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

HTTP interface: get rid of vlc_object_find

parent 1cdcdc95
...@@ -230,9 +230,8 @@ static void MacroDo( httpd_file_sys_t *p_args, ...@@ -230,9 +230,8 @@ static void MacroDo( httpd_file_sys_t *p_args,
if( p_sys->p_input ) if( p_sys->p_input )
{ {
vout_thread_t *p_vout; vout_thread_t *p_vout;
p_vout = vlc_object_find( p_sys->p_input,
VLC_OBJECT_VOUT, FIND_CHILD );
p_vout = input_GetVout( p_sys->p_input );
if( p_vout ) if( p_vout )
{ {
p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE; p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE;
......
...@@ -36,7 +36,6 @@ static vlc_object_t *GetVLCObject( intf_thread_t *p_intf, ...@@ -36,7 +36,6 @@ static vlc_object_t *GetVLCObject( intf_thread_t *p_intf,
bool *pb_need_release ) bool *pb_need_release )
{ {
intf_sys_t *p_sys = p_intf->p_sys; intf_sys_t *p_sys = p_intf->p_sys;
int i_object_type = 0;
vlc_object_t *p_object = NULL; vlc_object_t *p_object = NULL;
*pb_need_release = false; *pb_need_release = false;
...@@ -48,18 +47,17 @@ static vlc_object_t *GetVLCObject( intf_thread_t *p_intf, ...@@ -48,18 +47,17 @@ static vlc_object_t *GetVLCObject( intf_thread_t *p_intf,
p_object = VLC_OBJECT(p_sys->p_playlist); p_object = VLC_OBJECT(p_sys->p_playlist);
else if( !strcmp( psz_object, "VLC_OBJECT_INPUT" ) ) else if( !strcmp( psz_object, "VLC_OBJECT_INPUT" ) )
p_object = VLC_OBJECT(p_sys->p_input); p_object = VLC_OBJECT(p_sys->p_input);
else if( !strcmp( psz_object, "VLC_OBJECT_VOUT" ) ) else if( p_sys->p_input )
i_object_type = VLC_OBJECT_VOUT;
else if( !strcmp( psz_object, "VLC_OBJECT_AOUT" ) )
i_object_type = VLC_OBJECT_AOUT;
else
msg_Warn( p_intf, "unknown object type (%s)", psz_object );
if( p_object == NULL && i_object_type )
{ {
if( !strcmp( psz_object, "VLC_OBJECT_VOUT" ) )
p_object = VLC_OBJECT( input_GetVout( p_sys->p_input ) );
else if( !strcmp( psz_object, "VLC_OBJECT_AOUT" ) )
p_object = VLC_OBJECT( input_GetAout( p_sys->p_input ) );
if( p_object )
*pb_need_release = true; *pb_need_release = true;
p_object = vlc_object_find( p_intf, i_object_type, FIND_ANYWHERE );
} }
else
msg_Warn( p_intf, "unknown object type (%s)", psz_object );
return p_object; return p_object;
} }
...@@ -1123,10 +1121,7 @@ void EvaluateRPN( intf_thread_t *p_intf, mvar_t *vars, ...@@ -1123,10 +1121,7 @@ void EvaluateRPN( intf_thread_t *p_intf, mvar_t *vars,
{ {
if( p_sys->p_input ) if( p_sys->p_input )
{ {
vout_thread_t *p_vout; vout_thread_t *p_vout = input_GetVout( p_sys->p_input );
p_vout = vlc_object_find( p_sys->p_input,
VLC_OBJECT_VOUT, FIND_CHILD );
if( p_vout ) if( p_vout )
{ {
vout_Control( p_vout, VOUT_SNAPSHOT ); vout_Control( p_vout, VOUT_SNAPSHOT );
......
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