FCL/sf/incubator/stemkit: comparison breakdeps/eikkeysoundserver.cpp

equal deleted inserted replaced

-:e17592a1211c
+:bdb0226b36a8
 // This base class method should never be called.
 }
 void CAknSynthSoundInfo::InitL()
 {
-// Keyclicks are played with a statically reserved CMdaAudioToneUtility.
+#if 0
+	// Keyclicks are played with a statically reserved CMdaAudioToneUtility.
 // Same concerns also error tones (this is a hack to avoid an endless error dialog
 // loop because of audio server crash).
 if ((iPriority == EAvkonKeyClickPriority && iPreference == KKeyClickPreference) ||
 (iPriority == EAvkonErrorNotePriority && iPreference == EAvkonErrorNotePreference))
 {
 iPlayedStatically = ETrue;
 iToneObserver = CAknEikAudioToneObserver::NewL(*this);
 iTonePlayer = CMdaAudioToneUtility::NewL(*iToneObserver, NULL); // Synchronous
 }
+#endif
 }
 void CAknSynthSoundInfo::PlayL()
 {
 LOGTEXT(_L("CAknSynthSoundInfo::PlayL()."));
 LOGTEXT3(_L(" This:%d, iPriority:%d, iPreference:%d"), (TInt)this, iPriority, iPreference);
+#if 0
 // Stops playing and deletes instances if they exist.
 Stop();
 if (!iPlayedStatically)
 {
 iTonePlayer = CMdaAudioToneUtility::NewL(*iToneObserver, NULL); // Synchronous
 }
 // Prepare to play either a tone or a sequence depending on subclass.
 Prepare();
+#endif
 }
 void CAknSynthSoundInfo::DoPlay()
 {
 LOGTEXT(_L("CAknSynthSoundInfo::DoPlay()."));
 LOGTEXT3(_L(" This:%d, iPriority:%d, iPreference:%d"), (TInt)this, iPriority, iPreference);
+#if 0
 if (iTonePlayer->State() == EMdaAudioToneUtilityPrepared)
 {
 LOGTEXT(_L(" CAknSynthSoundInfo::DoPlay(). Prepare successful, play."));
 iTonePlayer->SetPriority(iPriority,(TMdaPriorityPreference)iPreference);
 iTonePlayer = NULL;
 delete iToneObserver;
 iToneObserver = NULL;
 }
 }
+#endif
 }
 void CAknSynthSoundInfo::Stop()
 {
 LOGTEXT(_L("CAknSynthSoundInfo::Stop()."));
 LOGTEXT3(_L(" This:%d, iPriority:%d, iPreference:%d"), (TInt)this, iPriority, iPreference);
+#if 0
 // Stop playing and delete tone player if it exists.
 if (iTonePlayer)
 {
 LOGTEXT(_L(" CAknSynthSoundInfo::Stop(). iTonePlayer exists."));
 delete iToneObserver;
 iToneObserver = NULL;
 }
 }
