summaryrefslogtreecommitdiffstats
path: root/apps/recorder
diff options
context:
space:
mode:
authorSteve Bavin <pondlife@pondlife.me>2007-06-11 08:28:38 +0000
committerSteve Bavin <pondlife@pondlife.me>2007-06-11 08:28:38 +0000
commit24d9f59c784ab07241b51851a2683ea1c90e89e2 (patch)
tree5a9140a80bd279870a5e6d6aa4e6f0d9797eb24f /apps/recorder
parent0fba85fe9ee8775aed331e4a9f60d91ac78ade9c (diff)
downloadrockbox-24d9f59c784ab07241b51851a2683ea1c90e89e2.tar.gz
rockbox-24d9f59c784ab07241b51851a2683ea1c90e89e2.tar.bz2
rockbox-24d9f59c784ab07241b51851a2683ea1c90e89e2.zip
When recording, disable voice menus without actually modifying user settings. Patch FS#7272, fixes bug FS #6163
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13615 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/recorder')
-rw-r--r--apps/recorder/keyboard.c10
-rw-r--r--apps/recorder/recording.c18
2 files changed, 14 insertions, 14 deletions
diff --git a/apps/recorder/keyboard.c b/apps/recorder/keyboard.c
index 5c97f2bad6..3ce0208b7e 100644
--- a/apps/recorder/keyboard.c
+++ b/apps/recorder/keyboard.c
@@ -190,7 +190,7 @@ static void kbd_spellchar(unsigned short c)
{
static char spell_char[2] = "\0\0"; /* store char to pass to talk_spell */
- if (global_settings.talk_menu && c < 128) /* voice UI? */
+ if (talk_menus_enabled() && c < 128) /* voice UI? */
{
spell_char[0] = (char)c;
talk_spell(spell_char, false);
@@ -510,7 +510,7 @@ int kbd_input(char* text, int buflen)
/* Initial edit position is after last character */
editpos = utf8length(text);
- if (global_settings.talk_menu) /* voice UI? */
+ if (talk_menus_enabled()) /* voice UI? */
talk_spell(text, true); /* spell initial text */
action_signalscreenchange();
@@ -1087,7 +1087,7 @@ int kbd_input(char* text, int buflen)
kbd_inschar(text, buflen, &editpos, ch);
}
- if (global_settings.talk_menu) /* voice UI? */
+ if (talk_menus_enabled()) /* voice UI? */
talk_spell(text, false);
/* speak revised text */
@@ -1116,7 +1116,7 @@ int kbd_input(char* text, int buflen)
kbd_inschar(text, buflen, &editpos, ch);
}
- if (global_settings.talk_menu) /* voice UI? */
+ if (talk_menus_enabled()) /* voice UI? */
talk_spell(text, false); /* speak revised text */
break;
@@ -1167,7 +1167,7 @@ int kbd_input(char* text, int buflen)
param[l].hangul = false;
kbd_inschar(text, buflen, &editpos, morse_alphabets[j]);
- if (global_settings.talk_menu) /* voice UI? */
+ if (talk_menus_enabled()) /* voice UI? */
talk_spell(text, false); /* speak revised text */
}
#endif /* KBD_MORSE_INPUT */
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c
index 226ff9a17f..f7ceb508d5 100644
--- a/apps/recorder/recording.c
+++ b/apps/recorder/recording.c
@@ -705,7 +705,6 @@ bool recording_screen(bool no_source)
int radio_status = (global_settings.rec_source != AUDIO_SRC_FMRADIO) ?
FMRADIO_OFF : get_radio_status();
#endif
- int talk_menu = global_settings.talk_menu;
#if (CONFIG_LED == LED_REAL)
bool led_state = false;
int led_countdown = 2;
@@ -741,9 +740,8 @@ bool recording_screen(bool no_source)
#endif
#if CONFIG_CODEC == SWCODEC
- /* recording_menu gets messed up: so reset talk_menu */
- talk_menu = global_settings.talk_menu;
- global_settings.talk_menu = 0;
+ /* recording_menu gets messed up: so prevent manus talking */
+ talk_disable_menus();
/* audio_init_recording stops anything playing when it takes the audio
buffer */
#else
@@ -931,8 +929,9 @@ bool recording_screen(bool no_source)
have_recorded = true;
rec_record();
last_seconds = 0;
- if (talk_menu)
- { /* no voice possible here, but a beep */
+ if (global_settings.talk_menu)
+ {
+ /* no voice possible here, but a beep */
audio_beep(HZ/2); /* longer beep on start */
}
}
@@ -960,8 +959,9 @@ bool recording_screen(bool no_source)
if(audio_stat & AUDIO_STATUS_PAUSE)
{
audio_resume_recording();
- if (talk_menu)
- { /* no voice possible here, but a beep */
+ if (global_settings.talk_menu)
+ {
+ /* no voice possible here, but a beep */
audio_beep(HZ/4); /* short beep on resume */
}
}
@@ -1695,7 +1695,7 @@ bool recording_screen(bool no_source)
rec_set_source(AUDIO_SRC_PLAYBACK, SRCF_PLAYBACK);
/* restore talk_menu setting */
- global_settings.talk_menu = talk_menu;
+ talk_enable_menus();
#else /* !SWCODEC */
audio_init_playback();
#endif /* CONFIG_CODEC == SWCODEC */