Skip to content

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

macosx: added an option to automagically save the equalizer status and its... 

macosx: added an option to automagically save the equalizer status and its settings (default enabled). Code cleanup.
parent bd808b06
Hide whitespace changes
Inline Side-by-side
Showing with 120 additions and 106 deletions
extras/MacOSX/vlc.xcodeproj/project.pbxproj
View file @ 6331d8c6
......@@ -975,8 +975,8 @@
089C1672FE841209C02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
089C167FFE841241C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
2A16E03F06C4F08700C87B09 /* equalizer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = equalizer.h; path = ../../modules/gui/macosx/equalizer.h; sourceTree = SOURCE_ROOT; };
2A16E04006C4F08700C87B09 /* equalizer.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = equalizer.m; path = ../../modules/gui/macosx/equalizer.m; sourceTree = SOURCE_ROOT; };
2A16E03F06C4F08700C87B09 /* equalizer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = equalizer.h; path = ../../modules/gui/macosx/equalizer.h; sourceTree = SOURCE_ROOT; };
2A16E04006C4F08700C87B09 /* equalizer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = equalizer.m; path = ../../modules/gui/macosx/equalizer.m; sourceTree = SOURCE_ROOT; };
2A16E07E06C5074F00C87B09 /* equalizerdrawer_active.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = equalizerdrawer_active.png; path = Resources/equalizerdrawer_active.png; sourceTree = "<group>"; };
2A16E07F06C5074F00C87B09 /* equalizerdrawer_blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = equalizerdrawer_blue.png; path = Resources/equalizerdrawer_blue.png; sourceTree = "<group>"; };
2AEF857609A5FEC900130822 /* fspanel.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = fspanel.h; path = ../../modules/gui/macosx/fspanel.h; sourceTree = SOURCE_ROOT; };
......@@ -1137,7 +1137,7 @@
CCCB86D90ACFDFB300CF1E10 /* fs_stop.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = fs_stop.png; path = Resources/fs_stop.png; sourceTree = "<group>"; };
CCCB86DA0ACFDFB300CF1E10 /* fs_background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = fs_background.png; path = Resources/fs_background.png; sourceTree = "<group>"; };
CCF3C64B0923B99D00401862 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = Resources/English.lproj/SFilters.nib; sourceTree = "<group>"; };
CCF3C6500923B9D100401862 /* sfilters.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sfilters.h; path = ../../modules/gui/macosx/sfilters.h; sourceTree = SOURCE_ROOT; };
CCF3C6500923B9D100401862 /* sfilters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sfilters.h; path = ../../modules/gui/macosx/sfilters.h; sourceTree = SOURCE_ROOT; };
CCF3C6510923B9D100401862 /* sfilters.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = sfilters.m; path = ../../modules/gui/macosx/sfilters.m; sourceTree = SOURCE_ROOT; };
DC769AB7085DF0DB001A838D /* wizard.m */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; name = wizard.m; path = ../../modules/gui/macosx/wizard.m; sourceTree = SOURCE_ROOT; tabWidth = 4; usesTabs = 0; };
DC769AB8085DF0DB001A838D /* wizard.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; name = wizard.h; path = ../../modules/gui/macosx/wizard.h; sourceTree = SOURCE_ROOT; };
......
modules/gui/macosx/equalizer.h
View file @ 6331d8c6
/*****************************************************************************
* equalizer.h: MacOS X interface module
*****************************************************************************
* Copyright (C) 2004-2007 the VideoLAN team
* Copyright (C) 2004-2008 the VideoLAN team
* $Id$
*
* Authors: Jérôme Decoodt <djc@videolan.org>
......@@ -60,5 +60,4 @@
- (void)setBandSlidersValues: (float *)values;
- (void)initBandSliders;
@end
modules/gui/macosx/equalizer.m
View file @ 6331d8c6
/*****************************************************************************
* equalizer.m: MacOS X interface module
*****************************************************************************
* Copyright (C) 2004-2006 the VideoLAN team
* Copyright (C) 2004-2008 the VideoLAN team
* $Id$
*
* Authors: Jerome Decoodt <djc@videolan.org>
* Authors: Jérôme Decoodt <djc@videolan.org>
* Felix Paul Kühne <fkuehne -at- videolan -dot- org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
......@@ -101,6 +102,16 @@ static void ChangeFiltersString( intf_thread_t *p_intf,
p_aout->pp_inputs[i]->b_restart = VLC_TRUE;
}
}
if( (BOOL)config_GetInt( p_object, "macosx-eq-keep" ) == YES )
{
/* save changed to config */
config_PutPsz( p_object, "audio-filter", psz_string );
/* save to vlcrc */
config_SaveConfigFile( p_object, "main" );
}
free( psz_string );
vlc_object_release( p_object );
}
......@@ -117,7 +128,11 @@ static vlc_bool_t GetFiltersStatus( intf_thread_t *p_intf,
if( p_object == NULL )
return VLC_FALSE;
psz_string = var_GetNonEmptyString( p_object, "audio-filter" );
if( (BOOL)config_GetInt( p_intf, "macosx-eq-keep" ) == YES )
psz_string = config_GetPsz( p_intf, "audio-filter" );
if(! psz_string )
psz_string = var_GetNonEmptyString( p_object, "audio-filter" );
vlc_object_release( p_object );
......@@ -152,21 +167,7 @@ static vlc_bool_t GetFiltersStatus( intf_thread_t *p_intf,
}
[o_window setTitle: _NS("Equalizer")];
/*
[o_slider_band1 setFloatValue: 0];
[o_slider_band2 setFloatValue: 0];
[o_slider_band3 setFloatValue: 0];
[o_slider_band4 setFloatValue: 0];
[o_slider_band5 setFloatValue: 0];
[o_slider_band6 setFloatValue: 0];
[o_slider_band7 setFloatValue: 0];
[o_slider_band8 setFloatValue: 0];
[o_slider_band9 setFloatValue: 0];
[o_slider_band10 setFloatValue: 0];
*/
[self initBandSliders];
[o_ckb_enable setState: NSOffState];
[o_ckb_2pass setState: NSOffState];
}
- (void)equalizerUpdated
......@@ -178,33 +179,41 @@ static vlc_bool_t GetFiltersStatus( intf_thread_t *p_intf,
int i;
vlc_bool_t b_enabled = GetFiltersStatus( p_intf, (char *)"equalizer" );
vlc_object_t *p_object = vlc_object_find( p_intf,
VLC_OBJECT_AOUT, FIND_ANYWHERE );
VLC_OBJECT_AOUT, FIND_ANYWHERE );
if( p_object == NULL )
p_object = vlc_object_find( p_intf,
VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
if( p_object == NULL )
return;
var_Create( p_object, "equalizer-preamp", VLC_VAR_FLOAT |
VLC_VAR_DOINHERIT );
VLC_VAR_DOINHERIT );
var_Create( p_object, "equalizer-bands", VLC_VAR_STRING |
VLC_VAR_DOINHERIT );
VLC_VAR_DOINHERIT );
f_preamp = var_GetFloat( p_object, "equalizer-preamp" );
psz_bands = var_GetNonEmptyString( p_object, "equalizer-bands" );
if( psz_bands == NULL )
psz_bands = strdup( "0 0 0 0 0 0 0 0 0 0" );
b_2p = var_GetBool( p_object, "equalizer-2pass" );
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" );
}
vlc_object_release( p_object );
/* Set the preamp slider */
/* Set the preamp slider */
[o_slider_preamp setFloatValue: f_preamp];
/* Set the bands slider */
/* Set the bands slider */
psz_bands_init = psz_bands;
for( i = 0; i < 10; i++ )
......@@ -216,51 +225,36 @@ static vlc_bool_t GetFiltersStatus( intf_thread_t *p_intf,
f_band[i] = (float)strtod( psz_bands, &p_next );
#endif
if( !p_next || p_next == psz_bands ) break; /* strtof() failed */
if( !*psz_bands ) break; /* end of line */
psz_bands = p_next+1;
}
free( psz_bands_init );
[self setBandSlidersValues:f_band];
/*
[o_slider_band1 setFloatValue: f_band[0]];
[o_slider_band2 setFloatValue: f_band[1]];
[o_slider_band3 setFloatValue: f_band[2]];
[o_slider_band4 setFloatValue: f_band[3]];
[o_slider_band5 setFloatValue: f_band[4]];
[o_slider_band6 setFloatValue: f_band[5]];
[o_slider_band7 setFloatValue: f_band[6]];
[o_slider_band8 setFloatValue: f_band[7]];
[o_slider_band9 setFloatValue: f_band[8]];
[o_slider_band10 setFloatValue: f_band[9]];
*/
/* Set the the checkboxes */
if( b_enabled == VLC_TRUE )
[o_ckb_enable setState:NSOnState];
else
[o_ckb_enable setState:NSOffState];
/* Set the the checkboxes */
[o_ckb_enable setState: b_enabled];
[o_ckb_2pass setState:( ( b_2p == VLC_TRUE ) ? NSOnState : NSOffState )];
[o_ckb_2pass setState: b_2p];
}
- (IBAction)bandSliderUpdated:(id)sender
{
intf_thread_t *p_intf = VLCIntf;
vlc_object_t *p_object = vlc_object_find( p_intf,
VLC_OBJECT_AOUT, FIND_ANYWHERE );
char psz_values[102];
memset( psz_values, 0, 102 );
VLC_OBJECT_AOUT, FIND_ANYWHERE );
if( p_object == NULL )
p_object = vlc_object_find( p_intf,
VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
if( p_object == NULL )
return;
char psz_values[102];
memset( psz_values, 0, 102 );
/* Write the new bands values */
/* TODO: write a generic code instead of ten times the same thing */
/* TODO: write a generic code instead of ten times the same thing */
sprintf( psz_values, "%s %.1f", psz_values, [o_slider_band1 floatValue] );
sprintf( psz_values, "%s %.1f", psz_values, [o_slider_band2 floatValue] );
......@@ -274,6 +268,16 @@ static vlc_bool_t GetFiltersStatus( intf_thread_t *p_intf,
sprintf( psz_values, "%s %.1f", psz_values, [o_slider_band10 floatValue] );
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 to vlcrc */
config_SaveConfigFile( p_intf, "equalizer" );
}
vlc_object_release( p_object );
}
......@@ -282,16 +286,16 @@ static vlc_bool_t GetFiltersStatus( intf_thread_t *p_intf,
intf_thread_t *p_intf = VLCIntf;
int i;
vlc_object_t *p_object= vlc_object_find( p_intf,
VLC_OBJECT_AOUT, FIND_ANYWHERE );
char psz_values[102];
memset( psz_values, 0, 102 );
VLC_OBJECT_AOUT, FIND_ANYWHERE );
if( p_object == NULL )
p_object = vlc_object_find( p_intf,
VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
if( p_object == NULL )
return;
char psz_values[102];
memset( psz_values, 0, 102 );
var_SetString( p_object , "equalizer-preset" , preset_list[[sender indexOfSelectedItem]] );
for( i = 0; i < 10; i++ )
......@@ -300,20 +304,20 @@ static vlc_bool_t GetFiltersStatus( intf_thread_t *p_intf,
var_SetFloat( p_object, "equalizer-preamp", eqz_preset_10b[[sender indexOfSelectedItem]]->f_preamp);
[o_slider_preamp setFloatValue: eqz_preset_10b[[sender indexOfSelectedItem]]->f_preamp];
/*
[o_slider_band1 setFloatValue: eqz_preset_10b[[sender indexOfSelectedItem]]->f_amp[0]];
[o_slider_band2 setFloatValue: eqz_preset_10b[[sender indexOfSelectedItem]]->f_amp[1]];
[o_slider_band3 setFloatValue: eqz_preset_10b[[sender indexOfSelectedItem]]->f_amp[2]];
[o_slider_band4 setFloatValue: eqz_preset_10b[[sender indexOfSelectedItem]]->f_amp[3]];
[o_slider_band5 setFloatValue: eqz_preset_10b[[sender indexOfSelectedItem]]->f_amp[4]];
[o_slider_band6 setFloatValue: eqz_preset_10b[[sender indexOfSelectedItem]]->f_amp[5]];
[o_slider_band7 setFloatValue: eqz_preset_10b[[sender indexOfSelectedItem]]->f_amp[6]];
[o_slider_band8 setFloatValue: eqz_preset_10b[[sender indexOfSelectedItem]]->f_amp[7]];
[o_slider_band9 setFloatValue: eqz_preset_10b[[sender indexOfSelectedItem]]->f_amp[8]];
[o_slider_band10 setFloatValue: eqz_preset_10b[[sender indexOfSelectedItem]]->f_amp[9]];
*/
[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 to vlcrc */
config_SaveConfigFile( p_intf, "equalizer" );
}
vlc_object_release( p_object );
}
......@@ -328,15 +332,24 @@ static vlc_bool_t GetFiltersStatus( intf_thread_t *p_intf,
float f_preamp = [sender floatValue] ;
vlc_object_t *p_object = vlc_object_find( p_intf,
VLC_OBJECT_AOUT, FIND_ANYWHERE );
VLC_OBJECT_AOUT, FIND_ANYWHERE );
if( p_object == NULL )
p_object = vlc_object_find( p_intf,
VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
if( p_object == NULL )
return;
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 to vlcrc */
config_SaveConfigFile( p_intf, "equalizer" );
}
vlc_object_release( p_object );
}
......@@ -359,24 +372,33 @@ static vlc_bool_t GetFiltersStatus( intf_thread_t *p_intf,
intf_thread_t *p_intf = VLCIntf;
vlc_bool_t b_2p = [sender state] ? VLC_TRUE : VLC_FALSE;
vlc_object_t *p_object= vlc_object_find( p_intf,
VLC_OBJECT_AOUT, FIND_ANYWHERE );
VLC_OBJECT_AOUT, FIND_ANYWHERE );
aout_instance_t *p_aout = (aout_instance_t *)p_object;
if( p_object == NULL )
p_object = vlc_object_find( p_intf,
VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
if( p_object == NULL )
return;
var_SetBool( p_object, "equalizer-2pass", b_2p );
if( ( [o_ckb_enable state] ) && ( p_aout != NULL ) )
{
int i;
int i;
for( i = 0; i < p_aout->i_nb_inputs; i++ )
{
p_aout->pp_inputs[i]->b_restart = VLC_TRUE;
}
}
if( (BOOL)config_GetInt( p_intf, "macosx-eq-keep" ) == YES )
{
/* save changed to config */
config_PutInt( p_intf, "equalizer-2pass", (int)b_2p );
/* save to vlcrc */
config_SaveConfigFile( p_intf, "equalizer" );
}
vlc_object_release( p_object );
}
......@@ -389,10 +411,10 @@ static vlc_bool_t GetFiltersStatus( intf_thread_t *p_intf,
{
int i;
vlc_object_t *p_object= vlc_object_find( VLCIntf,
VLC_OBJECT_AOUT, FIND_ANYWHERE );
VLC_OBJECT_AOUT, FIND_ANYWHERE );
if( p_object == NULL )
p_object = vlc_object_find( VLCIntf,
VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
p_object = vlc_object_find( VLCIntf,
VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
[o_window setExcludedFromWindowsMenu: TRUE];
......@@ -403,36 +425,24 @@ static vlc_bool_t GetFiltersStatus( intf_thread_t *p_intf,
char *psz_preset;
var_Create( p_object, "equalizer-preset", VLC_VAR_STRING |
VLC_VAR_DOINHERIT );
VLC_VAR_DOINHERIT );
psz_preset = var_GetNonEmptyString( p_object, "equalizer-preset" );
for( i = 0 ; (psz_preset != NULL) && (i < 18) ; i++ )
{
if( strcmp( preset_list[i], psz_preset ) )
continue;
[o_popup_presets selectItemAtIndex: i];
[o_slider_preamp setFloatValue: eqz_preset_10b[i]->f_preamp];
[self setBandSlidersValues: (float *)eqz_preset_10b[i]->f_amp];
/*
[o_slider_band1 setFloatValue: eqz_preset_10b[i]->f_amp[0]];
[o_slider_band2 setFloatValue: eqz_preset_10b[i]->f_amp[1]];
[o_slider_band3 setFloatValue: eqz_preset_10b[i]->f_amp[2]];
[o_slider_band4 setFloatValue: eqz_preset_10b[i]->f_amp[3]];
[o_slider_band5 setFloatValue: eqz_preset_10b[i]->f_amp[4]];
[o_slider_band6 setFloatValue: eqz_preset_10b[i]->f_amp[5]];
[o_slider_band7 setFloatValue: eqz_preset_10b[i]->f_amp[6]];
[o_slider_band8 setFloatValue: eqz_preset_10b[i]->f_amp[7]];
[o_slider_band9 setFloatValue: eqz_preset_10b[i]->f_amp[8]];
[o_slider_band10 setFloatValue: eqz_preset_10b[i]->f_amp[9]];
*/
if( strcmp( psz_preset, "flat" ) )
{
char psz_bands[100];
snprintf( psz_bands, sizeof( psz_bands ),
"%.1f %.1f %.1f %.1f %.1f %.1f %.1f "
"%.1f %.1f %.1f",
......@@ -446,13 +456,13 @@ static vlc_bool_t GetFiltersStatus( intf_thread_t *p_intf,
eqz_preset_10b[i]->f_amp[7],
eqz_preset_10b[i]->f_amp[8],
eqz_preset_10b[i]->f_amp[9] );
var_Create( p_object, "equalizer-preamp", VLC_VAR_FLOAT |
VLC_VAR_DOINHERIT );
VLC_VAR_DOINHERIT );
var_Create( p_object, "equalizer-bands", VLC_VAR_STRING |
VLC_VAR_DOINHERIT );
VLC_VAR_DOINHERIT );
var_SetFloat( p_object, "equalizer-preamp",
eqz_preset_10b[i]->f_preamp );
eqz_preset_10b[i]->f_preamp );
var_SetString( p_object, "equalizer-bands", psz_bands );
}
}
......@@ -460,8 +470,7 @@ static vlc_bool_t GetFiltersStatus( intf_thread_t *p_intf,
vlc_object_release( p_object );
}
[self equalizerUpdated];
[self equalizerUpdated];
}
......@@ -504,7 +513,7 @@ static vlc_bool_t GetFiltersStatus( intf_thread_t *p_intf,
- (void)setValue:(float)value forSlider:(int)index
{
id slider = [self getSliderByIndex:index];
if (slider != nil)
{
[slider setFloatValue:value];
......
modules/gui/macosx/macosx.m
View file @ 6331d8c6
......@@ -84,6 +84,10 @@ void E_(CloseVideoGL) ( vlc_object_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.")
vlc_module_begin();
set_description( _("Mac OS X interface") );
set_capability( "interface", 100 );
......@@ -96,6 +100,8 @@ vlc_module_begin();
VLC_FALSE );
add_bool( "macosx-recentitems", 1, NULL, RECENT_ITEMS_TEXT, RECENT_ITEMS_LONGTEXT,
VLC_FALSE );
add_bool( "macosx-eq-keep", 1, NULL, EQ_KEEP_TEXT, EQ_KEEP_LONGTEXT,
VLC_FALSE );
add_bool( "macosx-fspanel", 1, NULL, FSPANEL_TEXT, FSPANEL_LONGTEXT,
VLC_FALSE );
......
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