Use var_Inherit* instead of var_CreateGet*.

[vlc] / src / control / media_list_player.c

diff --git a/src/control/media_list_player.c b/src/control/media_list_player.c
index 22c5b2b8367b02122569bca25997b1ac90b0a4ca..a6d509869119c9eb33c94a04ca67d8ece623fa5d 100644 (file)
--- a/src/control/media_list_player.c
+++ b/src/control/media_list_player.c
@@ -80,11 +80,10 @@ static inline void vlc_assert_locked(vlc_mutex_t *mutex)
  * Forward declaration
  */
 
-static void set_relative_playlist_position_and_play(
-                                            libvlc_media_list_player_t * p_mlp,
-                                            int i_relative_position,
-                                            libvlc_exception_t * p_e);
-static void stop(libvlc_media_list_player_t * p_mlp, libvlc_exception_t * p_e);
+static
+int set_relative_playlist_position_and_play(libvlc_media_list_player_t *p_mlp,
+                                            int i_relative_position);
+static void stop(libvlc_media_list_player_t * p_mlp);
 
 /*
  * Private functions
@@ -116,13 +115,13 @@ 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)
 {
     assert_locked(p_mlp);
-    return libvlc_media_player_event_manager(p_mlp->p_mi, NULL);
+    return libvlc_media_player_event_manager(p_mlp->p_mi);
 }
 
 /**************************************************************************
@@ -144,7 +143,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 +171,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 +217,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 +251,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 +284,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;
@@ -328,16 +327,11 @@ media_player_reached_end(const libvlc_event_t * p_event, void * p_user_data)
 {
     VLC_UNUSED(p_event);
     libvlc_media_list_player_t * p_mlp = p_user_data;
-    libvlc_exception_t e;
-    libvlc_exception_init(&e);
 
     vlc_mutex_lock(&p_mlp->mp_callback_lock);
     if (!p_mlp->are_mp_callback_cancelled)
-        set_relative_playlist_position_and_play(p_mlp, 1, &e);
+        set_relative_playlist_position_and_play(p_mlp, 1);
     vlc_mutex_unlock(&p_mlp->mp_callback_lock);
-
-    // There is no point in reporting an error from this callback
-    libvlc_exception_clear(&e);
 }
 
 /**************************************************************************
@@ -347,6 +341,7 @@ static void
 mlist_item_deleted(const libvlc_event_t * p_event, void * p_user_data)
 {
     // Nothing to do. For now.
+    (void)p_event; (void)p_user_data;
 }
 
 
@@ -357,7 +352,7 @@ static void
 install_playlist_observer(libvlc_media_list_player_t * p_mlp)
 {
     assert_locked(p_mlp);
-    libvlc_event_attach(mlist_em(p_mlp), libvlc_MediaListItemDeleted, mlist_item_deleted, p_mlp, NULL);
+    libvlc_event_attach(mlist_em(p_mlp), libvlc_MediaListItemDeleted, mlist_item_deleted, p_mlp);
 }
 
 /**************************************************************************
@@ -368,7 +363,7 @@ uninstall_playlist_observer(libvlc_media_list_player_t * p_mlp)
 {
     assert_locked(p_mlp);
     if (!p_mlp->p_mlist) return;
-    libvlc_event_detach(mlist_em(p_mlp), libvlc_MediaListItemDeleted, mlist_item_deleted, p_mlp, NULL);
+    libvlc_event_detach(mlist_em(p_mlp), libvlc_MediaListItemDeleted, mlist_item_deleted, p_mlp);
 }
 
 /**************************************************************************
@@ -378,7 +373,7 @@ static void
 install_media_player_observer(libvlc_media_list_player_t * p_mlp)
 {
     assert_locked(p_mlp);
-    libvlc_event_attach_async(mplayer_em(p_mlp), libvlc_MediaPlayerEndReached, media_player_reached_end, p_mlp, NULL);
+    libvlc_event_attach_async(mplayer_em(p_mlp), libvlc_MediaPlayerEndReached, media_player_reached_end, p_mlp);
 }
 
 
@@ -397,7 +392,7 @@ uninstall_media_player_observer(libvlc_media_list_player_t * p_mlp)
     // Allow callbacks to run, because detach() will wait until all callbacks are processed.
     // This is safe because only callbacks are allowed, and there execution will be cancelled.
     vlc_mutex_unlock(&p_mlp->mp_callback_lock);
-    libvlc_event_detach(mplayer_em(p_mlp), libvlc_MediaPlayerEndReached, media_player_reached_end, p_mlp, NULL);
+    libvlc_event_detach(mplayer_em(p_mlp), libvlc_MediaPlayerEndReached, media_player_reached_end, p_mlp);
 
     // Now, lock back the callback lock. No more callback will be present from this point.
     vlc_mutex_lock(&p_mlp->mp_callback_lock);
@@ -437,9 +432,9 @@ set_current_playing_item(libvlc_media_list_player_t * p_mlp, libvlc_media_list_p
 
     /* Create a new media_player if there is none */
     if (!p_mlp->p_mi)
