Changeset def34b917dc0694ae650f3962662e79e63f22924

Timestamp:

06/14/08 15:11:41 (3 months ago)

Author:

Pierre d'Herbemont <pdherbemont@videolan.org>

git-committer:

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

git-parent:

[966feba166c6a6abe77fc2660da9da4549b4d104]

git-author:

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

Message:

playlist: de-inline p_input setters.

Files:

• src/playlist/engine.c (modified) (1 diff)
• src/playlist/playlist_internal.h (modified) (1 diff)

src/playlist/engine.c

@@ -203 +203 @@
-    vlc_mutex_unlock( &p_playlist->gc_lock );
-}
+
+/* Internals */
+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;
+}
+
+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;
+    }
+}
+
+/**
+ * @}
+ */
-
-/**

src/playlist/playlist_internal.h

@@ -111 +111 @@
-int playlist_ItemDelete ( playlist_item_t * );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-/**