# HG changeset patch # User markw # Date 1287157698 -3600 # Node ID bdb0226b36a86c7f3dd3a9974bd10da59a267a8e # Parent e17592a1211cc72b9a65e1386006aaefcd15d517 Break Eiksrvui.dll dependency on MediaClientAudio.dll diff -r e17592a1211c -r bdb0226b36a8 breakdeps/EIKSRVUI.MMP --- a/breakdeps/EIKSRVUI.MMP Fri Oct 15 16:37:36 2010 +0100 +++ b/breakdeps/EIKSRVUI.MMP Fri Oct 15 16:48:18 2010 +0100 @@ -14,18 +14,21 @@ * Description: Project definition file for project EIKON Server UI. * */ +// Modified to build stem_eiksrvui.dll to break dependency on mediaclientaudio.dll +// Assumes that the sf/mw/classicui package is accessible and adjusts the paths +// to refer back to /sf/mw/classicui/uifw/eikstd where needed #include #include -TARGET eiksrvui.dll +TARGET stem_eiksrvui.dll TARGETTYPE dll UID 0x1000008D 0x100053D0 CAPABILITY CAP_GENERAL_DLL VENDORID VID_DEFAULT -SOURCEPATH ../srvuisrc +SOURCEPATH /sf/mw/classicui/uifw/eikstd/srvuisrc START RESOURCE EIKSRVUI.RSS HEADER @@ -33,15 +36,15 @@ LANGUAGE_IDS END -USERINCLUDE . -USERINCLUDE ../inc -USERINCLUDE ../../AvKon/inc -USERINCLUDE ../../AvKon/animdllinc -USERINCLUDE ../../inc -USERINCLUDE ../../../inc -USERINCLUDE ../srvuiinc -USERINCLUDE ../dlginc -USERINCLUDE ../cdlginc +USERINCLUDE /sf/mw/classicui/uifw/eikstd/srvuisrc +USERINCLUDE /sf/mw/classicui/uifw/eikstd/inc +USERINCLUDE /sf/mw/classicui/uifw/AvKon/inc +USERINCLUDE /sf/mw/classicui/uifw/AvKon/animdllinc +USERINCLUDE /sf/mw/classicui/uifw/inc +USERINCLUDE /sf/mw/classicui/uifw/eikstd/coctlinc +USERINCLUDE /sf/mw/classicui/uifw/eikstd/srvuiinc +USERINCLUDE /sf/mw/classicui/uifw/eikstd/dlginc +USERINCLUDE /sf/mw/classicui/uifw/eikstd/cdlginc // This is a SYSTEMINCLUDE macro containing the middleware // and applications layer specific include directories @@ -55,6 +58,9 @@ SOURCE EikLafShutStarter.cpp SOURCE EikLafShutScheduler.cpp SOURCE AknEikAudioToneObserver.cpp + +SOURCEPATH . + SOURCE eikkeysoundserver.cpp LIBRARY euser.lib @@ -68,7 +74,6 @@ LIBRARY eikcore.lib LIBRARY eikcoctl.lib LIBRARY eikdlg.lib -LIBRARY mediaclientaudio.lib LIBRARY eiksrv.lib LIBRARY avkon.lib LIBRARY Eikalert.lib @@ -96,8 +101,11 @@ LIBRARY aknlayout2.lib LIBRARY gdi.lib -DEFFILE EIKSVUI.DEF - +#ifdef WINSCW +DEFFILE /sf/mw/classicui/uifw/Eikstd/bwins/EIKSVUI.DEF +#else +DEFFILE /sf/mw/classicui/uifw/Eikstd/eabi/EIKSVUI.DEF +#endif START WINS BASEADDRESS 0x74350000 END diff -r e17592a1211c -r bdb0226b36a8 breakdeps/eikkeysoundserver.cpp --- a/breakdeps/eikkeysoundserver.cpp Fri Oct 15 16:37:36 2010 +0100 +++ b/breakdeps/eikkeysoundserver.cpp Fri Oct 15 16:48:18 2010 +0100 @@ -907,7 +907,8 @@ 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) || @@ -919,13 +920,14 @@ 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(); @@ -938,13 +940,14 @@ // 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.")); @@ -971,13 +974,14 @@ 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) { @@ -1012,6 +1016,7 @@ iToneObserver = NULL; } } +#endif } void CAknSynthSoundInfo::SetVolume(TVolumeSetting aVolume) @@ -1027,7 +1032,7 @@ { max = (TInt)ESoundVolume9; // Set it to our max } - +#if 0 TInt volume = 0; if ( Preference() != KKeyClickPreference ) // Other sounds than key click @@ -1051,6 +1056,7 @@ break; } aTonePlayer->SetVolume(volume); +#endif } @@ -1072,9 +1078,10 @@ void CAknToneSoundInfo::Prepare() { LOGTEXT(_L("CAknToneSoundInfo::Prepare().")); - +#if 0 // Prepare iTonePlayer->PrepareToPlayTone(iFrequency, iMs); +#endif } @@ -1097,9 +1104,10 @@ void CAknSequenceSoundInfo::Prepare() { LOGTEXT(_L("CAknSequenceSoundInfo::Prepare().")); - +#if 0 // Prepare iTonePlayer->PrepareToPlayDesSequence(*iSequence); +#endif } void CAknSequenceSoundInfo::ReadSequenceL(RReadStream& aStream) @@ -1142,12 +1150,13 @@ { 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")); } @@ -1155,7 +1164,7 @@ void CAknFileSoundInfo::DoPlay() { LOGTEXT(_L("CAknFileSoundInfo::DoPlay().")); - +#if 0 if (iPrepared) { LOGTEXT(_L(" CAknFileSoundInfo::DoPlay(). Prepared succesfull, play.")); @@ -1178,13 +1187,14 @@ 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) { @@ -1204,6 +1214,7 @@ iAudioPlayer = NULL; iPrepared = EFalse; } +#endif } void CAknFileSoundInfo::MoscoStateChangeEvent(CBase* /*aObject*/, TInt /*aPreviousState*/, @@ -1224,7 +1235,7 @@ { max = (TInt)ESoundVolume9; // Set it to our max } - +#if 0 TInt volume = 0; if ( Preference() != KKeyClickPreference ) // Other sounds than key click @@ -1249,6 +1260,7 @@ break; } aAudioPlayer->SetVolume(volume); +#endif } void CAknFileSoundInfo::MapcInitComplete(TInt aError, @@ -1256,7 +1268,6 @@ { LOGTEXT(_L("CAknFileSoundInfo::MapcInitComplete().")); LOGTEXT1(_L(" aError:%d"), aError); - if (aError == KErrNone) { iPrepared = ETrue; @@ -1269,12 +1280,13 @@ void CAknFileSoundInfo::MapcPlayComplete(TInt /*aError*/) { LOGTEXT(_L("CAknFileSoundInfo::MapcPlayComplete()")); - +#if 0 iPlaying = EFalse; delete iAudioPlayer; iAudioPlayer = NULL; iPrepared = EFalse; +#endif } // End of file diff -r e17592a1211c -r bdb0226b36a8 group/bld.inf --- a/group/bld.inf Fri Oct 15 16:37:36 2010 +0100 +++ b/group/bld.inf Fri Oct 15 16:48:18 2010 +0100 @@ -25,4 +25,5 @@ ..\breakdeps\backend.mmp ..\breakdeps\cone.mmp ..\breakdeps\SVGEngine.mmp +..\breakdeps\eiksrvui.mmp