macosx: fixed a few compilation warnings

[vlc] / modules / gui / macosx / equalizer.m

diff --git a/modules/gui/macosx/equalizer.m b/modules/gui/macosx/equalizer.m
index 02f1ba71902e9399987748adf4b98e6be0f8cc32..68d6e9d00ed972ced73f94894dd86db5bd584f0e 100644 (file)
--- a/modules/gui/macosx/equalizer.m
+++ b/modules/gui/macosx/equalizer.m
@@ -53,9 +53,7 @@ static void ChangeFiltersString( intf_thread_t *p_intf,
                                 VLC_OBJECT_AOUT, FIND_ANYWHERE );
     aout_instance_t *p_aout = (aout_instance_t *)p_object;
     if( p_object == NULL )
-        p_object = pl_Yield( p_intf );
-    if( p_object == NULL )
-        return;
+        p_object = (vlc_object_t *)pl_Yield( p_intf );
 
     psz_string = var_GetNonEmptyString( p_object, "audio-filter" );
 
@@ -126,9 +124,7 @@ static bool GetFiltersStatus( intf_thread_t *p_intf,
     vlc_object_t *p_object = vlc_object_find( p_intf,
                                 VLC_OBJECT_AOUT, FIND_ANYWHERE );
     if( p_object == NULL )
-        p_object = pl_Yield( p_intf );
-    if( p_object == NULL )
-        return false;
+        p_object = (vlc_object_t *)pl_Yield( p_intf );
 
     if( (BOOL)config_GetInt( p_intf, "macosx-eq-keep" ) == YES )
         psz_string = config_GetPsz( p_intf, "audio-filter" );
@@ -184,9 +180,7 @@ static bool GetFiltersStatus( intf_thread_t *p_intf,
                                               VLC_OBJECT_AOUT, FIND_ANYWHERE );
 
     if( p_object == NULL )
-        p_object = pl_Yield( p_intf );
-    if( p_object == NULL )
-        return;
+        p_object = (vlc_object_t *)pl_Yield( p_intf );
 
     var_Create( p_object, "equalizer-preamp", VLC_VAR_FLOAT |
                 VLC_VAR_DOINHERIT );
@@ -246,9 +240,7 @@ static bool GetFiltersStatus( intf_thread_t *p_intf,
                                               VLC_OBJECT_AOUT, FIND_ANYWHERE );
 
     if( p_object == NULL )
-        p_object = pl_Yield( p_intf );
-    if( p_object == NULL )
-        return;
+        p_object = (vlc_object_t *)pl_Yield( p_intf );
 
     char psz_values[102];
     memset( psz_values, 0, 102 );
@@ -288,9 +280,7 @@ static bool GetFiltersStatus( intf_thread_t *p_intf,
     vlc_object_t *p_object= vlc_object_find( p_intf,
                                              VLC_OBJECT_AOUT, FIND_ANYWHERE );
     if( p_object == NULL )
-        p_object = pl_Yield( p_intf );
-    if( p_object == NULL )
-        return;
+        p_object = (vlc_object_t *)pl_Yield( p_intf );
 
     char psz_values[102];
     memset( psz_values, 0, 102 );
@@ -333,9 +323,7 @@ static bool GetFiltersStatus( intf_thread_t *p_intf,
     vlc_object_t *p_object = vlc_object_find( p_intf,
                                               VLC_OBJECT_AOUT, FIND_ANYWHERE );
     if( p_object == NULL )
-        p_object = pl_Yield( p_intf );
-    if( p_object == NULL )
-        return;
+        p_object = (vlc_object_t *)pl_Yield( p_intf );
 
     var_SetFloat( p_object, "equalizer-preamp", f_preamp );
 
@@ -373,9 +361,7 @@ static bool GetFiltersStatus( intf_thread_t *p_intf,
                                              VLC_OBJECT_AOUT, FIND_ANYWHERE );
     aout_instance_t *p_aout = (aout_instance_t *)p_object;
     if( p_object == NULL )
-        p_object = pl_Yield( p_intf );
-    if( p_object == NULL )
-        return;
+        p_object = (vlc_object_t *)pl_Yield( p_intf );
 
     var_SetBool( p_object, "equalizer-2pass", b_2p );
     if( ( [o_ckb_enable state] ) && ( p_aout != NULL ) )
@@ -410,7 +396,7 @@ static bool GetFiltersStatus( intf_thread_t *p_intf,
     vlc_object_t *p_object= vlc_object_find( VLCIntf,
                                              VLC_OBJECT_AOUT, FIND_ANYWHERE );
     if( p_object == NULL )
-        p_object = pl_Yield( VLCIntf );
+        p_object = (vlc_object_t *)pl_Yield( VLCIntf );
 
     [o_window setExcludedFromWindowsMenu: TRUE];