diff -r 51dda465e618 -r 38fb6f7eacd5 camerauis/cameraapp/generic/src/CamSoundPlayer.cpp
--- a/camerauis/cameraapp/generic/src/CamSoundPlayer.cpp	Wed Apr 14 15:41:04 2010 +0300
+++ b/camerauis/cameraapp/generic/src/CamSoundPlayer.cpp	Tue Apr 27 16:19:06 2010 +0300
@@ -36,13 +36,7 @@
 // EXTERNAL FUNCTION PROTOTYPES  
 
 // CONSTANTS
-#if 0 // Old constants that may be used again in the future
-const TInt KCamInCallToneHz = 1760;         
-const TInt KCamInCallToneLen= 450000;       
-_LIT( KCamSelfTimerSoundFile , "z:\\system\\sounds\\simple\\cameraappSelfTimer.rng" );
-#endif 
 
-const TReal32 KCamInCallToneVol = 0.75f;    
 
 _LIT( KCamAutoFocusComplete, "z:\\system\\sounds\\digital\\cameraappFocusSucc.wav" );
 //_LIT( KCamAutoFocusFailed,   "c:\\system\\sounds\\digital\\focus2.wav" ); NOT DEFINED YET
@@ -72,11 +66,6 @@
     {
     iAudioPlayer = CMdaAudioPlayerUtility::NewL( *this, 
                                                  KAudioPriorityCameraTone,
-                                                 TMdaPriorityPreference( KAudioPrefCamera ) );
-
-    iTonePlayer = CMdaAudioToneUtility::NewL( *this, 
-                                              NULL, 
-                                              KAudioPriorityVideoRecording,
                                               TMdaPriorityPreference( KAudioPrefCamera ) );
     }
 
@@ -111,8 +100,6 @@
     delete iAudioPlayer;
     }
   
-  CancelTonePlayer();    
-  delete iTonePlayer;
   PRINT( _L("Camera <= ~CCamSoundPlayer") );
   }
 
@@ -222,22 +209,15 @@
             StartPlaySound( KCamCaptureTone4(), aEnableCallback );         	
             break;
             } 
-#if 0
-        case ECamInCallToneId:
+
+        case ECamSelfTimerSoundId:
             {
-            PlayTone( KCamInCallToneHz, KCamInCallToneLen, KCamInCallToneVol, aEnableCallback );
+            StartPlaySound( KCamSelfTimerTone(), aEnableCallback );
             break;
             }
-#endif
     
         default:
             {
-            // Other sounds are played using the key sound system                
-#if !( defined(__WINS__) || defined(__WINSCW__) )
-#if 0
-            iKeySoundSystem->PlaySound( aSoundId );
-#endif            
-#endif
             iEnableCallback = EFalse;
             break;
             }
@@ -245,32 +225,6 @@
     PRINT( _L("Camera <= CCamSoundPlayer::PlaySound") );            
     }
 
-// -----------------------------------------------------------------------------
-// CCamSoundPlayer::PlayTone
-// Plays the requested tone
-// -----------------------------------------------------------------------------
-//
-void CCamSoundPlayer::PlayTone( TInt aToneHz, TInt aLenMicSec, TReal32 aVolume, TBool aEnableCallback )
-    {
-    if ( !iOpenFileInProgress )
-        {   
-        iOpenFileInProgress = ETrue;
-        TInt64 len = aLenMicSec;
-        iTonePlayer->PrepareToPlayTone( aToneHz, TTimeIntervalMicroSeconds( len ) );
-        iTonePlayer->SetVolume( static_cast<TInt>( aVolume * iTonePlayer->MaxVolume() ) );
-        }
-    else
-        {
-        if ( iEnableCallback )
-            {
-            iObserver->PlaySoundComplete();
-            iEnableCallback = EFalse;
-            }
-        }  
-
-    iEnableCallback = aEnableCallback;
-    }
-
 
 // ---------------------------------------------------------------------------
 // CCamSoundPlayer::StartPlaySound
@@ -308,48 +262,6 @@
     }
 
 // ---------------------------------------------------------------------------
