[vlc-commits] macosx: remove 'macosx-eq-keep', since it is a useless option, which was never disabled anyway
Felix Paul Kühne
git at videolan.org
Tue Aug 23 17:16:05 CEST 2011
vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Tue Aug 23 17:15:53 2011 +0200| [532049f650ca83f072d0f057ee42abd11782673b] | committer: Felix Paul Kühne
macosx: remove 'macosx-eq-keep', since it is a useless option, which was never disabled anyway
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=532049f650ca83f072d0f057ee42abd11782673b
---
modules/gui/macosx/AudioEffects.m | 63 ++++++++++++------------------------
modules/gui/macosx/macosx.m | 7 +---
2 files changed, 22 insertions(+), 48 deletions(-)
diff --git a/modules/gui/macosx/AudioEffects.m b/modules/gui/macosx/AudioEffects.m
index f2680a5..e37d6ff 100644
--- a/modules/gui/macosx/AudioEffects.m
+++ b/modules/gui/macosx/AudioEffects.m
@@ -164,8 +164,7 @@ static bool GetEqualizerStatus( intf_thread_t *p_custom_intf,
if( p_object == NULL )
p_object = vlc_object_hold(pl_Get( p_custom_intf ));
- if( (BOOL)config_GetInt( p_custom_intf, "macosx-eq-keep" ) == YES )
- psz_string = config_GetPsz( p_custom_intf, "audio-filter" );
+ psz_string = config_GetPsz( p_custom_intf, "audio-filter" );
if(! psz_string )
psz_string = var_GetNonEmptyString( p_object, "audio-filter" );
@@ -265,18 +264,10 @@ static bool GetEqualizerStatus( intf_thread_t *p_custom_intf,
if( psz_bands == NULL )
psz_bands = strdup( "0 0 0 0 0 0 0 0 0 0" );
-
- if( (BOOL)config_GetInt( p_intf, "macosx-eq-keep" ) == YES )
- {
- b_2p = (BOOL)config_GetInt( p_object, "equalizer-2pass" );
- f_preamp = config_GetFloat( p_object, "equalizer-preamp" );
- }
- else
- {
- b_2p = var_GetBool( p_object, "equalizer-2pass" );
- f_preamp = var_GetFloat( p_object, "equalizer-preamp" );
- }
-
+
+ b_2p = (BOOL)config_GetInt( p_object, "equalizer-2pass" );
+ f_preamp = config_GetFloat( p_object, "equalizer-preamp" );
+
vlc_object_release( p_object );
/* Set the preamp slider */
@@ -366,13 +357,10 @@ static bool GetEqualizerStatus( intf_thread_t *p_custom_intf,
psz_values = [preset UTF8String];
var_SetString( p_object, "equalizer-bands", psz_values );
-
- if( (BOOL)config_GetInt( p_intf, "macosx-eq-keep" ) == YES )
- {
- /* save changed to config */
- config_PutPsz( p_intf, "equalizer-bands", psz_values );
- }
-
+
+ /* save changed to config */
+ config_PutPsz( p_intf, "equalizer-bands", psz_values );
+
vlc_object_release( p_object );
}
- (IBAction)eq_changePreset:(id)sender
@@ -397,14 +385,11 @@ static bool GetEqualizerStatus( intf_thread_t *p_custom_intf,
[self setBandSlidersValues:(float *)eqz_preset_10b[[sender indexOfSelectedItem]].f_amp];
- if( (BOOL)config_GetInt( p_intf, "macosx-eq-keep" ) == YES )
- {
- /* save changed to config */
- config_PutPsz( p_intf, "equalizer-bands", psz_values );
- config_PutFloat( p_intf, "equalizer-preamp", eqz_preset_10b[[sender indexOfSelectedItem]].f_preamp );
- config_PutPsz( p_intf, "equalizer-preset", preset_list[[sender indexOfSelectedItem]] );
- }
-
+ /* save changed to config */
+ config_PutPsz( p_intf, "equalizer-bands", psz_values );
+ config_PutFloat( p_intf, "equalizer-preamp", eqz_preset_10b[[sender indexOfSelectedItem]].f_preamp );
+ config_PutPsz( p_intf, "equalizer-preset", preset_list[[sender indexOfSelectedItem]] );
+
vlc_object_release( p_object );
}
- (IBAction)eq_preampSliderUpdated:(id)sender
@@ -417,11 +402,8 @@ static bool GetEqualizerStatus( intf_thread_t *p_custom_intf,
var_SetFloat( p_object, "equalizer-preamp", f_preamp );
- if( (BOOL)config_GetInt( p_intf, "macosx-eq-keep" ) == YES )
- {
- /* save changed to config */
- config_PutFloat( p_intf, "equalizer-preamp", f_preamp );
- }
+ /* save changed to config */
+ config_PutFloat( p_intf, "equalizer-preamp", f_preamp );
vlc_object_release( p_object );
}
@@ -432,15 +414,12 @@ static bool GetEqualizerStatus( intf_thread_t *p_custom_intf,
vlc_object_t *p_object= VLC_OBJECT(p_aout);
if( p_object == NULL )
p_object = vlc_object_hold(pl_Get( p_intf ));
-
+
var_SetBool( p_object, "equalizer-2pass", b_2p );
-
- if( (BOOL)config_GetInt( p_intf, "macosx-eq-keep" ) == YES )
- {
- /* save changed to config */
- config_PutInt( p_intf, "equalizer-2pass", (int)b_2p );
- }
-
+
+ /* save changed to config */
+ config_PutInt( p_intf, "equalizer-2pass", (int)b_2p );
+
vlc_object_release( p_object );
}
diff --git a/modules/gui/macosx/macosx.m b/modules/gui/macosx/macosx.m
index a72060a..591614e 100644
--- a/modules/gui/macosx/macosx.m
+++ b/modules/gui/macosx/macosx.m
@@ -77,10 +77,6 @@ void WindowClose ( vout_window_t * );
#define RECENT_ITEMS_LONGTEXT N_("By default, VLC keeps a list of the last 10 items. " \
"This feature can be disabled here.")
-#define EQ_KEEP_TEXT N_("Keep current Equalizer settings")
-#define EQ_KEEP_LONGTEXT N_("By default, VLC keeps the last equalizer settings before " \
- "termination. This feature can be disabled here.")
-
#define USE_APPLE_REMOTE_TEXT N_("Control playback with the Apple Remote")
#define USE_APPLE_REMOTE_LONGTEXT N_("By default, VLC can be remotely controlled with the Apple Remote.")
@@ -105,8 +101,6 @@ vlc_module_begin ()
false )
add_bool( "macosx-recentitems", true, RECENT_ITEMS_TEXT, RECENT_ITEMS_LONGTEXT,
false )
- add_bool( "macosx-eq-keep", true, EQ_KEEP_TEXT, EQ_KEEP_LONGTEXT,
- false )
add_bool( "macosx-fspanel", true, FSPANEL_TEXT, FSPANEL_LONGTEXT,
false )
add_bool( "macosx-appleremote", true, USE_APPLE_REMOTE_TEXT, USE_APPLE_REMOTE_LONGTEXT,
@@ -118,6 +112,7 @@ vlc_module_begin ()
add_bool( "macosx-nativefullscreenmode", true, NATIVE_FULLSCREEN_MODE_ON_LION_TEXT, NATIVE_FULLSCREEN_MODE_ON_LION_LONGTEXT, false )
add_obsolete_bool( "macosx-stretch" ) /* since 1.2.0 */
add_obsolete_bool( "macosx-background" ) /* since 1.2.0 */
+ add_obsolete_bool( "macosx-eq-keep" ) /* since 1.2.0 */
add_submodule ()
set_description( "Mac OS X Video Output Provider" )
More information about the vlc-commits
mailing list