Remove orientation from application class

[platform/core/uifw/dali-adaptor.git] / adaptors / public-api / adaptor-framework / sound-player.h

diff --git a/adaptors/public-api/adaptor-framework/sound-player.h b/adaptors/public-api/adaptor-framework/sound-player.h
index e17df84..91e03c3 100644 (file)
--- a/adaptors/public-api/adaptor-framework/sound-player.h
+++ b/adaptors/public-api/adaptor-framework/sound-player.h
@@ -20,9 +20,9 @@
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/object/base-handle.h>
-#include <dali/public-api/signals/dali-signal-v2.h>
+#include <dali/public-api/signals/dali-signal.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 namespace Internal DALI_INTERNAL
@@ -36,16 +36,11 @@ class SoundPlayer;
 /**
  * @brief Plays sound effects.
  */
-class SoundPlayer : public BaseHandle
+class DALI_IMPORT_API SoundPlayer : public BaseHandle
 {
 public:
 
-  typedef SignalV2< void (SoundPlayer&) > SoundPlayFinishedSignalV2; ///< Sound play finished signal
-
-  // Signal Names
-  static const char* const SIGNAL_SOUND_PLAY_FINISHED; ///< name "sound-play-finished"
-
-public:
+  typedef Signal< void (SoundPlayer&) > SoundPlayFinishedSignalType; ///< Sound play finished signal
 
   /**
    * @brief Create an uninitialized handle.
@@ -90,8 +85,10 @@ public:
    *
    * @pre The SoundPlayer needs to be initialized.
    * @return The signal to connect to.
+   *
+   * @note The signal name is "sound-play-finished" if using BaseHandle::ConnectSignal()
    */
-  SoundPlayFinishedSignalV2& SoundPlayFinishedSignal();
+  SoundPlayFinishedSignalType& SoundPlayFinishedSignal();
 
 public: // Not intended for application developers
 
@@ -100,7 +97,7 @@ public: // Not intended for application developers
    *
    * @param[in] soundPlayer A pointer to the sound player.
    */
-  SoundPlayer( Internal::Adaptor::SoundPlayer* soundPlayer );
+  explicit DALI_INTERNAL SoundPlayer( Internal::Adaptor::SoundPlayer* soundPlayer );
 };
 
 } // namespace Dali