diff options
Diffstat (limited to 'apps/talk.c')
-rw-r--r-- | apps/talk.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/apps/talk.c b/apps/talk.c index 2dcaf91420..88d9afab90 100644 --- a/apps/talk.c +++ b/apps/talk.c | |||
@@ -797,6 +797,16 @@ static void queue_clip(unsigned long clip_offset, long size, bool enqueue) | |||
797 | return; | 797 | return; |
798 | } | 798 | } |
799 | 799 | ||
800 | #if CONFIG_CODEC == SWCODEC | ||
801 | /* return if a voice codec is required or not */ | ||
802 | static bool talk_voice_required(void) | ||
803 | { | ||
804 | return (has_voicefile) /* Voice file is available */ | ||
805 | || (global_settings.talk_dir_clip) /* Thumbnail clips are required */ | ||
806 | || (global_settings.talk_file_clip); | ||
807 | } | ||
808 | #endif | ||
809 | |||
800 | /***************** Public implementation *****************/ | 810 | /***************** Public implementation *****************/ |
801 | 811 | ||
802 | void talk_init(void) | 812 | void talk_init(void) |
@@ -877,9 +887,9 @@ void talk_init(void) | |||
877 | #endif | 887 | #endif |
878 | 888 | ||
879 | #if CONFIG_CODEC == SWCODEC | 889 | #if CONFIG_CODEC == SWCODEC |
880 | /* Safe to init voice playback engine now since we now know if talk is | 890 | /* Initialize the actual voice clip playback engine as well */ |
881 | required or not */ | 891 | if (talk_voice_required()) |
882 | voice_thread_init(); | 892 | voice_thread_init(); |
883 | #endif | 893 | #endif |
884 | 894 | ||
885 | out: | 895 | out: |
@@ -887,16 +897,6 @@ out: | |||
887 | filehandle = -1; | 897 | filehandle = -1; |
888 | } | 898 | } |
889 | 899 | ||
890 | #if CONFIG_CODEC == SWCODEC | ||
891 | /* return if a voice codec is required or not */ | ||
892 | bool talk_voice_required(void) | ||
893 | { | ||
894 | return (has_voicefile) /* Voice file is available */ | ||
895 | || (global_settings.talk_dir_clip) /* Thumbnail clips are required */ | ||
896 | || (global_settings.talk_file_clip); | ||
897 | } | ||
898 | #endif | ||
899 | |||
900 | /* somebody else claims the mp3 buffer, e.g. for regular play/record */ | 900 | /* somebody else claims the mp3 buffer, e.g. for regular play/record */ |
901 | void talk_buffer_set_policy(int policy) | 901 | void talk_buffer_set_policy(int policy) |
902 | { | 902 | { |