[vlc-commits] audioscrobbler: simplify pl_Get() usage

Rémi Denis-Courmont git at videolan.org
Sun Jan 5 17:47:17 CET 2014


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

audioscrobbler: simplify pl_Get() usage

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

 modules/misc/audioscrobbler.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules/misc/audioscrobbler.c b/modules/misc/audioscrobbler.c
index c5fde84..67c1941 100644
--- a/modules/misc/audioscrobbler.c
+++ b/modules/misc/audioscrobbler.c
@@ -432,17 +432,15 @@ static int Open(vlc_object_t *p_this)
  *****************************************************************************/
 static void Close(vlc_object_t *p_this)
 {
-    playlist_t                  *p_playlist = pl_Get(p_this);
-    input_thread_t              *p_input;
     intf_thread_t               *p_intf = (intf_thread_t*) p_this;
     intf_sys_t                  *p_sys  = p_intf->p_sys;
 
-    var_DelCallback(p_playlist, "activity", ItemChange, p_intf);
+    var_DelCallback(pl_Get(p_intf), "activity", ItemChange, p_intf);
 
     vlc_cancel(p_sys->thread);
     vlc_join(p_sys->thread, NULL);
 
-    p_input = playlist_CurrentInput(p_playlist);
+    input_thread_t *p_input = pl_CurrentInput(p_intf);
     if (p_input)
     {
         if (p_sys->b_state_cb)



More information about the vlc-commits mailing list