Disable TTS temporarily in wayland environment

Change-Id: I1258086eff7b2c751d6edced624a288d8cb1ec9f

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 912f852..e68a675 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -95,7 +95,6 @@ SET(PKGS_CHECK_MODULES
         dlog
         ecore-imf
         libxml-2.0
-        tts
         vconf
         )
 
@@ -103,7 +102,7 @@ IF (with_wayland)
         ADD_DEFINITIONS("-DWAYLAND")
         pkg_check_modules(pkgs REQUIRED ${PKGS_CHECK_MODULES})
 ELSE (with_wayland)
-        pkg_check_modules(pkgs REQUIRED ${PKGS_CHECK_MODULES} utilX)
+        pkg_check_modules(pkgs REQUIRED ${PKGS_CHECK_MODULES} utilX tts)
 ENDIF(with_wayland)
 
 FOREACH(flag ${pkgs_CFLAGS})

diff --git a/packaging/libscl-ui.spec b/packaging/libscl-ui.spec
index d57b03e..97f80dc 100644 (file)
--- a/packaging/libscl-ui.spec
+++ b/packaging/libscl-ui.spec
@@ -18,13 +18,13 @@ BuildRequires:  pkgconfig(elementary)
 %else
 BuildRequires:  pkgconfig(utilX)
 BuildRequires:  pkgconfig(x11)
+BuildRequires:  pkgconfig(tts)
 %endif
 BuildRequires:  pkgconfig(vconf)
 BuildRequires:  pkgconfig(feedback)
 BuildRequires:  pkgconfig(sensor)
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(libxml-2.0)
-BuildRequires:  pkgconfig(tts)
 
 
 %description

diff --git a/scl/utils/linux/sclutils-linux.cpp b/scl/utils/linux/sclutils-linux.cpp
index d553e13..4e033ae 100644 (file)
--- a/scl/utils/linux/sclutils-linux.cpp
+++ b/scl/utils/linux/sclutils-linux.cpp
@@ -26,11 +26,11 @@
 #include <Ecore_Wayland.h>
 #else
 #include <Ecore_X.h>
+#include <tts.h>
 #endif
 #include <Ecore_Evas.h>
 #include <feedback.h>
 #include <Elementary.h>
-#include <tts.h>
 #include <vconf.h>
 
 #include <dlog.h>
@@ -40,7 +40,10 @@
 
 using namespace scl;
 
+#ifndef WAYLAND
 static tts_h tts = NULL;
+#endif
+
 #ifndef WAYLAND
 static Eina_Bool _get_default_zone_geometry_info (Ecore_X_Window root, scluint *x, scluint *y, scluint *w, scluint *h)
 {
@@ -84,6 +87,7 @@ static Eina_Bool _get_default_zone_geometry_info (Ecore_X_Window root, scluint *
 #endif
 void accessibility_changed_cb(keynode_t *key, void* data)
 {
+#ifndef WAYLAND
     int r;
     int enabled;
     if (vconf_get_int(VCONFKEY_SETAPPL_ACCESSIBILITY_TTS, &enabled)) {
@@ -133,6 +137,7 @@ void accessibility_changed_cb(keynode_t *key, void* data)
             }
         }
     }
+#endif
 }
 
 void
@@ -197,6 +202,7 @@ sclboolean
 CSCLUtilsImplLinux::play_tts(const sclchar* str) {
     SCL_DEBUG();
 
+#ifndef WAYLAND
     if (str) {
         int r;
         int utt_id = 0;
@@ -223,6 +229,7 @@ CSCLUtilsImplLinux::play_tts(const sclchar* str) {
             LOGD("Fail to add text : ret(%d)\n", r);
         }
     }
+#endif
 
     return TRUE;
 }