X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=adaptors%2Fcommon%2Fsound-player-impl.cpp;h=5c3e5a50889fd563cc44e045bbfa786f6a92f506;hb=ab5a19a8b72cc2dd6e1573df1f37ce25be584d09;hp=7215a7330cd72a9148eff3f0386f0799a6522ad1;hpb=12acf51f394123980eec1e6fff504971745a741c;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

diff --git a/adaptors/common/sound-player-impl.cpp b/adaptors/common/sound-player-impl.cpp
index 7215a73..5c3e5a5 100644
--- a/adaptors/common/sound-player-impl.cpp
+++ b/adaptors/common/sound-player-impl.cpp
@@ -36,15 +36,17 @@ namespace Adaptor
 namespace // unnamed namespace
 {
 
+const char* const SIGNAL_SOUND_PLAY_FINISHED = "soundPlayFinished";
+
 // Type Registration
-Dali::BaseHandle Create()
+Dali::BaseHandle GetInstance()
 {
   return SoundPlayer::Get();
 }
 
-Dali::TypeRegistration SOUND_PLAYER_TYPE( typeid(Dali::SoundPlayer), typeid(Dali::BaseHandle), Create );
+Dali::TypeRegistration SOUND_PLAYER_TYPE( typeid(Dali::SoundPlayer), typeid(Dali::BaseHandle), GetInstance );
 
-Dali::SignalConnectorType SIGNAL_CONNECTOR_1( SOUND_PLAYER_TYPE, Dali::SoundPlayer::SIGNAL_SOUND_PLAY_FINISHED, Dali::Internal::Adaptor::SoundPlayer::DoConnectSignal );
+Dali::SignalConnectorType SIGNAL_CONNECTOR_1( SOUND_PLAYER_TYPE, SIGNAL_SOUND_PLAY_FINISHED, Dali::Internal::Adaptor::SoundPlayer::DoConnectSignal );
 
 } // unnamed namespace
 
@@ -88,9 +90,9 @@ void SoundPlayer::Stop( int handle )
   mPlugin.StopSound( handle );
 }
 
-SoundPlayer::SoundPlayFinishedSignalV2& SoundPlayer::SoundPlayFinishedSignal()
+SoundPlayer::SoundPlayFinishedSignalType& SoundPlayer::SoundPlayFinishedSignal()
 {
-  return mSoundPlayFinishedSignalV2;
+  return mSoundPlayFinishedSignal;
 }
 
 bool SoundPlayer::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor )
@@ -98,8 +100,7 @@ bool SoundPlayer::DoConnectSignal( BaseObject* object, ConnectionTrackerInterfac
   bool connected( true );
   SoundPlayer* player = dynamic_cast<SoundPlayer*>( object );
 
-  if( player &&
-      Dali::SoundPlayer::SIGNAL_SOUND_PLAY_FINISHED == signalName )
+  if( player && ( SIGNAL_SOUND_PLAY_FINISHED == signalName ) )
   {
     player->SoundPlayFinishedSignal().Connect( tracker, functor );
   }
@@ -125,10 +126,10 @@ void SoundPlayer::EmitSoundPlayFinishedSignal()
 {
   // Emit SoundPlayFinished signal
 
-  if ( !mSoundPlayFinishedSignalV2.Empty() )
+  if ( !mSoundPlayFinishedSignal.Empty() )
   {
     Dali::SoundPlayer handle( this );
-    mSoundPlayFinishedSignalV2.Emit( handle );
+    mSoundPlayFinishedSignal.Emit( handle );
   }
 }