[vlc-commits] src: simplify and inline pl_Get()

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Jan  5 18:38:12 2014 +0200| [b381bf8f8291110314b5c1fc0d04d89e3cd042d3] | committer: Rémi Denis-Courmont

src: simplify and inline pl_Get()

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b381bf8f8291110314b5c1fc0d04d89e3cd042d3
---

 include/vlc_interface.h   |   11 +++++++++++
 include/vlc_playlist.h    |    9 ---------
 modules/lua/extension.c   |    4 +++-
 src/interface/interface.c |    8 --------
 src/libvlccore.sym        |    1 -
 5 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/include/vlc_interface.h b/include/vlc_interface.h
index 8799e47..d016d0a 100644
--- a/include/vlc_interface.h
+++ b/include/vlc_interface.h
@@ -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.
diff --git a/include/vlc_playlist.h b/include/vlc_playlist.h
index e32fdaa..49dcd15 100644
--- a/include/vlc_playlist.h
+++ b/include/vlc_playlist.h
@@ -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 )
 {
diff --git a/modules/lua/extension.c b/modules/lua/extension.c
index 6913fa1..439083a 100644
--- a/modules/lua/extension.c
+++ b/modules/lua/extension.c
@@ -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 );
diff --git a/src/interface/interface.c b/src/interface/interface.c
index e044021..b68c9cf 100644
--- a/src/interface/interface.c
+++ b/src/interface/interface.c
@@ -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
diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index 14e26e3..3fc39d7 100644
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -350,7 +350,6 @@ playlist_VolumeSet
 playlist_VolumeUp
 playlist_MuteSet
 playlist_MuteGet
-pl_Get
 resolve_xml_special_chars
 sdp_AddAttribute
 sdp_AddMedia