-        p_mlp->p_mi = libvlc_media_player_new_from_media(p_md, NULL);
+        p_mlp->p_mi = libvlc_media_player_new_from_media(p_md);
 
-    libvlc_media_player_set_media(p_mlp->p_mi, p_md, NULL);
+    libvlc_media_player_set_media(p_mlp->p_mi, p_md);
 
     install_media_player_observer(p_mlp);
     libvlc_media_release(p_md); /* for libvlc_media_list_item_at_index */
@@ -453,21 +448,29 @@ set_current_playing_item(libvlc_media_list_player_t * p_mlp, libvlc_media_list_p
  *         new (Public)
  **************************************************************************/
 libvlc_media_list_player_t *
-libvlc_media_list_player_new(libvlc_instance_t * p_instance, libvlc_exception_t * p_e)
+libvlc_media_list_player_new(libvlc_instance_t * p_instance)
 {
-    (void)p_e;
     libvlc_media_list_player_t * p_mlp;
     p_mlp = calloc( 1, sizeof(libvlc_media_list_player_t) );
-    if (!p_mlp)
+    if (unlikely(p_mlp == NULL))
+    {
+        libvlc_printerr("Not enough memory");
         return NULL;
+    }
+
+    p_mlp->p_event_manager = libvlc_event_manager_new(p_mlp, p_instance);
+    if (unlikely(p_mlp->p_event_manager == NULL))
+    {
+        free (p_mlp);
+        return NULL;
+    }
 
     libvlc_retain(p_instance);
     p_mlp->p_libvlc_instance = p_instance;
     p_mlp->i_refcount = 1;
     vlc_mutex_init(&p_mlp->object_lock);
     vlc_mutex_init(&p_mlp->mp_callback_lock);
-    p_mlp->p_event_manager = libvlc_event_manager_new(p_mlp, p_instance, p_e);
-    libvlc_event_manager_register_event_type(p_mlp->p_event_manager, libvlc_MediaListPlayerNextItemSet, p_e);
+    libvlc_event_manager_register_event_type(p_mlp->p_event_manager, libvlc_MediaListPlayerNextItemSet);
     p_mlp->e_playback_mode = libvlc_playback_mode_default;
 
     return p_mlp;
@@ -528,10 +531,8 @@ libvlc_media_list_player_event_manager(libvlc_media_list_player_t * p_mlp)
 /**************************************************************************
  *        set_media_player (Public)
  **************************************************************************/
-void libvlc_media_list_player_set_media_player(libvlc_media_list_player_t * p_mlp, libvlc_media_player_t * p_mi, libvlc_exception_t * p_e)
+void libvlc_media_list_player_set_media_player(libvlc_media_list_player_t * p_mlp, libvlc_media_player_t * p_mi)
 {
-    VLC_UNUSED(p_e);
-
     lock(p_mlp);
 
     if (p_mlp->p_mi)
@@ -550,9 +551,8 @@ void libvlc_media_list_player_set_media_player(libvlc_media_list_player_t * p_ml
 /**************************************************************************
  *       set_media_list (Public)
  **************************************************************************/
-void libvlc_media_list_player_set_media_list(libvlc_media_list_player_t * p_mlp, libvlc_media_list_t * p_mlist, libvlc_exception_t * p_e)
+void libvlc_media_list_player_set_media_list(libvlc_media_list_player_t * p_mlp, libvlc_media_list_t * p_mlist)
 {
-    VLC_UNUSED( p_e );
     assert (p_mlist);
 
     lock(p_mlp);
@@ -572,16 +572,16 @@ void libvlc_media_list_player_set_media_list(libvlc_media_list_player_t * p_mlp,
 /**************************************************************************
  *        Play (Public)
  **************************************************************************/
-void libvlc_media_list_player_play(libvlc_media_list_player_t * p_mlp, libvlc_exception_t * p_e)
+void libvlc_media_list_player_play(libvlc_media_list_player_t * p_mlp)
 {
     lock(p_mlp);
     if (!p_mlp->current_playing_item_path)
     {
-        set_relative_playlist_position_and_play(p_mlp, 1, p_e);
+        set_relative_playlist_position_and_play(p_mlp, 1);
         unlock(p_mlp);
         return; /* Will set to play */
     }
-    libvlc_media_player_play(p_mlp->p_mi, p_e);
+    libvlc_media_player_play(p_mlp->p_mi);
     unlock(p_mlp);
 }
 
@@ -589,7 +589,7 @@ void libvlc_media_list_player_play(libvlc_media_list_player_t * p_mlp, libvlc_ex
 /**************************************************************************
  *        Pause (Public)
  **************************************************************************/
-void libvlc_media_list_player_pause(libvlc_media_list_player_t * p_mlp, libvlc_exception_t * p_e)
+void libvlc_media_list_player_pause(libvlc_media_list_player_t * p_mlp)
 {
     lock(p_mlp);
     if (!p_mlp->p_mi)
@@ -597,7 +597,7 @@ void libvlc_media_list_player_pause(libvlc_media_list_player_t * p_mlp, libvlc_e
         unlock(p_mlp);
         return;
     }
-    libvlc_media_player_pause(p_mlp->p_mi, p_e);
+    libvlc_media_player_pause(p_mlp->p_mi);
     unlock(p_mlp);
 }
 
@@ -605,9 +605,13 @@ void libvlc_media_list_player_pause(libvlc_media_list_player_t * p_mlp, libvlc_e
  *        is_playing (Public)
  **************************************************************************/
 int
-libvlc_media_list_player_is_playing(libvlc_media_list_player_t * p_mlp, libvlc_exception_t * p_e)
+libvlc_media_list_player_is_playing(libvlc_media_list_player_t * p_mlp)
 {
-    libvlc_state_t state = libvlc_media_player_get_state(p_mlp->p_mi, p_e);
+    if (!p_mlp->p_mi)
+    {
+        return libvlc_NothingSpecial;
+    }
+    libvlc_state_t state = libvlc_media_player_get_state(p_mlp->p_mi);
     return (state == libvlc_Opening) || (state == libvlc_Buffering) ||
            (state == libvlc_Playing);
 }
@@ -616,49 +620,48 @@ libvlc_media_list_player_is_playing(libvlc_media_list_player_t * p_mlp, libvlc_e
  *        State (Public)
  **************************************************************************/
 libvlc_state_t
-libvlc_media_list_player_get_state(libvlc_media_list_player_t * p_mlp, libvlc_exception_t * p_e)
+libvlc_media_list_player_get_state(libvlc_media_list_player_t * p_mlp)
 {
     if (!p_mlp->p_mi)
         return libvlc_Ended;
-    return libvlc_media_player_get_state(p_mlp->p_mi, p_e);
+    return libvlc_media_player_get_state(p_mlp->p_mi);
 }
 
 /**************************************************************************
  *        Play item at index (Public)
  **************************************************************************/
-void libvlc_media_list_player_play_item_at_index(libvlc_media_list_player_t * p_mlp, int i_index, libvlc_exception_t * p_e)
+int libvlc_media_list_player_play_item_at_index(libvlc_media_list_player_t * p_mlp, int i_index)
 {
-    VLC_UNUSED(p_e);
-
     lock(p_mlp);
     set_current_playing_item(p_mlp, libvlc_media_list_path_with_root_index(i_index));
-    libvlc_media_player_play(p_mlp->p_mi, p_e);
+    libvlc_media_player_play(p_mlp->p_mi);
     unlock(p_mlp);
 
     /* Send the next item event */
     libvlc_event_t event;
     event.type = libvlc_MediaListPlayerNextItemSet;
     libvlc_event_send(p_mlp->p_event_manager, &event);
+    return 0;
 }
 
 /**************************************************************************
  *        Play item (Public)
  **************************************************************************/
-void libvlc_media_list_player_play_item(libvlc_media_list_player_t * p_mlp, libvlc_media_t * p_md, libvlc_exception_t * p_e)
+int libvlc_media_list_player_play_item(libvlc_media_list_player_t * p_mlp, libvlc_media_t * p_md)
 {
     lock(p_mlp);
     libvlc_media_list_path_t path = libvlc_media_list_path_of_item(p_mlp->p_mlist, p_md);
     if (!path)
     {
-        libvlc_exception_raise(p_e);
         libvlc_printerr("Item not found in media list");
         unlock(p_mlp);
-        return;
+        return -1;
     }
 
     set_current_playing_item(p_mlp, path);
-    libvlc_media_player_play(p_mlp->p_mi, p_e);
+    libvlc_media_player_play(p_mlp->p_mi);
     unlock(p_mlp);
+    return 0;
 }
 
 /**************************************************************************
@@ -666,7 +669,7 @@ void libvlc_media_list_player_play_item(libvlc_media_list_player_t * p_mlp, libv
  *
  * Lock must be held.
  **************************************************************************/
-static void stop(libvlc_media_list_player_t * p_mlp, libvlc_exception_t * p_e)
+static void stop(libvlc_media_list_player_t * p_mlp)
 {
     assert_locked(p_mlp);
 
@@ -674,7 +677,7 @@ static void stop(libvlc_media_list_player_t * p_mlp, libvlc_exception_t * p_e)
     {
         /* We are not interested in getting media stop event now */
         uninstall_media_player_observer(p_mlp);
-        libvlc_media_player_stop(p_mlp->p_mi, p_e);
+        libvlc_media_player_stop(p_mlp->p_mi);
         install_media_player_observer(p_mlp);
     }
 
@@ -685,11 +688,10 @@ static void stop(libvlc_media_list_player_t * p_mlp, libvlc_exception_t * p_e)
 /**************************************************************************
  *       Stop (Public)
  **************************************************************************/
-void libvlc_media_list_player_stop(libvlc_media_list_player_t * p_mlp,
-                                   libvlc_exception_t * p_e)
+void libvlc_media_list_player_stop(libvlc_media_list_player_t * p_mlp)
 {
     lock(p_mlp);
-    stop(p_mlp, p_e);
+    stop(p_mlp);
     unlock(p_mlp);
 }
 
@@ -700,18 +702,16 @@ void libvlc_media_list_player_stop(libvlc_media_list_player_t * p_mlp,
  * (based on the currently playing item) and then begins the new item playback.
  * Lock must be held.
  **************************************************************************/
-static void set_relative_playlist_position_and_play(
+static int set_relative_playlist_position_and_play(
                                       libvlc_media_list_player_t * p_mlp,
-                                      int i_relative_position,
-                                      libvlc_exception_t * p_e)
+                                      int i_relative_position)
 {
     assert_locked(p_mlp);
 
     if (!p_mlp->p_mlist)
     {
-        libvlc_exception_raise(p_e);
         libvlc_printerr("No media list");
-        return;
+        return -1;
     }
 
     libvlc_media_list_lock(p_mlp->p_mlist);
@@ -756,10 +756,10 @@ static void set_relative_playlist_position_and_play(
     if (!path)
     {
         libvlc_media_list_unlock(p_mlp->p_mlist);
-        return;
+        return -1;
     }
 
-    libvlc_media_player_play(p_mlp->p_mi, p_e);
+    libvlc_media_player_play(p_mlp->p_mi);
 
     libvlc_media_list_unlock(p_mlp->p_mlist);
 
@@ -770,28 +770,29 @@ static void set_relative_playlist_position_and_play(
     event.u.media_list_player_next_item_set.item = p_md;
     libvlc_event_send(p_mlp->p_event_manager, &event);
     libvlc_media_release(p_md);
+    return 0;
 }
 
 /**************************************************************************
  *       Next (Public)
  **************************************************************************/
-void libvlc_media_list_player_next(libvlc_media_list_player_t * p_mlp,
-                                   libvlc_exception_t * p_e)
+int libvlc_media_list_player_next(libvlc_media_list_player_t * p_mlp)
 {
     lock(p_mlp);
-    set_relative_playlist_position_and_play(p_mlp, 1, p_e);
+    int failure = set_relative_playlist_position_and_play(p_mlp, 1);
     unlock(p_mlp);
+    return failure;
 }
 
 /**************************************************************************
  *       Previous (Public)
  **************************************************************************/
-void libvlc_media_list_player_previous(libvlc_media_list_player_t * p_mlp,
-                                       libvlc_exception_t * p_e)
+int libvlc_media_list_player_previous(libvlc_media_list_player_t * p_mlp)
 {
     lock(p_mlp);
-    set_relative_playlist_position_and_play(p_mlp, -1, p_e);
+    int failure = set_relative_playlist_position_and_play(p_mlp, -1);
     unlock(p_mlp);
+    return failure;
 }
 
 /**************************************************************************
@@ -799,11 +800,8 @@ void libvlc_media_list_player_previous(libvlc_media_list_player_t * p_mlp,
  **************************************************************************/
 void libvlc_media_list_player_set_playback_mode(
                                             libvlc_media_list_player_t * p_mlp,
-                                            libvlc_playback_mode_t e_mode,
-                                            libvlc_exception_t * p_e )
+                                            libvlc_playback_mode_t e_mode )
 {
-    VLC_UNUSED(p_e);
-
     lock(p_mlp);
     p_mlp->e_playback_mode = e_mode;
     unlock(p_mlp);