Move Ubuntu tts player to generic.

Change-Id: I67ff0c92f83502734b9aac56ab91b67504c70449

diff --git a/dali/internal/accessibility/file.list b/dali/internal/accessibility/file.list
index c0674f6..00bd528 100644 (file)
--- a/dali/internal/accessibility/file.list
+++ b/dali/internal/accessibility/file.list
@@ -32,8 +32,8 @@ adaptor_accessibility_tizen_tv_src_files=\
 adaptor_accessibility_tizen_wearable_src_files=\
     ${adaptor_accessibility_dir}/tizen-wayland/tizen-wearable/accessibility-adaptor-impl-wearable.cpp
 
-# module: accessibility, backend: ubuntu
+# module: accessibility, backend: generic
 adaptor_accessibility_ubuntu_src_files=\
     ${adaptor_accessibility_dir}/generic/accessibility-adaptor-impl-generic.cpp \
-    ${adaptor_accessibility_dir}/ubuntu/tts-player-factory-ubuntu.cpp \
-    ${adaptor_accessibility_dir}/ubuntu/tts-player-impl-ubuntu.cpp
+    ${adaptor_accessibility_dir}/generic/tts-player-factory-generic.cpp \
+    ${adaptor_accessibility_dir}/generic/tts-player-impl-generic.cpp

diff --git a/dali/internal/accessibility/ubuntu/tts-player-factory-ubuntu.cpp b/dali/internal/accessibility/generic/tts-player-factory-generic.cpp
similarity index 82%
rename from dali/internal/accessibility/ubuntu/tts-player-factory-ubuntu.cpp
rename to dali/internal/accessibility/generic/tts-player-factory-generic.cpp
index ef43e15..ac70139 100644 (file)
--- a/dali/internal/accessibility/ubuntu/tts-player-factory-ubuntu.cpp
+++ b/dali/internal/accessibility/generic/tts-player-factory-generic.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
  */
 
 #include <dali/internal/accessibility/common/tts-player-factory.h>
-#include <dali/internal/accessibility/ubuntu/tts-player-impl-ubuntu.h>
+#include <dali/internal/accessibility/generic/tts-player-impl-generic.h>
 
 namespace Dali
 {
@@ -32,7 +32,7 @@ namespace TtsPlayerFactory
 
 std::unique_ptr<TtsPlayer> New(Dali::TtsPlayer::Mode mode)
 {
-  return TtsPlayerUbuntu::New(mode);
+  return TtsPlayerGeneric::New(mode);
 }
 
 } // namespace TtsPlayerFactory
@@ -41,4 +41,4 @@ std::unique_ptr<TtsPlayer> New(Dali::TtsPlayer::Mode mode)
 
 } // namespace Internal
 
-} // namespace Dali
\ No newline at end of file
+} // namespace Dali

