update directory path for migration

Change-Id: I54f0f82fb5735ea828e8443131243c71cd009429
Signed-off-by: Wonnam Jang <wn.jang@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a869cdb..833380d 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -84,6 +84,6 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} -Llib/x86_64 -lsmt ${pkgs_LDFLAGS})
 INSTALL(FILES lib/x86_64/libsmt.so DESTINATION ${LIBDIR})
 ENDIF()
 
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIBDIR}/voice/tts/1.0/engine COMPONENT RuntimeLibraries)
-INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/vdata/ DESTINATION /usr/share/voice/tts/smt_vdata)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/ttssmt-info.xml DESTINATION ${LIBDIR}/voice/tts/1.0/engine-info/)
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${TZ_SYS_RO_SHARE}/voice/tts/1.0/engine COMPONENT RuntimeLibraries)
+INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/vdata/ DESTINATION ${TZ_SYS_RO_SHARE}/voice/tts/smt_vdata)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/ttssmt-info.xml DESTINATION ${TZ_SYS_RO_SHARE}/voice/tts/1.0/engine-info/)

diff --git a/packaging/libttssmt.spec b/packaging/libttssmt.spec
index ed04ebd..9e7781a 100644 (file)
--- a/packaging/libttssmt.spec
+++ b/packaging/libttssmt.spec
@@ -12,6 +12,7 @@ Source1001:   libttssmt.manifest
 BuildRequires:  cmake
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(libtzplatform-config)
 BuildRequires:  pkgconfig(tts)
 BuildRequires: pkgconfig(tts-engine)
 
@@ -25,7 +26,8 @@ Description: Text To Speech smt plugin shared library
 %setup -q
 cp %{SOURCE1001} .
 
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIBDIR=%{_libdir} -DINCLUDEDIR=%{_includedir}
+cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIBDIR=%{_libdir} -DINCLUDEDIR=%{_includedir} \
+        -DTZ_SYS_RO_SHARE=%TZ_SYS_RO_SHARE -DTZ_SYS_BIN=%TZ_SYS_BIN
 
 %build
 export CFLAGS="${CFLAGS} -fPIC -fvisibility=hidden"
@@ -34,14 +36,14 @@ make %{?jobs:-j%jobs}
 %install
 rm -rf %{buildroot}
 %make_install
-mkdir -p %{buildroot}/usr/share/license
-cp %{_builddir}/%{name}-%{version}/LICENSE.Flora %{buildroot}/usr/share/license/%{name}
+mkdir -p %{buildroot}%{TZ_SYS_RO_SHARE}/license
+cp %{_builddir}/%{name}-%{version}/LICENSE.Flora %{buildroot}%{TZ_SYS_RO_SHARE}/license/%{name}
 
 %files
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
-%{_libdir}/voice/tts/1.0/engine/*
-/usr/share/voice/tts/smt_vdata/*
 %{_libdir}/libsmt.so*
-%{_libdir}/voice/tts/1.0/engine-info/ttssmt-info.xml
-/usr/share/license/%{name}
+%{TZ_SYS_RO_SHARE}/voice/tts/1.0/engine/*
+%{TZ_SYS_RO_SHARE}/voice/tts/smt_vdata/*
+%{TZ_SYS_RO_SHARE}/voice/tts/1.0/engine-info/ttssmt-info.xml
+%{TZ_SYS_RO_SHARE}/license/%{name}

diff --git a/src/_SlpSmtApis.cpp b/src/_SlpSmtApis.cpp
index be6a912..59ef43d 100644 (file)
--- a/src/_SlpSmtApis.cpp
+++ b/src/_SlpSmtApis.cpp
@@ -132,7 +132,7 @@ static struct _global
 {
        NULL                     , // pfnCallback
 
-       TTSP_SPEED_NORMAL       , // eSpeechSpeed
+       8                        , // eSpeechSpeed
        -1                       , // iVoiceInfo, initial value means INVALID INDEX
        false                    , // bStop
        {}                       , // bStopMutex
@@ -279,7 +279,8 @@ void SLPSMT_SetSpeechSpeed(int const eSpeechSpeed)
        int level = -1;
 
        if (eSpeechSpeed == 0) {
-               level = TTSP_SPEED_NORMAL;
+//             level = TTSP_SPEED_NORMAL;
+               level = 8;
        } else if (eSpeechSpeed >= 1 && eSpeechSpeed <= 3) {
                level = 2;
        } else if (eSpeechSpeed >= 4 && eSpeechSpeed <= 6) {
@@ -346,7 +347,8 @@ int SLPSMT_Finalize(void)
        }
 
        _g.pfnCallback  = NULL;
-       _g.eSpeechSpeed = TTSP_SPEED_NORMAL;
+//     _g.eSpeechSpeed = TTSP_SPEED_NORMAL;
+       _g.eSpeechSpeed = 8;
        _g.iVoiceInfo   = -1;
        while(_g.ThreadId != -1){
                usleep(10000);
@@ -544,7 +546,8 @@ static void _SetSpeechSpeed(void)
        case 11 : SMTSetSpeechSpeed(eSMTSpeechSpeed_Fast    );  break;
        case 5  : SMTSetSpeechSpeed(eSMTSpeechSpeed_Slow    );  break;
        case 2  : SMTSetSpeechSpeed(eSMTSpeechSpeed_VerySlow);  break;
-       case TTSP_SPEED_NORMAL    : SMTSetSpeechSpeed(eSMTSpeechSpeed_Normal  );  break;
+//     case TTSP_SPEED_NORMAL    : SMTSetSpeechSpeed(eSMTSpeechSpeed_Normal  );  break;
+       case 8  : SMTSetSpeechSpeed(eSMTSpeechSpeed_Normal  );  break;
        }
 }
 

diff --git a/src/plugin_internal.cpp b/src/plugin_internal.cpp
index 146c401..39184f1 100644 (file)
--- a/src/plugin_internal.cpp
+++ b/src/plugin_internal.cpp
@@ -137,4 +137,15 @@ int plugin_UnloadVoice(const char* language, int type)
 void plugin_SetDaemonAPIs(ttspd_funcs_s const * pAPIs)
 {
        gpDaemonAPIs = pAPIs;
+
+       int min, normal, max;
+
+       gpDaemonAPIs->get_speed_range(&min, &normal, &max);
+
+       printf("[SMT] Speed range : min(%d) normal(%d) max(%d)\n", min, normal, max);
+
+       gpDaemonAPIs->get_pitch_range(&min, &normal, &max);
+
+       printf("[SMT] Pitch range : min(%d) normal(%d) max(%d)\n", min, normal, max);
+
 }