summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2012-05-30 18:42:16 -0400
committerMichael Sevakis <jethead71@rockbox.org>2012-05-30 18:42:16 -0400
commitba8e4367fb4d116ffc01c12cc619bfc714e582c9 (patch)
tree472c9a4722bef3b439310f739dbd740e0f6c7ce7
parent77220147b5678dfc148171263aafe07dfde51b67 (diff)
downloadrockbox-ba8e4367fb4d116ffc01c12cc619bfc714e582c9.tar.gz
rockbox-ba8e4367fb4d116ffc01c12cc619bfc714e582c9.zip
Disable attempts to voice init_tagcache.
It just cannot work anyways because init_tagcache is called before audio_init. Besides, FS#12684 may be helped for now as well. Change-Id: I2bb4f81f807bae509b220ee6656a6a109b5eb011
-rw-r--r--apps/main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/main.c b/apps/main.c
index 0fff0846a6..4ce72497d7 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -282,7 +282,7 @@ static void init_tagcache(void) INIT_ATTR;
282static void init_tagcache(void) 282static void init_tagcache(void)
283{ 283{
284 bool clear = false; 284 bool clear = false;
285#if CONFIG_CODEC == SWCODEC 285#if 0 /* CONFIG_CODEC == SWCODEC */
286 long talked_tick = 0; 286 long talked_tick = 0;
287#endif 287#endif
288 tagcache_init(); 288 tagcache_init();
@@ -293,7 +293,7 @@ static void init_tagcache(void)
293 293
294 if (ret > 0) 294 if (ret > 0)
295 { 295 {
296#if CONFIG_CODEC == SWCODEC 296#if 0 /* FIXME: Audio isn't even initialized yet! */ /* CONFIG_CODEC == SWCODEC */
297 /* hwcodec can't use voice here, as the database commit 297 /* hwcodec can't use voice here, as the database commit
298 * uses the audio buffer. */ 298 * uses the audio buffer. */
299 if(global_settings.talk_menu 299 if(global_settings.talk_menu