summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorAndy <andy@rockbox.org>2005-11-12 14:49:43 +0000
committerAndy <andy@rockbox.org>2005-11-12 14:49:43 +0000
commitf6da6d85b6153cdd5eea4e9781e464ae9778ac25 (patch)
treea33916cb83a36a3ffe55dbaf3dfa73629199c6ca /apps
parent622f9334dbedebade18905d117d5025cbaac5f2e (diff)
downloadrockbox-f6da6d85b6153cdd5eea4e9781e464ae9778ac25.zip
rockbox-f6da6d85b6153cdd5eea4e9781e464ae9778ac25.tar.gz
rockbox-f6da6d85b6153cdd5eea4e9781e464ae9778ac25.tar.bz2
rockbox-f6da6d85b6153cdd5eea4e9781e464ae9778ac25.tar.xz
Removed monitor option from audio_set_recording_options and the global setting rec_monitor.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7821 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/recorder/radio.c6
-rw-r--r--apps/recorder/recording.c12
-rw-r--r--apps/settings.c1
-rw-r--r--apps/settings.h1
-rw-r--r--apps/sound_menu.c8
5 files changed, 6 insertions, 22 deletions
diff --git a/apps/recorder/radio.c b/apps/recorder/radio.c
index 6be6d04..4563c6f 100644
--- a/apps/recorder/radio.c
+++ b/apps/recorder/radio.c
@@ -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;
}
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c
index ebd9217..119209a 100644
--- a/apps/recorder/recording.c
+++ b/apps/recorder/recording.c
@@ -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();
diff --git a/apps/settings.c b/apps/settings.c
index d44fec1..16c5cef 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -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},
diff --git a/apps/settings.h b/apps/settings.h
index 18c566b..152f82c 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -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,
diff --git a/apps/sound_menu.c b/apps/sound_menu.c
index c429920..833dea5 100644
--- a/apps/sound_menu.c
+++ b/apps/sound_menu.c
@@ -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);