FCL/sf/mw/classicui: comparison uifw/EikStd/srvuisrc/eikkeysoundserver.cpp

equal deleted inserted replaced

-:978afdc0236f
+:85902f042028
 // CEikKeySoundServer implementation.
 // ==================================
 TInt CEikKeySoundServer::LaunchServer(TThreadId& aThreadId)
 {
+LOGTEXT(_L("CEikKeySoundServer::LaunchServer"));
 // First, check that ther server isn't already running.
 TFindServer findServer(__KEYSOUND_SERVER_NAME);
 TFullName name;
 if (findServer.Next(name) == KErrNone)
 {
 // construct all system SID objects
 }
 void CEikKeySoundServer::ConstructL()
 {
+LOGTEXT(_L("CEikKeySoundServer::ConstructL"));
 iInit = EFalse;
 iSidList = new(ELeave)CArrayFixFlat<TAknSoundID>(KAknSoundInfoMapGranularity);
 iSoundList = new(ELeave)CArrayPtrFlat<CEikSoundInfo>(KAknSoundInfoMapGranularity);
 // Default to loudest volume
 #endif
 }
 CEikKeySoundServer::~CEikKeySoundServer()
 {
+LOGTEXT(_L("CEikKeySoundServer::~CEikKeySoundServer"));
 if (iProfilesNotifyHandler)
 {
 iProfilesNotifyHandler->StopListening();
 delete iProfilesNotifyHandler;
 }
 }
 CSession2* CEikKeySoundServer::NewSessionL(const TVersion& aVersion,
 const RMessage2& /*aMessage*/) const
 {
+LOGTEXT(_L("CEikKeySoundServer::NewSessionL"));
 TVersion ver(KKeySoundServMajorVN, KKeySoundServMinorVN, KKeySoundServBuildVN);
 if (!User::QueryVersionSupported(ver, aVersion))
 {
 User::Leave(KErrNotSupported);
 }
 		}
 	}
 void CEikKeySoundServer::PlaySid(TInt aSid, TBool aPlaySelf)
 {
+LOGTEXT1(_L("CEikKeySoundServer::PlaySid aSid: %d"), aSid);
 if (aSid == EAvkonSIDWarningTone && iWarningToneEnabled == 0)
 {
 // Don't play warning tone, when the warning tone is disabled in setting.
 return;
 }
 }
 }
 void CEikKeySoundServer::SetDisabledScanCode( TInt aScanCode )
 	{
+LOGTEXT1(_L("CEikKeySoundServer::SetDisabledScanCode aScanCode: %d"),
+aScanCode);
 	iDisabledScanCode = aScanCode;
 	}
 TInt CEikKeySoundServer::DisabledScanCode()
 	{
 {
 }
 CEikKeySoundSession::~CEikKeySoundSession()
 {
+LOGTEXT1(_L("CEikKeySoundSession::~CEikKeySoundSession iClientUid %d"),
+iClientUid);
 RemoveSids(iClientUid);
 if (iHasLockedContext)
 {
 if( iServer )
 {
 iServer->SetContextLocked(EFalse);
 }
 }
 if (iOwnsDefaultSounds)
 {
+LOGTEXT(_L("CEikKeySoundSession::~CEikKeySoundSession OwnsDefaultSounds"));
 RemoveSids(0);
 iServer->iInit = EFalse;
 }
 if (iSoundStack)
 {
 }
 void CEikKeySoundSession::ServiceL(const RMessage2& aMessage)
 {
+LOGTEXT1(_L("CEikKeySoundSession::ServiceL aMessage: %d"),
+aMessage.Function());
 if (aMessage.Function() == EKeySoundServerPlayKey)
 {
 TInt scancode = aMessage.Int0() & 0xff;
 TBool repeat = aMessage.Int1();
 aMessage.Complete(KErrNone);
 void CEikKeySoundSession::AddSoundIdBufferL(const RMessage2& aMessage)
 {
 TInt uid = aMessage.Int0();
 TInt size = aMessage.Int1();
+LOGTEXT1(_L("CEikKeySoundSession::AddSoundIdBufferL uid: %d"), uid);
 // CBufFlat requires that size must be positive and not larger than KMaxTInt / 2.
 // Without this check the KeySoundServer could panic.
 if (size <= 0 || size >= ((KMaxTInt / 2) - KKeySoundServerBufExpandSize))
 {
 User::Leave(KErrArgument);
 iServer->SetVolumeForPreferenceType(KKeyClickPreference, iServer->iKeypadVolume);
 }
 void CEikKeySoundSession::RemoveSids(TInt aUid)
 {
+LOGTEXT1(_L("CEikKeySoundSession::RemoveSids aUid %d"), aUid);
 TUint uid = aUid << 16;
 if (!iServer->iSidList)
 {
 return;
 }
 // If no duplicate found, sid is deleted. Else duplicate will be
 // deleted when the for-loop reaches it (unless there is even more duplicates).
 if (!duplicateFound)
 {
 // Remove sound at this position
-delete id.iSoundInfo;
+if(id.iSoundInfo->IsWaittingPlay())
+{
+LOGTEXT1(_L("CEikKeySoundSession::RemoveSids DestroyAfterplay : %d"),
+(TInt)id.iSoundInfo );
+id.iSoundInfo->SetDestroyAfterPlay(ETrue);
+}
+else
+{
+LOGTEXT1(_L("CEikKeySoundSession::RemoveSids Destroy : %d"),
+(TInt)id.iSoundInfo );
+delete id.iSoundInfo;
+}
 if (iServer->iSoundList)
 {
 iServer->iSoundList->Delete(ii);
 }
 iServer->iSidList->Delete(ii);
 }
 }
 void CEikKeySoundSession::AddToneSidL(const TAknSoundID& aSoundID, CAknToneSoundInfo* aSoundInfo)
 {
+LOGTEXT(_L("CEikKeySoundSession::AddToneSidL"));
 aSoundInfo->InitL();
 TKeyArrayFix sidKey(_FOFF(TAknSoundID, iSid), ECmpTUint);
 if (iServer->iSidList && iServer->iSoundList)
 {
 }
 void CEikKeySoundSession::AddSequenceSidL(const TAknSoundID& aSoundID,
 CAknSequenceSoundInfo* aSoundInfo)
 {
+LOGTEXT(_L("CEikKeySoundSession::AddSequenceSidL"));
 aSoundInfo->InitL();
 TKeyArrayFix sidKey(_FOFF(TAknSoundID, iSid), ECmpTUint);
 if (iServer->iSidList && iServer->iSoundList)
 }
 void CEikKeySoundSession::AddFileSidL(const TAknSoundID& aSoundID, CAknFileSoundInfo* aSoundInfo,
 const TDesC& aFileName)
 {
+LOGTEXT(_L("CEikKeySoundSession::AddFileSidL"));
 aSoundInfo->InitL(aFileName, NULL);
 TKeyArrayFix sidKey(_FOFF(TAknSoundID, iSid), ECmpTUint);
 if (iServer->iSidList && iServer->iSoundList)
 {
 CEikSoundInfo::CEikSoundInfo(TInt aPriority, TInt aPreference)
 {
 iPriority = aPriority;
 iPreference = aPreference;
+iWaittingPlay = EFalse;
+iDestroyAfterPlay = EFalse;
 iVolume = ESoundVolume9; // default to loudest
 }
 CEikSoundInfo::~CEikSoundInfo()
 {
 }
 CEikSoundInfo::TVolumeSetting CEikSoundInfo::Volume()
 {
 return iVolume;
+}
+TBool CEikSoundInfo::IsWaittingPlay()
+{
+LOGTEXT1(_L("CEikSoundInfo::IsWaittingPlay : %d"), iWaittingPlay);
+return iWaittingPlay;
+}
+void CEikSoundInfo::SetDestroyAfterPlay(TBool aDestroyAfterPlay)
+{
+iDestroyAfterPlay = aDestroyAfterPlay;
 }
 // ==================================
 // CAknSynthSoundInfo implementation.
 // ==================================
 CAknFileSoundInfo::~CAknFileSoundInfo()
 {
 delete iAudioPlayer;
 }
-void CAknFileSoundInfo::InitL(const TDesC& aFileName, CMdaServer* aMdaServer)
+void CAknFileSoundInfo::InitL(const TDesC& aFileName, CMdaServer* /*aMdaServer*/)
 {
 LOGTEXT(_L("CAknFileSoundInfo::InitL() - Filename:"));
 LOGTEXT(aFileName);
 iFileName = aFileName;
 LOGTEXT(_L(" CAknFileSoundInfo::InitL() - Exit"));
 // 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 );
+iWaittingPlay =ETrue;
 LOGTEXT(_L(" CAknFileSoundInfo::PlayL() - Exit"));
 }
 void CAknFileSoundInfo::DoPlay()
 LOGTEXT(_L(" CAknFileSoundInfo::DoPlay(). Prepare failed, delete!"));
 LOGTEXT(_L(" CAknFileSoundInfo::DoPlay(). Deleting iAudioPlayer."));
 delete iAudioPlayer;
 iAudioPlayer = NULL;
+iWaittingPlay = EFalse;
 }
 }
 void CAknFileSoundInfo::Stop()
 LOGTEXT(_L(" CAknFileSoundInfo::Stop(). Deleting iAudioPlayer."));
 delete iAudioPlayer;
 iAudioPlayer = NULL;
 iPrepared = EFalse;
+iWaittingPlay = EFalse;
 }
 }
 void CAknFileSoundInfo::MoscoStateChangeEvent(CBase* /*aObject*/, TInt /*aPreviousState*/,
 TInt /*aCurrentState*/, TInt /*aErrorCode*/)
 }
 void CAknFileSoundInfo::MapcPlayComplete(TInt /*aError*/)
 {
 LOGTEXT(_L("CAknFileSoundInfo::MapcPlayComplete()"));
+LOGTEXT1(_L(" aError:%d"), aError);
 iPlaying = EFalse;
+iWaittingPlay = EFalse;
 delete iAudioPlayer;
 iAudioPlayer = NULL;
 iPrepared = EFalse;
+if(iDestroyAfterPlay)
+{
+LOGTEXT1(_L("CAknFileSoundInfo::MapcPlayComplete DestroyAfterPlay : %d"),
+TInt(this));
+delete this;
+}
 }
 // End of file

branch	RCL_3
changeset 64	85902f042028
parent 56	d48ab3b357f1
child 72	a5e7a4f63858