From bed20a2aed6b41a7aed5a5dd0623b5ab52c7600b Mon Sep 17 00:00:00 2001 From: howon kim Date: Mon, 9 Dec 2013 18:22:29 +0900 Subject: [PATCH] Merge commits Tizen 2.2 to Tizen 2.2.1 Change-Id: Ie2d8f3e37e2096aca32c29a113afe6c6a0331028 Signed-off-by: howon kim --- inc/FUixSpeechSpeechToText.h | 12 +++--------- inc/FUixSpeechSpeechToTextTypes.h | 6 +++--- inc/FUixSpeechTextToSpeech.h | 14 ++++---------- src/stt/FUixSpeech_SpeechToTextImpl.cpp | 8 +------- src/tts/FUixSpeech_TextToSpeechImpl.cpp | 6 ------ 5 files changed, 11 insertions(+), 35 deletions(-) diff --git a/inc/FUixSpeechSpeechToText.h b/inc/FUixSpeechSpeechToText.h index 83dc88b..564f672 100644 --- a/inc/FUixSpeechSpeechToText.h +++ b/inc/FUixSpeechSpeechToText.h @@ -190,20 +190,14 @@ public: /** * Initializes the Speech-To-Text service. @n - * The %Initialize() method is asynchronous. @n + * This method is asynchronous. @n * The ISpeechToTextEventListener::OnSpeechToTextInitialized() is invoked when the service has been initialized. * @since 2.0 * - * @feature %http://tizen.org/feature/speech.recognition - * * @return An error code * @exception E_SUCCESS The method is successful. - * @exception E_UNSUPPORTED_OPERATION The Emulator or target device does not support the required feature. @b Since: @b 2.1 - * For more information, see Application Filtering. - * @remarks - * - Before calling this method, check whether the feature is supported by - * Tizen::System::SystemInfo::GetValue(const Tizen::Base::String&, bool&). - * - This method must be called after Construct(). + * @exception E_OUT_OF_MEMORY The memory is insufficient. + * @remarks This method must be called after Construct(). */ result Initialize(void); diff --git a/inc/FUixSpeechSpeechToTextTypes.h b/inc/FUixSpeechSpeechToTextTypes.h index e514d98..885d7c8 100644 --- a/inc/FUixSpeechSpeechToTextTypes.h +++ b/inc/FUixSpeechSpeechToTextTypes.h @@ -31,7 +31,7 @@ namespace Tizen { namespace Uix { namespace Speech /** * @enum SpeechToTextStatus * -* Defines the SpeechToText status. +* Defines the %SpeechToText status. * * @since 2.0 * @@ -48,7 +48,7 @@ enum SpeechToTextStatus /** * @enum SpeechToTextGrammar * -* Defines the SpeechToText grammar. +* Defines the %SpeechToText grammar. * * @since 2.0 * @@ -63,7 +63,7 @@ enum SpeechToTextGrammar /** * @enum SpeechToTextError * -* Defines the errors in SpeechToText. @n +* Defines the errors in %SpeechToText. @n * When an error occurs, the user can not receive any %SpeechToText result. * * @since 2.0 diff --git a/inc/FUixSpeechTextToSpeech.h b/inc/FUixSpeechTextToSpeech.h index 7fcb35e..7dbcd90 100644 --- a/inc/FUixSpeechTextToSpeech.h +++ b/inc/FUixSpeechTextToSpeech.h @@ -188,21 +188,15 @@ public: /** * Initializes the Text-To-Speech service. @n - * The %Initialize() method is asynchronous. @n + * This method is asynchronous. @n * The ITextToSpeechEventListener::OnTextToSpeechInitialized() is invoked when the service has been initialized. * * @since 2.0 - * - * @feature %http://tizen.org/feature/speech.synthesis - * + * * @return An error code * @exception E_SUCCESS The method is successful. - * @exception E_UNSUPPORTED_OPERATION The Emulator or target device does not support the required feature. @b Since: @b 2.1 - * For more information, see Application Filtering. - * @remarks - * - Before calling this method, check whether the feature is supported by - * Tizen::System::SystemInfo::GetValue(const Tizen::Base::String&, bool&). - * - This method must be called after Construct(). + * @exception E_OUT_OF_MEMORY The memory is insufficient. + * @remarks This method must be called after Construct(). */ result Initialize(void); diff --git a/src/stt/FUixSpeech_SpeechToTextImpl.cpp b/src/stt/FUixSpeech_SpeechToTextImpl.cpp index ad1a958..11cb404 100644 --- a/src/stt/FUixSpeech_SpeechToTextImpl.cpp +++ b/src/stt/FUixSpeech_SpeechToTextImpl.cpp @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include @@ -37,7 +36,6 @@ using namespace Tizen::Base; using namespace Tizen::Base::Collection; using namespace Tizen::Locales; -using namespace Tizen::System; namespace Tizen { namespace Uix { namespace Speech { @@ -267,13 +265,9 @@ _SpeechToTextImpl::Construct(ISpeechToTextEventListener& listener) result _SpeechToTextImpl::Initialize(void) { - bool isSupported; - SysAssertf(__isInitialized != true, + SysAssertf(__isInitialized != true, "Already calling Initialize() twice or more on a same instance is not allowed for this class."); - Tizen::System::SystemInfo::GetValue("http://tizen.org/feature/speech.recognition", isSupported); - SysTryReturnResult(NID_UIX_SPEECH, isSupported == true, E_UNSUPPORTED_OPERATION, "The STT is Not supported"); - int sttError = stt_set_error_cb(__sttHandle, SttErrorReceiver, __pSpeechToTextListener); SysTryLog(NID_UIX_SPEECH, sttError == STT_ERROR_NONE, "[%s] Failed to set the error callback.", GetEngineErrorMessage(sttError)); SysTryReturnResult(NID_UIX_SPEECH, sttError == STT_ERROR_NONE, E_OUT_OF_MEMORY, "The memory is insufficient."); diff --git a/src/tts/FUixSpeech_TextToSpeechImpl.cpp b/src/tts/FUixSpeech_TextToSpeechImpl.cpp index 684a112..c87acde 100644 --- a/src/tts/FUixSpeech_TextToSpeechImpl.cpp +++ b/src/tts/FUixSpeech_TextToSpeechImpl.cpp @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include @@ -37,7 +36,6 @@ using namespace Tizen::Base; using namespace Tizen::Base::Collection; using namespace Tizen::Locales; -using namespace Tizen::System; #ifdef __cplusplus extern "C" @@ -289,13 +287,9 @@ _TextToSpeechImpl::Construct(ITextToSpeechEventListener& listener) result _TextToSpeechImpl::Initialize(void) { - bool isSupported; SysAssertf(__isInitialized != true, "Already calling Initialize() twice or more on a same instance is not allowed for this class."); - Tizen::System::SystemInfo::GetValue("http://tizen.org/feature/speech.synthesis", isSupported); - SysTryReturnResult(NID_UIX_SPEECH, isSupported == true, E_UNSUPPORTED_OPERATION, "The TTS is Not supported"); - int ttsError = tts_set_error_cb(__ttsHandle, TtsErrorReceiver, (void*)(__pTextToSpeechListener)); SysTryLog(NID_UIX_SPEECH, ttsError == TTS_ERROR_NONE, "[%s] Failed to set the error callback.", GetEngineErrorMessage(ttsError)); SysTryReturnResult(NID_UIX_SPEECH, ttsError == TTS_ERROR_NONE, E_OUT_OF_MEMORY, "The memory is insufficient."); -- 2.34.1