Commit 57cd8822 authored by Rémi Duraffort's avatar Rémi Duraffort

rc: remove one vlc_object_find.

parent 81cbd185
...@@ -984,36 +984,32 @@ static int StateChanged( vlc_object_t *p_this, char const *psz_cmd, ...@@ -984,36 +984,32 @@ static int StateChanged( vlc_object_t *p_this, char const *psz_cmd,
VLC_UNUSED(p_this); VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); VLC_UNUSED(p_this); VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval);
intf_thread_t *p_intf = (intf_thread_t*)p_data; intf_thread_t *p_intf = (intf_thread_t*)p_data;
playlist_t *p_playlist = NULL; playlist_t *p_playlist = NULL;
input_thread_t *p_input = NULL; char cmd[6];
vlc_mutex_lock( &p_intf->p_sys->status_lock ); vlc_mutex_lock( &p_intf->p_sys->status_lock );
p_input = vlc_object_find( p_intf, VLC_OBJECT_INPUT, FIND_ANYWHERE ); p_playlist = pl_Hold( p_intf );
if( p_input ) PL_LOCK;
{ int i_status = playlist_Status( p_playlist );
char cmd[6]; PL_UNLOCK;
p_playlist = pl_Hold( p_input ); pl_Release( p_intf );
playlist_Lock( p_playlist );
switch( playlist_Status( p_playlist ) ) switch( i_status )
{ {
case PLAYLIST_STOPPED: case PLAYLIST_STOPPED:
strcpy( cmd, "stop" ); strcpy( cmd, "stop" );
break; break;
case PLAYLIST_RUNNING: case PLAYLIST_RUNNING:
strcpy( cmd, "play" ); strcpy( cmd, "play" );
break; break;
case PLAYLIST_PAUSED: case PLAYLIST_PAUSED:
strcpy( cmd, "pause" ); strcpy( cmd, "pause" );
break; break;
default: default:
cmd[0] = '\0'; cmd[0] = '\0';
} /* var_GetInteger( p_input, "state" ) */ } /* var_GetInteger( p_input, "state" ) */
playlist_Unlock( p_playlist ); msg_rc( STATUS_CHANGE "( %s state: %d ): %s", cmd, newval.i_int,
msg_rc( STATUS_CHANGE "( %s state: %d ): %s", ppsz_input_state[ newval.i_int ] );
cmd, newval.i_int,
ppsz_input_state[ newval.i_int ] );
vlc_object_release( p_playlist );
vlc_object_release( p_input );
}
vlc_mutex_unlock( &p_intf->p_sys->status_lock ); vlc_mutex_unlock( &p_intf->p_sys->status_lock );
return VLC_SUCCESS; return VLC_SUCCESS;
} }
......
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