From 34072ef0c68a98fe4821224879702ee4a7094f1c Mon Sep 17 00:00:00 2001 From: Youngsoo Choi Date: Thu, 7 May 2015 18:35:22 +0900 Subject: [PATCH] [tizen v3.0] Upversion tts lib On tizen v3.0, the latest tts lib does not support variable 'tts_speed_e' and 'tts_voice_type_e'. So, each variables are defined as 'void' and 'int', as it was in tizen v2.4. Bug: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=12933 Reviewed by: Antonio Gomes, SeungSeop Park Change-Id: I49bcd9caeeac377639d4d4ed4a61fbd6f42c11b7 Signed-off-by: Youngsoo Choi --- tizen_src/chromium_impl/content/browser/speech/tts_tizen.cc | 8 ++++---- tizen_src/chromium_impl/content/browser/speech/tts_tizen.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tizen_src/chromium_impl/content/browser/speech/tts_tizen.cc b/tizen_src/chromium_impl/content/browser/speech/tts_tizen.cc index 0a7a0f4..6ceb9b4 100644 --- a/tizen_src/chromium_impl/content/browser/speech/tts_tizen.cc +++ b/tizen_src/chromium_impl/content/browser/speech/tts_tizen.cc @@ -111,7 +111,7 @@ bool TtsSupportedVoiceCallback(tts_h tts_handle, const char* language, int voice_type, void* user_data) { TtsTizen* _this = static_cast(user_data); -#if defined(TIZEN_V_2_4) +#if !defined(TIZEN_V_2_3) int currentVoiceType = voice_type; #else tts_voice_type_e currentVoiceType = static_cast(voice_type); @@ -199,7 +199,7 @@ void TtsTizen::SetTtsDefaultVoice() { DCHECK(language); default_language_ = language; free(language); -#if defined(TIZEN_V_2_4) +#if !defined(TIZEN_V_2_3) default_voice_ = voice_type; #else default_voice_ = static_cast(voice_type); @@ -261,7 +261,7 @@ void TtsTizen::SpeakStoredUtterance() { int voiceType = static_cast(default_voice_); if (!utterance_.voice.empty()) voiceType = static_cast(VoiceNameToType(utterance_.voice)); -#if defined(TIZEN_V_2_4) +#if !defined(TIZEN_V_2_3) int textSpeed; SetVoiceSpeed(utterance_.rate, &textSpeed); #else @@ -337,7 +337,7 @@ void TtsTizen::AddVoice(std::string language, tts_voice_type_e type) { voice_list_.push_back(voice); } -#if defined(TIZEN_V_2_4) +#if !defined(TIZEN_V_2_3) void TtsTizen::SetVoiceSpeed(float rate, int* textSpeed) { if (rate < 0 || rate > 10) *textSpeed = TTS_SPEED_AUTO; diff --git a/tizen_src/chromium_impl/content/browser/speech/tts_tizen.h b/tizen_src/chromium_impl/content/browser/speech/tts_tizen.h index 1b4d9bd..313abfc 100644 --- a/tizen_src/chromium_impl/content/browser/speech/tts_tizen.h +++ b/tizen_src/chromium_impl/content/browser/speech/tts_tizen.h @@ -5,7 +5,7 @@ #ifndef BROWSER_SPEECH_TTS_TIZEN_H_ #define BROWSER_SPEECH_TTS_TIZEN_H_ -#if defined(TIZEN_V_2_4) +#if !defined(TIZEN_V_2_3) typedef int tts_voice_type_e; #endif @@ -47,7 +47,7 @@ class TtsTizen { void SetTtsCallback(void* tts_data); void SetTtsDefaultVoice(); void SpeakStoredUtterance(); -#if defined(TIZEN_V_2_4) +#if !defined(TIZEN_V_2_3) void SetVoiceSpeed(float rate, int *textSpeed); #else tts_speed_e SetVoiceSpeed(float rate); -- 2.7.4