Remove some unused p_e parameters and propagate

diff --git a/include/vlc/libvlc_media_library.h b/include/vlc/libvlc_media_library.h
index 2141ce078b9b16aae991ceb1402b4a4877d507f1..446bd7062daa650d63c9c5fd520aa9c966f855fe 100644 (file)
--- a/include/vlc/libvlc_media_library.h
+++ b/include/vlc/libvlc_media_library.h
@@ -50,11 +50,10 @@ typedef struct libvlc_media_library_t libvlc_media_library_t;
  * Create an new Media Library object
  *
  * \param p_libvlc_instance the libvlc instance
- * \param p_e an initialized exception pointer
+ * \return a new object or NULL on error
  */
 VLC_PUBLIC_API libvlc_media_library_t *
-    libvlc_media_library_new( libvlc_instance_t * p_inst,
-                              libvlc_exception_t * p_e );
+    libvlc_media_library_new( libvlc_instance_t * p_inst );
 
 /**
  * Release media library object. This functions decrements the

diff --git a/include/vlc/libvlc_media_list.h b/include/vlc/libvlc_media_list.h
index ea136c4af56d48fc914a99c8ea52acd5c83e6a88..860483d5fba4e9ccfb30f16d90bad321b487f3c7 100644 (file)
--- a/include/vlc/libvlc_media_list.h
+++ b/include/vlc/libvlc_media_list.h
@@ -49,11 +49,10 @@ typedef struct libvlc_media_list_view_t libvlc_media_list_view_t;
  * Create an empty media list.
  *
  * \param p_libvlc libvlc instance
- * \param p_e an initialized exception pointer
- * \return empty media list
+ * \return empty media list, or NULL on error
  */
 VLC_PUBLIC_API libvlc_media_list_t *
-    libvlc_media_list_new( libvlc_instance_t *, libvlc_exception_t * );
+    libvlc_media_list_new( libvlc_instance_t * );
 
 /**
  * Release media list created with libvlc_media_list_new().
@@ -213,16 +212,13 @@ VLC_PUBLIC_API libvlc_media_list_view_t *
  * Get a hierarchical media list view of media list items
  *
  * \param p_ml a media list instance
- * \param p_ex an exception instance
  * \return hierarchical media list view instance
  */
 VLC_PUBLIC_API libvlc_media_list_view_t *
-    libvlc_media_list_hierarchical_view( libvlc_media_list_t *,
-                                         libvlc_exception_t * );
+    libvlc_media_list_hierarchical_view( libvlc_media_list_t * );
 
 VLC_PUBLIC_API libvlc_media_list_view_t *
-    libvlc_media_list_hierarchical_node_view( libvlc_media_list_t * p_ml,
-                                              libvlc_exception_t * p_ex);
+    libvlc_media_list_hierarchical_node_view( libvlc_media_list_t * p_ml );
 
 /**
  * Get libvlc_event_manager from this media list instance.

diff --git a/src/control/flat_media_list_view.c b/src/control/flat_media_list_view.c
index 850bae2e100603fb57f8274d561875c85ad38bf9..2017e754a632e38b5c11535f2fddb33527cdc8e7 100644 (file)
--- a/src/control/flat_media_list_view.c
+++ b/src/control/flat_media_list_view.c
@@ -186,8 +186,7 @@ libvlc_media_list_flat_view( libvlc_media_list_t * p_mlist,
                                         flat_media_list_view_children_at_index,
                                         libvlc_media_list_flat_view,
                                         flat_media_list_view_release,
-                                        p_this_view_data,
-                                        p_e );
+                                        p_this_view_data );
     libvlc_media_list_lock( p_mlist );
     import_mlist_rec( p_mlv, p_mlist, p_e );
     libvlc_media_list_view_set_ml_notification_callback( p_mlv,

diff --git a/src/control/hierarchical_media_list_view.c b/src/control/hierarchical_media_list_view.c
index e265b7de70f9d2b8024f4217b8c0d7b57608948d..1283fad0646ef26b91c3e7ab7c74394f1a09f75f 100644 (file)
--- a/src/control/hierarchical_media_list_view.c
+++ b/src/control/hierarchical_media_list_view.c
@@ -86,7 +86,7 @@ hierarch_media_list_view_children_at_index( libvlc_media_list_view_t * p_mlv,
     p_submlist = libvlc_media_subitems( p_md );
     libvlc_media_release( p_md );
     if( !p_submlist ) return NULL;
-    p_ret = libvlc_media_list_hierarchical_view( p_submlist, p_e );
+    p_ret = libvlc_media_list_hierarchical_view( p_submlist );
     libvlc_media_list_release( p_submlist );
 
     return p_ret;
@@ -162,8 +162,7 @@ hierarch_media_list_view_release( libvlc_media_list_view_t * p_mlv )
  *       libvlc_media_list_flat_view (Public)
  **************************************************************************/
 libvlc_media_list_view_t *
