Skip to content

V
vlc-2-2
Commit 8e032ed8 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

audioscrobbler: simplify pl_Get() usage

parent c1677c69
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
modules/misc/audioscrobbler.c
View file @ 8e032ed8
...@@ -432,17 +432,15 @@ static int Open(vlc_object_t *p_this) ...@@ -432,17 +432,15 @@ static int Open(vlc_object_t *p_this)
*****************************************************************************/ *****************************************************************************/
static void Close(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_thread_t *p_intf = (intf_thread_t*) p_this;
intf_sys_t *p_sys = p_intf->p_sys; 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_cancel(p_sys->thread);
vlc_join(p_sys->thread, NULL); 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_input)
{ {
if (p_sys->b_state_cb) if (p_sys->b_state_cb)
......
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