diff options
| author | Linus Nielsen Feltzing <linus@haxx.se> | 2002-08-14 21:30:06 +0000 |
|---|---|---|
| committer | Linus Nielsen Feltzing <linus@haxx.se> | 2002-08-14 21:30:06 +0000 |
| commit | b3bda03db01eb5ffb2c087258c777ceb772cdc25 (patch) | |
| tree | a9eeab42d302a115c24dba21c8bad084e96f9308 /apps | |
| parent | bfe55a4a09a6e7dfc04df464ccec6ce427ddbdc1 (diff) | |
| download | rockbox-b3bda03db01eb5ffb2c087258c777ceb772cdc25.zip rockbox-b3bda03db01eb5ffb2c087258c777ceb772cdc25.tar.gz rockbox-b3bda03db01eb5ffb2c087258c777ceb772cdc25.tar.bz2 rockbox-b3bda03db01eb5ffb2c087258c777ceb772cdc25.tar.xz | |
Added Balance setting
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1744 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/main.c | 1 | ||||
| -rw-r--r-- | apps/settings.c | 10 | ||||
| -rw-r--r-- | apps/settings.h | 7 | ||||
| -rw-r--r-- | apps/sound_menu.c | 10 |
4 files changed, 16 insertions, 12 deletions
diff --git a/apps/main.c b/apps/main.c index a6e90ee..22fd8f6 100644 --- a/apps/main.c +++ b/apps/main.c @@ -152,6 +152,7 @@ void init(void) mpeg_init( global_settings.volume, global_settings.bass, global_settings.treble, + global_settings.balance, global_settings.loudness, global_settings.bass_boost, global_settings.avc ); diff --git a/apps/settings.c b/apps/settings.c index ef51727..8c73aab 100644 --- a/apps/settings.c +++ b/apps/settings.c @@ -39,7 +39,7 @@ struct user_settings global_settings; static unsigned short last_checksum = 0; -#define CONFIG_BLOCK_VERSION 0 +#define CONFIG_BLOCK_VERSION 1 #define CONFIG_BLOCK_SIZE 44 /******************************************** @@ -339,12 +339,12 @@ void settings_reset(void) { DEBUGF( "settings_reset()\n" ); global_settings.volume = mpeg_sound_default(SOUND_VOLUME); - global_settings.balance = DEFAULT_BALANCE_SETTING; + global_settings.balance = mpeg_sound_default(SOUND_BALANCE); global_settings.bass = mpeg_sound_default(SOUND_BASS); global_settings.treble = mpeg_sound_default(SOUND_TREBLE); - global_settings.loudness = DEFAULT_LOUDNESS_SETTING; - global_settings.bass_boost = DEFAULT_BASS_BOOST_SETTING; - global_settings.avc = DEFAULT_AVC_SETTING; + global_settings.loudness = mpeg_sound_default(SOUND_LOUDNESS); + global_settings.bass_boost = mpeg_sound_default(SOUND_SUPERBASS); + global_settings.avc = mpeg_sound_default(SOUND_AVC); global_settings.contrast = DEFAULT_CONTRAST_SETTING; global_settings.poweroff = DEFAULT_POWEROFF_SETTING; global_settings.backlight = DEFAULT_BACKLIGHT_SETTING; diff --git a/apps/settings.h b/apps/settings.h index 115aab0..52f67bd 100644 --- a/apps/settings.h +++ b/apps/settings.h @@ -97,13 +97,6 @@ extern struct user_settings global_settings; /* system defines */ -#define DEFAULT_VOLUME_SETTING 70/2 -#define DEFAULT_BALANCE_SETTING 50 -#define DEFAULT_BASS_SETTING 50/2 -#define DEFAULT_TREBLE_SETTING 50/2 -#define DEFAULT_LOUDNESS_SETTING 0 -#define DEFAULT_BASS_BOOST_SETTING 0 -#define DEFAULT_AVC_SETTING 0 #ifdef HAVE_LCD_CHARCELLS #define MAX_CONTRAST_SETTING 31 #define DEFAULT_CONTRAST_SETTING 30 diff --git a/apps/sound_menu.c b/apps/sound_menu.c index 70ecb87..1b44859 100644 --- a/apps/sound_menu.c +++ b/apps/sound_menu.c @@ -105,6 +105,10 @@ void set_sound(char* string, break; } mpeg_sound_set(setting, *variable); +#ifdef HAVE_MAS3507D + if(setting == SOUND_BALANCE) + mpeg_sound_set(SOUND_VOLUME, global_settings.volume); +#endif } lcd_stop_scroll(); } @@ -114,6 +118,11 @@ static void volume(void) set_sound("Volume", &global_settings.volume, SOUND_VOLUME); } +static void balance(void) +{ + set_sound("Balance", &global_settings.balance, SOUND_BALANCE); +} + static void bass(void) { set_sound("Bass", &global_settings.bass, SOUND_BASS); @@ -150,6 +159,7 @@ void sound_menu(void) { "Volume", volume }, { "Bass", bass }, { "Treble", treble }, + { "Balance", balance }, #ifdef HAVE_MAS3587F { "Loudness", loudness }, { "Bass Boost", bass_boost }, |