# HG changeset patch # User William Roberts # Date 1290093449 0 # Node ID 3c8fb4698aeb2b6252810425e18a5c88299922d6 # Parent b9832c8d3f368b173c05cc7d0155caf06ed1de47 Remove more unnecessary exports from stem_mediaclientaudio.dll, use unmodified cone.dll and eiksrvui.dll Stop building stem versions of cone.dll and eiksrvui.dll diff -r b9832c8d3f36 -r 3c8fb4698aeb eabi/MediaClientAudio.def --- a/eabi/MediaClientAudio.def Thu Nov 18 13:16:30 2010 +0000 +++ b/eabi/MediaClientAudio.def Thu Nov 18 15:17:29 2010 +0000 @@ -2,46 +2,46 @@ _ZN13CMdaAudioTypeD0Ev @ 1 NONAME ABSENT _ZN13CMdaAudioTypeD1Ev @ 2 NONAME ABSENT _ZN13CMdaAudioTypeD2Ev @ 3 NONAME ABSENT -_ZN20CMdaAudioToneUtility11GetBalanceLEv @ 4 NONAME - _ZN20CMdaAudioToneUtility11SetBalanceLEi @ 5 NONAME - _ZN20CMdaAudioToneUtility15CustomInterfaceE4TUid @ 6 NONAME - _ZN20CMdaAudioToneUtility21PrepareToPlayDualToneEiiRK25TTimeIntervalMicroSeconds @ 7 NONAME - _ZN20CMdaAudioToneUtility25PrepareToPlayFileSequenceER5RFile @ 8 NONAME - _ZN20CMdaAudioToneUtility4NewLER21MMdaAudioToneObserverP10CMdaServer @ 9 NONAME - _ZN20CMdaAudioToneUtility4NewLER21MMdaAudioToneObserverP10CMdaServerii @ 10 NONAME - _ZN22CMdaAudioPlayerUtility10GetBalanceERi @ 11 NONAME - _ZN22CMdaAudioPlayerUtility10GetBitRateERj @ 12 NONAME - _ZN22CMdaAudioPlayerUtility10SetBalanceEi @ 13 NONAME - _ZN22CMdaAudioPlayerUtility11GetPositionER25TTimeIntervalMicroSeconds @ 14 NONAME - _ZN22CMdaAudioPlayerUtility11SetPositionERK25TTimeIntervalMicroSeconds @ 15 NONAME - _ZN22CMdaAudioPlayerUtility11SetPriorityEii @ 16 NONAME - _ZN22CMdaAudioPlayerUtility13NewDesPlayerLERK6TDesC8R23MMdaAudioPlayerCallbackiiP10CMdaServer @ 17 NONAME - _ZN22CMdaAudioPlayerUtility13SetPlayWindowERK25TTimeIntervalMicroSecondsS2_ @ 18 NONAME - _ZN22CMdaAudioPlayerUtility14NewFilePlayerLERK7TDesC16R23MMdaAudioPlayerCallbackiiP10CMdaServer @ 19 NONAME - _ZN22CMdaAudioPlayerUtility14WillResumePlayEv @ 20 NONAME - _ZN22CMdaAudioPlayerUtility15ClearPlayWindowEv @ 21 NONAME - _ZN22CMdaAudioPlayerUtility17CustomCommandSyncERK8TPckgBufI22TMMFMessageDestinationEiRK6TDesC8S7_ @ 22 NONAME - _ZN22CMdaAudioPlayerUtility17CustomCommandSyncERK8TPckgBufI22TMMFMessageDestinationEiRK6TDesC8S7_R5TDes8 @ 23 NONAME - _ZN22CMdaAudioPlayerUtility17GetMetaDataEntryLEi @ 24 NONAME - _ZN22CMdaAudioPlayerUtility18CustomCommandAsyncERK8TPckgBufI22TMMFMessageDestinationEiRK6TDesC8S7_R14TRequestStatus @ 25 NONAME - _ZN22CMdaAudioPlayerUtility18CustomCommandAsyncERK8TPckgBufI22TMMFMessageDestinationEiRK6TDesC8S7_R5TDes8R14TRequestStatus @ 26 NONAME - _ZN22CMdaAudioPlayerUtility19GetDRMCustomCommandEv @ 27 NONAME - _ZN22CMdaAudioPlayerUtility21NewDesPlayerReadOnlyLERK6TDesC8R23MMdaAudioPlayerCallbackiiP10CMdaServer @ 28 NONAME - _ZN22CMdaAudioPlayerUtility24GetAudioLoadingProgressLERi @ 29 NONAME - _ZN22CMdaAudioPlayerUtility26GetNumberOfMetaDataEntriesERi @ 30 NONAME - _ZN22CMdaAudioPlayerUtility33RegisterAudioResourceNotificationER37MMMFAudioResourceNotificationCallback4TUidRK6TDesC8 @ 31 NONAME - _ZN22CMdaAudioPlayerUtility35RegisterForAudioLoadingNotificationER21MAudioLoadingObserver @ 32 NONAME - _ZN22CMdaAudioPlayerUtility36ControllerImplementationInformationLEv @ 33 NONAME - _ZN22CMdaAudioPlayerUtility39CancelRegisterAudioResourceNotificationE4TUid @ 34 NONAME - _ZN22CMdaAudioPlayerUtility4NewLER23MMdaAudioPlayerCallbackii @ 35 NONAME - _ZN22CMdaAudioPlayerUtility5CloseEv @ 36 NONAME - _ZN22CMdaAudioPlayerUtility5PauseEv @ 37 NONAME - _ZN22CMdaAudioPlayerUtility8OpenDesLERK6TDesC8 @ 38 NONAME - _ZN22CMdaAudioPlayerUtility8OpenUrlLERK7TDesC16iRK6TDesC8 @ 39 NONAME - _ZN22CMdaAudioPlayerUtility9GetVolumeERi @ 40 NONAME - _ZN22CMdaAudioPlayerUtility9OpenFileLERK5RFile @ 41 NONAME - _ZN22CMdaAudioPlayerUtility9OpenFileLERK7TDesC16 @ 42 NONAME - _ZN22CMdaAudioPlayerUtility9OpenFileLERK9TMMSource @ 43 NONAME +_ZN20CMdaAudioToneUtility11GetBalanceLEv @ 4 NONAME ABSENT + _ZN20CMdaAudioToneUtility11SetBalanceLEi @ 5 NONAME ABSENT + _ZN20CMdaAudioToneUtility15CustomInterfaceE4TUid @ 6 NONAME ABSENT + _ZN20CMdaAudioToneUtility21PrepareToPlayDualToneEiiRK25TTimeIntervalMicroSeconds @ 7 NONAME ABSENT + _ZN20CMdaAudioToneUtility25PrepareToPlayFileSequenceER5RFile @ 8 NONAME ABSENT + _ZN20CMdaAudioToneUtility4NewLER21MMdaAudioToneObserverP10CMdaServer @ 9 NONAME ; needed + _ZN20CMdaAudioToneUtility4NewLER21MMdaAudioToneObserverP10CMdaServerii @ 10 NONAME ABSENT + _ZN22CMdaAudioPlayerUtility10GetBalanceERi @ 11 NONAME ABSENT + _ZN22CMdaAudioPlayerUtility10GetBitRateERj @ 12 NONAME ABSENT + _ZN22CMdaAudioPlayerUtility10SetBalanceEi @ 13 NONAME ABSENT + _ZN22CMdaAudioPlayerUtility11GetPositionER25TTimeIntervalMicroSeconds @ 14 NONAME ; needed + _ZN22CMdaAudioPlayerUtility11SetPositionERK25TTimeIntervalMicroSeconds @ 15 NONAME ; needed + _ZN22CMdaAudioPlayerUtility11SetPriorityEii @ 16 NONAME ABSENT + _ZN22CMdaAudioPlayerUtility13NewDesPlayerLERK6TDesC8R23MMdaAudioPlayerCallbackiiP10CMdaServer @ 17 NONAME ABSENT + _ZN22CMdaAudioPlayerUtility13SetPlayWindowERK25TTimeIntervalMicroSecondsS2_ @ 18 NONAME ABSENT + _ZN22CMdaAudioPlayerUtility14NewFilePlayerLERK7TDesC16R23MMdaAudioPlayerCallbackiiP10CMdaServer @ 19 NONAME ; needed + _ZN22CMdaAudioPlayerUtility14WillResumePlayEv @ 20 NONAME ABSENT + _ZN22CMdaAudioPlayerUtility15ClearPlayWindowEv @ 21 NONAME ABSENT + _ZN22CMdaAudioPlayerUtility17CustomCommandSyncERK8TPckgBufI22TMMFMessageDestinationEiRK6TDesC8S7_ @ 22 NONAME ABSENT + _ZN22CMdaAudioPlayerUtility17CustomCommandSyncERK8TPckgBufI22TMMFMessageDestinationEiRK6TDesC8S7_R5TDes8 @ 23 NONAME ABSENT + _ZN22CMdaAudioPlayerUtility17GetMetaDataEntryLEi @ 24 NONAME ABSENT + _ZN22CMdaAudioPlayerUtility18CustomCommandAsyncERK8TPckgBufI22TMMFMessageDestinationEiRK6TDesC8S7_R14TRequestStatus @ 25 NONAME ABSENT + _ZN22CMdaAudioPlayerUtility18CustomCommandAsyncERK8TPckgBufI22TMMFMessageDestinationEiRK6TDesC8S7_R5TDes8R14TRequestStatus @ 26 NONAME ABSENT + _ZN22CMdaAudioPlayerUtility19GetDRMCustomCommandEv @ 27 NONAME ABSENT + _ZN22CMdaAudioPlayerUtility21NewDesPlayerReadOnlyLERK6TDesC8R23MMdaAudioPlayerCallbackiiP10CMdaServer @ 28 NONAME ABSENT + _ZN22CMdaAudioPlayerUtility24GetAudioLoadingProgressLERi @ 29 NONAME ABSENT + _ZN22CMdaAudioPlayerUtility26GetNumberOfMetaDataEntriesERi @ 30 NONAME ABSENT + _ZN22CMdaAudioPlayerUtility33RegisterAudioResourceNotificationER37MMMFAudioResourceNotificationCallback4TUidRK6TDesC8 @ 31 NONAME ABSENT + _ZN22CMdaAudioPlayerUtility35RegisterForAudioLoadingNotificationER21MAudioLoadingObserver @ 32 NONAME ABSENT + _ZN22CMdaAudioPlayerUtility36ControllerImplementationInformationLEv @ 33 NONAME ABSENT + _ZN22CMdaAudioPlayerUtility39CancelRegisterAudioResourceNotificationE4TUid @ 34 NONAME ABSENT + _ZN22CMdaAudioPlayerUtility4NewLER23MMdaAudioPlayerCallbackii @ 35 NONAME ; needed + _ZN22CMdaAudioPlayerUtility5CloseEv @ 36 NONAME ; needed + _ZN22CMdaAudioPlayerUtility5PauseEv @ 37 NONAME ; needed + _ZN22CMdaAudioPlayerUtility8OpenDesLERK6TDesC8 @ 38 NONAME ABSENT + _ZN22CMdaAudioPlayerUtility8OpenUrlLERK7TDesC16iRK6TDesC8 @ 39 NONAME ABSENT + _ZN22CMdaAudioPlayerUtility9GetVolumeERi @ 40 NONAME ABSENT + _ZN22CMdaAudioPlayerUtility9OpenFileLERK5RFile @ 41 NONAME ; needed + _ZN22CMdaAudioPlayerUtility9OpenFileLERK7TDesC16 @ 42 NONAME ; needed + _ZN22CMdaAudioPlayerUtility9OpenFileLERK9TMMSource @ 43 NONAME ABSENT _ZN23CMdaAudioConvertUtility13SourceFormatLEv @ 44 NONAME ABSENT _ZN23CMdaAudioConvertUtility14SourceBitRateLEv @ 45 NONAME ABSENT _ZN23CMdaAudioConvertUtility15SourceDataTypeLEv @ 46 NONAME ABSENT @@ -152,15 +152,15 @@ _ZTV26CMMFMdaAudioPlayerCallBack @ 151 NONAME ; ## _ZTV27CRepeatTrailingSilenceTimer @ 152 NONAME ; ## _ZTV32CMMFMdaAudioToneObserverCallback @ 153 NONAME ; ## - _ZNK22CMdaAudioPlayerUtility17SetThreadPriorityERK15TThreadPriority @ 154 NONAME + _ZNK22CMdaAudioPlayerUtility17SetThreadPriorityERK15TThreadPriority @ 154 NONAME ABSENT _ZNK23CMdaAudioConvertUtility17SetThreadPriorityERK15TThreadPriority @ 155 NONAME ABSENT _ZNK24CMdaAudioRecorderUtility23SetThreadPriorityRecordERK15TThreadPriority @ 156 NONAME ABSENT _ZNK24CMdaAudioRecorderUtility25SetThreadPriorityPlaybackERK15TThreadPriority @ 157 NONAME ABSENT - _ZN22CMdaAudioPlayerUtility13UseSharedHeapEv @ 158 NONAME - _ZN22CMdaAudioPlayerUtility8DurationER25TTimeIntervalMicroSeconds @ 159 NONAME + _ZN22CMdaAudioPlayerUtility13UseSharedHeapEv @ 158 NONAME ABSENT + _ZN22CMdaAudioPlayerUtility8DurationER25TTimeIntervalMicroSeconds @ 159 NONAME ABSENT _ZN24CMdaAudioRecorderUtility8DurationER25TTimeIntervalMicroSeconds @ 160 NONAME ABSENT _ZN23CMdaAudioConvertUtility13UseSharedHeapEv @ 161 NONAME ABSENT _ZN24CMdaAudioRecorderUtility13UseSharedHeapEv @ 162 NONAME ABSENT - _ZN20CMdaAudioToneUtility5PauseEv @ 163 NONAME - _ZN20CMdaAudioToneUtility6ResumeEv @ 164 NONAME - _ZN20CMdaAudioToneUtility25RegisterPlayStartCallbackER30MMdaAudioTonePlayStartObserver @ 165 NONAME + _ZN20CMdaAudioToneUtility5PauseEv @ 163 NONAME ABSENT + _ZN20CMdaAudioToneUtility6ResumeEv @ 164 NONAME ABSENT + _ZN20CMdaAudioToneUtility25RegisterPlayStartCallbackER30MMdaAudioTonePlayStartObserver @ 165 NONAME ABSENT diff -r b9832c8d3f36 -r 3c8fb4698aeb group/bld.inf --- a/group/bld.inf Thu Nov 18 13:16:30 2010 +0000 +++ b/group/bld.inf Thu Nov 18 15:17:29 2010 +0000 @@ -35,8 +35,6 @@ ../breakdeps/backend.mmp // based on sf/mw/classicui -../breakdeps/cone.mmp -../breakdeps/eiksrvui.mmp ../breakdeps/avkon.mmp // based on sf/mw/svgt diff -r b9832c8d3f36 -r 3c8fb4698aeb syborg_stem/rom_content.csv --- a/syborg_stem/rom_content.csv Thu Nov 18 13:16:30 2010 +0000 +++ b/syborg_stem/rom_content.csv Thu Nov 18 15:17:29 2010 +0000 @@ -3167,7 +3167,7 @@ sys\bin\comsdbgutil.dll,/epoc32/release/armv5/urel/comsdbgutil.dll,commsdebugutility.iby,os/persistentdata,Out,Auto,Not referenced during boot sys\bin\ConArc.dll,/epoc32/release/armv5/urel/conarc.dll,conarc.iby,mw/appsupport,,, sys\bin\conditionevaluator.dll,/epoc32/release/armv5/urel/conditionevaluator.dll,conditionevaluator.iby,os/devicesrv,,, -sys\bin\Cone.dll,/epoc32/release/armv5/urel/cone.dll,cone.iby,mw/classicui,mm_Stem,MW,Break dependency on MediaClientAudio.dll +sys\bin\Cone.dll,/epoc32/release/armv5/urel/cone.dll,cone.iby,mw/classicui,,WR,Stem no longer needed given slim mediaclientaudio.dll sys\bin\ConfigurationComponentsFactory.dll,/epoc32/release/armv5/urel/configurationcomponentsfactory.dll,core/os/ConfigurationComponentsFactory.iby,mw/mmmw,Out,Auto,Not referenced during boot Sys\Bin\connectiondialogswrapper.DLL,/epoc32/release/armv5/urel/connectiondialogswrapper.dll,core/mw/ConnectionDialogs.iby,mw/ipconnmgmt,,, sys\bin\ConnectionManager.dll,/epoc32/release/armv5/urel/connectionmanager.dll,core/mw/ConnectionManager.iby,mw/web,Out,Auto,Not referenced during boot @@ -3467,7 +3467,7 @@ sys\bin\EikSrv.dll,/epoc32/release/armv5/urel/eiksrv.dll,uikon.iby,mw/classicui,,, sys\bin\EikSrvc.dll,/epoc32/release/armv5/urel/eiksrvc.dll,uikon.iby,mw/classicui,,, sys\bin\EikSrvs.exe,/epoc32/release/armv5/urel/eiksrvs.exe,uikon.iby,mw/classicui,,, -sys\bin\eiksrvui.dll,/epoc32/release/armv5/urel/eiksrvui.dll,core/mw/eikstd.iby,mw/classicui,mm_Stem,MW,Break dependency on mediaclientaudio.dll +sys\bin\eiksrvui.dll,/epoc32/release/armv5/urel/eiksrvui.dll,core/mw/eikstd.iby,mw/classicui,,WR,Stem no longer needed given slim mediaclientaudio.dll Sys\Bin\eintsock_transport.dll,/epoc32/release/armv5/urel/eintsock_transport.dll,esock_core.iby,os/commsfw,Out,Auto,Not referenced during boot sys\bin\eirclient.dll,/epoc32/release/armv5/urel/eirclient.dll,bluetooth.iby,os/bt,Out,Auto,Not referenced during boot sys\bin\EKTran.dll,/epoc32/release/armv5/urel/ektran.dll,base.iby,os/kernelhwsrv,,, diff -r b9832c8d3f36 -r 3c8fb4698aeb syborg_stem/static_dependencies.txt --- a/syborg_stem/static_dependencies.txt Thu Nov 18 13:16:30 2010 +0000 +++ b/syborg_stem/static_dependencies.txt Thu Nov 18 15:17:29 2010 +0000 @@ -2183,7 +2183,7 @@ sys\bin\MceSettings.dll /epoc32/release/armv5/urel/mcesettings.dll sid=101f868d:CommonDialogs[101f4688].dll:CommonEngine[100058fe].dll:CommonUI[100058fd].dll:IMUMUTILS[102750c7].dll:ServiceHandler[101f865a].dll:avkon[100056c6].dll:bafl[10003a0f].dll:centralrepository[101fbc70].dll:cone[10003a41].dll:drtaeabi.dll:efsrv[100039e4].dll:eikcoctl[1000489e].dll:eikcore[10004892].dll:eikctl[1000489c].dll:eikdlg[10004898].dll:euser[100039e5].dll:featmgr[10005a2b].dll:hlplch[101f423b].dll:msgs[10004e66].dll:mtur[10004835].dll:muiu_internal[1028256a].dll:muiu[100058cd].dll:platformenv[101f857f].dll:scppnwdl.dll:sendui[100058f0].dll:sssettings[10005a01].dll:sysutil[10005943].dll sys\bin\MediaClient.dll /epoc32/release/armv5/urel/mediaclient.dll sid=10003942:drtaeabi.dll:euser[100039e5].dll:scppnwdl.dll sys\bin\MediaClientAudio.dll /epoc32/release/armv5/urel/mediaclientaudio.dll exports=1-165:sid=10003992:caf.dll:drtaeabi.dll:drtrvct2_2.dll:ecom[10009d8e].dll:euser[100039e5].dll:mediaclientutility[101ffa08].dll:mediaclient[10003942].dll:mmcommon[101f7d8f].dll:mmfcontrollerframework[101f76dd].dll:mmfdevsound[100058cc].dll:mmfstandardcustomcommands[101f76de].dll:scppnwdl.dll -sys\bin\MediaClientAudio.dll /epoc32/release/armv5/urel/stem_mediaclientaudio.dll exports=4-43.129.132.136-138.144.147.151-154.158-159.163-165:sid=10003992:drtaeabi.dll:ecom[10009d8e].dll:euser[100039e5].dll:scppnwdl.dll +sys\bin\MediaClientAudio.dll /epoc32/release/armv5/urel/stem_mediaclientaudio.dll exports=9.14-15.19.35-37.41-42.129.132.136-138.144.147.151-153:sid=10003992:drtaeabi.dll:ecom[10009d8e].dll:euser[100039e5].dll:scppnwdl.dll sys\bin\MediaClientAudioInputStream.dll /epoc32/release/armv5/urel/mediaclientaudioinputstream.dll sid=10003998:drtaeabi.dll:drtrvct2_2.dll:euser[100039e5].dll:mediaclient[10003942].dll:mmfdevsound[100058cc].dll:scppnwdl.dll sys\bin\MediaClientAudioStream.dll /epoc32/release/armv5/urel/mediaclientaudiostream.dll sid=10003996:drtaeabi.dll:drtrvct2_2.dll:euser[100039e5].dll:mediaclient[10003942].dll:mmfdevsound[100058cc].dll:scppnwdl.dll sys\bin\MediaClientImage.dll /epoc32/release/armv5/urel/mediaclientimage.dll sid=10003994:bitmaptransforms[101f45ec].dll:drtaeabi.dll:ecom[10009d8e].dll:efsrv[100039e4].dll:euser[100039e5].dll:fbscli[10003a15].dll:imageconversion[101f45ad].dll:scppnwdl.dll