merge with master

diff --git a/inc/FUixSpeechITextToSpeechEventListener.h b/inc/FUixSpeechITextToSpeechEventListener.h
index d3233be073c737075d8f90d7fbccbbbfc68f83e8..e37b15acecdc1632d749d248c42c89f9186761ab 100644 (file)
--- 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 6e88fea51691b4476495973c2072ff0e0c2cd775..885d7c8c1311c62a4294ab5e0eb03bb66a8bbb37 100644 (file)
--- 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 5871d6966b457a0630921501356da31996ba8c63..7dbcd902d8184920fe93fa9000f233ea924c4563 100644 (file)
--- 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 b1ff5c470ca05a7bb3a862634f37ec9c89c4a082..ba01da28dc695bce0689b2b09d28c7031d1cc054 100755 (executable)
--- 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 53133269df5eca79cc8da2ce97fc72f85904f64c..c87acde6fafd21a934e12e840b7b3a206a08ab2b 100644 (file)
--- 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;