# HG changeset patch
# User markw <markw@symbian.org>
# Date 1289563275 0
# Node ID 8338c5c25b5bc54250af3d32218b5fbb6a0a5bbc
# Parent  a2070821d4503724e8ff36803606020be9ec6783# Parent  faed561c44edbe16d2adf55abb485c848f843198
Merge mediaclientaudio stub to latest baseline.

diff -r a2070821d450 -r 8338c5c25b5b breakdeps/MediaClientAudio.mmp
diff -r a2070821d450 -r 8338c5c25b5b breakdeps/mmfclientaudioplayer.cpp
diff -r a2070821d450 -r 8338c5c25b5b breakdeps/mmfclienttoneplayer.cpp
diff -r a2070821d450 -r 8338c5c25b5b breakdeps/mmfclienttoneplayer.h
diff -r a2070821d450 -r 8338c5c25b5b eabi/MediaClientAudio.def
diff -r a2070821d450 -r 8338c5c25b5b group/bld.inf
diff -r a2070821d450 -r 8338c5c25b5b syborg_stem/rom_content.csv
--- a/syborg_stem/rom_content.csv	Fri Nov 12 11:56:07 2010 +0000
+++ b/syborg_stem/rom_content.csv	Fri Nov 12 12:01:15 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,Stem,MW,Break dependency on MediaClientAudio.dll
+sys\bin\Cone.dll,/epoc32/release/armv5/urel/cone.dll,cone.iby,mw/classicui,In,MW,Break dependency on 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
diff -r a2070821d450 -r 8338c5c25b5b syborg_stem/static_dependencies.txt
--- a/syborg_stem/static_dependencies.txt	Fri Nov 12 11:56:07 2010 +0000
+++ b/syborg_stem/static_dependencies.txt	Fri Nov 12 12:01:15 2010 +0000
@@ -4128,3 +4128,9 @@
 sys\bin\xn3odt.dll	/epoc32/release/armv5/urel/xn3odt.dll	sid=00000000:drtaeabi.dll:estor[10003b0d].dll:euser[100039e5].dll:scppnwdl.dll:xn3domdocument[10207392].dll:xn3resource.dll
 sys\bin\xn3resource.dll	/epoc32/release/armv5/urel/xn3resource.dll	sid=00000000:apmime[10003a1a].dll:drtaeabi.dll:estor[10003b0d].dll:euser[100039e5].dll:scppnwdl.dll
 sys\bin\xn3utils.dll	/epoc32/release/armv5/urel/xn3utils.dll	sid=2001cb51:drtaeabi.dll:ecom[10009d8e].dll:euser[100039e5].dll:scppnwdl.dll
+sys\bin\Cone.dll	/epoc32/release/armv5/urel/stem_cone.dll	sid=10003a41:bafl[10003a0f].dll:centralrepository[101fbc70].dll:drtaeabi.dll:ecom[10009d8e].dll:efsrv[100039e4].dll:egul[100048a2].dll:estor[10003b0d].dll:euser[100039e5].dll:gdi[10003b15].dll:hal[100039e8].dll:scppnwdl.dll:viewcli[10003f33].dll:ws32[10003b21].dll
+sys\bin\MediaClientAudio.dll	/epoc32/release/armv5/urel/stem_mediaclientaudio.dll	sid=10003992:drtaeabi.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\SVGEngine.dll	/epoc32/release/armv5/urel/stem_svgengine.dll	sid=101f856e:VGRenderer[0152d27e].dll:XMLInterface[101f9750].dll:avkon[100056c6].dll:bafl[10003a0f].dll:bitgdi[10003b18].dll:caf.dll:charconv[10003b11].dll:dfpaeabi.dll:drtaeabi.dll:efsrv[100039e4].dll:estor[10003b0d].dll:euser[100039e5].dll:ezlib[10005706].dll:fbscli[10003a15].dll:gdi[10003b15].dll:hal[100039e8].dll:imageconversion[101f45ad].dll:imut[10004837].dll:scppnwdl.dll
+sys\bin\eiksrvui.dll	/epoc32/release/armv5/urel/stem_eiksrvui.dll	sid=100053d0:AKNSKINS[10005a26].dll:AknIcon[1020735a].dll:AknLayout2Scalable[102040d7].dll:AknNotifyPlugin[010f9a40].dll:CdlEngine[101f8243].dll:Eikalert[100056df].dll:akncapserverclient[10207244].dll:aknlayout2[10158c94].dll:aknnotifierwrapper[101f882a].dll:alarmclient[101f5028].dll:apgrfx[10003a3c].dll:apparc[10003a3d].dll:apserv[10003a3e].dll:avkon[100056c6].dll:bafl[10003a0f].dll:c32[10003d33].dll:cenrepnotifhandler[10200c8a].dll:centralrepository[101fbc70].dll:cone[10003a41].dll:drtaeabi.dll:drtrvct2_2.dll:efsrv[100039e4].dll:eikcoctl[1000489e].dll:eikcore[10004892].dll:eikdlg[10004898].dll:eiksrv[10003a4a].dll:estor[10003b0d].dll:euser[100039e5].dll:featmgr[10005a2b].dll:gdi[10003b15].dll:oodmonitor[102828dc].dll:scppnwdl.dll:uiklaf[1000411f].dll:viewcli[10003f33].dll:ws32[10003b21].dll