Init voice before audio because audio needs to know the voice buffer size. Seems to fix the occasional freeze at startup (if voice is used), and also seems to fix voice eating itself after playback.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9849 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
d5e1157cf7
commit
6488177d05
1 changed files with 11 additions and 3 deletions
14
apps/main.c
14
apps/main.c
|
@ -224,14 +224,18 @@ void init(void)
|
|||
global_settings.mdb_shape,
|
||||
global_settings.mdb_enable,
|
||||
global_settings.superbass);
|
||||
|
||||
#if CONFIG_CODEC == SWCODEC
|
||||
audio_preinit();
|
||||
#endif
|
||||
audio_init();
|
||||
button_clear_queue(); /* Empty the keyboard buffer */
|
||||
|
||||
/* audio_init must to know the size of voice buffer so init voice first */
|
||||
#if CONFIG_CODEC == SWCODEC
|
||||
talk_init();
|
||||
#endif
|
||||
|
||||
audio_init();
|
||||
button_clear_queue(); /* Empty the keyboard buffer */
|
||||
}
|
||||
|
||||
#else
|
||||
|
@ -419,11 +423,15 @@ void init(void)
|
|||
global_settings.mdb_shape,
|
||||
global_settings.mdb_enable,
|
||||
global_settings.superbass);
|
||||
|
||||
/* audio_init must to know the size of voice buffer so init voice first */
|
||||
talk_init();
|
||||
|
||||
audio_init();
|
||||
#if (defined(IRIVER_H100_SERIES) || defined(IRIVER_H300_SERIES)) && !defined(SIMULATOR)
|
||||
pcm_rec_init();
|
||||
#endif
|
||||
talk_init();
|
||||
|
||||
/* runtime database has to be initialized after audio_init() */
|
||||
cpu_boost(false);
|
||||
|
||||
|
|
Loading…
Reference in a new issue