Commit b381bf8f authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

src: simplify and inline pl_Get()

parent a87ad3c7
......@@ -94,6 +94,17 @@ VLC_API int intf_Create( playlist_t *, const char * );
VLC_API void libvlc_Quit( libvlc_int_t * );
static inline playlist_t *pl_Get( struct intf_thread_t *intf )
{
return (playlist_t *)(intf->p_parent);
}
/**
* Retrieves the current input thread from the playlist.
* @note The returned object must be released with vlc_object_release().
*/
#define pl_CurrentInput(intf) (playlist_CurrentInput(pl_Get(intf)))
/**
* \defgroup vlc_subscription Log messages subscription
* These functions deal with log messages.
......
......@@ -253,9 +253,6 @@ enum pl_locked_state
#define PL_UNLOCK playlist_Unlock( p_playlist )
#define PL_ASSERT_LOCKED playlist_AssertLocked( p_playlist )
VLC_API playlist_t * pl_Get( vlc_object_t * );
#define pl_Get( a ) pl_Get( VLC_OBJECT(a) )
/* Playlist control */
#define playlist_Play(p) playlist_Control(p,PLAYLIST_PLAY, pl_Unlocked )
#define playlist_Pause(p) playlist_Control(p,PLAYLIST_PAUSE, pl_Unlocked )
......@@ -393,12 +390,6 @@ VLC_API void playlist_EnableAudioFilter( playlist_t *, const char *, bool );
/***********************************************************************
* Inline functions
***********************************************************************/
/** Small helper tp get current playing input or NULL. Release the input after use. */
static inline input_thread_t *pl_CurrentInput( struct intf_thread_t *intf )
{
return playlist_CurrentInput( pl_Get( (vlc_object_t *)intf ) );
}
/** Tell if the playlist is empty */
static inline bool playlist_IsEmpty( playlist_t *p_playlist )
{
......
......@@ -36,6 +36,7 @@
#include <vlc_common.h>
#include <vlc_input.h>
#include <vlc_interface.h>
#include <vlc_events.h>
#include <vlc_dialog.h>
......@@ -808,7 +809,8 @@ static lua_State* GetLuaState( extensions_manager_t *p_mgr,
return NULL;
}
vlclua_set_this( L, p_mgr );
vlclua_set_playlist_internal( L, pl_Get(p_mgr) );
vlclua_set_playlist_internal( L,
pl_Get((intf_thread_t *)(p_mgr->p_parent)) );
vlclua_extension_set( L, p_ext );
luaL_openlibs( L );
......
......@@ -155,14 +155,6 @@ static playlist_t *intf_GetPlaylist(libvlc_int_t *libvlc)
return playlist;
}
playlist_t *(pl_Get)(vlc_object_t *obj)
{
playlist_t *pl = intf_GetPlaylist(obj->p_libvlc);
if (unlikely(pl == NULL))
abort();
return pl;
}
/**
* Inserts an item in the playlist used by interfaces.
* @note This function may <b>not</b> be called at the same time as
......
......@@ -350,7 +350,6 @@ playlist_VolumeSet
playlist_VolumeUp
playlist_MuteSet
playlist_MuteGet
pl_Get
resolve_xml_special_chars
sdp_AddAttribute
sdp_AddMedia
......
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