src/control/video.c: drop debug printf()s.

[vlc] / src / control / media.c

diff --git a/src/control/media.c b/src/control/media.c
index 357b7ee3c3509fa9978eb54047a970114f75e0f0..e97c4164939c38f37c0dce983cbcef5d6eb4aa9a 100644 (file)
--- a/src/control/media.c
+++ b/src/control/media.c
@@ -101,7 +101,7 @@ static void input_item_subitem_added( const vlc_event_t *p_event,
     /* Add this to our media list */
     if( !p_md->p_subitems )
     {
-        p_md->p_subitems = libvlc_media_list_new( p_md->p_libvlc_instance, NULL );
+        p_md->p_subitems = libvlc_media_list_new( p_md->p_libvlc_instance );
         libvlc_media_list_set_media( p_md->p_subitems, p_md );
     }
     if( p_md->p_subitems )
@@ -270,17 +270,22 @@ libvlc_media_t * libvlc_media_new_from_input_item(
      * It can give a bunch of item to read. */
     p_md->p_subitems        = NULL;
 
-    p_md->p_event_manager = libvlc_event_manager_new( p_md, p_instance, p_e );
+    p_md->p_event_manager = libvlc_event_manager_new( p_md, p_instance );
+    if( unlikely(p_md->p_event_manager == NULL) )
+    {
+        free(p_md);
+        return NULL;
+    }
     libvlc_event_manager_register_event_type( p_md->p_event_manager,
-        libvlc_MediaMetaChanged, p_e );
+        libvlc_MediaMetaChanged );
     libvlc_event_manager_register_event_type( p_md->p_event_manager,
-        libvlc_MediaSubItemAdded, p_e );
+        libvlc_MediaSubItemAdded );
     libvlc_event_manager_register_event_type( p_md->p_event_manager,
-        libvlc_MediaFreed, p_e );
+        libvlc_MediaFreed );
     libvlc_event_manager_register_event_type( p_md->p_event_manager,
-        libvlc_MediaDurationChanged, p_e );
+        libvlc_MediaDurationChanged );
     libvlc_event_manager_register_event_type( p_md->p_event_manager,
-        libvlc_MediaStateChanged, p_e );
+        libvlc_MediaStateChanged );
 
     vlc_gc_incref( p_md->p_input_item );
 
@@ -341,7 +346,7 @@ libvlc_media_t * libvlc_media_new_as_node(
     p_md = libvlc_media_new_from_input_item( p_instance,
                 p_input_item, p_e );
 
-    p_md->p_subitems = libvlc_media_list_new( p_md->p_libvlc_instance, NULL );
+    p_md->p_subitems = libvlc_media_list_new( p_md->p_libvlc_instance );
 
     return p_md;
 }
@@ -668,6 +673,7 @@ libvlc_media_get_es( libvlc_media_t *p_md, libvlc_media_es_t ** pp_es )
 
 
         p_mes->i_codec = p_es->i_codec;
+        p_mes->i_id = p_es->i_id;
 
         p_mes->i_profile = p_es->i_profile;
         p_mes->i_level = p_es->i_level;