diff --git a/dali/internal/accessibility/ubuntu/tts-player-impl-ubuntu.cpp b/dali/internal/accessibility/generic/tts-player-impl-generic.cpp
similarity index 53%
rename from dali/internal/accessibility/ubuntu/tts-player-impl-ubuntu.cpp
rename to dali/internal/accessibility/generic/tts-player-impl-generic.cpp
index cec2109..5200af5 100644 (file)
--- a/dali/internal/accessibility/ubuntu/tts-player-impl-ubuntu.cpp
+++ b/dali/internal/accessibility/generic/tts-player-impl-generic.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/internal/accessibility/ubuntu/tts-player-impl-ubuntu.h>
+#include <dali/internal/accessibility/generic/tts-player-impl-generic.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/object/type-registry.h>
@@ -32,46 +32,46 @@ namespace Adaptor
 {
 
 #if defined(DEBUG_ENABLED)
-Debug::Filter* TtsPlayerUbuntu::gLogFilter = Debug::Filter::New(Debug::Concise, false, "LOG_TTS_PLAYER");
+Debug::Filter* TtsPlayerGeneric::gLogFilter = Debug::Filter::New(Debug::Concise, false, "LOG_TTS_PLAYER");
 #endif
 
-std::unique_ptr<TtsPlayerUbuntu> TtsPlayerUbuntu::New(Dali::TtsPlayer::Mode mode)
+std::unique_ptr<TtsPlayerGeneric> TtsPlayerGeneric::New(Dali::TtsPlayer::Mode mode)
 {
-  return std::unique_ptr<TtsPlayerUbuntu>(new TtsPlayerUbuntu(mode));
+  return std::unique_ptr<TtsPlayerGeneric>(new TtsPlayerGeneric(mode));
 }
 
-TtsPlayerUbuntu::TtsPlayerUbuntu(Dali::TtsPlayer::Mode mode)
+TtsPlayerGeneric::TtsPlayerGeneric(Dali::TtsPlayer::Mode mode)
 : mStateChangedSignal()
 {
-  DALI_LOG_ERROR("TTS is not implemented in UBUNTU profile.\n");
+  DALI_LOG_ERROR("TTS is not implemented in GENERIC profile.\n");
 }
 
-TtsPlayerUbuntu::~TtsPlayerUbuntu()
+TtsPlayerGeneric::~TtsPlayerGeneric()
 {
 }
 
-void TtsPlayerUbuntu::Play(const std::string& text)
+void TtsPlayerGeneric::Play(const std::string& text)
 {
 }
 
-void TtsPlayerUbuntu::Stop()
+void TtsPlayerGeneric::Stop()
 {
 }
 
-void TtsPlayerUbuntu::Pause()
+void TtsPlayerGeneric::Pause()
 {
 }
 
-void TtsPlayerUbuntu::Resume()
+void TtsPlayerGeneric::Resume()
 {
 }
 
-Dali::TtsPlayer::State TtsPlayerUbuntu::GetState()
+Dali::TtsPlayer::State TtsPlayerGeneric::GetState()
 {
   return Dali::TtsPlayer::UNAVAILABLE;
 }
 
-Dali::TtsPlayer::StateChangedSignalType& TtsPlayerUbuntu::StateChangedSignal()
+Dali::TtsPlayer::StateChangedSignalType& TtsPlayerGeneric::StateChangedSignal()
 {
   return mStateChangedSignal;
 }

diff --git a/dali/internal/accessibility/ubuntu/tts-player-impl-ubuntu.h b/dali/internal/accessibility/generic/tts-player-impl-generic.h
similarity index 81%
rename from dali/internal/accessibility/ubuntu/tts-player-impl-ubuntu.h
rename to dali/internal/accessibility/generic/tts-player-impl-generic.h
index d9380b5..c310a93 100644 (file)
--- a/dali/internal/accessibility/ubuntu/tts-player-impl-ubuntu.h
+++ b/dali/internal/accessibility/generic/tts-player-impl-generic.h
@@ -1,8 +1,8 @@
-#ifndef DALI_INTERNAL_ACCESSIBILITY_UBUNTU_TTS_PLAYER_IMPL_UBUNTU_H
-#define DALI_INTERNAL_ACCESSIBILITY_UBUNTU_TTS_PLAYER_IMPL_UBUNTU_H
+#ifndef DALI_INTERNAL_ACCESSIBILITY_GENERIC_TTS_PLAYER_IMPL_GENERIC_H
+#define DALI_INTERNAL_ACCESSIBILITY_GENERIC_TTS_PLAYER_IMPL_GENERIC_H
 
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,7 +42,7 @@ namespace Adaptor
 /**
  * Text-to-speech player
  */
-class TtsPlayerUbuntu : public Dali::Internal::Adaptor::TtsPlayer
+class TtsPlayerGeneric : public Dali::Internal::Adaptor::TtsPlayer
 {
 
 public:
@@ -53,7 +53,7 @@ public:
    * @param mode the mode of tts-player
    * @return A newly created TtsPlayer.
    */
-  static std::unique_ptr<TtsPlayerUbuntu> New(Dali::TtsPlayer::Mode mode);
+  static std::unique_ptr<TtsPlayerGeneric> New(Dali::TtsPlayer::Mode mode);
 
   /**
    * @copydoc TtsPlayer::Play()
@@ -89,12 +89,12 @@ public:
    * Private Constructor; see also TtsPlayer::New()
    * @param mode the mode of tts-player
    */
-  TtsPlayerUbuntu(Dali::TtsPlayer::Mode mode);
+  TtsPlayerGeneric(Dali::TtsPlayer::Mode mode);
 
   /**
    * Destructor
    */
-  virtual ~TtsPlayerUbuntu();
+  virtual ~TtsPlayerGeneric();
 
 private:
 
@@ -112,4 +112,4 @@ public:
 
 } // namespace Dali
 
-#endif // DALI_INTERNAL_ACCESSIBILITY_UBUNTU_TTS_PLAYER_IMPL_UBUNTU_H
+#endif // DALI_INTERNAL_ACCESSIBILITY_GENERIC_TTS_PLAYER_IMPL_GENERIC_H