-libvlc_media_list_hierarchical_view( libvlc_media_list_t * p_mlist,
-                                     libvlc_exception_t * p_e )
+libvlc_media_list_hierarchical_view( libvlc_media_list_t * p_mlist )
 {
     trace("\n");
     libvlc_media_list_view_t * p_mlv;
@@ -173,8 +172,7 @@ libvlc_media_list_hierarchical_view( libvlc_media_list_t * p_mlist,
                                         hierarch_media_list_view_children_at_index,
                                         libvlc_media_list_hierarchical_view,
                                         hierarch_media_list_view_release,
-                                        NULL,
-                                        p_e );
+                                        NULL );
     libvlc_media_list_lock( p_mlist );
     libvlc_event_attach( p_mlv->p_mlist->p_event_manager,
                          libvlc_MediaListItemAdded,

diff --git a/src/control/hierarchical_node_media_list_view.c b/src/control/hierarchical_node_media_list_view.c
index 03b8fa75dd590982eb53fe369c57e621251e6fcb..955e75405f3569c089d526390b48cb2dc0754ea8 100644 (file)
--- a/src/control/hierarchical_node_media_list_view.c
+++ b/src/control/hierarchical_node_media_list_view.c
@@ -127,7 +127,7 @@ hierarch_node_media_list_view_children_at_index( libvlc_media_list_view_t * p_ml
     p_submlist = libvlc_media_subitems( p_md );
     libvlc_media_release( p_md );
     if( !p_submlist ) return NULL;
-    p_ret = libvlc_media_list_hierarchical_node_view( p_submlist, p_e );
+    p_ret = libvlc_media_list_hierarchical_node_view( p_submlist );
     libvlc_media_list_release( p_submlist );
 
     return p_ret;
@@ -282,8 +282,7 @@ hierarch_node_media_list_view_release( libvlc_media_list_view_t * p_mlv )
  *       libvlc_media_list_flat_view (Public)
  **************************************************************************/
 libvlc_media_list_view_t *
-libvlc_media_list_hierarchical_node_view( libvlc_media_list_t * p_mlist,
-                                     libvlc_exception_t * p_e )
+libvlc_media_list_hierarchical_node_view( libvlc_media_list_t * p_mlist )
 {
     trace("\n");
     libvlc_media_list_view_t * p_mlv;
@@ -293,8 +292,7 @@ libvlc_media_list_hierarchical_node_view( libvlc_media_list_t * p_mlist,
                                         hierarch_node_media_list_view_children_at_index,
                                         libvlc_media_list_hierarchical_node_view,
                                         hierarch_node_media_list_view_release,
-                                        NULL,
-                                        p_e );
+                                        NULL );
     libvlc_media_list_lock( p_mlist );
     libvlc_event_attach( p_mlv->p_mlist->p_event_manager,
                          libvlc_MediaListItemAdded,

diff --git a/src/control/media.c b/src/control/media.c
index 55f3e9af41773702dfe7500812e135dd19cae090..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 )
@@ -346,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;
 }

diff --git a/src/control/media_discoverer.c b/src/control/media_discoverer.c
index 649038a00bc7a189211c4ab5e4ea219f9f3f0f9a..23e06c3beb4bbfde5c22fa8f9b3bbf882b2030ca 100644 (file)
--- a/src/control/media_discoverer.c
+++ b/src/control/media_discoverer.c
@@ -184,7 +184,7 @@ libvlc_media_discoverer_new_from_name( libvlc_instance_t * p_inst,
     }
 
     p_mdis->p_libvlc_instance = p_inst;
-    p_mdis->p_mlist = libvlc_media_list_new( p_inst, NULL );
+    p_mdis->p_mlist = libvlc_media_list_new( p_inst );
     p_mdis->p_mlist->b_read_only = true;
     p_mdis->running = false;
 

diff --git a/src/control/media_library.c b/src/control/media_library.c
index b4cb22472c191e7e30411eb2c9cbc62768510e02..8af091d55d9cb67554e7c71dfe4821eb2e87c33f 100644 (file)
--- a/src/control/media_library.c
+++ b/src/control/media_library.c
@@ -57,8 +57,7 @@ struct libvlc_media_library_t
  *       new (Public)
  **************************************************************************/
 libvlc_media_library_t *
-libvlc_media_library_new( libvlc_instance_t * p_inst,
-                          libvlc_exception_t * p_e )
+libvlc_media_library_new( libvlc_instance_t * p_inst )
 {
     libvlc_media_library_t * p_mlib;
 
@@ -131,9 +130,7 @@ libvlc_media_library_load( libvlc_media_library_t * p_mlib,
     if( p_mlib->p_mlist )
         libvlc_media_list_release( p_mlib->p_mlist );
 
-    p_mlib->p_mlist = libvlc_media_list_new(
-                        p_mlib->p_libvlc_instance,
-                        p_e );
+    p_mlib->p_mlist = libvlc_media_list_new( p_mlib->p_libvlc_instance );
 
     libvlc_media_list_add_file_content( p_mlib->p_mlist, psz_uri, p_e );
     free( psz_uri );

diff --git a/src/control/media_list.c b/src/control/media_list.c
index dd41b18cd7cdd58acd285eeb7e917965d4a39c1f..914c12c7c51943648005643c3ea07fcf1cbdea00 100644 (file)
--- a/src/control/media_list.c
+++ b/src/control/media_list.c
@@ -151,8 +151,7 @@ int mlist_is_writable( libvlc_media_list_t *p_mlist, libvlc_exception_t *p_e )
  * Init an object.
  **************************************************************************/
 libvlc_media_list_t *
-libvlc_media_list_new( libvlc_instance_t * p_inst,
-                       libvlc_exception_t * p_e )
+libvlc_media_list_new( libvlc_instance_t * p_inst )
 {
     libvlc_media_list_t * p_mlist;
 

diff --git a/src/control/media_list_view.c b/src/control/media_list_view.c
index f7983a16fab85695e73aadf5ba0fb9ad20ef69bf..4c830379fc5a8f6343c576482e8dec2a15bc3230 100644 (file)
--- a/src/control/media_list_view.c
+++ b/src/control/media_list_view.c
@@ -303,8 +303,7 @@ libvlc_media_list_view_new( libvlc_media_list_t * p_mlist,
                             libvlc_media_list_view_children_at_index_func_t pf_children_at_index,
                             libvlc_media_list_view_constructor_func_t pf_constructor,
                             libvlc_media_list_view_release_func_t pf_release,
-                            void * this_view_data,
-                            libvlc_exception_t * p_e )
+                            void * this_view_data )
 {
     libvlc_media_list_view_t * p_mlv;
     p_mlv = calloc( 1, sizeof(libvlc_media_list_view_t) );

diff --git a/src/control/media_list_view_internal.h b/src/control/media_list_view_internal.h
index b45347889a812d05257bf744745423bcd307146e..1d60bb7f759580214747415eae8f061a2e400cfe 100644 (file)
--- a/src/control/media_list_view_internal.h
+++ b/src/control/media_list_view_internal.h
@@ -86,8 +86,7 @@ libvlc_media_list_view_t * libvlc_media_list_view_new(
         libvlc_media_list_view_children_at_index_func_t pf_children_at_index,
         libvlc_media_list_view_constructor_func_t pf_constructor,
         libvlc_media_list_view_release_func_t pf_release,
-        void * this_view_data,
-        libvlc_exception_t * p_e );
+        void * this_view_data );
 
 void libvlc_media_list_view_set_ml_notification_callback(
         libvlc_media_list_view_t * p_mlv,

diff --git a/test/libvlc/media_list.c b/test/libvlc/media_list.c
index 3413b219ccccfecccf00cdc4322722d302108867..42156baf3fe810d73bcf73aef6f01ddef21ee437 100644 (file)
--- a/test/libvlc/media_list.c
+++ b/test/libvlc/media_list.c
@@ -35,8 +35,8 @@ static void test_media_list (const char ** argv, int argc)
     vlc = libvlc_new (argc, argv, &ex);
     catch ();
 
-    ml = libvlc_media_list_new (vlc, &ex);
-    catch ();
+    ml = libvlc_media_list_new (vlc);
+    assert (ml != NULL);
 
     md1 = libvlc_media_new (vlc, "/dev/null", &ex);
     catch ();

diff --git a/test/libvlc/media_list_player.c b/test/libvlc/media_list_player.c
index 35f8be5595d1ac0134080bf3f20fb508480ff046..0a59b23f309d62058a4327f89fd30048aa842530 100644 (file)
--- a/test/libvlc/media_list_player.c
+++ b/test/libvlc/media_list_player.c
@@ -107,8 +107,8 @@ static void test_media_list_player_items_queue(const char** argv, int argc)
     md = libvlc_media_new (vlc, file, &ex);
     catch ();
 
-    ml = libvlc_media_list_new (vlc, &ex);
-    catch ();
+    ml = libvlc_media_list_new (vlc);
+    assert (ml != NULL);
 
     mlp = libvlc_media_list_player_new (vlc, &ex);
     catch ();
@@ -178,8 +178,8 @@ static void test_media_list_player_previous(const char** argv, int argc)
     md = libvlc_media_new (vlc, file, &ex);
     catch ();
 
-    ml = libvlc_media_list_new (vlc, &ex);
-    catch ();
+    ml = libvlc_media_list_new (vlc);
+    assert (ml != NULL);
 
     mlp = libvlc_media_list_player_new (vlc, &ex);
     catch ();
@@ -255,8 +255,8 @@ static void test_media_list_player_next(const char** argv, int argc)
     md = libvlc_media_new (vlc, file, &ex);
     catch ();
 
-    ml = libvlc_media_list_new (vlc, &ex);
-    catch ();
+    ml = libvlc_media_list_new (vlc);
+    assert (ml != NULL);
 
     mlp = libvlc_media_list_player_new (vlc, &ex);
     catch ();
@@ -331,8 +331,8 @@ static void test_media_list_player_pause_stop(const char** argv, int argc)
     md = libvlc_media_new (vlc, file, &ex);
     catch ();
 
-    ml = libvlc_media_list_new (vlc, &ex);
-    catch ();
+    ml = libvlc_media_list_new (vlc);
+    assert (ml != NULL);
 
     mlp = libvlc_media_list_player_new (vlc, &ex);
 
@@ -378,8 +378,8 @@ static void test_media_list_player_play_item_at_index(const char** argv, int arg
     md = libvlc_media_new (vlc, file, &ex);
     catch ();
 
-    ml = libvlc_media_list_new (vlc, &ex);
-    catch ();
+    ml = libvlc_media_list_new (vlc);
+    assert (ml != NULL);
 
     mlp = libvlc_media_list_player_new (vlc, &ex);
 
@@ -458,23 +458,23 @@ static void test_media_list_player_playback_options (const char** argv, int argc
     md5 = libvlc_media_new (vlc, file, &ex);
     catch ();
 
-    ml = libvlc_media_list_new (vlc, &ex);
-    catch ();
+    ml = libvlc_media_list_new (vlc);
+    assert (ml != NULL);
 
-    ml2 = libvlc_media_list_new (vlc, &ex);
-    catch ();
+    ml2 = libvlc_media_list_new (vlc);
+    assert (ml2 != NULL);
 
-    ml3 = libvlc_media_list_new (vlc, &ex);
-    catch ();
+    ml3 = libvlc_media_list_new (vlc);
+    assert (ml3 != NULL);
 
-    ml4 = libvlc_media_list_new (vlc, &ex);
-    catch ();
+    ml4 = libvlc_media_list_new (vlc);
+    assert (ml4 != NULL);
 
-    ml5 = libvlc_media_list_new (vlc, &ex);
-    catch ();
+    ml5 = libvlc_media_list_new (vlc);
+    assert (ml5 != NULL);
 
-    ml6 = libvlc_media_list_new (vlc, &ex);
-    catch ();
+    ml6 = libvlc_media_list_new (vlc);
+    assert (ml6 != NULL);
 
     media_list_add_file_path (vlc, ml2, file);
     media_list_add_file_path (vlc, ml2, file);