Merge "Revert "Disable TTS temporarily in wayland environment"" into tizen

diff --combined scl/utils/linux/sclutils-linux.cpp
index c051482,d553e13..13d4612
--- 1/scl/utils/linux/sclutils-linux.cpp
--- 2/scl/utils/linux/sclutils-linux.cpp
+++ b/scl/utils/linux/sclutils-linux.cpp
@@@ -26,11 -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,10 -40,7 +40,7 @@@
  
  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)
  {
@@@ -87,10 -84,9 +84,9 @@@
  #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)) {
 +    int enabled = 0;
 +    if (vconf_get_int(VCONFKEY_SETAPPL_ACCESSIBILITY_TTS, &enabled) == 0) {
          LOGD("VCONFKEY_SETAPPL_ACCESSIBILITY_TTS : %d, (%p)", enabled, tts);
          if (enabled) {
              if (tts == NULL) {
@@@ -137,7 -133,6 +133,6 @@@
              }
          }
      }
- #endif
  }
  
  void
@@@ -162,6 -157,8 +157,6 @@@ CSCLUtilsImplLinux::fini() 
  sclboolean
  CSCLUtilsImplLinux::get_screen_resolution(sclint *x, sclint *y) {
      SCL_DEBUG();
 -    //*x = gdk_screen_get_width(gdk_screen_get_default());
 -    //*y = gdk_screen_get_height(gdk_screen_get_default());
      CSCLContext *context = CSCLContext::get_instance();
  
      static Evas_Coord scr_w = 0, scr_h = 0;
@@@ -169,6 -166,10 +164,6 @@@
  #ifdef WAYLAND
          ecore_wl_sync();
          ecore_wl_screen_size_get(&scr_w, &scr_h);
 -        if (scr_w >= 720)
 -            scr_w = 720;
 -        else
 -            scr_w = 600;
  #else
          scluint w, h;
          w = h = 0;
@@@ -196,7 -197,6 +191,6 @@@ sclboolea
  CSCLUtilsImplLinux::play_tts(const sclchar* str) {
      SCL_DEBUG();
  
- #ifndef WAYLAND
      if (str) {
          int r;
          int utt_id = 0;
@@@ -223,7 -223,6 +217,6 @@@
              LOGD("Fail to add text : ret(%d)\n", r);
          }
      }
- #endif
  
      return TRUE;
  }