GLX: remove MIT-SHM support infrastructure

[vlc] / src / control / media_list_view.c

diff --git a/src/control/media_list_view.c b/src/control/media_list_view.c
index f288c4f414334b96d1c00134eb79a20b01f2f7e2..878ab670f0169fbd838b726fc5aab97536c0511b 100644 (file)
--- a/src/control/media_list_view.c
+++ b/src/control/media_list_view.c
@@ -22,10 +22,21 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include "libvlc_internal.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/libvlc.h>
-#include <assert.h>
-#include "vlc_arrays.h"
+#include <vlc/libvlc_media.h>
+#include <vlc/libvlc_media_list.h>
+#include <vlc/libvlc_media_list_view.h>
+#include <vlc/libvlc_events.h>
+
+#include "libvlc_internal.h"  // Abuse, could and should be removed
+
+#include "media_internal.h"  // Abuse, could and should be removed
+#include "media_list_internal.h"  // Abuse, could and should be removed
+#include "media_list_view_internal.h"
 
 //#define DEBUG_FLAT_LIST
 
@@ -50,7 +61,7 @@ install_md_listener( libvlc_media_list_view_t * p_mlv,
                      libvlc_media_t * p_md)
 {
     libvlc_media_list_t * p_mlist;
-    if((p_mlist = libvlc_media_subitems( p_md, NULL )))
+    if((p_mlist = libvlc_media_subitems( p_md )))
     {
         libvlc_media_list_lock( p_mlist );
         int i, count = libvlc_media_list_count( p_mlist, NULL );
@@ -99,7 +110,7 @@ uninstall_md_listener( libvlc_media_list_view_t * p_mlv,
                          media_list_subitem_added, p_mlv, &ignored_exception );
     if( libvlc_exception_raised( &ignored_exception ) )
         libvlc_exception_clear( &ignored_exception ); /* We don't care if we encounter an exception */
-    if((p_mlist = libvlc_media_subitems( p_md, NULL )))
+    if((p_mlist = libvlc_media_subitems( p_md )))
     {
         libvlc_media_list_lock( p_mlist );
         libvlc_event_detach( p_mlist->p_event_manager,
@@ -149,7 +160,7 @@ media_list_subitem_added( const libvlc_event_t * p_event, void * p_user_data )
     libvlc_media_t * p_submd = p_event->u.media_subitem_added.new_child;
     libvlc_media_t * p_md = p_event->p_obj;
 
-    if((p_mlist = libvlc_media_subitems( p_md, NULL )))
+    if((p_mlist = libvlc_media_subitems( p_md )))
     {
         /* We have a mlist to which we're going to listen to events
          * thus, no need to wait for SubItemAdded events */
@@ -328,7 +339,7 @@ libvlc_media_list_view_new( libvlc_media_list_t * p_mlist,
 
     p_mlv->p_this_view_data = this_view_data;
 
-    vlc_mutex_init( p_mlv->p_libvlc_instance->p_libvlc_int, &p_mlv->object_lock );
+    vlc_mutex_init( &p_mlv->object_lock );
     p_mlv->i_refcount = 1;
 
     return p_mlv;
@@ -438,7 +449,7 @@ libvlc_media_list_view_children_for_item( libvlc_media_list_view_t * p_mlv,
     libvlc_media_list_t * p_mlist;
     libvlc_media_list_view_t * ret;
 
-    p_mlist = libvlc_media_subitems(p_md, p_e);
+    p_mlist = libvlc_media_subitems(p_md);
     if(!p_mlist) return NULL;
 
     ret = p_mlv->pf_constructor( p_mlist, p_e );
@@ -464,7 +475,8 @@ libvlc_media_list_view_children_for_item( libvlc_media_list_view_t * p_mlv,
     { \
         if( p_mlv->pf_##name ) \
             return p_mlv->pf_##name ARGS(__VA_ARGS__) ; \
-        libvlc_exception_raise( p_e, "No '" #name "' method in this media_list_view" ); \
+        libvlc_exception_raise( p_e ); \
+        libvlc_printerr( "No '" #name "' method in this media_list_view" ); \
         return default_ret_value;\
     }
 
@@ -479,7 +491,8 @@ libvlc_media_list_view_children_for_item( libvlc_media_list_view_t * p_mlv,
             p_mlv->pf_##name ARGS(__VA_ARGS__) ; \
             return; \
         } \
-        libvlc_exception_raise( p_e, "No '" #name "' method in this media_list_view" ); \
+        libvlc_exception_raise( p_e ); \
+        libvlc_printerr( "No '" #name "' method in this media_list_view" ); \
     }