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.tar.gz rockbox-428f069a1f1da9fe5461d2c2359f3da1bfb63e0a.zip |
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 4750d0cc43..3af8b2bbf6 100644 --- a/apps/audio_thread.c +++ b/apps/audio_thread.c | |||
@@ -170,10 +170,6 @@ void INIT_ATTR audio_init(void) | |||
170 | recording_init(); | 170 | recording_init(); |
171 | #endif | 171 | #endif |
172 | 172 | ||
173 | /* ...now...audio_reset_buffer must know the size of voicefile buffer so | ||
174 | init talk first which will init the buffers */ | ||
175 | talk_init(); | ||
176 | |||
177 | /* Probably safe to say */ | 173 | /* Probably safe to say */ |
178 | audio_is_initialized = true; | 174 | audio_is_initialized = true; |
179 | 175 | ||
diff --git a/apps/mpeg.c b/apps/mpeg.c index bfe3d6d54f..c0b2ae0c0e 100644 --- a/apps/mpeg.c +++ b/apps/mpeg.c | |||
@@ -3008,8 +3008,6 @@ void audio_init(void) | |||
3008 | or_b(0x08, &PADRH); | 3008 | or_b(0x08, &PADRH); |
3009 | #endif /* CONFIG_CODEC == MAS3587F */ | 3009 | #endif /* CONFIG_CODEC == MAS3587F */ |
3010 | 3010 | ||
3011 | talk_init(); | ||
3012 | |||
3013 | #ifdef DEBUG | 3011 | #ifdef DEBUG |
3014 | #ifndef SIMULATOR | 3012 | #ifndef SIMULATOR |
3015 | dbg_timer_start(); | 3013 | dbg_timer_start(); |
diff --git a/apps/settings.c b/apps/settings.c index e4a44dafe1..13dcb5cca9 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -971,10 +971,10 @@ void settings_apply(bool read_disk) | |||
971 | CHART(">lang_core_load"); | 971 | CHART(">lang_core_load"); |
972 | lang_core_load(buf); | 972 | lang_core_load(buf); |
973 | CHART("<lang_core_load"); | 973 | CHART("<lang_core_load"); |
974 | CHART(">talk_init"); | ||
975 | talk_init(); /* use voice of same language */ | ||
976 | CHART("<talk_init"); | ||
977 | } | 974 | } |
975 | CHART(">talk_init"); | ||
976 | talk_init(); /* use voice of same language */ | ||
977 | CHART("<talk_init"); | ||
978 | 978 | ||
979 | /* load the icon set */ | 979 | /* load the icon set */ |
980 | CHART(">icons_init"); | 980 | CHART(">icons_init"); |