Remove some more unused exceptions

diff --git a/include/vlc/libvlc_media_list.h b/include/vlc/libvlc_media_list.h
index 1274df2dd94d64575ca855b0b703f95a51c892c0..ea136c4af56d48fc914a99c8ea52acd5c83e6a88 100644 (file)
--- a/include/vlc/libvlc_media_list.h
+++ b/include/vlc/libvlc_media_list.h
@@ -83,12 +83,9 @@ VLC_DEPRECATED_API void
  *
  * \param p_ml a media list instance
  * \param p_mi media instance to add
- * \param p_e initialized exception object
  */
 VLC_PUBLIC_API void
-    libvlc_media_list_set_media( libvlc_media_list_t *,
-                                            libvlc_media_t *,
-                                            libvlc_exception_t *);
+libvlc_media_list_set_media( libvlc_media_list_t *p_ml, libvlc_media_t *p_md );
 
 /**
  * Get media instance from this media list instance. This action will increase
@@ -96,12 +93,10 @@ VLC_PUBLIC_API void
  * The libvlc_media_list_lock should NOT be held upon entering this function.
  *
  * \param p_ml a media list instance
- * \param p_e initialized exception object
  * \return media instance
  */
 VLC_PUBLIC_API libvlc_media_t *
-    libvlc_media_list_media( libvlc_media_list_t *,
-                                        libvlc_exception_t *);
+    libvlc_media_list_media( libvlc_media_list_t *p_ml );
 
 /**
  * Add media instance to media list
@@ -147,12 +142,10 @@ VLC_PUBLIC_API void
  * The libvlc_media_list_lock should be held upon entering this function.
  *
  * \param p_ml a media list instance
- * \param p_e initialized exception object
  * \return number of items in media list
  */
 VLC_PUBLIC_API int
-    libvlc_media_list_count( libvlc_media_list_t * p_mlist,
-                             libvlc_exception_t * p_e );
+    libvlc_media_list_count( libvlc_media_list_t *p_ml );
 
 /**
  * List media instance in media list at a position
@@ -173,13 +166,11 @@ VLC_PUBLIC_API libvlc_media_t *
  *
  * \param p_ml a media list instance
  * \param p_mi media list instance
- * \param p_e initialized exception object
  * \return position of media instance
  */
 VLC_PUBLIC_API int
-    libvlc_media_list_index_of_item( libvlc_media_list_t *,
-                                     libvlc_media_t *,
-                                     libvlc_exception_t * );
+    libvlc_media_list_index_of_item( libvlc_media_list_t *p_ml,
+                                     libvlc_media_t *p_mi );
 
 /**
  * This indicates if this media list is read-only from a user point of view
@@ -238,12 +229,10 @@ VLC_PUBLIC_API libvlc_media_list_view_t *
  * The p_event_manager is immutable, so you don't have to hold the lock
  *
  * \param p_ml a media list instance
- * \param p_ex an excpetion instance
  * \return libvlc_event_manager
  */
 VLC_PUBLIC_API libvlc_event_manager_t *
-    libvlc_media_list_event_manager( libvlc_media_list_t *,
-                                     libvlc_exception_t * );
+    libvlc_media_list_event_manager( libvlc_media_list_t *p_ml );
 
 /** @} media_list */
 

