diff options
-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 | ||||
-rw-r--r-- | firmware/export/audio.h | 3 | ||||
-rw-r--r-- | firmware/mpeg.c | 9 | ||||
-rw-r--r-- | firmware/pcm_record.c | 5 |
8 files changed, 12 insertions, 33 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); |
diff --git a/firmware/export/audio.h b/firmware/export/audio.h index ab6f41c81f..66f6bfe45b 100644 --- a/firmware/export/audio.h +++ b/firmware/export/audio.h | |||
@@ -94,8 +94,7 @@ void audio_resume_recording(void); | |||
94 | void audio_new_file(const char *filename); | 94 | void audio_new_file(const char *filename); |
95 | void audio_set_recording_options(int frequency, int quality, | 95 | void audio_set_recording_options(int frequency, int quality, |
96 | int source, int channel_mode, | 96 | int source, int channel_mode, |
97 | bool editable, int prerecord_time, | 97 | bool editable, int prerecord_time); |
98 | bool monitor); | ||
99 | void audio_set_recording_gain(int left, int right, int type); | 98 | void audio_set_recording_gain(int left, int right, int type); |
100 | unsigned long audio_recorded_time(void); | 99 | unsigned long audio_recorded_time(void); |
101 | unsigned long audio_num_recorded_bytes(void); | 100 | unsigned long audio_num_recorded_bytes(void); |
diff --git a/firmware/mpeg.c b/firmware/mpeg.c index e2de6ad85a..ef7c315b0c 100644 --- a/firmware/mpeg.c +++ b/firmware/mpeg.c | |||
@@ -2437,8 +2437,7 @@ static void stop_recording(void) | |||
2437 | 2437 | ||
2438 | void audio_set_recording_options(int frequency, int quality, | 2438 | void audio_set_recording_options(int frequency, int quality, |
2439 | int source, int channel_mode, | 2439 | int source, int channel_mode, |
2440 | bool editable, int prerecord_time, | 2440 | bool editable, int prerecord_time) |
2441 | bool monitor) | ||
2442 | { | 2441 | { |
2443 | bool is_mpeg1; | 2442 | bool is_mpeg1; |
2444 | 2443 | ||
@@ -2462,7 +2461,7 @@ void audio_set_recording_options(int frequency, int quality, | |||
2462 | 2461 | ||
2463 | DEBUGF("mas_writemem(MAS_BANK_D0, SOFT_MUTE, %x)\n", shadow_soft_mute); | 2462 | DEBUGF("mas_writemem(MAS_BANK_D0, SOFT_MUTE, %x)\n", shadow_soft_mute); |
2464 | 2463 | ||
2465 | shadow_io_control_main = ((monitor?(1 << 10):0) | /* Monitoring ON */ | 2464 | shadow_io_control_main = ((1 << 10) | /* Monitoring ON */ |
2466 | ((source < 2)?1:2) << 8) | /* Input select */ | 2465 | ((source < 2)?1:2) << 8) | /* Input select */ |
2467 | (1 << 5) | /* SDO strobe invert */ | 2466 | (1 << 5) | /* SDO strobe invert */ |
2468 | ((is_mpeg1?0:1) << 3) | | 2467 | ((is_mpeg1?0:1) << 3) | |
@@ -2647,8 +2646,7 @@ void audio_init_recording(void) | |||
2647 | } | 2646 | } |
2648 | void audio_set_recording_options(int frequency, int quality, | 2647 | void audio_set_recording_options(int frequency, int quality, |
2649 | int source, int channel_mode, | 2648 | int source, int channel_mode, |
2650 | bool editable, int prerecord_time, | 2649 | bool editable, int prerecord_time) |
2651 | int monitor) | ||
2652 | { | 2650 | { |
2653 | /* a dummy */ | 2651 | /* a dummy */ |
2654 | (void)frequency; | 2652 | (void)frequency; |
@@ -2657,7 +2655,6 @@ void audio_set_recording_options(int frequency, int quality, | |||
2657 | (void)channel_mode; | 2655 | (void)channel_mode; |
2658 | (void)editable; | 2656 | (void)editable; |
2659 | (void)prerecord_time; | 2657 | (void)prerecord_time; |
2660 | (void)monitor; | ||
2661 | } | 2658 | } |
2662 | #endif /* SIMULATOR */ | 2659 | #endif /* SIMULATOR */ |
2663 | #endif /* CONFIG_CODEC == MAS3587F */ | 2660 | #endif /* CONFIG_CODEC == MAS3587F */ |
diff --git a/firmware/pcm_record.c b/firmware/pcm_record.c index b167d6a562..1200669456 100644 --- a/firmware/pcm_record.c +++ b/firmware/pcm_record.c | |||
@@ -208,8 +208,7 @@ unsigned long audio_num_recorded_bytes(void) | |||
208 | */ | 208 | */ |
209 | void audio_set_recording_options(int frequency, int quality, | 209 | void audio_set_recording_options(int frequency, int quality, |
210 | int source, int channel_mode, | 210 | int source, int channel_mode, |
211 | bool editable, int prerecord_time, | 211 | bool editable, int prerecord_time) |
212 | bool monitor) | ||
213 | { | 212 | { |
214 | /* TODO: */ | 213 | /* TODO: */ |
215 | (void)frequency; | 214 | (void)frequency; |
@@ -233,7 +232,7 @@ void audio_set_recording_options(int frequency, int quality, | |||
233 | break; | 232 | break; |
234 | } | 233 | } |
235 | 234 | ||
236 | uda1380_set_monitor(monitor); | 235 | uda1380_set_monitor(true); |
237 | } | 236 | } |
238 | 237 | ||
239 | 238 | ||