diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/recorder/radio.c | 6 | ||||
-rw-r--r-- | apps/recorder/recording.c | 12 | ||||
-rw-r--r-- | apps/settings.c | 1 | ||||
-rw-r--r-- | apps/settings.h | 1 | ||||
-rw-r--r-- | apps/sound_menu.c | 8 |
5 files changed, 6 insertions, 22 deletions
diff --git a/apps/recorder/radio.c b/apps/recorder/radio.c index 6be6d04e72..4563c6fe15 100644 --- a/apps/recorder/radio.c +++ b/apps/recorder/radio.c | |||
@@ -243,8 +243,7 @@ bool radio_screen(void) | |||
243 | 1, /* Line In */ | 243 | 1, /* Line In */ |
244 | global_settings.rec_channels, | 244 | global_settings.rec_channels, |
245 | global_settings.rec_editable, | 245 | global_settings.rec_editable, |
246 | global_settings.rec_prerecord_time, | 246 | global_settings.rec_prerecord_time); |
247 | global_settings.rec_monitor); | ||
248 | 247 | ||
249 | 248 | ||
250 | audio_set_recording_gain(sound_default(SOUND_LEFT_GAIN), | 249 | audio_set_recording_gain(sound_default(SOUND_LEFT_GAIN), |
@@ -919,8 +918,7 @@ static bool fm_recording_settings(void) | |||
919 | 1, /* Line In */ | 918 | 1, /* Line In */ |
920 | global_settings.rec_channels, | 919 | global_settings.rec_channels, |
921 | global_settings.rec_editable, | 920 | global_settings.rec_editable, |
922 | global_settings.rec_prerecord_time, | 921 | global_settings.rec_prerecord_time); |
923 | global_settings.rec_monitor); | ||
924 | } | 922 | } |
925 | return ret; | 923 | return ret; |
926 | } | 924 | } |
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c index ebd92178c5..119209a26a 100644 --- a/apps/recorder/recording.c +++ b/apps/recorder/recording.c | |||
@@ -332,8 +332,7 @@ bool recording_screen(void) | |||
332 | global_settings.rec_source, | 332 | global_settings.rec_source, |
333 | global_settings.rec_channels, | 333 | global_settings.rec_channels, |
334 | global_settings.rec_editable, | 334 | global_settings.rec_editable, |
335 | global_settings.rec_prerecord_time, | 335 | global_settings.rec_prerecord_time); |
336 | global_settings.rec_monitor); | ||
337 | 336 | ||
338 | set_gain(); | 337 | set_gain(); |
339 | 338 | ||
@@ -594,8 +593,7 @@ bool recording_screen(void) | |||
594 | global_settings.rec_source, | 593 | global_settings.rec_source, |
595 | global_settings.rec_channels, | 594 | global_settings.rec_channels, |
596 | global_settings.rec_editable, | 595 | global_settings.rec_editable, |
597 | global_settings.rec_prerecord_time, | 596 | global_settings.rec_prerecord_time); |
598 | global_settings.rec_monitor); | ||
599 | 597 | ||
600 | set_gain(); | 598 | set_gain(); |
601 | update_countdown = 1; /* Update immediately */ | 599 | update_countdown = 1; /* Update immediately */ |
@@ -973,8 +971,7 @@ bool f2_rec_screen(void) | |||
973 | global_settings.rec_source, | 971 | global_settings.rec_source, |
974 | global_settings.rec_channels, | 972 | global_settings.rec_channels, |
975 | global_settings.rec_editable, | 973 | global_settings.rec_editable, |
976 | global_settings.rec_prerecord_time, | 974 | global_settings.rec_prerecord_time); |
977 | global_settings.rec_monitor); | ||
978 | 975 | ||
979 | set_gain(); | 976 | set_gain(); |
980 | 977 | ||
@@ -1068,8 +1065,7 @@ bool f3_rec_screen(void) | |||
1068 | global_settings.rec_source, | 1065 | global_settings.rec_source, |
1069 | global_settings.rec_channels, | 1066 | global_settings.rec_channels, |
1070 | global_settings.rec_editable, | 1067 | global_settings.rec_editable, |
1071 | global_settings.rec_prerecord_time, | 1068 | global_settings.rec_prerecord_time); |
1072 | global_settings.rec_monitor); | ||
1073 | 1069 | ||
1074 | 1070 | ||
1075 | set_gain(); | 1071 | set_gain(); |
diff --git a/apps/settings.c b/apps/settings.c index d44fec1f0b..16c5cef5fb 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -407,7 +407,6 @@ static const struct bit_entry hd_bits[] = | |||
407 | 407 | ||
408 | #ifdef HAVE_RECORDING | 408 | #ifdef HAVE_RECORDING |
409 | {1, S_O(rec_startup), false, "rec screen on startup", off_on }, | 409 | {1, S_O(rec_startup), false, "rec screen on startup", off_on }, |
410 | {1, S_O(rec_monitor), true, "monitor recording", off_on }, | ||
411 | 410 | ||
412 | /* values for the trigger */ | 411 | /* values for the trigger */ |
413 | {8 | SIGNED, S_O(rec_start_thres), -35, "trigger start threshold", NULL}, | 412 | {8 | SIGNED, S_O(rec_start_thres), -35, "trigger start threshold", NULL}, |
diff --git a/apps/settings.h b/apps/settings.h index 18c566b980..152f82cbb2 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -181,7 +181,6 @@ struct user_settings | |||
181 | int rec_adc_right_gain; /* -128 .. 48 */ | 181 | int rec_adc_right_gain; /* -128 .. 48 */ |
182 | #endif | 182 | #endif |
183 | bool rec_editable; /* true means that the bit reservoir is off */ | 183 | bool rec_editable; /* true means that the bit reservoir is off */ |
184 | bool rec_monitor; /* true means that one can listen to what is being recorded */ | ||
185 | 184 | ||
186 | /* note: timesplit setting is not saved */ | 185 | /* note: timesplit setting is not saved */ |
187 | int rec_timesplit; /* 0 = off, | 186 | int rec_timesplit; /* 0 = off, |
diff --git a/apps/sound_menu.c b/apps/sound_menu.c index c429920143..833dea53b9 100644 --- a/apps/sound_menu.c +++ b/apps/sound_menu.c | |||
@@ -228,12 +228,6 @@ static bool receditable(void) | |||
228 | &global_settings.rec_editable); | 228 | &global_settings.rec_editable); |
229 | } | 229 | } |
230 | 230 | ||
231 | static bool recmonitor(void) | ||
232 | { | ||
233 | return set_bool(str(LANG_RECORDING_MONITOR), | ||
234 | &global_settings.rec_monitor); | ||
235 | } | ||
236 | |||
237 | #ifdef HAVE_UDA1380 | 231 | #ifdef HAVE_UDA1380 |
238 | static bool recadcleft(void) | 232 | static bool recadcleft(void) |
239 | { | 233 | { |
@@ -783,8 +777,6 @@ bool recording_menu(bool no_source) | |||
783 | items[i++].function = recadcright; | 777 | items[i++].function = recadcright; |
784 | #endif | 778 | #endif |
785 | 779 | ||
786 | items[i].desc = ID2P(LANG_RECORDING_MONITOR); | ||
787 | items[i++].function = recmonitor; | ||
788 | items[i].desc = ID2P(LANG_RECORDING_EDITABLE); | 780 | items[i].desc = ID2P(LANG_RECORDING_EDITABLE); |
789 | items[i++].function = receditable; | 781 | items[i++].function = receditable; |
790 | items[i].desc = ID2P(LANG_RECORD_TIMESPLIT); | 782 | items[i].desc = ID2P(LANG_RECORD_TIMESPLIT); |