diff --git a/src/control/flat_media_list_view.c b/src/control/flat_media_list_view.c
index 3144948369a970c4a6865e67b27781401484b038..850bae2e100603fb57f8274d561875c85ad38bf9 100644 (file)
--- a/src/control/flat_media_list_view.c
+++ b/src/control/flat_media_list_view.c
@@ -148,7 +148,7 @@ import_mlist_rec( libvlc_media_list_view_t * p_mlv,
                   libvlc_exception_t * p_e )
 {
     int i, count;
-    count = libvlc_media_list_count( p_mlist, p_e );
+    count = libvlc_media_list_count( p_mlist );
     for( i = 0; i < count; i++ )
     {
         libvlc_media_t * p_md;

diff --git a/src/control/hierarchical_media_list_view.c b/src/control/hierarchical_media_list_view.c
index e57b212f2bd45f52d2dc419e4be0dfd3e887357d..84b8e85dfb8438b23268ec9112e5f4b0b928860c 100644 (file)
--- a/src/control/hierarchical_media_list_view.c
+++ b/src/control/hierarchical_media_list_view.c
@@ -53,7 +53,8 @@ static int
 hierarch_media_list_view_count( libvlc_media_list_view_t * p_mlv,
                                 libvlc_exception_t * p_e )
 {
-    return libvlc_media_list_count( p_mlv->p_mlist, p_e );
+    VLC_UNUSED(p_e);
+    return libvlc_media_list_count( p_mlv->p_mlist );
 }
 
 /**************************************************************************

diff --git a/src/control/hierarchical_node_media_list_view.c b/src/control/hierarchical_node_media_list_view.c
index e0c25d7f22e366bf1945854eba2e0e992312c375..d6264c7b7d495889a17c50491b193fd0edaba8c2 100644 (file)
--- a/src/control/hierarchical_node_media_list_view.c
+++ b/src/control/hierarchical_node_media_list_view.c
@@ -59,7 +59,7 @@ hierarch_node_media_list_view_count( libvlc_media_list_view_t * p_mlv,
                                 libvlc_exception_t * p_e )
 {
     /* FIXME: we may want to cache that */
-    int i, ret, count = libvlc_media_list_count( p_mlv->p_mlist, p_e );
+    int i, ret, count = libvlc_media_list_count( p_mlv->p_mlist );
     libvlc_media_t * p_md;
     libvlc_media_list_t * p_submlist;
     ret = 0;
@@ -90,7 +90,7 @@ hierarch_node_media_list_view_item_at_index( libvlc_media_list_view_t * p_mlv,
     libvlc_media_t * p_md;
     libvlc_media_list_t * p_submlist;
     trace("%d\n", index);
-    int i, current_index, count = libvlc_media_list_count( p_mlv->p_mlist, p_e );
+    int i, current_index, count = libvlc_media_list_count( p_mlv->p_mlist );
     current_index = -1;
     for( i = 0; i < count; i++ )
     {
@@ -140,7 +140,7 @@ index_of_item( libvlc_media_list_view_t * p_mlv, libvlc_media_t * p_md )
     libvlc_media_t * p_iter_md;
     libvlc_media_list_t * p_submlist;
 
-    int i, current_index, count = libvlc_media_list_count( p_mlv->p_mlist, NULL );
+    int i, current_index, count = libvlc_media_list_count( p_mlv->p_mlist );
     current_index = -1;
     for( i = 0; i < count; i++ )
     {
@@ -164,7 +164,7 @@ item_is_already_added( libvlc_media_t * p_md )
 
     p_submlist = libvlc_media_subitems( p_md );
     if( !p_submlist ) return false;
-    int count = libvlc_media_list_count( p_submlist, NULL );
+    int count = libvlc_media_list_count( p_submlist );
     libvlc_media_list_release( p_submlist );
     return count > 1;
 }

diff --git a/src/control/media.c b/src/control/media.c
index a947dec84e9ecf6c16711d476a482d6d46d6a425..357b7ee3c3509fa9978eb54047a970114f75e0f0 100644 (file)
--- a/src/control/media.c
+++ b/src/control/media.c
@@ -102,7 +102,7 @@ static void input_item_subitem_added( const vlc_event_t *p_event,
     if( !p_md->p_subitems )
     {
         p_md->p_subitems = libvlc_media_list_new( p_md->p_libvlc_instance, NULL );
-        libvlc_media_list_set_media( p_md->p_subitems, p_md, NULL );
+        libvlc_media_list_set_media( p_md->p_subitems, p_md );
     }
     if( p_md->p_subitems )
     {

diff --git a/src/control/media_discoverer.c b/src/control/media_discoverer.c
index 9d887e6cfe7fb9d28d9735dbda9128cb500dff18..5fbfc747e88fb0c1afec3bbac0e15fc881e5b415 100644 (file)
--- a/src/control/media_discoverer.c
+++ b/src/control/media_discoverer.c
@@ -88,7 +88,7 @@ static void services_discovery_item_added( const vlc_event_t * p_event,
 
             /* Insert the md into the root list */
             libvlc_media_list_lock( p_mdis->p_mlist );
-            _libvlc_media_list_add_media( p_mdis->p_mlist, p_catmd, NULL );
+            _libvlc_media_list_add_media( p_mdis->p_mlist, p_catmd );
             libvlc_media_list_unlock( p_mdis->p_mlist );
 
             /* We don't release the mlist cause the dictionary
@@ -98,7 +98,7 @@ static void services_discovery_item_added( const vlc_event_t * p_event,
     }
 
     libvlc_media_list_lock( p_mlist );
-    _libvlc_media_list_add_media( p_mlist, p_md, NULL );
+    _libvlc_media_list_add_media( p_mlist, p_md );
     libvlc_media_list_unlock( p_mlist );
 
     libvlc_media_release( p_md );
@@ -115,7 +115,7 @@ static void services_discovery_item_removed( const vlc_event_t * p_event,
     libvlc_media_t * p_md;
     libvlc_media_discoverer_t * p_mdis = user_data;
 
-    int i, count = libvlc_media_list_count( p_mdis->p_mlist, NULL );
+    int i, count = libvlc_media_list_count( p_mdis->p_mlist );
     libvlc_media_list_lock( p_mdis->p_mlist );
     for( i = 0; i < count; i++ )
     {

diff --git a/src/control/media_list.c b/src/control/media_list.c
index a56d1f6bf5cf17cf0be3cd7b89e634ff06fe0e29..d553536fedb57a241514a30c61283b22c70e6a22 100644 (file)
--- a/src/control/media_list.c
+++ b/src/control/media_list.c
@@ -288,11 +288,9 @@ libvlc_media_list_add_file_content( libvlc_media_list_t * p_mlist,
  *       set_media (Public)
  **************************************************************************/
 void libvlc_media_list_set_media( libvlc_media_list_t * p_mlist,
-                                             libvlc_media_t * p_md,
-                                             libvlc_exception_t * p_e)
+                                  libvlc_media_t * p_md )
 
 {
-    VLC_UNUSED(p_e);
     vlc_mutex_lock( &p_mlist->object_lock );
     libvlc_media_release( p_mlist->p_md );
     libvlc_media_retain( p_md );
@@ -310,11 +308,9 @@ void libvlc_media_list_set_media( libvlc_media_list_t * p_mlist,
  * media.
  **************************************************************************/
 libvlc_media_t *
-libvlc_media_list_media( libvlc_media_list_t * p_mlist,
-                                    libvlc_exception_t * p_e)
+libvlc_media_list_media( libvlc_media_list_t * p_mlist )
 {
     libvlc_media_t *p_md;
-    VLC_UNUSED(p_e);
 
     vlc_mutex_lock( &p_mlist->object_lock );
     p_md = p_mlist->p_md;
@@ -328,12 +324,10 @@ libvlc_media_list_media( libvlc_media_list_t * p_mlist,
 /**************************************************************************
  *       libvlc_media_list_count (Public)
  *
- * Lock should be hold when entering.
+ * Lock should be held when entering.
  **************************************************************************/
-int libvlc_media_list_count( libvlc_media_list_t * p_mlist,
-                             libvlc_exception_t * p_e )
+int libvlc_media_list_count( libvlc_media_list_t * p_mlist )
 {
-    VLC_UNUSED(p_e);
     return vlc_array_count( &p_mlist->items );
 }
 
@@ -348,16 +342,13 @@ void libvlc_media_list_add_media(
                                    libvlc_exception_t * p_e )
 {
     if( mlist_is_writable(p_mlist,p_e) )
-        _libvlc_media_list_add_media( p_mlist, p_md, p_e );
+        _libvlc_media_list_add_media( p_mlist, p_md );
 }
 
 /* LibVLC internal version */
-void _libvlc_media_list_add_media(
-                                   libvlc_media_list_t * p_mlist,
-                                   libvlc_media_t * p_md,
-                                   libvlc_exception_t * p_e )
+void _libvlc_media_list_add_media( libvlc_media_list_t * p_mlist,
+                                   libvlc_media_t * p_md )
 {
-    VLC_UNUSED(p_e);
     libvlc_media_retain( p_md );
 
     notify_item_addition( p_mlist, p_md, vlc_array_count( &p_mlist->items ),
@@ -379,17 +370,15 @@ void libvlc_media_list_insert_media(
                                    libvlc_exception_t * p_e )
 {
     if( mlist_is_writable(p_mlist,p_e) )
-        _libvlc_media_list_insert_media( p_mlist, p_md, index, p_e );
+        _libvlc_media_list_insert_media( p_mlist, p_md, index );
 }
 
 /* LibVLC internal version */
 void _libvlc_media_list_insert_media(
                                    libvlc_media_list_t * p_mlist,
                                    libvlc_media_t * p_md,
-                                   int index,
-                                   libvlc_exception_t * p_e )
+                                   int index )
 {
-    VLC_UNUSED(p_e);
     libvlc_media_retain( p_md );
 
     notify_item_addition( p_mlist, p_md, index, EventWillHappen );
@@ -464,11 +453,8 @@ libvlc_media_list_item_at_index( libvlc_media_list_t * p_mlist,
  * Warning: this function returns the first matching item.
  **************************************************************************/
 int libvlc_media_list_index_of_item( libvlc_media_list_t * p_mlist,
-                                     libvlc_media_t * p_searched_md,
-                                     libvlc_exception_t * p_e )
+                                     libvlc_media_t * p_searched_md )
 {
-    VLC_UNUSED(p_e);
-
     libvlc_media_t * p_md;
     int i;
     for ( i = 0; i < vlc_array_count( &p_mlist->items ); i++ )
@@ -519,9 +505,7 @@ void libvlc_media_list_unlock( libvlc_media_list_t * p_mlist )
  * The p_event_manager is immutable, so you don't have to hold the lock
  **************************************************************************/
 libvlc_event_manager_t *
-libvlc_media_list_event_manager( libvlc_media_list_t * p_mlist,
-                                    libvlc_exception_t * p_e )
+libvlc_media_list_event_manager( libvlc_media_list_t * p_mlist )
 {
-    VLC_UNUSED(p_e);
     return p_mlist->p_event_manager;
 }

diff --git a/src/control/media_list_internal.h b/src/control/media_list_internal.h
index a9ee2c7ba5bdc7fa8db3d662ef53719803bee39b..5852eb590f2892da89cf497d3c0ebd1af78ed321 100644 (file)
--- a/src/control/media_list_internal.h
+++ b/src/control/media_list_internal.h
@@ -58,13 +58,11 @@ struct libvlc_media_list_t
 /* Media List */
 void _libvlc_media_list_add_media(
         libvlc_media_list_t * p_mlist,
-        libvlc_media_t * p_md,
-        libvlc_exception_t * p_e );
+        libvlc_media_t * p_md );
 
 void _libvlc_media_list_insert_media(
         libvlc_media_list_t * p_mlist,
-        libvlc_media_t * p_md, int index,
-        libvlc_exception_t * p_e );
+        libvlc_media_t * p_md, int index );
 
 void _libvlc_media_list_remove_index(
         libvlc_media_list_t * p_mlist, int index,

diff --git a/src/control/media_list_path.h b/src/control/media_list_path.h
index f46db747380ccf06b96ecc9c073528e1dc8e8d99..1cca9f2fdf4e79190faaed64ae0fb7926d61570d 100644 (file)
--- a/src/control/media_list_path.h
+++ b/src/control/media_list_path.h
@@ -119,7 +119,7 @@ static libvlc_media_list_path_t
 get_path_rec( const libvlc_media_list_path_t path, libvlc_media_list_t * p_current_mlist, libvlc_media_t * p_searched_md )
 {
     int i, count;
-    count = libvlc_media_list_count( p_current_mlist, NULL );
+    count = libvlc_media_list_count( p_current_mlist );
     for( i = 0; i < count; i++ )
     {
         libvlc_media_t * p_md = libvlc_media_list_item_at_index( p_current_mlist, i, NULL );

diff --git a/src/control/media_list_player.c b/src/control/media_list_player.c
index 45222fcb2a50752973eb73ebeaccc91f8155899d..790123f71e11e046aace5aa43b638400e85e5bb9 100644 (file)
--- a/src/control/media_list_player.c
+++ b/src/control/media_list_player.c
@@ -116,7 +116,7 @@ static inline void assert_locked(libvlc_media_list_player_t * p_mlp)
 static inline libvlc_event_manager_t * mlist_em(libvlc_media_list_player_t * p_mlp)
 {
     assert_locked(p_mlp);
-    return libvlc_media_list_event_manager(p_mlp->p_mlist, NULL);
+    return libvlc_media_list_event_manager(p_mlp->p_mlist);
 }
 
 static inline libvlc_event_manager_t * mplayer_em(libvlc_media_list_player_t * p_mlp)
@@ -144,7 +144,7 @@ get_next_path(libvlc_media_list_player_t * p_mlp, bool b_loop)
 
     if (!p_mlp->current_playing_item_path)
     {
-        if (!libvlc_media_list_count(p_mlp->p_mlist, NULL))
+        if (!libvlc_media_list_count(p_mlp->p_mlist))
             return NULL;
         return libvlc_media_list_path_with_root_index(0);
     }
@@ -172,7 +172,7 @@ get_next_path(libvlc_media_list_player_t * p_mlp, bool b_loop)
     ret[depth - 1]++; /* set to next element */
 
     /* If this goes beyond the end of the list */
-    while(ret[depth-1] >= libvlc_media_list_count(p_parent_of_playing_item, NULL))
+    while(ret[depth-1] >= libvlc_media_list_count(p_parent_of_playing_item))
     {
         depth--;
         if (depth <= 0)
@@ -218,7 +218,7 @@ find_last_item( libvlc_media_list_t * p_mlist, libvlc_media_list_path_t current_
 
     if(p_sublist)
     {
-        int i_count = libvlc_media_list_count(p_sublist, NULL);
+        int i_count = libvlc_media_list_count(p_sublist);
         if(i_count > 0)
         {
             /* Add the last sublist item to the path. */
@@ -252,7 +252,7 @@ get_previous_path(libvlc_media_list_player_t * p_mlp, bool b_loop)
 
     if (!p_mlp->current_playing_item_path)
     {
-        if (!libvlc_media_list_count(p_mlp->p_mlist, NULL))
+        if (!libvlc_media_list_count(p_mlp->p_mlist))
             return NULL;
         return libvlc_media_list_path_with_root_index(0);
     }
@@ -285,7 +285,7 @@ get_previous_path(libvlc_media_list_player_t * p_mlp, bool b_loop)
             // Is looping enabled?
             if(b_loop)
             {
-                int i_count = libvlc_media_list_count(p_parent_of_playing_item, NULL);
+                int i_count = libvlc_media_list_count(p_parent_of_playing_item);
 
                 /* Set current play item to the last element in the list */
                 ret[0] = i_count - 1;

diff --git a/src/control/media_list_view.c b/src/control/media_list_view.c
index 00ade8d11f1920a1745262f2451952a1ab9464ab..fcf6f71732bed8c9cf1264f6f4a929e5944113ca 100644 (file)
--- a/src/control/media_list_view.c
+++ b/src/control/media_list_view.c
@@ -64,7 +64,7 @@ install_md_listener( libvlc_media_list_view_t * p_mlv,
     if((p_mlist = libvlc_media_subitems( p_md )))
     {
         libvlc_media_list_lock( p_mlist );
-        int i, count = libvlc_media_list_count( p_mlist, NULL );
+        int i, count = libvlc_media_list_count( p_mlist );
         for( i = 0; i < count; i++)
         {
             libvlc_event_t added_event;
@@ -116,7 +116,7 @@ uninstall_md_listener( libvlc_media_list_view_t * p_mlv,
                              libvlc_MediaListItemDeleted,
                              media_list_item_removed, p_mlv );
 
-        int i, count = libvlc_media_list_count( p_mlist, NULL );
+        int i, count = libvlc_media_list_count( p_mlist );
         for( i = 0; i < count; i++)
         {
             libvlc_media_t * p_submd;
@@ -203,7 +203,7 @@ libvlc_media_list_view_set_ml_notification_callback(
     libvlc_event_attach( p_mlv->p_mlist->p_event_manager,
                          libvlc_MediaListItemDeleted,
                          media_list_item_removed, p_mlv, NULL );
-    int i, count = libvlc_media_list_count( p_mlv->p_mlist, NULL );
+    int i, count = libvlc_media_list_count( p_mlv->p_mlist );
     for( i = 0; i < count; i++)
     {
         libvlc_media_t * p_md;
@@ -387,7 +387,7 @@ libvlc_media_list_view_release( libvlc_media_list_view_t * p_mlv )
                             libvlc_MediaListItemDeleted,
                             media_list_item_removed, p_mlv );
     }
-    int i, count = libvlc_media_list_count( p_mlv->p_mlist, NULL );
+    int i, count = libvlc_media_list_count( p_mlv->p_mlist );
     for( i = 0; i < count; i++)
     {
         libvlc_media_t * p_md;

diff --git a/test/libvlc/media_list.c b/test/libvlc/media_list.c
index fb176972f346f5132040e3101742d18e22300d97..3413b219ccccfecccf00cdc4322722d302108867 100644 (file)
--- a/test/libvlc/media_list.c
+++ b/test/libvlc/media_list.c
@@ -50,41 +50,31 @@ static void test_media_list (const char ** argv, int argc)
     libvlc_media_list_add_media (ml, md2, &ex);
     catch ();
 
-    assert( libvlc_media_list_count (ml, &ex) == 2 );
-    catch ();
-
-    assert( libvlc_media_list_index_of_item (ml, md1, &ex) == 0 );
-    catch ();
-
-    assert( libvlc_media_list_index_of_item (ml, md2, &ex) == 1 );
-    catch ();
+    assert( libvlc_media_list_count (ml) == 2 );
+    assert( libvlc_media_list_index_of_item (ml, md1) == 0 );
+    assert( libvlc_media_list_index_of_item (ml, md2) == 1 );
 
     libvlc_media_list_remove_index (ml, 0, &ex);  /* removing first item */
     catch ();
 
     /* test if second item was moved on first place */
-    assert( libvlc_media_list_index_of_item (ml, md2, &ex) == 0 );
-    catch ();
-
+    assert( libvlc_media_list_index_of_item (ml, md2) == 0 );
     libvlc_media_list_add_media (ml, md1, &ex); /* add 2 items */
     catch ();
     libvlc_media_list_add_media (ml, md1, &ex);
     catch ();
 
     /* there should be 3 pieces */
-    assert( libvlc_media_list_count (ml, &ex) == 3 );
-    catch ();
+    assert( libvlc_media_list_count (ml) == 3 );
 
     libvlc_media_list_insert_media (ml, md3, 2, &ex);
     catch ();
 
     /* there should be 4 pieces */
-    assert( libvlc_media_list_count (ml, &ex) == 4 );
-    catch ();
+    assert( libvlc_media_list_count (ml) == 4 );
 
     /* test inserting on right place */
-    assert( libvlc_media_list_index_of_item (ml, md3, &ex) == 2 );
-    catch ();
+    assert( libvlc_media_list_index_of_item (ml, md3) == 2 );
 
     /* test right returning descriptor*/
     assert ( libvlc_media_list_item_at_index (ml, 0, &ex) == md2 );
@@ -120,7 +110,7 @@ static void test_media_list (const char ** argv, int argc)
 
     /* try to find non inserted item */
     int i_non_exist = 0;
-    i_non_exist = libvlc_media_list_index_of_item (ml, md4, &ex);
+    i_non_exist = libvlc_media_list_index_of_item (ml, md4);
     assert ( i_non_exist == -1 );
 
     libvlc_media_release (md1);