diff -r 51dda465e618 -r 38fb6f7eacd5 camerauis/cameraapp/generic/src/audioplayer/camaudioplayercontroller.cpp
--- a/camerauis/cameraapp/generic/src/audioplayer/camaudioplayercontroller.cpp	Wed Apr 14 15:41:04 2010 +0300
+++ b/camerauis/cameraapp/generic/src/audioplayer/camaudioplayercontroller.cpp	Tue Apr 27 16:19:06 2010 +0300
@@ -33,7 +33,6 @@
 #include "mcamplayerobserver.h"
 #include "mcamplayerwrapper.h"
 #include "camaudioplayerwrapper.h"
-#include "camtoneplayerwrapper.h"
 #include "camaudioplayercontroller.h"
 #include "OstTraceDefinitions.h"
 #ifdef OST_TRACE_COMPILER_IN_USE
@@ -256,35 +255,6 @@
 
 
 // ---------------------------------------------------------------------------
-// PlayTone
-// ---------------------------------------------------------------------------
-// 
-void
-CCamAudioPlayerController::PlayTone( TInt    aToneInHz, 
-                                     TInt    aLengthInUs, 
-                                     TReal32 aVolumeInPercent, 
-                                     TBool   aCallback )
-  {
-  TInt status( KErrNone );
-
-  if( !iTonePlayer )
-    {
-    TRAP( status, iTonePlayer = CCamTonePlayerWrapper::NewL( iObserver ) );
-    }
-
-  if( KErrNone == status )
-    {
-    iTonePlayer->PlayTone( aToneInHz, aLengthInUs, aVolumeInPercent, aCallback );
-    }
-  else
-    {
-    if( aCallback )
-      iObserver.PlayComplete( status, -1 );
-    }
-  }
-  
-
-// ---------------------------------------------------------------------------
 // CancelAllPlaying
 // ---------------------------------------------------------------------------
 //
@@ -293,10 +263,6 @@
   {
   PRINT( _L("Camera => CCamAudioPlayerController::CancelAllPlaying") );
 
-  if( iTonePlayer )
-    {
-    iTonePlayer->CancelPlay();
-    }
   for( TInt i = 0; i < iPlayers.Count(); i++ )
     {
     iPlayers[i]->CancelPlay();
@@ -587,8 +553,6 @@
   PRINT ( _L("Camera => CCamAudioPlayerController::Reset") );
   iPlayers.ResetAndDestroy();
 
-  delete iTonePlayer;
-  iTonePlayer = NULL;
 
   iCameraMode     = ECamControllerIdle;
   iCaptureSoundId = -1;