Commit d90d8b7d authored by Pierre d'Herbemont's avatar Pierre d'Herbemont

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

parent b94083f5
...@@ -294,6 +294,10 @@ VLC_EXPORT( void, __pl_Release, ( vlc_object_t * ) ); ...@@ -294,6 +294,10 @@ VLC_EXPORT( void, __pl_Release, ( vlc_object_t * ) );
*/ */
VLC_EXPORT( int, playlist_Control, ( playlist_t *p_playlist, int i_query, bool b_locked, ... ) ); 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 /** Clear the playlist
* \param b_locked TRUE if playlist is locked when entering this function * \param b_locked TRUE if playlist is locked when entering this function
*/ */
...@@ -411,6 +415,7 @@ static inline int playlist_Import( playlist_t *p_playlist, const char *psz_file) ...@@ -411,6 +415,7 @@ static inline int playlist_Import( playlist_t *p_playlist, const char *psz_file)
return VLC_SUCCESS; return VLC_SUCCESS;
} }
/** Tell if the playlist is currently running */ /** Tell if the playlist is currently running */
#define playlist_IsPlaying( pl ) ( pl->status.i_status == PLAYLIST_RUNNING ) #define playlist_IsPlaying( pl ) ( pl->status.i_status == PLAYLIST_RUNNING )
......
...@@ -244,6 +244,7 @@ playlist_BothAddInput ...@@ -244,6 +244,7 @@ playlist_BothAddInput
playlist_ChildSearchName playlist_ChildSearchName
playlist_Clear playlist_Clear
playlist_Control playlist_Control
playlist_CurrentInput
playlist_DeleteFromInput playlist_DeleteFromInput
playlist_DeleteInputInParent playlist_DeleteInputInParent
playlist_Export playlist_Export
......
...@@ -258,6 +258,18 @@ void playlist_set_current_input( ...@@ -258,6 +258,18 @@ void playlist_set_current_input(
} }
} }
/** 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;
}
/** /**
* @} * @}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment