Changeset d90d8b7da24381831dcf067618836e4cb4a5bb05

Timestamp:

07/05/08 15:50:01 (2 months ago)

Author:

Pierre d'Herbemont <pdherbemont@videolan.org>

git-committer:

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

git-parent:

[b94083f55404f83a91bba60913e4db6c3e32f9c0]

git-author:

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

Message:

playlist: Define playlist_CurrentInput(), that returns current playing input.

Files:

• include/vlc_playlist.h (modified) (2 diffs)
• src/libvlccore.sym (modified) (1 diff)
• src/playlist/engine.c (modified) (1 diff)

include/vlc_playlist.h

@@ -295 +295 @@
-VLC_EXPORT( int, playlist_Control, ( playlist_t *p_playlist, int i_query, bool b_locked, ...  ) );
-
+/** Get current playing input. The object is retained.
+ */
+VLC_EXPORT( input_thread_t *, playlist_CurrentInput, ( playlist_t *p_playlist ) );
+
-/** Clear the playlist
- * \param b_locked TRUE if playlist is locked when entering this function
@@ -412 +416 @@
-}
-
+
-/** Tell if the playlist is currently running */
-#define playlist_IsPlaying( pl ) ( pl->status.i_status == PLAYLIST_RUNNING )

src/libvlccore.sym

@@ -245 +245 @@
-playlist_Clear
-playlist_Control
+playlist_CurrentInput
-playlist_DeleteFromInput
-playlist_DeleteInputInParent

src/playlist/engine.c

@@ -257 +257 @@
-                          input_selected_stream_changed, p_playlist );
-    }
+}
+
+/** Get current playing input.
+ */
+input_thread_t * playlist_CurrentInput( playlist_t * p_playlist )
+{
+    input_thread_t * p_input;
+    PL_LOCK;
+    p_input = p_playlist->p_input;
+    if( p_input ) vlc_object_yield( p_input );
+    PL_UNLOCK;
+    return p_input;
-}
-