summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Kurbjun <kkurbjun@gmail.com>2009-12-18 04:25:56 +0000
committerKarl Kurbjun <kkurbjun@gmail.com>2009-12-18 04:25:56 +0000
commit069bafe2152614a7d6e5343d805ac7ac4ffbd5ed (patch)
tree373d1090fdf5396c7bb97a2573cbbb129f67d9b6
parente7f2a1360914c6e48e7c7e75e41cbde51a04698c (diff)
downloadrockbox-069bafe2152614a7d6e5343d805ac7ac4ffbd5ed.tar.gz
rockbox-069bafe2152614a7d6e5343d805ac7ac4ffbd5ed.zip
Accept FS #10271 by Christian Beier: Automatically disable voice upon rockdoom startup.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24063 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/plugins/doom/rockdoom.c5
-rw-r--r--docs/CREDITS1
2 files changed, 6 insertions, 0 deletions
diff --git a/apps/plugins/doom/rockdoom.c b/apps/plugins/doom/rockdoom.c
index a76c9379b3..21efbc4147 100644
--- a/apps/plugins/doom/rockdoom.c
+++ b/apps/plugins/doom/rockdoom.c
@@ -653,6 +653,9 @@ extern int systemvol;
653/* this is the plugin entry point */ 653/* this is the plugin entry point */
654enum plugin_status plugin_start(const void* parameter) 654enum plugin_status plugin_start(const void* parameter)
655{ 655{
656 /* Disable all talking before initializing IRAM */
657 rb->talk_disable(true);
658
656 PLUGIN_IRAM_INIT(rb) 659 PLUGIN_IRAM_INIT(rb)
657 660
658 (void)parameter; 661 (void)parameter;
@@ -686,6 +689,7 @@ enum plugin_status plugin_start(const void* parameter)
686#ifdef HAVE_ADJUSTABLE_CPU_FREQ 689#ifdef HAVE_ADJUSTABLE_CPU_FREQ
687 rb->cpu_boost(false); 690 rb->cpu_boost(false);
688#endif 691#endif
692 rb->talk_disable(false);
689 if( result == -1 ) 693 if( result == -1 )
690 return PLUGIN_OK; // Quit was selected 694 return PLUGIN_OK; // Quit was selected
691 else 695 else
@@ -752,5 +756,6 @@ enum plugin_status plugin_start(const void* parameter)
752 rb->cpu_boost(false); 756 rb->cpu_boost(false);
753#endif 757#endif
754 758
759 rb->talk_disable(false);
755 return PLUGIN_OK; 760 return PLUGIN_OK;
756} 761}
diff --git a/docs/CREDITS b/docs/CREDITS
index 23fe2ee292..cdad69257b 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -509,6 +509,7 @@ Pavel Rzehák
509Diego Herranz 509Diego Herranz
510Viktor Varga 510Viktor Varga
511Juliusz Chroboczek 511Juliusz Chroboczek
512Christian Beier
512 513
513The libmad team 514The libmad team
514The wavpack team 515The wavpack team