breakdeps/coesndpy.cpp
changeset 54 dcd1a22c2899
parent 42 29cf161020cf
child 55 f1c1302a0b48
--- a/breakdeps/coesndpy.cpp	Fri Oct 15 14:34:27 2010 +0100
+++ b/breakdeps/coesndpy.cpp	Fri Oct 15 14:46:27 2010 +0100
@@ -13,16 +13,15 @@
 // Description:
 //
 
-//#include <mda/client/utility.h>
-//#include <mdaaudiosampleplayer.h>
-//#include <mdaaudiotoneplayer.h>
+#include <mda/client/utility.h>
+#include <mdaaudiosampleplayer.h>
+#include <mdaaudiotoneplayer.h>
 #include <bassnd.h>
 #include <coesndpy.h>
 #include <coemain.h>
 #include "coepanic.h"
 #include <coeutils.h>
 
-#if 0
 const TUid KLafSoundPlayerUid={0x10005F1A};
 
 class CCoeSoundPlayer;
@@ -425,7 +424,7 @@
 	{
 	iMdaServer=CMdaServer::NewL();
 	}
-#endif
+
 //
 // class CoeSoundPlayer
 //
@@ -433,7 +432,7 @@
 EXPORT_C void CoeSoundPlayer::PlaySound(const TBaSystemSoundType& aType,TInt aPlayCount,
 											TTimeIntervalMicroSeconds32 aGap,TBool aInterrupt)
 	{ // static
-	//TRAP_IGNORE(ManagerL()->PlaySoundL(aType,aPlayCount,aGap,aInterrupt));
+	TRAP_IGNORE(ManagerL()->PlaySoundL(aType,aPlayCount,aGap,aInterrupt));
 	}
 
 EXPORT_C void CoeSoundPlayer::CancelSound(const TBaSystemSoundType& aType)
@@ -441,12 +440,11 @@
 
 @param aType The sound to stop playing. */
 	{ // static
-	//TRAP_IGNORE(ManagerL()->CancelSound(aType));
+	TRAP_IGNORE(ManagerL()->CancelSound(aType));
 	}
 
 CCoeSoundPlayerManager* CoeSoundPlayer::ManagerL()
 	{ // static
-#if 0	
 	CCoeEnv* env=CCoeEnv::Static();
 	__ASSERT_ALWAYS(env,Panic(ECoePanicNullEnvironment));
 	CCoeSoundPlayerManager* manager=
@@ -454,6 +452,4 @@
 	if (!manager)
 		manager=CCoeSoundPlayerManager::NewL();
 	return manager;
-#endif
-	return NULL;
 	}