Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Removed monitor option from audio_set_recording_options and the global setting rec_monitor.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7821 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Andy 2005-11-12 14:49:43 +00:00
parent 622f9334db
commit f6da6d85b6
8 changed files with 12 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/recorder/radio.c
View file

@ -243,8 +243,7 @@ bool radio_screen(void)
1, /* Line In */
global_settings.rec_channels,
global_settings.rec_editable,
global_settings.rec_prerecord_time,
global_settings.rec_monitor);
global_settings.rec_prerecord_time);
audio_set_recording_gain(sound_default(SOUND_LEFT_GAIN),
@ -919,8 +918,7 @@ static bool fm_recording_settings(void)
1, /* Line In */
global_settings.rec_channels,
global_settings.rec_editable,
global_settings.rec_prerecord_time,
global_settings.rec_monitor);
global_settings.rec_prerecord_time);
}
return ret;
}

12
apps/recorder/recording.c
View file

@ -332,8 +332,7 @@ bool recording_screen(void)
global_settings.rec_source,
global_settings.rec_channels,
global_settings.rec_editable,
global_settings.rec_prerecord_time,
global_settings.rec_monitor);
global_settings.rec_prerecord_time);
set_gain();
@ -594,8 +593,7 @@ bool recording_screen(void)
global_settings.rec_source,
global_settings.rec_channels,
global_settings.rec_editable,
global_settings.rec_prerecord_time,
global_settings.rec_monitor);
global_settings.rec_prerecord_time);
set_gain();
update_countdown = 1; /* Update immediately */
@ -973,8 +971,7 @@ bool f2_rec_screen(void)
global_settings.rec_source,
global_settings.rec_channels,
global_settings.rec_editable,
global_settings.rec_prerecord_time,
global_settings.rec_monitor);
global_settings.rec_prerecord_time);
set_gain();
@ -1068,8 +1065,7 @@ bool f3_rec_screen(void)
global_settings.rec_source,
global_settings.rec_channels,
global_settings.rec_editable,
global_settings.rec_prerecord_time,
global_settings.rec_monitor);
global_settings.rec_prerecord_time);
set_gain();

1
apps/settings.c
View file

@ -407,7 +407,6 @@ static const struct bit_entry hd_bits[] =
#ifdef HAVE_RECORDING
{1, S_O(rec_startup), false, "rec screen on startup", off_on },
{1, S_O(rec_monitor), true, "monitor recording", off_on },
/* values for the trigger */
{8 | SIGNED, S_O(rec_start_thres), -35, "trigger start threshold", NULL},

1
apps/settings.h
View file

@ -181,7 +181,6 @@ struct user_settings
int rec_adc_right_gain; /* -128 .. 48 */
#endif
bool rec_editable; /* true means that the bit reservoir is off */
bool rec_monitor; /* true means that one can listen to what is being recorded */
/* note: timesplit setting is not saved */
int rec_timesplit; /* 0 = off,

8
apps/sound_menu.c
View file

@ -228,12 +228,6 @@ static bool receditable(void)
&global_settings.rec_editable);
}
static bool recmonitor(void)
{
return set_bool(str(LANG_RECORDING_MONITOR),
&global_settings.rec_monitor);
}
#ifdef HAVE_UDA1380
static bool recadcleft(void)
{
@ -783,8 +777,6 @@ bool recording_menu(bool no_source)
items[i++].function = recadcright;
#endif
items[i].desc = ID2P(LANG_RECORDING_MONITOR);
items[i++].function = recmonitor;
items[i].desc = ID2P(LANG_RECORDING_EDITABLE);
items[i++].function = receditable;
items[i].desc = ID2P(LANG_RECORD_TIMESPLIT);

3
firmware/export/audio.h
View file

@ -94,8 +94,7 @@ void audio_resume_recording(void);
void audio_new_file(const char *filename);
void audio_set_recording_options(int frequency, int quality,
int source, int channel_mode,
bool editable, int prerecord_time,
bool monitor);
bool editable, int prerecord_time);
void audio_set_recording_gain(int left, int right, int type);
unsigned long audio_recorded_time(void);
unsigned long audio_num_recorded_bytes(void);

9
firmware/mpeg.c
View file

@ -2437,8 +2437,7 @@ static void stop_recording(void)
void audio_set_recording_options(int frequency, int quality,
int source, int channel_mode,
bool editable, int prerecord_time,
bool monitor)
bool editable, int prerecord_time)
{
bool is_mpeg1;
@ -2462,7 +2461,7 @@ void audio_set_recording_options(int frequency, int quality,
DEBUGF("mas_writemem(MAS_BANK_D0, SOFT_MUTE, %x)\n", shadow_soft_mute);
shadow_io_control_main = ((monitor?(1 << 10):0) | /* Monitoring ON */
shadow_io_control_main = ((1 << 10) | /* Monitoring ON */
((source < 2)?1:2) << 8) | /* Input select */
(1 << 5) | /* SDO strobe invert */
((is_mpeg1?0:1) << 3) |
@ -2647,8 +2646,7 @@ void audio_init_recording(void)
}
void audio_set_recording_options(int frequency, int quality,
int source, int channel_mode,
bool editable, int prerecord_time,
int monitor)
bool editable, int prerecord_time)
{
/* a dummy */
(void)frequency;
@ -2657,7 +2655,6 @@ void audio_set_recording_options(int frequency, int quality,
(void)channel_mode;
(void)editable;
(void)prerecord_time;
(void)monitor;
}
#endif /* SIMULATOR */
#endif /* CONFIG_CODEC == MAS3587F */

5
firmware/pcm_record.c
View file

@ -208,8 +208,7 @@ unsigned long audio_num_recorded_bytes(void)
*/
void audio_set_recording_options(int frequency, int quality,
int source, int channel_mode,
bool editable, int prerecord_time,
bool monitor)
bool editable, int prerecord_time)
{
/* TODO: */
(void)frequency;
@ -233,7 +232,7 @@ void audio_set_recording_options(int frequency, int quality,
break;
}
uda1380_set_monitor(monitor);
uda1380_set_monitor(true);
}