+#endif
 }
 void CAknSynthSoundInfo::SetVolume(TVolumeSetting aVolume)
 {
 iVolume = aVolume;
 if ( max == 0x0000ffff ) // 16bit -1 i.e. not set
 {
 max = (TInt)ESoundVolume9; // Set it to our max
 }
+#if 0
 TInt volume = 0;
 if ( Preference() != KKeyClickPreference ) // Other sounds than key click
 {
 aTonePlayer->SetVolume( ((TInt)iVolume * max )/(TInt)ESoundVolume9);
 default: //case EKeypadVolumeLoud:
 volume = max;
 break;
 }
 aTonePlayer->SetVolume(volume);
+#endif
 }
 // =================================
 // CAknToneSoundInfo implementation.
 }
 void CAknToneSoundInfo::Prepare()
 {
 LOGTEXT(_L("CAknToneSoundInfo::Prepare()."));
+#if 0
 // Prepare
 iTonePlayer->PrepareToPlayTone(iFrequency, iMs);
+#endif
 }
 // =====================================
 // CAknSequenceSoundInfo implementation.
 }
 void CAknSequenceSoundInfo::Prepare()
 {
 LOGTEXT(_L("CAknSequenceSoundInfo::Prepare()."));
+#if 0
 // Prepare
 iTonePlayer->PrepareToPlayDesSequence(*iSequence);
+#endif
 }
 void CAknSequenceSoundInfo::ReadSequenceL(RReadStream& aStream)
 {
 delete iSequence;
 void CAknFileSoundInfo::PlayL()
 {
 LOGTEXT(_L("CAknFileSoundInfo::PlayL()."));
 LOGTEXT3(_L(" This:%d, iPriority:%d, iPreference:%d"), (TInt)this, iPriority, iPreference);
+#if 0
 // Stops playing and deletes audio player instance if it exist.
 Stop();
 // Create audio player. DoPlay() will be called in all circumstances.
 iAudioPlayer = CMdaAudioPlayerUtility::NewFilePlayerL(iFileName, *this, iPriority,(TMdaPriorityPreference)iPreference );
+#endif
 LOGTEXT(_L(" CAknFileSoundInfo::PlayL() - Exit"));
 }
 void CAknFileSoundInfo::DoPlay()
 {
 LOGTEXT(_L("CAknFileSoundInfo::DoPlay()."));
+#if 0
 if (iPrepared)
 {
 LOGTEXT(_L(" CAknFileSoundInfo::DoPlay(). Prepared succesfull, play."));
 // No need to set priority. It is already set in NewDesPlayerReadOnlyL().
 LOGTEXT(_L(" CAknFileSoundInfo::DoPlay(). Deleting iAudioPlayer."));
 delete iAudioPlayer;
 iAudioPlayer = NULL;
 }
+#endif
 }
 void CAknFileSoundInfo::Stop()
 {
 LOGTEXT(_L("CAknFileSoundInfo::Stop()."));
+#if 0
 // Stop playing and delete audio player if it exists.
 if (iAudioPlayer)
 {
 LOGTEXT(_L(" CAknFileSoundInfo::Stop(). iAudioPlayer exists."));
 delete iAudioPlayer;
 iAudioPlayer = NULL;
 iPrepared = EFalse;
 }
+#endif
 }
 void CAknFileSoundInfo::MoscoStateChangeEvent(CBase* /*aObject*/, TInt /*aPreviousState*/,
 TInt /*aCurrentState*/, TInt /*aErrorCode*/)
 {
 if ( max == 0x0000ffff ) // 16bit -1 i.e. not set
 {
 max = (TInt)ESoundVolume9; // Set it to our max
 }
+#if 0
 TInt volume = 0;
 if ( Preference() != KKeyClickPreference ) // Other sounds than key click
 {
 		//change (TInt)ESoundVolume9 to ((TInt)ESoundVolume9 + 1)) to keep consistent with audiotheme
 default: //case EKeypadVolumeLoud:
 volume = max;
 break;
 }
 aAudioPlayer->SetVolume(volume);
+#endif
 }
 void CAknFileSoundInfo::MapcInitComplete(TInt aError,
 const TTimeIntervalMicroSeconds& /*aDuration*/)
 {
 LOGTEXT(_L("CAknFileSoundInfo::MapcInitComplete()."));
 LOGTEXT1(_L(" aError:%d"), aError);
 if (aError == KErrNone)
 {
 iPrepared = ETrue;
 SetVolume(iVolume);
 }
 }
 void CAknFileSoundInfo::MapcPlayComplete(TInt /*aError*/)
 {
 LOGTEXT(_L("CAknFileSoundInfo::MapcPlayComplete()"));
+#if 0
 iPlaying = EFalse;
 delete iAudioPlayer;
 iAudioPlayer = NULL;
 iPrepared = EFalse;
+#endif
 }
 // End of file

changeset 61	bdb0226b36a8
parent 60	e17592a1211c