From 905e29b49012be3b9aa33fd9e7088a0b52d25354 Mon Sep 17 00:00:00 2001 From: Jinkun Jang Date: Sat, 16 Mar 2013 01:17:17 +0900 Subject: [PATCH] merge with master --- inc/FUixSpeechITextToSpeechEventListener.h | 2 -- inc/FUixSpeechSpeechToTextTypes.h | 2 +- inc/FUixSpeechTextToSpeech.h | 1 - packaging/osp-speech.spec | 2 +- src/tts/FUixSpeech_TextToSpeechImpl.cpp | 5 +++++ 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/inc/FUixSpeechITextToSpeechEventListener.h b/inc/FUixSpeechITextToSpeechEventListener.h index d3233be..e37b15a 100644 --- a/inc/FUixSpeechITextToSpeechEventListener.h +++ b/inc/FUixSpeechITextToSpeechEventListener.h @@ -73,7 +73,6 @@ public: * @since 2.0 * * @param[in] status The status of the Text-To-Speech service - * @see TextToSpeechStatus */ virtual void OnTextToSpeechStatusChanged(Tizen::Uix::Speech::TextToSpeechStatus status) = 0; @@ -83,7 +82,6 @@ public: * @since 2.0 * * @param[in] error The reason for an error in the Text-To-Speech service - * @see TextToSpeechError */ virtual void OnTextToSpeechErrorOccurred(Tizen::Uix::Speech::TextToSpeechError error) = 0; diff --git a/inc/FUixSpeechSpeechToTextTypes.h b/inc/FUixSpeechSpeechToTextTypes.h index 6e88fea..885d7c8 100644 --- a/inc/FUixSpeechSpeechToTextTypes.h +++ b/inc/FUixSpeechSpeechToTextTypes.h @@ -52,7 +52,7 @@ enum SpeechToTextStatus * * @since 2.0 * -* @see SetGrammar() +* @see SpeechToText::SetGrammar() */ enum SpeechToTextGrammar { diff --git a/inc/FUixSpeechTextToSpeech.h b/inc/FUixSpeechTextToSpeech.h index 5871d69..7dbcd90 100644 --- a/inc/FUixSpeechTextToSpeech.h +++ b/inc/FUixSpeechTextToSpeech.h @@ -316,7 +316,6 @@ public: * @param[in] rate A speech rate * @exception E_SUCCESS The method is successful. * @exception E_INVALID_STATE This instance is not initialized as yet. - * @see TextToSpeechSpeechRate */ result SetSpeechRate(TextToSpeechSpeechRate rate); diff --git a/packaging/osp-speech.spec b/packaging/osp-speech.spec index b1ff5c4..ba01da2 100755 --- a/packaging/osp-speech.spec +++ b/packaging/osp-speech.spec @@ -3,7 +3,7 @@ Name: osp-speech Summary: osp speech library -Version: 1.2.0.0 +Version: 1.2.1.0 Release: 2 Group: System/Libraries License: TO_BE/FILLED_IN diff --git a/src/tts/FUixSpeech_TextToSpeechImpl.cpp b/src/tts/FUixSpeech_TextToSpeechImpl.cpp index 5313326..c87acde 100644 --- a/src/tts/FUixSpeech_TextToSpeechImpl.cpp +++ b/src/tts/FUixSpeech_TextToSpeechImpl.cpp @@ -350,6 +350,11 @@ _TextToSpeechImpl::Speak(const String& text, TextToSpeechRequestMode requestMode ttsError = tts_play(__ttsHandle); SysTryCatch(NID_UIX_SPEECH, ttsError == TTS_ERROR_NONE, r = E_SYSTEM, E_SYSTEM, "[%s] Failed to play.", GetEngineErrorMessage(ttsError)); } + else if (requestMode == TEXT_TO_SPEECH_REQUEST_MODE_APPEND && ttsState != TTS_STATE_PLAYING) + { + ttsError = tts_play(__ttsHandle); + SysTryCatch(NID_UIX_SPEECH, ttsError == TTS_ERROR_NONE, r = E_SYSTEM, E_SYSTEM, "[%s] Failed to play.", GetEngineErrorMessage(ttsError)); + } __appendRequsetCount++; __currentRequestMode = requestMode; -- 2.34.1