diff options
-rw-r--r-- | apps/gui/option_select.c | 2 | ||||
-rw-r--r-- | apps/settings_list.c | 6 | ||||
-rw-r--r-- | apps/settings_list.h | 5 |
3 files changed, 7 insertions, 6 deletions
diff --git a/apps/gui/option_select.c b/apps/gui/option_select.c index 7752b35085..474c459ff1 100644 --- a/apps/gui/option_select.c +++ b/apps/gui/option_select.c | |||
@@ -293,7 +293,7 @@ bool option_screen(struct settings_list *setting, | |||
293 | struct gui_synclist lists; | 293 | struct gui_synclist lists; |
294 | int oldvalue, nb_items = 0, selected = 0, temp_var; | 294 | int oldvalue, nb_items = 0, selected = 0, temp_var; |
295 | int *variable; | 295 | int *variable; |
296 | bool allow_wrap = ((int*)setting->setting != &global_settings.volume); | 296 | bool allow_wrap = setting->flags & F_NO_WRAP ? false : true; |
297 | int var_type = setting->flags&F_T_MASK; | 297 | int var_type = setting->flags&F_T_MASK; |
298 | void (*function)(int) = NULL; | 298 | void (*function)(int) = NULL; |
299 | char *title; | 299 | char *title; |
diff --git a/apps/settings_list.c b/apps/settings_list.c index 1218dbf3e4..67ebec8866 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c | |||
@@ -382,10 +382,10 @@ static long jumpscroll_getlang(int value) | |||
382 | 382 | ||
383 | const struct settings_list settings[] = { | 383 | const struct settings_list settings[] = { |
384 | /* sound settings */ | 384 | /* sound settings */ |
385 | SOUND_SETTING(0,volume, LANG_VOLUME, "volume", SOUND_VOLUME), | 385 | SOUND_SETTING(F_NO_WRAP,volume, LANG_VOLUME, "volume", SOUND_VOLUME), |
386 | SOUND_SETTING(BALANCE_FLIP, balance, LANG_BALANCE, "balance", SOUND_BALANCE), | 386 | SOUND_SETTING(BALANCE_FLIP, balance, LANG_BALANCE, "balance", SOUND_BALANCE), |
387 | SOUND_SETTING(0,bass, LANG_BASS, "bass", SOUND_BASS), | 387 | SOUND_SETTING(F_NO_WRAP,bass, LANG_BASS, "bass", SOUND_BASS), |
388 | SOUND_SETTING(0,treble, LANG_TREBLE, "treble", SOUND_TREBLE), | 388 | SOUND_SETTING(F_NO_WRAP,treble, LANG_TREBLE, "treble", SOUND_TREBLE), |
389 | 389 | ||
390 | #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) | 390 | #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) |
391 | SOUND_SETTING(0,loudness, LANG_LOUDNESS, "loudness", SOUND_LOUDNESS), | 391 | SOUND_SETTING(0,loudness, LANG_LOUDNESS, "loudness", SOUND_LOUDNESS), |
diff --git a/apps/settings_list.h b/apps/settings_list.h index b7044c8039..05da5e8b20 100644 --- a/apps/settings_list.h +++ b/apps/settings_list.h | |||
@@ -102,8 +102,9 @@ struct choice_setting { | |||
102 | - number of bytes for a NVRAM setting is changed | 102 | - number of bytes for a NVRAM setting is changed |
103 | - a NVRAM setting is removed | 103 | - a NVRAM setting is removed |
104 | */ | 104 | */ |
105 | #define F_TEMPVAR 0x400 /* used if the setting should be set using a temp var */ | 105 | #define F_TEMPVAR 0x0400 /* used if the setting should be set using a temp var */ |
106 | #define F_FLIPLIST 0x800 /* used if the order in the setting screen is backwards */ | 106 | #define F_FLIPLIST 0x0800 /* used if the order in the setting screen is backwards */ |
107 | #define F_NO_WRAP 0x1000 /* used if the list should not wrap */ | ||
107 | 108 | ||
108 | struct settings_list { | 109 | struct settings_list { |
109 | uint32_t flags; /* ____ ___R TFFF ____ NNN_ FTVC IFRB STTT */ | 110 | uint32_t flags; /* ____ ___R TFFF ____ NNN_ FTVC IFRB STTT */ |