diff options
Diffstat (limited to 'apps/settings_list.c')
-rw-r--r-- | apps/settings_list.c | 59 |
1 files changed, 29 insertions, 30 deletions
diff --git a/apps/settings_list.c b/apps/settings_list.c index 17ca714e76..8576c5b926 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c | |||
@@ -207,10 +207,6 @@ static const char graphic_numeric[] = "graphic,numeric"; | |||
207 | #define DEFAULT_BACKDROP "cabbiev2" | 207 | #define DEFAULT_BACKDROP "cabbiev2" |
208 | 208 | ||
209 | #ifdef HAVE_RECORDING | 209 | #ifdef HAVE_RECORDING |
210 | /* keep synchronous to trig_durations and | ||
211 | trigger_times in settings_apply_trigger */ | ||
212 | static const char trig_durations_conf [] = | ||
213 | "0s,1s,2s,5s,10s,15s,20s,25s,30s,1min,2min,5min,10min"; | ||
214 | /* these should be in the config.h files */ | 210 | /* these should be in the config.h files */ |
215 | #if CONFIG_CODEC == MAS3587F | 211 | #if CONFIG_CODEC == MAS3587F |
216 | # define DEFAULT_REC_MIC_GAIN 8 | 212 | # define DEFAULT_REC_MIC_GAIN 8 |
@@ -918,24 +914,35 @@ const struct settings_list settings[] = { | |||
918 | /** Encoder settings end **/ | 914 | /** Encoder settings end **/ |
919 | #endif /* CONFIG_CODEC == SWCODEC */ | 915 | #endif /* CONFIG_CODEC == SWCODEC */ |
920 | /* values for the trigger */ | 916 | /* values for the trigger */ |
921 | {F_T_INT|F_RECSETTING,&global_settings.rec_start_thres, | 917 | INT_SETTING(F_RECSETTING, rec_start_thres_db, LANG_RECORD_START_THRESHOLD, -35, |
922 | LANG_RECORD_START_THRESHOLD, INT(-35), | 918 | "trigger start threshold dB", UNIT_DB, VOLUME_MIN/10, 0, -1, NULL, NULL, NULL), |
923 | "trigger start threshold",NULL,UNUSED}, | 919 | INT_SETTING(F_RECSETTING, rec_start_thres_linear, LANG_RECORD_START_THRESHOLD, 5, |
924 | {F_T_INT|F_RECSETTING,&global_settings.rec_stop_thres, | 920 | "trigger start threshold linear", UNIT_PERCENT, 0, 100, 1, NULL, NULL, NULL), |
925 | LANG_RECORD_STOP_THRESHOLD,INT(-45), | 921 | INT_SETTING(F_RECSETTING, rec_stop_thres_db, LANG_RECORD_STOP_THRESHOLD, -45, |
926 | "trigger stop threshold",NULL,UNUSED}, | 922 | "trigger stop threshold dB", UNIT_DB, VOLUME_MIN/10, 0, -1, NULL, NULL, NULL), |
927 | {F_T_INT|F_RECSETTING,&global_settings.rec_start_duration, | 923 | INT_SETTING(F_RECSETTING, rec_stop_thres_linear, LANG_RECORD_STOP_THRESHOLD, 10, |
928 | LANG_MIN_DURATION,INT(0), | 924 | "trigger stop threshold linear", UNIT_PERCENT, 0, 100, 1, NULL, NULL, NULL), |
929 | "trigger start duration",trig_durations_conf,UNUSED}, | 925 | TABLE_SETTING(F_RECSETTING, rec_start_duration, LANG_MIN_DURATION, 0, |
930 | {F_T_INT|F_RECSETTING,&global_settings.rec_stop_postrec, | 926 | "trigger start duration", |
931 | LANG_MIN_DURATION,INT(2), | 927 | "0s,1s,2s,5s,10s,15s,20s,25s,30s,1min,2min,5min,10min", |
932 | "trigger stop postrec",trig_durations_conf,UNUSED}, | 928 | UNIT_SEC, NULL, NULL, NULL, 13, |
933 | {F_T_INT|F_RECSETTING,&global_settings.rec_stop_gap, | 929 | 0,1,2,5,10,15,20,25,30,60,120,300,600), |
934 | LANG_RECORD_STOP_GAP,INT(1), | 930 | TABLE_SETTING(F_RECSETTING, rec_stop_postrec, LANG_MIN_DURATION, 0, |
935 | "trigger min gap",trig_durations_conf,UNUSED}, | 931 | "trigger stop duration", |
936 | {F_T_INT|F_RECSETTING,&global_settings.rec_trigger_mode, | 932 | "0s,1s,2s,5s,10s,15s,20s,25s,30s,1min,2min,5min,10min", |
937 | LANG_RECORD_TRIGGER,INT(0), | 933 | UNIT_SEC, NULL, NULL, NULL, 13, |
938 | "trigger mode","off,once,repeat",UNUSED}, | 934 | 0,1,2,5,10,15,20,25,30,60,120,300,600), |
935 | TABLE_SETTING(F_RECSETTING, rec_stop_gap, LANG_RECORD_STOP_GAP, 1, | ||
936 | "trigger min gap", | ||
937 | "0s,1s,2s,5s,10s,15s,20s,25s,30s,1min,2min,5min,10min", | ||
938 | UNIT_SEC, NULL, NULL, NULL, 13, | ||
939 | 0,1,2,5,10,15,20,25,30,60,120,300,600), | ||
940 | CHOICE_SETTING(F_RECSETTING, rec_trigger_mode, LANG_RECORD_TRIGGER, TRIG_MODE_OFF, | ||
941 | "trigger mode","off,once,repeat", NULL ,3, | ||
942 | ID2P(LANG_OFF), ID2P(LANG_RECORD_TRIG_NOREARM), ID2P(LANG_REPEAT)), | ||
943 | CHOICE_SETTING(F_RECSETTING, rec_trigger_type, LANG_RECORD_TRIGGER_TYPE, TRIG_TYPE_STOP, | ||
944 | "trigger mode","off,once,repeat", NULL ,3, | ||
945 | ID2P(LANG_RECORD_TRIGGER_STOP), ID2P(LANG_PAUSE), ID2P(LANG_RECORD_TRIGGER_NEWFILESTP)), | ||
939 | #endif /* HAVE_RECORDING */ | 946 | #endif /* HAVE_RECORDING */ |
940 | 947 | ||
941 | #ifdef HAVE_SPDIF_POWER | 948 | #ifdef HAVE_SPDIF_POWER |
@@ -1192,14 +1199,6 @@ const struct settings_list settings[] = { | |||
1192 | 1199 | ||
1193 | OFFON_SETTING(0, audioscrobbler, LANG_AUDIOSCROBBLER, false, | 1200 | OFFON_SETTING(0, audioscrobbler, LANG_AUDIOSCROBBLER, false, |
1194 | "Last.fm Logging", NULL), | 1201 | "Last.fm Logging", NULL), |
1195 | |||
1196 | #ifdef HAVE_RECORDING | ||
1197 | {F_T_INT|F_RECSETTING,&global_settings.rec_trigger_type, | ||
1198 | LANG_RECORD_TRIGGER_TYPE, INT(0), | ||
1199 | "trigger type","stop,pause,nf stp",UNUSED}, | ||
1200 | #endif | ||
1201 | |||
1202 | /** settings not in the old config blocks **/ | ||
1203 | #if CONFIG_TUNER | 1202 | #if CONFIG_TUNER |
1204 | FILENAME_SETTING(0, fmr_file, "fmr", "", | 1203 | FILENAME_SETTING(0, fmr_file, "fmr", "", |
1205 | FMPRESET_PATH "/", ".fmr", MAX_FILENAME+1), | 1204 | FMPRESET_PATH "/", ".fmr", MAX_FILENAME+1), |