FS#7994 - Rename talk.c API, make talk_disable() affect all talking (not just menus), hopefully save some space.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15206 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 13 insertions, 13 deletions

diff --git a/apps/recorder/keyboard.c b/apps/recorder/keyboard.c
index 9c35f288ff..6c75d07a65 100644
--- a/apps/recorder/keyboard.c
+++ b/apps/recorder/keyboard.c
@@ -191,7 +191,7 @@ int load_kbd(unsigned char* filename)
 /* helper function to spell a char if voice UI is enabled */
 static void kbd_spellchar(unsigned short c)
 {
-    if (talk_menus_enabled()) /* voice UI? */
+    if (global_settings.talk_menu) /* voice UI? */
     {
         unsigned char tmp[5];
         /* store char to pass to talk_spell */
@@ -208,7 +208,7 @@ static void kbd_spellchar(unsigned short c)
 #ifdef KBD_MODES
 static void say_edit(void)
 {
-    if(talk_menus_enabled())
+    if(global_settings.talk_menu)
         talk_id(VOICE_EDIT, false);
 }
 #endif
@@ -527,7 +527,7 @@ int kbd_input(char* text, int buflen)
     /* Initial edit position is after last character */
     editpos = utf8length(text);
 
-    if (talk_menus_enabled()) /* voice UI? */
+    if (global_settings.talk_menu) /* voice UI? */
         talk_spell(text, true); /* spell initial text */
 
 
@@ -832,7 +832,7 @@ int kbd_input(char* text, int buflen)
                         kbd_spellchar(text[c]);
                     } 
 #if CONFIG_CODEC == SWCODEC
-                    else if (talk_menus_enabled())
+                    else if (global_settings.talk_menu)
                         pcmbuf_beep(1000, 150, 1500);
 #endif
                 }
@@ -877,7 +877,7 @@ int kbd_input(char* text, int buflen)
                         kbd_spellchar(text[c]);
                     } 
 #if CONFIG_CODEC == SWCODEC
-                    else if (talk_menus_enabled())
+                    else if (global_settings.talk_menu)
                         pcmbuf_beep(1000, 150, 1500);
 #endif
                 }
@@ -1124,7 +1124,7 @@ int kbd_input(char* text, int buflen)
                     kbd_inschar(text, buflen, &editpos, ch);
                 }
 
-                if (talk_menus_enabled()) /* voice UI? */
+                if (global_settings.talk_menu) /* voice UI? */
                     talk_spell(text, false);
 
                 /* speak revised text */
@@ -1153,7 +1153,7 @@ int kbd_input(char* text, int buflen)
                     kbd_inschar(text, buflen, &editpos, ch);
                 }
 
-                if (talk_menus_enabled()) /* voice UI? */
+                if (global_settings.talk_menu) /* voice UI? */
                     talk_spell(text, false);   /* speak revised text */
                 break;
 
@@ -1166,7 +1166,7 @@ int kbd_input(char* text, int buflen)
                     kbd_spellchar(text[c]);
                 }
 #if CONFIG_CODEC == SWCODEC
-                else if (talk_menus_enabled())
+                else if (global_settings.talk_menu)
                     pcmbuf_beep(1000, 150, 1500);
 #endif
                 break;
@@ -1180,7 +1180,7 @@ int kbd_input(char* text, int buflen)
                     kbd_spellchar(text[c]);
                 }
 #if CONFIG_CODEC == SWCODEC
-                else if (talk_menus_enabled())
+                else if (global_settings.talk_menu)
                     pcmbuf_beep(1000, 150, 1500);
 #endif
                 break;
@@ -1212,7 +1212,7 @@ int kbd_input(char* text, int buflen)
                         param[l].hangul = false;
                     kbd_inschar(text, buflen, &editpos, morse_alphabets[j]);
 
-                    if (talk_menus_enabled()) /* voice UI? */
+                    if (global_settings.talk_menu) /* 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 3b706e1a6d..84207c77ab 100644
--- a/apps/recorder/recording.c
+++ b/apps/recorder/recording.c
@@ -889,7 +889,7 @@ bool recording_screen(bool no_source)
 
 #if CONFIG_CODEC == SWCODEC
     /* recording_menu gets messed up: so prevent manus talking */
-    talk_disable_menus();
+    talk_disable(true);
     /* audio_init_recording stops anything playing when it takes the audio
        buffer */
 #else
@@ -1873,8 +1873,8 @@ bool recording_screen(bool no_source)
         /* Go back to playback mode */
         rec_set_source(AUDIO_SRC_PLAYBACK, SRCF_PLAYBACK);
 
-    /* restore talk_menu setting */
-    talk_enable_menus();
+    /* restore talking */
+    talk_disable(false);
 #else /* !SWCODEC */
     audio_init_playback();
 #endif /* CONFIG_CODEC == SWCODEC */