Changeset 966feba166c6a6abe77fc2660da9da4549b4d104

Timestamp:

06/14/08 15:03:15 (3 months ago)

Author:

Pierre d'Herbemont <pdherbemont@videolan.org>

git-committer:

Pierre d'Herbemont <pdherbemont@videolan.org> 1213448595 +0200

git-parent:

[c75d563f2fb190ba3cbd8ff7137c01cf05f0d84d]

git-author:

Pierre d'Herbemont <pdherbemont@videolan.org> 1213448595 +0200

Message:

playlist: Use a set/release accessor for playlist->p_input.

(To better track when to attach/detach events).

Files:

• src/playlist/control.c (modified) (1 diff)
• src/playlist/engine.c (modified) (4 diffs)
• src/playlist/playlist_internal.h (modified) (2 diffs)

src/playlist/control.c

@@ -477 +477 @@
-    var_SetInteger( p_playlist, "activity", i_activity +
-                    DEFAULT_INPUT_ACTIVITY );
-
+
+
-        input_CreateThreadExtended( p_playlist, p_input, NULL, *pp_sout );
+    playlist_set_current_input( p_playlist, p_input_thread );
+    vlc_object_release( p_input_thread );
+
-    *pp_sout = NULL;
-

src/playlist/engine.c

@@ -40 +40 @@
-static void VariablesInit( playlist_t *p_playlist );
-static void playlist_Destructor( vlc_object_t * p_this );
+static void playlist_Destructor( vlc_object_t * p_this );
-
-static int RandomCallback( vlc_object_t *p_this, char const *psz_cmd,
@@ -245 +246 @@
-
-            p_input = p_playlist->p_input;
-
+
-            assert( *pp_sout == NULL );
-            if( var_CreateGetBool( p_input, "sout-keep" ) )
-                *pp_sout = input_DetachSout( p_input );
-
-            /* Release the playlist lock, because we may get stuck
-             * in vlc_object_release() for some time. */
-            PL_UNLOCK;
-
-            /* Destroy input */
-
-
-
+
-
-            p_playlist->gc_date = mdate();
@@ -276 +271 @@
-            var_SetInteger( p_playlist, "activity", i_activity -
-                            DEFAULT_INPUT_ACTIVITY );
+
-            goto check_input;
-        }
@@ -379 +375 @@
-        if( p_playlist->p_input->b_dead )
-        {
-
-
-
-
-
-
+
+
-
-            /* sout-keep: no need to anything here.
-             * The last input will destroy its sout, if any, by itself */
-
-
-
+
-            continue;
-        }

src/playlist/playlist_internal.h

@@ -36 +36 @@
-
-#include "input/input_internal.h"
+#include <assert.h>
-
-struct playlist_preparse_t
@@ -110 +111 @@
-int playlist_ItemDelete ( playlist_item_t * );
-
+static inline void playlist_release_current_input( playlist_t * p_playlist )
+{
+    vlc_assert_locked( &p_playlist->object_lock );
+
+    if( !p_playlist->p_input ) return;
+
+    input_thread_t * p_input = p_playlist->p_input;
+    p_playlist->p_input = NULL;
+
+    /* Release the playlist lock, because we may get stuck
+     * in vlc_object_release() for some time. */
+    PL_UNLOCK;
+    vlc_object_release( p_input );
+    PL_LOCK;
+}
+
+static inline void playlist_set_current_input(
+    playlist_t * p_playlist, input_thread_t * p_input )
+{
+    vlc_assert_locked( &p_playlist->object_lock );
+
+    playlist_release_current_input( p_playlist );
+
+    if( p_input )
+    {
+        vlc_object_yield( p_input );
+        p_playlist->p_input = p_input;
+    }
+}
+
+
-/**
- * @}