Skip to content

V
vlc-2-2
Commit 15144737 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

macosx: fixed a few compilation warnings

parent 12473c40
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 22 deletions
modules/gui/macosx/equalizer.m
View file @ 15144737
...@@ -53,9 +53,7 @@ static void ChangeFiltersString( intf_thread_t *p_intf, ...@@ -53,9 +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 = pl_Yield( p_intf ); p_object = (vlc_object_t *)pl_Yield( p_intf );
if( p_object == NULL )
return;
psz_string = var_GetNonEmptyString( p_object, "audio-filter" ); psz_string = var_GetNonEmptyString( p_object, "audio-filter" );
...@@ -126,9 +124,7 @@ static bool GetFiltersStatus( intf_thread_t *p_intf, ...@@ -126,9 +124,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 = pl_Yield( p_intf ); p_object = (vlc_object_t *)pl_Yield( p_intf );
if( p_object == NULL )
return false;
if( (BOOL)config_GetInt( p_intf, "macosx-eq-keep" ) == YES ) if( (BOOL)config_GetInt( p_intf, "macosx-eq-keep" ) == YES )
psz_string = config_GetPsz( p_intf, "audio-filter" ); psz_string = config_GetPsz( p_intf, "audio-filter" );
...@@ -184,9 +180,7 @@ static bool GetFiltersStatus( intf_thread_t *p_intf, ...@@ -184,9 +180,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 = pl_Yield( p_intf ); p_object = (vlc_object_t *)pl_Yield( p_intf );
if( p_object == NULL )
return;
var_Create( p_object, "equalizer-preamp", VLC_VAR_FLOAT | var_Create( p_object, "equalizer-preamp", VLC_VAR_FLOAT |
VLC_VAR_DOINHERIT ); VLC_VAR_DOINHERIT );
...@@ -246,9 +240,7 @@ static bool GetFiltersStatus( intf_thread_t *p_intf, ...@@ -246,9 +240,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 = pl_Yield( p_intf ); p_object = (vlc_object_t *)pl_Yield( p_intf );
if( p_object == NULL )
return;
char psz_values[102]; char psz_values[102];
memset( psz_values, 0, 102 ); memset( psz_values, 0, 102 );
...@@ -288,9 +280,7 @@ static bool GetFiltersStatus( intf_thread_t *p_intf, ...@@ -288,9 +280,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 = pl_Yield( p_intf ); p_object = (vlc_object_t *)pl_Yield( p_intf );
if( p_object == NULL )
return;
char psz_values[102]; char psz_values[102];
memset( psz_values, 0, 102 ); memset( psz_values, 0, 102 );
...@@ -333,9 +323,7 @@ static bool GetFiltersStatus( intf_thread_t *p_intf, ...@@ -333,9 +323,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 = pl_Yield( p_intf ); p_object = (vlc_object_t *)pl_Yield( p_intf );
if( p_object == NULL )
return;
var_SetFloat( p_object, "equalizer-preamp", f_preamp ); var_SetFloat( p_object, "equalizer-preamp", f_preamp );
...@@ -373,9 +361,7 @@ static bool GetFiltersStatus( intf_thread_t *p_intf, ...@@ -373,9 +361,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 = pl_Yield( p_intf ); p_object = (vlc_object_t *)pl_Yield( p_intf );
if( p_object == NULL )
return;
var_SetBool( p_object, "equalizer-2pass", b_2p ); var_SetBool( p_object, "equalizer-2pass", b_2p );
if( ( [o_ckb_enable state] ) && ( p_aout != NULL ) ) if( ( [o_ckb_enable state] ) && ( p_aout != NULL ) )
...@@ -410,7 +396,7 @@ static bool GetFiltersStatus( intf_thread_t *p_intf, ...@@ -410,7 +396,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 = pl_Yield( VLCIntf ); p_object = (vlc_object_t *)pl_Yield( VLCIntf );
[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