From 428f069a1f1da9fe5461d2c2359f3da1bfb63e0a Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Tue, 28 Jan 2014 15:34:53 +0100 Subject: [PATCH] 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 --- apps/audio_thread.c | 4 ---- apps/mpeg.c | 2 -- 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) 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 bfe3d6d54f..c0b2ae0c0e 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 e4a44dafe1..13dcb5cca9 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("talk_init"); - talk_init(); /* use voice of same language */ - CHART("talk_init"); + talk_init(); /* use voice of same language */ + CHART("icons_init");