Skip to content

V
vlc-2-2
Commit ac14ce27 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman
Browse files
Options

macosx intf: switch a vlc_object_find to input_GetAout

parent 77347b41
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
modules/gui/macosx/intf.m
View file @ ac14ce27
...@@ -1768,8 +1768,7 @@ end: ...@@ -1768,8 +1768,7 @@ end:
if( [o_mi_videotrack isEnabled] == YES ) if( [o_mi_videotrack isEnabled] == YES )
[o_mi_subtitle setEnabled: YES]; [o_mi_subtitle setEnabled: YES];
aout_instance_t * p_aout = vlc_object_find( p_intf, VLC_OBJECT_AOUT, aout_instance_t * p_aout = input_GetAout( p_input );
FIND_ANYWHERE );
if( p_aout != NULL ) if( p_aout != NULL )
{ {
[o_controls setupVarMenuItem: o_mi_channels target: (vlc_object_t *)p_aout [o_controls setupVarMenuItem: o_mi_channels target: (vlc_object_t *)p_aout
...@@ -1783,8 +1782,7 @@ end: ...@@ -1783,8 +1782,7 @@ end:
vlc_object_release( (vlc_object_t *)p_aout ); vlc_object_release( (vlc_object_t *)p_aout );
} }
vout_thread_t * p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT, vout_thread_t * p_vout = input_GetVout( p_input );
FIND_ANYWHERE );
if( p_vout != NULL ) if( p_vout != NULL )
{ {
...@@ -1802,6 +1800,8 @@ end: ...@@ -1802,6 +1800,8 @@ end:
[o_controls setupVarMenuItem: o_mi_deinterlace target: (vlc_object_t *)p_vout [o_controls setupVarMenuItem: o_mi_deinterlace target: (vlc_object_t *)p_vout
var: "deinterlace" selector: @selector(toggleVar:)]; var: "deinterlace" selector: @selector(toggleVar:)];
#if 0
/* FIXME Post processing. */
p_dec_obj = (vlc_object_t *)vlc_object_find( p_dec_obj = (vlc_object_t *)vlc_object_find(
(vlc_object_t *)p_vout, (vlc_object_t *)p_vout,
VLC_OBJECT_DECODER, VLC_OBJECT_DECODER,
...@@ -1814,6 +1814,7 @@ end: ...@@ -1814,6 +1814,7 @@ end:
vlc_object_release(p_dec_obj); vlc_object_release(p_dec_obj);
} }
#endif
vlc_object_release( (vlc_object_t *)p_vout ); vlc_object_release( (vlc_object_t *)p_vout );
} }
vlc_object_release( p_input ); vlc_object_release( p_input );
......
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