diff -r 51dda465e618 -r 38fb6f7eacd5 camerauis/cameraapp/generic/inc/CamSoundPlayer.h
--- a/camerauis/cameraapp/generic/inc/CamSoundPlayer.h	Wed Apr 14 15:41:04 2010 +0300
+++ b/camerauis/cameraapp/generic/inc/CamSoundPlayer.h	Tue Apr 27 16:19:06 2010 +0300
@@ -20,7 +20,6 @@
 #define CAMSOUNDPLAYER_H
 
 //  INCLUDES
-#include <MdaAudioTonePlayer.h>
 #include <MdaAudioSamplePlayer.h>
 #include "Cam.hrh" // For TCamSoundId
 
@@ -59,8 +58,7 @@
 *  @since 2.8
 */
 class CCamSoundPlayer : public CBase,
-                        public MMdaAudioPlayerCallback,
-                        public MMdaAudioToneObserver
+                        public MMdaAudioPlayerCallback
     {
     public:  // Constructors and destructor
         
@@ -91,16 +89,7 @@
         */
         void PlaySound( TCamSoundId aSound, TBool aEnableCallback );
 
-        /**
-        * Initiates the playing of the specified tone
-        * @since 2.8
-        * @param aToneHz The frequency of the tone to play in Hertz
-        * @param aLenMicSec The length of tone to play in microseconds
-        * @param aVolume The volume of the tone, range 0.0 to 1.0
-        * @param aEnableCallback Whether to be called back when playback complete
-        */
-        void PlayTone( TInt aToneHz, TInt aLenMicSec, TReal32 aVolume, TBool aEnableCallback );
-
+      
         /**
         * Called to disable certain key press clicks
         * @since 2.8 
@@ -127,11 +116,6 @@
         */
         void EnableAllKeySounds();
         
-        /**
-        * Cancels any outstanding tone player activity
-        * @since 3.0
-        */
-        void CancelTonePlayer();
 
     public: // Functions from base classes
         /**
@@ -146,18 +130,6 @@
         * @since 2.8
         */
         void MapcPlayComplete( TInt aError );
-
-        /**
-        * From MMdaAudioToneObserver.
-        * @since 2.8
-        */
-        void MatoPrepareComplete( TInt aError );
-
-        /**
-        * From MMdaAudioToneObserver.
-        * @since 2.8
-        */
-        void MatoPlayComplete( TInt aError );
         
     private:
 
@@ -181,22 +153,11 @@
         */
         void StartPlaySound( const TDesC& aFile, const TBool aEnableCallback );
 
-        /**
-        * Starts procedure to play audio Tone (and RNG) files. Internal function
-        * @since 2.8 
-        * @param aFile The file to open
-        * @param aEnableCallback Whether to call back when play complete
-        */
-        void StartPlayTone( const TDesC& aFile, const TBool aEnableCallback );
-
     public:     // Data
 
         // Audio player utility for WAV sounds (eg Video Recording)
         CMdaAudioPlayerUtility* iAudioPlayer;
 
-        // Tone player for TONES (eg Video recording when in call)
-        CMdaAudioToneUtility* iTonePlayer;
-
         // Key sound system for Self-timer sound and camera shutter.
         CAknKeySoundSystem* iKeySoundSystem;
 
@@ -218,8 +179,6 @@
         // Whether all keys have been silenced
         TBool iAllKeysSilent;        
 
-        // Whether a tone is currently playing
-        TBool iTonePlayInProgress;
         };
 
 #endif      // CAMSOUNDPLAYER_H