Add API to get the current state of TTS player

Change-Id: Idce0225976a6b2cf791761755cd0831e3d1ba054

diff --git a/adaptors/public-api/adaptor-framework/tts-player.cpp b/adaptors/public-api/adaptor-framework/tts-player.cpp
index 83292dc..6e20aa3 100644 (file)
--- a/adaptors/public-api/adaptor-framework/tts-player.cpp
+++ b/adaptors/public-api/adaptor-framework/tts-player.cpp
@@ -58,7 +58,7 @@ TtsPlayer& TtsPlayer::operator=(const TtsPlayer& rhs)
 
 void TtsPlayer::Play(const std::string& text)
 {
-  return GetImplementation(*this).Play(text);
+  GetImplementation(*this).Play(text);
 }
 
 void TtsPlayer::Stop()
@@ -76,6 +76,11 @@ void TtsPlayer::Resume()
   GetImplementation(*this).Resume();
 }
 
+TtsPlayer::State TtsPlayer::GetState()
+{
+  return GetImplementation(*this).GetState();
+}
+
 TtsPlayer::TtsPlayer( Internal::Adaptor::TtsPlayer* player )
 : BaseHandle( player )
 {

diff --git a/adaptors/public-api/adaptor-framework/tts-player.h b/adaptors/public-api/adaptor-framework/tts-player.h
index bb79902..deaf1b3 100644 (file)
--- a/adaptors/public-api/adaptor-framework/tts-player.h
+++ b/adaptors/public-api/adaptor-framework/tts-player.h
@@ -50,6 +50,17 @@ public: // ENUMs
     MODE_NUM
   };
 
+  /**
+   * @brief Enumeration of TTS state.
+   */
+  enum State
+  {
+    UNAVAILABLE = 0,    ///< Player is not available
+    READY,              ///< Player is ready to play
+    PLAYING,            ///< Player is playing
+    PAUSED              ///< Player is paused
+  };
+
 public: // API
 
   /**
@@ -115,6 +126,12 @@ public: // API
    */
   void Resume();
 
+  /**
+   * @brief Gets the current state of the player.
+   * @pre The TtsPlayer needs to be initialized.
+   */
+  State GetState();
+
 public: // Not intended for application developers
 
   /**

diff --git a/adaptors/tizen/tts-player-impl-tizen.cpp b/adaptors/tizen/tts-player-impl-tizen.cpp
index 70f5b9c..e2d7de3 100644 (file)
--- a/adaptors/tizen/tts-player-impl-tizen.cpp
+++ b/adaptors/tizen/tts-player-impl-tizen.cpp
@@ -233,6 +233,28 @@ void TtsPlayer::Resume()
   }
 }
 
+Dali::TtsPlayer::State TtsPlayer::GetState()
+{
+  Dali::TtsPlayer::State ttsState = Dali::TtsPlayer::UNAVAILABLE;
+
+  if(mInitialized)
+  {
+    // Check the current TTS state
+    tts_state_e state;
+    int retVal = tts_get_state(mTtsHandle, &state);
+    if(retVal != TTS_ERROR_NONE)
+    {
+      LogErrorCode(static_cast<tts_error_e>(retVal));
+    }
+    else
+    {
+      ttsState = static_cast<Dali::TtsPlayer::State>(state);
+    }
+  }
+
+  return ttsState;
+}
+
 void TtsPlayer::StateChangedCallback(tts_h tts, tts_state_e previous, tts_state_e current, void *userData)
 {
   TtsPlayer* obj = static_cast<TtsPlayer*>(userData);

diff --git a/adaptors/tizen/tts-player-impl.h b/adaptors/tizen/tts-player-impl.h
index 9ee5921..f1b261e 100644 (file)
--- a/adaptors/tizen/tts-player-impl.h
+++ b/adaptors/tizen/tts-player-impl.h
@@ -73,6 +73,11 @@ public:
    */
   void Resume();
 
+  /**
+   * @copydoc TtsPlayer::GetState()
+   */
+  Dali::TtsPlayer::State GetState();
+
 private:
 
   /**

diff --git a/adaptors/ubuntu/tts-player-impl-ubuntu.cpp b/adaptors/ubuntu/tts-player-impl-ubuntu.cpp
index fcce032..8e6b579 100644 (file)
--- a/adaptors/ubuntu/tts-player-impl-ubuntu.cpp
+++ b/adaptors/ubuntu/tts-player-impl-ubuntu.cpp
@@ -78,6 +78,12 @@ void TtsPlayer::Resume()
 {
 }
 
+Dali::TtsPlayer::State TtsPlayer::GetState()
+{
+  return Dali::TtsPlayer::UNAVAILABLE;
+}
+
+
 } // namespace Adaptor
 
 } // namespace Internal

diff --git a/adaptors/ubuntu/tts-player-impl.h b/adaptors/ubuntu/tts-player-impl.h
index 8c51629..0b33a08 100644 (file)
--- a/adaptors/ubuntu/tts-player-impl.h
+++ b/adaptors/ubuntu/tts-player-impl.h
@@ -73,6 +73,11 @@ public:
    */
   void Resume();
 
+  /**
+   * @copydoc TtsPlayer::GetState()
+   */
+  Dali::TtsPlayer::State GetState();
+
 private:
 
   /**

diff --git a/automated-tests/src/dali-adaptor/utc-Dali-TtsPlayer.cpp b/automated-tests/src/dali-adaptor/utc-Dali-TtsPlayer.cpp
index 60f531d..9269756 100644 (file)
--- a/automated-tests/src/dali-adaptor/utc-Dali-TtsPlayer.cpp
+++ b/automated-tests/src/dali-adaptor/utc-Dali-TtsPlayer.cpp
@@ -155,3 +155,20 @@ int UtcDaliTtsPlayerResumeN(void)
   END_TEST;
 }
 
+int UtcDaliTtsPlayerGetStateN(void)
+{
+  Dali::TtsPlayer player = Dali::TtsPlayer::Get();
+
+  try
+  {
+    Dali::TtsPlayer::State state = player.GetState();
+    DALI_TEST_CHECK( false ); // Should not reach here!
+  }
+  catch( ... )
+  {
+    DALI_TEST_CHECK( true );
+  }
+
+  END_TEST;
+}
+