diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2014-01-28 15:34:53 +0100 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2014-02-02 19:40:38 +0100 |
| commit | 428f069a1f1da9fe5461d2c2359f3da1bfb63e0a (patch) | |
| tree | 060c85a8f86fc2ba706c6ab6a41e05ccd39ebb65 /apps | |
| parent | 4ce39f7e73b1d1ca4ac5c906d9f9593f46872133 (diff) | |
| download | rockbox-428f069a1f1da9fe5461d2c2359f3da1bfb63e0a.zip rockbox-428f069a1f1da9fe5461d2c2359f3da1bfb63e0a.tar.gz rockbox-428f069a1f1da9fe5461d2c2359f3da1bfb63e0a.tar.bz2 rockbox-428f069a1f1da9fe5461d2c2359f3da1bfb63e0a.tar.xz | |
talk: Remove superflous call to talk_init().
talk_init() is called by settings_apply() already which is called on boot.
Doing it again means loading the voicefile a second time which isn't necessary.
Change-Id: I4decd16401e63bf87338d3163c99d06d69fe3a3c
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/audio_thread.c | 4 | ||||
| -rw-r--r-- | apps/mpeg.c | 2 | ||||
| -rw-r--r-- | apps/settings.c | 6 |
3 files changed, 3 insertions, 9 deletions
diff --git a/apps/audio_thread.c b/apps/audio_thread.c index 4750d0c..3af8b2b 100644 --- a/apps/audio_thread.c +++ b/apps/audio_thread.c @@ -170,10 +170,6 @@ void INIT_ATTR audio_init(void) recording_init(); #endif - /* ...now...audio_reset_buffer must know the size of voicefile buffer so - init talk first which will init the buffers */ - talk_init(); - /* Probably safe to say */ audio_is_initialized = true; diff --git a/apps/mpeg.c b/apps/mpeg.c index bfe3d6d..c0b2ae0 100644 --- a/apps/mpeg.c +++ b/apps/mpeg.c @@ -3008,8 +3008,6 @@ void audio_init(void) or_b(0x08, &PADRH); #endif /* CONFIG_CODEC == MAS3587F */ - talk_init(); - #ifdef DEBUG #ifndef SIMULATOR dbg_timer_start(); diff --git a/apps/settings.c b/apps/settings.c index e4a44da..13dcb5c 100644 --- a/apps/settings.c +++ b/apps/settings.c @@ -971,10 +971,10 @@ void settings_apply(bool read_disk) CHART(">lang_core_load"); lang_core_load(buf); CHART("<lang_core_load"); - CHART(">talk_init"); - talk_init(); /* use voice of same language */ - CHART("<talk_init"); } + CHART(">talk_init"); + talk_init(); /* use voice of same language */ + CHART("<talk_init"); /* load the icon set */ CHART(">icons_init"); |