Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

#ifdef out some setting struct members when they are not needed, fix some comments

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15665 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Nils Wallménius 2007-11-18 16:45:58 +00:00
parent 7dc92d4d2e
commit fedc7dc0c9
1 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
apps/settings.h
View file

@ -288,20 +288,23 @@ struct user_settings
{ {
/* audio settings */ /* audio settings */
int volume; /* audio output volume: 0-100 0=off 100=max */ int volume; /* audio output volume in decibels range depends on the dac */
int balance; /* stereo balance: 0-100 0=left 50=bal 100=right */ int balance; /* stereo balance: 0-100 0=left 50=bal 100=right */
int bass; /* bass eq: 0-100 0=off 100=max */ int bass; /* bass boost/cut in decibels */
int treble; /* treble eq: 0-100 0=low 100=high */ int treble; /* treble boost/cut in decibels */
int loudness; /* loudness eq: 0-100 0=off 100=max */
int avc; /* auto volume correct: 0=off, 1=20ms, 2=2s 3=4s 4=8s */
int channel_config; /* Stereo, Mono, Custom, Mono left, Mono right, Karaoke */ int channel_config; /* Stereo, Mono, Custom, Mono left, Mono right, Karaoke */
int stereo_width; /* 0-255% */ int stereo_width; /* 0-255% */
#if CONFIG_CODEC != SWCODEC
int loudness; /* loudness eq: 0-100 0=off 100=max */
int avc; /* auto volume correct: 0=off, 1=20ms, 2=2s 3=4s 4=8s */
int mdb_strength; /* 0-127dB */ int mdb_strength; /* 0-127dB */
int mdb_harmonics; /* 0-100% */ int mdb_harmonics; /* 0-100% */
int mdb_center; /* 20-300Hz */ int mdb_center; /* 20-300Hz */
int mdb_shape; /* 50-300Hz */ int mdb_shape; /* 50-300Hz */
bool mdb_enable; /* true/false */ bool mdb_enable; /* true/false */
bool superbass; /* true/false */ bool superbass; /* true/false */
#endif
#if CONFIG_CODEC == SWCODEC #if CONFIG_CODEC == SWCODEC
int crossfade; /* Enable crossfade (0=off,1=shuffle,2=trackskip,3=shuff&trackskip,4=always) */ int crossfade; /* Enable crossfade (0=off,1=shuffle,2=trackskip,3=shuff&trackskip,4=always) */
@ -388,17 +391,23 @@ struct user_settings
int cursor_style; /* style of the selection cursor */ int cursor_style; /* style of the selection cursor */
bool flip_display; /* turn display (and button layout) by 180 degrees */ bool flip_display; /* turn display (and button layout) by 180 degrees */
int poweroff; /* power off timer */ int poweroff; /* power off timer */
#ifdef HAVE_BACKLIGHT
int backlight_timeout; /* backlight off timeout: 0-18 0=never, int backlight_timeout; /* backlight off timeout: 0-18 0=never,
1=always, 1=always,
then according to timeout_values[] */ then according to timeout_values[] */
int backlight_timeout_plugged; int backlight_timeout_plugged;
#endif
#ifdef HAVE_BACKLIGHT_PWM_FADING #ifdef HAVE_BACKLIGHT_PWM_FADING
int backlight_fade_in; /* backlight fade in timing: 0..3 */ int backlight_fade_in; /* backlight fade in timing: 0..3 */
int backlight_fade_out; /* backlight fade in timing: 0..7 */ int backlight_fade_out; /* backlight fade in timing: 0..7 */
#endif
#ifdef HAVE_BACKLIGHT_BRIGHTNESS
int brightness;
#endif #endif
int battery_capacity; /* in mAh */ int battery_capacity; /* in mAh */
#if BATTERY_TYPES_COUNT > 1
int battery_type; /* for units which can take multiple types (Ondio). */ int battery_type; /* for units which can take multiple types (Ondio). */
#endif
#ifdef HAVE_SPDIF_POWER #ifdef HAVE_SPDIF_POWER
bool spdif_enable; /* S/PDIF power on/off */ bool spdif_enable; /* S/PDIF power on/off */
#endif #endif
@ -445,8 +454,10 @@ struct user_settings
/* show status bar */ /* show status bar */
bool statusbar; /* 0=hide, 1=show */ bool statusbar; /* 0=hide, 1=show */
#if CONFIG_KEYPAD == RECORDER_PAD
/* show button bar */ /* show button bar */
bool buttonbar; /* 0=hide, 1=show */ bool buttonbar; /* 0=hide, 1=show */
#endif
/* show scroll bar */ /* show scroll bar */
bool scrollbar; /* 0=hide, 1=show */ bool scrollbar; /* 0=hide, 1=show */
@ -495,7 +506,9 @@ struct user_settings
bool show_icons; /* 0=hide 1=show */ bool show_icons; /* 0=hide 1=show */
int recursive_dir_insert; /* should directories be inserted recursively */ int recursive_dir_insert; /* should directories be inserted recursively */
bool line_in; /* false=off, true=active */ #if CONFIG_CODEC == MAS3507D
bool line_in; /* false=off, true=active */
#endif
/* playlist viewer settings */ /* playlist viewer settings */
bool playlist_viewer_icons; /* display icons on viewer */ bool playlist_viewer_icons; /* display icons on viewer */
@ -566,10 +579,6 @@ struct user_settings
#ifdef HAVE_REMOTE_LCD #ifdef HAVE_REMOTE_LCD
unsigned char rwps_file[MAX_FILENAME+1]; /* last remote-wps */ unsigned char rwps_file[MAX_FILENAME+1]; /* last remote-wps */
#endif #endif
#ifdef HAVE_BACKLIGHT_BRIGHTNESS
int brightness; /* iriver h300: backlight PWM value: 2..15
(0 and 1 are black) */
#endif
#if CONFIG_CODEC == SWCODEC #if CONFIG_CODEC == SWCODEC
bool eq_enabled; /* Enable equalizer */ bool eq_enabled; /* Enable equalizer */