-// CCamSoundPlayer::StartPlayTone
-// Attempts to begin playing the specified tone
-// ---------------------------------------------------------------------------
-//
-void CCamSoundPlayer::StartPlayTone( const TDesC& aFile, const TBool aEnableCallback )
-    {
-    // Check if we are already trying to open/play a tone, and stop it 
-    // if so
-    if ( iOpenFileInProgress )
-        {
-        iTonePlayer->CancelPrepare();
-        iOpenFileInProgress = EFalse;
-        if ( iEnableCallback )
-            {
-            iObserver->PlaySoundComplete();
-            iEnableCallback = EFalse;
-            }
-        }
-    else if ( iTonePlayInProgress )
-        {
-        iTonePlayer->CancelPlay();
-        iTonePlayInProgress = EFalse;
-        if ( iEnableCallback )
-            {
-            iObserver->PlaySoundComplete();
-            iEnableCallback = EFalse;
-            }
-        }    
-    else
-        {
-        // empty statement to remove Lint error.
-        }
-
-    iEnableCallback = aEnableCallback;
-
-    iOpenFileInProgress = ETrue;
-    iTonePlayer->PrepareToPlayFileSequence( aFile );
-    iTonePlayer->SetVolume( static_cast<TInt>( KCamInCallToneVol * iTonePlayer->MaxVolume() ) );
-    }
-
-
-// ---------------------------------------------------------------------------
 // CCamSoundPlayer::MapcInitComplete
 // CMdaAudioPlayerUtility initialization complete
 // ---------------------------------------------------------------------------
@@ -389,52 +301,6 @@
     }
 
 
-// ---------------------------------------------------------------------------
-// CCamSoundPlayer::MatoPrepareComplete
-// Tone prepare complete.
-// ---------------------------------------------------------------------------
-//
-void CCamSoundPlayer::MatoPrepareComplete( TInt aError )
-    {
-    iOpenFileInProgress = EFalse;
-
-    if ( !aError )
-        {
-        iTonePlayInProgress = ETrue;
-        iTonePlayer->Play();
-#ifdef __WINS__
-// The tone player does not give a call back on the emulator so
-// we have to force a callback here
-    MatoPlayComplete( KErrNone );
-#endif // __WINS__
-        }
-    else
-        {
-        if ( iEnableCallback )
-            {
-            iObserver->PlaySoundComplete();
-            iEnableCallback = EFalse;
-            }
-        }
-    }
-
-
-// ---------------------------------------------------------------------------
-// CCamSoundPlayer::MatoPlayComplete
-// Tone playback complete.
-// ---------------------------------------------------------------------------
-//
-void CCamSoundPlayer::MatoPlayComplete( TInt /*aError*/ )
-    {
-    iTonePlayInProgress = EFalse;
-    if ( iEnableCallback )
-        {
-        iObserver->PlaySoundComplete();
-        iEnableCallback = EFalse;
-        }
-    }
-
-
 
 // ---------------------------------------------------------------------------
 // CCamSoundPlayer::DisableSelectionKeySoundL
@@ -498,39 +364,4 @@
         }
     }
 
-
-// ---------------------------------------------------------------------------
-// CCamSoundPlayer::CancelTonePlayer
-// Cancels any outstanding tone player activity
-// ---------------------------------------------------------------------------
-//
-void CCamSoundPlayer::CancelTonePlayer()
-    {
-    if ( iOpenFileInProgress && iTonePlayer )
-        {   
-        iTonePlayer->CancelPrepare();
-        iOpenFileInProgress = EFalse;
-
-        if ( iEnableCallback && iObserver )
-            {
-            iObserver->PlaySoundComplete();
-            iEnableCallback = EFalse;
-            }
-        }
-        
-    if ( iTonePlayInProgress && iTonePlayer )
-        {
-        iTonePlayer->CancelPlay();        
-        iTonePlayInProgress = EFalse;
-
-        if ( iEnableCallback && iObserver )
-            {
-            iObserver->PlaySoundComplete();
-            iEnableCallback = EFalse;
-            }        
-        }
-    }
-    
-
-
 //  End of File