diff -r 51dda465e618 -r 38fb6f7eacd5 camerauis/cameraapp/generic/inc/audioplayer/camaudioplayercontroller.h
--- a/camerauis/cameraapp/generic/inc/audioplayer/camaudioplayercontroller.h	Wed Apr 14 15:41:04 2010 +0300
+++ b/camerauis/cameraapp/generic/inc/audioplayer/camaudioplayercontroller.h	Tue Apr 27 16:19:06 2010 +0300
@@ -31,7 +31,6 @@
 class CCamAppController;
 class MCamAudioPlayerObserver;
 class CCamPlayerWrapperBase;
-class CCamTonePlayerWrapper;
 
 // ===========================================================================
 // Class definitions
@@ -81,15 +80,6 @@
     *                  callback to MCamAudioPlayerObserver::PlayComplete
     */
     void PlaySound( TInt  aSoundId, 
-                    TBool aCallback );
-
-    /**
-    * @param aCallback If set ETrue, calling method this results in one 
-    *                  callback to MCamAudioPlayerObserver::PlayComplete
-    */
-    void PlayTone( TInt    aToneInHz, 
-                   TInt    aLengthInUs, 
-                   TReal32 aVolumeInPercent, 
                    TBool   aCallback );
 
     /**
@@ -139,7 +129,6 @@
     MCamPlayerObserver&                  iObserver;
 
     RPointerArray<CCamPlayerWrapperBase> iPlayers;
-    CCamTonePlayerWrapper*               iTonePlayer;
 
     TInt                                 iCameraMode;     // TCamCameraMode value
     TInt                                 iCaptureSoundId; // Sound id or -1 if not set