Check malloc return value.

[vlc] / src / control / media_list_view.c

diff --git a/src/control/media_list_view.c b/src/control/media_list_view.c
index 0844c7c282b459c7b66b3edc4593bed4b579db5d..5ed71d0f9d77e395fdc6ffade8eb2204261209db 100644 (file)
--- a/src/control/media_list_view.c
+++ b/src/control/media_list_view.c
@@ -82,7 +82,7 @@ install_md_listener( libvlc_media_list_view_t * p_mlv,
     {
         /* No mlist, wait for a subitem added event */
         libvlc_event_attach( p_md->p_event_manager,
-                            libvlc_MediaDescriptorSubItemAdded,
+                            libvlc_MediaSubItemAdded,
                             media_list_subitem_added, p_mlv, NULL );
     }
 }
@@ -95,7 +95,7 @@ uninstall_md_listener( libvlc_media_list_view_t * p_mlv,
     libvlc_exception_t ignored_exception;
     libvlc_exception_init( &ignored_exception );
     libvlc_event_detach( p_md->p_event_manager,
-                         libvlc_MediaDescriptorSubItemAdded,
+                         libvlc_MediaSubItemAdded,
                          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 */
@@ -154,7 +154,7 @@ media_list_subitem_added( const libvlc_event_t * p_event, void * p_user_data )
         /* We have a mlist to which we're going to listen to events
          * thus, no need to wait for SubItemAdded events */
         libvlc_event_detach( p_md->p_event_manager,
-                             libvlc_MediaDescriptorSubItemAdded,
+                             libvlc_MediaSubItemAdded,
                              media_list_subitem_added, p_mlv, NULL );
         libvlc_media_list_lock( p_mlist );
 
@@ -328,7 +328,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;