Skip to content

V
vlc-2-2
Commit c5132d35 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont
Browse files
Options

macosx: Get rid of vlc_object_find(playlist).

parent ee1ba2fd
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 16 deletions
modules/gui/macosx/equalizer.m
View file @ c5132d35
...@@ -53,8 +53,7 @@ static void ChangeFiltersString( intf_thread_t *p_intf, ...@@ -53,8 +53,7 @@ static void ChangeFiltersString( intf_thread_t *p_intf,
VLC_OBJECT_AOUT, FIND_ANYWHERE ); VLC_OBJECT_AOUT, FIND_ANYWHERE );
aout_instance_t *p_aout = (aout_instance_t *)p_object; aout_instance_t *p_aout = (aout_instance_t *)p_object;
if( p_object == NULL ) if( p_object == NULL )
p_object = vlc_object_find( p_intf, p_object = pl_Yield( p_intf );
VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
if( p_object == NULL ) if( p_object == NULL )
return; return;
...@@ -127,8 +126,7 @@ static bool GetFiltersStatus( intf_thread_t *p_intf, ...@@ -127,8 +126,7 @@ static bool GetFiltersStatus( intf_thread_t *p_intf,
vlc_object_t *p_object = vlc_object_find( p_intf, vlc_object_t *p_object = vlc_object_find( p_intf,
VLC_OBJECT_AOUT, FIND_ANYWHERE ); VLC_OBJECT_AOUT, FIND_ANYWHERE );
if( p_object == NULL ) if( p_object == NULL )
p_object = vlc_object_find( p_intf, p_object = pl_Yield( p_intf );
VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
if( p_object == NULL ) if( p_object == NULL )
return false; return false;
...@@ -186,8 +184,7 @@ static bool GetFiltersStatus( intf_thread_t *p_intf, ...@@ -186,8 +184,7 @@ static bool GetFiltersStatus( intf_thread_t *p_intf,
VLC_OBJECT_AOUT, FIND_ANYWHERE ); VLC_OBJECT_AOUT, FIND_ANYWHERE );
if( p_object == NULL ) if( p_object == NULL )
p_object = vlc_object_find( p_intf, p_object = pl_Yield( p_intf );
VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
if( p_object == NULL ) if( p_object == NULL )
return; return;
...@@ -249,8 +246,7 @@ static bool GetFiltersStatus( intf_thread_t *p_intf, ...@@ -249,8 +246,7 @@ static bool GetFiltersStatus( intf_thread_t *p_intf,
VLC_OBJECT_AOUT, FIND_ANYWHERE ); VLC_OBJECT_AOUT, FIND_ANYWHERE );
if( p_object == NULL ) if( p_object == NULL )
p_object = vlc_object_find( p_intf, p_object = pl_Yield( p_intf );
VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
if( p_object == NULL ) if( p_object == NULL )
return; return;
...@@ -292,8 +288,7 @@ static bool GetFiltersStatus( intf_thread_t *p_intf, ...@@ -292,8 +288,7 @@ static bool GetFiltersStatus( intf_thread_t *p_intf,
vlc_object_t *p_object= vlc_object_find( p_intf, vlc_object_t *p_object= vlc_object_find( p_intf,
VLC_OBJECT_AOUT, FIND_ANYWHERE ); VLC_OBJECT_AOUT, FIND_ANYWHERE );
if( p_object == NULL ) if( p_object == NULL )
p_object = vlc_object_find( p_intf, p_object = pl_Yield( p_intf );
VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
if( p_object == NULL ) if( p_object == NULL )
return; return;
...@@ -338,8 +333,7 @@ static bool GetFiltersStatus( intf_thread_t *p_intf, ...@@ -338,8 +333,7 @@ static bool GetFiltersStatus( intf_thread_t *p_intf,
vlc_object_t *p_object = vlc_object_find( p_intf, vlc_object_t *p_object = vlc_object_find( p_intf,
VLC_OBJECT_AOUT, FIND_ANYWHERE ); VLC_OBJECT_AOUT, FIND_ANYWHERE );
if( p_object == NULL ) if( p_object == NULL )
p_object = vlc_object_find( p_intf, p_object = pl_Yield( p_intf );
VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
if( p_object == NULL ) if( p_object == NULL )
return; return;
...@@ -379,8 +373,7 @@ static bool GetFiltersStatus( intf_thread_t *p_intf, ...@@ -379,8 +373,7 @@ static bool GetFiltersStatus( intf_thread_t *p_intf,
VLC_OBJECT_AOUT, FIND_ANYWHERE ); VLC_OBJECT_AOUT, FIND_ANYWHERE );
aout_instance_t *p_aout = (aout_instance_t *)p_object; aout_instance_t *p_aout = (aout_instance_t *)p_object;
if( p_object == NULL ) if( p_object == NULL )
p_object = vlc_object_find( p_intf, p_object = pl_Yield( p_intf );
VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
if( p_object == NULL ) if( p_object == NULL )
return; return;
...@@ -417,8 +410,7 @@ static bool GetFiltersStatus( intf_thread_t *p_intf, ...@@ -417,8 +410,7 @@ static bool GetFiltersStatus( intf_thread_t *p_intf,
vlc_object_t *p_object= vlc_object_find( VLCIntf, vlc_object_t *p_object= vlc_object_find( VLCIntf,
VLC_OBJECT_AOUT, FIND_ANYWHERE ); VLC_OBJECT_AOUT, FIND_ANYWHERE );
if( p_object == NULL ) if( p_object == NULL )
p_object = vlc_object_find( VLCIntf, p_object = pl_Yield( VLCIntf );
VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
[o_window setExcludedFromWindowsMenu: TRUE]; [o_window setExcludedFromWindowsMenu: TRUE];
......
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