diff options
Diffstat (limited to 'apps/settings_list.c')
-rw-r--r-- | apps/settings_list.c | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/apps/settings_list.c b/apps/settings_list.c index 348caec6e5..7f6f4fefc7 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c | |||
@@ -310,7 +310,6 @@ static const char graphic_numeric[] = "graphic,numeric"; | |||
310 | 310 | ||
311 | #ifdef HAVE_RECORDING | 311 | #ifdef HAVE_RECORDING |
312 | /* these should be in the config.h files */ | 312 | /* these should be in the config.h files */ |
313 | #if CONFIG_CODEC == SWCODEC | ||
314 | # ifdef HAVE_UDA1380 | 313 | # ifdef HAVE_UDA1380 |
315 | # define DEFAULT_REC_MIC_GAIN 16 | 314 | # define DEFAULT_REC_MIC_GAIN 16 |
316 | # define DEFAULT_REC_LEFT_GAIN 0 | 315 | # define DEFAULT_REC_LEFT_GAIN 0 |
@@ -332,7 +331,6 @@ static const char graphic_numeric[] = "graphic,numeric"; | |||
332 | # define DEFAULT_REC_LEFT_GAIN 0 | 331 | # define DEFAULT_REC_LEFT_GAIN 0 |
333 | # define DEFAULT_REC_RIGHT_GAIN 0 | 332 | # define DEFAULT_REC_RIGHT_GAIN 0 |
334 | # endif | 333 | # endif |
335 | #endif | ||
336 | 334 | ||
337 | #endif /* HAVE_RECORDING */ | 335 | #endif /* HAVE_RECORDING */ |
338 | 336 | ||
@@ -472,8 +470,6 @@ static const char* scanaccel_formatter(char *buffer, size_t buffer_size, | |||
472 | } | 470 | } |
473 | #endif | 471 | #endif |
474 | 472 | ||
475 | #if CONFIG_CODEC == SWCODEC | ||
476 | |||
477 | static const char* formatter_unit_0_is_off(char *buffer, size_t buffer_size, | 473 | static const char* formatter_unit_0_is_off(char *buffer, size_t buffer_size, |
478 | int val, const char *unit) | 474 | int val, const char *unit) |
479 | { | 475 | { |
@@ -591,7 +587,6 @@ static void eq_set_default(void* setting, void* defaultval) | |||
591 | { | 587 | { |
592 | memcpy(setting, defaultval, sizeof(struct eq_band_setting)); | 588 | memcpy(setting, defaultval, sizeof(struct eq_band_setting)); |
593 | } | 589 | } |
594 | #endif | ||
595 | 590 | ||
596 | #ifdef HAVE_QUICKSCREEN | 591 | #ifdef HAVE_QUICKSCREEN |
597 | static int find_setting_by_name(char*name) | 592 | static int find_setting_by_name(char*name) |
@@ -1213,15 +1208,11 @@ const struct settings_list settings[] = { | |||
1213 | "seek acceleration", "very fast,fast,normal,slow,very slow", NULL, 5, | 1208 | "seek acceleration", "very fast,fast,normal,slow,very slow", NULL, 5, |
1214 | ID2P(LANG_VERY_FAST), ID2P(LANG_FAST), ID2P(LANG_NORMAL), | 1209 | ID2P(LANG_VERY_FAST), ID2P(LANG_FAST), ID2P(LANG_NORMAL), |
1215 | ID2P(LANG_SLOW) , ID2P(LANG_VERY_SLOW)), | 1210 | ID2P(LANG_SLOW) , ID2P(LANG_VERY_SLOW)), |
1216 | #if (CONFIG_CODEC == SWCODEC) && defined(HAVE_DISK_STORAGE) | 1211 | #if defined(HAVE_DISK_STORAGE) |
1217 | TABLE_SETTING(F_TIME_SETTING | F_ALLOW_ARBITRARY_VALS, buffer_margin, | 1212 | TABLE_SETTING(F_TIME_SETTING | F_ALLOW_ARBITRARY_VALS, buffer_margin, |
1218 | LANG_MP3BUFFER_MARGIN, 5, "antiskip", NULL, UNIT_SEC, | 1213 | LANG_MP3BUFFER_MARGIN, 5, "antiskip", NULL, UNIT_SEC, |
1219 | NULL, NULL, | 1214 | NULL, NULL, |
1220 | NULL,8, 5,15,30,60,120,180,300,600), | 1215 | NULL,8, 5,15,30,60,120,180,300,600), |
1221 | #elif defined(HAVE_DISK_STORAGE) | ||
1222 | INT_SETTING(F_TIME_SETTING, buffer_margin, LANG_MP3BUFFER_MARGIN, 0, | ||
1223 | "antiskip", UNIT_SEC, 0, 7, 1, formatter_time_unit_0_is_off, | ||
1224 | getlang_time_unit_0_is_off, audio_set_buffer_margin), | ||
1225 | #endif | 1216 | #endif |
1226 | /* disk */ | 1217 | /* disk */ |
1227 | #ifdef HAVE_DISK_STORAGE | 1218 | #ifdef HAVE_DISK_STORAGE |
@@ -1348,10 +1339,8 @@ const struct settings_list settings[] = { | |||
1348 | TALK_ID(1792, UNIT_MB)), | 1339 | TALK_ID(1792, UNIT_MB)), |
1349 | {F_T_INT|F_RECSETTING, &global_settings.rec_channels, LANG_CHANNELS, INT(0), | 1340 | {F_T_INT|F_RECSETTING, &global_settings.rec_channels, LANG_CHANNELS, INT(0), |
1350 | "rec channels","stereo,mono",UNUSED}, | 1341 | "rec channels","stereo,mono",UNUSED}, |
1351 | #if CONFIG_CODEC == SWCODEC | ||
1352 | {F_T_INT|F_RECSETTING, &global_settings.rec_mono_mode, | 1342 | {F_T_INT|F_RECSETTING, &global_settings.rec_mono_mode, |
1353 | LANG_RECORDING_MONO_MODE, INT(0), "rec mono mode","L+R,L,R",UNUSED}, | 1343 | LANG_RECORDING_MONO_MODE, INT(0), "rec mono mode","L+R,L,R",UNUSED}, |
1354 | #endif | ||
1355 | CHOICE_SETTING(F_RECSETTING, rec_split_type, LANG_SPLIT_TYPE, 0, | 1344 | CHOICE_SETTING(F_RECSETTING, rec_split_type, LANG_SPLIT_TYPE, 0, |
1356 | "rec split type", "Split,Stop,Shutdown", NULL, 3, | 1345 | "rec split type", "Split,Stop,Shutdown", NULL, 3, |
1357 | ID2P(LANG_START_NEW_FILE), ID2P(LANG_STOP_RECORDING),ID2P(LANG_STOP_RECORDING_AND_SHUTDOWN)), | 1346 | ID2P(LANG_START_NEW_FILE), ID2P(LANG_STOP_RECORDING),ID2P(LANG_STOP_RECORDING_AND_SHUTDOWN)), |
@@ -1398,7 +1387,6 @@ const struct settings_list settings[] = { | |||
1398 | INT(DEFAULT_REC_RIGHT_GAIN), | 1387 | INT(DEFAULT_REC_RIGHT_GAIN), |
1399 | "rec right gain",NULL,UNUSED}, | 1388 | "rec right gain",NULL,UNUSED}, |
1400 | #endif /* DEFAULT_REC_RIGHT_GAIN */ | 1389 | #endif /* DEFAULT_REC_RIGHT_GAIN */ |
1401 | #if CONFIG_CODEC == SWCODEC | ||
1402 | {F_T_INT|F_RECSETTING,&global_settings.rec_frequency, | 1390 | {F_T_INT|F_RECSETTING,&global_settings.rec_frequency, |
1403 | LANG_FREQUENCY,INT(REC_FREQ_DEFAULT), | 1391 | LANG_FREQUENCY,INT(REC_FREQ_DEFAULT), |
1404 | "rec frequency",REC_FREQ_CFG_VAL_LIST,UNUSED}, | 1392 | "rec frequency",REC_FREQ_CFG_VAL_LIST,UNUSED}, |
@@ -1417,7 +1405,6 @@ const struct settings_list settings[] = { | |||
1417 | /* wavpack_enc */ | 1405 | /* wavpack_enc */ |
1418 | /* (no settings yet) */ | 1406 | /* (no settings yet) */ |
1419 | /** Encoder settings end **/ | 1407 | /** Encoder settings end **/ |
1420 | #endif /* CONFIG_CODEC == SWCODEC */ | ||
1421 | /* values for the trigger */ | 1408 | /* values for the trigger */ |
1422 | INT_SETTING(F_RECSETTING, rec_start_thres_db, LANG_RECORD_START_THRESHOLD, -35, | 1409 | INT_SETTING(F_RECSETTING, rec_start_thres_db, LANG_RECORD_START_THRESHOLD, -35, |
1423 | "trigger start threshold dB", UNIT_DB, -89, 0, 1, NULL, NULL, NULL), | 1410 | "trigger start threshold dB", UNIT_DB, -89, 0, 1, NULL, NULL, NULL), |
@@ -1465,7 +1452,6 @@ const struct settings_list settings[] = { | |||
1465 | LANG_SET_BOOL_YES, LANG_SET_BOOL_NO, NULL), | 1452 | LANG_SET_BOOL_YES, LANG_SET_BOOL_NO, NULL), |
1466 | 1453 | ||
1467 | #ifdef HAVE_TAGCACHE | 1454 | #ifdef HAVE_TAGCACHE |
1468 | #if CONFIG_CODEC == SWCODEC | ||
1469 | BOOL_SETTING(0, autoresume_enable, LANG_AUTORESUME, false, | 1455 | BOOL_SETTING(0, autoresume_enable, LANG_AUTORESUME, false, |
1470 | "autoresume enable", off_on, | 1456 | "autoresume enable", off_on, |
1471 | LANG_SET_BOOL_YES, LANG_SET_BOOL_NO, NULL), | 1457 | LANG_SET_BOOL_YES, LANG_SET_BOOL_NO, NULL), |
@@ -1478,7 +1464,6 @@ const struct settings_list settings[] = { | |||
1478 | ID2P(LANG_AUTORESUME_CUSTOM)), | 1464 | ID2P(LANG_AUTORESUME_CUSTOM)), |
1479 | TEXT_SETTING(0, autoresume_paths, "autoresume next track paths", | 1465 | TEXT_SETTING(0, autoresume_paths, "autoresume next track paths", |
1480 | "/podcast:/podcasts", NULL, NULL), | 1466 | "/podcast:/podcasts", NULL, NULL), |
1481 | #endif | ||
1482 | 1467 | ||
1483 | OFFON_SETTING(0, runtimedb, LANG_RUNTIMEDB_ACTIVE, false, | 1468 | OFFON_SETTING(0, runtimedb, LANG_RUNTIMEDB_ACTIVE, false, |
1484 | "gather runtime data", NULL), | 1469 | "gather runtime data", NULL), |
@@ -1486,7 +1471,6 @@ const struct settings_list settings[] = { | |||
1486 | DEFAULT_TAGCACHE_SCAN_PATHS, NULL, NULL), | 1471 | DEFAULT_TAGCACHE_SCAN_PATHS, NULL, NULL), |
1487 | #endif | 1472 | #endif |
1488 | 1473 | ||
1489 | #if CONFIG_CODEC == SWCODEC | ||
1490 | /* replay gain */ | 1474 | /* replay gain */ |
1491 | CHOICE_SETTING(F_SOUNDSETTING, replaygain_settings.type, | 1475 | CHOICE_SETTING(F_SOUNDSETTING, replaygain_settings.type, |
1492 | LANG_REPLAYGAIN_MODE, REPLAYGAIN_SHUFFLE, "replaygain type", | 1476 | LANG_REPLAYGAIN_MODE, REPLAYGAIN_SHUFFLE, "replaygain type", |
@@ -1747,7 +1731,6 @@ const struct settings_list settings[] = { | |||
1747 | LANG_COMPRESSOR_RELEASE, 500, | 1731 | LANG_COMPRESSOR_RELEASE, 500, |
1748 | "compressor release time", UNIT_MS, 100, 1000, | 1732 | "compressor release time", UNIT_MS, 100, 1000, |
1749 | 100, NULL, NULL, compressor_set), | 1733 | 100, NULL, NULL, compressor_set), |
1750 | #endif /* CONFIG_CODEC == SWCODEC */ | ||
1751 | 1734 | ||
1752 | #ifdef AUDIOHW_HAVE_BASS_CUTOFF | 1735 | #ifdef AUDIOHW_HAVE_BASS_CUTOFF |
1753 | SOUND_SETTING(F_NO_WRAP, bass_cutoff, LANG_BASS_CUTOFF, | 1736 | SOUND_SETTING(F_NO_WRAP, bass_cutoff, LANG_BASS_CUTOFF, |
@@ -2023,7 +2006,6 @@ const struct settings_list settings[] = { | |||
2023 | 3, "list_accel_wait", UNIT_SEC, 1, 10, 1, | 2006 | 3, "list_accel_wait", UNIT_SEC, 1, 10, 1, |
2024 | scanaccel_formatter, NULL, NULL), | 2007 | scanaccel_formatter, NULL, NULL), |
2025 | #endif /* HAVE_WHEEL_ACCELERATION */ | 2008 | #endif /* HAVE_WHEEL_ACCELERATION */ |
2026 | #if CONFIG_CODEC == SWCODEC | ||
2027 | /* keyclick */ | 2009 | /* keyclick */ |
2028 | #ifdef HAVE_HARDWARE_CLICK | 2010 | #ifdef HAVE_HARDWARE_CLICK |
2029 | CHOICE_SETTING(0, keyclick, LANG_KEYCLICK_SOFTWARE, 0, | 2011 | CHOICE_SETTING(0, keyclick, LANG_KEYCLICK_SOFTWARE, 0, |
@@ -2042,7 +2024,6 @@ const struct settings_list settings[] = { | |||
2042 | OFFON_SETTING(0, keyclick_repeats, LANG_KEYCLICK_REPEATS, false, | 2024 | OFFON_SETTING(0, keyclick_repeats, LANG_KEYCLICK_REPEATS, false, |
2043 | "keyclick repeats", NULL), | 2025 | "keyclick repeats", NULL), |
2044 | #endif | 2026 | #endif |
2045 | #endif /* CONFIG_CODEC == SWCODEC */ | ||
2046 | TEXT_SETTING(0, playlist_catalog_dir, "playlist catalog directory", | 2027 | TEXT_SETTING(0, playlist_catalog_dir, "playlist catalog directory", |
2047 | PLAYLIST_CATALOG_DEFAULT_DIR, NULL, NULL), | 2028 | PLAYLIST_CATALOG_DEFAULT_DIR, NULL, NULL), |
2048 | INT_SETTING(F_TIME_SETTING, sleeptimer_duration, LANG_SLEEP_TIMER_DURATION, | 2029 | INT_SETTING(F_TIME_SETTING, sleeptimer_duration, LANG_SLEEP_TIMER_DURATION, |
@@ -2117,11 +2098,9 @@ const struct settings_list settings[] = { | |||
2117 | #ifdef HAVE_PITCHCONTROL | 2098 | #ifdef HAVE_PITCHCONTROL |
2118 | OFFON_SETTING(0, pitch_mode_semitone, LANG_SEMITONE, false, | 2099 | OFFON_SETTING(0, pitch_mode_semitone, LANG_SEMITONE, false, |
2119 | "Semitone pitch change", NULL), | 2100 | "Semitone pitch change", NULL), |
2120 | #if CONFIG_CODEC == SWCODEC | ||
2121 | OFFON_SETTING(0, pitch_mode_timestretch, LANG_TIMESTRETCH, false, | 2101 | OFFON_SETTING(0, pitch_mode_timestretch, LANG_TIMESTRETCH, false, |
2122 | "Timestretch mode", NULL), | 2102 | "Timestretch mode", NULL), |
2123 | #endif | 2103 | #endif |
2124 | #endif | ||
2125 | 2104 | ||
2126 | #ifdef USB_ENABLE_HID | 2105 | #ifdef USB_ENABLE_HID |
2127 | OFFON_SETTING(0, usb_hid, LANG_USB_HID, true, "usb hid", usb_set_hid), | 2106 | OFFON_SETTING(0, usb_hid, LANG_USB_HID, true, "usb hid", usb_set_hid), |
@@ -2187,11 +2166,9 @@ const struct settings_list settings[] = { | |||
2187 | HOTKEY_OPEN_WITH, HOTKEY_DELETE, HOTKEY_INSERT, HOTKEY_INSERT_SHUFFLED), | 2166 | HOTKEY_OPEN_WITH, HOTKEY_DELETE, HOTKEY_INSERT, HOTKEY_INSERT_SHUFFLED), |
2188 | #endif | 2167 | #endif |
2189 | 2168 | ||
2190 | #if CONFIG_CODEC == SWCODEC | ||
2191 | INT_SETTING(F_TIME_SETTING, resume_rewind, LANG_RESUME_REWIND, 0, | 2169 | INT_SETTING(F_TIME_SETTING, resume_rewind, LANG_RESUME_REWIND, 0, |
2192 | "resume rewind", UNIT_SEC, 0, 60, 5, | 2170 | "resume rewind", UNIT_SEC, 0, 60, 5, |
2193 | formatter_time_unit_0_is_off, getlang_time_unit_0_is_off, NULL), | 2171 | formatter_time_unit_0_is_off, getlang_time_unit_0_is_off, NULL), |
2194 | #endif | ||
2195 | CUSTOM_SETTING(0, root_menu_customized, | 2172 | CUSTOM_SETTING(0, root_menu_customized, |
2196 | LANG_ROCKBOX_TITLE, /* lang string here is never actually used */ | 2173 | LANG_ROCKBOX_TITLE, /* lang string here is never actually used */ |
2197 | NULL, "root menu order", | 2174 | NULL, "root menu order", |