2010wk25_03
authorhgs
Fri, 09 Jul 2010 12:23:13 +0100
changeset 29 eb1e5d7cc688
parent 26 c36d67f77f75
child 30 9707f1c07383
2010wk25_03
build.config.xml
devsound/a3facf/group/bld.inf
devsound/a3facf/group/multimedia_a3f_acf.mrp
devsound/a3fdevsound/bwins/mmfdevsoundadaptor.def
devsound/a3fdevsound/eabi/mmfdevsoundadaptor.def
devsound/a3fdevsound/group/multimedia_a3f_devsound.mrp
devsound/a3fdevsound/src/devsoundadaptor/cdevaudio.cpp
devsound/a3fdevsound/src/devsoundadaptor/cdevaudio.h
devsound/a3fdevsound/src/devsoundadaptor/cdevcommoncontrol.cpp
devsound/a3fdevsound/src/devsoundadaptor/mmfdevsoundadaptation.cpp
devsound/a3fdevsound/src/devsoundadaptor/mmfdevsoundadaptation.h
devsound/a3fdevsound/src/devsoundadaptor/mmfdevsoundadaptationbody.cpp
devsound/a3fdevsound/src/devsoundadaptor/mmfdevsoundadaptationbody.h
devsound/a3fdevsound/src/mmfdevsoundserver/mmfdevsoundsession.cpp
devsound/a3fintegrationtest/group/bld.inf
devsound/a3fintegrationtest/group/tsi_a3f_devsound.iby
devsound/a3fintegrationtest/scripts/tsi_a3f_devsound_pcm_play.script
devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp
devsound/a3ftrace/group/multimedia_a3f_traces.mrp
devsound/devsoundapi/group/bld.inf
devsound/devsoundpluginsupport/inc/MmfDevSoundCustomCommands.h
devsound/devsoundpluginsupport/inc/MmfDevSoundCustomInterface.h
devsound/devsoundpluginsupport/inc/MmfDevSoundCustomInterface.hrh
devsound/devsoundpluginsupport/inc/plugin/DevSoundPlugin.h
devsound/devsoundpluginsupport/mmpfiles/MMFDevSoundCIFileBlockLength.mmp
devsound/devsoundpluginsupport/mmpfiles/MMFDevSoundCustomInterfaceBitRate.mmp
devsound/devsoundpluginsupport/mmpfiles/aacdecoderconfigci.mmp
devsound/devsoundpluginsupport/mmpfiles/advancedaacencodesettingsci.mmp
devsound/devsoundpluginsupport/mmpfiles/audiobufferprefillci.mmp
devsound/devsoundpluginsupport/mmpfiles/audiovibracontrolci.mmp
devsound/devsoundpluginsupport/mmpfiles/bufferframesconfigci.mmp
devsound/devsoundpluginsupport/mmpfiles/dspcontrolci.mmp
devsound/devsoundpluginsupport/mmpfiles/eaacplusdecoderci.mmp
devsound/devsoundpluginsupport/mmpfiles/errorconcealmentci.mmp
devsound/devsoundpluginsupport/mmpfiles/g711decoderconfigci.mmp
devsound/devsoundpluginsupport/mmpfiles/g711encoderconfigci.mmp
devsound/devsoundpluginsupport/mmpfiles/g729decoderconfigci.mmp
devsound/devsoundpluginsupport/mmpfiles/g729encoderconfigci.mmp
devsound/devsoundpluginsupport/mmpfiles/gettimestampsci.mmp
devsound/devsoundpluginsupport/mmpfiles/gsmconfigci.mmp
devsound/devsoundpluginsupport/mmpfiles/ilbcdecoderconfigci.mmp
devsound/devsoundpluginsupport/mmpfiles/ilbcencoderconfigci.mmp
devsound/devsoundpluginsupport/mmpfiles/playbackstatusci.mmp
devsound/devsoundpluginsupport/mmpfiles/sbcencoderci.mmp
devsound/devsoundpluginsupport/mmpfiles/setdrmprotectedci.mmp
devsound/devsoundpluginsupport/mmpfiles/speechencoderconfigci.mmp
devsound/devsoundpluginsupport/mmpfiles/underflowautostopcontrolci.mmp
devsound/devsoundpluginsupport/src/CustomInterfaces/CMMFDevSoundCIBitRate.cpp
devsound/devsoundpluginsupport/src/CustomInterfaces/CMMFDevSoundCIBitRate.h
devsound/devsoundpluginsupport/src/CustomInterfaces/CMMFDevSoundCIBitRateImplementationUID.hrh
devsound/devsoundpluginsupport/src/CustomInterfaces/CMMFDevSoundCIFileBlockLength.cpp
devsound/devsoundpluginsupport/src/CustomInterfaces/CMMFDevSoundCIFileBlockLength.h
devsound/devsoundpluginsupport/src/CustomInterfaces/CMMFDevSoundCIFileBlockLengthImplUID.hrh
devsound/devsoundrefplugin/group/bld.inf
devsound/devsoundrefplugin/mmpfiles/plugin/Gsm610HwDevices.mmp
devsound/devsoundrefplugin/mmpfiles/plugin/mmfAudioHwDevices.mmp
devsound/hwdevapi/group/bld.inf
devsound/sounddevbt/group/BLD.INF
devsound/sounddevbt/group/bld.inf
devsoundextensions/drmaudioplayer/DRMPlayServer/inc/DRMCustomCommandAsyncAO.h
devsoundextensions/effects/Loudness/LoudnessEffect/Src/LoudnessBase.cpp
imagingandcamerafws/camerafw/group/BLD.INF
imagingandcamerafws/camerafw/group/bld.inf
imagingandcamerafws/camerafw/group/multimedia_ecam_framework.mrp
imagingandcamerafws/cameraunittest/group/BLD.INF
imagingandcamerafws/cameraunittest/group/bld.inf
imagingandcamerafws/cameraunittest/inc/tsu_ecm_adv.iby
imagingandcamerafws/cameraunittest/inc/tsu_ecm_api.iby
imagingandcamerafws/cameraunittest/inc/tsu_ecm_ram.iby
imagingandcamerafws/imagingfws/BitmapTransform/group/BLD.inf
imagingandcamerafws/imagingfws/BitmapTransform/group/bld.inf
imagingandcamerafws/imagingfws/GifScaler/group/bld.inf
imagingandcamerafws/imagingfws/GifScaler/group/bld_include.inf
imagingandcamerafws/imagingfws/ImageTransform/group/bld.inf
imagingandcamerafws/imagingfws/ImageTransform/group/bld_include.inf
imagingandcamerafws/imagingfws/MediaClientImage/Group/BLD.INF
imagingandcamerafws/imagingfws/MediaClientImage/Group/bld.inf
imagingandcamerafws/imagingfws/group/BLD.INF
imagingandcamerafws/imagingfws/group/bld.inf
imagingandcamerafws/imagingfws/inc/ImageConversion.h
imagingandcamerafws/imagingfws/inc/icl/ICL_PropertyUIDS.h
imagingandcamerafws/imagingfws/inc/icl/ICL_PropertyUIDS.hrh
imagingandcamerafws/imagingfws/src/ImageResolverAPI.cpp
imagingandcamerafws/imaginginttest/Codecs/Group/BLD.INF
imagingandcamerafws/imaginginttest/Codecs/Group/bld.inf
imagingandcamerafws/imaginginttest/Codecs/PpmSamples/lain.ppm
imagingandcamerafws/imaginginttest/TSI_ICL_COD/group/Bld.inf
imagingandcamerafws/imaginginttest/TSI_ICL_COD/group/bld.inf
imagingandcamerafws/imaginginttest/TestImageIAgent/group/bld.inf
imagingandcamerafws/imaginginttest/group/Bld.inf
imagingandcamerafws/imaginginttest/group/bld.inf
imagingandcamerafws/imaginginttest/imagedecoder/group/bld_include.inf
imagingandcamerafws/imaginginttest/imageencoder/group/bld_include.inf
imagingandcamerafws/imaginginttest/src/Data/lain.ppm
imagingandcamerafws/imaginginttest/src/TestStepConversion.cpp
imagingandcamerafws/imaginginttest/te_tsi_icl_cod_5/group/bld.inf
imagingandcamerafws/imaginginttest/te_tsi_icl_pluginsupport_01/group/bld.inf
imagingandcamerafws/imaginginttest/tsi_icl_btrans_01/group/BLD.INF
imagingandcamerafws/imaginginttest/tsi_icl_btrans_01/group/bld.inf
imagingandcamerafws/imagingunittest/TSU_ICL_COD_03/group/BLD.INF
imagingandcamerafws/imagingunittest/TSU_ICL_COD_03/group/bld.inf
imagingandcamerafws/imagingunittest/TSU_ICL_COD_04/group/BLD.INF
imagingandcamerafws/imagingunittest/TSU_ICL_COD_04/group/bld.inf
imagingandcamerafws/imagingunittest/TSU_ICL_TMDAVID/group/BLD.INF
imagingandcamerafws/imagingunittest/TSU_ICL_TMDAVID/group/bld.inf
imagingandcamerafws/imagingunittest/group/BLD.INF
imagingandcamerafws/imagingunittest/group/bld.inf
imagingandcamerafws/imagingunittest/testcodec/group/bld.inf
imagingandcamerafws/imagingunittest/tsu_icl_GenIclImgDisp_01/group/bld.inf
imagingandcamerafws/imagingunittest/tsu_icl_MngImgDisp_01/group/bld.inf
imagingandcamerafws/imagingunittest/tsu_icl_btrans_01/group/bld.inf
imagingandcamerafws/imagingunittest/tsu_icl_btrans_01/inc/TSU_ICL_BTRANS_01.iby
imagingandcamerafws/imagingunittest/tsu_icl_cod_01/group/BLD.INF
imagingandcamerafws/imagingunittest/tsu_icl_cod_01/group/bld.inf
imagingandcamerafws/imagingunittest/tsu_icl_cod_02/group/BLD.INF
imagingandcamerafws/imagingunittest/tsu_icl_cod_02/group/TSU_ICL_COD_02.iby
imagingandcamerafws/imagingunittest/tsu_icl_cod_02/group/bld.inf
imagingandcamerafws/imagingunittest/tsu_icl_frm_01/group/bld.inf
imagingandcamerafws/imagingunittest/tsu_icl_frm_01/testfiles/fw_ext_not_supported_test1.ppm
imagingandcamerafws/imagingunittest/tsu_icl_gscal_01/group/bld.inf
imagingandcamerafws/imagingunittest/tsu_icl_imageframe/group/bld.inf
imagingandcamerafws/imagingunittest/tsu_icl_imgdisp/group/bld.inf
imagingandcamerafws/imagingunittest/tsu_icl_itfm_01/group/bld.inf
imagingandcamerafws/imagingunittest/tsu_icl_mediasvr/group/bld.inf
imagingandcamerafws/imagingunittest/tsu_icl_pfm_01/group/BLD.INF
imagingandcamerafws/imagingunittest/tsu_icl_pfm_01/group/bld.inf
imagingandcamerafws/imagingunittest/tsu_icl_pfm_02/group/BLD.INF
imagingandcamerafws/imagingunittest/tsu_icl_pfm_02/group/bld.inf
imagingandcamerafws/imagingunittest/tsu_icl_pfm_02/scripts/TSU_ICL_PFM_02.script
layers.sysdef.xml
mdfdevvideoextensions/nga_mdf_postprocessor/group/NGAPostProcHwDevice.mmp
mdfdevvideoextensions/nga_mdf_postprocessor/group/nga_mdf_postprocessor.pkg
mdfdevvideoextensions/nga_mdf_postprocessor/inc/NGAPostProcHwDevice.h
mdfdevvideoextensions/nga_mdf_postprocessor/inc/common.h
mdfdevvideoextensions/nga_mdf_postprocessor/inc/surface_hints.h
mdfdevvideoextensions/nga_mdf_postprocessor/src/NGAPostProcHwDevice.cpp
mf_developer_build.config.xml
mm_info/mm_metadata/mm_metadata.mrp
mm_plat/audio_routing_api/inc/AudioOutput.h
mm_plat/audio_routing_proxy_api/inc/AudioInputProxy.h
mm_plat/audio_routing_proxy_api/inc/AudioOutputProxy.h
mm_plat/custom_interface_proxy_factory_api/inc/CustomInterfaceProxyFactory.h
mm_plat/custom_interface_utility_api/inc/CustomCommandUtility.h
mm_plat/custom_interface_utility_api/inc/CustomInterfaceUtility.h
mm_plat/eaacplusutil_api/eaacplusutil_api.metaxml
mm_plat/frametable_api/frametable_api.metaxml
mm_pub/audio_effects_api/inc/AudioEqualizerBase.h
mm_pub/audio_effects_api/inc/BassBoostBase.h
mm_pub/audio_effects_api/inc/DistanceAttenuationBase.h
mm_pub/audio_effects_api/inc/DopplerBase.h
mm_pub/audio_effects_api/inc/EnvironmentalReverbBase.h
mm_pub/audio_effects_api/inc/ListenerDopplerBase.h
mm_pub/audio_effects_api/inc/ListenerLocationBase.h
mm_pub/audio_effects_api/inc/ListenerOrientationBase.h
mm_pub/audio_effects_api/inc/LoudnessBase.h
mm_pub/audio_effects_api/inc/OrientationBase.h
mm_pub/audio_effects_api/inc/RoomLevelBase.h
mm_pub/audio_effects_api/inc/SourceDopplerBase.h
mm_pub/audio_effects_api/inc/SourceLocationBase.h
mm_pub/audio_effects_api/inc/SourceOrientationBase.h
mm_pub/audio_effects_api/inc/StereoWideningBase.h
mm_pub/audio_effects_presets_api/tsrc/EffectPresetsTest/src/EffectPresetTestCore.cpp
mm_pub/drm_audio_player_api/tsrc/DRMAudioPlay/src/DRMAudioPlay_core.cpp
mm_pub/drm_audio_player_api/tsrc/DRMAudioPlay/src/SimpleSoundPlayer.cpp
mm_pub/drm_audio_player_api/tsrc/data/mmc/drm/test3gp.dcf
mm_pub/drm_audio_player_api/tsrc/data/mmc/drm/testamr.dcf
mm_pub/drm_audio_player_api/tsrc/data/mmc/drm/testamrnb.dcf
mm_pub/drm_audio_player_api/tsrc/data/mmc/drm/testamrwb.dcf
mm_pub/drm_audio_player_api/tsrc/data/mmc/drm/testawb.dcf
mm_pub/drm_audio_player_api/tsrc/data/mmc/drm/testmp3.dcf
mmdevicefw/mdf/mmpfiles/audio/mdasoundadapter.mmp
mmdevicefw/mdf/src/audio/mdasoundadapter/mdasoundadapter.cpp
mmdevicefw/mdf/src/audio/mdasoundadapter/mdasoundadapter.h
mmdevicefw/mdf/src/audio/mdasoundadapter/mdasoundadapterbody.cpp
mmdevicefw/mdf/src/audio/mdasoundadapter/mdasoundadapterbody.h
mmdevicefw/mdfunittest/codecapi/PU/pcmcodec/group/BLD.INF
mmdevicefw/mdfunittest/codecapi/PU/pcmcodec/group/bld.inf
mmdevicefw/mdfunittest/codecapi/PU/video/group/bld.inf
mmdevicefw/mdfunittest/codecapi/audio/group/bld.inf
mmdevicefw/mdfunittest/codecapi/codecapi/group/bld.inf
mmdevicefw/mdfunittest/codecapi/omxvorbis/group/bld.inf
mmdevicefw/mdfunittest/codecapi/video/group/TSU_MDF_VIDEOCODECS.iby
mmdevicefw/mdfunittest/codecapi/video/group/bld.inf
mmdevicefw/mdfunittest/group/BLD.INF
mmdevicefw/mdfunittest/group/bld.inf
mmdevicefw/speechrecogsupport/tsrc/ASR/group/bld.inf
mmdevicefw/speechrecogsupport/tsrc/ASR/src/TSU_MMF_ASRCL.cpp
mmhais/a3facl/group/multimedia_a3f_acl.mrp
mmhais/a3fdevsoundcustomisation/group/multimedia_a3f_devsoundadaptationinfo.mrp
mmhais/dvbhunittest/hai/dvbh/group/bld.inf
mmhais/dvbhunittest/hai/dvbh/group/tsu_dvbh_hai.iby
mmhais/refacladapt/group/multimedia_a3f_refacladaptation.mrp
mmlibs/mmfw/group/BLD.INF
mmlibs/mmfw/group/bld.inf
mmlibs/mmfw/inc/mmf/PLUGIN/mmfmediaclientextdisplayinterface.h
mmlibs/mmfw/src/Client/Video/mediaclientextdisplayhandler.cpp
mmlibs/mmfw/src/Client/Video/mediaclientextdisplayhandler.h
mmlibs/mmfw/src/Plugin/Codec/audio/MMFImaAdPcmToPcm16Codec.h
mmlibs/mmfw/src/Plugin/Codec/audio/MmfimaadpcmTopcm16codec.cpp
mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/video/play/group/bld.inf
mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/video/play/group/char_mmf_videoplay.iby
mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/TestConverter.cpp
mmlibs/mmfw/tsrc/mmfintegrationtest/SDevSound/group/BLD.INF
mmlibs/mmfw/tsrc/mmfintegrationtest/SDevSound/group/bld.inf
mmlibs/mmfw/tsrc/mmfintegrationtest/SecureDRM/data/videocontent2.xml
mmlibs/mmfw/tsrc/mmfintegrationtest/SecureDRM/data/videorights2.xml
mmlibs/mmfw/tsrc/mmfintegrationtest/SecureDRM/data/xvidonly.avi
mmlibs/mmfw/tsrc/mmfintegrationtest/bwins/TSI_MMFACLNTU.DEF
mmlibs/mmfw/tsrc/mmfintegrationtest/bwins/TSI_MMFCTLFRMU.DEF
mmlibs/mmfw/tsrc/mmfintegrationtest/bwins/TSI_MMFCUSTOMCOMMANDSU.DEF
mmlibs/mmfw/tsrc/mmfintegrationtest/bwins/TSI_MMFVCLNTU.DEF
mmlibs/mmfw/tsrc/mmfintegrationtest/devsound/group/bld.inf
mmlibs/mmfw/tsrc/mmfintegrationtest/devvideo/group/bld.inf
mmlibs/mmfw/tsrc/mmfintegrationtest/devvideo/group/tsi_mmf_devvideo.iby
mmlibs/mmfw/tsrc/mmfintegrationtest/devvideo/mmpfiles/tsi_mmf_devvideo.mmp
mmlibs/mmfw/tsrc/mmfintegrationtest/devvideo/src/tsi_mmf_devvideo_play.h
mmlibs/mmfw/tsrc/mmfintegrationtest/devvideo/src/tsi_mmf_devvideo_record.h
mmlibs/mmfw/tsrc/mmfintegrationtest/devvideo/src/tsi_mmf_devvideo_stepbase.h
mmlibs/mmfw/tsrc/mmfintegrationtest/devvideo/src/tsi_mmf_devvideo_suite.h
mmlibs/mmfw/tsrc/mmfintegrationtest/eabi/TSI_MMFACLNTU.DEF
mmlibs/mmfw/tsrc/mmfintegrationtest/eabi/TSI_MMFCustomCommandsU.DEF
mmlibs/mmfw/tsrc/mmfintegrationtest/eabi/TSI_MMFVCLNTU.DEF
mmlibs/mmfw/tsrc/mmfintegrationtest/eabi/TSI_MmfCtlfrmU.DEF
mmlibs/mmfw/tsrc/mmfintegrationtest/group/BLD.INF
mmlibs/mmfw/tsrc/mmfintegrationtest/group/IntTest_Mmf.iby
mmlibs/mmfw/tsrc/mmfintegrationtest/group/bld.inf
mmlibs/mmfw/tsrc/mmfintegrationtest/mmpfiles/DSCapTestServer.mmp
mmlibs/mmfw/tsrc/mmfintegrationtest/mmpfiles/TSI_MMFACLNT.mmp
mmlibs/mmfw/tsrc/mmfintegrationtest/mmpfiles/TSI_MMFCTLFRM.mmp
mmlibs/mmfw/tsrc/mmfintegrationtest/mmpfiles/TSI_MMFController.mmp
mmlibs/mmfw/tsrc/mmfintegrationtest/mmpfiles/TSI_MMFController2.mmp
mmlibs/mmfw/tsrc/mmfintegrationtest/mmpfiles/TSI_MMFCustomCommands.mmp
mmlibs/mmfw/tsrc/mmfintegrationtest/mmpfiles/TSI_MMFDataSink.mmp
mmlibs/mmfw/tsrc/mmfintegrationtest/mmpfiles/TSI_MMFDataSource.mmp
mmlibs/mmfw/tsrc/mmfintegrationtest/mmpfiles/TSI_MMFFORMAT.mmp
mmlibs/mmfw/tsrc/mmfintegrationtest/mmpfiles/TSI_MMFUseOldCodecAudioController.mmp
mmlibs/mmfw/tsrc/mmfintegrationtest/mmpfiles/TSI_MMFVCLNT.mmp
mmlibs/mmfw/tsrc/mmfintegrationtest/mmpfiles/TSI_MMF_SDEVSOUND.mmp
mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNT_00.script
mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNT_00_PREEMPTION.script
mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNT_01.script
mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNT_01_PREEMPTION.script
mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNT_02.script
mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNT_03.script
mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNT_03_PREEMPTION.script
mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNT_04.script
mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNT_ARN.script
mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNT_DRM.script
mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNT_FS.script
mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNT_OF.script
mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNT_OF_ALLOC.script
mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNT_Panic.script
mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNT_SD.script
mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNT_SD_MMDDCAP.script
mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNT_SD_NOCAP.script
mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNT_SD_PREEMPTION.script
mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNT_SD_UECAP.script
mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_CTLFRM.script
mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_CTLFRM_NEG.script
mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_CTLFRM_NEG_PREEMPTION.script
mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_CTLFRM_POS.script
mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_CTLFRM_POS_PREEMPTION.script
mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_CTLFRM_PREEMPTION.script
mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_SDEVSOUND_01.script
mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_SDEVSOUND_01_PREEMPTION.script
mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_SDEVSOUND_01_Panic.script
mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_SDEVSOUND_MMDDCAP.script
mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_SDEVSOUND_NOCAP.script
mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_SDEVSOUND_UECAP.script
mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_SECUREDRM_AUDIO.script
mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_SECUREDRM_AUDIO_MMDDCAP.script
mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_SECUREDRM_TESTDATA.script
mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_SECUREDRM_VIDEO_MMDDCAP.script
mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_VCLNT_OF.script
mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_VCLNT_OF_ALLOC.script
mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_VCLNT_WM.script
mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/audio.ini
mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/securedrm_audio.ini
mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/securedrm_testdata.ini
mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/securedrm_video.ini
mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/tsi_mmf_aclnt_00_nona3f.script
mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/tsi_mmf_aclnt_00_not_ne.script
mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/tsi_mmf_aclnt_00_truepause.script
mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/tsi_mmf_aclnt_03_nona3f.script
mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/tsi_mmf_aclnt_03_truepause.script
mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/video.ini
mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/group/bld.inf
mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/group/tsi_mmf_vclntavi.iby
mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/mmpfiles/tsi_mmf_vclntavi.mmp
mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/scripts/tsi_mmf_vclntavi_alloc.script
mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/src/graphicsurface.h
mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/src/teststepvclnt2crp.h
mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/src/testvideoplayer.h
mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/src/testvideoplayer2.h
mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/src/testvideoplayer_apr.h
mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/src/testvideoplayer_secdisp.h
mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/src/testvideoplayer_subtitles.h
mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/src/testvideorecorder.h
mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/src/testvideorecorder_par_audio.h
mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/src/tsi_mmf_vclntavi_stepbase.h
mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/src/tsi_mmf_vclntavi_suite.h
mmlibs/mmfw/tsrc/mmfunittest/AFMT/Data/pcm8mono11khz.raw
mmlibs/mmfw/tsrc/mmfunittest/AFMT/TSU_MMF_AFMT_ALLOC.script
mmlibs/mmfw/tsrc/mmfunittest/Actrl/TSU_MMF_ACTRL_01.script
mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/CIPlugins/group/BLD.INF
mmlibs/mmfw/tsrc/mmfunittest/DevVideo/group/TSU_MMF_DEVVIDEO_01.iby
mmlibs/mmfw/tsrc/mmfunittest/DevVideo/group/bld.inf
mmlibs/mmfw/tsrc/mmfunittest/DevVideo/group/tsu_mmf_devvideo_ciu_01.iby
mmlibs/mmfw/tsrc/mmfunittest/MidiClnt/MidiTestCntrl/group/bld.inf
mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/CustomMmfAudioController.mmp
mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/MmfMP3Format.mmp
mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/MmfMP3NullCodec.mmp
mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TSU_MMFMIDICLNT.mmp
mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TSU_MMF_ACLNT_01.mmp
mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TSU_MMF_ACOD.mmp
mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TSU_MMF_ACOD_TestCodecs.mmp
mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TSU_MMF_ACTRL_01.mmp
mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TSU_MMF_AFMT.mmp
mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TSU_MMF_AFMT_TestDataSink.mmp
mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TSU_MMF_AFMT_TestDataSource.mmp
mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TSU_MMF_BASECL.mmp
mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TSU_MMF_BASECL_TestCodec.mmp
mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TSU_MMF_BASECL_TestFormat.mmp
mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TSU_MMF_BASECL_TestSrcSink.mmp
mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TSU_MMF_CTLFRM.mmp
mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TSU_MMF_DEVSOUND_NOTIFICATION_SUITE.mmp
mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TSU_MMF_DEVSOUND_SUITE.mmp
mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TSU_MMF_DEVSOUND_TESTDEVICE.mmp
mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TSU_MMF_DEVSOUND_TESTINTERFACE.mmp
mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TSU_MMF_DEVSOUND_TESTINTERFACE1.mmp
mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TSU_MMF_SRSSNK.mmp
mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TSU_MMF_SWCDWRAP.mmp
mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TSU_MMF_SWCDWRAP_TestDevice.mmp
mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TSU_MMF_SbcCodec.mmp
mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TSU_MMF_SwCodecDevices.mmp
mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TSU_MMF_VCLNT_01.mmp
mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TS_CMMFTestController.mmp
mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TS_CMMFTestCustomCommands.mmp
mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TS_MMFTestDataSink.mmp
mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TS_MMFTestDataSinkB.mmp
mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TS_MMFTestDataSource.mmp
mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TS_MMFTestDataSourceB.mmp
mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/ts_cmmftestconstructcontroller.mmp
mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/ts_cmmftestterminationcontroller.mmp
mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/tsu_mmf_ctlfrm_sdrm.mmp
mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/tsu_mmf_devsubtitle.mmp
mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/tsu_mmf_mmruf.mmp
mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/tsu_mmf_subtitlegraphic.mmp
mmlibs/mmfw/tsrc/mmfunittest/Profiling/TSU_MMF_PFM_01/group/BLD.INF
mmlibs/mmfw/tsrc/mmfunittest/Profiling/TSU_MMF_PFM_01/group/bld.inf
mmlibs/mmfw/tsrc/mmfunittest/Recogniser/Data/Corrupt.snd
mmlibs/mmfw/tsrc/mmfunittest/Recogniser/Data/common/badcert.cer
mmlibs/mmfw/tsrc/mmfunittest/SbcCodec/BLD.INF
mmlibs/mmfw/tsrc/mmfunittest/aclnt/TSU_MMF_ACLNT_01/TestStepConvertOpen.cpp
mmlibs/mmfw/tsrc/mmfunittest/aclnt/TSU_MMF_ACLNT_01/TestStepPlayerPlay.cpp
mmlibs/mmfw/tsrc/mmfunittest/bwins/TSU_MMFMIDICLNT.DEF
mmlibs/mmfw/tsrc/mmfunittest/bwins/TSU_MMF_ACLNT_01.DEF
mmlibs/mmfw/tsrc/mmfunittest/bwins/TSU_MMF_ACODU.DEF
mmlibs/mmfw/tsrc/mmfunittest/bwins/TSU_MMF_ACOD_TESTCODECSU.DEF
mmlibs/mmfw/tsrc/mmfunittest/bwins/TSU_MMF_ACTRL_01U.DEF
mmlibs/mmfw/tsrc/mmfunittest/bwins/TSU_MMF_AFMTU.DEF
mmlibs/mmfw/tsrc/mmfunittest/bwins/TSU_MMF_BASECLU.DEF
mmlibs/mmfw/tsrc/mmfunittest/bwins/TSU_MMF_CTLFRMU.DEF
mmlibs/mmfw/tsrc/mmfunittest/bwins/TSU_MMF_DEVSOUND_NOTIFICATION_SUITE.DEF
mmlibs/mmfw/tsrc/mmfunittest/bwins/TSU_MMF_DEVSOUND_SUITE.DEF
mmlibs/mmfw/tsrc/mmfunittest/bwins/TSU_MMF_SRSSNKU.DEF
mmlibs/mmfw/tsrc/mmfunittest/bwins/TSU_MMF_SWCDWRAPU.DEF
mmlibs/mmfw/tsrc/mmfunittest/bwins/TSU_MMF_SWCODECDEVICESU.def
mmlibs/mmfw/tsrc/mmfunittest/bwins/TSU_MMF_SbcCodecU.DEF
mmlibs/mmfw/tsrc/mmfunittest/bwins/TS_CMMFTESTCUSTOMCOMMANDS.DEF
mmlibs/mmfw/tsrc/mmfunittest/bwins/TS_TRANSFERBUFFERTESTERCLIENTU.DEF
mmlibs/mmfw/tsrc/mmfunittest/bwins/tsu_mmf_ctlfrm_sdrmu.def
mmlibs/mmfw/tsrc/mmfunittest/bwins/tsu_mmf_devsubtitleu.def
mmlibs/mmfw/tsrc/mmfunittest/bwins/tsu_mmf_mmrufU.def
mmlibs/mmfw/tsrc/mmfunittest/bwins/tsu_mmf_subtitlegraphicu.def
mmlibs/mmfw/tsrc/mmfunittest/devsubtitle/inc/tsu_mmf_devsubtitle.iby
mmlibs/mmfw/tsrc/mmfunittest/eabi/TSU_MMFMIDICLNT.DEF
mmlibs/mmfw/tsrc/mmfunittest/eabi/TSU_MMF_ACLNT_01.DEF
mmlibs/mmfw/tsrc/mmfunittest/eabi/TSU_MMF_ACODU.DEF
mmlibs/mmfw/tsrc/mmfunittest/eabi/TSU_MMF_ACTRL_01U.DEF
mmlibs/mmfw/tsrc/mmfunittest/eabi/TSU_MMF_AFMTU.DEF
mmlibs/mmfw/tsrc/mmfunittest/eabi/TSU_MMF_BASECLU.DEF
mmlibs/mmfw/tsrc/mmfunittest/eabi/TSU_MMF_CTLFRMU.DEF
mmlibs/mmfw/tsrc/mmfunittest/eabi/TSU_MMF_DEVSOUND_NOTIFICATION_SUITE.DEF
mmlibs/mmfw/tsrc/mmfunittest/eabi/TSU_MMF_DEVSOUND_SUITE.DEF
mmlibs/mmfw/tsrc/mmfunittest/eabi/TSU_MMF_SRSSNKU.DEF
mmlibs/mmfw/tsrc/mmfunittest/eabi/TSU_MMF_SWCDWRAPU.DEF
mmlibs/mmfw/tsrc/mmfunittest/eabi/TSU_MMF_SWCODECDEVICESU.DEF
mmlibs/mmfw/tsrc/mmfunittest/eabi/TSU_MMF_SbcCodecU.DEF
mmlibs/mmfw/tsrc/mmfunittest/eabi/TS_CmmfTestCustomCommands.DEF
mmlibs/mmfw/tsrc/mmfunittest/eabi/TS_TransferBufferTesterClientU.DEF
mmlibs/mmfw/tsrc/mmfunittest/eabi/tsu_mmf_ctlfrm_sdrmu.def
mmlibs/mmfw/tsrc/mmfunittest/eabi/tsu_mmf_devsubtitleu.def
mmlibs/mmfw/tsrc/mmfunittest/eabi/tsu_mmf_mmrufU.def
mmlibs/mmfw/tsrc/mmfunittest/eabi/tsu_mmf_subtitlegraphicu.def
mmlibs/mmfw/tsrc/mmfunittest/group/BLD.INF
mmlibs/mmfw/tsrc/mmfunittest/group/TSU_MMF_ACOD.bat
mmlibs/mmfw/tsrc/mmfunittest/group/TSU_MMF_ACOD.iby
mmlibs/mmfw/tsrc/mmfunittest/group/TSU_MMF_DEVSOUND_SUITE.iby
mmlibs/mmfw/tsrc/mmfunittest/group/TSU_MMF_SWCDWRAP.iby
mmlibs/mmfw/tsrc/mmfunittest/group/TSU_MMF_SWCODECDEVICES.iby
mmlibs/mmfw/tsrc/mmfunittest/group/TSU_MMF_VCLNT.iby
mmlibs/mmfw/tsrc/mmfunittest/group/bld.inf
mmlibs/mmfw/tsrc/mmfunittest/scripts/TSU_MMF_ACLNT_01.ini
mmlibs/mmfw/tsrc/mmfunittest/scripts/TSU_MMF_ACLNT_01.script
mmlibs/mmfw/tsrc/mmfunittest/scripts/TSU_MMF_ACLNT_01_Alloc.script
mmlibs/mmfw/tsrc/mmfunittest/scripts/TSU_MMF_ACLNT_01_NOTIFICATION.script
mmlibs/mmfw/tsrc/mmfunittest/scripts/TSU_MMF_ACLNT_01_PREEMPTION.script
mmlibs/mmfw/tsrc/mmfunittest/scripts/TSU_MMF_ACLNT_02_Alloc.script
mmlibs/mmfw/tsrc/mmfunittest/scripts/TSU_MMF_ACLNT_03_Alloc.script
mmlibs/mmfw/tsrc/mmfunittest/scripts/TSU_MMF_ACLNT_04_Alloc.script
mmlibs/mmfw/tsrc/mmfunittest/scripts/TSU_MMF_ACLNT_05_Alloc.script
mmlibs/mmfw/tsrc/mmfunittest/scripts/TSU_MMF_ACLNT_DRM.script
mmlibs/mmfw/tsrc/mmfunittest/scripts/TSU_MMF_ACLNT_DRM_ALLOC.script
mmlibs/mmfw/tsrc/mmfunittest/scripts/TSU_MMF_ACLNT_RF_ALLOC.script
mmlibs/mmfw/tsrc/mmfunittest/scripts/TSU_MMF_CTLFRM_SDRM.script
mmlibs/mmfw/tsrc/mmfunittest/scripts/TSU_MMF_CTLFRM_SDRM_ALLOC.script
mmlibs/mmfw/tsrc/mmfunittest/scripts/TSU_MMF_MIDICLNT_00.script
mmlibs/mmfw/tsrc/mmfunittest/scripts/TSU_MMF_MIDICLNT_00_Alloc.script
mmlibs/mmfw/tsrc/mmfunittest/scripts/TSU_MMF_MIDICLNT_RF.script
mmlibs/mmfw/tsrc/mmfunittest/scripts/TSU_MMF_MIDICLNT_RF_Alloc.script
mmlibs/mmfw/tsrc/mmfunittest/scripts/TSU_MMF_MMRUF_ALLOC.script
mmlibs/mmfw/tsrc/mmfunittest/scripts/TSU_MMF_SWCODECDEVICES.ini
mmlibs/mmfw/tsrc/mmfunittest/scripts/midi.ini
mmlibs/mmfw/tsrc/mmfunittest/scripts/tsu_mmf_aclnt_securedrm.ini
mmlibs/mmfw/tsrc/mmfunittest/scripts/tsu_mmf_aclnt_securedrm.script
mmlibs/mmfw/tsrc/mmfunittest/scripts/tsu_mmf_aclnt_securedrmtestdata.ini
mmlibs/mmfw/tsrc/mmfunittest/scripts/tsu_mmf_aclnt_securedrmtestdata.script
mmlibs/mmfw/tsrc/mmfunittest/scripts/tsu_mmf_mmruf.script
mmlibs/mmfw/tsrc/mmfunittest/scripts/tsu_mmf_mmruf_badext.script
mmlibs/mmfw/tsrc/mmfunittest/scripts/tsu_mmf_mmruf_corrupt.script
mmlibs/mmfw/tsrc/mmfunittest/srtdecoder/group/bld.inf
mmlibs/mmfw/tsrc/mmfunittest/srtdecoder/inc/tsu_mmf_subtitledecoder.iby
mmlibs/mmfw/tsrc/mmfunittest/subtitlegraphic/inc/tsu_mmf_subtitlegraphic.iby
mmlibs/mmfw/tsrc/mmfunittest/videorenderer/group/bld.inf
mmlibs/mmfw/tsrc/mmfunittest/videorenderer/inc/tsu_mmf_videorenderer.iby
mmlibs/mmfw/tsrc/mmvalidationsuite/mvsintegrationtest/group/bld.inf
mmlibs/mmfw/tsrc/mmvalidationsuite/mvsintegrationtest/group/tsi_mvs_agents.iby
mmlibs/mmutilitylib/group/BLD.INF
mmlibs/mmutilitylib/group/bld.inf
mmlibs/mmutilitylib/group/multimedia_common.mrp
mmplugins/cameraplugins/group/BLD.INF
mmplugins/cameraplugins/group/bld.inf
mmplugins/lib3gp/group/multimedia_3gplibrary.mrp
mmplugins/lib3gp/impl/inc/filewriter.h
mmplugins/lib3gp/impl/src/file.cpp
mmplugins/lib3gp/impl/src/filewriter.cpp
mmplugins/lib3gpunittest/group/bld.inf
mmplugins/lib3gpunittest/group/interopfiles.inf
mmplugins/lib3gpunittest/group/performancefiles.inf
mmplugins/lib3gpunittest/group/tsu_3gplibrary.iby
mmplugins/mmfwplugins/group/BLD.INF
mmplugins/mmfwplugins/group/bld.inf
mmresourcemgmt/mmresctrl/group/multimedia_a3f_refmmrc.mrp
mmtestenv/mmtestagent/group/bld.inf
mmtestenv/mmtestfw/gceavailable/group/bld.inf
mmtestenv/mmtestfw/group/BLD.INF
mmtestenv/mmtestfw/group/bld.inf
mmtestenv/mmtestfwunittest/group/BLD.INF
mmtestenv/mmtestfwunittest/group/bld.inf
mmtestenv/mmtesttools/Group/bld.inf
omxil/omxilunittest/components/group/bld.inf
omxil/omxilunittest/components/src/tsu_omxil_pcmrenderer_step.cpp
omxil/omxilunittest/contentpipe/group/bld.inf
--- a/build.config.xml	Thu Jun 24 10:37:45 2010 +0100
+++ b/build.config.xml	Fri Jul 09 12:23:13 2010 +0100
@@ -1,190 +1,230 @@
 <?xml version="1.0"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?, build?)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (logicalset* | module*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  levels CDATA #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT logicalset (logicalsubset* | module* | unit* | package* | prebuilt*)*>
- <!ATTLIST logicalset 
-  name CDATA #REQUIRED
-  levels CDATA #IMPLIED  
-  span CDATA #IMPLIED
-  level CDATA #IMPLIED>
- <!ELEMENT logicalsubset (module* | unit* | package* | prebuilt*)*>
- <!ATTLIST logicalsubset name CDATA #REQUIRED>
- <!ELEMENT module (component* | unit* | package* | prebuilt*)*>
- <!ATTLIST module
-  name CDATA #REQUIRED
-  level CDATA #IMPLIED>
- <!ELEMENT component (unit* | package* | prebuilt*)*>
- <!ATTLIST component name CDATA #REQUIRED>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  unitID ID #REQUIRED
-  name CDATA #REQUIRED
-  mrp CDATA #REQUIRED
-  filter CDATA #IMPLIED
-  bldFile CDATA #REQUIRED
-  priority CDATA #IMPLIED
-  contract CDATA #IMPLIED>
- <!ELEMENT package EMPTY>
- <!ATTLIST package
-  name CDATA #REQUIRED
-  mrp CDATA #REQUIRED
-  filter CDATA #IMPLIED
-  contract CDATA #IMPLIED>
- <!ELEMENT prebuilt EMPTY>
- <!ATTLIST prebuilt
-  name CDATA #REQUIRED
-  version CDATA #REQUIRED
-  late (Y|N) #IMPLIED
-  filter CDATA #IMPLIED
-  contract CDATA #IMPLIED>
- <!ELEMENT build (option* | target+ | targetList+ | unitList+ | configuration+)*>
- <!ELEMENT unitList (unitRef+)>
- <!ATTLIST unitList
-  name ID #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT unitRef EMPTY>
- <!ATTLIST unitRef unit IDREF #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
-  name ID #REQUIRED
-  abldTarget CDATA #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
-  name ID #REQUIRED
-  abldOption CDATA #REQUIRED
-  description CDATA #REQUIRED
-  enable (Y | N | y | n) #REQUIRED>
- <!ELEMENT configuration (unitListRef+ | layerRef+ | task+)*>
- <!ATTLIST configuration
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  filter CDATA #REQUIRED>
- <!ELEMENT task ( unitListRef* , (buildLayer | specialInstructions))>
- <!ELEMENT unitListRef EMPTY>
- <!ATTLIST unitListRef unitList IDREF #REQUIRED>
- <!ELEMENT layerRef EMPTY>
- <!ATTLIST layerRef layerName CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
-  command CDATA #REQUIRED
-  targetList IDREFS #IMPLIED
-  unitParallel (Y | N | y | n) #REQUIRED
-  targetParallel (Y | N | y | n) #IMPLIED>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
-  name CDATA #REQUIRED
-  cwd CDATA #REQUIRED
-  command CDATA #REQUIRED>
- <!ENTITY layer_real_source_path "/sf/os/mm" >
-]>
-<SystemDefinition name="multimedia" schema="1.4.0">
-  <systemModel>
-		<layer name="os_layer">
+<!DOCTYPE SystemDefinition SYSTEM "sysdef_1_4_0.dtd" [
+  <!ENTITY layer_real_source_path "sf/os/mm" >
+]> 
+
+<SystemDefinition name="os_mm_pkg" schema="1.4.0">
+	<systemModel>
+  <!-- Common file for prebuild layers-->
+  	<layer name="os_layer">
+			<module name="mm">
+				<unit unitID="mm" mrp="" bldFile="&layer_real_source_path;/group" name="mm" />
+			</module>
+			<module name="">
+				<unit unitID="AudioEqualizerUtility" mrp="" bldFile="&layer_real_source_path;/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build" name="AudioEqualizerUtility" />
+				<unit unitID="EnvironmentalReverbUtility" mrp="" bldFile="&layer_real_source_path;/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build" name="EnvironmentalReverbUtility" />
+			</module>
+			<module name="">
+				<unit unitID="AacEncoderPlugin" mrp="" bldFile="&layer_real_source_path;/audio/ARM_CMMF_codecs/AacEncoderPlugin/group" filter="!sf_build" name="AacEncoderPlugin" />
+			</module>
+			<module name="">
+				<unit unitID="AmrNbCodecPlugin" mrp="" bldFile="&layer_real_source_path;/audio/ARM_CMMF_codecs/AmrNbCodecPlugin/group" filter="!sf_build" name="AmrNbCodecPlugin" />
+			</module>
+			<module name="">
+				<unit unitID="AmrWbCodecPlugin" mrp="" bldFile="&layer_real_source_path;/audio/ARM_CMMF_codecs/AmrWbCodecPlugin/group" filter="!sf_build" name="AmrWbCodecPlugin" />
+			</module>
+			<module name="">
+				<unit unitID="EAacPlusCodecPlugin" mrp="" bldFile="&layer_real_source_path;/audio/ARM_CMMF_codecs/EAacPlusCodecPlugin/group" filter="!sf_build" name="EAacPlusCodecPlugin" />
+			</module>
+			<module name="">
+				<unit unitID="EAacPlusUtil" mrp="" bldFile="&layer_real_source_path;/audio/ARM_CMMF_codecs/EAacPlusUtil/group" filter="!sf_build" name="EAacPlusUtil" />
+			</module>
+			<module name="">
+				<unit unitID="MP3CodecPlugin" mrp="" bldFile="&layer_real_source_path;/audio/ARM_CMMF_codecs/MP3CodecPlugin/group" filter="!sf_build" name="MP3CodecPlugin" />
+			</module>
+			<module name="">
+				<unit unitID="WMADecoderPlugin" mrp="" bldFile="&layer_real_source_path;/audio/ARM_CMMF_codecs/WMADecoderPlugin/group" filter="!sf_build" name="WMADecoderPlugin" />
+			</module>
+			<module name="">
+				<unit unitID="ARM_MDF_Decoders" mrp="" bldFile="&layer_real_source_path;/video/ARM_MDF_Decoders/group" filter="!sf_build" name="ARM_MDF_Decoders" />
+			</module>
+			<module name="">
+				<unit unitID="Utilities" mrp="" bldFile="&layer_real_source_path;/video/ARM_MDF_Decoders/Utilities/group" filter="sf_build" name="Utilities" />
+			</module>
+			
 			<module name="multimedia_icl">
-				<unit name="imagingfws" unitID="sos.imagingfws" bldFile="sf\os\mm\imagingandcamerafws\imagingfws\group" mrp="sf\os\mm\imagingandcamerafws\imagingfws\group\multimedia_icl.mrp"/>				
+				<unit name="imagingfws" unitID="sos.imagingfws" mrp="" bldFile="&layer_real_source_path;/imagingandcamerafws/imagingfws/group" />				
 			</module>
 			<module name="multimedia_camera">				
-				<unit name="camerafw" unitID="sos.camerafw" bldFile="sf\os\mm\imagingandcamerafws\camerafw\group" mrp="sf\os\mm\imagingandcamerafws\camerafw\group\multimedia_ecam_framework.mrp"/>
+				<unit name="camerafw" unitID="sos.camerafw" mrp="" bldFile="&layer_real_source_path;/imagingandcamerafws/camerafw/group" />
 			</module>			
 			<module name="multimedia_imgplugins">
-				<unit name="imgplugins" unitID="sos.imgplugins" bldFile="sf\os\mm\mmplugins\imagingplugins\group" mrp="sf\os\mm\mmplugins\imagingplugins\group\multimedia_icl_plugin.mrp"/>
+				<unit name="imgplugins" unitID="sos.imgplugins" mrp="" bldFile="&layer_real_source_path;/mmplugins/imagingplugins/group" />
 			</module>
 			<module name="multimedia_mmlibs">
-				<unit name="mmutilitylib" unitID="sos.mmutilitylib" bldFile="sf\os\mm\mmlibs\mmutilitylib\group" mrp="sf\os\mm\mmlibs\mmutilitylib\group\multimedia_common.mrp"/>
-				<unit name="mmfw" unitID="sos.mmfw" bldFile="sf\os\mm\mmlibs\mmfw\group" mrp="sf\os\mm\mmlibs\mmfw\group\multimedia_mmf.mrp"/>
+				<unit name="mmutilitylib" unitID="sos.mmutilitylib" mrp="" bldFile="&layer_real_source_path;/mmlibs/mmutilitylib/group" />
+				<unit name="mmfw" unitID="sos.mmfw" mrp="" bldFile="&layer_real_source_path;/mmlibs/mmfw/group"/>
 			</module>			
 			<module name="multimedia_mmdevicefw">
-				<unit name="speechrecogsupport" unitID="sos.speechrecogsupport" bldFile="sf\os\mm\mmdevicefw\speechrecogsupport\group" mrp="sf\os\mm\mmdevicefw\speechrecogsupport\group\multimedia_mmf_ASR.mrp"/>				
+				<unit name="speechrecogsupport" unitID="sos.speechrecogsupport" mrp="" bldFile="&layer_real_source_path;/mmdevicefw/speechrecogsupport/group" />				
 			</module>			
 			<module name="multimedia_devsound">
-				<unit name="a3facf" unitID="sos.a3facf" bldFile="sf\os\mm\devsound\a3facf\group" mrp="sf\os\mm\devsound\a3facf\group\multimedia_a3f_acf.mrp"/>
-				<unit name="a3fdevsound" unitID="sos.a3fdevsound" bldFile="sf\os\mm\devsound\a3fdevsound\group" mrp="sf\os\mm\devsound\a3fdevsound\group\multimedia_a3f_devsound.mrp"/>
-				<unit name="a3fsrvstart" unitID="sos.a3fsrvstart" bldFile="sf\os\mm\devsound\a3fsrvstart\group" mrp="sf\os\mm\devsound\a3fsrvstart\group\multimedia_a3f_serverstart.mrp"/>
-				<unit name="a3ftrace" unitID="sos.a3ftrace" bldFile="sf\os\mm\devsound\a3ftrace\group" mrp="sf\os\mm\devsound\a3ftrace\group\multimedia_a3f_traces.mrp"/>
-				<unit name="hwdevapi" unitID="sos.hwdevapi" bldFile="sf\os\mm\devsound\hwdevapi\group" mrp="sf\os\mm\devsound\hwdevapi\group\multimedia_mdf_devsound_hwdev.mrp"/>	
-				<unit name="devsoundapi" unitID="sos.devsoundapi" bldFile="sf\os\mm\devsound\devsoundapi\group" mrp="sf\os\mm\devsound\devsoundapi\group\multimedia_mdf_devsound_api.mrp"/>	
-				<unit name="devsoundpluginsupport" unitID="sos.devsoundpluginsupport" bldFile="sf\os\mm\devsound\devsoundpluginsupport\group" mrp="sf\os\mm\devsound\devsoundpluginsupport\group\multimedia_mdf_devsound_pluginsupport.mrp"/>
+				<unit name="a3facf" unitID="sos.a3facf" mrp="" bldFile="&layer_real_source_path;/devsound/a3facf/group"/>
+				<unit name="a3fdevsound" unitID="sos.a3fdevsound" mrp="" bldFile="&layer_real_source_path;/devsound/a3fdevsound/group"/>
+				<unit name="a3fsrvstart" unitID="sos.a3fsrvstart" mrp="" bldFile="&layer_real_source_path;/devsound/a3fsrvstart/group"/> 
+				<unit name="a3ftrace" unitID="sos.a3ftrace" mrp="" bldFile="&layer_real_source_path;/devsound/a3ftrace/group"/>
+				<unit name="hwdevapi" unitID="sos.hwdevapi" mrp="" bldFile="&layer_real_source_path;/devsound/hwdevapi/group"/>	
+				<unit name="devsoundapi" unitID="sos.devsoundapi" mrp="" bldFile="&layer_real_source_path;/devsound/devsoundapi/group"/>	
+				<unit name="devsoundpluginsupport" unitID="sos.devsoundpluginsupport" mrp="" bldFile="&layer_real_source_path;/devsound/devsoundpluginsupport/group"/>
 			</module>
 			<module name="multimedia_mmhais">
-				<unit name="videohai" unitID="sos.videohai" bldFile="sf\os\mm\mmhais\videohai\group" mrp="sf\os\mm\mmhais\videohai\group\multimedia_videohai.mrp"/>
+				<unit name="videohai" unitID="sos.videohai" mrp="" bldFile="&layer_real_source_path;/mmhais/videohai/group"/>
 			</module>
 			<module name="multimedia_mmplugins">
-				<unit name="lib3gp" unitID="sos.lib3gp" bldFile="sf\os\mm\mmplugins\lib3gp\group" mrp="sf\os\mm\mmplugins\lib3gp\group\multimedia_3gplibrary.mrp"/>
+				<unit name="lib3gp" unitID="sos.lib3gp" mrp="" bldFile="&layer_real_source_path;/mmplugins/lib3gp/group" />
+				<unit name="mmfplugin" unitID="sos.mmplugin" mrp="" bldFile="&layer_real_source_path;/mmplugins/mmfwplugins/group"/>
 			</module>
 			<module name="multimedia_mmswadaptation">
-				<unit name="videorenderer" unitID="sos.videorenderer" bldFile="sf\os\mm\mmswadaptation\videorenderer\group" mrp="sf\os\mm\mmswadaptation\videorenderer\group\multimedia_videorenderer.mrp"/>
+				<unit name="videorenderer" unitID="sos.videorenderer" mrp="" bldFile="&layer_real_source_path;/mmswadaptation/videorenderer/group"/>
 			</module>
 			<module name="multimedia_testframework">
-				<unit name="mmtestfw" unitID="sos.mmtestfw" bldFile="sf\os\mm\mmtestenv\mmtestfw\group" mrp="sf\os\mm\mmtestenv\mmtestfw\group\multimedia_testframework_source.mrp" filter="mm_common"/>
+				<unit name="mmtestfw" unitID="sos.mmtestfw" mrp="" bldFile="&layer_real_source_path;/mmtestenv/mmtestfw/group" filter="mm_common"/>
 			</module>
 			<module name="mm_testagent">
-				<unit name="mmtestagent" unitID="sos.mmtestagent" bldFile="sf\os\mm\mmtestenv\mmtestagent\group" mrp="sf\os\mm\mmtestenv\mmtestagent\group\multimediatestagent_source.mrp" filter="image"/>
+				<unit name="mmtestagent" unitID="sos.mmtestagent" mrp="" bldFile="&layer_real_source_path;/mmtestenv/mmtestagent/group" filter="image"/>
 			</module>
 			<module name="multimedia_testtools">
-				<unit name="mmtesttools" unitID="sos.mmtesttools" bldFile="sf\os\mm\mmtestenv\mmtesttools\group" mrp="sf\os\mm\mmtestenv\mmtesttools\group\multimedia_testtools_source.mrp" filter="mmmw"/>
-			</module>	
-		</layer>
-		<layer name="api_test_layer">
-			<module name="multimedia_test_component">
-				<unit name="a3fchartest" unitID="sos.a3fchartest" bldFile="sf\os\mm\devsound\a3fcharacterisationtest\group" mrp="" filter="audio"/>
-				<unit name="speechrecogsupporttest" unitID="sos.speechrecogsupporttest" bldFile="sf\os\mm\mmdevicefw\speechrecogsupport\tsrc\ASR\group" mrp="" filter="audio"/>
-				<unit name="mmfintgdevsound" unitID="sos.mmfintgdevsound" bldFile="sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\devsound\group" mrp="" filter="audio"/>
-				<unit name="acod" unitID="sos.acod" bldFile="sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\ACOD\group" mrp="" filter="audio"/>
-				<unit name="DevSoundTestCIPlugins" unitID="sos.DevSoundTestCIPlugins" bldFile="sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\DevSoundTest\CIPlugins\group" mrp="" filter="audio"/>
-				<unit name="DevSoundTest" unitID="sos.DevSoundTest" bldFile="sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\DevSoundTest\group" mrp="" filter="audio"/>
-				<unit name="SbcCodec" unitID="sos.SbcCodec" bldFile="sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\SbcCodec\group" mrp="" filter="audio"/>
-				<unit name="mmtestfwunittest" unitID="sos.mmtestfwunittest" bldFile="sf\os\mm\mmtestenv\mmtestfwunittest\group" mrp="" filter="audio"/>
-				<unit name="SDevSound" unitID="sos.SDevSound" bldFile="sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\SDevSound\group" mrp="" filter="audio"/>				
-				<unit name="mmfcharacterisationvalidationaudioplay" unitID="sos.mmfcharacterisationvalidationaudioplay" bldFile="sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\play\group" mrp="" filter="mmmw"/>
-				<unit name="mmfcharacterisationvalidationaudiorecord" unitID="sos.mmfcharacterisationvalidationaudiorecord" bldFile="sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\record\group" mrp="" filter="mmmw"/>
-				<unit name="mmfintegrationtestCtlfrm" unitID="sos.mmfintegrationtestCtlfrm" bldFile="sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\Ctlfrm\group" mrp="" filter="mmmw"/>
-				<unit name="mmfintegrationtestSecureDrm" unitID="sos.mmfintegrationtestSecureDrm" bldFile="sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\SecureDRM\group" mrp="" filter="mmmw"/>
-				<unit name="mmfintegrationtestAclnt" unitID="sos.mmfintegrationtestAclnt" bldFile="sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\group" mrp="" filter="mmmw"/>
-				<unit name="mmfunittestsActrl" unitID="sos.mmfunittestsActrl" bldFile="sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\group" mrp="" filter="mmmw"/>	
-				<unit name="mmfunittestaclnt" unitID="sos.mmfunittestaclnt" bldFile="sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\group" mrp="" filter="mmmw"/>
-				<unit name="mmfunittestsAFMT" unitID="sos.mmfunittestsAFMT" bldFile="sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\AFMT\group" mrp="" filter="mmmw"/>	
-				<unit name="mmfunittestsBasecl" unitID="sos.mmfunittestsBasecl" bldFile="sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\basecl\group" mrp="" filter="mmmw"/>
-				<unit name="mmfunittestsctlfrm" unitID="sos.mmfunittestsctlfrm" bldFile="sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\ctlfrm\group" mrp="" filter="mmmw"/>
-				<unit name="mmfunittestsGEF" unitID="sos.mmfunittestsGEF" bldFile="sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\GEF\group" mrp="" filter="mmmw"/>
-				<unit name="mmfunittestsMidiClnt" unitID="sos.mmfunittestsMidiClnt" bldFile="sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\MidiClnt\group" mrp="" filter="mmmw"/>
-				<unit name="mmfunittestsMidiTestCntrl" unitID="sos.mmfunittestsMidiTestCntrl" bldFile="sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\MidiClnt\MidiTestCntrl\group" mrp="" filter="mmmw"/>
-				<unit name="mmfunittestsRecogniser" unitID="sos.mmfunittestsRecogniser" bldFile="sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\group" mrp="" filter="mmmw"/>
-				<unit name="mmfunittestsSRSSNK" unitID="sos.mmfunittestsSRSSNK" bldFile="sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\srssnk\group" mrp="" filter="mmmw"/>				
-				<unit name="mdfunittestcodecapi" unitID="sos.mdfunittestcodecapi" bldFile="sf\os\mm\mmdevicefw\mdfunittest\codecapi\video\group" mrp="" filter="video"/>
-				<unit name="mdfunittestcodecapiPU" unitID="sos.mdfunittestcodecapiPU" bldFile="sf\os\mm\mmdevicefw\mdfunittest\codecapi\PU\video\group" mrp="" filter="video"/>				
-				<unit name="lib3gpunittest" unitID="sos.lib3gpunittest" bldFile="sf\os\mm\mmplugins\lib3gpunittest\group" mrp="" filter="video"/>				
-				<unit name="cameraunittest" unitID="sos.cameraunittest" bldFile="sf\os\mm\imagingandcamerafws\cameraunittest\group" mrp="" filter="video"/>				
-				<unit name="VideoUnitTest" unitID="sos.VideoUnitTest" bldFile="sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\group\VideoGroup" mrp="" filter="video"/>
-				<unit name="xvidcore" unitID="sos.xvidcore" bldFile="sf\xvidhwdevice\group" mrp="" filter="video"/>
-				<unit name="xvidpu" unitID="sos.xvidpu" bldFile="sf\xvidpu\group" mrp="" filter="video"/>			
-				<!--unit name="dvbhreceiverhai" unitID="sos.dvbhreceiverhai" bldFile="sf\os\mm\mmhais\dvbhreceiverhai\hai\dvbh\group" mrp="" filter="video"/-->
-				<!--unit name="dvbhunittest" unitID="sos.dvbhunittest" bldFile="sf\os\mm\mmhais\dvbhunittest\hai\dvbh\group" mrp="" filter="video"/-->				
-				<unit name="mmtplugin" unitID="sos.mmplugin" bldFile="sf\os\mm\mmplugins\mmfwplugins\group" mrp="" filter="video"/>
-				<!--unit name="mvsintegrationtest" unitID="sos.mvsintegrationtest" bldFile="sf\os\mm\mmlibs\mmfw\tsrc\mmvalidationsuite\mvsintegrationtest\group" mrp="" filter="video"/-->
-				<unit name="VideoIntegrationTest" unitID="sos.VideoIntegrationTest" bldFile="sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\group\VideoGroup" mrp="" filter="video"/>				
-				<unit name="imagingunittest" unitID="sos.imagingunittest" bldFile="sf\os\mm\imagingandcamerafws\imagingunittest\group" mrp="" filter="image"/>
-				<unit name="imaginginttest" unitID="sos.imaginginttest" bldFile="sf\os\mm\imagingandcamerafws\imaginginttest\group" mrp="" filter="image"/>
-				<unit name="TSU_ICL_GSCAL_01" unitID="sos.TSU_ICL_GSCAL_01" bldFile="sf\os\mm\imagingandcamerafws\imagingunittest\TSU_ICL_GSCAL_01\group" mrp="" filter="image"/>
-				<unit name="TSU_ICL_ITFM_01" unitID="sos.TSU_ICL_ITFM_01" bldFile="sf\os\mm\imagingandcamerafws\imagingunittest\TSU_ICL_ITFM_01\group" mrp="" filter="image"/>				
+				<unit name="mmtesttools" unitID="sos.mmtesttools" mrp="" bldFile="&layer_real_source_path;/mmtestenv/mmtesttools/group" filter="mmmw"/>
+			</module>			
+    </layer>    
+
+        <layer name="arm9e_layer"> 
+                            <module name=""> 
+                                    <unit unitID="EAacPlusCodecPlugin_arm9e" mrp="" bldFile="&layer_real_source_path;/audio/ARM_CMMF_codecs/EAacPlusCodecPlugin/group" filter="!sf_build" name="EAacPlusCodecPlugin_arm9e" /> 
+                            </module> 
+        </layer>     
+
+  	<layer name="bldmelast_layer">
+			<module name="">
+				<unit unitID="EAacPlusCodecPlugin_arm9e_2" mrp="" bldFile="&layer_real_source_path;/audio/ARM_CMMF_codecs/EAacPlusCodecPlugin/group" filter="!sf_build" name="EAacPlusCodecPlugin_arm9e_2" />
+			</module>
+    </layer>    
+
+
+  	<layer name="api_test_layer">
+			<module name="mm_tsrc">
+				<unit unitID="mm_tsrc" name="mm_tsrc" bldFile="&layer_real_source_path;/tsrc/group" mrp="" />
+			</module>
+    </layer>   
+
+
+  	<layer name="module_test_layer">
+			<module name="nga_mdf_tsrc">
+				<unit unitID="nga_mdf_tsrc" name="nga_mdf_tsrc" bldFile="&layer_real_source_path;/mdfdevvideoextensions/nga_mdf_postprocessor/tsrc/StifNgaMdfPoPTest/group" mrp="" />
+			</module>
+    </layer>   
+
+
+  	<layer name="pref_test_layer">
+			<module name="mm_tsrc_group">
+				<unit unitID="mm_tsrc_group" name="mm_tsrc_group" bldFile="&layer_real_source_path;/tsrc/group" mrp="" filter="TA_MM" />
+			</module>
+			<module name="nga_mdf_tsrc_group">
+				<unit unitID="nga_mdf_tsrc_group" name="nga_mdf_tsrc_group" bldFile="&layer_real_source_path;/mdfdevvideoextensions/nga_mdf_postprocessor/tsrc/StifNgaMdfPoPTest/group" mrp="" filter="TA_NGA_MDF_POSTPROCESSOR" />
+			</module>
+    </layer>    
+
+ 
+  	<layer name="os_mm_layer">
+			<module name="mm_group">
+				<unit unitID="mm_group" mrp="" bldFile="&layer_real_source_path;/group" name="mm_group" />
+			</module>
+			<module name="">
+				<unit unitID="AudioEqualizerUtility_group" mrp="" bldFile="&layer_real_source_path;/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build" name="AudioEqualizerUtility_group" />
+				<unit unitID="EnvironmentalReverbUtility_group" mrp="" bldFile="&layer_real_source_path;/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build" name="EnvironmentalReverbUtility_group" />
+			</module>
+			<module name="">
+				<unit unitID="AacEncoderPlugin_group" mrp="" bldFile="&layer_real_source_path;/audio/ARM_CMMF_codecs/AacEncoderPlugin/group" filter="!sf_build" name="AacEncoderPlugin_group" />
+			</module>
+			<module name="">
+				<unit unitID="AmrNbCodecPlugin_group" mrp="" bldFile="&layer_real_source_path;/audio/ARM_CMMF_codecs/AmrNbCodecPlugin/group" filter="!sf_build" name="AmrNbCodecPlugin_group" />
+			</module>
+			<module name="">
+				<unit unitID="AmrWbCodecPlugin_group" mrp="" bldFile="&layer_real_source_path;/audio/ARM_CMMF_codecs/AmrWbCodecPlugin/group" filter="!sf_build" name="AmrWbCodecPlugin_group" />
+			</module>
+			<module name="">
+				<unit unitID="EAacPlusCodecPlugin_group" mrp="" bldFile="&layer_real_source_path;/audio/ARM_CMMF_codecs/EAacPlusCodecPlugin/group" filter="!sf_build" name="EAacPlusCodecPlugin_group" />
+			</module>
+			<module name="">
+				<unit unitID="EAacPlusUtil_group" mrp="" bldFile="&layer_real_source_path;/audio/ARM_CMMF_codecs/EAacPlusUtil/group" filter="!sf_build" name="EAacPlusUtil_group" />
+			</module>
+			<module name="">
+				<unit unitID="MP3CodecPlugin_group" mrp="" bldFile="&layer_real_source_path;/audio/ARM_CMMF_codecs/MP3CodecPlugin/group" filter="!sf_build" name="MP3CodecPlugin_group" />
+			</module>
+			<module name="">
+				<unit unitID="WMADecoderPlugin_group" mrp="" bldFile="&layer_real_source_path;/audio/ARM_CMMF_codecs/WMADecoderPlugin/group" filter="!sf_build" name="WMADecoderPlugin_group" />
 			</module>
-			<module name="multimedia_test_component_rom">
-				<unit name="a3fintegrationtest" unitID="sos.a3fintegrationtest" bldFile="sf\os\mm\devsound\a3fintegrationtest\group" mrp="" filter="audio"/>
+			<module name="">
+				<unit unitID="ARM_MDF_Decoders_group" mrp="" bldFile="&layer_real_source_path;/video/ARM_MDF_Decoders/group" filter="!sf_build" name="ARM_MDF_Decoders_group" />
+			</module>
+			<module name="">
+				<unit unitID="Utilities_group" mrp="" bldFile="&layer_real_source_path;/video/ARM_MDF_Decoders/Utilities/group" filter="sf_build" name="Utilities_group" />
 			</module>
-		</layer>
+    </layer>    
+  	<layer name="audio_test_layer">
+			<module name="mf_multimedia_test_component">
+				<unit name="a3fchartest" unitID="sos.a3fchartest" bldFile="&layer_real_source_path;/devsound/a3fcharacterisationtest/group" mrp=""/>
+				<unit name="speechrecogsupporttest" unitID="sos.speechrecogsupporttest" bldFile="&layer_real_source_path;/mmdevicefw/speechrecogsupport/tsrc/ASR/group" mrp=""/>
+				<unit name="mmfintgdevsound" unitID="sos.mmfintgdevsound" bldFile="&layer_real_source_path;/mmlibs/mmfw/tsrc/mmfintegrationtest/devsound/group" mrp=""/>
+				<unit name="acod" unitID="sos.acod" bldFile="&layer_real_source_path;/mmlibs/mmfw/tsrc/mmfunittest/ACOD/group" mrp=""/>
+				<unit name="DevSoundTestCIPlugins" unitID="sos.DevSoundTestCIPlugins" bldFile="&layer_real_source_path;/mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/CIPlugins/group" mrp=""/>
+				<unit name="DevSoundTest" unitID="sos.DevSoundTest" bldFile="&layer_real_source_path;/mmlibs\mmfw\tsrc\mmfunittest\DevSoundTest\group" mrp=""/>
+				<unit name="SbcCodec" unitID="sos.SbcCodec" bldFile="&layer_real_source_path;/mmlibs/mmfw/tsrc/mmfunittest/SbcCodec/group" mrp=""/>
+				<unit name="mmtestfwunittest" unitID="sos.mmtestfwunittest" bldFile="&layer_real_source_path;/mmtestenv/mmtestfwunittest/group" mrp=""/>
+				<unit name="SDevSound" unitID="sos.SDevSound" bldFile="&layer_real_source_path;/mmlibs/mmfw/tsrc/mmfintegrationtest/SDevSound/group" mrp=""/>
+				<!--unit name="a3fintegrationtest" unitID="sos.a3fintegrationtest" bldFile="&layer_real_source_path;/devsound/a3fintegrationtest/group" mrp="" />-->				
+			</module>			
+    </layer>   
+  	<layer name="mmmw_test_layer">
+			<module name="mmmw_multimedia_test_component">
+				<unit name="mmfcharacterisationvalidationaudioplay" unitID="sos.mmfcharacterisationvalidationaudioplay" bldFile="&layer_real_source_path;/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/play/group" mrp=""/>
+				<unit name="mmfcharacterisationvalidationaudiorecord" unitID="sos.mmfcharacterisationvalidationaudiorecord" bldFile="&layer_real_source_path;/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/record/group" mrp=""/>
+				<unit name="mmfintegrationtestCtlfrm" unitID="sos.mmfintegrationtestCtlfrm" bldFile="&layer_real_source_path;/mmlibs/mmfw/tsrc/mmfintegrationtest/Ctlfrm/group" mrp=""/>
+				<unit name="mmfintegrationtestSecureDrm" unitID="sos.mmfintegrationtestSecureDrm" bldFile="&layer_real_source_path;/mmlibs/mmfw/tsrc/mmfintegrationtest/SecureDRM/group" mrp=""/>
+				<unit name="mmfintegrationtestAclnt" unitID="sos.mmfintegrationtestAclnt" bldFile="&layer_real_source_path;/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/group" mrp=""/>
+				<unit name="mmfunittestsActrl" unitID="sos.mmfunittestsActrl" bldFile="&layer_real_source_path;/mmlibs/mmfw/tsrc/mmfunittest/Actrl/group" mrp=""/>	
+				<unit name="mmfunittestaclnt" unitID="sos.mmfunittestaclnt" bldFile="&layer_real_source_path;/mmlibs/mmfw/tsrc/mmfunittest/aclnt/group" mrp=""/>
+				<unit name="mmfunittestsAFMT" unitID="sos.mmfunittestsAFMT" bldFile="&layer_real_source_path;/mmlibs/mmfw/tsrc/mmfunittest/AFMT/group" mrp=""/>	
+				<unit name="mmfunittestsBasecl" unitID="sos.mmfunittestsBasecl" bldFile="&layer_real_source_path;/mmlibs/mmfw/tsrc/mmfunittest/basecl/group" mrp=""/>
+				<unit name="mmfunittestsctlfrm" unitID="sos.mmfunittestsctlfrm" bldFile="&layer_real_source_path;/mmlibs/mmfw/tsrc/mmfunittest/ctlfrm/group" mrp=""/>
+				<unit name="mmfunittestsGEF" unitID="sos.mmfunittestsGEF" bldFile="&layer_real_source_path;/mmlibs/mmfw/tsrc/mmfunittest/GEF/group" mrp=""/>
+				<unit name="mmfunittestsMidiClnt" unitID="sos.mmfunittestsMidiClnt" bldFile="&layer_real_source_path;/mmlibs/mmfw/tsrc/mmfunittest/MidiClnt/group" mrp=""/>
+				<unit name="mmfunittestsMidiTestCntrl" unitID="sos.mmfunittestsMidiTestCntrl" bldFile="&layer_real_source_path;/mmlibs/mmfw/tsrc/mmfunittest/MidiClnt/MidiTestCntrl/group" mrp=""/>
+				<unit name="mmfunittestsRecogniser" unitID="sos.mmfunittestsRecogniser" bldFile="&layer_real_source_path;/mmlibs/mmfw/tsrc/mmfunittest/Recogniser/group" mrp=""/>
+				<unit name="mmfunittestsSRSSNK" unitID="sos.mmfunittestsSRSSNK" bldFile="&layer_real_source_path;/mmlibs/mmfw/tsrc/mmfunittest/srssnk/group" mrp=""/>				
+			</module>			
+    </layer>   
+  	<layer name="video_test_layer">
+			<module name="video_multimedia_test_component">
+				<unit name="mdfunittestcodecapi" unitID="sos.mdfunittestcodecapi" bldFile="&layer_real_source_path;/mmdevicefw/mdfunittest/codecapi/video/group" mrp=""/>
+				<unit name="mdfunittestcodecapiPU" unitID="sos.mdfunittestcodecapiPU" bldFile="&layer_real_source_path;/mmdevicefw/mdfunittest/codecapi/PU/video/group" mrp=""/>				
+				<unit name="lib3gpunittest" unitID="sos.lib3gpunittest" bldFile="&layer_real_source_path;/mmplugins/lib3gpunittest/group" mrp=""/>				
+				<unit name="cameraunittest" unitID="sos.cameraunittest" bldFile="&layer_real_source_path;/imagingandcamerafws/cameraunittest/group" mrp=""/>				
+				<unit name="VideoUnitTest" unitID="sos.VideoUnitTest" bldFile="&layer_real_source_path;/mmlibs/mmfw/tsrc/mmfunittest/group/VideoGroup" mrp=""/>
+				<unit name="xvidcore" unitID="sos.xvidcore" bldFile="sf\xvidhwdevice\group" mrp=""/>
+				<unit name="xvidpu" unitID="sos.xvidpu" bldFile="sf\xvidpu\group" mrp=""/>			
+				<!--unit name="dvbhreceiverhai" unitID="sos.dvbhreceiverhai" bldFile="&layer_real_source_path;/mmhais/dvbhreceiverhai/hai/dvbh/group" mrp=""/-->
+				<!--unit name="dvbhunittest" unitID="sos.dvbhunittest" bldFile="&layer_real_source_path;/mmhais/dvbhunittest/hai/dvbh/group" mrp=""/-->				
+				<!--unit name="mvsintegrationtest" unitID="sos.mvsintegrationtest" bldFile="&layer_real_source_path;/mmlibs/mmfw/tsrc/mmvalidationsuite/mvsintegrationtest/group" mrp=""/-->
+				<unit name="VideoIntegrationTest" unitID="sos.VideoIntegrationTest" bldFile="&layer_real_source_path;/mmlibs/mmfw/tsrc/mmfintegrationtest/group/VideoGroup" mrp=""/>				
+			</module>			
+    </layer>   
+  	<layer name="imaging_test_layer">
+			<module name="imaging_multimedia_test_component">
+				<unit name="imagingunittest" unitID="sos.imagingunittest" bldFile="&layer_real_source_path;/imagingandcamerafws/imagingunittest/group" mrp=""/>
+				<unit name="imaginginttest" unitID="sos.imaginginttest" bldFile="&layer_real_source_path;/imagingandcamerafws/imaginginttest/group" mrp=""/>
+				<unit name="TSU_ICL_GSCAL_01" unitID="sos.TSU_ICL_GSCAL_01" bldFile="&layer_real_source_path;/imagingandcamerafws/imagingunittest/TSU_ICL_GSCAL_01/group" mrp=""/>
+				<unit name="TSU_ICL_ITFM_01" unitID="sos.TSU_ICL_ITFM_01" bldFile="&layer_real_source_path;/imagingandcamerafws/imagingunittest/TSU_ICL_ITFM_01/group" mrp=""/>				
+			</module>			
+    </layer>
+
+  	<layer name="mmapi_test_layer">
+			<module name="mmapi_multimedia_test_component">
+				<unit name="devsoundexthaitest" unitID="sos.devsoundexthaitest" bldFile="&layer_real_source_path;/mmapitest/devsoundexthaitest/group" mrp=""/>
+				<unit name="devsoundhaitest" unitID="sos.devsoundhaitest" bldFile="&layer_real_source_path;/mmapitest/devsoundhaitest/group" mrp=""/>
+				<unit name="devvideohaitest" unitID="sos.devvideohaitest" bldFile="&layer_real_source_path;/mmapitest/devvideohaitest/group" mrp=""/>
+				<unit name="mmsvs" unitID="sos.mmsvs" bldFile="&layer_real_source_path;/mmapitest/mmsvs/suite/group" mrp=""/>				
+			</module>			
+    </layer>  
   </systemModel>
-</SystemDefinition>
+</SystemDefinition>
\ No newline at end of file
--- a/devsound/a3facf/group/bld.inf	Thu Jun 24 10:37:45 2010 +0100
+++ b/devsound/a3facf/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -40,6 +40,7 @@
 ../inc/mbuffersource.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(a3f/mbuffersource.h)
 ../inc/msynccisupport.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(a3f/msynccisupport.h)
 ../inc/tonedata.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(a3f/tonedata.h)
+../inc/mcontexteffectiveclient.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(a3f/mcontexteffectiveclient.h)
 
 // DEF FILES
 ../bwins/audiocontextfactory.def	/epoc32/include/def/bwins/audiocontextfactory.def
--- a/devsound/a3facf/group/multimedia_a3f_acf.mrp	Thu Jun 24 10:37:45 2010 +0100
+++ b/devsound/a3facf/group/multimedia_a3f_acf.mrp	Fri Jul 09 12:23:13 2010 +0100
@@ -1,17 +1,6 @@
+#multimedia_a3f_acf.mrp
 #
-# Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description: 
+#Copyright (c) Symbian Software Ltd 2007.  All rights reserved.
 #
 
 component	multimedia_a3f_acf
--- a/devsound/a3fdevsound/bwins/mmfdevsoundadaptor.def	Thu Jun 24 10:37:45 2010 +0100
+++ b/devsound/a3fdevsound/bwins/mmfdevsoundadaptor.def	Fri Jul 09 12:23:13 2010 +0100
@@ -2,7 +2,7 @@
 	??1CMMFDevSoundAdaptation@@UAE@XZ @ 1 NONAME ; CMMFDevSoundAdaptation::~CMMFDevSoundAdaptation(void)
 	?CancelInitialize@CMMFDevSoundAdaptation@@QAEHXZ @ 2 NONAME ; int CMMFDevSoundAdaptation::CancelInitialize(void)
 	?Capabilities@CMMFDevSoundAdaptation@@QAEHAAVTMMFCapabilities@@@Z @ 3 NONAME ; int CMMFDevSoundAdaptation::Capabilities(class TMMFCapabilities &)
-	?ClientConfig@CMMFDevSoundAdaptation@@QBEABVTMMFClientConfig@@XZ @ 4 NONAME ; class TMMFClientConfig const & CMMFDevSoundAdaptation::ClientConfig(void) const
+	?ClientConfig@CMMFDevSoundAdaptation@@QBEABVTMMFClientConfig@@XZ @ 4 NONAME ABSENT ; class TMMFClientConfig const & CMMFDevSoundAdaptation::ClientConfig(void) const
 	?CloseDevSound@CMMFDevSoundAdaptation@@QAEHXZ @ 5 NONAME ; int CMMFDevSoundAdaptation::CloseDevSound(void)
 	?Config@CMMFDevSoundAdaptation@@QBE?AVTMMFCapabilities@@XZ @ 6 NONAME ; class TMMFCapabilities CMMFDevSoundAdaptation::Config(void) const
 	?CustomInterface@CMMFDevSoundAdaptation@@QAEPAXVTUid@@@Z @ 7 NONAME ; void * CMMFDevSoundAdaptation::CustomInterface(class TUid)
@@ -34,7 +34,7 @@
 	?RecordInitL@CMMFDevSoundAdaptation@@QAEXXZ @ 33 NONAME ; void CMMFDevSoundAdaptation::RecordInitL(void)
 	?SamplesPlayed@CMMFDevSoundAdaptation@@QAEHXZ @ 34 NONAME ; int CMMFDevSoundAdaptation::SamplesPlayed(void)
 	?SamplesRecorded@CMMFDevSoundAdaptation@@QAEHXZ @ 35 NONAME ; int CMMFDevSoundAdaptation::SamplesRecorded(void)
-	?SetClientConfig@CMMFDevSoundAdaptation@@QAEHABVTMMFClientConfig@@@Z @ 36 NONAME ; int CMMFDevSoundAdaptation::SetClientConfig(class TMMFClientConfig const &)
+	?SetClientConfig@CMMFDevSoundAdaptation@@QAEHABVTProcessId@@@Z @ 36  NONAME ; int CMMFDevSoundAdaptation::SetClientConfig(class TProcessId const &)
 	?SetConfigL@CMMFDevSoundAdaptation@@QAEXABVTMMFCapabilities@@@Z @ 37 NONAME ; void CMMFDevSoundAdaptation::SetConfigL(class TMMFCapabilities const &)
 	?SetDTMFLengths@CMMFDevSoundAdaptation@@QAEHAAVTTimeIntervalMicroSeconds32@@00@Z @ 38 NONAME ; int CMMFDevSoundAdaptation::SetDTMFLengths(class TTimeIntervalMicroSeconds32 &, class TTimeIntervalMicroSeconds32 &, class TTimeIntervalMicroSeconds32 &)
 	?SetGain@CMMFDevSoundAdaptation@@QAEHHAAH@Z @ 39 NONAME ; int CMMFDevSoundAdaptation::SetGain(int, int &)
@@ -56,4 +56,5 @@
 	?BufferErrorEvent@CMMFDevSoundAdaptation@@QAEXXZ @ 55 NONAME ; void CMMFDevSoundAdaptation::BufferErrorEvent(void)
 	?ProcessingError@CMMFDevSoundAdaptation@@QAEHAAH@Z @ 56 NONAME ; int CMMFDevSoundAdaptation::ProcessingError(int &)
 	?RollbackAdaptorActiveStateToBeforeCommit@CMMFDevSoundAdaptation@@QAEXXZ @ 57 NONAME ; void CMMFDevSoundAdaptation::RollbackAdaptorActiveStateToBeforeCommit(void)
+	?SetClientConfig@CMMFDevSoundAdaptation@@QAEHABVTProcessId@@0@Z @ 58  NONAME ; int CMMFDevSoundAdaptation::SetClientConfig(class TProcessId const &, class TProcessId const &)
 
--- a/devsound/a3fdevsound/eabi/mmfdevsoundadaptor.def	Thu Jun 24 10:37:45 2010 +0100
+++ b/devsound/a3fdevsound/eabi/mmfdevsoundadaptor.def	Fri Jul 09 12:23:13 2010 +0100
@@ -17,7 +17,7 @@
 	_ZN22CMMFDevSoundAdaptation15GetPlayBalanceLERiS0_ @ 16 NONAME
 	_ZN22CMMFDevSoundAdaptation15PlayDTMFStringLERK7TDesC16 @ 17 NONAME
 	_ZN22CMMFDevSoundAdaptation15SamplesRecordedEv @ 18 NONAME
-	_ZN22CMMFDevSoundAdaptation15SetClientConfigERK16TMMFClientConfig @ 19 NONAME
+	_ZN22CMMFDevSoundAdaptation15SetClientConfigERK16TMMFClientConfig @ 19 NONAME ABSENT
 	_ZN22CMMFDevSoundAdaptation15SetPlayBalanceLEiiRi @ 20 NONAME
 	_ZN22CMMFDevSoundAdaptation16CancelInitializeEv @ 21 NONAME
 	_ZN22CMMFDevSoundAdaptation17FixedSequenceNameEi @ 22 NONAME
@@ -44,7 +44,7 @@
 	_ZN22CMMFDevSoundAdaptationD0Ev @ 43 NONAME
 	_ZN22CMMFDevSoundAdaptationD1Ev @ 44 NONAME
 	_ZN22CMMFDevSoundAdaptationD2Ev @ 45 NONAME
-	_ZNK22CMMFDevSoundAdaptation12ClientConfigEv @ 46 NONAME
+	_ZNK22CMMFDevSoundAdaptation12ClientConfigEv @ 46 NONAME ABSENT
 	_ZNK22CMMFDevSoundAdaptation27GetSupportedInputDataTypesLER6RArrayI7TFourCCERK20TMMFPrioritySettings @ 47 NONAME
 	_ZNK22CMMFDevSoundAdaptation28GetSupportedOutputDataTypesLER6RArrayI7TFourCCERK20TMMFPrioritySettings @ 48 NONAME
 	_ZNK22CMMFDevSoundAdaptation6ConfigEv @ 49 NONAME
@@ -63,4 +63,6 @@
 	_ZN22CMMFDevSoundAdaptation16BufferErrorEventEv @ 62 NONAME
 	_ZN22CMMFDevSoundAdaptation15ProcessingErrorERi @ 63 NONAME
 	_ZN22CMMFDevSoundAdaptation40RollbackAdaptorActiveStateToBeforeCommitEv @ 64 NONAME
+	_ZN22CMMFDevSoundAdaptation15SetClientConfigERK10TProcessId @ 65 NONAME
+	_ZN22CMMFDevSoundAdaptation15SetClientConfigERK10TProcessIdS2_ @ 66 NONAME
 
--- a/devsound/a3fdevsound/group/multimedia_a3f_devsound.mrp	Thu Jun 24 10:37:45 2010 +0100
+++ b/devsound/a3fdevsound/group/multimedia_a3f_devsound.mrp	Fri Jul 09 12:23:13 2010 +0100
@@ -1,17 +1,6 @@
+#multimedia_a3f_devsound.mrp
 #
-# Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description: 
+#Copyright (c) Symbian Software Ltd 2007.  All rights reserved.
 #
 
 component	multimedia_a3f_devsound
--- a/devsound/a3fdevsound/src/devsoundadaptor/cdevaudio.cpp	Thu Jun 24 10:37:45 2010 +0100
+++ b/devsound/a3fdevsound/src/devsoundadaptor/cdevaudio.cpp	Fri Jul 09 12:23:13 2010 +0100
@@ -28,6 +28,7 @@
 #include <a3f/audiocontextfactory.h>
 #include <a3f/maudioprocessingunit.h>
 #include <a3f/maudiocontext.h>
+#include <a3f/mcontexteffectiveclient.h>
 #include <a3f/maudiostream.h>
 #include <a3f/maudiocodec.h>
 #include <a3f/maudiogaincontrol.h>
@@ -495,11 +496,6 @@
 	DP_IN();
 	TInt err(KErrNone);
 
-	if(	iActiveState != EDevSoundAdaptorInitialised_Initialised)
-		{
-		DP0_RET(KErrNotReady, "%d");
-		}
-
 	// Redo partial cancelling of initialization after pre-emption clash event in
 	// EDevSoundAdaptorRemovingProcessingUnits state.
 	if (iActiveState == EDevSoundAdaptorUnitialised_Uninitialised &&
@@ -508,7 +504,11 @@
 		err = iCurrentAudioControl->RemoveProcessingUnits();
 		DP0_RET(err, "%d");
 		}
-			
+	else if(iActiveState != EDevSoundAdaptorInitialised_Initialised)
+		{
+		DP0_RET(KErrNotReady, "%d");
+		}
+
 	err = iCurrentAudioControl->Uninitialize();
 	
 	DP0_RET(err, "%d");
@@ -557,18 +557,19 @@
 	{
 	return iPriorityFlag;
 	}
+
 // -----------------------------------------------------------------------------
 // CDevAudio::SetClientConfig
 // -----------------------------------------------------------------------------
 //
-TInt CDevAudio::SetClientConfig(const TMMFClientConfig& aClientConfig)
+TInt CDevAudio::SetClientConfig(const TProcessId& aProcessId)
 	{
 	DP_CONTEXT(CDevAudio::SetClientConfig *CD1*, CtxDevSound, DPLOCAL);
 	DP_IN();
 	// TODO: Check if the TClientContextSettings atributte go back since 
 	// if not there is no way to send the vendor id
 	TClientContextSettings context;
-	context.iProcessId = aClientConfig.iProcessId;
+	context.iProcessId = aProcessId;
 	TInt err = iAudioContext->SetClientSettings(context);
 	if (err != KErrNone)
 		{
@@ -577,6 +578,43 @@
 	DP0_RET(err, "%d");
 	}
 
+TInt CDevAudio::SetClientConfig(const TProcessId& aActualProcessId, const TProcessId& aProcessId)
+	{
+	DP_CONTEXT(CDevAudio::SetClientConfig *CD1*, CtxDevSound, DPLOCAL);
+	DP_IN();
+	
+	MContextSetEffectiveClient* setEffectiveClient
+        = static_cast<MContextSetEffectiveClient*>(iAudioContext->Interface(KSetClientInfoUid));
+	
+	TInt err;
+	
+	if (!setEffectiveClient)
+	    {
+        DP0(DLINFO, "MContextSetEffectiveClient not supported, revert to old behaviour of just passing actual client info");
+        err = SetClientConfig(aActualProcessId);
+	    }
+	else
+	    {
+        TClientContextSettings context;
+        context.iProcessId = aProcessId;
+        err = iAudioContext->SetClientSettings(context);
+        if (err != KErrNone)
+            {
+            DP1(DLERR, "Error %d setting client context!",err);
+            }
+        if (!err)
+            {
+            err = setEffectiveClient->SetEffectiveClientInfo(aActualProcessId);
+            if (err != KErrNone)
+                {
+                DP1(DLERR, "Error %d setting effective client context!",err);
+                }
+            }
+	    }
+
+	DP0_RET(err, "%d");
+	}
+
 
 void CDevAudio::ContextEvent(TUid /*aEvent*/, TInt /*aError*/)
 	{
--- a/devsound/a3fdevsound/src/devsoundadaptor/cdevaudio.h	Thu Jun 24 10:37:45 2010 +0100
+++ b/devsound/a3fdevsound/src/devsoundadaptor/cdevaudio.h	Fri Jul 09 12:23:13 2010 +0100
@@ -143,10 +143,11 @@
 	/**
 	* Sets client configuration
 	* @since
-	* @param TMMFClientConfig& aClientConfig A reference to client
-	*        configuration object.
+	* @param aProcessId DevSound's client process
+	* @param aActualProcessId DevSound's effective/actual client (supplied by SetClientThreadInfo)
 	*/
-	TInt SetClientConfig(const TMMFClientConfig& aClientConfig);
+    TInt SetClientConfig(const TProcessId& aProcessId);
+    TInt SetClientConfig(const TProcessId& aActualProcessId, const TProcessId& aProcessId);
 
 
 	/**
--- a/devsound/a3fdevsound/src/devsoundadaptor/cdevcommoncontrol.cpp	Thu Jun 24 10:37:45 2010 +0100
+++ b/devsound/a3fdevsound/src/devsoundadaptor/cdevcommoncontrol.cpp	Fri Jul 09 12:23:13 2010 +0100
@@ -107,10 +107,6 @@
     DP_IN();
     
     TInt err = KErrNone;
-    if(iDevAudio->iActiveState != EDevSoundAdaptorPaused_Primed)
-        {
-        err = KErrNotReady;
-        }
 
     //If following condition is true, then we are here because of a
     //pre-emption clash in last Commit cycle started from
@@ -121,6 +117,10 @@
 		err = Unload();
 		DP0_RET(err,"%d");
     	}
+    else if(iDevAudio->iActiveState != EDevSoundAdaptorPaused_Primed)
+        {
+        DP0_RET(KErrNotReady, "%d");
+        }
 
     if(err == KErrNone)
         {
--- a/devsound/a3fdevsound/src/devsoundadaptor/mmfdevsoundadaptation.cpp	Thu Jun 24 10:37:45 2010 +0100
+++ b/devsound/a3fdevsound/src/devsoundadaptor/mmfdevsoundadaptation.cpp	Fri Jul 09 12:23:13 2010 +0100
@@ -750,27 +750,23 @@
 // -----------------------------------------------------------------------------
 //
 EXPORT_C TInt CMMFDevSoundAdaptation::SetClientConfig(
-								const TMMFClientConfig& aClientConfig)
-	{
-	DP_CONTEXT(CMMFDevSoundAdaptation::SetClientConfig *CD1*, CtxDevSound, DPLOCAL);
-	DP_IN();
-	TInt retVal = iBody->SetClientConfig(aClientConfig);
-	DP0_RET(retVal, "%d");
-	}
+                                const TProcessId& aProcessId)
+    {
+    DP_CONTEXT(CMMFDevSoundAdaptation::SetClientConfig *CD1*, CtxDevSound, DPLOCAL);
+    DP_IN();
+    TInt retVal = iBody->SetClientConfig(aProcessId);
+    DP0_RET(retVal, "%d");
+    }
 
-// -----------------------------------------------------------------------------
-// CMMFDevSoundAdaptation::ClientConfig
-// Returns client capabilities of this instance of DevSound Adaptation.
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-EXPORT_C const TMMFClientConfig& CMMFDevSoundAdaptation::ClientConfig() const
-	{
-	DP_CONTEXT(CMMFDevSoundAdaptation::ClientConfig *CD1*, CtxDevSound, DPLOCAL);
-	DP_IN();
-	DP_OUT();
-	return(iBody->ClientConfig());
-	}
+EXPORT_C TInt CMMFDevSoundAdaptation::SetClientConfig(
+                                const TProcessId& aActualProcessId,
+                                const TProcessId& aProcessId)
+    {
+    DP_CONTEXT(CMMFDevSoundAdaptation::SetClientConfig *CD1*, CtxDevSound, DPLOCAL);
+    DP_IN();
+    TInt retVal = iBody->SetClientConfig(aActualProcessId, aProcessId);
+    DP0_RET(retVal, "%d");
+    }
 
 // -----------------------------------------------------------------------------
 // CMMFDevSoundAdaptation::EmptyBuffers
--- a/devsound/a3fdevsound/src/devsoundadaptor/mmfdevsoundadaptation.h	Thu Jun 24 10:37:45 2010 +0100
+++ b/devsound/a3fdevsound/src/devsoundadaptor/mmfdevsoundadaptation.h	Fri Jul 09 12:23:13 2010 +0100
@@ -252,21 +252,6 @@
 
 	};
 
-
-/**
-@publishedAll
-@released
-*  A class representing client application information.
-*
-*  @lib MmfDevSoundAdaptation.lib
-*  @since
-*/
-class TMMFClientConfig
-	{
-	public:
-		TProcessId                  iProcessId; //<<< Application Process Id
-	};
-
 // CLASS DECLARATION
 
 /**
@@ -827,18 +812,12 @@
 	/**
 	* Sets client configuration
 	* @since
-	* @param TMMFClientConfig& aClientConfig A reference to client
-	*        configuration object.
+    * @param aActualProcessId the effective devsound client (supplied with SetClientThreadInfo)
+    * @param aProcessId the client of DevSound
 	* @return KErrNone if successful, system wide error otherwise
 	*/
-	IMPORT_C TInt SetClientConfig(const TMMFClientConfig& aClientConfig);
-
-	/**
-	* Returns client configuration
-	* @since
-	* @return void
-	*/
-	IMPORT_C const TMMFClientConfig& ClientConfig() const;
+    IMPORT_C TInt SetClientConfig(const TProcessId& aProcessId);
+    IMPORT_C TInt SetClientConfig(const TProcessId& aActualProcessId, const TProcessId& aProcessId);
 
 	/**
 	* Empties the buffers below DevSound without deleting the codec.
--- a/devsound/a3fdevsound/src/devsoundadaptor/mmfdevsoundadaptationbody.cpp	Thu Jun 24 10:37:45 2010 +0100
+++ b/devsound/a3fdevsound/src/devsoundadaptor/mmfdevsoundadaptationbody.cpp	Fri Jul 09 12:23:13 2010 +0100
@@ -1004,33 +1004,25 @@
 // -----------------------------------------------------------------------------
 //
 TInt CMMFDevSoundAdaptation::CBody::SetClientConfig(
-								const TMMFClientConfig& aClientConfig)
-	{
-	DP_CONTEXT(CMMFDevSoundAdaptation::CBody::SetClientConfig *CD1*, CtxDevSound, DPLOCAL);
-	DP_IN();
+                                const TProcessId& aActualProcessId,
+                                const TProcessId& aProcessId)
+    {
+    DP_CONTEXT(CMMFDevSoundAdaptation::CBody::SetClientConfig *CD1*, CtxDevSound, DPLOCAL);
+    DP_IN();
 
-	TInt err = iDevAudio->SetClientConfig(aClientConfig);
-	if (err == KErrNone)
-		{
-		iClientConfig = aClientConfig;
-		}
-	DP0_RET(err, "%d");
-	}
+    TInt err = iDevAudio->SetClientConfig(aActualProcessId, aProcessId);
+    DP0_RET(err, "%d");
+    }
 
-// -----------------------------------------------------------------------------
-// TMMFClientConfig& CMMFDevSoundAdaptation::CBody::ClientConfig
-// Returns client capabilities of this instance of DevSound Adaptation.
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-const TMMFClientConfig& CMMFDevSoundAdaptation::CBody::ClientConfig() const
-	{
-	DP_CONTEXT(CMMFDevSoundAdaptation::CBody::ClientConfig *CD1*, CtxDevSound, DPLOCAL);
-	DP_IN();
-	DP_OUT();
-	return iClientConfig;
-	}
+TInt CMMFDevSoundAdaptation::CBody::SetClientConfig(
+                                const TProcessId& aProcessId)
+    {
+    DP_CONTEXT(CMMFDevSoundAdaptation::CBody::SetClientConfig *CD1*, CtxDevSound, DPLOCAL);
+    DP_IN();
 
+    TInt err = iDevAudio->SetClientConfig(aProcessId);
+    DP0_RET(err, "%d");
+    }
 
 TBool CMMFDevSoundAdaptation::CBody::CloseDevSound()
 	{
--- a/devsound/a3fdevsound/src/devsoundadaptor/mmfdevsoundadaptationbody.h	Thu Jun 24 10:37:45 2010 +0100
+++ b/devsound/a3fdevsound/src/devsoundadaptor/mmfdevsoundadaptationbody.h	Fri Jul 09 12:23:13 2010 +0100
@@ -590,19 +590,12 @@
 	/**
 	* Sets client configuration
 	* @since
-	* @param TMMFClientConfig& aClientConfig A reference to client
-	*        configuration object.
+	* @param aActualProcessId the effective devsound client (supplied with SetClientThreadInfo)
+	* @param aProcessId the client of DevSound
 	* @return KErrNone if successful, system wide error otherwise
 	*/
-	TInt SetClientConfig(const TMMFClientConfig& aClientConfig);
-
-	/**
-	* Returns client configuration
-	* @since
-	* @return const TMMFClientConfig& A constant reference to client
-	*        configuration.
-	*/
-	const TMMFClientConfig& ClientConfig() const;
+    TInt SetClientConfig(const TProcessId& aProcessId);
+    TInt SetClientConfig(const TProcessId& aActualProcessId, const TProcessId& aProcessId);
 
 	/**
 	* Return to idle state, preparing for destruction.
@@ -709,11 +702,6 @@
 	TMMFCapabilities iMmfConfig;
 
 	/**
-	* holds client platsec related information (VID,SID,PID,caps)
-	*/
-	TMMFClientConfig iClientConfig;
-
-	/**
 	* holds client audio type information
 	*/
 	TMMFPrioritySettings iPrioritySettings;
--- a/devsound/a3fdevsound/src/mmfdevsoundserver/mmfdevsoundsession.cpp	Thu Jun 24 10:37:45 2010 +0100
+++ b/devsound/a3fdevsound/src/mmfdevsoundserver/mmfdevsoundsession.cpp	Fri Jul 09 12:23:13 2010 +0100
@@ -2314,11 +2314,20 @@
 				static_cast<const CMMFDevSoundServer*>(Server()));
 			
 		ASSERT(server); // session should always have a server!
+		
+		TProcessId actualProcessId = server->ActualProcessId();
+		TProcessId processId = server->ProcessId();
+		
+		if (actualProcessId!=processId)
+		    {
+            // we have a differing actual process id, so pass that to the adaptor too
+            err = iAdapter->SetClientConfig(actualProcessId, processId);
+		    }
+		else
+		    {
+            err = iAdapter->SetClientConfig(processId);
+		    }
 
-		TMMFClientConfig clientConfig;
-		clientConfig.iProcessId = server->ActualProcessId();
-
-		err = iAdapter->SetClientConfig(clientConfig);
 		if (!err)
 			{
 			iSetClientConfigApplied = ETrue;
--- a/devsound/a3fintegrationtest/group/bld.inf	Thu Jun 24 10:37:45 2010 +0100
+++ b/devsound/a3fintegrationtest/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -18,18 +18,21 @@
 PRJ_PLATFORMS
 DEFAULT
 
-PRJ_MMPFILES
+PRJ_TESTMMPFILES
 
 // DEVSOUND
 ../mmpfiles/tsi_a3f_devsound.mmp
 
-PRJ_EXPORTS
+PRJ_TESTEXPORTS
 
 // test scripts
 ../scripts/tsi_a3f_devsound_pcm_record.script		c:/tsi_a3f_devsound/tsi_a3f_devsound_pcm_record.script
 ../scripts/tsi_a3f_devsound_pcm_long_record.script	c:/tsi_a3f_devsound/tsi_a3f_devsound_pcm_long_record.script
 
 ../scripts/tsi_a3f_devsound_pcm_play.script  		c:/tsi_a3f_devsound/tsi_a3f_devsound_pcm_play.script
+../scripts/tsi_a3f_devsound_pcm_play2.script  		c:/tsi_a3f_devsound/tsi_a3f_devsound_pcm_play2.script
+../scripts/tsi_a3f_devsound_pcm_play3.script  		c:/tsi_a3f_devsound/tsi_a3f_devsound_pcm_play3.script
+../scripts/tsi_a3f_devsound_pcm_play4.script  		c:/tsi_a3f_devsound/tsi_a3f_devsound_pcm_play4.script
 // To be uncommented if long playback script required
 ../scripts/tsi_a3f_devsound_pcm_long_play.script	c:/tsi_a3f_devsound/tsi_a3f_devsound_pcm_long_play.script
 
--- a/devsound/a3fintegrationtest/group/tsi_a3f_devsound.iby	Thu Jun 24 10:37:45 2010 +0100
+++ b/devsound/a3fintegrationtest/group/tsi_a3f_devsound.iby	Fri Jul 09 12:23:13 2010 +0100
@@ -28,6 +28,9 @@
 data=EPOCROOT##epoc32\data\c\tsi_a3f_devsound\tsi_a3f_devsound_pcm_long_record.script	\tsi_a3f_devsound_pcm_long_record.script
 
 data=EPOCROOT##epoc32\data\c\tsi_a3f_devsound\tsi_a3f_devsound_pcm_play.script			\tsi_a3f_devsound_pcm_play.script
+data=EPOCROOT##epoc32\data\c\tsi_a3f_devsound\tsi_a3f_devsound_pcm_play2.script			\tsi_a3f_devsound_pcm_play2.script
+data=EPOCROOT##epoc32\data\c\tsi_a3f_devsound\tsi_a3f_devsound_pcm_play3.script			\tsi_a3f_devsound_pcm_play3.script
+data=EPOCROOT##epoc32\data\c\tsi_a3f_devsound\tsi_a3f_devsound_pcm_play4.script			\tsi_a3f_devsound_pcm_play4.script
 // To be uncommented if long playback script required
 data=EPOCROOT##epoc32\data\c\tsi_a3f_devsound\tsi_a3f_devsound_pcm_long_play.script		\tsi_a3f_devsound_pcm_long_play.script
 
--- a/devsound/a3fintegrationtest/scripts/tsi_a3f_devsound_pcm_play.script	Thu Jun 24 10:37:45 2010 +0100
+++ b/devsound/a3fintegrationtest/scripts/tsi_a3f_devsound_pcm_play.script	Fri Jul 09 12:23:13 2010 +0100
@@ -120,530 +120,3 @@
 RUN_TEST_STEP 600000 TSI_A3F_DEVSOUND MM-A3F-DEVSOUND-PLAY-PCM-I-0007 \tsi_a3f_devsound\tsi_a3f_devsound_play.ini
 TEST_COMPLETE
 
-//! @SYMTestCaseID				MM-A3F-DEVSOUND-PLAY-PCM-I-0008
-//! @SYMTestCaseDesc			Positive: PCM 22.050k stereo playback (+ve)
-//! @SYMTestPriority			High
-//! @SYMTestType				CIT
-//! @SYMREQ 					7918
-//! @SYMPREQ					1540
-//! @SYMTestActions 			1.	Configure DevSound to play PCM16 raw audio data in stereo mode with sampling rate of 22.050 KHz.
-//! 							2.	Start playing and read recorded data from file.
-//! 							3.	Stop playback once EOF is reached.
-//! @SYMTestExpectedResults 	Devsound to successfully play PCM16 raw audio data in stereo mode with sampling rate of 22.050 KHz with all the DevSound callback functions
-//! 							being executed as required throughout the test.
-
-RUN_TEST_STEP 600000 TSI_A3F_DEVSOUND MM-A3F-DEVSOUND-PLAY-PCM-I-0008 \tsi_a3f_devsound\tsi_a3f_devsound_play.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID				MM-A3F-DEVSOUND-PLAY-PCM-I-0009
-//! @SYMTestCaseDesc			Positive: PCM 32k mono playback (+ve)
-//! @SYMTestPriority			High
-//! @SYMTestType				CIT
-//! @SYMREQ 					7918
-//! @SYMPREQ					1540
-//! @SYMTestActions 			1.	Configure DevSound to play PCM16 raw audio data in mono mode with sampling rate of 32 KHz.
-//! 							2.	Start playing and read recorded data from file.
-//! 							3.	Stop playback once EOF is reached.
-//! @SYMTestExpectedResults 	Devsound to successfully play PCM16 raw audio data in mono mode with sampling rate of 32 KHz with all the DevSound callback functions
-//! 							being executed as required throughout the test.
-
-RUN_TEST_STEP 600000 TSI_A3F_DEVSOUND MM-A3F-DEVSOUND-PLAY-PCM-I-0009 \tsi_a3f_devsound\tsi_a3f_devsound_play.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID				MM-A3F-DEVSOUND-PLAY-PCM-I-0010
-//! @SYMTestCaseDesc			Positive: PCM 32k stereo playback (+ve)
-//! @SYMTestPriority			High
-//! @SYMTestType				CIT
-//! @SYMREQ 					7918
-//! @SYMPREQ					1540
-//! @SYMTestActions 			1.	Configure DevSound to play PCM16 raw audio data in stereo mode with sampling rate of 32 KHz.
-//! 							2.	Start playing and read recorded data from file.
-//! 							3.	Stop playback once EOF is reached.
-//! @SYMTestExpectedResults 	Devsound to successfully play PCM16 raw audio data in stereo mode with sampling rate of 32 KHz with all the DevSound callback functions
-//! 							being executed as required throughout the test.
-
-RUN_TEST_STEP 600000 TSI_A3F_DEVSOUND MM-A3F-DEVSOUND-PLAY-PCM-I-0010 \tsi_a3f_devsound\tsi_a3f_devsound_play.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID				MM-A3F-DEVSOUND-PLAY-PCM-I-0011
-//! @SYMTestCaseDesc			Positive: PCM 44.100k mono playback (+ve)
-//! @SYMTestPriority			High
-//! @SYMTestType				CIT
-//! @SYMREQ 					7918
-//! @SYMPREQ					1540
-//! @SYMTestActions 			1.	Configure DevSound to play PCM16 raw audio data in mono mode with sampling rate of 44.100 KHz.
-//! 							2.	Start playing and read recorded data from file.
-//! 							3.	Stop playback once EOF is reached.
-//! @SYMTestExpectedResults 	Devsound to successfully play PCM16 raw audio data in mono mode with sampling rate of 44.100 KHz with all the DevSound callback functions
-//! 							being executed as required throughout the test.
-
-RUN_TEST_STEP 600000 TSI_A3F_DEVSOUND MM-A3F-DEVSOUND-PLAY-PCM-I-0011 \tsi_a3f_devsound\tsi_a3f_devsound_play.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID				MM-A3F-DEVSOUND-PLAY-PCM-I-0012
-//! @SYMTestCaseDesc			Positive: PCM 44.100k stereo playback (+ve)
-//! @SYMTestPriority			High
-//! @SYMTestType				CIT
-//! @SYMREQ 					7918
-//! @SYMPREQ					1540
-//! @SYMTestActions 			1.	Configure DevSound to play PCM16 raw audio data in stereo mode with sampling rate of 44.100 KHz.
-//! 							2.	Start playing and read recorded data from file.
-//! 							3.	Stop playback once EOF is reached.
-//! @SYMTestExpectedResults 	Devsound to successfully play PCM16 raw audio data in stereo mode with sampling rate of 44.100 KHz with all the DevSound callback functions
-//! 							being executed as required throughout the test.
-
-RUN_TEST_STEP 600000 TSI_A3F_DEVSOUND MM-A3F-DEVSOUND-PLAY-PCM-I-0012 \tsi_a3f_devsound\tsi_a3f_devsound_play.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID				MM-A3F-DEVSOUND-PLAY-PCM-I-0013
-//! @SYMTestCaseDesc			Positive: PCM 48k mono playback (+ve)
-//! @SYMTestPriority			High
-//! @SYMTestType				CIT
-//! @SYMREQ 					7918
-//! @SYMPREQ					1540
-//! @SYMTestActions 			1.	Configure DevSound to play PCM16 raw audio data in mono mode with sampling rate of 48 KHz.
-//! 							2.	Start playing and read recorded data from file.
-//! 							3.	Stop playback once EOF is reached.
-//! @SYMTestExpectedResults 	Devsound to successfully play PCM16 raw audio data in mono mode with sampling rate of 48 KHz with all the DevSound callback functions
-//! 							being executed as required throughout the test.
-
-RUN_TEST_STEP 600000 TSI_A3F_DEVSOUND MM-A3F-DEVSOUND-PLAY-PCM-I-0013 \tsi_a3f_devsound\tsi_a3f_devsound_play.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID				MM-A3F-DEVSOUND-PLAY-PCM-I-0014
-//! @SYMTestCaseDesc			Positive: PCM 48k stereo playback (+ve)
-//! @SYMTestPriority			High
-//! @SYMTestType				CIT
-//! @SYMREQ 					7918
-//! @SYMPREQ					1540
-//! @SYMTestActions 			1.	Configure DevSound to play PCM16 raw audio data in stereo mode with sampling rate of 48 KHz.
-//! 							2.	Start playing and read recorded data from file.
-//! 							3.	Stop playback once EOF is reached.
-//! @SYMTestExpectedResults 	Devsound to successfully play PCM16 raw audio data in stereo mode with sampling rate of 48 KHz with all the DevSound callback functions
-//! 							being executed as required throughout the test.
-
-RUN_TEST_STEP 600000 TSI_A3F_DEVSOUND MM-A3F-DEVSOUND-PLAY-PCM-I-0014 \tsi_a3f_devsound\tsi_a3f_devsound_play.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID				MM-A3F-DEVSOUND-PLAY-PCM-I-0015
-//! @SYMTestCaseDesc			Negative: Play empty PCM raw audio data file (-ve)
-//! @SYMTestPriority			High
-//! @SYMTestType				CIT
-//! @SYMREQ 					7927
-//! @SYMPREQ					1540
-//! @SYMTestStatus
-//! @SYMTestActions
-//! @SYMTestExpectedResults
-
-RUN_TEST_STEP 600000  TSI_A3F_DEVSOUND MM-A3F-DEVSOUND-PLAY-PCM-I-0015 \tsi_a3f_devsound\tsi_a3f_devsound_play.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID				MM-A3F-DEVSOUND-PLAY-PCM-I-0016
-//! @SYMTestCaseDesc			Positive: PCM 48k stereo playback of sine audio data (+ve)
-//! @SYMTestPriority			High
-//! @SYMTestType				CIT
-//! @SYMREQ 					7918
-//! @SYMPREQ					1540
-//! @SYMTestActions 			1.	Configure DevSound to play PCM16 raw sine audio data in stereo mode with sampling rate of 48 KHz.
-//! 							2.	Start playing and read recorded data from file.
-//! 							3.	Stop playback once EOF is reached.
-//! @SYMTestExpectedResults 	Devsound to successfully play PCM16 raw sine audio data in stereo mode with sampling rate of 48 KHz with all the DevSound callback functions
-//! 							being executed as required throughout the test.
-
-RUN_TEST_STEP 600000 TSI_A3F_DEVSOUND MM-A3F-DEVSOUND-PLAY-PCM-I-0016 \tsi_a3f_devsound\tsi_a3f_devsound_play.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID				MM-A3F-DEVSOUND-PLAY-PCM-I-0017
-//! @SYMTestCaseDesc			Positive: Play a 8 bitmupcm raw file (+ve)
-//! @SYMTestPriority			High
-//! @SYMTestType				CIT
-//! @SYMREQ
-//! @SYMPREQ					1540
-//! @SYMTestStatus
-//! @SYMTestActions				1. Configure DevSound to play 8bit MuLaw audio data in mono mode with sampling rate of 8 KHz.
-//!								2. Start playing and read recorded data from file.
-//!								3. Stop playback once EOF is reached.
-//! @SYMTestExpectedResults		Devsound to successfully play 8bit MuLaw audio data in mono mode with sampling rate of 8 KHz with all the DevSound callback functions 
-//!								being executed as required throughout the test.
-
-RUN_TEST_STEP 600000 TSI_A3F_DEVSOUND MM-A3F-DEVSOUND-PLAY-PCM-I-0017 \tsi_a3f_devsound\tsi_a3f_devsound_play.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID				MM-A3F-DEVSOUND-PLAY-PCM-I-0018
-//! @SYMTestCaseDesc			Negative: PCM mono playback with invalid sample rate (-ve)
-//! @SYMTestPriority			High
-//! @SYMTestType				CIT
-//! @SYMREQ 					7927
-//! @SYMPREQ					1540
-//! @SYMTestActions				1. Configure DevSound to play PCM16 raw audio data in mono mode with an invalid sample rate.
-//!								2. Verify the valid error code is received
-//! @SYMTestExpectedResults		CMMFDevSound::SetConfigL should return with KErrArgument
-
-RUN_TEST_STEP 600000 TSI_A3F_DEVSOUND MM-A3F-DEVSOUND-PLAY-PCM-I-0018 \tsi_a3f_devsound\tsi_a3f_devsound_play.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID				MM-A3F-DEVSOUND-PLAY-PCM-I-0019
-//! @SYMTestCaseDesc			Negative: PCM 8k playback with invalid channel mode (-ve)
-//! @SYMTestPriority			High
-//! @SYMTestType				CIT
-//! @SYMREQ 					7927
-//! @SYMPREQ					1540
-//! @SYMTestActions				1. Configure DevSound to play PCM16 raw audio data in an invalid mode with sampling rate of 8 kHz.
-//!								2. Verify the valid error code is received
-//! @SYMTestExpectedResults		CMMFDevSound::SetConfigL should return with KErrArgument
-
-RUN_TEST_STEP 600000 TSI_A3F_DEVSOUND MM-A3F-DEVSOUND-PLAY-PCM-I-0019 \tsi_a3f_devsound\tsi_a3f_devsound_play.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID				MM-A3F-DEVSOUND-PLAY-PCM-I-0020
-//! @SYMTestCaseDesc			Negative: PCM 8k mono playback with invalid FourCC (-ve)
-//! @SYMTestPriority			High
-//! @SYMTestType				CIT
-//! @SYMREQ 					7927
-//! @SYMPREQ					1540
-//! @SYMTestActions				1. Initialise DevSound with an invalid FourCC code
-//!								2. Verify the valid error code is received
-//! @SYMTestExpectedResults		CMMFDevSound::InitializeL should return with KErrNotSupported
-
-RUN_TEST_STEP 600000 TSI_A3F_DEVSOUND MM-A3F-DEVSOUND-PLAY-PCM-I-0020 \tsi_a3f_devsound\tsi_a3f_devsound_play.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID				MM-A3F-DEVSOUND-PLAY-PCM-I-0021
-//! @SYMTestCaseDesc			Negative: PCM 8k mono playback of corrupt file (-ve)
-//! @SYMTestPriority			High
-//! @SYMTestType				CIT
-//! @SYMREQ 					7927
-//! @SYMPREQ					1540
-//! @SYMTestStatus
-//! @SYMTestActions				1. Configure DevSound to play PCM8 raw audio data in mono mode with sampling rate of 8 kHz.
-//!								2. Start playing and read recorded data from file.
-//!								3. Stop playback once EOF is reached.
-//! @SYMTestExpectedResults		Devsound to successfully play PCM8 audio data in mono mode with sampling rate of 8 KHz with all the DevSound callback functions 
-//!								being executed as required throughout the test.
-
-RUN_TEST_STEP 600000 TSI_A3F_DEVSOUND MM-A3F-DEVSOUND-PLAY-PCM-I-0021 \tsi_a3f_devsound\tsi_a3f_devsound_play.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID				MM-A3F-DEVSOUND-PLAY-PCM-I-0022
-//! @SYMTestCaseDesc			Positive: Play to the EOF a specified number of times (+ve)
-//! @SYMTestPriority			High
-//! @SYMTestType				CIT
-//! @SYMREQ 					7918
-//! @SYMPREQ					1540
-//! @SYMTestStatus
-//! @SYMTestActions				1. Configure DevSound to play PCM16 raw audio data in mono mode with sampling rate of 8 kHz.
-//!								2. Start playing and read recorded data from file.
-//!								3. Stop playback once EOF is reached.
-//!								4. Restart playback again
-//!								5. Stop test when EOF is reached again
-//! @SYMTestExpectedResults		Devsound to successfully play PCM16 audio data in mono mode with sampling rate of 8 KHz twice with all the DevSound callback 
-//!								functions being executed as required throughout the test.
-
-RUN_TEST_STEP 600000 TSI_A3F_DEVSOUND MM-A3F-DEVSOUND-PLAY-PCM-I-0022 \tsi_a3f_devsound\tsi_a3f_devsound_play.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID				MM-A3F-DEVSOUND-PLAY-PCM-I-0023
-//! @SYMTestCaseDesc			Positive: PCM playback with default parameters. Default FourCC input datatype and default config values (+ve)
-//! @SYMTestPriority			High
-//! @SYMTestType				CIT
-//! @SYMREQ 					7925
-//! @SYMPREQ					1540
-//! @SYMTestStatus
-//! @SYMTestActions				1. Initialise DevSound for playback without specifying format nor configuration parameters
-//!								2. Start playing and read recorded data from a PCM16/8 kHz file.
-//!								3. Stop playback once EOF is reached.
-//! @SYMTestExpectedResults		Devsound to successfully play PCM16 audio data in mono mode with sampling rate of 8 KHz with all the DevSound callback functions 
-//!								being executed as required throughout the test.
-
-RUN_TEST_STEP 600000 TSI_A3F_DEVSOUND MM-A3F-DEVSOUND-PLAY-PCM-I-0023 \tsi_a3f_devsound\tsi_a3f_devsound_play.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID				MM-A3F-DEVSOUND-PLAY-PCM-I-0024
-//! @SYMTestCaseDesc			Positive: Play->Stop->Play->Stop->Play EOF. Stop is called a specified number of times through ini file.
-//! 							Last playback continues until the EOF (+ve)
-//! @SYMTestPriority			High
-//! @SYMTestType				CIT
-//! @SYMREQ 					7919
-//! @SYMPREQ					1540
-//! @SYMTestStatus
-//! @SYMTestActions				1. Configure DevSound to play PCM16 raw audio data in mono mode with sampling rate of 8 kHz.
-//!								2. Start playing and read recorded data from file.
-//!								3. Stop playback after 10 seconds.
-//!								4. Restart playback
-//!								5. Stop playback after 10 seconds.
-//!								6. Restart playback
-//!								7. Stop playback once EOF is reached.
-//! @SYMTestExpectedResults		Devsound to successfully play-stop-play-stop-play PCM16 audio data in mono mode with sampling rate of 8 KHz with all the DevSound callback
-//!								functions being executed as required throughout the test.
-
-RUN_TEST_STEP 600000 TSI_A3F_DEVSOUND MM-A3F-DEVSOUND-PLAY-PCM-I-0024 \tsi_a3f_devsound\tsi_a3f_devsound_play.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID				MM-A3F-DEVSOUND-PLAY-PCM-I-0025
-//! @SYMTestCaseDesc			Positive: Read the current device configuration during playback (+ve)
-//! @SYMTestPriority			High
-//! @SYMTestType				CIT
-//! @SYMREQ
-//! @SYMPREQ					1540
-//! @SYMTestActions				1. Configure DevSound to play PCM16 raw audio data in mono mode with sampling rate of 8 kHz.
-//!								2. Start playing and read recorded data from file.
-//!								3. In the BuffertoBeFilled callback check the current device configuration matches the one set at the beginning of the test.
-//!								4. Stop the test
-//! @SYMTestExpectedResults		Values queried during playback should match the ones set before the playback started
-RUN_TEST_STEP 600000 TSI_A3F_DEVSOUND MM-A3F-DEVSOUND-PLAY-PCM-I-0025 \tsi_a3f_devsound\tsi_a3f_devsound_play.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID				MM-A3F-DEVSOUND-PLAY-PCM-I-0026
-//! @SYMTestCaseDesc			Positive: Set volume before play, start play, stop play and get volume (+ve)
-//! @SYMTestPriority			High
-//! @SYMTestType				CIT
-//! @SYMREQ
-//! @SYMPREQ					1540
-//! @SYMTestActions				1. Configure DevSound to play PCM16 raw audio data in mono mode with sampling rate of 8 kHz.
-//!								2. Set volume to a value specified in the ini file
-//!								3. Start playing and read recorded data from file.
-//!								4. Stop playback after 10 seconds and get the volume from DevSound
-//!								5. Check the values match
-//! @SYMTestExpectedResults		The Volume after the playback has stopped should match the volume set before playback 
-RUN_TEST_STEP 600000 TSI_A3F_DEVSOUND MM-A3F-DEVSOUND-PLAY-PCM-I-0026 \tsi_a3f_devsound\tsi_a3f_devsound_play.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID				MM-A3F-DEVSOUND-PLAY-PCM-I-0027
-//! @SYMTestCaseDesc			Positive: Empty buffers when playback paused (+ve)
-//! @SYMTestPriority			High
-//! @SYMTestType				CIT
-//! @SYMREQ 					7926
-//! @SYMPREQ					1540
-//! @SYMTestActions				1. Configure DevSound to play PCM16 raw audio data in mono mode with sampling rate of 8 kHz.
-//!								2. Start playing and read recorded data from file.
-//!								3. Pause playback after 10 seconds
-//!								4. Call EmptyBuffers while in paused state
-//! @SYMTestExpectedResults		EmptyBuffers in paused state should return with KErrNone
-
-RUN_TEST_STEP 600000 TSI_A3F_DEVSOUND MM-A3F-DEVSOUND-PLAY-PCM-I-0027 \tsi_a3f_devsound\tsi_a3f_devsound_play.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID				MM-A3F-DEVSOUND-PLAY-PCM-I-0028
-//! @SYMTestCaseDesc			Negative: Initialize DevSound in Record mode and play (-ve)
-//! @SYMTestPriority			High
-//! @SYMTestType				CIT
-//! @SYMREQ
-//! @SYMPREQ					1540
-//! @SYMTestActions				1. Initialise DevSound in Recording state
-//!								2. Call PlayInitL
-//!								3. Error code should be received
-//! @SYMTestExpectedResults		PlayInitL must return with KErrNotReady
-
-RUN_TEST_STEP 600000 TSI_A3F_DEVSOUND MM-A3F-DEVSOUND-PLAY-PCM-I-0028 \tsi_a3f_devsound\tsi_a3f_devsound_play.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID				MM-A3F-DEVSOUND-PLAY-PCM-I-0029
-//! @SYMTestCaseDesc			Negative: Empty buffers during playback (-ve)
-//! @SYMTestPriority			High
-//! @SYMTestType				CIT
-//! @SYMREQ
-//! @SYMPREQ					1540
-//! @SYMTestActions				1. Configure DevSound to play PCM16 raw audio data in mono mode with sampling rate of 8 kHz.
-//!								2. Start playing and read recorded data from file.
-//!								3. Call EmptyBuffers after the first BTBF state
-//! @SYMTestExpectedResults		EmptyBuffers while playing should return with KErrNone
-
-RUN_TEST_STEP 600000 TSI_A3F_DEVSOUND MM-A3F-DEVSOUND-PLAY-PCM-I-0029 \tsi_a3f_devsound\tsi_a3f_devsound_play.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID				MM-A3F-DEVSOUND-PLAY-PCM-I-0030
-//! @SYMTestCaseDesc			Negative: Call InitializeL while playback is in progress (-ve)
-//! @SYMTestPriority			High
-//! @SYMTestType				CIT
-//! @SYMREQ 					7927
-//! @SYMPREQ					1540
-//! @SYMTestActions				1. Configure DevSound to play PCM16 raw audio data in mono mode with sampling rate of 8 kHz.
-//!								2. Start playing and read recorded data from file.
-//!								3. After 10 seconds have passed, and playback is still in progress, initialise DevSound again
-//!								4. Error code should be received
-//! @SYMTestExpectedResults		Second call to InitializeL must return with KErrNotReady
-
-RUN_TEST_STEP 600000 TSI_A3F_DEVSOUND MM-A3F-DEVSOUND-PLAY-PCM-I-0030 \tsi_a3f_devsound\tsi_a3f_devsound_play.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID				MM-A3F-DEVSOUND-PLAY-PCM-I-0031
-//! @SYMTestCaseDesc			Negative: Initialize DevSound HwDeviceUID (-ve)
-//! @SYMTestPriority			High
-//! @SYMTestType				CIT
-//! @SYMREQ
-//! @SYMPREQ					1540
-//! @SYMTestActions				1. Initialise DevSound using a HwDeviceUID instead of a FourCC code
-//!								2. Error code should be received
-//! @SYMTestExpectedResults		InitializeL must return with KErrNotSupported
-
-RUN_TEST_STEP 600000 TSI_A3F_DEVSOUND MM-A3F-DEVSOUND-PLAY-PCM-I-0031 \tsi_a3f_devsound\tsi_a3f_devsound_play.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID				MM-A3F-DEVSOUND-PLAY-PCM-I-0032
-//! @SYMTestCaseDesc			Positive: Set Play balance during playback and get it to confirm balance set correctly (+ve)
-//! @SYMTestPriority			High
-//! @SYMTestType				CIT
-//! @SYMREQ
-//! @SYMPREQ					1540
-//! @SYMTestActions				1. Configure DevSound to play PCM16 raw audio data in mono mode with sampling rate of 8 kHz.
-//!								2. Start playing and read recorded data from file.
-//!								3. In the BuffertoBeFilled callback set the playback balance
-//!								4. Get the balance and check that it's the same as the one that was set
-//! @SYMTestExpectedResults		SetPlayBalanceL returns with KErrNone
-//!								GetPlayBalanceL returns with KErrNone and the left and right balance values match the ones previously set
-
-RUN_TEST_STEP 600000 TSI_A3F_DEVSOUND MM-A3F-DEVSOUND-PLAY-PCM-I-0032 \tsi_a3f_devsound\tsi_a3f_devsound_play.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID				MM-A3F-DEVSOUND-PLAY-PCM-I-0033
-//! @SYMTestCaseDesc			Positive: Get the number of samples played after stopping the playback (+ve)
-//! @SYMTestPriority			High
-//! @SYMTestType				CIT
-//! @SYMREQ
-//! @SYMPREQ					1540
-//! @SYMTestActions				1. Configure DevSound to play PCM16 raw audio data in mono mode with sampling rate of 8 kHz.
-//!								2. Start playing and read recorded data from file.
-//!								3. Stop playback after 10 seconds and get the number of samples played
-//!								4. Samples Played should be more than 0
-//! @SYMTestExpectedResults		SamplesPlayed should return a value greater than 0
-
-RUN_TEST_STEP 600000 TSI_A3F_DEVSOUND MM-A3F-DEVSOUND-PLAY-PCM-I-0033 \tsi_a3f_devsound\tsi_a3f_devsound_play.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID				MM-A3F-DEVSOUND-PLAY-PCM-I-0034
-//! @SYMTestCaseDesc			Negative: Call second InitializeL before the first InitializeL has completed (-ve)
-//! @SYMTestPriority			High
-//! @SYMTestType				CIT
-//! @SYMREQ 					7927
-//! @SYMPREQ					1540
-//! @SYMTestActions				1. Initialise DevSound for playback
-//!								2. Initialise DevSound again without waiting for the InitializeComplete callback
-//! @SYMTestExpectedResults		The first initialisation should complete correctly, the second one should fail with KErrNotReady
-
-RUN_TEST_STEP 600000  TSI_A3F_DEVSOUND MM-A3F-DEVSOUND-PLAY-PCM-I-0034 \tsi_a3f_devsound\tsi_a3f_devsound_play.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID				MM-A3F-DEVSOUND-PLAY-PCM-I-0035
-//! @SYMTestCaseDesc			Negative: Call second PlayInitL before the first PlayInitL has completed (-ve)
-//! @SYMTestPriority			High
-//! @SYMTestType				CIT
-//! @SYMREQ 					7927
-//! @SYMPREQ					1540
-//! @SYMTestActions				1. Configure DevSound to play PCM16 raw audio data in mono mode with sampling rate of 8 kHz.
-//!								2. Call PlayInitL twice.
-//!								3. In the BufferToBeFilled callback check the error codes of both PlayInitL calls
-//! @SYMTestExpectedResults		The first PlayInitL should complete correctly, the second one should fail with KErrNotReady
-
-RUN_TEST_STEP 600000  TSI_A3F_DEVSOUND MM-A3F-DEVSOUND-PLAY-PCM-I-0035 \tsi_a3f_devsound\tsi_a3f_devsound_play.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID				MM-A3F-DEVSOUND-PLAY-PCM-I-0036
-//! @SYMTestCaseDesc			Negative: Set the volume beyond the maximum and minimum supported values and get the set volume to check if volume is cropped (-ve)
-//! @SYMTestPriority			High
-//! @SYMTestType				CIT
-//! @SYMREQ 					7927
-//! @SYMPREQ					1540
-//! @SYMTestActions				1. Initialise DevSound for playback
-//!								2. Get the Max Volume supported
-//!								3. Set the volume higher than the Max Volume
-//!								4. Verify the volume was cropped to the Max Volume
-//!								5. Set the volume lower than zero
-//!								6. Verify the volume was cropped to zero
-//! @SYMTestExpectedResults		Setting the volume to a value beyond the maximum supported volume will crop it to the maximum supported volume.
-//!								Setting the volume to a value below the minimum supported volume will crop ot to the minimum supported volume
-
-RUN_TEST_STEP 600000  TSI_A3F_DEVSOUND MM-A3F-DEVSOUND-PLAY-PCM-I-0036 \tsi_a3f_devsound\tsi_a3f_devsound_play.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID				MM-A3F-DEVSOUND-PLAY-PCM-I-0037
-//! @SYMTestCaseDesc			Negative: Initialize the DevSound in TMMFState EMMFStateConverting (-ve)
-//! @SYMTestPriority			High
-//! @SYMTestType				CIT
-//! @SYMREQ 					7927
-//! @SYMPREQ					1540
-//! @SYMTestActions				1. Initialise DevSound in converting state
-//! @SYMTestExpectedResults		InitializeL must return with KErrNotSupported. DevSound is not initialised
-
-RUN_TEST_STEP 600000  TSI_A3F_DEVSOUND MM-A3F-DEVSOUND-PLAY-PCM-I-0037 \tsi_a3f_devsound\tsi_a3f_devsound_play.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID				MM-A3F-DEVSOUND-PLAY-PCM-I-0038
-//! @SYMTestCaseDesc			Positive: Call CMMFDevSound::CancelInitialize before the InitializeComplete callback. (+ve)
-//! 							
-//! @SYMTestPriority			High
-//! @SYMTestType				CIT
-//! @SYMREQ 					????
-//! @SYMPREQ					1540
-//! @SYMTestActions 			1.	Configure DevSound to play PCM16 raw audio data.
-//! 							2.	Initialize DevSound via CMMFDevSound::InitializeL in play mode using TMMFState::EMMFStatePlaying.
-//! 							3.	Call CMMFDevSound::CancelInitialize before the InitializeComplete callback is received
-//! 							4.	Wait 10 seconds to ensure the InitializeComplete callback is not received.
-//! 							5.	Call SetConfig to verify DevSound is not initialized.
-//!
-//! @SYMTestExpectedResults 	The CMMFDevSound::CancelInitialize call cancels the InitializeComplete callback. DevSound is not Initialized
-
-RUN_TEST_STEP 600000  TSI_A3F_DEVSOUND MM-A3F-DEVSOUND-PLAY-PCM-I-0038 \tsi_a3f_devsound\tsi_a3f_devsound_play.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID				MM-A3F-DEVSOUND-PLAY-PCM-I-0039
-//! @SYMTestCaseDesc			Negative: Call CMMFDevSound::CancelInitialize after the InitializeComplete callback. (-ve)
-//! 							
-//! @SYMTestPriority			High
-//! @SYMTestType				CIT
-//! @SYMREQ 					????
-//! @SYMPREQ					1540
-//! @SYMTestActions 			1.	Configure DevSound to play PCM16 raw audio data.
-//! 							2.	Initialize DevSound via CMMFDevSound::InitializeL in record mode using TMMFState::EMMFStateRecording.
-//! 							3.	Call CMMFDevSound::CancelInitialize after the InitializeComplete callback is received
-//!
-//! @SYMTestExpectedResults 	The CMMFDevSound::CancelInitialize call returns with KErrNotReady. DevSound is Initialized
-
-RUN_TEST_STEP 600000  TSI_A3F_DEVSOUND MM-A3F-DEVSOUND-PLAY-PCM-I-0039 \tsi_a3f_devsound\tsi_a3f_devsound_play.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID				MM-A3F-DEVSOUND-PLAY-PCM-I-0040
-//! @SYMTestCaseDesc			Negative: Call CMMFDevSound::EmptyBuffers after creating the DevSound object. (-ve)
-//! 							
-//! @SYMTestPriority			High
-//! @SYMTestType				CIT
-//! @SYMREQ 					????
-//! @SYMPREQ					1540
-//! @SYMTestActions 			1.	Create the DevSound object
-//! 							2.	Call CMMFDevSound::EmptyBuffers
-//!
-//! @SYMTestExpectedResults 	The CMMFDevSound::EmptyBuffers call returns with KErrNotReady.
-
-RUN_TEST_STEP 600000  TSI_A3F_DEVSOUND MM-A3F-DEVSOUND-PLAY-PCM-I-0040
-TEST_COMPLETE
-
-//! @SYMTestCaseID				MM-A3F-DEVSOUND-PLAY-PCM-I-0041
-//! @SYMTestCaseDesc			Negative: Call CMMFDevSound::EmptyBuffers after the InitializeComplete callback. (-ve)
-//! 							
-//! @SYMTestPriority			High
-//! @SYMTestType				CIT
-//! @SYMREQ 					????
-//! @SYMPREQ					1540
-//! @SYMTestActions 			1.	Configure DevSound to play PCM16 raw audio data.
-//! 							2.	Initialize DevSound via CMMFDevSound::InitializeL in play mode using TMMFState::EMMFStatePlaying.
-//! 							3.	Call CMMFDevSound::EmptyBuffers after the InitializeComplete callback is received
-//!
-//! @SYMTestExpectedResults 	The CMMFDevSound::EmptyBuffers call returns with KErrNotReady.
-
-RUN_TEST_STEP 600000  TSI_A3F_DEVSOUND MM-A3F-DEVSOUND-PLAY-PCM-I-0041 \tsi_a3f_devsound\tsi_a3f_devsound_play.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID				MM-A3F-DEVSOUND-PLAY-PCM-I-0042
-//! @SYMTestCaseDesc			Negative: Call CMMFDevSound::EmptyBuffers before the InitializeComplete callback. (-ve)
-//! 							
-//! @SYMTestPriority			High
-//! @SYMTestType				CIT
-//! @SYMREQ 					????
-//! @SYMPREQ					1540
-//! @SYMTestActions 			1.	Configure DevSound to play PCM16 raw audio data.
-//! 							2.	Initialize DevSound via CMMFDevSound::InitializeL in play mode using TMMFState::EMMFStatePlaying.
-//! 							3.	Call CMMFDevSound::EmptyBuffers before the InitializeComplete callback is received
-//!
-//! @SYMTestExpectedResults 	The CMMFDevSound::EmptyBuffers call returns with KErrNotReady.
-
-RUN_TEST_STEP 600000  TSI_A3F_DEVSOUND MM-A3F-DEVSOUND-PLAY-PCM-I-0042 \tsi_a3f_devsound\tsi_a3f_devsound_play.ini
-TEST_COMPLETE
--- a/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp	Thu Jun 24 10:37:45 2010 +0100
+++ b/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp	Fri Jul 09 12:23:13 2010 +0100
@@ -1,17 +1,6 @@
+#multimedia_a3f_serverstart.mrp
 #
-# Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description: 
+#Copyright (c) Symbian Software Ltd 2008.  All rights reserved.
 #
 
 component	multimedia_a3f_serverstart
--- a/devsound/a3ftrace/group/multimedia_a3f_traces.mrp	Thu Jun 24 10:37:45 2010 +0100
+++ b/devsound/a3ftrace/group/multimedia_a3f_traces.mrp	Fri Jul 09 12:23:13 2010 +0100
@@ -1,17 +1,6 @@
+#multimedia_a3f_traces.mrp
 #
-# Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description: 
+#Copyright (c) Symbian Software Ltd 2007.  All rights reserved.
 #
 
 component	multimedia_a3f_traces
--- a/devsound/devsoundapi/group/bld.inf	Thu Jun 24 10:37:45 2010 +0100
+++ b/devsound/devsoundapi/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -19,12 +19,12 @@
 ../inc/SoundDevice.inl	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/server/sounddevice.inl)
 ../inc/DevSoundStandardCustomInterfaces.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/server/devsoundstandardcustominterfaces.h)
 ../inc/MmfDevSoundCustomInterfaceSupport.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/server/mmfdevsoundcustominterfacesupport.h)
-../inc/mmfdevsoundcustominterfaceobserver.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmf/server/mmfdevsoundcustominterfaceobserver.h)
-../inc/mmfdevsoundcustominterfacesupportclasses.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmf/server/mmfdevsoundcustominterfacesupportclasses.h)
+../inc/mmfdevsoundcustominterfaceobserver.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/server/mmfdevsoundcustominterfaceobserver.h)
+../inc/mmfdevsoundcustominterfacesupportclasses.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/server/mmfdevsoundcustominterfacesupportclasses.h)
 
 ../bwins/MMFDEVSOUND.DEF	/epoc32/include/def/bwins/mmfdevsound.def
 ../eabi/MMFDevSound.def	/epoc32/include/def/eabi/mmfdevsound.def
 PRJ_MMPFILES
 // DevSound
-../MMPFiles/mmfdevsoundlib.mmp	
+../mmpfiles/mmfdevsoundlib.mmp	
 
--- a/devsound/devsoundpluginsupport/inc/MmfDevSoundCustomCommands.h	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-#ifndef MMFDEVSOUNDCUSTOMCOMMANDS_H
-#define MMFDEVSOUNDCUSTOMCOMMANDS_H
-
-/**
-* @internalTechnology
-* @file
-*/
-
-enum TMMFDevSoundCustomCommand
-	{
-	EMMFDevSoundCustomCommandCIOpenSlave,
-	EMMFDevSoundCustomCommandCICloseSlave,
-	EMMFDevSoundCustomCommandCISendSlaveSyncCommand,
-	EMMFDevSoundCustomCommandCISendSlaveSyncCommandResult,
-	EMMFDevSoundCustomCommandCISendSlaveAsyncCommand,
-	EMMFDevSoundCustomCommandCISendSlaveAsyncCommandResult
-	};
-
-#endif 
--- a/devsound/devsoundpluginsupport/inc/MmfDevSoundCustomInterface.h	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,430 +0,0 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-/**
- @publishedPartner
- @released
- @file
-*/
-
-#ifndef MMFDEVSOUNDCUSTOMINTERFACE_H
-#define MMFDEVSOUNDCUSTOMINTERFACE_H
-
-// forward reference
-class MMMFDevSoundCustomInterfaceMuxPlugin;
-class MMMFDevSoundCustomInterfaceDeMuxPlugin;
-
-/**
-* structure to hold command, handle pair
-*/
-class TMMFDevSoundCustomInterfaceCommand
-	{
-public:
-	TInt iCommand;
-	TInt iHandle;
-	};
-
-typedef TPckgBuf<TMMFDevSoundCustomInterfaceCommand> TMMFDevSoundCustomInterfaceCommandPackage;
-
-/**
-* structure to hold custom interface data
-*/
-class TMMFDevSoundCustomInterfaceData
-	{
-public:	
-	TUid iId;
-	TInt iHandle;
-	MMMFDevSoundCustomInterfaceMuxPlugin* iInterface;
-	};
-
-/**
-* structure to hold custom interface data on server side
-*/
-class TMMFDevSoundCustomInterfaceDeMuxData
-	{
-public:
-	TUid iId;
-	MMMFDevSoundCustomInterfaceDeMuxPlugin* iInterface;	
-	};
-
-
-/**
-* mixin for custom command pipeline used by utility to reroute commands
-*/
-class MMMFDevSoundCustomInterfaceChannel
-	{
-public:
-	/**
-	Implements a synchronous custom command
-	@param aUid
-		   The UID of the custom command
-	@param aParam1
-		   A buffer of data to be supplied to the receiver
-	@param aParam2
-		   A buffer of data to be supplied to the receiver
-	@param aOutParam
-		   A buffer that will be written into by the receiver
-		   and returned to the client
-	@return the result of the custom command
-	 */
-	virtual TInt SyncCustomCommand(TUid aUid, const TDesC8& aParam1, const TDesC8& aParam2, TDes8* aOutParam) = 0;
-
-	/**
-	Implements an asynchronous custom command
-	@param aUid
-		   The UID of the custom command
-	@param aStatus
-		   The request status of the active object that
-		   will be called upon the completion of the request
-	@param aParam1
-		   A buffer of data to be supplied to the receiver
-	@param aParam2
-		   A buffer of data to be supplied to the receiver
-	@param aOutParam
-		   A buffer that will be written into by the receiver
-		   and returned to the client
-	 */
-	virtual void AsyncCustomCommand(TUid aUid, TRequestStatus& aStatus, const TDesC8& aParam1, const TDesC8& aParam2, TDes8* aOutParam) = 0;
-	};
-
-
-/**
-* custom interface API mixin
-*/
-class MMMFDevSoundCustomInterfaceTarget
-	{
-public:	
-	/**
-	Obtain a custom interface
-	@param aInterfaceId
-		   The UID of the required custom interface
-	@return a pointer to the custom interface
-	 */
-	virtual TAny* CustomInterface(TUid aInterfaceId) = 0;
-	};
-
-
-/**
-* the custom interface MUX Mixin class implemented by the mux utility
-*/
-class MMMFDevSoundCustomInterfaceMuxUtility
-	{
-public:	
-	/**
-	Attempt to open the slave plugin
-	@param aInterface
-		   The UID of the requested slave
-	@param aPackageBuf
-		   A buffer that can be used to supply initialisation data
-	@return one of the system-wide error codes
-	 */
-	virtual TInt OpenSlave(TUid aInterface, const TDesC8& aPackageBuf) = 0;
-
-	/**
-	Close the slave plugin
-	@param aHandle
-		   The handle of the slave to close
-	 */
-	virtual void CloseSlave(TInt aHandle) = 0;
-
-	/**
-	Send a synchronous command to the slave
-	@param aHandle
-		   The handle of the remote slave plugin
-	@param aCommand
-		   The command to send to the slave
-	@param aPackageBuf
-		   Buffer of data to send to slave
-	@return the return code from the command
-	 */
-	virtual TInt SendSlaveSyncCommand(TInt aHandle, TInt aCommand, const TDesC8& aPackageBuf) = 0;
-	
-	/**
-	Send a synchronous command to the slave and obtain a result
-	@param aHandle
-		   The handle of the remote slave plugin
-	@param aCommand
-		   The command to send to the slave
-	@param aPackageBuf
-		   Buffer of data to send to slave
-	@param aResultBuf
-		   Buffer to contain the result from the destination.
-		   This must be large enough to contain the result.
-	@return the return code from the command
-	 */
-	virtual TInt SendSlaveSyncCommandResult(TInt aHandle, TInt aCommand, const TDesC8& aPackageBuf, TDes8& aResultBuf) = 0; 
-	
-	/**
-	Send an asychronous command to the slave
-	@param aComPackage
-		   A package containing the handle of the remote slave and
-		   the command to be sent
-	@see TMMFDevSoundCustomInterfaceCommandPackage
-	@param aStatus
-		   The request status of the active object that will called
-		   upon the completion of the request
-	@param aPackageBuf
-		   Buffer of data to send to slave
-	 */
-	virtual void SendSlaveAsyncCommand(TMMFDevSoundCustomInterfaceCommandPackage& aComPackage, TRequestStatus& aStatus, const TDesC8& aPackageBuf) = 0;
-	
-	/**
-	Send an asychronous command to the slave and obtain a result
-	@param aComPackage
-		   A package containing the handle of the remote slave and
-		   the command to be sent
-	@see TMMFDevSoundCustomInterfaceCommandPackage
-	@param aStatus
-		   The request status of the active object that will be called
-		   upon the completion of the request
-	@param aPackageBuf
-		   Buffer of data to send to slave
-	@param aResultBuf
-		   Buffer to contain the result from the destination.
-		   This must be large enough to contain the result.
-	 */
-	virtual void SendSlaveAsyncCommandResult(TMMFDevSoundCustomInterfaceCommandPackage& aComPackage, TRequestStatus& aStatus, const TDesC8& aPackageBuf, TDes8& aResultBuf) = 0;	
-	};
-
-
-/**
-* mixin implemented by Mux plugin itself
-*/
-class MMMFDevSoundCustomInterfaceMuxPlugin
-	{
-public:
-	/**
-	Attempt to open the interface.
-	@param aInterfaceId
-		   The UID of the required interface
-	@return one of the system wide error codes
-	*/
-	virtual TInt OpenInterface(TUid aInterfaceId) = 0;
-
-	/**
-	Equivalent to destructor.  Called to destroy plugin.
-	*/
-	virtual void Release() = 0;
-	/**
-	Pass destructor key.
-	Called on construction so plugin takes responsibility to call REComSession::DestroyedImplementation()
-	@param aDestructorKey
-	       The Uid returned by REComSession::CreateImplementationL() or similar
-	*/
-	virtual void PassDestructorKey(TUid aDestructorKey) = 0;
-	
-	/**
-	Complete construction.
-	Pass additional values from the construction phase, used subsequently by the plugin.
-	@param aCustomUtility
-	       The custom interface utility used by the plugin to communicate with the remote
-		   server side DeMux plugin
-	*/
-	virtual void CompleteConstructL(MMMFDevSoundCustomInterfaceMuxUtility* aCustomUtility) = 0;
-
-	/** 
-	Return the custom interface
-	@param aInterfaceId
-		   The id of the required custom interface
-	@return the custom interface supported by this plugin
-	*/
-	virtual TAny* CustomInterface(TUid aInterfaceId) = 0;
-	};
-
-
-/**
-* the custom interface DEMUX Mixin class implemented by the DeMux interface
-* this is likely to be the DevSound server implementation
-*/
-class MMMFDevSoundCustomInterfaceDeMuxInterface
-	{
-public:	
-	/**
-	Open the slave
-	@param aInterface
-		   The UID of the requested interface
-	@param aPackageBuf
-		   A package of data that can be supplied for initialisation
-	@return the result of the operation
-	 */
-	virtual TInt DoOpenSlaveL(TUid aInterface, const TDesC8& aPackageBuf) = 0;
-
-	/** 
-	Close the slave
-	@param aHandle
-		   The handle of the slave plugin
-	 */
-	virtual void DoCloseSlaveL(TInt aHandle) = 0;
-
-	// original RMessage is supplied so that remote demux plugin can extract necessary details
-	// using DeMux utility
-
-	/**
-	Relay the synchronous custom command onto the slave
-	@param aMessage
-		   The IPC message to be sent to the slave
-	@return the result of the operation
-	 */
-	virtual TInt DoSendSlaveSyncCommandL(const RMmfIpcMessage& aMessage) = 0;
-
-	/**
-	Relay the synchronous custom command onto the slave and obtain a result
-	@param aMessage
-		   The IPC message to be sent to the slave
-	@return the result of the operation
-	 */
-	virtual TInt DoSendSlaveSyncCommandResultL(const RMmfIpcMessage& aMessage) = 0;
-
-	/**
-	Relay an asynchronous command onto the slave
-	@param aMessage
-		   The IPC message to be sent to the slave
-	 */
-	virtual void DoSendSlaveAsyncCommandL(const RMmfIpcMessage& aMessage) = 0;
-
-	/**
-	Relay an asynchronous command onto the slave and obtain a result
-	@param aMessage
-		   The IPC message to be sent to the slave@param aMessage
-	 */
-	virtual void DoSendSlaveAsyncCommandResultL(const RMmfIpcMessage& aMessage) = 0;
-	};
-
-
-/**
-* message data structure for demux utility
-*/
-class TMMFDevSoundCIMessageData
-	{
-public:
-	TInt iCommand;
-	TInt iHandle;
-	};
-
-
-/**
-* mixin class implemented by the demux utility
-*/
-class MMMFDevSoundCustomInterfaceDeMuxUtility
-	{
-public:
-	/**
-	Get all settings at once into a client supplied package
-	@param aMessage
-		   The IPC message
-	@param aData
-		   Structure containing the command and handle
-	@see TMMFDevSoundCIMessageData
-	 */
-	virtual void GetSyncMessageDataL(const RMmfIpcMessage& aMessage, TMMFDevSoundCIMessageData& aData) = 0;
-
-	/**
-	Get all settings at once into a client supplied package
-	from an asynchronous message
-	@param aMessage
-		   The IPC message
-	@param aData
-		   Structure containing the command and handle
-	@see TMMFDevSoundCIMessageData
-	 */
-	virtual void GetAsyncMessageDataL(const RMmfIpcMessage& aMessage, TMMFDevSoundCIMessageData& aData) = 0;
-	
-	/**
-	Obtain the input descriptor length from the message
-	@param aMessage
-		   The IPC message
-	@return the length of the input descriptor in the message
-	 */
-	virtual TInt InputDesLength(const RMmfIpcMessage& aMessage) = 0;
-
-	/**
-	Read the data from the input descriptor into the supplied buffer
-	@param aMessage
-		   The IPC message
-	@param aBufToFill
-		   The descriptor to copy the data from the input message into
-	 */
-	virtual void ReadFromInputDesL(const RMmfIpcMessage& aMessage, TDes8* aBufToFill) = 0;
-
-	/**
-	Write the supplied buffer into the output buffer in the IPC message
-	@param aMessage
-		   The IPC message
-	@param aBufToWrite
-		   The buffer to write to the output buffer in the supplied IPC message
-	 */
-	virtual void WriteToOutputDesL(const RMmfIpcMessage& aMessage, TDesC8& aBufToWrite) = 0;
-	
-	/**
-	Complete the supplied IPC message with the supplied error code
-	@param aMessage
-		   The IPC message
-	@param aError
-		   One of the system wide error codes to complete the message with
-	 */
-	virtual void CompleteMessage(const RMmfIpcMessage& aMessage, TInt aError) = 0;
-	};
-
-
-/**
-* mixin implemented by DeMux plugin itself
-*/
-class MMMFDevSoundCustomInterfaceDeMuxPlugin : public MMMFDevSoundCustomInterfaceDeMuxInterface
-	{
-public:
-	/**
-	Attempt to open the interface.
-	@param aInterfaceId
-		   The UID of the required interface
-	@return a handle to the remote plugin
-	*/
-	virtual TInt OpenInterface(TUid aInterfaceId) = 0;
-
-	/**
-	Equivalent to destructor.  Called to destroy plugin.
-	*/
-	virtual void Release() = 0;
-	/**
-	Pass destructor key.
-	Called on construction so plugin takes responsibility to call REComSession::DestroyedImplementation()
-	@param aDestructorKey
-	       The Uid returned by REComSession::CreateImplementationL() or similar
-	*/
-	virtual void PassDestructorKey(TUid aDestructorKey) = 0;
-	
-	/**
-	Complete construction.
-	Set the target of the custom interface call
-	@param aDevSoundServer
-	      The DevSound to call the custom interface on.
-	*/
-	virtual void SetInterfaceTarget(MMMFDevSoundCustomInterfaceTarget* aTarget) = 0;
-
-	/**
-	Complete construction.
-	@param aUtility
-	       A pointer to the DeMux utility to use
-	*/
-	virtual void CompleteConstructL(MMMFDevSoundCustomInterfaceDeMuxUtility* aUtility) = 0;
-
-	/**
-	Refresh the interfaces if circumstances / other areas of DevSound have changed
-	*/
-	virtual void RefreshL() = 0;
-	};
-
-
-
-#endif 
--- a/devsound/devsoundpluginsupport/inc/MmfDevSoundCustomInterface.hrh	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,191 +0,0 @@
-// MmfDevSoundCustomInterface.hrh
-
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-/**
- @publishedPartner
- @released
- @file
-*/
-
-#ifndef MMFDEVSOUNDCUSTOMINTERFACE_HRH
-#define MMFDEVSOUNDCUSTOMINTERFACE_HRH
-
-/**
-* used internally to denote a custom interface plugin for DevSound
-*/
-#define KUidDevSoundCustomInterfaceMux 		0x102070ac
-#define KUidDevSoundCustomInterfaceDeMux 	0x102070ad	
-
-#if defined(SYMBIAN_MULTIMEDIA_A3FDEVSOUND) && !defined(KUidDevSoundCIClientExtension)
-/**
-* Custom Interface Extension Implementation UIDs
-* Only a single extension adapter is allowed and the implementation must use these UIDs
-*/
-#define  KUidDevSoundCIClientExtension      0x10283405
-#define  KUidDevSoundCIServerExtension      0x10283406
-#define  KMmfUidCIClientExtensionImpl       0x10283408
-#define  KMmfUidCIServerExtensionImpl       0x10283409
-#endif
-
-/**
-* used internally to denote a Playback status custom interface plugin
-*/
-#define  KMmfUidCustomInterfacePlayBackStatusDll			0x10273836
-#define  KMmfUidCustomInterfacePlayBackStatusMux			0x10273811
-#define  KMmfUidCustomInterfacePlayBackStatusDeMux			0x10273813
-
-/**
-* used internally to denote an Aac decoder config custom interface plugin
-*/
-#define KMmfUidCustomInterfaceAacDecoderConfigDll			0x102825BB
-#define KMmfUidCustomInterfaceAacDecoderConfigMux			0x102825FD
-#define KMmfUidCustomInterfaceAacDecoderConfigDeMux			0x102825BC
-
-/**
-* used internally to denote a G729 encoder intfc custom interface plugin
-*/
-#define KMmfUidCustomInterfaceG729DecoderIntfcDll			0x102825BE
-#define KMmfUidCustomInterfaceG729DecoderIntfcMux			0x10282603
-#define KMmfUidCustomInterfaceG729DecoderIntfcDeMux			0x102825BF
-
-/**
-* used internally to denote a G729 encoder intfc custom interface plugin
-*/
-#define KMmfUidCustomInterfaceG729EncoderIntfcDll			0x102825C0
-#define KMmfUidCustomInterfaceG729EncoderIntfcMux			0x10282604
-#define KMmfUidCustomInterfaceG729EncoderIntfcDeMux			0x102825C1
-
-/**
-* used internally to denote an audio vibra control custom interface plugin
-*/
-#define KMmfUidCustomInterfaceAudioVibraControlDll			0x102825C2
-#define KMmfUidCustomInterfaceAudioVibraControlMux			0x10282608
-#define KMmfUidCustomInterfaceAudioVibraControlDeMux		0x102825C3
-
-/**
-* used internally to denote a sample buffering custom interface plugin
-*/
-#define KMmfUidCustomInterfaceSampleBufferingDll			0x102825C4
-#define KMmfUidCustomInterfaceSampleBufferingMux			0x10282609
-#define KMmfUidCustomInterfaceSampleBufferingDeMux			0x102825C5
-
-/**
-* used internally to denote a DSP control custom interface plugin
-*/
-#define KMmfUidCustomInterfaceDspControlDll					0x102825C6
-#define KMmfUidCustomInterfaceDspControlMux					0x1028260A
-#define KMmfUidCustomInterfaceDspControlDeMux				0x102825C7
-
-/**
-* used internally to denote an speech encoder config custom interface plugin
-*/
-#define KMmfUidCustomInterfaceSpeechEncoderConfigDll		0x102825D5
-#define KMmfUidCustomInterfaceSpeechEncoderConfigMux		0x10282607
-#define KMmfUidCustomInterfaceSpeechEncoderConfigDeMux		0x102825D6
-
-/**
-* used internally to denote a G711 encoder intfc custom interface plugin
-*/
-#define KMmfUidCustomInterfaceG711DecoderIntfcDll			0x102825D7
-#define KMmfUidCustomInterfaceG711DecoderIntfcMux			0x10282601
-#define KMmfUidCustomInterfaceG711DecoderIntfcDeMux			0x102825D8
-
-/**
-* used internally to denote a G711 encoder intfc custom interface plugin
-*/
-#define KMmfUidCustomInterfaceG711EncoderIntfcDll			0x102825D9
-#define KMmfUidCustomInterfaceG711EncoderIntfcMux			0x10282602
-#define KMmfUidCustomInterfaceG711EncoderIntfcDeMux			0x102825DA
-
-/**
-* used internally to denote a Ilbc encoder intfc custom interface plugin
-*/
-#define KMmfUidCustomInterfaceIlbcDecoderIntfcDll			0x102825DB
-#define KMmfUidCustomInterfaceIlbcDecoderIntfcMux			0x10282605
-#define KMmfUidCustomInterfaceIlbcDecoderIntfcDeMux			0x102825DC
-
-/**
-* used internally to denote a Ilbc encoder intfc custom interface plugin
-*/
-#define KMmfUidCustomInterfaceIlbcEncoderIntfcDll			0x102825DD
-#define KMmfUidCustomInterfaceIlbcEncoderIntfcMux			0x10282606
-#define KMmfUidCustomInterfaceIlbcEncoderIntfcDeMux			0x102825DE
-
-/**
-* used internally to denote a error concealment intfc custom interface plugin
-*/
-#define KMmfUidCustomInterfaceErrorConcealmentIntfcDll		0x102825DF
-#define KMmfUidCustomInterfaceErrorConcealmentIntfcMux		0x10207AB6
-#define KMmfUidCustomInterfaceErrorConcealmentIntfcDeMux	0x102825E0
-
-/**
-* used internally to denote a gsm config custom interface plugin
-*/
-#define KMmfUidCustomInterfaceGsmConfigDll					0x1028261B
-#define KMmfUidCustomInterfaceGsmConfigMux					0x102825FC
-#define KMmfUidCustomInterfaceGsmConfigDeMux				0x1028261C
-
-/**
-* used internally to denote a underflow auto stop control custom interface plugin
-*/
-#define KMmfUidCustomInterfaceUnderflowAutoStopCtrlDll		0x1028261D
-#define KMmfUidCustomInterfaceUnderflowAutoStopCtrlMux		0x1028260B
-#define KMmfUidCustomInterfaceUnderflowAutoStopCtrlDeMux	0x1028261E
-
-/**
-* used internally to denote an EAac+ Decoder custom interface plugin
-*/
-#define  KMmfUidCustomInterfaceEAacPlusDecoderDll	0x1027381c
-#define  KMmfUidCustomInterfaceEAacPlusDecoderMux	0x102825ff
-#define  KMmfUidCustomInterfaceEAacPlusDecoderDeMux	0x1027381d
-
-/**
-* used internally to denote an SBC Encoder custom interface plugin
-*/
-#define  KMmfUidCustomInterfaceSbcEncoderDll	0x102825cd
-#define  KMmfUidCustomInterfaceSbcEncoderMux	0x10282600
-#define  KMmfUidCustomInterfaceSbcEncoderDeMux	0x102825ce
-
-/**
-* used internally to denote a Set DRM Protected custom interface plugin
-*/
-#define  KMmfUidCustomInterfaceSetDRMProtectedDll	0x1027381e
-#define  KMmfUidCustomInterfaceSetDRMProtectedMux	0x1028260c
-#define  KMmfUidCustomInterfaceSetDRMProtectedDeMux	0x102825cf
-
-/**
-* used internally to denote an Advanced AAC Encode Settings custom interface plugin
-*/
-#define  KMmfUidCustomInterfaceAdvancedAACEncodeSettingsDll		0x102825d1
-#define  KMmfUidCustomInterfaceAdvancedAACEncodeSettingsMux		0x10273949
-#define  KMmfUidCustomInterfaceAdvancedAACEncodeSettingsDeMux	0x102825d2
-
-/**
-* used internally to denote a Get Timestamps custom interface plugin
-*/
-#define  KMmfUidCustomInterfaceGetTimestampsDll		0x102825ea
-#define  KMmfUidCustomInterfaceGetTimestampsMux		0x1028260e
-#define  KMmfUidCustomInterfaceGetTimestampsDeMux	0x102825eb
-
-/**
-* used internally to denote a Buffer Frames Configuration custom interface plugin
-*/
-#define  KMmfUidCustomInterfaceBufferFramesConfigDll	0x102825ec
-#define  KMmfUidCustomInterfaceBufferFramesConfigMux	0x1028260d
-#define  KMmfUidCustomInterfaceBufferFramesConfigDeMux	0x102825ed
-
-#endif 
--- a/devsound/devsoundpluginsupport/inc/plugin/DevSoundPlugin.h	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,527 +0,0 @@
-
-// Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-/**
- @file
- @publishedPartner
- @released
-*/
-
-#ifndef DEVSOUNDPLUGIN_H
-#define DEVSOUNDPLUGIN_H
-
-_LIT8(KDevSoundPluginMatchString, "*"); // ECom insists on something
-
-/**
-Interface class used in the plugin implementation of DevSound.
-The CMMFDevSound implementation loads a plugin based on this interface class. 
-Once this has been constructed, calls to method functions of CMMFDevSound are passed
-verbatim to this interface. For further description of required functionality, 
-see CMMFDevSound.
-
-@see CMMFDevSound
-*/
-
-class MMMFDevSoundPlugin
-	{
-public:
-	/**	
-	This must provide an implementation as defined by CMMFDevSound::~CMMFDevSound()
-	
-	@see CMMFDevSound::~CMMFDevSound()
-	*/
-	virtual ~MMMFDevSoundPlugin() {}
-
-	/**
-	This must provide an implementation as defined by 
-	CMMFDevSound::InitializeL(MDevSoundObserver& aDevSoundObserver, TMMFState aMode)
-	
-	@param  aDevSoundObserver
-	        A reference to DevSound Observer instance.
-	@param  aMode
-	        The mode for which this object will be used.
-	        
-	@see CMMFDevSound::InitializeL(MDevSoundObserver& aDevSoundObserver, TMMFState aMode)
-	*/
-    virtual void InitializeL(MDevSoundObserver& aDevSoundObserver, TMMFState aMode)=0;
-
-
-	/**
-	This must provide an implementation as defined by 
-	CMMFDevSound::InitializeL(MDevSoundObserver& aDevSoundObserver, TUid aHWDev, TMMFState aMode)
-	
-	@param  aDevSoundObserver
-	        A reference to DevSound Observer instance.
-	@param  aHWDev
-	        The CMMFHwDevice implementation identifier.
-	@param  aMode
-	        The mode for which this object will be used.
-	        
-	@see CMMFDevSound::InitializeL(MDevSoundObserver& aDevSoundObserver, TUid aHWDev, TMMFState aMode)
-	*/
-	virtual void InitializeL(MDevSoundObserver& aDevSoundObserver, TUid aHWDev, TMMFState aMode)=0;
-
-	/**
-	This must provide an implementation as defined by 
-	CMMFDevSound::InitializeL(MDevSoundObserver& aDevSoundObserver, TFourCC aDesiredFourCC, TMMFState aMode)
-
-	@param  aDevSoundObserver
-	        A reference to DevSound Observer instance.
-	@param  aDesiredFourCC
-	        The CMMFHwDevice implementation FourCC code.
-	@param  aMode
-	        The mode for which this object will be used.
-	        
-	@see CMMFDevSound::InitializeL(MDevSoundObserver& aDevSoundObserver, TFourCC aDesiredFourCC, TMMFState aMode)
-	*/
-	virtual void InitializeL(MDevSoundObserver& aDevSoundObserver, TFourCC aDesiredFourCC, TMMFState aMode)=0;
-
-	/**
-	This must provide an implementation as defined by CMMFDevSound::Capabilities()
-	
-	@return	The device settings.
-	
-	@see CMMFDevSound::Capabilities()
-	*/
-	virtual TMMFCapabilities Capabilities()=0;
-
-	/**
-	This must provide an implementation as defined by CMMFDevSound::Config()
-	
-	@return	The device settings.
-	
-	@see CMMFDevSound::Config()
-	*/
-	virtual TMMFCapabilities Config() const=0;
-
-	/**
-	This must provide an implementation as defined by CMMFDevSound::SetConfigL(const TMMFCapabilities& aCaps)
-
-	@param  aCaps The attribute values to which CMMFDevSound object will be configured to.
-	        
-	@see CMMFDevSound::SetConfigL(const TMMFCapabilities& aCaps)
-	*/
-	virtual void SetConfigL(const TMMFCapabilities& aCaps)=0;
-
-	/**
-	This must provide an implementation as defined by CMMFDevSound::MaxVolume()
-	
-	@return	The maximum volume. This value is platform dependent but is always greater than or equal
-	to one.
-	
-	@see CMMFDevSound::MaxVolume()
-	*/
-	virtual TInt MaxVolume()=0;
-
-	/**
-	This must provide an implementation as defined by CMMFDevSound::Volume()
-	
-	@return The current volume level.
-		
-	@see CMMFDevSound::Volume()
-	*/
-	virtual TInt Volume()=0;
-
-	/**
-	This must provide an implementation as defined by CMMFDevSound::SetVolume()
-	
-	@param  aVolume
-	        The volume setting. This can be any value from 0 to the value
-	        returned by a call to CMMFDevSound::MaxVolume(). If the
-	        volume is not within this range, the volume is automatically set to
-	        minimum or maximum value based on the value that is being passed.
-	        Setting a zero value mutes the sound. Setting the maximum value
-	        results in the loudest possible sound.
-        
-	@see CMMFDevSound::SetVolume()
-	*/
-	virtual void SetVolume(TInt aVolume)=0;
-
-	/**
-	This must provide an implementation as defined by CMMFDevSound::MaxGain()
-	
-	@return The maximum gain. This value is platform dependent but is always greater than or equal
-	to one.
-	
-	@see CMMFDevSound::MaxGain()
-	*/
-	virtual TInt MaxGain()=0;
-
-	/**
-	This must provide an implementation as defined by CMMFDevSound::Gain()
-	
-	@return The current gain level.
-	
-	@see CMMFDevSound::Gain()
-	*/
-	virtual TInt Gain()=0;
-
-	/**
-	This must provide an implementation as defined by CMMFDevSound::SetGain()
-	
-	@param  aGain
-		    The gain setting. This can be any value from zero to the value
-		    returned by a call to CMMFDevSound::MaxGain(). If the
-		    volume is not within this range, the gain is automatically set to
-		    minimum or maximum value based on the value that is being passed.
-		    Setting a zero value mutes the sound. Setting the maximum value
-		    results in the loudest possible sound.
-	@see CMMFDevSound::SetGain()
-	*/
-	virtual void SetGain(TInt aGain)=0;
-
-	/**
-	This must provide an implementation as defined by 
-	CMMFDevSound::GetPlayBalanceL(TInt& aLeftPercentage, TInt& aRightPercentage)
-	
-	@param  aLeftPercentage
-	        On return contains the left speaker volume percentage.
-	@param  aRightPercentage
-	        On return contains the right speaker volume percentage.
-	        
-	@see CMMFDevSound::GetPlayBalanceL(TInt& aLeftPercentage, TInt& aRightPercentage)
-	*/
-	virtual void GetPlayBalanceL(TInt& aLeftPercentage, TInt& aRightPercentage)=0;
-
-	/**
-	This must provide an implementation as defined by 
-	CMMFDevSound::SetPlayBalanceL(TInt aLeftPercentage, TInt aRightPercentage)
-	
-	@param  aLeftPercentage
-	        On return contains left speaker volume perecentage. This can be any
-	        value from zero to 100. Setting a zero value mutes the sound on left
-	        speaker.
-	@param  aRightPercentage
-	        On return contains right speaker volume perecentage. This can be any
-	        value from zero to 100. Setting a zero value mutes the sound on
-	        right speaker.
-	        
-	@see CMMFDevSound::SetPlayBalanceL(TInt aLeftPercentage, TInt aRightPercentage)
-	*/
-	virtual void SetPlayBalanceL(TInt aLeftPercentage, TInt aRightPercentage)=0;
-
-	/**
-	This must provide an implementation as defined by 
-	CMMFDevSound::GetRecordBalanceL(TInt& aLeftPercentage, TInt& aRightPercentage)
-	
-	@param  aLeftPercentage
-	        On return contains the left microphone gain percentage.
-	@param  aRightPercentage
-	        On return contains the right microphone gain percentage.
-	        
-	@see CMMFDevSound::GetRecordBalanceL(TInt& aLeftPercentage, TInt& aRightPercentage)
-	*/
-	virtual void GetRecordBalanceL(TInt& aLeftPercentage, TInt& aRightPercentage)=0;
-
-	/**
-	This must provide an implementation as defined by 
-	CMMFDevSound::GetRecordBalanceL(TInt aLeftPercentage, TInt aRightPercentage)
-	
-	@param  aLeftPercentage
-	        The left microphone gain precentage. This can be any value from zero to
-	        100. Setting a zero value mutes the gain on left microphone.
-	@param  aRightPercentage
-	        The right microphone gain precentage. This can be any value from zero to
-	        100. Setting a zero value mutes the gain on right microphone.
-	        
-	@see CMMFDevSound::GetRecordBalanceL(TInt aLeftPercentage, TInt aRightPercentage)
-	*/
-	virtual void SetRecordBalanceL(TInt aLeftPercentage, TInt aRightPercentage)=0;
-
-	/**
-	This must provide an implementation as defined by CMMFDevSound::PlayInitL()
-	
-	@see CMMFDevSound::PlayInitL()
-	*/
-	virtual void PlayInitL()=0;
-
-	/**
-	This must provide an implementation as defined by CMMFDevSound::RecordInitL()
-
-	@see CMMFDevSound::RecordInitL()
-	*/
-	virtual void RecordInitL()=0;
-
-	/**
-	This must provide an implementation as defined by CMMFDevSound::PlayData()
-	
-	@see CMMFDevSound::PlayData()
-	*/
-	virtual void PlayData()=0;
-
-	/**
-	This must provide an implementation as defined by CMMFDevSound::RecordData()
-	
-	@see CMMFDevSound::RecordData()
-	*/
-	virtual void RecordData()=0;
-
-	/**
-	This must provide an implementation as defined by CMMFDevSound::Stop()
-	
-	@see CMMFDevSound::Stop()
-	*/
-	virtual void Stop()=0;
-
-	/**
-	This must provide an implementation as defined by CMMFDevSound::Pause()
-	
-	@see CMMFDevSound::Pause()
-	*/
-	virtual void Pause()=0;
-
-	/**
-	This must provide an implementation as defined by CMMFDevSound::SamplesRecorded()
-	
-	@return The samples recorded.
-	
-	@see CMMFDevSound::SamplesRecorded()
-	*/
-	virtual TInt SamplesRecorded()=0;
-
-	/**
-	This must provide an implementation as defined by CMMFDevSound::SamplesPlayed()
-	
-	@return The samples played.
-	
-	@see CMMFDevSound::SamplesPlayed()
-	*/
-	virtual TInt SamplesPlayed()=0;
-
-	/**
-	This must provide an implementation as defined by 
-	CMMFDevSound::PlayToneL(TInt aFrequency, const TTimeIntervalMicroSeconds& aDuration)
-	
-	@param  aFrequency
-	        The frequency at which the tone will be played.
-	@param  aDuration
-	        The period over which the tone will be played. A zero value causes
-	        the no tone to be played.
-	        
-	@see CMMFDevSound::PlayToneL(TInt aFrequency, const TTimeIntervalMicroSeconds& aDuration)
-	*/
-	virtual void PlayToneL(TInt aFrequency, const TTimeIntervalMicroSeconds& aDuration)=0;
-
-	/**
-	This must provide an implementation as defined by 
-	CMMFDevSound::PlayDualToneL(TInt aFrequencyOne, TInt aFrequencyTwo, const TTimeIntervalMicroSeconds& aDuration)
-	
-	@param  aFrequencyOne
-	        The first frequency of dual tone.
-	@param  aFrequencyTwo
-	        The second frequency of dual tone
-	@param  aDuration
-	        The period over which the tone will be played. A zero value causes
-	        the no tone to be played (Verify this with test app).
-	        
-	@see CMMFDevSound::PlayDualToneL(TInt aFrequencyOne, TInt aFrequencyTwo, const TTimeIntervalMicroSeconds& aDuration)
-	*/
-	virtual void PlayDualToneL(TInt aFrequencyOne, TInt aFrequencyTwo, const TTimeIntervalMicroSeconds& aDuration)=0;
-
-	/**
-	This must provide an implementation as defined by CMMFDevSound::PlayDTMFStringL(const TDesC& aDTMFString)
-	
-	@param  aDTMFString The DTMF sequence in a descriptor.
-	
-	@see CMMFDevSound::PlayDTMFStringL(const TDesC& aDTMFString)
-	*/
-	virtual void PlayDTMFStringL(const TDesC& aDTMFString)=0;
-
-	/**
-	This must provide an implementation as defined by CMMFDevSound::PlayToneSequenceL(const TDesC8& aData)
-
-	@param  aData The tone sequence in a descriptor.
-	
-	@see CMMFDevSound::PlayToneSequenceL(const TDesC8& aData)
-	*/
-	virtual void PlayToneSequenceL(const TDesC8& aData)=0;
-
-	/**
-	This must provide an implementation as defined by CMMFDevSound::PlayFixedSequenceL(TInt aSequenceNumber)
-	
-	@param  aSequenceNumber
-	        The index identifying the specific pre-defined tone sequence. Index
-	        values are relative to zero.
-	        This can be any value from zero to the value returned by a call to
-	        FixedSequenceCount() - 1.
-	        The function raises a panic if the sequence number is not within this
-	        range.
-	        
-	@see CMMFDevSound::PlayFixedSequenceL(TInt aSequenceNumber)
-	@see FixedSequenceCount()
-	*/
-	virtual void PlayFixedSequenceL(TInt aSequenceNumber)=0;
-
-	/**
-	This must provide an implementation as defined by 
-	CMMFDevSound::SetToneRepeats(TInt aRepeatCount,
-					const TTimeIntervalMicroSeconds& aRepeatTrailingSilence)
-	
-	@param  aRepeatCount
-	        The number of times the tone, together with the trailing silence,
-	        is to be repeated. If this is set to KMdaRepeatForever, then the
-	        tone, together with the trailing silence, is repeated indefinitely
-	        or until Stop() is called. If this is set to zero, then the tone is
-	        not repeated.
-	@param  aRepeatTrailingSilence
-	        An interval of silence which will be played after each tone.
-	        Supported only during tone playing.
-	        
-	@see CMMFDevSound::SetToneRepeats(TInt aRepeatCount,
-					const TTimeIntervalMicroSeconds& aRepeatTrailingSilence)
-	*/
-	virtual void SetToneRepeats(TInt aRepeatCount,
-					const TTimeIntervalMicroSeconds& aRepeatTrailingSilence)=0;
-
-	/**
-	This must provide an implementation as defined by 
-	CMMFDevSound::(TTimeIntervalMicroSeconds32& aToneOnLength,
-									TTimeIntervalMicroSeconds32& aToneOffLength,
-									TTimeIntervalMicroSeconds32& aPauseLength)
-
-	@param  aToneOnLength
-	        The period over which the tone will be played. If this is set to
-	        zero, then the tone is not played.
-	@param  aToneOffLength
-	        The period over which the no tone will be played.
-	@param  aPauseLength
-	        The period over which the tone playing will be paused.
-	        
-	@see CMMFDevSound::(TTimeIntervalMicroSeconds32& aToneOnLength,
-									TTimeIntervalMicroSeconds32& aToneOffLength,
-									TTimeIntervalMicroSeconds32& aPauseLength)
-	*/
-	virtual void SetDTMFLengths(TTimeIntervalMicroSeconds32& aToneOnLength,
-									TTimeIntervalMicroSeconds32& aToneOffLength,
-									TTimeIntervalMicroSeconds32& aPauseLength)=0;
-
-	/**
-	This must provide an implementation as defined by 
-	CMMFDevSound::SetVolumeRamp(const TTimeIntervalMicroSeconds& aRampDuration)
-	
-	@param  aRampDuration
-	        The period over which the volume is to rise. A zero value causes
-	        the tone sample to be played at the normal level for the full
-	        duration of the playback. A value, which is longer than the duration
-	        of the tone sample means that the sample never reaches its normal
-	        volume level.
-	        
-	@see CMMFDevSound::SetVolumeRamp(const TTimeIntervalMicroSeconds& aRampDuration)
-	*/
-	virtual void SetVolumeRamp(const TTimeIntervalMicroSeconds& aRampDuration)=0;
-
-	/**
-	This must provide an implementation as defined by 
-	CMMFDevSound::SetPrioritySettings(const TMMFPrioritySettings& aPrioritySettings)
-
-	@param	aPrioritySettings 
-			A class type representing the client's priority, priority preference and state.
-			
-	@see CMMFDevSound::SetPrioritySettings(const TMMFPrioritySettings& aPrioritySettings)
-	*/
-	virtual void SetPrioritySettings(const TMMFPrioritySettings& aPrioritySettings)=0;
-
-	/**
-	This must provide an implementation as defined by CMMFDevSound::CustomInterface(TUid aInterfaceId)
-	
-	@param  aInterfaceId
-	        The interface UID, defined with the custom interface.
-	
-	@return A pointer to the interface implementation, or NULL if the device does not
-	        implement the interface requested. The return value must be cast to the
-	        correct type by the user.The user should be careful while caching the custom interface pointer,
-	        as in some situations the lower level custom interface pointer may become NULL
-	        
-	@see CMMFDevSound::CustomInterface(TUid aInterfaceId)
-	*/
-	virtual TAny* CustomInterface(TUid aInterfaceId)=0;
-
-	/**
-	This must provide an implementation as defined by CMMFDevSound::FixedSequenceCount()
-	
-	@return The fixed sequence count. This value is implementation dependent but is always greater 
-	        than or equal to zero.
-	        
-	@see CMMFDevSound::FixedSequenceCount()
-	*/
-	virtual TInt FixedSequenceCount()=0;
-
-	/**
-	This must provide an implementation as defined by CMMFDevSound::FixedSequenceName(TInt aSequenceNumber)
-	
-	@param  aSequenceNumber
-	        The index identifying the specific pre-defined tone sequence. Index values are relative 
-	        to zero. This can be any value from zero to the value returned by a call to
-	        FixedSequenceCount() - 1.
-	        The function raises a panic if sequence number is not within this
-	        range.
-
-	@return A reference to a Descriptor containing the fixed sequence name indexed by
-	        aSequenceNumber.
-	        
-	@see CMMFDevSound::FixedSequenceName(TInt aSequenceNumber)
-	@see FixedSequenceCount()
-	*/
-	virtual const TDesC& FixedSequenceName(TInt aSequenceNumber)=0;
-
-	/**
-	This must provide an implementation as defined by 
-	CMMFDevSound::GetSupportedInputDataTypesL(RArray<TFourCC>& aSupportedDataTypes,
-													const TMMFPrioritySettings& aPrioritySettings) const
-	
-	@param  aSupportedDataTypes
-	        The array of supported data types that will be filled in by this function.
-	        The supported data types of the DevSound are in the form of an array
-	        of TFourCC codes. Any existing entries in the array will be overwritten on 
-	        calling this function. If no supported data types are found given the priority 
-	        settings, then the aSupportedDatatypes array will have zero entries.
-	@param  aPrioritySettings
-	        The priority settings used to determine the supported datatypes.  Note this
-	        does not set the priority settings. For input datatypes the iState member
-	        of the priority settings would be expected to be either
-	        EMMFStatePlaying or EMMFStatePlayingRecording. The priority settings may
-	        effect the supported datatypes depending on the audio routing.
-	        
-	@see CMMFDevSound::GetSupportedInputDataTypesL(RArray<TFourCC>& aSupportedDataTypes,
-													const TMMFPrioritySettings& aPrioritySettings) const
-	*/
-	virtual void GetSupportedInputDataTypesL(RArray<TFourCC>& aSupportedDataTypes, const TMMFPrioritySettings& aPrioritySettings) const=0;
-
-	/**
-	This must provide an implementation as defined by 
-	CMMFDevSound::GetSupportedOutputDataTypesL(RArray<TFourCC>& aSupportedDataTypes, const TMMFPrioritySettings& aPrioritySettings) const
-	
-	@param  aSupportedDataTypes
-	        The array of supported data types that will be filled in by this function.
-	        The supported datatypes of the DevSound are in the form of an array
-	        of TFourCC codes.
-	        Any existing entries in the array will be overwritten on calling this function.
-	        If no supported datatypes are found given the priority settings, then
-	        the aSupportedDatatypes array will have zero entries.
-	@param  aPrioritySettings
-	        The priority settings used to determine the supported data types.  Note this
-	        does not set the priority settings. For output data types the iState member
-	        of the priority settings would expected to be either
-	        EMMFStateRecording or EMMFStatePlayingRecording. The priority settings may
-	        effect the supported datatypes depending on the audio routing.
-	        
-	@see CMMFDevSound::GetSupportedOutputDataTypesL(RArray<TFourCC>& aSupportedDataTypes, const TMMFPrioritySettings& aPrioritySettings) const
-	*/
-	virtual void GetSupportedOutputDataTypesL(RArray<TFourCC>& aSupportedDataTypes, const TMMFPrioritySettings& aPrioritySettings) const=0;
-	
-	};
-
-#endif // DEVSOUNDPLUGIN_H
--- a/devsound/devsoundpluginsupport/mmpfiles/MMFDevSoundCIFileBlockLength.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-#include "../src/custominterfaces/cmmfdevsoundcifileblocklengthimpluid.hrh"
-
-/**
-@file
-
-@SYMPurpose DevSound custom interface to allow block length to be set
-*/
-
-TARGET		mmfdevsoundcifileblocklength.dll
-CAPABILITY ALL -TCB
-TARGETTYPE 	PLUGIN
-UNPAGED
-
-UID	0x10009D8D   KMmfUidCIFileBlockLengthDll
-VENDORID 0x70000001
-
-SOURCEPATH	../src/custominterfaces
-
-SOURCE		cmmfdevsoundcifileblocklength.cpp
-
-
-START RESOURCE 	102737FD.rss 
-#ifdef SYMBIAN_SECURE_ECOM
-TARGET mmfdevsoundcifileblocklength.rsc
-#endif
-END
-
-USERINCLUDE	../src/CustomInterfaces
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-LIBRARY		euser.lib 
-LIBRARY		mmfserverbaseclasses.lib
-LIBRARY		mmfcontrollerframework.lib
-LIBRARY		ecom.lib
-LIBRARY		estor.lib
-
-
-SMPSAFE
--- a/devsound/devsoundpluginsupport/mmpfiles/MMFDevSoundCustomInterfaceBitRate.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-#include "../src/CustomInterfaces/cmmfdevsoundcibitrateimplementationuid.hrh"
-
-/**
-@file
-
-@SYMPurpose mmfdevsoundcustominterfacebitrate.dll
-*/
-
-TARGET		mmfdevsoundcustominterfacebitrate.dll
-CAPABILITY ALL -TCB
-TARGETTYPE 	PLUGIN
-UNPAGED
-
-UID	0x10009D8D   KMmfUidCustomInterfaceBitRateDll
-VENDORID 0x70000001
-
-SOURCEPATH	../src/CustomInterfaces
-
-SOURCE		cmmfdevsoundcibitrate.cpp
-
-
-START RESOURCE 	102070B4.rss
-TARGET mmfdevsoundcustominterfacebitrate.rsc
-END
-
-
-USERINCLUDE	../src/CustomInterfaces
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-LIBRARY		euser.lib 
-LIBRARY		mmfserverbaseclasses.lib
-LIBRARY		mmfcontrollerframework.lib
-LIBRARY		ecom.lib
-LIBRARY		estor.lib
-
-
-SMPSAFE
--- a/devsound/devsoundpluginsupport/mmpfiles/aacdecoderconfigci.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ b/devsound/devsoundpluginsupport/mmpfiles/aacdecoderconfigci.mmp	Fri Jul 09 12:23:13 2010 +0100
@@ -28,7 +28,7 @@
 UID	0x10009D8D   KMmfUidCustomInterfaceAacDecoderConfigDll
 VENDORID 0x70000001
 
-SOURCEPATH	../src/custominterfaces
+SOURCEPATH	../src/CustomInterfaces
 
 SOURCE	aacdecoderconfigci.cpp
 
--- a/devsound/devsoundpluginsupport/mmpfiles/advancedaacencodesettingsci.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ b/devsound/devsoundpluginsupport/mmpfiles/advancedaacencodesettingsci.mmp	Fri Jul 09 12:23:13 2010 +0100
@@ -28,7 +28,7 @@
 UID	0x10009D8D   KMmfUidCustomInterfaceAdvancedAACEncodeSettingsDll
 VENDORID 0x70000001
 
-SOURCEPATH		../src/custominterfaces
+SOURCEPATH		../src/CustomInterfaces
 
 SOURCE		advancedaacencodesettingsci.cpp
 
--- a/devsound/devsoundpluginsupport/mmpfiles/audiobufferprefillci.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ b/devsound/devsoundpluginsupport/mmpfiles/audiobufferprefillci.mmp	Fri Jul 09 12:23:13 2010 +0100
@@ -28,7 +28,7 @@
 UID	0x10009D8D   KMmfUidCustomInterfaceSampleBufferingDll
 VENDORID 0x70000001
 
-SOURCEPATH	../src/custominterfaces
+SOURCEPATH	../src/CustomInterfaces
 
 SOURCE	audiobufferprefillci.cpp
 
--- a/devsound/devsoundpluginsupport/mmpfiles/audiovibracontrolci.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ b/devsound/devsoundpluginsupport/mmpfiles/audiovibracontrolci.mmp	Fri Jul 09 12:23:13 2010 +0100
@@ -28,7 +28,7 @@
 UID	0x10009D8D   KMmfUidCustomInterfaceAudioVibraControlDll
 VENDORID 0x70000001
 
-SOURCEPATH	../src/custominterfaces
+SOURCEPATH	../src/CustomInterfaces
 
 SOURCE	audiovibracontrolci.cpp
 
--- a/devsound/devsoundpluginsupport/mmpfiles/bufferframesconfigci.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ b/devsound/devsoundpluginsupport/mmpfiles/bufferframesconfigci.mmp	Fri Jul 09 12:23:13 2010 +0100
@@ -28,7 +28,7 @@
 UID	0x10009D8D   KMmfUidCustomInterfaceBufferFramesConfigDll
 VENDORID 0x70000001
 
-SOURCEPATH		../src/custominterfaces
+SOURCEPATH		../src/CustomInterfaces
 
 SOURCE		bufferframesconfigci.cpp
 
--- a/devsound/devsoundpluginsupport/mmpfiles/dspcontrolci.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ b/devsound/devsoundpluginsupport/mmpfiles/dspcontrolci.mmp	Fri Jul 09 12:23:13 2010 +0100
@@ -28,7 +28,7 @@
 UID	0x10009D8D   KMmfUidCustomInterfaceDspControlDll
 VENDORID 0x70000001
 
-SOURCEPATH	../src/custominterfaces
+SOURCEPATH	../src/CustomInterfaces
 
 SOURCE	dspcontrolci.cpp
 
--- a/devsound/devsoundpluginsupport/mmpfiles/eaacplusdecoderci.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ b/devsound/devsoundpluginsupport/mmpfiles/eaacplusdecoderci.mmp	Fri Jul 09 12:23:13 2010 +0100
@@ -28,7 +28,7 @@
 UID	0x10009D8D   KMmfUidCustomInterfaceEAacPlusDecoderDll
 VENDORID 0x70000001
 
-SOURCEPATH ../src/custominterfaces
+SOURCEPATH ../src/CustomInterfaces
 	
 SOURCE eaacplusdecoderci.cpp
 
--- a/devsound/devsoundpluginsupport/mmpfiles/errorconcealmentci.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ b/devsound/devsoundpluginsupport/mmpfiles/errorconcealmentci.mmp	Fri Jul 09 12:23:13 2010 +0100
@@ -28,7 +28,7 @@
 UID	0x10009D8D   KMmfUidCustomInterfaceErrorConcealmentIntfcDll
 VENDORID 0x70000001
 
-SOURCEPATH	../src/custominterfaces
+SOURCEPATH	../src/CustomInterfaces
 
 SOURCE	errorconcealmentci.cpp
 
--- a/devsound/devsoundpluginsupport/mmpfiles/g711decoderconfigci.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ b/devsound/devsoundpluginsupport/mmpfiles/g711decoderconfigci.mmp	Fri Jul 09 12:23:13 2010 +0100
@@ -28,7 +28,7 @@
 UID	0x10009D8D   KMmfUidCustomInterfaceG711DecoderIntfcDll
 VENDORID 0x70000001
 
-SOURCEPATH	../src/custominterfaces
+SOURCEPATH	../src/CustomInterfaces
 
 SOURCE	g711decoderconfigci.cpp
 
--- a/devsound/devsoundpluginsupport/mmpfiles/g711encoderconfigci.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ b/devsound/devsoundpluginsupport/mmpfiles/g711encoderconfigci.mmp	Fri Jul 09 12:23:13 2010 +0100
@@ -28,7 +28,7 @@
 UID	0x10009D8D   KMmfUidCustomInterfaceG711EncoderIntfcDll
 VENDORID 0x70000001
 
-SOURCEPATH	../src/custominterfaces
+SOURCEPATH	../src/CustomInterfaces
 
 SOURCE	g711encoderconfigci.cpp
 
--- a/devsound/devsoundpluginsupport/mmpfiles/g729decoderconfigci.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ b/devsound/devsoundpluginsupport/mmpfiles/g729decoderconfigci.mmp	Fri Jul 09 12:23:13 2010 +0100
@@ -28,7 +28,7 @@
 UID	0x10009D8D   KMmfUidCustomInterfaceG729DecoderIntfcDll
 VENDORID 0x70000001
 
-SOURCEPATH	../src/custominterfaces
+SOURCEPATH	../src/CustomInterfaces
 
 SOURCE	g729decoderconfigci.cpp
 
--- a/devsound/devsoundpluginsupport/mmpfiles/g729encoderconfigci.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ b/devsound/devsoundpluginsupport/mmpfiles/g729encoderconfigci.mmp	Fri Jul 09 12:23:13 2010 +0100
@@ -28,7 +28,7 @@
 UID	0x10009D8D   KMmfUidCustomInterfaceG729EncoderIntfcDll
 VENDORID 0x70000001
 
-SOURCEPATH	../src/custominterfaces
+SOURCEPATH	../src/CustomInterfaces
 
 SOURCE	g729encoderconfigci.cpp
 
--- a/devsound/devsoundpluginsupport/mmpfiles/gettimestampsci.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ b/devsound/devsoundpluginsupport/mmpfiles/gettimestampsci.mmp	Fri Jul 09 12:23:13 2010 +0100
@@ -28,7 +28,7 @@
 UID	0x10009D8D   KMmfUidCustomInterfaceGetTimestampsDll
 VENDORID 0x70000001
 
-SOURCEPATH		../src/custominterfaces
+SOURCEPATH		../src/CustomInterfaces
 
 SOURCE		gettimestampsci.cpp
 
--- a/devsound/devsoundpluginsupport/mmpfiles/gsmconfigci.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ b/devsound/devsoundpluginsupport/mmpfiles/gsmconfigci.mmp	Fri Jul 09 12:23:13 2010 +0100
@@ -28,7 +28,7 @@
 UID	0x10009D8D   KMmfUidCustomInterfaceGsmConfigDll
 VENDORID 0x70000001
 
-SOURCEPATH	../src/custominterfaces
+SOURCEPATH	../src/CustomInterfaces
 
 SOURCE	gsmconfigci.cpp
 
--- a/devsound/devsoundpluginsupport/mmpfiles/ilbcdecoderconfigci.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ b/devsound/devsoundpluginsupport/mmpfiles/ilbcdecoderconfigci.mmp	Fri Jul 09 12:23:13 2010 +0100
@@ -28,7 +28,7 @@
 UID	0x10009D8D   KMmfUidCustomInterfaceIlbcDecoderIntfcDll
 VENDORID 0x70000001
 
-SOURCEPATH	../src/custominterfaces
+SOURCEPATH	../src/CustomInterfaces
 
 SOURCE	ilbcdecoderconfigci.cpp
 
--- a/devsound/devsoundpluginsupport/mmpfiles/ilbcencoderconfigci.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ b/devsound/devsoundpluginsupport/mmpfiles/ilbcencoderconfigci.mmp	Fri Jul 09 12:23:13 2010 +0100
@@ -28,7 +28,7 @@
 UID	0x10009D8D   KMmfUidCustomInterfaceIlbcEncoderIntfcDll
 VENDORID 0x70000001
 
-SOURCEPATH	../src/custominterfaces
+SOURCEPATH	../src/CustomInterfaces
 
 SOURCE	ilbcencoderconfigci.cpp
 
--- a/devsound/devsoundpluginsupport/mmpfiles/playbackstatusci.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ b/devsound/devsoundpluginsupport/mmpfiles/playbackstatusci.mmp	Fri Jul 09 12:23:13 2010 +0100
@@ -28,7 +28,7 @@
 UID	0x10009D8D   KMmfUidCustomInterfacePlayBackStatusDll
 VENDORID 0x70000001
 
-SOURCEPATH		../src/custominterfaces
+SOURCEPATH		../src/CustomInterfaces
 
 SOURCE		playbackstatusci.cpp
 
--- a/devsound/devsoundpluginsupport/mmpfiles/sbcencoderci.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ b/devsound/devsoundpluginsupport/mmpfiles/sbcencoderci.mmp	Fri Jul 09 12:23:13 2010 +0100
@@ -28,7 +28,7 @@
 UID	0x10009D8D   KMmfUidCustomInterfaceSbcEncoderDll
 VENDORID 0x70000001
 
-SOURCEPATH ../src/custominterfaces
+SOURCEPATH ../src/CustomInterfaces
 
 SOURCE sbcencoderci.cpp
 
--- a/devsound/devsoundpluginsupport/mmpfiles/setdrmprotectedci.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ b/devsound/devsoundpluginsupport/mmpfiles/setdrmprotectedci.mmp	Fri Jul 09 12:23:13 2010 +0100
@@ -28,7 +28,7 @@
 UID	0x10009D8D   KMmfUidCustomInterfaceSetDRMProtectedDll
 VENDORID 0x70000001
 
-SOURCEPATH		../src/custominterfaces
+SOURCEPATH		../src/CustomInterfaces
 
 SOURCE		setdrmprotectedci.cpp
 
--- a/devsound/devsoundpluginsupport/mmpfiles/speechencoderconfigci.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ b/devsound/devsoundpluginsupport/mmpfiles/speechencoderconfigci.mmp	Fri Jul 09 12:23:13 2010 +0100
@@ -28,7 +28,7 @@
 UID	0x10009D8D   KMmfUidCustomInterfaceSpeechEncoderConfigDll
 VENDORID 0x70000001
 
-SOURCEPATH	../src/custominterfaces
+SOURCEPATH	../src/CustomInterfaces
 
 SOURCE	speechencoderconfigci.cpp
 
--- a/devsound/devsoundpluginsupport/mmpfiles/underflowautostopcontrolci.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ b/devsound/devsoundpluginsupport/mmpfiles/underflowautostopcontrolci.mmp	Fri Jul 09 12:23:13 2010 +0100
@@ -28,7 +28,7 @@
 UID	0x10009D8D   KMmfUidCustomInterfaceUnderflowAutoStopCtrlDll
 VENDORID 0x70000001
 
-SOURCEPATH	../src/custominterfaces
+SOURCEPATH	../src/CustomInterfaces
 
 SOURCE	underflowautostopcontrolci.cpp
 
--- a/devsound/devsoundpluginsupport/src/CustomInterfaces/CMMFDevSoundCIBitRate.cpp	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,459 +0,0 @@
-/*
-* Copyright (c) 2005 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-
-#include "cmmfdevsoundcibitrateimplementationuid.hrh"
-
-#include <ecom/implementationproxy.h>
-#include <ecom/ecom.h>
-#include <s32mem.h>
-
-#include "cmmfdevsoundcibitrate.h"
-
-// __________________________________________________________________________
-// Implementation
-
-////////////////////////////////////////// MUX /////////////////////
-
-TInt CMMFDevSoundCIBitRateMux::OpenInterface(TUid /*aInterfaceId*/)
-	{
-	// attempt to open the interface link with the
-	// remote slave device
-	iRemoteHandle = -1;
-	TUid slaveId = {KMmfUidCustomInterfaceBitRateDeMux};
-		
-	TInt handle = iUtility->OpenSlave(slaveId, KNullDesC8);
-	if (handle >= 0)
-		{
-		iRemoteHandle = handle;
-		}
-		
-	return iRemoteHandle;
-	}
-
-void CMMFDevSoundCIBitRateMux::Release()
-	{
-	// close the slave device if it exists
-	if (iRemoteHandle != -1)
-		{
-		// we assume the slave is closed correctly
-		iUtility->CloseSlave(iRemoteHandle);
-		}
-	
-	TUid key = iKey;
-	delete this;
-	
-	// tell ECom to destroy us
-	REComSession::DestroyedImplementation(key);
-	}
-	
-void CMMFDevSoundCIBitRateMux::PassDestructorKey(TUid aDestructorKey)
-	{
-	// store the destructor key
-	iKey = aDestructorKey;
-	}
-
-void CMMFDevSoundCIBitRateMux::CompleteConstructL(MMMFDevSoundCustomInterfaceMuxUtility* aCustomUtility)
-	{
-	// store a pointer to the utility
-	iUtility = aCustomUtility;
-	}
-	
-MMMFDevSoundCustomInterfaceMuxPlugin* CMMFDevSoundCIBitRateMux::NewL()
-	{
-	CMMFDevSoundCIBitRateMux* self = new (ELeave) CMMFDevSoundCIBitRateMux;
-	return self;
-	}
-	
-TAny* CMMFDevSoundCIBitRateMux::CustomInterface(TUid /*aInterfaceId*/)
-	{
-	MMMFDevSoundCustomInterfaceBitRate* interface = this;
-	return interface;
-	}
-	
-CMMFDevSoundCIBitRateMux::CMMFDevSoundCIBitRateMux() :
-	iRemoteHandle(-1)
-	{	
-	}
-
-CMMFDevSoundCIBitRateMux::~CMMFDevSoundCIBitRateMux()
-	{	
-	}
-
-// from MMMFDevSoundCustomInterfaceBitRate
-void CMMFDevSoundCIBitRateMux::GetSupportedBitRatesL(RArray<TInt>& aSupportedBitRates)
-	{
-	if (iRemoteHandle == -1)
-		{
-		User::Leave(KErrNotReady);
-		}
-	
-	// first clear out the array
-	aSupportedBitRates.Reset();
-	
-	// now fetch the count from the server
-	TInt count = -1;
-	count = iUtility->SendSlaveSyncCommand(iRemoteHandle, EMMFDevSoundCIBitRateGetSupportedBitRates, KNullDesC8);
-	
-	// if count is negative then the server side left with an error
-	if (count < 0)
-		{
-		User::Leave(count);
-		}
-	
-	// no point getting the data if the count is zero
-	if (count != 0)
-		{
-		// allocate a temporary buffer to hold the bitrates
-		HBufC8* buf = HBufC8::NewLC(count * sizeof(TInt32));
-		TPtr8 ptr = buf->Des();
-	
-		// fetch the bitrates - but send over the received count to be sure
-		TPckgBuf<TInt> countBuf(count);
-		User::LeaveIfError(iUtility->SendSlaveSyncCommandResult(
-											 iRemoteHandle, 
-											 EMMFDevSoundCIBitRateGetSupportedBitRatesArray,
-											 countBuf, ptr));
-	
-		// stream data into the pointer
-		RDesReadStream stream(ptr);
-		CleanupClosePushL(stream);
-				
-		TInt err = KErrNone;
-		for (TInt i = 0; i < count; i++)
-			{
-			// note we don't destroy array because we don't own it
-			// but we do reset it as it is incomplete
-			err = aSupportedBitRates.Append(stream.ReadInt32L());
-			if (err != KErrNone)
-				{
-				aSupportedBitRates.Reset();
-				User::Leave(KErrCorrupt);
-				}
-			}
-		
-		CleanupStack::PopAndDestroy(2, buf);// stream, buf
-		}
-	}
-	
-TInt CMMFDevSoundCIBitRateMux::BitRateL()
-	{
-	if (iRemoteHandle == -1)
-		{
-		User::Leave(KErrNotReady);
-		}
-	
-	// send EMMFDevSoundCIBitRateBitRate command to slave
-	TInt bitrate = 0;
-	bitrate = iUtility->SendSlaveSyncCommand(iRemoteHandle, EMMFDevSoundCIBitRateBitRate, KNullDesC8);
-	
-	// if bitrate is negative then remote side left with an error
-	if (bitrate < 0)
-		{
-		User::Leave(bitrate);
-		}
-	
-	return bitrate;
-	}
-	
-void CMMFDevSoundCIBitRateMux::SetBitRateL(TInt aBitRate)
-	{
-	if (iRemoteHandle == -1)
-		{
-		User::Leave(KErrNotReady);
-		}
-	
-	// send the bitrate in the sync command
-	TPckgBuf<TInt> bitBuffer(aBitRate);
-	
-	// any return code other than zero is an error
-	User::LeaveIfError(iUtility->SendSlaveSyncCommand(iRemoteHandle, EMMFDevSoundCIBitRateSetBitRate, bitBuffer));
-	}
-
-/////////////////////////////////////// DEMUX //////////////////////	
-	
-
-TInt CMMFDevSoundCIBitRateDeMux::OpenInterface(TUid /*aInterfaceId*/)
-	{
-	return KErrNone;
-	}
-	
-void CMMFDevSoundCIBitRateDeMux::Release()
-	{
-	TUid key = iKey;
-	
-	delete this;
-	
-	// tell ECom to destroy us
-	REComSession::DestroyedImplementation(key);
-	}
-	
-void CMMFDevSoundCIBitRateDeMux::PassDestructorKey(TUid aDestructorKey)
-	{
-	// store the destructor key
-	iKey = aDestructorKey;
-	}
-	
-void CMMFDevSoundCIBitRateDeMux::SetInterfaceTarget(MMMFDevSoundCustomInterfaceTarget* aTarget)
-	{
-	iTarget = aTarget;
-	}
-	
-void CMMFDevSoundCIBitRateDeMux::CompleteConstructL(MMMFDevSoundCustomInterfaceDeMuxUtility* aCustomUtility)
-	{
-	// store a pointer to the utility
-	iUtility = aCustomUtility;
-	}
-
-void CMMFDevSoundCIBitRateDeMux::RefreshL()
-	{
-	// refetch the bitrate custom interface if we already have a target
-	if (iTarget)
-		{
-		MMMFDevSoundCustomInterfaceBitRate* ptr = NULL;
-		ptr = static_cast <MMMFDevSoundCustomInterfaceBitRate*> (iTarget->CustomInterface(KUidCustomInterfaceDevSoundBitRate));
-	
-		if (!ptr)
-			{
-			iBitRateInterface = NULL;
-			User::Leave(KErrNotSupported);
-			}
-		else
-			{
-			iBitRateInterface = ptr;
-			}	
-		}
-	}
-
-
-MMMFDevSoundCustomInterfaceDeMuxPlugin* CMMFDevSoundCIBitRateDeMux::NewL()
-	{
-	CMMFDevSoundCIBitRateDeMux* self = new (ELeave) CMMFDevSoundCIBitRateDeMux;
-	return self;
-	}
-	
-CMMFDevSoundCIBitRateDeMux::CMMFDevSoundCIBitRateDeMux()
-	{
-	
-	}
-
-CMMFDevSoundCIBitRateDeMux::~CMMFDevSoundCIBitRateDeMux()
-	{
-	iBitRateArray.Reset();
-	iBitRateArray.Close();
-	}
-
-
-TInt CMMFDevSoundCIBitRateDeMux::DoOpenSlaveL(TUid /*aInterface*/, const TDesC8& /*aPackageBuf*/)
-	{
-	// fetch the bitrate custom interface
-	MMMFDevSoundCustomInterfaceBitRate* ptr = NULL;
-	ptr = static_cast <MMMFDevSoundCustomInterfaceBitRate*> (iTarget->CustomInterface(KUidCustomInterfaceDevSoundBitRate));
-	
-	if (!ptr)
-		{
-		iBitRateInterface = NULL;
-		User::Leave(KErrNotSupported);
-		}
-	else
-		{
-		iBitRateInterface = ptr;
-		}
-	return KErrNone;
-	}
-	
-void CMMFDevSoundCIBitRateDeMux::DoCloseSlaveL(TInt /*aHandle*/)
-	{
-	// nothing to do
-	}
-
-// original RMessage is supplied so that remote demux plugin can extract necessary details
-// using DeMux utility
-TInt CMMFDevSoundCIBitRateDeMux::DoSendSlaveSyncCommandL(const RMmfIpcMessage& aMessage)
-	{
-	TMMFDevSoundCIMessageData data;
-	
-	// decode message
-	iUtility->GetSyncMessageDataL(aMessage, data);
-	TInt retVal = -1;
-	
-	switch (data.iCommand)
-		{
-		case EMMFDevSoundCIBitRateBitRate:
-			{
-			retVal = DoBitRateL();
-			break;
-			}
-		case EMMFDevSoundCIBitRateSetBitRate:
-			{
-			// we know that offset 2 contains a TInt
-			TPckgBuf<TInt> bitBuffer;
-			iUtility->ReadFromInputDesL(aMessage, &bitBuffer);
-			
-			DoSetBitRateL(bitBuffer());
-			retVal = KErrNone;
-			break;
-			}
-		case EMMFDevSoundCIBitRateGetSupportedBitRates:
-			{
-			// reset the current bitrate array
-			iBitRateArray.Reset();
-			DoGetSupportedBitRatesL(iBitRateArray);
-			
-			// send back the array count
-			TInt count = iBitRateArray.Count();
-			retVal = count;
-			break;
-			}
-		default:
-			{
-			User::Leave(KErrNotSupported);
-			}
-		}
-		
-	return retVal;
-	}
-	
-TInt CMMFDevSoundCIBitRateDeMux::DoSendSlaveSyncCommandResultL(const RMmfIpcMessage& aMessage)
-	{
-	TMMFDevSoundCIMessageData data;
-	
-	// decode message
-	iUtility->GetSyncMessageDataL(aMessage, data);
-	
-	switch (data.iCommand)
-		{
-		case EMMFDevSoundCIBitRateGetSupportedBitRatesArray:
-			{
-			DoCopyBitRateBufferToClientL(aMessage);		
-			break;
-			}
-		default:
-			{
-			User::Leave(KErrNotSupported);
-			}
-		}
-	return KErrNone;
-	}
-	
-void CMMFDevSoundCIBitRateDeMux::DoSendSlaveAsyncCommandL(const RMmfIpcMessage& /*aMessage*/)
-	{
-	// not used in this interface
-	}
-	
-void CMMFDevSoundCIBitRateDeMux::DoSendSlaveAsyncCommandResultL(const RMmfIpcMessage& /*aMessage*/)
-	{
-	// not used in this interface
-	}
-
-// bitrate custom interface implementation
-void CMMFDevSoundCIBitRateDeMux::DoGetSupportedBitRatesL(RArray<TInt>& aSupportedBitRates)
-	{
-	if (!iBitRateInterface)
-		{
-		User::Leave(KErrNotReady);
-		}
-		
-	iBitRateInterface->GetSupportedBitRatesL(aSupportedBitRates);
-	}
-
-
-void CMMFDevSoundCIBitRateDeMux::DoCopyBitRateBufferToClientL(const RMmfIpcMessage& aMessage)
-	{
-	if (!iBitRateInterface)
-		{
-		User::Leave(KErrNotReady);
-		}
-		
-	// check our count is the same as the client's
-	TPckgBuf<TInt> countBuffer;
-	iUtility->ReadFromInputDesL(aMessage, &countBuffer);
-
-	TInt count = countBuffer();
-	if (count != iBitRateArray.Count())
-		{
-		User::Leave(KErrCorrupt);
-		}
-			
-	// send back the array - the client has the count already
-	const TInt KBufExpandSize8 = 8; //two TInt's
-	CBufFlat* dataCopyBuffer = CBufFlat::NewL(KBufExpandSize8);
-	CleanupStack::PushL(dataCopyBuffer);
-	RBufWriteStream stream;
-	stream.Open(*dataCopyBuffer);
-	CleanupClosePushL(stream);
-	
-	for (TInt i = 0; i < count; i++)
-		{
-		stream.WriteInt32L(iBitRateArray[i]);
-		}
-	
-	// write the data to the supplied descriptor buffer
-	TPtr8 ptrBuf = dataCopyBuffer->Ptr(0);
-	iUtility->WriteToOutputDesL(aMessage, ptrBuf);
-	stream.Close();
-
-	CleanupStack::PopAndDestroy(2); // iDataCopyBuffer, stream
-	}
-
-
-TInt CMMFDevSoundCIBitRateDeMux::DoBitRateL()
-	{
-	if (!iBitRateInterface)
-		{
-		User::Leave(KErrNotReady);
-		}
-	return iBitRateInterface->BitRateL();
-	}
-
-void CMMFDevSoundCIBitRateDeMux::DoSetBitRateL(TInt aBitRate)
-	{
-	if (!iBitRateInterface)
-		{
-		User::Leave(KErrNotReady);
-		}
-			
-	// set the bitrate		
-	iBitRateInterface->SetBitRateL(aBitRate);
-	}
-
-
-
-//
-// ImplementationTable
-//
-
-const TImplementationProxy ImplementationTable[] = 
-	{
-	IMPLEMENTATION_PROXY_ENTRY(KMmfUidCustomInterfaceBitRateMux,	CMMFDevSoundCIBitRateMux::NewL),
-	IMPLEMENTATION_PROXY_ENTRY(KMmfUidCustomInterfaceBitRateDeMux,	CMMFDevSoundCIBitRateDeMux::NewL),
-	};
-
-
-//
-// ImplementationGroupProxy
-//
-////////////////////////////////////////////////////////////////////////////////
-
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy(TInt& aTableCount)
-	{
-	aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy);
-
-	return ImplementationTable;
-	}
-
-
--- a/devsound/devsoundpluginsupport/src/CustomInterfaces/CMMFDevSoundCIBitRate.h	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,235 +0,0 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-#ifndef CMMFDEVSOUNDCIBITRATE_H
-#define CMMFDEVSOUNDCIBITRATE_H
-
-#include <e32base.h>
-#include <mmf/common/mmfipc.h>
-#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
-#include <mmf/common/mmfipcserver.h>
-#endif
-#include <mmf/server/mmfdevsoundcustominterface.h>
-#include <mmf/server/mmfdevsoundcustomcommands.h>
-#include <mmf/server/devsoundstandardcustominterfaces.h>
-
-/**
- @internalComponent
- @prototype
- @file
- */
-
-enum TMMFDevSoundCIBitRateCommands
-	{
-	EMMFDevSoundCIBitRateBitRate = 0,
-	EMMFDevSoundCIBitRateSetBitRate,
-	EMMFDevSoundCIBitRateGetSupportedBitRates,
-	EMMFDevSoundCIBitRateGetSupportedBitRatesArray
-	};
-
-/**
- * CMMFDevSoundCIBitRate
- *
- * implementation of the BitRate custom interface pair
- */
-class CMMFDevSoundCIBitRateMux : public CBase,
-			      	 			 public MMMFDevSoundCustomInterfaceMuxPlugin,
-			      	 			 public MMMFDevSoundCustomInterfaceBitRate
-	{
-public:
-	/**
-	Attempt to open the interface.
-	@param aInterfaceId
-		   The UID of the interface to open.
-	@return one of the system wide error codes
-	*/
-	virtual TInt OpenInterface(TUid aInterfaceId);
-
-	/**
-	Equivalent to destructor.  Called to destroy plugin.
-	*/
-	virtual void Release();
-	/**
-	Pass destructor key.
-	Called on construction so plugin takes responsibility to call REComSession::DestroyedImplementation()
-	@param aDestructorKey
-	       The Uid returned by REComSession::CreateImplementationL() or similar
-	*/
-	virtual void PassDestructorKey(TUid aDestructorKey);
-	
-	/**
-	Complete construction.
-	Pass additional values from the construction phase, used subsequently by the plugin.
-	@param aCustomUtility
-	       The custom interface utility used by the plugin to communicate with the remote
-		   server side DeMux plugin
-	*/
-	virtual void CompleteConstructL(MMMFDevSoundCustomInterfaceMuxUtility* aCustomUtility);
-
-	/** 
-	Return the custom interface
-	@param aInterfaceId
-		   The UID of the required custom interface
-	@return the custom interface supported by this plugin
-	*/
-	virtual TAny* CustomInterface(TUid aInterfaceId);
-
-	/**
-	Instantiate a CMMFDevSoundCIBitRateMux class
-	@return the pointer to the new class, cast to the Mux plugin mixin
-	*/
-	static MMMFDevSoundCustomInterfaceMuxPlugin* NewL();
-
-protected:
-	// from MMMFDevSoundCustomInterfaceBitRate
-	virtual void GetSupportedBitRatesL(RArray<TInt>& aSupportedBitRates);
-	virtual TInt BitRateL();
-	virtual void SetBitRateL(TInt aBitRate);
-
-	CMMFDevSoundCIBitRateMux();
-	~CMMFDevSoundCIBitRateMux();
-
-protected:
-	TUid iKey;
-	TInt iRemoteHandle;
-	MMMFDevSoundCustomInterfaceMuxUtility* iUtility;
-	};
-
-
-/**
- * DeMux side of pair
- */
-
-class CMMFDevSoundCIBitRateDeMux : public CBase,
-			      	   			   public MMMFDevSoundCustomInterfaceDeMuxPlugin
-	{
-public:
-	/**
-	Instantiate a CMMFDevSoundCIBitRateDeMux class
-	@return a pointer to the new class cast to the DeMux plugin mixin
-	*/
-	static MMMFDevSoundCustomInterfaceDeMuxPlugin* NewL();
-		
-	/**
-	Attempt to open the interface.
-	@param aInterfaceId
-		   The UID of the interface to open.
-	@return a handle to the remote plugin
-	*/
-	virtual TInt OpenInterface(TUid aInterfaceId);
-
-	/**
-	Equivalent to destructor.  Called to destroy plugin.
-	*/
-	virtual void Release();
-	/**
-	Pass destructor key.
-	Called on construction so plugin takes responsibility to call REComSession::DestroyedImplementation()
-	@param aDestructorKey
-	       The Uid returned by REComSession::CreateImplementationL() or similar
-	*/
-	virtual void PassDestructorKey(TUid aDestructorKey);
-	
-	/**
-	Set the target of the custom interface call
-	@param aTarget
-	       The DevSound to call the custom interface on.
-	*/
-	virtual void SetInterfaceTarget(MMMFDevSoundCustomInterfaceTarget* aTarget);
-	
-	/**
-	Complete construction.
-	@param aUtility
-	       The DeMux utility to use
-	*/
-	virtual void CompleteConstructL(MMMFDevSoundCustomInterfaceDeMuxUtility* aUtility);
-
-	/**
-	Refresh the current custom interface connections
-	*/
-	virtual void RefreshL();
-
-	// from MMMFDeMuxInterface
-	/**
-	Open the slave
-	@param aInterface
-		   The UID of the requested interface
-	@param aPackageBuf
-		   A package of data that can be supplied for initialisation
-	@return the result of the operation
-	 */
-	virtual TInt DoOpenSlaveL(TUid aInterface, const TDesC8& aPackageBuf);
-
-	/** 
-	Close the slave
-	@param aHandle
-		   The handle of the slave plugin
-	 */
-	virtual void DoCloseSlaveL(TInt aHandle);
-
-	// original RMessage is supplied so that remote demux plugin can extract necessary details
-	// using DeMux utility
-
-	/**
-	Relay the synchronous custom command onto the slave
-	@param aMessage
-		   The IPC message to be sent to the slave
-	@return the result of the operation
-	 */
-	virtual TInt DoSendSlaveSyncCommandL(const RMmfIpcMessage& aMessage);
-
-	/**
-	Relay the synchronous custom command onto the slave and obtain a result
-	@param aMessage
-		   The IPC message to be sent to the slave
-	@return the result of the operation
-	 */
-	virtual TInt DoSendSlaveSyncCommandResultL(const RMmfIpcMessage& aMessage);
-
-	/**
-	Relay an asynchronous command onto the slave
-	@param aMessage
-		   The IPC message to be sent to the slave
-	 */
-	virtual void DoSendSlaveAsyncCommandL(const RMmfIpcMessage& aMessage);
-
-	/**
-	Relay an asynchronous command onto the slave and obtain a result
-	@param aMessage
-		   The IPC message to be sent to the slave@param aMessage
-	 */
-	virtual void DoSendSlaveAsyncCommandResultL(const RMmfIpcMessage& aMessage);
-
-protected:
-	~CMMFDevSoundCIBitRateDeMux();
-	CMMFDevSoundCIBitRateDeMux();
-
-	// implementation of bitrate custom interface
-	void DoGetSupportedBitRatesL(RArray<TInt>& aSupportedBitRates);
-	void DoCopyBitRateBufferToClientL(const RMmfIpcMessage& aMessage);
-	TInt DoBitRateL();
-	void DoSetBitRateL(TInt aBitRate);
-	
-protected:
-	MMMFDevSoundCustomInterfaceDeMuxUtility* iUtility;
-	MMMFDevSoundCustomInterfaceTarget* iTarget;
-	MMMFDevSoundCustomInterfaceBitRate* iBitRateInterface;
-	TUid iKey;
-	
-	// array for bitrates
-	RArray<TInt> iBitRateArray;
-	};
-
-#endif 
--- a/devsound/devsoundpluginsupport/src/CustomInterfaces/CMMFDevSoundCIBitRateImplementationUID.hrh	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-/**
- @file
- @internalTechnology
-*/
-
-#ifndef __CMMFDEVSOUNDCIBITRATEIMPLEMENTATIONUID_HRH__
-#define __CMMFDEVSOUNDCIBITRATEIMPLEMENTATIONUID_HRH__
-
-// These are the ECOM Implementation UIDs for the Bitrate Custom Interface
-
-#define  KMmfUidCustomInterfaceBitRateDll	0x102070b4
-
-// The below interface is currently defined but has been supplied by a 
-// licensee.  If this is deemed to be a problem then use 0x102070b5 instead
-#define  KMmfUidCustomInterfaceBitRateMux	0x101F7DD5
-
-#define  KMmfUidCustomInterfaceBitRateDeMux	0x102070b6
-
-#endif
--- a/devsound/devsoundpluginsupport/src/CustomInterfaces/CMMFDevSoundCIFileBlockLength.cpp	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,294 +0,0 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-#include "cmmfdevsoundcifileblocklengthimpluid.hrh"
-
-#include <ecom/implementationproxy.h>
-#include <ecom/implementationproxy.h>
-#include <ecom/ecom.h>
-#include <s32mem.h>
-
-#include "cmmfdevsoundcifileblocklength.h"
-
-// __________________________________________________________________________
-// Implementation
-
-// MUX //
-
-TInt CMMFDevSoundCIFileBlockLengthMux::OpenInterface(TUid /*aInterfaceId*/)
-	{
-	// attempt to open the interface link with the
-	// remote slave device
-	iRemoteHandle = -1;
-	TUid slaveId = {KMmfUidCIFileBlockLengthDeMux};
-		
-	TInt handle = iUtility->OpenSlave(slaveId, KNullDesC8);
-	if (handle >= 0)
-		{
-		iRemoteHandle = handle;
-		}
-		
-	return iRemoteHandle;
-	}
-
-void CMMFDevSoundCIFileBlockLengthMux::Release()
-	{
-	// close the slave device if it exists
-	if (iRemoteHandle != -1)
-		{
-		// we assume the slave is closed correctly
-		iUtility->CloseSlave(iRemoteHandle);
-		}
-	
-	TUid key = iKey;
-	delete this;
-	
-	// tell ECom to destroy us
-	REComSession::DestroyedImplementation(key);
-	}
-	
-void CMMFDevSoundCIFileBlockLengthMux::PassDestructorKey(TUid aDestructorKey)
-	{
-	// store the destructor key
-	iKey = aDestructorKey;
-	}
-
-void CMMFDevSoundCIFileBlockLengthMux::CompleteConstructL(MMMFDevSoundCustomInterfaceMuxUtility* aCustomUtility)
-	{
-	// store a pointer to the utility
-	iUtility = aCustomUtility;
-	}
-	
-MMMFDevSoundCustomInterfaceMuxPlugin* CMMFDevSoundCIFileBlockLengthMux::NewL()
-	{
-	CMMFDevSoundCIFileBlockLengthMux* self = new (ELeave) CMMFDevSoundCIFileBlockLengthMux;
-	return self;
-	}
-	
-TAny* CMMFDevSoundCIFileBlockLengthMux::CustomInterface(TUid /*aInterfaceId*/)
-	{
-	MMMFDevSoundCustomInterfaceFileBlockLength* interface = this;
-	return interface;
-	}
-	
-CMMFDevSoundCIFileBlockLengthMux::CMMFDevSoundCIFileBlockLengthMux() :
-	iRemoteHandle(-1)
-	{	
-	}
-
-CMMFDevSoundCIFileBlockLengthMux::~CMMFDevSoundCIFileBlockLengthMux()
-	{	
-	}
-
-// from MMMFDevSoundCustomInterfaceFileBlockLength
-
-void CMMFDevSoundCIFileBlockLengthMux::SetFileBlockLength(TUint aBlockAlign)
-	{
-	if (iRemoteHandle == -1)
-		{
-		return;
-		}
-	
-	// send the BlockAlign in the sync command
-	TPckgBuf<TUint> blockAlignBuffer(aBlockAlign);
-	
-	iUtility->SendSlaveSyncCommand(iRemoteHandle, EMMFDevSoundCIBlockLengthSetFileBlockLength, blockAlignBuffer);
-	}
-
-// DEMUX //	
-	
-
-TInt CMMFDevSoundCIFileBlockLengthDeMux::OpenInterface(TUid /*aInterfaceId*/)
-	{
-	return KErrNone;
-	}
-	
-void CMMFDevSoundCIFileBlockLengthDeMux::Release()
-	{
-	TUid key = iKey;
-	
-	delete this;
-	
-	// tell ECom to destroy us
-	REComSession::DestroyedImplementation(key);
-	}
-	
-void CMMFDevSoundCIFileBlockLengthDeMux::PassDestructorKey(TUid aDestructorKey)
-	{
-	// store the destructor key
-	iKey = aDestructorKey;
-	}
-	
-void CMMFDevSoundCIFileBlockLengthDeMux::SetInterfaceTarget(MMMFDevSoundCustomInterfaceTarget* aTarget)
-	{
-	iTarget = aTarget;
-	}
-	
-void CMMFDevSoundCIFileBlockLengthDeMux::CompleteConstructL(MMMFDevSoundCustomInterfaceDeMuxUtility* aCustomUtility)
-	{
-	// store a pointer to the utility
-	iUtility = aCustomUtility;
-	}
-
-void CMMFDevSoundCIFileBlockLengthDeMux::RefreshL()
-	{
-	// refetch the fileblocklength custom interface if we already have a target
-	if (iTarget)
-		{
-		MMMFDevSoundCustomInterfaceFileBlockLength* ptr = NULL;
-		ptr = static_cast<MMMFDevSoundCustomInterfaceFileBlockLength*>(iTarget->CustomInterface(KUidCustomInterfaceDevSoundFileBlockLength));
-	
-		if (!ptr)
-			{
-			iFileBlockLengthInterface = NULL;
-			User::Leave(KErrNotSupported);
-			}
-		else
-			{
-			iFileBlockLengthInterface = ptr;
-			}	
-		}
-	}
-
-
-MMMFDevSoundCustomInterfaceDeMuxPlugin* CMMFDevSoundCIFileBlockLengthDeMux::NewL()
-	{
-	CMMFDevSoundCIFileBlockLengthDeMux* self = new (ELeave) CMMFDevSoundCIFileBlockLengthDeMux;
-	return self;
-	}
-	
-CMMFDevSoundCIFileBlockLengthDeMux::CMMFDevSoundCIFileBlockLengthDeMux()
-	{
-	}
-
-CMMFDevSoundCIFileBlockLengthDeMux::~CMMFDevSoundCIFileBlockLengthDeMux()
-	{
-	}
-
-
-TInt CMMFDevSoundCIFileBlockLengthDeMux::DoOpenSlaveL(TUid /*aInterface*/, const TDesC8& /*aPackageBuf*/)
-	{
-	// fetch the fileblocklength custom interface
-	MMMFDevSoundCustomInterfaceFileBlockLength* ptr = NULL;
-	ptr = static_cast <MMMFDevSoundCustomInterfaceFileBlockLength*> (iTarget->CustomInterface(KUidCustomInterfaceDevSoundFileBlockLength));
-	
-	if (!ptr)
-		{
-		iFileBlockLengthInterface = NULL;
-		User::Leave(KErrNotSupported);
-		}
-	else
-		{
-		iFileBlockLengthInterface = ptr;
-		}
-	return KErrNone;
-	}
-	
-void CMMFDevSoundCIFileBlockLengthDeMux::DoCloseSlaveL(TInt /*aHandle*/)
-	{
-	// nothing to do
-	}
-
-// original RMessage is supplied so that remote demux plugin can extract necessary details
-// using DeMux utility
-TInt CMMFDevSoundCIFileBlockLengthDeMux::DoSendSlaveSyncCommandL(const RMmfIpcMessage& aMessage)
-	{
-	TMMFDevSoundCIMessageData data;
-	
-	// decode message
-	iUtility->GetSyncMessageDataL(aMessage, data);
-	TInt retVal = -1;
-	
-	switch (data.iCommand)
-		{
-		case EMMFDevSoundCIBlockLengthSetFileBlockLength:
-			{
-			// we know that offset 2 contains a TInt
-			TPckgBuf<TUint> blockAlignBuffer;
-			iUtility->ReadFromInputDesL(aMessage, &blockAlignBuffer);
-			
-			DoSetFileBlockLengthL(blockAlignBuffer());
-			retVal = KErrNone;
-			break;
-			}
-	
-		default:
-			{
-			User::Leave(KErrNotSupported);
-			}
-		}
-		
-	return retVal;
-	}
-	
-TInt CMMFDevSoundCIFileBlockLengthDeMux::DoSendSlaveSyncCommandResultL(const RMmfIpcMessage& /*aMessage*/)
-	{
-	return KErrNotSupported;
-	}
-	
-void CMMFDevSoundCIFileBlockLengthDeMux::DoSendSlaveAsyncCommandL(const RMmfIpcMessage& /*aMessage*/)
-	{
-	// not used in this interface
-	}
-	
-void CMMFDevSoundCIFileBlockLengthDeMux::DoSendSlaveAsyncCommandResultL(const RMmfIpcMessage& /*aMessage*/)
-	{
-	// not used in this interface
-	}
-
-void CMMFDevSoundCIFileBlockLengthDeMux::DoSetFileBlockLengthL(TUint aBlockAlign)
-	{
-	if (!iFileBlockLengthInterface)
-		{
-		User::Leave(KErrNotReady);
-		}
-			
-	// set the block length		
-	iFileBlockLengthInterface->SetFileBlockLength(aBlockAlign);
-	}
-
-
-
-//
-// ImplementationTable
-//
-
-const TImplementationProxy ImplementationTable[] = 
-	{
-	IMPLEMENTATION_PROXY_ENTRY(KMmfUidCIFileBlockLengthMux,	CMMFDevSoundCIFileBlockLengthMux::NewL),
-	IMPLEMENTATION_PROXY_ENTRY(KMmfUidCIFileBlockLengthDeMux, CMMFDevSoundCIFileBlockLengthDeMux::NewL),
-	};
-
-
-//
-// ImplementationGroupProxy
-//
-//
-
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy(TInt& aTableCount)
-	{
-	aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy);
-
-	return ImplementationTable;
-	}
-
-#ifndef EKA2
-/** DLL Entry point */
-GLDEF_C TInt E32Dll(TDllReason /*aReason*/)
-	{
-	return(KErrNone);
-	}
-#endif
-
--- a/devsound/devsoundpluginsupport/src/CustomInterfaces/CMMFDevSoundCIFileBlockLength.h	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,220 +0,0 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-#ifndef CMMFDEVSOUNDCIFILEBLOCKLENGTH_H
-#define CMMFDEVSOUNDCIFILEBLOCKLENGTH_H
-
-#include <e32base.h>
-#include <mmf/common/mmfipc.h>
-#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
-#include <mmf/common/mmfipcserver.h>
-#endif
-#include <mmf/server/mmfdevsoundcustominterface.h>
-#include <mmf/server/mmfdevsoundcustomcommands.h>
-#include <mmf/server/devsoundstandardcustominterfaces.h>
-
-
-enum TMMFDevSoundCIBlockLengthCommands
-	{
-	EMMFDevSoundCIBlockLengthSetFileBlockLength = 0
-	};
-
-/**
- * CMMFDevSoundCIFileBlockLengthMux
- *
- * implementation of the FileBlockLength custom interface pair
- */
-class CMMFDevSoundCIFileBlockLengthMux : public CBase,
-			      	 			 public MMMFDevSoundCustomInterfaceMuxPlugin,
-			      	 			 public MMMFDevSoundCustomInterfaceFileBlockLength
-	{
-public:
-	/**
-	Attempt to open the interface.
-	@param aInterfaceId
-		   The UID of the interface to open.
-	@return one of the system wide error codes
-	*/
-	virtual TInt OpenInterface(TUid aInterfaceId);
-
-	/**
-	Equivalent to destructor.  Called to destroy plugin.
-	*/
-	virtual void Release();
-	/**
-	Pass destructor key.
-	Called on construction so plugin takes responsibility to call REComSession::DestroyedImplementation()
-	@param aDestructorKey
-	       The Uid returned by REComSession::CreateImplementationL() or similar
-	*/
-	virtual void PassDestructorKey(TUid aDestructorKey);
-	
-	/**
-	Complete construction.
-	Pass additional values from the construction phase, used subsequently by the plugin.
-	@param aCustomUtility
-	       The custom interface utility used by the plugin to communicate with the remote
-		   server side DeMux plugin
-	*/
-	virtual void CompleteConstructL(MMMFDevSoundCustomInterfaceMuxUtility* aCustomUtility);
-
-	/** 
-	Return the custom interface
-	@param aInterfaceId
-		   The UID of the required custom interface
-	@return the custom interface supported by this plugin
-	*/
-	virtual TAny* CustomInterface(TUid aInterfaceId);
-
-	/**
-	Instantiate a CMMFDevSoundCIFileBlockLengthMux class
-	@return the pointer to the new class, cast to the Mux plugin mixin
-	*/
-	static MMMFDevSoundCustomInterfaceMuxPlugin* NewL();
-
-protected:
-	// from MMMFDevSoundCustomInterfaceFileBlockLength
-	virtual void SetFileBlockLength(TUint aBlockAlign);
-
-	CMMFDevSoundCIFileBlockLengthMux();
-	~CMMFDevSoundCIFileBlockLengthMux();
-
-protected:
-	TUid iKey;
-	TInt iRemoteHandle;
-	MMMFDevSoundCustomInterfaceMuxUtility* iUtility;
-	};
-
-
-/**
- * DeMux side of pair
- */
-
-class CMMFDevSoundCIFileBlockLengthDeMux : public CBase,
-			      	   			   public MMMFDevSoundCustomInterfaceDeMuxPlugin
-	{
-public:
-	/**
-	Instantiate a CMMFDevSoundCIFileBlockLengthDeMux class
-	@return a pointer to the new class cast to the DeMux plugin mixin
-	*/
-	static MMMFDevSoundCustomInterfaceDeMuxPlugin* NewL();
-		
-	/**
-	Attempt to open the interface.
-	@param aInterfaceId
-		   The UID of the interface to open.
-	@return a handle to the remote plugin
-	*/
-	virtual TInt OpenInterface(TUid aInterfaceId);
-
-	/**
-	Equivalent to destructor.  Called to destroy plugin.
-	*/
-	virtual void Release();
-	/**
-	Pass destructor key.
-	Called on construction so plugin takes responsibility to call REComSession::DestroyedImplementation()
-	@param aDestructorKey
-	       The Uid returned by REComSession::CreateImplementationL() or similar
-	*/
-	virtual void PassDestructorKey(TUid aDestructorKey);
-	
-	/**
-	Set the target of the custom interface call
-	@param aTarget
-	       The DevSound to call the custom interface on.
-	*/
-	virtual void SetInterfaceTarget(MMMFDevSoundCustomInterfaceTarget* aTarget);
-	
-	/**
-	Complete construction.
-	@param aUtility
-	       The DeMux utility to use
-	*/
-	virtual void CompleteConstructL(MMMFDevSoundCustomInterfaceDeMuxUtility* aUtility);
-
-	/**
-	Refresh the current custom interface connections
-	*/
-	virtual void RefreshL();
-
-	// from MMMFDeMuxInterface
-	/**
-	Open the slave
-	@param aInterface
-		   The UID of the requested interface
-	@param aPackageBuf
-		   A package of data that can be supplied for initialisation
-	@return the result of the operation
-	 */
-	virtual TInt DoOpenSlaveL(TUid aInterface, const TDesC8& aPackageBuf);
-
-	/** 
-	Close the slave
-	@param aHandle
-		   The handle of the slave plugin
-	 */
-	virtual void DoCloseSlaveL(TInt aHandle);
-
-	// original RMessage is supplied so that remote demux plugin can extract necessary details
-	// using DeMux utility
-
-	/**
-	Relay the synchronous custom command onto the slave
-	@param aMessage
-		   The IPC message to be sent to the slave
-	@return the result of the operation
-	 */
-	virtual TInt DoSendSlaveSyncCommandL(const RMmfIpcMessage& aMessage);
-
-	/**
-	Relay the synchronous custom command onto the slave and obtain a result
-	@param aMessage
-		   The IPC message to be sent to the slave
-	@return the result of the operation
-	 */
-	virtual TInt DoSendSlaveSyncCommandResultL(const RMmfIpcMessage& aMessage);
-
-	/**
-	Relay an asynchronous command onto the slave
-	@param aMessage
-		   The IPC message to be sent to the slave
-	 */
-	virtual void DoSendSlaveAsyncCommandL(const RMmfIpcMessage& aMessage);
-
-	/**
-	Relay an asynchronous command onto the slave and obtain a result
-	@param aMessage
-		   The IPC message to be sent to the slave@param aMessage
-	 */
-	virtual void DoSendSlaveAsyncCommandResultL(const RMmfIpcMessage& aMessage);
- 
-protected:
-	~CMMFDevSoundCIFileBlockLengthDeMux();
-	CMMFDevSoundCIFileBlockLengthDeMux();
-
-	// implementation of FileBlockLength custom interface
-	void DoSetFileBlockLengthL(TUint aBlockAlign);
-
-protected:
-	MMMFDevSoundCustomInterfaceDeMuxUtility* iUtility;
-	MMMFDevSoundCustomInterfaceTarget* iTarget;
-	MMMFDevSoundCustomInterfaceFileBlockLength* iFileBlockLengthInterface;
-	TUid iKey;
-
-	};
-
-#endif 
--- a/devsound/devsoundpluginsupport/src/CustomInterfaces/CMMFDevSoundCIFileBlockLengthImplUID.hrh	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-#ifndef __CMMFDEVSOUNDCIFILEBLOCKLENGTHIMPLUID_HRH__
-#define __CMMFDEVSOUNDCIFILEBLOCKLENGTHIMPLUID_HRH__
-
-// These are the ECOM Implementation UIDs for the File Block Length Custom Interface
-
-#define  KMmfUidCIFileBlockLengthDll  	0x102737fd
-
-#define  KMmfUidCIFileBlockLengthMux	0x10273806
-
-#define  KMmfUidCIFileBlockLengthDeMux	0x102737fe
-
-#endif
--- a/devsound/devsoundrefplugin/group/bld.inf	Thu Jun 24 10:37:45 2010 +0100
+++ b/devsound/devsoundrefplugin/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -27,8 +27,8 @@
 ../inc/SwCodecWrapper/mmfSwCodecWrapper.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmf/server/mmfswcodecwrapper.h)
 ../inc/SwCodecWrapper/mmfSwCodecWrappercustomInterfacesUIDs.hrh 	/epoc32/include/mmf/server/mmfswcodecwrappercustominterfacesuids.hrh
 
-../inc/Plugin/mmfHwDeviceImplementationUIDs.hrh				/epoc32/include/mmf/plugin/mmfhwdeviceimplementationuids.hrh
-../inc/Plugin/mmfSBCCodecImplementationUIDs.hrh 			/epoc32/include/mmf/plugin/mmfsbccodecimplementationuids.hrh
+../inc/plugin/mmfHwDeviceImplementationUIDs.hrh				/epoc32/include/mmf/plugin/mmfhwdeviceimplementationuids.hrh
+../inc/plugin/mmfSBCCodecImplementationUIDs.hrh 			/epoc32/include/mmf/plugin/mmfsbccodecimplementationuids.hrh
 
 // Romkit include files
 devsound_refplugin.iby		/epoc32/rom/include/
@@ -48,14 +48,14 @@
 #endif 
 
 //Audio Tone Controller
-../mmpfiles/controller/mmfaudiotonecontroller.mmp
+../mmpfiles/controller/MmfAudioToneController.mmp
 	
 //Sw Codec Wrapper
 ../mmpfiles/swcodecwrapper/mmfswaudiodevice.mmp
 ../mmpfiles/swcodecwrapper/mmfswcodecwrapper.mmp
 
 // SBC encoder
-../mmpfiles/codec/sbcencoder.mmp
+../mmpfiles/codec/SBCEncoder.mmp
 
 //audio 'software' hw device plugins
 ../mmpfiles/plugin/mmfAudioHwDevices.mmp
--- a/devsound/devsoundrefplugin/mmpfiles/plugin/Gsm610HwDevices.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ b/devsound/devsoundrefplugin/mmpfiles/plugin/Gsm610HwDevices.mmp	Fri Jul 09 12:23:13 2010 +0100
@@ -34,7 +34,7 @@
 
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 
-SOURCEPATH	../../src/plugin/audio/gsm610
+SOURCEPATH	../../src/plugin/audio/Gsm610
 source		GSM610.CPP gsm610Proxy.cpp
 
 
--- a/devsound/devsoundrefplugin/mmpfiles/plugin/mmfAudioHwDevices.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ b/devsound/devsoundrefplugin/mmpfiles/plugin/mmfAudioHwDevices.mmp	Fri Jul 09 12:23:13 2010 +0100
@@ -36,7 +36,7 @@
 
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 
-SOURCEPATH		    ../../src/Plugin/Audio
+SOURCEPATH		    ../../src/plugin/audio
 SOURCE	MMFAudioCodecImplementationProxy.cpp
 SOURCE	MMFpcm16ToPcm16HwDevice.cpp
 SOURCE	MMFpcm16ToPcmU8HwDevice.cpp
--- a/devsound/hwdevapi/group/bld.inf	Thu Jun 24 10:37:45 2010 +0100
+++ b/devsound/hwdevapi/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -27,8 +27,8 @@
 //export mmfhwdevice.h/.inl 
 ../inc/mmfhwdevice.h		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/server/mmfhwdevice.h)
 ../inc/MmfHwDevice.inl		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/server/mmfhwdevice.inl)
-../inc/MMFHwDeviceCmds.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmf/server/mmfhwdevicecmds.h)
-../inc/TaskConfig.h		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmf/server/taskconfig.h)		
+../inc/MMFHwDeviceCmds.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/server/mmfhwdevicecmds.h)
+../inc/TaskConfig.h		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/server/taskconfig.h)		
 ../inc/mmfhwdevicesetup.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmf/server/mmfhwdevicesetup.h)
 
 
--- a/devsound/sounddevbt/group/BLD.INF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Note:: This is intended to be included in ...\MMF\group\bld.inf.
-// 
-//
-
-
-
-PRJ_TESTMMPFILES
-
-#include "../group/COMMON.INF"
-
-// Policy
-../MMPFiles/server/MmfBtAudioPolicy.mmp
-
-#include "../PlatSec/bld_include.inf"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/devsound/sounddevbt/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -0,0 +1,27 @@
+// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// Note:: This is intended to be included in ...\MMF\group\bld.inf.
+// 
+//
+
+
+
+PRJ_TESTMMPFILES
+
+#include "../group/COMMON.INF"
+
+// Policy
+../MMPFiles/server/MmfBtAudioPolicy.mmp
+
+#include "../PlatSec/bld_include.inf"
--- a/devsoundextensions/drmaudioplayer/DRMPlayServer/inc/DRMCustomCommandAsyncAO.h	Thu Jun 24 10:37:45 2010 +0100
+++ b/devsoundextensions/drmaudioplayer/DRMPlayServer/inc/DRMCustomCommandAsyncAO.h	Fri Jul 09 12:23:13 2010 +0100
@@ -23,7 +23,7 @@
 
 #include <e32base.h>
 #include "DRMPlaySession.h"
-// #include <MdaAudioSamplePlayer.h>
+// #include <mdaaudiosampleplayer.h>
 
 class CDRMPlayServerSession;
 
--- a/devsoundextensions/effects/Loudness/LoudnessEffect/Src/LoudnessBase.cpp	Thu Jun 24 10:37:45 2010 +0100
+++ b/devsoundextensions/effects/Loudness/LoudnessEffect/Src/LoudnessBase.cpp	Fri Jul 09 12:23:13 2010 +0100
@@ -78,6 +78,7 @@
 	if ( !loudnessProxy )
 		{
 		DEBPRN1("No Adaptation Support - leaving");
+		CleanupStack::Pop(customInterface);
 		User::Leave(KErrNotSupported);
 		}
 
@@ -156,6 +157,7 @@
 	if ( !loudnessProxy )
 		{
 		DEBPRN1("No Adaptation Support - leaving");
+		CleanupStack::Pop(customInterface);
 		User::Leave(KErrNotSupported);
 		}
 
@@ -187,6 +189,7 @@
 	if ( !loudnessProxy )
 		{
 		DEBPRN1("No Adaptation Support - leaving");
+		CleanupStack::Pop(customInterface);
 		User::Leave(KErrNotSupported);
 		}
 
@@ -273,6 +276,7 @@
 	if ( !loudnessProxy )
 		{
 		DEBPRN1("No Adaptation Support - leaving");
+		CleanupStack::Pop(customInterface);
 		User::Leave(KErrNotSupported);
 		}
 
@@ -330,6 +334,7 @@
 	if ( !loudnessProxy )
 		{
 		DEBPRN1("No Adaptation Support - leaving");
+		CleanupStack::Pop(customInterface);
 		User::Leave(KErrNotSupported);
 		}
 
@@ -361,6 +366,7 @@
 	if ( !loudnessProxy )
 		{
 		DEBPRN1("No Adaptation Support - leaving");
+		CleanupStack::Pop(customInterface);
 		User::Leave(KErrNotSupported);
 		}
 
@@ -392,6 +398,7 @@
 	if ( !loudnessProxy )
 		{
 		DEBPRN1("No Adaptation Support - leaving");
+		CleanupStack::Pop(customInterface);
 		User::Leave(KErrNotSupported);
 		}
 
--- a/imagingandcamerafws/camerafw/group/BLD.INF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,116 +0,0 @@
-// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// On board camera API
-// 
-//
-
-/**
- @file
-*/
-
-PRJ_EXPORTS
-../Include/ECam.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(ecam.h)
-../Include/ecamconst.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ecamconst.h)
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-../Include/ecamdef.h /epoc32/include/ecamdef.h
-#endif
-../Include/ECamUids.hrh /epoc32/include/ecamuids.hrh
-../Include/ecamuidsconst.hrh /epoc32/include/ecamuidsconst.hrh
-../Include/ecamuidsdef.hrh /epoc32/include/ecamuidsdef.hrh
-../Include/ecamerrors.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(ecamerrors.h)
-../Include/ecamerrorsconst.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ecamerrorsconst.h)
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-../Include/ecamerrorsdef.h /epoc32/include/ecamerrorsdef.h
-#endif
-../Include/ECam/ECamPlugin.h		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ecam/ecamplugin.h)
-../Include/ECam/ECamInfoPlugin.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ecam/ecaminfoplugin.h)
-../Include/ecamadvsettingsuids.hrh  /epoc32/include/ecamadvsettingsuids.hrh
-../Include/ecamadvsettingsuidsconst.hrh  /epoc32/include/ecamadvsettingsuidsconst.hrh
-../Include/ecamadvsettingsuidsdef.hrh  /epoc32/include/ecamadvsettingsuidsdef.hrh
-../Include/ecamadvsettings.h		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(ecamadvsettings.h)
-../Include/ecamadvsettingsconst.h		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ecamadvsettingsconst.h)
-../Include/ecamadvsettingsdef.h		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ecamadvsettingsdef.h)
-../Include/ecamimageprocessing.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(ecamimageprocessing.h)
-../Include/ecamimageprocessingconst.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ecamimageprocessingconst.h)
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-../Include/ecamimageprocessingdef.h	/epoc32/include/ecamimageprocessingdef.h
-#endif
-../Include/ecamcapturecontrol.h		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ecamcapturecontrol.h)
-../Include/ecamcapturecontrolconst.h		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ecamcapturecontrolconst.h)
-../Include/ecamviewfinder.h    		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ecamviewfinder.h)
-../Include/ecamviewfinderdef.h    		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ecamviewfinderdef.h)
-../Include/ECam/ecamadvsettingsintf.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ecam/ecamadvsettingsintf.h)
-../Include/ECam/ecamcapturecontrolintf.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ecam/ecamcapturecontrolintf.h)
-../Include/ECam/ecamimageprocessingintf.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ecam/ecamimageprocessingintf.h)
-../Include/ECam/ecamviewfinderintf.h   SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ecam/ecamviewfinderintf.h)
-../Include/ECam/implementationfactoryintf.h	 SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ecam/implementationfactoryintf.h) 
-../Include/ECam/ecamadvsettingsintfuids.hrh	/epoc32/include/ecam/ecamadvsettingsintfuids.hrh
-
-../Include/CameraHistogram.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ecam/camerahistogram.h)
-../Include/MCameraHistogram.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ecam/mcamerahistogram.h)
-../Include/CameraOverlay.h		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(ecam/cameraoverlay.h)
-../Include/cameraoverlayconst.h		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ecam/cameraoverlayconst.h)
-../Include/MCameraOverlay.h		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ecam/mcameraoverlay.h)
-../Include/CameraSnapshot.h		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ecam/camerasnapshot.h)
-../Include/MCameraSnapshot.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ecam/mcamerasnapshot.h)
-../Include/ECamCommonUIDs.hrh	/epoc32/include/ecam/ecamcommonuids.hrh
-../Include/ecamcommonuidsconst.hrh	/epoc32/include/ecam/ecamcommonuidsconst.hrh
-../Include/ECamCommonUIDif.hrh	/epoc32/include/ecam/ecamcommonuidif.hrh
-
-../Include/ecamconstants.h		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(ecam/ecamconstants.h)
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-../Include/ecamversion.h		/epoc32/include/ecam/ecamversion.h
-#endif
-
-../Include/ecamdirectviewfinder.h    SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(ecam/ecamdirectviewfinder.h)
-../Include/mcameradirectviewfinder.h   SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ecam/mcameradirectviewfinder.h)
-../Include/ecamdirectviewfinderuids.hrh   /epoc32/include/ecam/ecamdirectviewfinderuids.hrh
-../Include/cameradirectviewfinderuidif.hrh   /epoc32/include/ecam/cameradirectviewfinderuidif.hrh
-
-../bwins/ECamu.def /epoc32/release/wins/ecamu.def
-../eabi/ecamU.def  /epoc32/include/def/eabi/ecamu.def
-
-../bwins/ecamadvsettingsU.def  /epoc32/release/wins/ecamadvsettingsu.def
-../eabi/ecamadvsettingsU.def    /epoc32/include/def/eabi/ecamadvsettingsu.def
-
-../bwins/ecamsnapshotU.DEF  	/epoc32/release/wins/ecamsnapshotu.def
-../bwins/ecamoverlayU.DEF  		/epoc32/release/wins/ecamoverlayu.def
-../bwins/ecamhistogramU.DEF  	/epoc32/release/wins/ecamhistogramu.def
-
-../eabi/ecamsnapshotU.DEF	    /epoc32/include/def/eabi/ecamsnapshotu.def
-../eabi/ecamoverlayU.DEF    	/epoc32/include/def/eabi/ecamoverlayu.def
-../eabi/ecamhistogramU.DEF    	/epoc32/include/def/eabi/ecamhistogramu.def
-
-../bwins/ecamdirectviewfinderU.def  /epoc32/release/wins/ecamdirectviewfinderu.def
-../eabi/ecamdirectviewfinderU.def    /epoc32/include/def/eabi/ecamdirectviewfinderu.def
-
-// ROM  buildsupport
-../Include/ECam.iby  /epoc32/rom/include/ecam.iby
-
-PRJ_MMPFILES
-../mmpfiles/ECam.mmp
-../mmpfiles/ECamPluginSupport.mmp
-../mmpfiles/ECamAdvSettings.mmp
-../mmpfiles/ECamHistogram.mmp
-../mmpfiles/ECamOverlay.mmp
-../mmpfiles/ECamSnapshot.mmp
-../mmpfiles/ECamDirectViewFinder.mmp
-
-PRJ_TESTMMPFILES
-//removed due to techview dependency
-//../mmpfiles/TestCameraApp.mmp
-
-
-
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/imagingandcamerafws/camerafw/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -0,0 +1,116 @@
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// On board camera API
+// 
+//
+
+/**
+ @file
+*/
+
+PRJ_EXPORTS
+../Include/ECam.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(ecam.h)
+../Include/ecamconst.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ecamconst.h)
+#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+../Include/ecamdef.h /epoc32/include/ecamdef.h
+#endif
+../Include/ECamUids.hrh /epoc32/include/ecamuids.hrh
+../Include/ecamuidsconst.hrh /epoc32/include/ecamuidsconst.hrh
+../Include/ecamuidsdef.hrh /epoc32/include/ecamuidsdef.hrh
+../Include/ecamerrors.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(ecamerrors.h)
+../Include/ecamerrorsconst.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ecamerrorsconst.h)
+#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+../Include/ecamerrorsdef.h /epoc32/include/ecamerrorsdef.h
+#endif
+../Include/ECam/ECamPlugin.h		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ecam/ecamplugin.h)
+../Include/ECam/ECamInfoPlugin.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ecam/ecaminfoplugin.h)
+../Include/ecamadvsettingsuids.hrh  /epoc32/include/ecamadvsettingsuids.hrh
+../Include/ecamadvsettingsuidsconst.hrh  /epoc32/include/ecamadvsettingsuidsconst.hrh
+../Include/ecamadvsettingsuidsdef.hrh  /epoc32/include/ecamadvsettingsuidsdef.hrh
+../Include/ecamadvsettings.h		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(ecamadvsettings.h)
+../Include/ecamadvsettingsconst.h		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ecamadvsettingsconst.h)
+../Include/ecamadvsettingsdef.h		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ecamadvsettingsdef.h)
+../Include/ecamimageprocessing.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(ecamimageprocessing.h)
+../Include/ecamimageprocessingconst.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ecamimageprocessingconst.h)
+#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+../Include/ecamimageprocessingdef.h	/epoc32/include/ecamimageprocessingdef.h
+#endif
+../Include/ecamcapturecontrol.h		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ecamcapturecontrol.h)
+../Include/ecamcapturecontrolconst.h		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ecamcapturecontrolconst.h)
+../Include/ecamviewfinder.h    		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ecamviewfinder.h)
+../Include/ecamviewfinderdef.h    		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ecamviewfinderdef.h)
+../Include/ECam/ecamadvsettingsintf.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ecam/ecamadvsettingsintf.h)
+../Include/ECam/ecamcapturecontrolintf.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ecam/ecamcapturecontrolintf.h)
+../Include/ECam/ecamimageprocessingintf.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ecam/ecamimageprocessingintf.h)
+../Include/ECam/ecamviewfinderintf.h   SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ecam/ecamviewfinderintf.h)
+../Include/ECam/implementationfactoryintf.h	 SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ecam/implementationfactoryintf.h) 
+../Include/ECam/ecamadvsettingsintfuids.hrh	/epoc32/include/ecam/ecamadvsettingsintfuids.hrh
+
+../Include/CameraHistogram.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ecam/camerahistogram.h)
+../Include/MCameraHistogram.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ecam/mcamerahistogram.h)
+../Include/CameraOverlay.h		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(ecam/cameraoverlay.h)
+../Include/cameraoverlayconst.h		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ecam/cameraoverlayconst.h)
+../Include/MCameraOverlay.h		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ecam/mcameraoverlay.h)
+../Include/CameraSnapshot.h		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ecam/camerasnapshot.h)
+../Include/MCameraSnapshot.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ecam/mcamerasnapshot.h)
+../Include/ECamCommonUIDs.hrh	/epoc32/include/ecam/ecamcommonuids.hrh
+../Include/ecamcommonuidsconst.hrh	/epoc32/include/ecam/ecamcommonuidsconst.hrh
+../Include/ECamCommonUIDif.hrh	/epoc32/include/ecam/ecamcommonuidif.hrh
+
+../Include/ecamconstants.h		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(ecam/ecamconstants.h)
+#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+../Include/ecamversion.h		/epoc32/include/ecam/ecamversion.h
+#endif
+
+../Include/ecamdirectviewfinder.h    SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(ecam/ecamdirectviewfinder.h)
+../Include/mcameradirectviewfinder.h   SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ecam/mcameradirectviewfinder.h)
+../Include/ecamdirectviewfinderuids.hrh   /epoc32/include/ecam/ecamdirectviewfinderuids.hrh
+../Include/cameradirectviewfinderuidif.hrh   /epoc32/include/ecam/cameradirectviewfinderuidif.hrh
+
+../bwins/ECamu.def /epoc32/release/wins/ecamu.def
+../eabi/ecamU.def  /epoc32/include/def/eabi/ecamu.def
+
+../bwins/ecamadvsettingsU.def  /epoc32/release/wins/ecamadvsettingsu.def
+../eabi/ecamadvsettingsU.def    /epoc32/include/def/eabi/ecamadvsettingsu.def
+
+../bwins/ecamsnapshotU.DEF  	/epoc32/release/wins/ecamsnapshotu.def
+../bwins/ecamoverlayU.DEF  		/epoc32/release/wins/ecamoverlayu.def
+../bwins/ecamhistogramU.DEF  	/epoc32/release/wins/ecamhistogramu.def
+
+../eabi/ecamsnapshotU.DEF	    /epoc32/include/def/eabi/ecamsnapshotu.def
+../eabi/ecamoverlayU.DEF    	/epoc32/include/def/eabi/ecamoverlayu.def
+../eabi/ecamhistogramU.DEF    	/epoc32/include/def/eabi/ecamhistogramu.def
+
+../bwins/ecamdirectviewfinderU.def  /epoc32/release/wins/ecamdirectviewfinderu.def
+../eabi/ecamdirectviewfinderU.def    /epoc32/include/def/eabi/ecamdirectviewfinderu.def
+
+// ROM  buildsupport
+../Include/ECam.iby  /epoc32/rom/include/ecam.iby
+
+PRJ_MMPFILES
+../mmpfiles/ECam.mmp
+../mmpfiles/ECamPluginSupport.mmp
+../mmpfiles/ECamAdvSettings.mmp
+../mmpfiles/ECamHistogram.mmp
+../mmpfiles/ECamOverlay.mmp
+../mmpfiles/ECamSnapshot.mmp
+../mmpfiles/ECamDirectViewFinder.mmp
+
+PRJ_TESTMMPFILES
+//removed due to techview dependency
+//../mmpfiles/TestCameraApp.mmp
+
+
+
+
--- a/imagingandcamerafws/camerafw/group/multimedia_ecam_framework.mrp	Thu Jun 24 10:37:45 2010 +0100
+++ b/imagingandcamerafws/camerafw/group/multimedia_ecam_framework.mrp	Fri Jul 09 12:23:13 2010 +0100
@@ -1,17 +1,6 @@
+#multimedia_ecam_framework.mrp
 #
-# Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description: 
+#Copyright (c) Symbian Software Ltd 2007.  All rights reserved.
 #
 
 component	multimedia_ecam_framework
--- a/imagingandcamerafws/cameraunittest/group/BLD.INF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-
-PRJ_MMPFILES
-../group/TSU_ECM_API.mmp
-../group/TSU_ECM_ADV.mmp
-../group/ECamUnitTestPlugin.mmp
-../group/ecamramplugin.mmp
-../group/copyfile.mmp
-../group/tsu_ecm_ram.mmp
-
-PRJ_EXPORTS
-../scripts/TSU_ECM_API.script c:/mm/tsu_ecm_api.script
-../scripts/TSU_ECM_ADV_ALLOC.script c:/mm/tsu_ecm_adv_alloc.script
-../scripts/TSU_ECM_ADV.script c:/mm/tsu_ecm_adv.script
-../scripts/tsu_ecm_ram.script c:/mm/tsu_ecm_ram.script
-
-// .iby
-../inc/tsu_ecm_api.iby	/epoc32/rom/include/tsu_ecm_api.iby
-../inc/tsu_ecm_adv.iby	/epoc32/rom/include/tsu_ecm_adv.iby
-../inc/tsu_ecm_ram.iby	/epoc32/rom/include/tsu_ecm_ram.iby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/imagingandcamerafws/cameraunittest/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -0,0 +1,37 @@
+// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+
+PRJ_TESTMMPFILES
+../group/TSU_ECM_API.mmp
+../group/TSU_ECM_ADV.mmp
+../group/ECamUnitTestPlugin.mmp
+../group/ecamramplugin.mmp
+../group/copyfile.mmp
+../group/tsu_ecm_ram.mmp
+
+PRJ_TESTEXPORTS
+../scripts/TSU_ECM_API.script c:/mm/tsu_ecm_api.script
+../scripts/TSU_ECM_ADV_ALLOC.script c:/mm/tsu_ecm_adv_alloc.script
+../scripts/TSU_ECM_ADV.script c:/mm/tsu_ecm_adv.script
+../scripts/tsu_ecm_ram.script c:/mm/tsu_ecm_ram.script
+
+// .iby
+../inc/tsu_ecm_api.iby	/epoc32/rom/include/tsu_ecm_api.iby
+../inc/tsu_ecm_api_excl_test.iby	/epoc32/rom/include/tsu_ecm_api_excl_test.iby
+../inc/tsu_ecm_adv.iby	/epoc32/rom/include/tsu_ecm_adv.iby
+../inc/tsu_ecm_adv_excl_test.iby	/epoc32/rom/include/tsu_ecm_adv_excl_test.iby
+../inc/tsu_ecm_ram.iby	/epoc32/rom/include/tsu_ecm_ram.iby
+../inc/tsu_ecm_ram_excl_test.iby	/epoc32/rom/include/tsu_ecm_ram_excl_test.iby
--- a/imagingandcamerafws/cameraunittest/inc/tsu_ecm_adv.iby	Thu Jun 24 10:37:45 2010 +0100
+++ b/imagingandcamerafws/cameraunittest/inc/tsu_ecm_adv.iby	Fri Jul 09 12:23:13 2010 +0100
@@ -18,13 +18,9 @@
 
 // debug build
 
-file=ABI_DIR\DEBUG_DIR\TSU_ECM_ADV.dll 	System\Libs\TSU_ECM_ADV.dll
+#include <tsu_ecm_adv_excl_test.iby>
 
 data=EPOCROOT##epoc32\data\c\mm\TSU_ECM_ADV_ALLOC.script     	TSU_ECM_ADV_ALLOC.script
 data=EPOCROOT##epoc32\data\c\mm\TSU_ECM_ADV.script     	TSU_ECM_ADV.script
 
-#ifndef SYMBIAN_EXCLUDE_ECAM_UNITTESTPLUGIN
-ECOM_PLUGIN(ECamUnitTestPlugin.dll,102070CF.rsc)
-#endif 
-
 #endif //TSU_ECM_ADV_IBY
--- a/imagingandcamerafws/cameraunittest/inc/tsu_ecm_api.iby	Thu Jun 24 10:37:45 2010 +0100
+++ b/imagingandcamerafws/cameraunittest/inc/tsu_ecm_api.iby	Fri Jul 09 12:23:13 2010 +0100
@@ -16,9 +16,7 @@
 #ifndef  TSU_ECM_API_IBY
 #define  TSU_ECM_API_IBY
 
-// debug build
-
-file=ABI_DIR\DEBUG_DIR\TSU_ECM_API.dll 	System\Libs\TSU_ECM_API.dll
+#include <tsu_ecm_api_excl_test.iby>
 
 data=EPOCROOT##epoc32\data\c\mm\TSU_ECM_API.script     	TSU_ECM_API.script
 
--- a/imagingandcamerafws/cameraunittest/inc/tsu_ecm_ram.iby	Thu Jun 24 10:37:45 2010 +0100
+++ b/imagingandcamerafws/cameraunittest/inc/tsu_ecm_ram.iby	Fri Jul 09 12:23:13 2010 +0100
@@ -16,13 +16,8 @@
 #ifndef  TSU_ECM_RAM_IBY
 #define  TSU_ECM_RAM_IBY
 
-file=ABI_DIR\DEBUG_DIR\tsu_ecm_ram.dll 	System\Libs\tsu_ecm_ram.dll
+#include <tsu_ecm_ram_excl_test.iby>
 
 data=EPOCROOT##epoc32\data\c\mm\tsu_ecm_ram.script     	tsu_ecm_ram.script
 
-data=ABI_DIR\DEBUG_DIR\ecamramplugin.dll		testplugins\ecamramplugin.dll
-data=ZRESOURCE\Plugins\ecamramplugin.rsc		testplugins\ecamramplugin.rsc
-
-file=ABI_DIR\DEBUG_DIR\copyfile.exe    copyfile.exe
-
 #endif // TSU_ECM_RAM_IBY
--- a/imagingandcamerafws/imagingfws/BitmapTransform/group/BLD.inf	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-// Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-PRJ_EXPORTS
-../inc/BitmapTransforms.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(bitmaptransforms.h)
-../inc/BitmapTransforms.inl SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(bitmaptransforms.inl)
-../inc/BitmTrans/BitmTransPlugin.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bitmtrans/bitmtransplugin.h)
-../inc/BitmTrans/BitmTransUids.hrh	/epoc32/include/bitmtrans/bitmtransuids.hrh
-../inc/BitmTrans/BitmTransPanic.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(bitmtrans/bitmtranspanic.h)
-
-
-// ROM  buildsupport
-../inc/BitmapTransforms.iby  /epoc32/rom/include/bitmaptransforms.iby
-
-PRJ_MMPFILES
-../MmpFiles/BitmapTransforms.mmp
-
-
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/imagingandcamerafws/imagingfws/BitmapTransform/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -0,0 +1,31 @@
+// Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRJ_EXPORTS
+../inc/BitmapTransforms.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(bitmaptransforms.h)
+../inc/BitmapTransforms.inl SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(bitmaptransforms.inl)
+../inc/BitmTrans/BitmTransPlugin.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bitmtrans/bitmtransplugin.h)
+../inc/BitmTrans/BitmTransUids.hrh	/epoc32/include/bitmtrans/bitmtransuids.hrh
+../inc/BitmTrans/BitmTransPanic.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(bitmtrans/bitmtranspanic.h)
+
+
+// ROM  buildsupport
+../inc/BitmapTransforms.iby  /epoc32/rom/include/bitmaptransforms.iby
+
+PRJ_MMPFILES
+../MmpFiles/BitmapTransforms.mmp
+
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/imagingandcamerafws/imagingfws/GifScaler/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -0,0 +1,40 @@
+// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// This file basically provides the information required for building the whole of a component
+// C & C++ style comments are allowed in this file because it's passed through the C++ preprocessor
+// Examples are provided below of the kind of things we're expecting
+// Gif scaling API
+// 
+//
+
+/**
+ @file
+*/
+
+PRJ_PLATFORMS
+// specify the platforms your component needs to be built for here
+// defaults to WINS MARM so you can ignore this if you just build these
+DEFAULT
+
+PRJ_EXPORTS
+// specify the source file followed by its destination here
+// copy will be used to copy the source file to its destination
+../inc/gifscaler.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(gifscaler.h)
+// ROM  buildsupport
+../inc/GifScaler.iby  /epoc32/rom/include/gifscaler.iby
+
+PRJ_MMPFILES
+../MmpFiles/GifScaler.mmp
+
+
--- a/imagingandcamerafws/imagingfws/GifScaler/group/bld_include.inf	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// This file basically provides the information required for building the whole of a component
-// C & C++ style comments are allowed in this file because it's passed through the C++ preprocessor
-// Examples are provided below of the kind of things we're expecting
-// Gif scaling API
-// 
-//
-
-/**
- @file
-*/
-
-PRJ_PLATFORMS
-// specify the platforms your component needs to be built for here
-// defaults to WINS MARM so you can ignore this if you just build these
-DEFAULT
-
-PRJ_EXPORTS
-// specify the source file followed by its destination here
-// copy will be used to copy the source file to its destination
-../inc/gifscaler.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(gifscaler.h)
-// ROM  buildsupport
-../inc/GifScaler.iby  /epoc32/rom/include/gifscaler.iby
-
-PRJ_MMPFILES
-../MmpFiles/GifScaler.mmp
-
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/imagingandcamerafws/imagingfws/ImageTransform/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -0,0 +1,44 @@
+// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// This file basically provides the information required for building the whole of a component
+// C & C++ style comments are allowed in this file because it's passed through the C++ preprocessor
+// Examples are provided below of the kind of things we're expecting
+// 
+//
+
+PRJ_PLATFORMS
+// specify the platforms your component needs to be built for here
+// defaults to WINS MARM so you can ignore this if you just build these
+DEFAULT
+
+PRJ_EXPORTS
+// specify the source file followed by its destination here
+// copy will be used to copy the source file to its destination
+../inc/ImageTransform.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(imagetransform.h)
+../inc/icl/ImageTransform.hrh		/epoc32/include/icl/imagetransform.hrh
+../inc/icl/ImageTransformPlugin.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(icl/imagetransformplugin.h)
+../inc/icl/ImageTransformPanicCodes.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(icl/imagetransformpaniccodes.h)
+../inc/icl/ImageTransformPluginExt.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(icl/imagetransformpluginext.h)
+../inc/icl/squeezetransformextension.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(icl/squeezetransformextension.h)
+../inc/icl/orientationtransformextension.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(icl/orientationtransformextension.h)
+../inc/icl/overlaytransformextension.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(icl/overlaytransformextension.h)
+
+// ROM  buildsupport
+../inc/ImageTransform.iby  /epoc32/rom/include/imagetransform.iby
+
+PRJ_MMPFILES
+../MmpFiles/ImageTransform.mmp
+../MmpFiles/ImageTransformResolver.mmp
+
+
--- a/imagingandcamerafws/imagingfws/ImageTransform/group/bld_include.inf	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// This file basically provides the information required for building the whole of a component
-// C & C++ style comments are allowed in this file because it's passed through the C++ preprocessor
-// Examples are provided below of the kind of things we're expecting
-// 
-//
-
-PRJ_PLATFORMS
-// specify the platforms your component needs to be built for here
-// defaults to WINS MARM so you can ignore this if you just build these
-DEFAULT
-
-PRJ_EXPORTS
-// specify the source file followed by its destination here
-// copy will be used to copy the source file to its destination
-../inc/ImageTransform.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(imagetransform.h)
-../inc/icl/ImageTransform.hrh		/epoc32/include/icl/imagetransform.hrh
-../inc/icl/ImageTransformPlugin.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(icl/imagetransformplugin.h)
-../inc/icl/ImageTransformPanicCodes.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(icl/imagetransformpaniccodes.h)
-../inc/icl/ImageTransformPluginExt.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(icl/imagetransformpluginext.h)
-../inc/icl/squeezetransformextension.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(icl/squeezetransformextension.h)
-../inc/icl/orientationtransformextension.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(icl/orientationtransformextension.h)
-../inc/icl/overlaytransformextension.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(icl/overlaytransformextension.h)
-
-// ROM  buildsupport
-../inc/ImageTransform.iby  /epoc32/rom/include/imagetransform.iby
-
-PRJ_MMPFILES
-../MmpFiles/ImageTransform.mmp
-../MmpFiles/ImageTransformResolver.mmp
-
-
--- a/imagingandcamerafws/imagingfws/MediaClientImage/Group/BLD.INF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-// Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// This file basically provides the information required for building the whole of a component
-// C & C++ style comments are allowed in this file because it's passed through the C++ preprocessor
-// Examples are provided below of the kind of things we're expecting
-// 
-//
-
-
-PRJ_PLATFORMS
-// specify the platforms your component needs to be built for here
-
-DEFAULT	
-
-PRJ_EXPORTS
-
-../Include/MdaImageConverter.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mdaimageconverter.h)
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-../Include/MdaFrameInfo.h /epoc32/include/mdaframeinfo.h
-#endif
-../Include/MediaSvrConvert.iby    /epoc32/rom/include/ //
-
-PRJ_MMPFILES
-// specify the .mmp files required for building the important component releasables
-// note that you should specify any .mmp files for test programs further down the file.
-//
-// It's best if the .MMP files are specified in the order in which the components are
-// built, but that eventually shouldn't matter
-//
-// Use C++ style #defines to denote that a component is only built for a particular platform
-//
-// specify "tidy" if the component you need to build doesn't need to be released to
-// the rest of the company
-// specify "ignore" if the MMP file exists but should be ignored - William wants this!
-
-../MmpFiles/Client/MediaClientImage.mmp		// Client image utilities
-
-
-PRJ_TESTMMPFILES
-// specify the .mmp files required for building any test programs here
-//
-// you can specify "manual" to denote that a test should be listed in a generated
-// batch file for running a group of tests which require user input during testing.
-// you can specify "support" to denote that a file is a test support file and shouldn't
-// be listed in a batch file for running a group of tests
-// By default, each test will be listed in a batch file for running a group of tests
-// which can be left to run without requiring watching over by the person running the tests,
-// i.e. tests where no user input is required.  The default will apply if neither "manual"
-// or "support" is specified.
-
-PRJ_TESTEXPORTS
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/imagingandcamerafws/imagingfws/MediaClientImage/Group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -0,0 +1,63 @@
+// Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// This file basically provides the information required for building the whole of a component
+// C & C++ style comments are allowed in this file because it's passed through the C++ preprocessor
+// Examples are provided below of the kind of things we're expecting
+// 
+//
+
+
+PRJ_PLATFORMS
+// specify the platforms your component needs to be built for here
+
+DEFAULT	
+
+PRJ_EXPORTS
+
+../Include/MdaImageConverter.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mdaimageconverter.h)
+#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+../Include/MdaFrameInfo.h /epoc32/include/mdaframeinfo.h
+#endif
+../Include/MediaSvrConvert.iby    /epoc32/rom/include/ //
+
+PRJ_MMPFILES
+// specify the .mmp files required for building the important component releasables
+// note that you should specify any .mmp files for test programs further down the file.
+//
+// It's best if the .MMP files are specified in the order in which the components are
+// built, but that eventually shouldn't matter
+//
+// Use C++ style #defines to denote that a component is only built for a particular platform
+//
+// specify "tidy" if the component you need to build doesn't need to be released to
+// the rest of the company
+// specify "ignore" if the MMP file exists but should be ignored - William wants this!
+
+../MmpFiles/Client/MediaClientImage.mmp		// Client image utilities
+
+
+PRJ_TESTMMPFILES
+// specify the .mmp files required for building any test programs here
+//
+// you can specify "manual" to denote that a test should be listed in a generated
+// batch file for running a group of tests which require user input during testing.
+// you can specify "support" to denote that a file is a test support file and shouldn't
+// be listed in a batch file for running a group of tests
+// By default, each test will be listed in a batch file for running a group of tests
+// which can be left to run without requiring watching over by the person running the tests,
+// i.e. tests where no user input is required.  The default will apply if neither "manual"
+// or "support" is specified.
+
+PRJ_TESTEXPORTS
+
--- a/imagingandcamerafws/imagingfws/group/BLD.INF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,140 +0,0 @@
-// Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Image conversion library
-// This file basically provides the information required for building the whole of a component
-// C & C++ style comments are allowed in this file because it's passed through the C++ preprocessor
-// Examples are provided below of the kind of things we're expecting
-// 
-//
-
-/**
- @file
-*/
- 
-
-// Include imagedisplay, imagetransform, imageprocessor, panorama and gifscaler sub-components
-#include "../GifScaler/group/bld_include.inf" 
-#include "../ImageDisplay/group/bld.inf"
-#include "../ImageTransform/group/bld_include.inf"
-#include "../ImageProcessor/group/bld.inf"
-#include "../panorama/group/bld.inf"
-
-PRJ_PLATFORMS
-// specify the platforms your component needs to be built for here
-// defaults to WINS MARM so you can ignore this if you just build these
-DEFAULT
-
-PRJ_EXPORTS
-// specify the source file followed by its destination here
-// copy will be used to copy the source file to its destination
-// Public include files
-../inc/ImageConversion.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(imageconversion.h)
-../inc/iclrecognizerutil.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(iclrecognizerutil.h)
-
-../inc/ICLExif.h		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(iclexif.h)
-../ExifUtility/inc/ExifUtility.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(exifutility.h)
-../inc/ICLExifImageFrame.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(iclexifimageframe.h)
-../inc/imageframe.h		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(imageframe.h)
-../inc/imageframeconst.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(imageframeconst.h)
-
-../inc/icl/ImageCodecData.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(icl/imagecodecdata.h)
-../inc/icl/imageprocessor.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(icl/imageprocessor.h)
-../inc/icl/ImageCodec.h		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(icl/imagecodec.h)
-../inc/icl/imagecodecdef.h		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(icl/imagecodecdef.h)
-../inc/icl/ImageData.h		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(icl/imagedata.h)
-../inc/icl/ImagePlugin.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(icl/imageplugin.h)
-../inc/icl/ImageConstruct.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(icl/imageconstruct.h)
-../inc/icl/ICL_PropertyUIDS.h		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(icl/icl_propertyuids.h)
-../inc/icl/imageconversionextension.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(icl/imageconversionextension.h)
-../inc/icl/imageconversionextensionintf.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(icl/imageconversionextensionintf.h)
-
-../inc/icl/ICL_UIDS.hrh		/epoc32/include/icl/icl_uids.hrh
-../inc/icl/icl_uids_const.hrh		/epoc32/include/icl/icl_uids_const.hrh
-../inc/icl/icl_uids_def.hrh		/epoc32/include/icl/icl_uids_def.hrh
-
-../inc/icl/ICL_PropertyUIDS.hrh		/epoc32/include/icl/icl_propertyuids.hrh
-../inc/imageframeformats.hrh	/epoc32/include/imageframeformats.hrh
-../inc/imageframeconst.hrh	/epoc32/include/imageframeconst.hrh
-
-// ROM  buildsupport
-../group/ImageConversion.iby	/epoc32/rom/include/imageconversion.iby
-../ExifUtility/inc/ExifUtility.iby					/epoc32/rom/include/exifutility.iby
-
-
-PRJ_MMPFILES
-// specify the .mmp files required for building the important component releasables
-// note that you should specify any .mmp files for test programs further down the file.
-//
-// It's best if the .MMP files are specified in the order in which the components are
-// built, but that eventually shouldn't matter
-//
-// Use C++ style #defines to denote that a component is only built for a particular platform
-//
-// specify "tidy" if the component you need to build doesn't need to be released to
-// the rest of the company
-// specify "ignore" if the MMP file exists but should be ignored - William wants this!
-
-
-// Firstly build the image conversion library
-../group/ImageProcessorPerf.mmp
-../group/ImageConversion.mmp
-../group/ExifLibStatic.mmp
-
-// Now build the image conversion custom resolver
-../group/ImageConversionResolver.mmp
-
-// Now build the image recognizer
-../group/RecIcl.mmp
-
-../group/JPEGExifPlugin.mmp
-../ExifUtility/mmpfiles/ExifUtility.mmp
-../group/JPEGImageFramePlugin.mmp
-
-
-
-PRJ_TESTMMPFILES
-// specify the .mmp files required for building any test programs here
-//
-// you can specify "manual" to denote that a test should be listed in a generated
-// batch file for running a group of tests which require user input during testing.
-// you can specify "support" to denote that a file is a test support file and shouldn't
-// be listed in a batch file for running a group of tests
-// By default, each test will be listed in a batch file for running a group of tests
-// which can be left to run without requiring watching over by the person running the tests,
-// i.e. tests where no user input is required.  The default will apply if neither "manual"
-// or "support" is specified.
-
-../group/TImageViewer.mmp
-../group/TImageDisplay.mmp
-../group/TImageTran.mmp
-../group/tphotoeditor.mmp
-
-PRJ_TESTEXPORTS
-// specify the source file followed by its destination here
-// copy will be used to copsy the source file to its destination
-
-// Romkit include files - additional test files
-../group/ImageConversionTest.iby			/epoc32/rom/include/imageconversiontest.iby
-../group/ImageConversionProfile.iby			/epoc32/rom/include/imageconversionprofile.iby
-../group/TImageViewer.iby					/epoc32/rom/include/timageviewer.iby
-../group/TImageDisplay.iby					/epoc32/rom/include/timagedisplay.iby
-../group/timagetran.iby					/epoc32/rom/include/timagetran.iby
-../group/tphotoeditor.iby					/epoc32/rom/include/tphotoeditor.iby
-
-
-PRJ_TESTEXPORTS
-// BitmapTransforms
-#include "../BitmapTransform/group/BLD.inf"
-// MediaClientImage
-#include "../MediaClientImage/Group/BLD.INF"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/imagingandcamerafws/imagingfws/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -0,0 +1,140 @@
+// Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// Image conversion library
+// This file basically provides the information required for building the whole of a component
+// C & C++ style comments are allowed in this file because it's passed through the C++ preprocessor
+// Examples are provided below of the kind of things we're expecting
+// 
+//
+
+/**
+ @file
+*/
+ 
+
+// Include imagedisplay, imagetransform, imageprocessor, panorama and gifscaler sub-components
+#include "../GifScaler/group/bld.inf" 
+#include "../ImageDisplay/group/bld.inf"
+#include "../ImageTransform/group/bld.inf"
+#include "../ImageProcessor/group/bld.inf"
+#include "../panorama/group/bld.inf"
+
+PRJ_PLATFORMS
+// specify the platforms your component needs to be built for here
+// defaults to WINS MARM so you can ignore this if you just build these
+DEFAULT
+
+PRJ_EXPORTS
+// specify the source file followed by its destination here
+// copy will be used to copy the source file to its destination
+// Public include files
+../inc/ImageConversion.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(imageconversion.h)
+../inc/iclrecognizerutil.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(iclrecognizerutil.h)
+
+../inc/ICLExif.h		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(iclexif.h)
+../ExifUtility/inc/ExifUtility.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(exifutility.h)
+../inc/ICLExifImageFrame.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(iclexifimageframe.h)
+../inc/imageframe.h		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(imageframe.h)
+../inc/imageframeconst.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(imageframeconst.h)
+
+../inc/icl/ImageCodecData.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(icl/imagecodecdata.h)
+../inc/icl/imageprocessor.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(icl/imageprocessor.h)
+../inc/icl/ImageCodec.h		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(icl/imagecodec.h)
+../inc/icl/imagecodecdef.h		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(icl/imagecodecdef.h)
+../inc/icl/ImageData.h		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(icl/imagedata.h)
+../inc/icl/ImagePlugin.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(icl/imageplugin.h)
+../inc/icl/ImageConstruct.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(icl/imageconstruct.h)
+../inc/icl/ICL_PropertyUIDS.h		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(icl/icl_propertyuids.h)
+../inc/icl/imageconversionextension.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(icl/imageconversionextension.h)
+../inc/icl/imageconversionextensionintf.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(icl/imageconversionextensionintf.h)
+
+../inc/icl/ICL_UIDS.hrh		/epoc32/include/icl/icl_uids.hrh
+../inc/icl/icl_uids_const.hrh		/epoc32/include/icl/icl_uids_const.hrh
+../inc/icl/icl_uids_def.hrh		/epoc32/include/icl/icl_uids_def.hrh
+
+../inc/icl/ICL_PropertyUIDS.hrh		/epoc32/include/icl/icl_propertyuids.hrh
+../inc/imageframeformats.hrh	/epoc32/include/imageframeformats.hrh
+../inc/imageframeconst.hrh	/epoc32/include/imageframeconst.hrh
+
+// ROM  buildsupport
+../group/ImageConversion.iby	/epoc32/rom/include/imageconversion.iby
+../ExifUtility/inc/ExifUtility.iby					/epoc32/rom/include/exifutility.iby
+
+
+PRJ_MMPFILES
+// specify the .mmp files required for building the important component releasables
+// note that you should specify any .mmp files for test programs further down the file.
+//
+// It's best if the .MMP files are specified in the order in which the components are
+// built, but that eventually shouldn't matter
+//
+// Use C++ style #defines to denote that a component is only built for a particular platform
+//
+// specify "tidy" if the component you need to build doesn't need to be released to
+// the rest of the company
+// specify "ignore" if the MMP file exists but should be ignored - William wants this!
+
+
+// Firstly build the image conversion library
+../group/ImageProcessorPerf.mmp
+../group/ImageConversion.mmp
+../group/ExifLibStatic.mmp
+
+// Now build the image conversion custom resolver
+../group/ImageConversionResolver.mmp
+
+// Now build the image recognizer
+../group/RecIcl.mmp
+
+../group/JPEGExifPlugin.mmp
+../ExifUtility/mmpfiles/ExifUtility.mmp
+../group/JPEGImageFramePlugin.mmp
+
+
+
+PRJ_TESTMMPFILES
+// specify the .mmp files required for building any test programs here
+//
+// you can specify "manual" to denote that a test should be listed in a generated
+// batch file for running a group of tests which require user input during testing.
+// you can specify "support" to denote that a file is a test support file and shouldn't
+// be listed in a batch file for running a group of tests
+// By default, each test will be listed in a batch file for running a group of tests
+// which can be left to run without requiring watching over by the person running the tests,
+// i.e. tests where no user input is required.  The default will apply if neither "manual"
+// or "support" is specified.
+
+../group/TImageViewer.mmp
+../group/TImageDisplay.mmp
+../group/TImageTran.mmp
+../group/tphotoeditor.mmp
+
+PRJ_TESTEXPORTS
+// specify the source file followed by its destination here
+// copy will be used to copsy the source file to its destination
+
+// Romkit include files - additional test files
+../group/ImageConversionTest.iby			/epoc32/rom/include/imageconversiontest.iby
+../group/ImageConversionProfile.iby			/epoc32/rom/include/imageconversionprofile.iby
+../group/TImageViewer.iby					/epoc32/rom/include/timageviewer.iby
+../group/TImageDisplay.iby					/epoc32/rom/include/timagedisplay.iby
+../group/timagetran.iby					/epoc32/rom/include/timagetran.iby
+../group/tphotoeditor.iby					/epoc32/rom/include/tphotoeditor.iby
+
+
+PRJ_TESTEXPORTS
+// BitmapTransforms
+#include "../BitmapTransform/group/bld.inf"
+// MediaClientImage
+#include "../MediaClientImage/Group/bld.inf"
--- a/imagingandcamerafws/imagingfws/inc/ImageConversion.h	Thu Jun 24 10:37:45 2010 +0100
+++ b/imagingandcamerafws/imagingfws/inc/ImageConversion.h	Fri Jul 09 12:23:13 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -340,7 +340,15 @@
 		
 		Requests that codec applies the auto rotation when decoding according to the orientation tag in the image Exif header.
 		*/
-		EOptionAutoRotate = 0x040000
+		EOptionAutoRotate = 0x040000,
+
+		/**
+		@publishedPartner
+		@prototype
+		
+		Requests the Codec to do optimised partial image decoding, whenever partial decoding is needed.
+		*/
+		EOptionOptimisedPartialImageDecoding = 0x80000
 		};
 
 	/**
--- a/imagingandcamerafws/imagingfws/inc/icl/ICL_PropertyUIDS.h	Thu Jun 24 10:37:45 2010 +0100
+++ b/imagingandcamerafws/imagingfws/inc/icl/ICL_PropertyUIDS.h	Fri Jul 09 12:23:13 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -98,6 +98,12 @@
 */ 
 const TUid KUidJPGAutoRotateSupport   = {KUidJPGAutoRotateSupportValue};
 
+/** 
+Identifier for optimised partial decoding support property.
+ @see KUidJPGOptimisedPartialDecodingSupportValue
+*/ 
+const TUid KUidJPGOptimisedPartialDecodingSupport = {KUidJPGOptimisedPartialDecodingSupportValue};
+
 /**
 Identifier for an ICL Extension. This is used in the opaque_data section of an ICL
 codec plugin as part of a pair of values "KUidICLExtension <extension_flags_modifier>"
--- a/imagingandcamerafws/imagingfws/inc/icl/ICL_PropertyUIDS.hrh	Thu Jun 24 10:37:45 2010 +0100
+++ b/imagingandcamerafws/imagingfws/inc/icl/ICL_PropertyUIDS.hrh	Fri Jul 09 12:23:13 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -89,6 +89,12 @@
 */
 #define KUidJPGAutoRotateSupportValue	0x10287049
 
+/** 
+Defines the numerical value for KUidJPGOptimisedPartialDecodingSupport.
+ @see KUidJPGOptimisedPartialDecodingSupport
+*/
+#define KUidJPGOptimisedPartialDecodingSupportValue 0x2002BCBD
+
 /**
 Defines the numerical value for KUidICLExtension.
  @see KUidICLExtension
--- a/imagingandcamerafws/imagingfws/src/ImageResolverAPI.cpp	Thu Jun 24 10:37:45 2010 +0100
+++ b/imagingandcamerafws/imagingfws/src/ImageResolverAPI.cpp	Fri Jul 09 12:23:13 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -554,8 +554,12 @@
 	if ((aOptions & CImageDecoder::EOptionAutoRotate) != 0) 
 		{
 		iOptionsUidsArray.Append(KUidJPGAutoRotateSupport);
-		iOptions = aOptions;
 		}
+	if((aOptions & CImageDecoder::EOptionOptimisedPartialImageDecoding) != 0)
+	    {
+        iOptionsUidsArray.Append(KUidJPGOptimisedPartialDecodingSupport);
+	    }
+	iOptions = aOptions;
 	}
 	
 /*
--- a/imagingandcamerafws/imaginginttest/Codecs/Group/BLD.INF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-// Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// This file basically provides the information required for building the whole of a component
-// C & C++ style comments are allowed in this file because it's passed through the C++ preprocessor
-// Examples are provided below of the kind of things we're expecting
-// 
-//
-
-PRJ_PLATFORMS
-// specify the platforms your component needs to be built for here
-// defaults to WINS MARM so you can ignore this if you just build these
-
-
-PRJ_EXPORTS
-
-ppm1codec.iby /epoc32/rom/include/ppm1codec.iby
-ppm2codec.iby /epoc32/rom/include/ppm2codec.iby
-
-PRJ_MMPFILES
-
-../Group/PPm1Codec.mmp
-../Group/PPm2Codec.mmp
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/imagingandcamerafws/imaginginttest/Codecs/Group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -0,0 +1,37 @@
+// Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// This file basically provides the information required for building the whole of a component
+// C & C++ style comments are allowed in this file because it's passed through the C++ preprocessor
+// Examples are provided below of the kind of things we're expecting
+// 
+//
+
+PRJ_PLATFORMS
+// specify the platforms your component needs to be built for here
+// defaults to WINS MARM so you can ignore this if you just build these
+
+
+PRJ_EXPORTS
+
+PRJ_MMPFILES
+
+PRJ_TESTEXPORTS
+
+ppm1codec.iby /epoc32/rom/include/ppm1codec.iby
+ppm2codec.iby /epoc32/rom/include/ppm2codec.iby
+
+PRJ_TESTMMPFILES
+
+../Group/PPm1Codec.mmp
+../Group/PPm2Codec.mmp
Binary file imagingandcamerafws/imaginginttest/Codecs/PpmSamples/lain.ppm has changed
--- a/imagingandcamerafws/imaginginttest/TSI_ICL_COD/group/Bld.inf	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-
-PRJ_PLATFORMS
-DEFAULT
-
-#include "../../TestImageIAgent/group/bld.inf"
-
-PRJ_MMPFILES
-../MMPFiles/TSI_ICL_COD.mmp
-
-PRJ_EXPORTS
-// Test Scripts
-../scriptFiles/TSI_ICL_COD_00.script	c:/icl/tsi_icl_cod_00.script
-../scriptFiles/TSI_ICL_COD_01.script	c:/icl/tsi_icl_cod_01.script
-../scriptFiles/TSI_ICL_COD_02.script	c:/icl/tsi_icl_cod_02.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/imagingandcamerafws/imaginginttest/TSI_ICL_COD/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -0,0 +1,32 @@
+// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+
+PRJ_PLATFORMS
+DEFAULT
+
+#include "../../TestImageIAgent/group/bld.inf"
+PRJ_MMPFILES
+
+PRJ_EXPORTS
+
+PRJ_TESTMMPFILES
+../MMPFiles/TSI_ICL_COD.mmp
+
+PRJ_TESTEXPORTS
+// Test Scripts
+../scriptFiles/TSI_ICL_COD_00.script	c:/icl/tsi_icl_cod_00.script
+../scriptFiles/TSI_ICL_COD_01.script	c:/icl/tsi_icl_cod_01.script
+../scriptFiles/TSI_ICL_COD_02.script	c:/icl/tsi_icl_cod_02.script
--- a/imagingandcamerafws/imaginginttest/TestImageIAgent/group/bld.inf	Thu Jun 24 10:37:45 2010 +0100
+++ b/imagingandcamerafws/imaginginttest/TestImageIAgent/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -17,7 +17,11 @@
 DEFAULT
 
 PRJ_EXPORTS
+
+PRJ_MMPFILES
+
+PRJ_TESTEXPORTS
 ../group/multimediatestimageiagent.iby /epoc32/rom/include/multimediatestimageiagent.iby
 
-PRJ_MMPFILES
+PRJ_TESTMMPFILES
 multimediatestimageiagent.mmp
--- a/imagingandcamerafws/imaginginttest/group/Bld.inf	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,286 +0,0 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-PRJ_PLATFORMS
-// specify the platforms your component needs to be built for here
-// may add platform for OMAP, Helen etc
-DEFAULT
-// DEFAULT MISA 
-// WINS ARMI THUMB
-// MINT
-
-#ifdef SYMBIAN_ENABLE_1630_JPEG_EXTENSIONS
-#include "../imagedecoder/group/bld_include.inf"
-#include "../imageencoder/group/bld_include.inf"
-#endif
-
-#include "../tsi_icl_btrans_01/group/BLD.INF"
-#include "../TSI_ICL_COD/group/Bld.inf"
-#include "../te_tsi_icl_cod_5/group/bld.inf"
-#include "../te_tsi_icl_pluginsupport_01/group/bld.inf"
-#include "../Codecs/Group/BLD.INF"
-
-
-PRJ_MMPFILES
-
-// TSI_WP5 files
-// Add the build instructions - NOTE - Must be inserted here in MMP list
-../mmpfiles/TSI_ICL_FRM_00.mmp
-
-PRJ_EXPORTS
-../scriptfiles/TSI_ICL_FRM_00.script	c:/icl/tsi_icl_frm_00.script
-
-../scriptfiles/TSI_ICL_FRM_FS.script		c:/icl/tsi_icl_frm_fs.script
-../scriptfiles/TSI_ICL_FRM_DRM.script		c:/icl/tsi_icl_frm_drm.script
-
-../scriptfiles/TSI_ICL_FRM_RF.script	c:/icl/tsi_icl_frm_rf.script
-../scriptfiles/TSI_ICL_FRM_RF_ALLOC.script	c:/icl/tsi_icl_frm_rf_alloc.script
-
-../scriptfiles/TSI_ICL_FRM_YUV.script	c:/icl/tsi_icl_frm_yuv.script
-../scriptfiles/TSI_ICL_FRM_YUV_ALLOC.script	c:/icl/tsi_icl_frm_yuv_alloc.script
-
-../scriptfiles/TSI_ICL_FRM_00.ini	c:/icl/tsi_icl_frm_00.ini
-
-
-// test files
-../src/Data/jfif444_8.mbm		c:/icl/refimages/jfif444_8.mbm
-../src/Data/jfif444.drm			c:/icl/testimages/jfif444.drm
-../src/Data/drmstub.drm			c:/icl/testimages/drmstub.drm
-../src/Data/jfif444.mbm			c:/icl/refimages/jfif444.mbm
-../src/Data/trans_1.mbm                 c:/icl/refimages/trans_1.mbm
-../src/Data/trans_8.mbm                 c:/icl/refimages/trans_8.mbm
-../src/Data/bmp8bpp_8.mbm                 c:/icl/refimages/bmp8bpp_8.mbm
-../src/Data/operator.drm              c:/icl/testimages/operator.drm
-../src/Data/operator.mbm                 c:/icl/refimages/operator.mbm
-../src/Data/sun.mbm	                 c:/icl/refimages/sun.mbm
-../src/Data/png4_8.mbm	                 c:/icl/refimages/png4_8.mbm
-../src/Data/tif3_4.mbm	                 c:/icl/refimages/tif3_4.mbm
-../src/Data/wmf3_8.mbm	                 c:/icl/refimages/wmf3_8.mbm
-../src/Data/icoepoc.mbm	                 c:/icl/refimages/icoepoc.mbm
-../src/Data/mbm24bpp_4.mbm		c:/icl/refimages/mbm24bpp_4.mbm
-../src/Data/mbm24bpp_4.mbm		c:/icl/testimages/mbm24bpp_4.mbm
-../src/Data/minimum.mbm			c:/icl/refimages/minimum.mbm
-../src/Data/textfile.mbm		c:/icl/refimages/textfile.mbm
-../src/Data/img_1705.mbm		c:/icl/refimages/img_1705.mbm
-
-../src/Data/Preview.ppm			c:/icl/testimages/preview.ppm
-../src/Data/preview.mbm			c:/icl/refimages/preview.mbm
-../src/Data/mbm_datanewl_0300.uic	c:/icl/testimages/mbm_datanewl_0300.uic 
-../src/Data/mbm_datanewl_0300.mbm	c:/icl/refimages/mbm_datanewl_0300.mbm
-
-
-
-// SYMBIAN_CAF_V2
-../src/Data/Image.contentrights		c:/icl/testimages/image.contentrights
-../src/Data/Image.content			c:/icl/testimages/image.content
-
-#ifdef SYMBIAN_ENABLE_1630_JPEG_EXTENSIONS
-// test images
-../data/testimages/mbm/bitmap_verySmall02.mbm       c:/icl/testimages/mbm/bitmap_verysmall02.mbm
-../data/testimages/mbm/bitmap_verySmall01.mbm       c:/icl/testimages/mbm/bitmap_verysmall01.mbm
-../data/testimages/mbm/bitmap_average01.mbm         c:/icl/testimages/mbm/bitmap_average01.mbm
-../data/testimages/mbm/bitmap_average02.mbm         c:/icl/testimages/mbm/bitmap_average02.mbm
-../data/testimages/mbm/bitmap_small01.mbm           c:/icl/testimages/mbm/bitmap_small01.mbm
-../data/testimages/mbm/bitmap_small02.mbm           c:/icl/testimages/mbm/bitmap_small02.mbm
-../data/testimages/mbm/bitmap_small03.mbm           c:/icl/testimages/mbm/bitmap_small03.mbm
-../data/testimages/mbm/bitmap_small08.mbm           c:/icl/testimages/mbm/bitmap_small08.mbm
-../data/testimages/mbm/bitmap_wideandthin01.mbm     c:/icl/testimages/mbm/bitmap_wideandthin01.mbm
-../data/testimages/mbm/bitmap_wideandthin08.mbm     c:/icl/testimages/mbm/bitmap_wideandthin08.mbm
-../data/testimages/mbm/bitmap_wideandthin16.mbm     c:/icl/testimages/mbm/bitmap_wideandthin16.mbm
-../data/testimages/mbm/bitmap_wideandthin14.mbm     c:/icl/testimages/mbm/bitmap_wideandthin14.mbm
-../data/testimages/mbm/bitmap_wideandthin13.mbm     c:/icl/testimages/mbm/bitmap_wideandthin13.mbm
-../data/testimages/mbm/bitmap_tallandthin01.mbm     c:/icl/testimages/mbm/bitmap_tallandthin01.mbm
-../data/testimages/mbm/bitmap_tallandthin08.mbm     c:/icl/testimages/mbm/bitmap_tallandthin08.mbm
-../data/testimages/mbm/bitmap_tallandthin06.mbm     c:/icl/testimages/mbm/bitmap_tallandthin06.mbm
-../data/testimages/mbm/bitmap_tallandthin16.mbm     c:/icl/testimages/mbm/bitmap_tallandthin16.mbm
-../data/testimages/mbm/bitmap_tallandthin17.mbm     c:/icl/testimages/mbm/bitmap_tallandthin17.mbm
-../data/testimages/mbm/jpeg_tallandthin16.mbm       c:/icl/testimages/mbm/jpeg_tallandthin16.mbm
-../data/testimages/mbm/jpeg_multiscan.mbm           c:/icl/testimages/mbm/jpeg_multiscan.mbm
-../data/testimages/mbm/bitmap_restartinterop.mbm     c:/icl/testimages/mbm/bitmap_restartinterop.mbm
-
-// reference images
-../data/refimages/mbm/jpeg_sml07_refperf100.mbm     c:/icl/refimages/mbm/jpeg_sml07_refperf100.mbm
-../data/refimages/mbm/jpeg_sml10_refperf110.mbm     c:/icl/refimages/mbm/jpeg_sml10_refperf110.mbm
-../data/refimages/mbm/jpeg_sml11_refperf130.mbm     c:/icl/refimages/mbm/jpeg_sml11_refperf130.mbm
-../data/refimages/mbm/jpeg_sml11_refperf150.mbm     c:/icl/refimages/mbm/jpeg_sml11_refperf150.mbm
-../data/refimages/mbm/jpeg_avg02_refperf160.mbm     c:/icl/refimages/mbm/jpeg_avg02_refperf160.mbm
-../data/refimages/mbm/jpeg_sml11_refperf170.mbm     c:/icl/refimages/mbm/jpeg_sml11_refperf170.mbm
-../data/refimages/mbm/jpeg_avg02_refperf180.mbm     c:/icl/refimages/mbm/jpeg_avg02_refperf180.mbm
-../data/refimages/mbm/jpeg_sml07_refperf200.mbm     c:/icl/refimages/mbm/jpeg_sml07_refperf200.mbm
-../data/refimages/mbm/jpeg_sml02_refperf210.mbm     c:/icl/refimages/mbm/jpeg_sml02_refperf210.mbm
-../data/refimages/mbm/jpeg_sml04_refperf300.mbm     c:/icl/refimages/mbm/jpeg_sml04_refperf300.mbm
-../data/refimages/mbm/jpeg_sml03_refperf310_510.mbm c:/icl/refimages/mbm/jpeg_sml03_refperf310_510.mbm
-../data/refimages/mbm/jpeg_sml04_refperf330.mbm     c:/icl/refimages/mbm/jpeg_sml04_refperf330.mbm
-../data/refimages/mbm/jpeg_sml03_refperf340.mbm     c:/icl/refimages/mbm/jpeg_sml03_refperf340.mbm
-../data/refimages/mbm/jpeg_sml07_refperf400.mbm     c:/icl/refimages/mbm/jpeg_sml07_refperf400.mbm
-../data/refimages/mbm/jpeg_sml02_refperf410.mbm     c:/icl/refimages/mbm/jpeg_sml02_refperf410.mbm
-../data/refimages/mbm/jpeg_sml04_refperf500.mbm     c:/icl/refimages/mbm/jpeg_sml04_refperf500.mbm
-../data/refimages/mbm/jpeg_sml02_refperf700.mbm     c:/icl/refimages/mbm/jpeg_sml02_refperf700.mbm
-../data/refimages/mbm/jpeg_avg02_refperf710.mbm     c:/icl/refimages/mbm/jpeg_avg02_refperf710.mbm
-
-../data/refimages/mbm/jpeg_sml05_refcrop50_70.mbm        c:/icl/refimages/mbm/jpeg_sml05_refcrop50_70.mbm
-../data/refimages/mbm/jpeg_sml05_refcrop98.mbm           c:/icl/refimages/mbm/jpeg_sml05_refcrop98.mbm
-../data/refimages/mbm/jpeg_sml09_refcrop110_emono.mbm    c:/icl/refimages/mbm/jpeg_sml09_refcrop110_emono.mbm
-../data/refimages/mbm/jpeg_sml12_refcrop120_eclr420.mbm  c:/icl/refimages/mbm/jpeg_sml12_refcrop120_eclr420.mbm
-../data/refimages/mbm/jpeg_sml13_refcrop130_eclr422.mbm  c:/icl/refimages/mbm/jpeg_sml13_refcrop130_eclr422.mbm
-../data/refimages/mbm/jpeg_sml14_refcrop135_eclr444.mbm  c:/icl/refimages/mbm/jpeg_sml14_refcrop135_eclr444.mbm
-../data/refimages/mbm/jpeg_sml05_refcrop140_egray2.mbm   c:/icl/refimages/mbm/jpeg_sml05_refcrop140_egray2.mbm
-../data/refimages/mbm/jpeg_sml05_refcrop150_egray4.mbm   c:/icl/refimages/mbm/jpeg_sml05_refcrop150_egray4.mbm
-../data/refimages/mbm/jpeg_sml05_refcrop155_egray16.mbm  c:/icl/refimages/mbm/jpeg_sml05_refcrop155_egray16.mbm
-../data/refimages/mbm/jpeg_sml05_refcrop160_egray256.mbm c:/icl/refimages/mbm/jpeg_sml05_refcrop160_egray256.mbm
-../data/refimages/mbm/jpeg_sml05_refcrop165_eclr16.mbm   c:/icl/refimages/mbm/jpeg_sml05_refcrop165_eclr16.mbm
-../data/refimages/mbm/jpeg_sml05_refcrop170_eclr256.mbm  c:/icl/refimages/mbm/jpeg_sml05_refcrop170_eclr256.mbm
-../data/refimages/mbm/jpeg_sml12_refcrop180_eclr64k.mbm  c:/icl/refimages/mbm/jpeg_sml12_refcrop180_eclr64k.mbm
-../data/refimages/mbm/jpeg_sml12_refcrop190_eclr16m.mbm  c:/icl/refimages/mbm/jpeg_sml12_refcrop190_eclr16m.mbm
-../data/refimages/mbm/jpeg_sml12_refcrop200_eclr4k.mbm   c:/icl/refimages/mbm/jpeg_sml12_refcrop200_eclr4k.mbm
-../data/refimages/mbm/jpeg_sml12_refcrop212.mbm		 c:/icl/refimages/mbm/jpeg_sml12_refcrop212.mbm
-../data/refimages/mbm/jpeg_sml12_refcrop220.mbm          c:/icl/refimages/mbm/jpeg_sml12_refcrop220.mbm
-../data/refimages/mbm/jpeg_sml12_refcrop230.mbm          c:/icl/refimages/mbm/jpeg_sml12_refcrop230.mbm
-../data/refimages/mbm/jpeg_sml12_refcrop240.mbm          c:/icl/refimages/mbm/jpeg_sml12_refcrop240.mbm
-../data/refimages/mbm/jpeg_sml12_refcrop260.mbm          c:/icl/refimages/mbm/jpeg_sml12_refcrop260.mbm
-../data/refimages/mbm/jpeg_sml05_refcrop370_egray2.mbm   c:/icl/refimages/mbm/jpeg_sml05_refcrop370_egray2.mbm
-../data/refimages/mbm/jpeg_sml07_refcrop380_egray4.mbm   c:/icl/refimages/mbm/jpeg_sml07_refcrop380_egray4.mbm
-../data/refimages/mbm/jpeg_sml05_refcrop400.mbm          c:/icl/refimages/mbm/jpeg_sml05_refcrop400.mbm
-../data/refimages/mbm/jpeg_sml05_refcrop401.mbm          c:/icl/refimages/mbm/jpeg_sml05_refcrop401.mbm
-../data/refimages/mbm/jpeg_sml05_refcrop402.mbm          c:/icl/refimages/mbm/jpeg_sml05_refcrop402.mbm
-../data/refimages/mbm/jpeg_sml05_refcrop403.mbm          c:/icl/refimages/mbm/jpeg_sml05_refcrop403.mbm
-../data/refimages/mbm/jpeg_sml05_refcrop404.mbm          c:/icl/refimages/mbm/jpeg_sml05_refcrop404.mbm
-../data/refimages/mbm/jpeg_sml05_refcrop405.mbm          c:/icl/refimages/mbm/jpeg_sml05_refcrop405.mbm
-../data/refimages/mbm/jpeg_sml05_refcrop406.mbm          c:/icl/refimages/mbm/jpeg_sml05_refcrop406.mbm
-../data/refimages/mbm/jpeg_sml05_refcrop410_410_2_420_430_430_5.mbm c:/icl/refimages/mbm/jpeg_sml05_refcrop410_410_2_420_430_430_5.mbm
-../data/refimages/mbm/jpeg_sml05_refcrop420_2_430_2.mbm  c:/icl/refimages/mbm/jpeg_sml05_refcrop420_2_430_2.mbm
-../data/refimages/mbm/jpeg_sml05_refcrop430_3.mbm        c:/icl/refimages/mbm/jpeg_sml05_refcrop430_3.mbm
-../data/refimages/mbm/jpeg_sml05_refcrop430_4.mbm        c:/icl/refimages/mbm/jpeg_sml05_refcrop430_4.mbm
-../data/refimages/mbm/jpeg_sml05_refcrop430_6.mbm        c:/icl/refimages/mbm/jpeg_sml05_refcrop430_6.mbm
-../data/refimages/mbm/jpeg_sml05_refcrop430_7.mbm        c:/icl/refimages/mbm/jpeg_sml05_refcrop430_7.mbm
-../data/refimages/mbm/jpeg_sml14_refcrop440.mbm          c:/icl/refimages/mbm/jpeg_sml14_refcrop440.mbm
-../data/refimages/mbm/jpeg_sml14_refcrop450.mbm          c:/icl/refimages/mbm/jpeg_sml14_refcrop450.mbm
-../data/refimages/mbm/jpeg_sml14_refcrop460.mbm          c:/icl/refimages/mbm/jpeg_sml14_refcrop460.mbm
-../data/refimages/mbm/jpeg_sml14_refcrop470.mbm          c:/icl/refimages/mbm/jpeg_sml14_refcrop470.mbm
-../data/refimages/mbm/jpeg_sml12_refcrop510.mbm          c:/icl/refimages/mbm/jpeg_sml12_refcrop510.mbm
-../data/refimages/mbm/jpeg_sml12_refcrop520.mbm          c:/icl/refimages/mbm/jpeg_sml12_refcrop520.mbm
-../data/refimages/mbm/jpeg_sml12_refcrop530.mbm          c:/icl/refimages/mbm/jpeg_sml12_refcrop530.mbm
-../data/refimages/mbm/jpeg_sml12_refcrop540.mbm          c:/icl/refimages/mbm/jpeg_sml12_refcrop540.mbm
-../data/refimages/mbm/jpeg_sml12_refcrop550.mbm          c:/icl/refimages/mbm/jpeg_sml12_refcrop550.mbm
-../data/refimages/mbm/jpeg_sml12_refcrop560.mbm          c:/icl/refimages/mbm/jpeg_sml12_refcrop560.mbm
-../data/refimages/mbm/jpeg_sml12_refcrop570.mbm          c:/icl/refimages/mbm/jpeg_sml12_refcrop570.mbm
-../data/refimages/mbm/jpeg_sml12_refcrop580.mbm          c:/icl/refimages/mbm/jpeg_sml12_refcrop580.mbm
-../data/refimages/mbm/jpeg_avg01_refcrop590.mbm          c:/icl/refimages/mbm/jpeg_avg01_refcrop590.mbm
-../data/refimages/mbm/jpeg_crpt02_refcrop610.mbm         c:/icl/refimages/mbm/jpeg_crpt02_refcrop610.mbm
-../data/refimages/mbm/jpeg_crpt02_refcrop615.mbm         c:/icl/refimages/mbm/jpeg_crpt02_refcrop615.mbm
-../data/refimages/mbm/jpeg_sml11_refcrop690_eclr420.mbm  c:/icl/refimages/mbm/jpeg_sml11_refcrop690_eclr420.mbm
-../data/refimages/mbm/jpeg_mltscan_refcrop700.mbm        c:/icl/refimages/mbm/jpeg_mltscan_refcrop700.mbm
-../data/refimages/mbm/jpeg_reinterop_refcrop720.mbm      c:/icl/refimages/mbm/jpeg_reinterop_refcrop720.mbm
-
-../data/refimages/mbm/jpeg_sml05_refscal110_egray2.mbm      c:/icl/refimages/mbm/jpeg_sml05_refscal110_egray2.mbm
-../data/refimages/mbm/jpeg_sml05_refscal120_egray4.mbm      c:/icl/refimages/mbm/jpeg_sml05_refscal120_egray4.mbm
-../data/refimages/mbm/jpeg_sml05_refscal130_egray16.mbm     c:/icl/refimages/mbm/jpeg_sml05_refscal130_egray16.mbm
-../data/refimages/mbm/jpeg_sml05_refscal140_egray256.mbm    c:/icl/refimages/mbm/jpeg_sml05_refscal140_egray256.mbm
-../data/refimages/mbm/jpeg_sml05_refscal150_eclr16.mbm      c:/icl/refimages/mbm/jpeg_sml05_refscal150_eclr16.mbm
-../data/refimages/mbm/jpeg_sml05_refscal160_eclr256.mbm     c:/icl/refimages/mbm/jpeg_sml05_refscal160_eclr256.mbm
-../data/refimages/mbm/jpeg_sml05_refscal170_eclr64k.mbm     c:/icl/refimages/mbm/jpeg_sml05_refscal170_eclr64k.mbm
-../data/refimages/mbm/jpeg_sml05_refscal180_eclr16m.mbm     c:/icl/refimages/mbm/jpeg_sml05_refscal180_eclr16m.mbm
-../data/refimages/mbm/jpeg_sml04_refscal190_eclr4k.mbm      c:/icl/refimages/mbm/jpeg_sml04_refscal190_eclr4k.mbm
-../data/refimages/mbm/jpeg_sml04_refscal195_eclr4k.mbm      c:/icl/refimages/mbm/jpeg_sml04_refscal195_eclr4k.mbm
-../data/refimages/mbm/jpeg_sml04_refscal210.mbm             c:/icl/refimages/mbm/jpeg_sml04_refscal210.mbm
-../data/refimages/mbm/jpeg_sml04_refscal220.mbm             c:/icl/refimages/mbm/jpeg_sml04_refscal220.mbm
-../data/refimages/mbm/jpeg_sml04_refscal230.mbm             c:/icl/refimages/mbm/jpeg_sml04_refscal230.mbm
-../data/refimages/mbm/jpeg_crpt05_refscal710.mbm            c:/icl/refimages/mbm/jpeg_crpt05_refscal710.mbm
-../data/refimages/mbm/jpeg_reinterop_refscal720.mbm         c:/icl/refimages/mbm/jpeg_reinterop_refscal720.mbm
-
-../data/refimages/mbm/jpeg_sml01_refrtmr30_50_180_210_220.mbm c:/icl/refimages/mbm/jpeg_sml01_refrtmr30_50_180_210_220.mbm
-../data/refimages/mbm/jpeg_sml01_refrtmr70_egray2.mbm       c:/icl/refimages/mbm/jpeg_sml01_refrtmr70_egray2.mbm
-../data/refimages/mbm/jpeg_sml01_refrtmr80_egray4.mbm       c:/icl/refimages/mbm/jpeg_sml01_refrtmr80_egray4.mbm
-../data/refimages/mbm/jpeg_sml01_refrtmr90_egray16.mbm      c:/icl/refimages/mbm/jpeg_sml01_refrtmr90_egray16.mbm
-../data/refimages/mbm/jpeg_sml01_refrtmr100_egray256.mbm    c:/icl/refimages/mbm/jpeg_sml01_refrtmr100_egray256.mbm
-../data/refimages/mbm/jpeg_sml01_refrtmr110_eclr16.mbm      c:/icl/refimages/mbm/jpeg_sml01_refrtmr110_eclr16.mbm
-../data/refimages/mbm/jpeg_sml01_refrtmr120_eclr256.mbm     c:/icl/refimages/mbm/jpeg_sml01_refrtmr120_eclr256.mbm
-../data/refimages/mbm/jpeg_sml01_refrtmr130_eclr64k.mbm     c:/icl/refimages/mbm/jpeg_sml01_refrtmr130_eclr64k.mbm
-../data/refimages/mbm/jpeg_sml01_refrtmr140_eclr16m.mbm     c:/icl/refimages/mbm/jpeg_sml01_refrtmr140_eclr16m.mbm
-../data/refimages/mbm/jpeg_sml01_refrtmr150_eclr4k.mbm      c:/icl/refimages/mbm/jpeg_sml01_refrtmr150_eclr4k.mbm
-../data/refimages/mbm/jpeg_sml01_refrtmr162.mbm         c:/icl/refimages/mbm/jpeg_sml01_refrtmr162.mbm
-../data/refimages/mbm/jpeg_sml01_refrtmr170_230.mbm         c:/icl/refimages/mbm/jpeg_sml01_refrtmr170_230.mbm
-../data/refimages/mbm/jpeg_sml01_refrtmr190_240.mbm         c:/icl/refimages/mbm/jpeg_sml01_refrtmr190_240.mbm
-../data/refimages/mbm/jpeg_sml01_refrtmr200.mbm             c:/icl/refimages/mbm/jpeg_sml01_refrtmr200.mbm
-../data/refimages/mbm/jpeg_sml01_refrtmr250.mbm             c:/icl/refimages/mbm/jpeg_sml01_refrtmr250.mbm
-../data/refimages/mbm/jpeg_sml01_refrtmr260.mbm             c:/icl/refimages/mbm/jpeg_sml01_refrtmr260.mbm
-../data/refimages/mbm/jpeg_sml01_refrtmr270.mbm             c:/icl/refimages/mbm/jpeg_sml01_refrtmr270.mbm
-../data/refimages/mbm/jpeg_sml05_refrtmr320_egray2.mbm      c:/icl/refimages/mbm/jpeg_sml05_refrtmr320_egray2.mbm
-../data/refimages/mbm/jpeg_sml07_refrtmr330_egray4.mbm      c:/icl/refimages/mbm/jpeg_sml07_refrtmr330_egray4.mbm
-../data/refimages/mbm/jpeg_sml01_refrtmr350.mbm             c:/icl/refimages/mbm/jpeg_sml01_refrtmr350.mbm
-../data/refimages/mbm/jpeg_sml01_refrtmr360.mbm             c:/icl/refimages/mbm/jpeg_sml01_refrtmr360.mbm
-../data/refimages/mbm/jpeg_sml01_refrtmr370.mbm             c:/icl/refimages/mbm/jpeg_sml01_refrtmr370.mbm
-../data/refimages/mbm/jpeg_sml01_refrtmr380.mbm             c:/icl/refimages/mbm/jpeg_sml01_refrtmr380.mbm
-../data/refimages/mbm/jpeg_sml02_refrtmr400_520_550.mbm     c:/icl/refimages/mbm/jpeg_sml02_refrtmr400_520_550.mbm
-../data/refimages/mbm/jpeg_sml02_refrtmr410.mbm             c:/icl/refimages/mbm/jpeg_sml02_refrtmr410.mbm
-../data/refimages/mbm/jpeg_sml02_refrtmr420.mbm             c:/icl/refimages/mbm/jpeg_sml02_refrtmr420.mbm
-../data/refimages/mbm/jpeg_sml02_refrtmr460_510.mbm         c:/icl/refimages/mbm/jpeg_sml02_refrtmr460_510.mbm
-../data/refimages/mbm/jpeg_sml02_refrtmr480_540.mbm         c:/icl/refimages/mbm/jpeg_sml02_refrtmr480_540.mbm
-../data/refimages/mbm/jpeg_sml02_refrtmr500_530.mbm         c:/icl/refimages/mbm/jpeg_sml02_refrtmr500_530.mbm
-../data/refimages/mbm/jpeg_crpt05_refrtmr710.mbm            c:/icl/refimages/mbm/jpeg_crpt05_refrtmr710.mbm
-../data/refimages/mbm/jpeg_mltscan_refrtmr700.mbm           c:/icl/refimages/mbm/jpeg_mltscan_refrtmr700.mbm
-../data/refimages/mbm/jpeg_reinterop_refrtmr720.mbm         c:/icl/refimages/mbm/jpeg_reinterop_refrtmr720.mbm
-../data/refimages/mbm/jpeg_sml01_refrtmr750.mbm             c:/icl/refimages/mbm/jpeg_sml01_refrtmr750.mbm
-../data/refimages/mbm/jpeg_sml01_refrtmr760.mbm	         c:/icl/refimages/mbm/jpeg_sml01_refrtmr760.mbm
-../data/refimages/mbm/jpeg_sml01_refrtmr770.mbm             c:/icl/refimages/mbm/jpeg_sml01_refrtmr770.mbm
-../data/refimages/mbm/jpeg_sml01_refrtmr780.mbm             c:/icl/refimages/mbm/jpeg_sml01_refrtmr780.mbm
-../data/refimages/mbm/image_content_refrtmr790.mbm             c:/icl/refimages/mbm/image_content_refrtmr790.mbm
-../data/refimages/mbm/jpeg_sml01_refrtmr740.mbm             c:/icl/refimages/mbm/jpeg_sml01_refrtmr740.mbm
-
-../data/refimages/mbm/jpeg_sml05_refmuop10_egray2.mbm       c:/icl/refimages/mbm/jpeg_sml05_refmuop10_egray2.mbm
-../data/refimages/mbm/jpeg_sml05_refmuop20_egray4.mbm       c:/icl/refimages/mbm/jpeg_sml05_refmuop20_egray4.mbm
-../data/refimages/mbm/jpeg_sml05_refmuop30_egray16.mbm      c:/icl/refimages/mbm/jpeg_sml05_refmuop30_egray16.mbm
-../data/refimages/mbm/jpeg_sml05_refmuop40_egray256.mbm     c:/icl/refimages/mbm/jpeg_sml05_refmuop40_egray256.mbm
-../data/refimages/mbm/jpeg_sml05_refmuop50_eclr16.mbm       c:/icl/refimages/mbm/jpeg_sml05_refmuop50_eclr16.mbm
-../data/refimages/mbm/jpeg_sml05_refmuop60_eclr256.mbm      c:/icl/refimages/mbm/jpeg_sml05_refmuop60_eclr256.mbm
-../data/refimages/mbm/jpeg_sml05_refmuop70_eclr64k.mbm      c:/icl/refimages/mbm/jpeg_sml05_refmuop70_eclr64k.mbm
-../data/refimages/mbm/jpeg_sml05_refmuop80_eclr16m.mbm      c:/icl/refimages/mbm/jpeg_sml05_refmuop80_eclr16m.mbm
-../data/refimages/mbm/jpeg_sml05_refmuop90_eclr4k.mbm       c:/icl/refimages/mbm/jpeg_sml05_refmuop90_eclr4k.mbm
-../data/refimages/mbm/jpeg_sml05_refmuop110_egray2.mbm      c:/icl/refimages/mbm/jpeg_sml05_refmuop110_egray2.mbm
-../data/refimages/mbm/jpeg_sml05_refmuop120_egray4.mbm      c:/icl/refimages/mbm/jpeg_sml05_refmuop120_egray4.mbm
-../data/refimages/mbm/jpeg_sml05_refmuop130_egray16.mbm     c:/icl/refimages/mbm/jpeg_sml05_refmuop130_egray16.mbm
-../data/refimages/mbm/jpeg_sml05_refmuop140_egray256.mbm    c:/icl/refimages/mbm/jpeg_sml05_refmuop140_egray256.mbm
-../data/refimages/mbm/jpeg_sml05_refmuop150_eclr16.mbm      c:/icl/refimages/mbm/jpeg_sml05_refmuop150_eclr16.mbm
-../data/refimages/mbm/jpeg_sml05_refmuop160_eclr256.mbm     c:/icl/refimages/mbm/jpeg_sml05_refmuop160_eclr256.mbm
-../data/refimages/mbm/jpeg_sml05_refmuop170_eclr64k.mbm     c:/icl/refimages/mbm/jpeg_sml05_refmuop170_eclr64k.mbm
-../data/refimages/mbm/jpeg_sml04_refmuop180_eclr16m.mbm     c:/icl/refimages/mbm/jpeg_sml04_refmuop180_eclr16m.mbm
-../data/refimages/mbm/jpeg_sml04_refmuop190_eclr4k.mbm      c:/icl/refimages/mbm/jpeg_sml04_refmuop190_eclr4k.mbm
-../data/refimages/mbm/jpeg_sml05_refmuop210_egray2.mbm      c:/icl/refimages/mbm/jpeg_sml05_refmuop210_egray2.mbm
-../data/refimages/mbm/jpeg_sml05_refmuop220_egray4.mbm      c:/icl/refimages/mbm/jpeg_sml05_refmuop220_egray4.mbm
-../data/refimages/mbm/jpeg_sml05_refmuop230_egray16.mbm     c:/icl/refimages/mbm/jpeg_sml05_refmuop230_egray16.mbm
-../data/refimages/mbm/jpeg_sml05_refmuop240_egray256.mbm    c:/icl/refimages/mbm/jpeg_sml05_refmuop240_egray256.mbm
-../data/refimages/mbm/jpeg_sml05_refmuop250_eclr16.mbm      c:/icl/refimages/mbm/jpeg_sml05_refmuop250_eclr16.mbm
-../data/refimages/mbm/jpeg_sml05_refcrop730.mbm      c:/icl/refimages/mbm/jpeg_sml05_refcrop730.mbm
-../data/refimages/mbm/jpeg_sml05_refscal730_egray2.mbm      c:/icl/refimages/mbm/jpeg_sml05_refscal730_egray2.mbm
-
-../data/refimages/mbm/auto_rot_1_refarto10.mbm             c:/icl/refimages/mbm/auto_rot_1_refarto10.mbm
-../data/refimages/mbm/auto_rot_1_refarto20.mbm             c:/icl/refimages/mbm/auto_rot_1_refarto20.mbm
-../data/refimages/mbm/auto_rot_2_refarto30.mbm             c:/icl/refimages/mbm/auto_rot_2_refarto30.mbm
-../data/refimages/mbm/auto_rot_4_refarto40.mbm             c:/icl/refimages/mbm/auto_rot_4_refarto40.mbm
-../data/refimages/mbm/auto_rot_1_refarcr60.mbm             c:/icl/refimages/mbm/auto_rot_1_refarcr60.mbm
-../data/refimages/mbm/auto_rot_1_refarcr70.mbm             c:/icl/refimages/mbm/auto_rot_1_refarcr70.mbm
-../data/refimages/mbm/auto_rot_2_refarsc150_eclr80.mbm     c:/icl/refimages/mbm/auto_rot_2_refarsc150_eclr80.mbm
-../data/refimages/mbm/auto_rot_2_refarsc90_egray2.mbm      c:/icl/refimages/mbm/auto_rot_2_refarsc90_egray2.mbm
-../data/refimages/mbm/bitmap_sml01_refarto110.mbm            c:/icl/refimages/mbm/bitmap_sml01_refarto110.mbm
-../data/refimages/mbm/jpeg_sml03_refarto100.mbm            c:/icl/refimages/mbm/jpeg_sml03_refarto100.mbm
-../data/refimages/mbm/auto_rot_4_ref160_dec1.mbm            c:/icl/refimages/mbm/auto_rot_4_ref160_dec1.mbm
-../data/refimages/mbm/auto_rot_4_refarto160.mbm            c:/icl/refimages/mbm/auto_rot_4_refarto160.mbm
-
-#endif
-
-// there used to be a number of exports below which were mirrored in the unit tests.
-// instead these are no longer exported from here and are just exported from the unit
-// tests in order to fix errors in the mrp file mappings.  Thus the unit tests have to 
-// be built before running the integrations tests.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/imagingandcamerafws/imaginginttest/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -0,0 +1,292 @@
+// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRJ_PLATFORMS
+// specify the platforms your component needs to be built for here
+// may add platform for OMAP, Helen etc
+DEFAULT
+// DEFAULT MISA 
+// WINS ARMI THUMB
+// MINT
+
+#ifdef SYMBIAN_ENABLE_1630_JPEG_EXTENSIONS
+#include "../imagedecoder/group/bld.inf"
+#include "../imageencoder/group/bld.inf"
+#endif
+
+#include "../tsi_icl_btrans_01/group/bld.inf"
+#include "../TSI_ICL_COD/group/bld.inf"
+#include "../te_tsi_icl_cod_5/group/bld.inf"
+#include "../te_tsi_icl_pluginsupport_01/group/bld.inf"
+#include "../Codecs/Group/bld.inf"
+
+
+PRJ_MMPFILES
+
+PRJ_EXPORTS
+
+PRJ_TESTMMPFILES
+
+// TSI_WP5 files
+// Add the build instructions - NOTE - Must be inserted here in MMP list
+../mmpfiles/TSI_ICL_FRM_00.mmp
+
+PRJ_TESTEXPORTS
+../scriptfiles/TSI_ICL_FRM_00.script	c:/icl/tsi_icl_frm_00.script
+
+../scriptfiles/TSI_ICL_FRM_FS.script		c:/icl/tsi_icl_frm_fs.script
+../scriptfiles/TSI_ICL_FRM_DRM.script		c:/icl/tsi_icl_frm_drm.script
+
+../scriptfiles/TSI_ICL_FRM_RF.script	c:/icl/tsi_icl_frm_rf.script
+../scriptfiles/TSI_ICL_FRM_RF_ALLOC.script	c:/icl/tsi_icl_frm_rf_alloc.script
+
+../scriptfiles/TSI_ICL_FRM_YUV.script	c:/icl/tsi_icl_frm_yuv.script
+../scriptfiles/TSI_ICL_FRM_YUV_ALLOC.script	c:/icl/tsi_icl_frm_yuv_alloc.script
+
+../scriptfiles/TSI_ICL_FRM_00.ini	c:/icl/tsi_icl_frm_00.ini
+
+../group/IntTest_Icl.iby             /epoc32/rom/include/IntTest_Icl.iby
+
+// test files
+../src/Data/jfif444_8.mbm		c:/icl/refimages/jfif444_8.mbm
+../src/Data/jfif444.drm			c:/icl/testimages/jfif444.drm
+../src/Data/drmstub.drm			c:/icl/testimages/drmstub.drm
+../src/Data/jfif444.mbm			c:/icl/refimages/jfif444.mbm
+../src/Data/trans_1.mbm                 c:/icl/refimages/trans_1.mbm
+../src/Data/trans_8.mbm                 c:/icl/refimages/trans_8.mbm
+../src/Data/bmp8bpp_8.mbm                 c:/icl/refimages/bmp8bpp_8.mbm
+../src/Data/operator.drm              c:/icl/testimages/operator.drm
+../src/Data/operator.mbm                 c:/icl/refimages/operator.mbm
+../src/Data/sun.mbm	                 c:/icl/refimages/sun.mbm
+../src/Data/png4_8.mbm	                 c:/icl/refimages/png4_8.mbm
+../src/Data/tif3_4.mbm	                 c:/icl/refimages/tif3_4.mbm
+../src/Data/wmf3_8.mbm	                 c:/icl/refimages/wmf3_8.mbm
+../src/Data/icoepoc.mbm	                 c:/icl/refimages/icoepoc.mbm
+../src/Data/mbm24bpp_4.mbm		c:/icl/refimages/mbm24bpp_4.mbm
+../src/Data/mbm24bpp_4.mbm		c:/icl/testimages/mbm24bpp_4.mbm
+../src/Data/minimum.mbm			c:/icl/refimages/minimum.mbm
+../src/Data/textfile.mbm		c:/icl/refimages/textfile.mbm
+../src/Data/img_1705.mbm		c:/icl/refimages/img_1705.mbm
+
+../src/Data/Preview.ppm			c:/icl/testimages/preview.ppm
+../src/Data/preview.mbm			c:/icl/refimages/preview.mbm
+../src/Data/mbm_datanewl_0300.uic	c:/icl/testimages/mbm_datanewl_0300.uic 
+../src/Data/mbm_datanewl_0300.mbm	c:/icl/refimages/mbm_datanewl_0300.mbm
+
+
+
+// SYMBIAN_CAF_V2
+../src/Data/Image.contentrights		c:/icl/testimages/image.contentrights
+../src/Data/Image.content			c:/icl/testimages/image.content
+
+#ifdef SYMBIAN_ENABLE_1630_JPEG_EXTENSIONS
+// test images
+../data/testimages/mbm/bitmap_verySmall02.mbm       c:/icl/testimages/mbm/bitmap_verysmall02.mbm
+../data/testimages/mbm/bitmap_verySmall01.mbm       c:/icl/testimages/mbm/bitmap_verysmall01.mbm
+../data/testimages/mbm/bitmap_average01.mbm         c:/icl/testimages/mbm/bitmap_average01.mbm
+../data/testimages/mbm/bitmap_average02.mbm         c:/icl/testimages/mbm/bitmap_average02.mbm
+../data/testimages/mbm/bitmap_small01.mbm           c:/icl/testimages/mbm/bitmap_small01.mbm
+../data/testimages/mbm/bitmap_small02.mbm           c:/icl/testimages/mbm/bitmap_small02.mbm
+../data/testimages/mbm/bitmap_small03.mbm           c:/icl/testimages/mbm/bitmap_small03.mbm
+../data/testimages/mbm/bitmap_small08.mbm           c:/icl/testimages/mbm/bitmap_small08.mbm
+../data/testimages/mbm/bitmap_wideandthin01.mbm     c:/icl/testimages/mbm/bitmap_wideandthin01.mbm
+../data/testimages/mbm/bitmap_wideandthin08.mbm     c:/icl/testimages/mbm/bitmap_wideandthin08.mbm
+../data/testimages/mbm/bitmap_wideandthin16.mbm     c:/icl/testimages/mbm/bitmap_wideandthin16.mbm
+../data/testimages/mbm/bitmap_wideandthin14.mbm     c:/icl/testimages/mbm/bitmap_wideandthin14.mbm
+../data/testimages/mbm/bitmap_wideandthin13.mbm     c:/icl/testimages/mbm/bitmap_wideandthin13.mbm
+../data/testimages/mbm/bitmap_tallandthin01.mbm     c:/icl/testimages/mbm/bitmap_tallandthin01.mbm
+../data/testimages/mbm/bitmap_tallandthin08.mbm     c:/icl/testimages/mbm/bitmap_tallandthin08.mbm
+../data/testimages/mbm/bitmap_tallandthin06.mbm     c:/icl/testimages/mbm/bitmap_tallandthin06.mbm
+../data/testimages/mbm/bitmap_tallandthin16.mbm     c:/icl/testimages/mbm/bitmap_tallandthin16.mbm
+../data/testimages/mbm/bitmap_tallandthin17.mbm     c:/icl/testimages/mbm/bitmap_tallandthin17.mbm
+../data/testimages/mbm/jpeg_tallandthin16.mbm       c:/icl/testimages/mbm/jpeg_tallandthin16.mbm
+../data/testimages/mbm/jpeg_multiscan.mbm           c:/icl/testimages/mbm/jpeg_multiscan.mbm
+../data/testimages/mbm/bitmap_restartinterop.mbm     c:/icl/testimages/mbm/bitmap_restartinterop.mbm
+
+// reference images
+../data/refimages/mbm/jpeg_sml07_refperf100.mbm     c:/icl/refimages/mbm/jpeg_sml07_refperf100.mbm
+../data/refimages/mbm/jpeg_sml10_refperf110.mbm     c:/icl/refimages/mbm/jpeg_sml10_refperf110.mbm
+../data/refimages/mbm/jpeg_sml11_refperf130.mbm     c:/icl/refimages/mbm/jpeg_sml11_refperf130.mbm
+../data/refimages/mbm/jpeg_sml11_refperf150.mbm     c:/icl/refimages/mbm/jpeg_sml11_refperf150.mbm
+../data/refimages/mbm/jpeg_avg02_refperf160.mbm     c:/icl/refimages/mbm/jpeg_avg02_refperf160.mbm
+../data/refimages/mbm/jpeg_sml11_refperf170.mbm     c:/icl/refimages/mbm/jpeg_sml11_refperf170.mbm
+../data/refimages/mbm/jpeg_avg02_refperf180.mbm     c:/icl/refimages/mbm/jpeg_avg02_refperf180.mbm
+../data/refimages/mbm/jpeg_sml07_refperf200.mbm     c:/icl/refimages/mbm/jpeg_sml07_refperf200.mbm
+../data/refimages/mbm/jpeg_sml02_refperf210.mbm     c:/icl/refimages/mbm/jpeg_sml02_refperf210.mbm
+../data/refimages/mbm/jpeg_sml04_refperf300.mbm     c:/icl/refimages/mbm/jpeg_sml04_refperf300.mbm
+../data/refimages/mbm/jpeg_sml03_refperf310_510.mbm c:/icl/refimages/mbm/jpeg_sml03_refperf310_510.mbm
+../data/refimages/mbm/jpeg_sml04_refperf330.mbm     c:/icl/refimages/mbm/jpeg_sml04_refperf330.mbm
+../data/refimages/mbm/jpeg_sml03_refperf340.mbm     c:/icl/refimages/mbm/jpeg_sml03_refperf340.mbm
+../data/refimages/mbm/jpeg_sml07_refperf400.mbm     c:/icl/refimages/mbm/jpeg_sml07_refperf400.mbm
+../data/refimages/mbm/jpeg_sml02_refperf410.mbm     c:/icl/refimages/mbm/jpeg_sml02_refperf410.mbm
+../data/refimages/mbm/jpeg_sml04_refperf500.mbm     c:/icl/refimages/mbm/jpeg_sml04_refperf500.mbm
+../data/refimages/mbm/jpeg_sml02_refperf700.mbm     c:/icl/refimages/mbm/jpeg_sml02_refperf700.mbm
+../data/refimages/mbm/jpeg_avg02_refperf710.mbm     c:/icl/refimages/mbm/jpeg_avg02_refperf710.mbm
+
+../data/refimages/mbm/jpeg_sml05_refcrop50_70.mbm        c:/icl/refimages/mbm/jpeg_sml05_refcrop50_70.mbm
+../data/refimages/mbm/jpeg_sml05_refcrop98.mbm           c:/icl/refimages/mbm/jpeg_sml05_refcrop98.mbm
+../data/refimages/mbm/jpeg_sml09_refcrop110_emono.mbm    c:/icl/refimages/mbm/jpeg_sml09_refcrop110_emono.mbm
+../data/refimages/mbm/jpeg_sml12_refcrop120_eclr420.mbm  c:/icl/refimages/mbm/jpeg_sml12_refcrop120_eclr420.mbm
+../data/refimages/mbm/jpeg_sml13_refcrop130_eclr422.mbm  c:/icl/refimages/mbm/jpeg_sml13_refcrop130_eclr422.mbm
+../data/refimages/mbm/jpeg_sml14_refcrop135_eclr444.mbm  c:/icl/refimages/mbm/jpeg_sml14_refcrop135_eclr444.mbm
+../data/refimages/mbm/jpeg_sml05_refcrop140_egray2.mbm   c:/icl/refimages/mbm/jpeg_sml05_refcrop140_egray2.mbm
+../data/refimages/mbm/jpeg_sml05_refcrop150_egray4.mbm   c:/icl/refimages/mbm/jpeg_sml05_refcrop150_egray4.mbm
+../data/refimages/mbm/jpeg_sml05_refcrop155_egray16.mbm  c:/icl/refimages/mbm/jpeg_sml05_refcrop155_egray16.mbm
+../data/refimages/mbm/jpeg_sml05_refcrop160_egray256.mbm c:/icl/refimages/mbm/jpeg_sml05_refcrop160_egray256.mbm
+../data/refimages/mbm/jpeg_sml05_refcrop165_eclr16.mbm   c:/icl/refimages/mbm/jpeg_sml05_refcrop165_eclr16.mbm
+../data/refimages/mbm/jpeg_sml05_refcrop170_eclr256.mbm  c:/icl/refimages/mbm/jpeg_sml05_refcrop170_eclr256.mbm
+../data/refimages/mbm/jpeg_sml12_refcrop180_eclr64k.mbm  c:/icl/refimages/mbm/jpeg_sml12_refcrop180_eclr64k.mbm
+../data/refimages/mbm/jpeg_sml12_refcrop190_eclr16m.mbm  c:/icl/refimages/mbm/jpeg_sml12_refcrop190_eclr16m.mbm
+../data/refimages/mbm/jpeg_sml12_refcrop200_eclr4k.mbm   c:/icl/refimages/mbm/jpeg_sml12_refcrop200_eclr4k.mbm
+../data/refimages/mbm/jpeg_sml12_refcrop212.mbm		 c:/icl/refimages/mbm/jpeg_sml12_refcrop212.mbm
+../data/refimages/mbm/jpeg_sml12_refcrop220.mbm          c:/icl/refimages/mbm/jpeg_sml12_refcrop220.mbm
+../data/refimages/mbm/jpeg_sml12_refcrop230.mbm          c:/icl/refimages/mbm/jpeg_sml12_refcrop230.mbm
+../data/refimages/mbm/jpeg_sml12_refcrop240.mbm          c:/icl/refimages/mbm/jpeg_sml12_refcrop240.mbm
+../data/refimages/mbm/jpeg_sml12_refcrop260.mbm          c:/icl/refimages/mbm/jpeg_sml12_refcrop260.mbm
+../data/refimages/mbm/jpeg_sml05_refcrop370_egray2.mbm   c:/icl/refimages/mbm/jpeg_sml05_refcrop370_egray2.mbm
+../data/refimages/mbm/jpeg_sml07_refcrop380_egray4.mbm   c:/icl/refimages/mbm/jpeg_sml07_refcrop380_egray4.mbm
+../data/refimages/mbm/jpeg_sml05_refcrop400.mbm          c:/icl/refimages/mbm/jpeg_sml05_refcrop400.mbm
+../data/refimages/mbm/jpeg_sml05_refcrop401.mbm          c:/icl/refimages/mbm/jpeg_sml05_refcrop401.mbm
+../data/refimages/mbm/jpeg_sml05_refcrop402.mbm          c:/icl/refimages/mbm/jpeg_sml05_refcrop402.mbm
+../data/refimages/mbm/jpeg_sml05_refcrop403.mbm          c:/icl/refimages/mbm/jpeg_sml05_refcrop403.mbm
+../data/refimages/mbm/jpeg_sml05_refcrop404.mbm          c:/icl/refimages/mbm/jpeg_sml05_refcrop404.mbm
+../data/refimages/mbm/jpeg_sml05_refcrop405.mbm          c:/icl/refimages/mbm/jpeg_sml05_refcrop405.mbm
+../data/refimages/mbm/jpeg_sml05_refcrop406.mbm          c:/icl/refimages/mbm/jpeg_sml05_refcrop406.mbm
+../data/refimages/mbm/jpeg_sml05_refcrop410_410_2_420_430_430_5.mbm c:/icl/refimages/mbm/jpeg_sml05_refcrop410_410_2_420_430_430_5.mbm
+../data/refimages/mbm/jpeg_sml05_refcrop420_2_430_2.mbm  c:/icl/refimages/mbm/jpeg_sml05_refcrop420_2_430_2.mbm
+../data/refimages/mbm/jpeg_sml05_refcrop430_3.mbm        c:/icl/refimages/mbm/jpeg_sml05_refcrop430_3.mbm
+../data/refimages/mbm/jpeg_sml05_refcrop430_4.mbm        c:/icl/refimages/mbm/jpeg_sml05_refcrop430_4.mbm
+../data/refimages/mbm/jpeg_sml05_refcrop430_6.mbm        c:/icl/refimages/mbm/jpeg_sml05_refcrop430_6.mbm
+../data/refimages/mbm/jpeg_sml05_refcrop430_7.mbm        c:/icl/refimages/mbm/jpeg_sml05_refcrop430_7.mbm
+../data/refimages/mbm/jpeg_sml14_refcrop440.mbm          c:/icl/refimages/mbm/jpeg_sml14_refcrop440.mbm
+../data/refimages/mbm/jpeg_sml14_refcrop450.mbm          c:/icl/refimages/mbm/jpeg_sml14_refcrop450.mbm
+../data/refimages/mbm/jpeg_sml14_refcrop460.mbm          c:/icl/refimages/mbm/jpeg_sml14_refcrop460.mbm
+../data/refimages/mbm/jpeg_sml14_refcrop470.mbm          c:/icl/refimages/mbm/jpeg_sml14_refcrop470.mbm
+../data/refimages/mbm/jpeg_sml12_refcrop510.mbm          c:/icl/refimages/mbm/jpeg_sml12_refcrop510.mbm
+../data/refimages/mbm/jpeg_sml12_refcrop520.mbm          c:/icl/refimages/mbm/jpeg_sml12_refcrop520.mbm
+../data/refimages/mbm/jpeg_sml12_refcrop530.mbm          c:/icl/refimages/mbm/jpeg_sml12_refcrop530.mbm
+../data/refimages/mbm/jpeg_sml12_refcrop540.mbm          c:/icl/refimages/mbm/jpeg_sml12_refcrop540.mbm
+../data/refimages/mbm/jpeg_sml12_refcrop550.mbm          c:/icl/refimages/mbm/jpeg_sml12_refcrop550.mbm
+../data/refimages/mbm/jpeg_sml12_refcrop560.mbm          c:/icl/refimages/mbm/jpeg_sml12_refcrop560.mbm
+../data/refimages/mbm/jpeg_sml12_refcrop570.mbm          c:/icl/refimages/mbm/jpeg_sml12_refcrop570.mbm
+../data/refimages/mbm/jpeg_sml12_refcrop580.mbm          c:/icl/refimages/mbm/jpeg_sml12_refcrop580.mbm
+../data/refimages/mbm/jpeg_avg01_refcrop590.mbm          c:/icl/refimages/mbm/jpeg_avg01_refcrop590.mbm
+../data/refimages/mbm/jpeg_crpt02_refcrop610.mbm         c:/icl/refimages/mbm/jpeg_crpt02_refcrop610.mbm
+../data/refimages/mbm/jpeg_crpt02_refcrop615.mbm         c:/icl/refimages/mbm/jpeg_crpt02_refcrop615.mbm
+../data/refimages/mbm/jpeg_sml11_refcrop690_eclr420.mbm  c:/icl/refimages/mbm/jpeg_sml11_refcrop690_eclr420.mbm
+../data/refimages/mbm/jpeg_mltscan_refcrop700.mbm        c:/icl/refimages/mbm/jpeg_mltscan_refcrop700.mbm
+../data/refimages/mbm/jpeg_reinterop_refcrop720.mbm      c:/icl/refimages/mbm/jpeg_reinterop_refcrop720.mbm
+
+../data/refimages/mbm/jpeg_sml05_refscal110_egray2.mbm      c:/icl/refimages/mbm/jpeg_sml05_refscal110_egray2.mbm
+../data/refimages/mbm/jpeg_sml05_refscal120_egray4.mbm      c:/icl/refimages/mbm/jpeg_sml05_refscal120_egray4.mbm
+../data/refimages/mbm/jpeg_sml05_refscal130_egray16.mbm     c:/icl/refimages/mbm/jpeg_sml05_refscal130_egray16.mbm
+../data/refimages/mbm/jpeg_sml05_refscal140_egray256.mbm    c:/icl/refimages/mbm/jpeg_sml05_refscal140_egray256.mbm
+../data/refimages/mbm/jpeg_sml05_refscal150_eclr16.mbm      c:/icl/refimages/mbm/jpeg_sml05_refscal150_eclr16.mbm
+../data/refimages/mbm/jpeg_sml05_refscal160_eclr256.mbm     c:/icl/refimages/mbm/jpeg_sml05_refscal160_eclr256.mbm
+../data/refimages/mbm/jpeg_sml05_refscal170_eclr64k.mbm     c:/icl/refimages/mbm/jpeg_sml05_refscal170_eclr64k.mbm
+../data/refimages/mbm/jpeg_sml05_refscal180_eclr16m.mbm     c:/icl/refimages/mbm/jpeg_sml05_refscal180_eclr16m.mbm
+../data/refimages/mbm/jpeg_sml04_refscal190_eclr4k.mbm      c:/icl/refimages/mbm/jpeg_sml04_refscal190_eclr4k.mbm
+../data/refimages/mbm/jpeg_sml04_refscal195_eclr4k.mbm      c:/icl/refimages/mbm/jpeg_sml04_refscal195_eclr4k.mbm
+../data/refimages/mbm/jpeg_sml04_refscal210.mbm             c:/icl/refimages/mbm/jpeg_sml04_refscal210.mbm
+../data/refimages/mbm/jpeg_sml04_refscal220.mbm             c:/icl/refimages/mbm/jpeg_sml04_refscal220.mbm
+../data/refimages/mbm/jpeg_sml04_refscal230.mbm             c:/icl/refimages/mbm/jpeg_sml04_refscal230.mbm
+../data/refimages/mbm/jpeg_crpt05_refscal710.mbm            c:/icl/refimages/mbm/jpeg_crpt05_refscal710.mbm
+../data/refimages/mbm/jpeg_reinterop_refscal720.mbm         c:/icl/refimages/mbm/jpeg_reinterop_refscal720.mbm
+
+../data/refimages/mbm/jpeg_sml01_refrtmr30_50_180_210_220.mbm c:/icl/refimages/mbm/jpeg_sml01_refrtmr30_50_180_210_220.mbm
+../data/refimages/mbm/jpeg_sml01_refrtmr70_egray2.mbm       c:/icl/refimages/mbm/jpeg_sml01_refrtmr70_egray2.mbm
+../data/refimages/mbm/jpeg_sml01_refrtmr80_egray4.mbm       c:/icl/refimages/mbm/jpeg_sml01_refrtmr80_egray4.mbm
+../data/refimages/mbm/jpeg_sml01_refrtmr90_egray16.mbm      c:/icl/refimages/mbm/jpeg_sml01_refrtmr90_egray16.mbm
+../data/refimages/mbm/jpeg_sml01_refrtmr100_egray256.mbm    c:/icl/refimages/mbm/jpeg_sml01_refrtmr100_egray256.mbm
+../data/refimages/mbm/jpeg_sml01_refrtmr110_eclr16.mbm      c:/icl/refimages/mbm/jpeg_sml01_refrtmr110_eclr16.mbm
+../data/refimages/mbm/jpeg_sml01_refrtmr120_eclr256.mbm     c:/icl/refimages/mbm/jpeg_sml01_refrtmr120_eclr256.mbm
+../data/refimages/mbm/jpeg_sml01_refrtmr130_eclr64k.mbm     c:/icl/refimages/mbm/jpeg_sml01_refrtmr130_eclr64k.mbm
+../data/refimages/mbm/jpeg_sml01_refrtmr140_eclr16m.mbm     c:/icl/refimages/mbm/jpeg_sml01_refrtmr140_eclr16m.mbm
+../data/refimages/mbm/jpeg_sml01_refrtmr150_eclr4k.mbm      c:/icl/refimages/mbm/jpeg_sml01_refrtmr150_eclr4k.mbm
+../data/refimages/mbm/jpeg_sml01_refrtmr162.mbm         c:/icl/refimages/mbm/jpeg_sml01_refrtmr162.mbm
+../data/refimages/mbm/jpeg_sml01_refrtmr170_230.mbm         c:/icl/refimages/mbm/jpeg_sml01_refrtmr170_230.mbm
+../data/refimages/mbm/jpeg_sml01_refrtmr190_240.mbm         c:/icl/refimages/mbm/jpeg_sml01_refrtmr190_240.mbm
+../data/refimages/mbm/jpeg_sml01_refrtmr200.mbm             c:/icl/refimages/mbm/jpeg_sml01_refrtmr200.mbm
+../data/refimages/mbm/jpeg_sml01_refrtmr250.mbm             c:/icl/refimages/mbm/jpeg_sml01_refrtmr250.mbm
+../data/refimages/mbm/jpeg_sml01_refrtmr260.mbm             c:/icl/refimages/mbm/jpeg_sml01_refrtmr260.mbm
+../data/refimages/mbm/jpeg_sml01_refrtmr270.mbm             c:/icl/refimages/mbm/jpeg_sml01_refrtmr270.mbm
+../data/refimages/mbm/jpeg_sml05_refrtmr320_egray2.mbm      c:/icl/refimages/mbm/jpeg_sml05_refrtmr320_egray2.mbm
+../data/refimages/mbm/jpeg_sml07_refrtmr330_egray4.mbm      c:/icl/refimages/mbm/jpeg_sml07_refrtmr330_egray4.mbm
+../data/refimages/mbm/jpeg_sml01_refrtmr350.mbm             c:/icl/refimages/mbm/jpeg_sml01_refrtmr350.mbm
+../data/refimages/mbm/jpeg_sml01_refrtmr360.mbm             c:/icl/refimages/mbm/jpeg_sml01_refrtmr360.mbm
+../data/refimages/mbm/jpeg_sml01_refrtmr370.mbm             c:/icl/refimages/mbm/jpeg_sml01_refrtmr370.mbm
+../data/refimages/mbm/jpeg_sml01_refrtmr380.mbm             c:/icl/refimages/mbm/jpeg_sml01_refrtmr380.mbm
+../data/refimages/mbm/jpeg_sml02_refrtmr400_520_550.mbm     c:/icl/refimages/mbm/jpeg_sml02_refrtmr400_520_550.mbm
+../data/refimages/mbm/jpeg_sml02_refrtmr410.mbm             c:/icl/refimages/mbm/jpeg_sml02_refrtmr410.mbm
+../data/refimages/mbm/jpeg_sml02_refrtmr420.mbm             c:/icl/refimages/mbm/jpeg_sml02_refrtmr420.mbm
+../data/refimages/mbm/jpeg_sml02_refrtmr460_510.mbm         c:/icl/refimages/mbm/jpeg_sml02_refrtmr460_510.mbm
+../data/refimages/mbm/jpeg_sml02_refrtmr480_540.mbm         c:/icl/refimages/mbm/jpeg_sml02_refrtmr480_540.mbm
+../data/refimages/mbm/jpeg_sml02_refrtmr500_530.mbm         c:/icl/refimages/mbm/jpeg_sml02_refrtmr500_530.mbm
+../data/refimages/mbm/jpeg_crpt05_refrtmr710.mbm            c:/icl/refimages/mbm/jpeg_crpt05_refrtmr710.mbm
+../data/refimages/mbm/jpeg_mltscan_refrtmr700.mbm           c:/icl/refimages/mbm/jpeg_mltscan_refrtmr700.mbm
+../data/refimages/mbm/jpeg_reinterop_refrtmr720.mbm         c:/icl/refimages/mbm/jpeg_reinterop_refrtmr720.mbm
+../data/refimages/mbm/jpeg_sml01_refrtmr750.mbm             c:/icl/refimages/mbm/jpeg_sml01_refrtmr750.mbm
+../data/refimages/mbm/jpeg_sml01_refrtmr760.mbm	         c:/icl/refimages/mbm/jpeg_sml01_refrtmr760.mbm
+../data/refimages/mbm/jpeg_sml01_refrtmr770.mbm             c:/icl/refimages/mbm/jpeg_sml01_refrtmr770.mbm
+../data/refimages/mbm/jpeg_sml01_refrtmr780.mbm             c:/icl/refimages/mbm/jpeg_sml01_refrtmr780.mbm
+../data/refimages/mbm/image_content_refrtmr790.mbm             c:/icl/refimages/mbm/image_content_refrtmr790.mbm
+../data/refimages/mbm/jpeg_sml01_refrtmr740.mbm             c:/icl/refimages/mbm/jpeg_sml01_refrtmr740.mbm
+
+../data/refimages/mbm/jpeg_sml05_refmuop10_egray2.mbm       c:/icl/refimages/mbm/jpeg_sml05_refmuop10_egray2.mbm
+../data/refimages/mbm/jpeg_sml05_refmuop20_egray4.mbm       c:/icl/refimages/mbm/jpeg_sml05_refmuop20_egray4.mbm
+../data/refimages/mbm/jpeg_sml05_refmuop30_egray16.mbm      c:/icl/refimages/mbm/jpeg_sml05_refmuop30_egray16.mbm
+../data/refimages/mbm/jpeg_sml05_refmuop40_egray256.mbm     c:/icl/refimages/mbm/jpeg_sml05_refmuop40_egray256.mbm
+../data/refimages/mbm/jpeg_sml05_refmuop50_eclr16.mbm       c:/icl/refimages/mbm/jpeg_sml05_refmuop50_eclr16.mbm
+../data/refimages/mbm/jpeg_sml05_refmuop60_eclr256.mbm      c:/icl/refimages/mbm/jpeg_sml05_refmuop60_eclr256.mbm
+../data/refimages/mbm/jpeg_sml05_refmuop70_eclr64k.mbm      c:/icl/refimages/mbm/jpeg_sml05_refmuop70_eclr64k.mbm
+../data/refimages/mbm/jpeg_sml05_refmuop80_eclr16m.mbm      c:/icl/refimages/mbm/jpeg_sml05_refmuop80_eclr16m.mbm
+../data/refimages/mbm/jpeg_sml05_refmuop90_eclr4k.mbm       c:/icl/refimages/mbm/jpeg_sml05_refmuop90_eclr4k.mbm
+../data/refimages/mbm/jpeg_sml05_refmuop110_egray2.mbm      c:/icl/refimages/mbm/jpeg_sml05_refmuop110_egray2.mbm
+../data/refimages/mbm/jpeg_sml05_refmuop120_egray4.mbm      c:/icl/refimages/mbm/jpeg_sml05_refmuop120_egray4.mbm
+../data/refimages/mbm/jpeg_sml05_refmuop130_egray16.mbm     c:/icl/refimages/mbm/jpeg_sml05_refmuop130_egray16.mbm
+../data/refimages/mbm/jpeg_sml05_refmuop140_egray256.mbm    c:/icl/refimages/mbm/jpeg_sml05_refmuop140_egray256.mbm
+../data/refimages/mbm/jpeg_sml05_refmuop150_eclr16.mbm      c:/icl/refimages/mbm/jpeg_sml05_refmuop150_eclr16.mbm
+../data/refimages/mbm/jpeg_sml05_refmuop160_eclr256.mbm     c:/icl/refimages/mbm/jpeg_sml05_refmuop160_eclr256.mbm
+../data/refimages/mbm/jpeg_sml05_refmuop170_eclr64k.mbm     c:/icl/refimages/mbm/jpeg_sml05_refmuop170_eclr64k.mbm
+../data/refimages/mbm/jpeg_sml04_refmuop180_eclr16m.mbm     c:/icl/refimages/mbm/jpeg_sml04_refmuop180_eclr16m.mbm
+../data/refimages/mbm/jpeg_sml04_refmuop190_eclr4k.mbm      c:/icl/refimages/mbm/jpeg_sml04_refmuop190_eclr4k.mbm
+../data/refimages/mbm/jpeg_sml05_refmuop210_egray2.mbm      c:/icl/refimages/mbm/jpeg_sml05_refmuop210_egray2.mbm
+../data/refimages/mbm/jpeg_sml05_refmuop220_egray4.mbm      c:/icl/refimages/mbm/jpeg_sml05_refmuop220_egray4.mbm
+../data/refimages/mbm/jpeg_sml05_refmuop230_egray16.mbm     c:/icl/refimages/mbm/jpeg_sml05_refmuop230_egray16.mbm
+../data/refimages/mbm/jpeg_sml05_refmuop240_egray256.mbm    c:/icl/refimages/mbm/jpeg_sml05_refmuop240_egray256.mbm
+../data/refimages/mbm/jpeg_sml05_refmuop250_eclr16.mbm      c:/icl/refimages/mbm/jpeg_sml05_refmuop250_eclr16.mbm
+../data/refimages/mbm/jpeg_sml05_refcrop730.mbm      c:/icl/refimages/mbm/jpeg_sml05_refcrop730.mbm
+../data/refimages/mbm/jpeg_sml05_refscal730_egray2.mbm      c:/icl/refimages/mbm/jpeg_sml05_refscal730_egray2.mbm
+
+../data/refimages/mbm/auto_rot_1_refarto10.mbm             c:/icl/refimages/mbm/auto_rot_1_refarto10.mbm
+../data/refimages/mbm/auto_rot_1_refarto20.mbm             c:/icl/refimages/mbm/auto_rot_1_refarto20.mbm
+../data/refimages/mbm/auto_rot_2_refarto30.mbm             c:/icl/refimages/mbm/auto_rot_2_refarto30.mbm
+../data/refimages/mbm/auto_rot_4_refarto40.mbm             c:/icl/refimages/mbm/auto_rot_4_refarto40.mbm
+../data/refimages/mbm/auto_rot_1_refarcr60.mbm             c:/icl/refimages/mbm/auto_rot_1_refarcr60.mbm
+../data/refimages/mbm/auto_rot_1_refarcr70.mbm             c:/icl/refimages/mbm/auto_rot_1_refarcr70.mbm
+../data/refimages/mbm/auto_rot_2_refarsc150_eclr80.mbm     c:/icl/refimages/mbm/auto_rot_2_refarsc150_eclr80.mbm
+../data/refimages/mbm/auto_rot_2_refarsc90_egray2.mbm      c:/icl/refimages/mbm/auto_rot_2_refarsc90_egray2.mbm
+../data/refimages/mbm/bitmap_sml01_refarto110.mbm            c:/icl/refimages/mbm/bitmap_sml01_refarto110.mbm
+../data/refimages/mbm/jpeg_sml03_refarto100.mbm            c:/icl/refimages/mbm/jpeg_sml03_refarto100.mbm
+../data/refimages/mbm/auto_rot_4_ref160_dec1.mbm            c:/icl/refimages/mbm/auto_rot_4_ref160_dec1.mbm
+../data/refimages/mbm/auto_rot_4_refarto160.mbm            c:/icl/refimages/mbm/auto_rot_4_refarto160.mbm
+
+
+#endif
+
+// there used to be a number of exports below which were mirrored in the unit tests.
+// instead these are no longer exported from here and are just exported from the unit
+// tests in order to fix errors in the mrp file mappings.  Thus the unit tests have to 
+// be built before running the integrations tests.
--- a/imagingandcamerafws/imaginginttest/imagedecoder/group/bld_include.inf	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// \inttest\icl\imagedecoder\group is built from \inttest\icl\group
-// 
-//
-
-
-PRJ_MMPFILES
-tsi_icl_imagedecoder.mmp
-
-
-PRJ_EXPORTS
-../group/tsi_icl_imagedecoder.iby                       /epoc32/rom/include/tsi_icl_imagedecoder.iby
-
-../scripts/tsi_icl_imagedecoder_perf.ini                c:/icl/imagedecoder/tsi_icl_imagedecoder_perf.ini
-../scripts/tsi_icl_imagedecoder_perf.script             c:/icl/imagedecoder/tsi_icl_imagedecoder_perf.script
-
-../scripts/tsi_icl_imagedecoder_extinterface.ini        c:/icl/imagedecoder/tsi_icl_imagedecoder_extinterface.ini
-../scripts/tsi_icl_imagedecoder_extinterface.script     c:/icl/imagedecoder/tsi_icl_imagedecoder_extinterface.script
-../scripts/tsi_icl_imagedecoder_extinterface_panic.script       c:/icl/imagedecoder/tsi_icl_imagedecoder_extinterface_panic.script
-
-../scripts/tsi_icl_imagedecoder_crop.ini                c:/icl/imagedecoder/tsi_icl_imagedecoder_crop.ini
-../scripts/tsi_icl_imagedecoder_crop.script             c:/icl/imagedecoder/tsi_icl_imagedecoder_crop.script
-
-../scripts/tsi_icl_imagedecoder_scale.ini               c:/icl/imagedecoder/tsi_icl_imagedecoder_scale.ini
-../scripts/tsi_icl_imagedecoder_scale.script            c:/icl/imagedecoder/tsi_icl_imagedecoder_scale.script
-
-../scripts/tsi_icl_imagedecoder_rotation.ini            c:/icl/imagedecoder/tsi_icl_imagedecoder_rotation.ini
-../scripts/tsi_icl_imagedecoder_rotation.script         c:/icl/imagedecoder/tsi_icl_imagedecoder_rotation.script
-
-../scripts/tsi_icl_imagedecoder_stream.ini              c:/icl/imagedecoder/tsi_icl_imagedecoder_stream.ini
-../scripts/tsi_icl_imagedecoder_stream.script           c:/icl/imagedecoder/tsi_icl_imagedecoder_stream.script
-
-../scripts/tsi_icl_imagedecoder_multipleop.ini          c:/icl/imagedecoder/tsi_icl_imagedecoder_multipleop.ini
-../scripts/tsi_icl_imagedecoder_multipleop.script       c:/icl/imagedecoder/tsi_icl_imagedecoder_multipleop.script
-
-../scripts/tsi_icl_imagedecoder_autorotate.ini            c:/icl/imagedecoder/tsi_icl_imagedecoder_autorotate.ini
-../scripts/tsi_icl_imagedecoder_autorotate.script         c:/icl/imagedecoder/tsi_icl_imagedecoder_autorotate.script
--- a/imagingandcamerafws/imaginginttest/imageencoder/group/bld_include.inf	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// bld.inf
-// 
-//
-
-
-PRJ_MMPFILES
-tsi_icl_imageencoder.mmp
-
-
-PRJ_EXPORTS
-../group/tsi_icl_imageencoder.iby               	/epoc32/rom/include/tsi_icl_imageencoder.iby
-
-../scripts/tsi_icl_imageencoder_perf.ini         	c:/icl/imageencoder/tsi_icl_imageencoder_perf.ini
-../scripts/tsi_icl_imageencoder_perf1.script     	c:/icl/imageencoder/tsi_icl_imageencoder_perf1.script
-../scripts/tsi_icl_imageencoder_perf2.script     	c:/icl/imageencoder/tsi_icl_imageencoder_perf2.script
-../scripts/tsi_icl_imageencoder_perf3.script     	c:/icl/imageencoder/tsi_icl_imageencoder_perf3.script
-
-../scripts/tsi_icl_imageencoder_extinterface.ini    c:/icl/imageencoder/tsi_icl_imageencoder_extinterface.ini
-../scripts/tsi_icl_imageencoder_extinterface.script c:/icl/imageencoder/tsi_icl_imageencoder_extinterface.script
-
-../scripts/tsi_icl_imageencoder_mirror.ini     		c:/icl/imageencoder/tsi_icl_imageencoder_mirror.ini
-../scripts/tsi_icl_imageencoder_mirror1.script     	c:/icl/imageencoder/tsi_icl_imageencoder_mirror1.script
-../scripts/tsi_icl_imageencoder_mirror2.script     	c:/icl/imageencoder/tsi_icl_imageencoder_mirror2.script
-
-../scripts/tsi_icl_imageencoder_stream.ini     		c:/icl/imageencoder/tsi_icl_imageencoder_stream.ini
-../scripts/tsi_icl_imageencoder_stream.script     	c:/icl/imageencoder/tsi_icl_imageencoder_stream.script
Binary file imagingandcamerafws/imaginginttest/src/Data/lain.ppm has changed
--- a/imagingandcamerafws/imaginginttest/src/TestStepConversion.cpp	Thu Jun 24 10:37:45 2010 +0100
+++ b/imagingandcamerafws/imaginginttest/src/TestStepConversion.cpp	Fri Jul 09 12:23:13 2010 +0100
@@ -1609,8 +1609,8 @@
 	INFO_PRINTF1(_L("Implementation information"));
 	INFO_PRINTF2(_L("Display name : %S"), &dispName);
 	INFO_PRINTF2(_L("Version : %d"), theVersion);
-	INFO_PRINTF2(_L("Data type : %S"), &dataType);
-	INFO_PRINTF2(_L("Opaque data : %S"), &opaqueData);
+	//INFO_PRINTF2(_L("Data type : %S"), &dataType);
+	//INFO_PRINTF2(_L("Opaque data : %S"), &opaqueData);
 
 //-------
 	CleanupStack::PopAndDestroy(3, theImageFromFile); //theImageDecoder, theImageFromFile, theImplementationInfo
--- a/imagingandcamerafws/imaginginttest/te_tsi_icl_cod_5/group/bld.inf	Thu Jun 24 10:37:45 2010 +0100
+++ b/imagingandcamerafws/imaginginttest/te_tsi_icl_cod_5/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -14,6 +14,12 @@
 //
 
 PRJ_EXPORTS
+// None
+
+PRJ_MMPFILES
+// None
+
+PRJ_TESTEXPORTS
 
 ../scripts/te_tsi_icl_cod_5Suite_1.script		c:/testdata/scripts/te_tsi_icl_cod_5suite_1.script
 ../scripts/te_tsi_icl_cod_5Suite_2.script		c:/testdata/scripts/te_tsi_icl_cod_5suite_2.script
@@ -946,13 +952,7 @@
 ../testdata/bmp/ref/8bpp_bmp_16mu_no_mask_decode.mbm		c:/te_tsi_icl_cod_05/bmp/ref/8bpp_bmp_16mu_no_mask_decode.mbm
 ../testdata/bmp/ref/8bpp_bmp_16ma_no_mask_decode.mbm		c:/te_tsi_icl_cod_05/bmp/ref/8bpp_bmp_16ma_no_mask_decode.mbm
 
-PRJ_TESTEXPORTS
-// None
-
-PRJ_MMPFILES
+PRJ_TESTMMPFILES
 
 Te_tsi_icl_cod_5suite.mmp
-Te_tsi_icl_cod_5asuite.mmp
-
-PRJ_TESTMMPFILES
-// None
+Te_tsi_icl_cod_5asuite.mmp
\ No newline at end of file
--- a/imagingandcamerafws/imaginginttest/te_tsi_icl_pluginsupport_01/group/bld.inf	Thu Jun 24 10:37:45 2010 +0100
+++ b/imagingandcamerafws/imaginginttest/te_tsi_icl_pluginsupport_01/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -15,14 +15,15 @@
 
 PRJ_EXPORTS
 
+PRJ_MMPFILES
+
+PRJ_TESTEXPORTS
+
 ../testdata/imagetransform_source.jpeg				c:/te_tsi_icl_pluginsupport_01/imagetransform_source.jpeg
 ../scripts/te_tsi_icl_pluginsupport_01suite.script	c:/testdata/scripts/te_tsi_icl_pluginsupport_01suite.script
 ./te_tsi_icl_pluginsupport_01suite.iby   			/epoc32/rom/include/te_tsi_icl_pluginsupport_01suite.iby
 
-PRJ_TESTEXPORTS
 
-PRJ_MMPFILES
+PRJ_TESTMMPFILES
 
 te_tsi_icl_pluginsupport_01suite.mmp
-
-PRJ_TESTMMPFILES
--- a/imagingandcamerafws/imaginginttest/tsi_icl_btrans_01/group/BLD.INF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-PRJ_PLATFORMS
-// specify the platforms your component needs to be built for here
-// may add platform for OMAP, Helen etc
-DEFAULT
-// DEFAULT MISA 
-// WINS ARMI THUMB
-// MINT
-
-PRJ_MMPFILES
-
-../mmpfiles/TSI_ICL_BTRANS_01.mmp
-
-PRJ_EXPORTS
-
-// scripts
-../scripts/TSI_ICL_BTRANS_01.script	c:/mm/tsi_icl_btrans_01.script
-../scripts/TSI_ICL_BTRANS_01_Panic.script	c:/mm/tsi_icl_btrans_01_panic.script
-../scripts/TSI_ICL_BTRANS_01_Alloc.script	c:/mm/tsi_icl_btrans_01_alloc.script
-
-// iby
-TSI_ICL_BTRANS_01.IBY			/epoc32/rom/include/tsi_icl_btrans_01.iby
-
-//test files
-//In order to fix mrp errors the below file is exported from TSU_ICL_COD_01 instead
-//thus the unit tests have to be built before running this test suite.
-//This has been commented below for reference.
-//..\TestFiles\imagevid_8.mbm	 		C:\TImage\imagevid_8.mbm
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/imagingandcamerafws/imaginginttest/tsi_icl_btrans_01/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -0,0 +1,46 @@
+// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRJ_PLATFORMS
+// specify the platforms your component needs to be built for here
+// may add platform for OMAP, Helen etc
+DEFAULT
+// DEFAULT MISA 
+// WINS ARMI THUMB
+// MINT
+
+PRJ_EXPORTS
+
+PRJ_MMPFILES
+
+PRJ_TESTMMPFILES
+
+../mmpfiles/TSI_ICL_BTRANS_01.mmp
+
+PRJ_TESTEXPORTS
+
+// scripts
+../scripts/TSI_ICL_BTRANS_01.script	c:/mm/tsi_icl_btrans_01.script
+../scripts/TSI_ICL_BTRANS_01_Panic.script	c:/mm/tsi_icl_btrans_01_panic.script
+../scripts/TSI_ICL_BTRANS_01_Alloc.script	c:/mm/tsi_icl_btrans_01_alloc.script
+
+// iby
+TSI_ICL_BTRANS_01.IBY			/epoc32/rom/include/tsi_icl_btrans_01.iby
+
+//test files
+//In order to fix mrp errors the below file is exported from TSU_ICL_COD_01 instead
+//thus the unit tests have to be built before running this test suite.
+//This has been commented below for reference.
+//..\TestFiles\imagevid_8.mbm	 		C:\TImage\imagevid_8.mbm
--- a/imagingandcamerafws/imagingunittest/TSU_ICL_COD_03/group/BLD.INF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,170 +0,0 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-PRJ_PLATFORMS
-// specify the platforms your component needs to be built for here
-// may add platform for OMAP, Helen etc
-DEFAULT
-// DEFAULT MISA 
-// WINS ARMI THUMB
-// MINT
-
-PRJ_MMPFILES
-
-// TSI_WP5 files
-../MMPFiles/TSU_ICL_COD_03.mmp
-../MMPFiles/testiclresolver.mmp
-
-PRJ_EXPORTS
-
-// scripts
-../scripts/TSU_ICL_COD_03.script	c:/tsu_icl_cod_03.script
-../scripts/TSU_ICL_COD_03_alloc.script	c:/tsu_icl_cod_03_alloc.script
-
-// iby
-TSU_ICL_COD_03.iby			/epoc32/rom/include/tsu_icl_cod_03.iby
-
-
-PRJ_EXPORTS
-
-// test files
-../TestFiles/gifPalette.mbm    		c:/tsu_icl_cod_03/gifpalette.mbm
-../TestFiles/clinton.mbm    		c:/tsu_icl_cod_03/clinton.mbm
-../TestFiles/anmatcat.mbm    		c:/tsu_icl_cod_03/anmatcat.mbm
-../TestFiles/am475.mbm    		c:/tsu_icl_cod_03/am475.mbm
-../TestFiles/Restart0.mbm    		c:/tsu_icl_cod_03/restart0.mbm
-../TestFiles/InterlacResize.mbm    	c:/tsu_icl_cod_03/interlacresize.mbm
-../TestFiles/Cancel.mbm    		c:/tsu_icl_cod_03/cancel.mbm
-../TestFiles/Comment.mbm    		c:/tsu_icl_cod_03/comment.mbm
-../TestFiles/AdobeMono.mbm    		c:/tsu_icl_cod_03/adobemono.mbm
-../TestFiles/NGimage1.mbm    		c:/tsu_icl_cod_03/ngimage1.mbm
-../TestFiles/bmp1bpp.mbm		c:/tsu_icl_cod_03/bmp1bpp.mbm
-../TestFiles/png8bpp_g0_b.mbm    	c:/tsu_icl_cod_03/png8bpp_g0_b.mbm
-../TestFiles/png4bpp_g0_b.mbm    	c:/tsu_icl_cod_03/png4bpp_g0_b.mbm
-../TestFiles/png2bpp_g0_b.mbm    	c:/tsu_icl_cod_03/png2bpp_g0_b.mbm
-../TestFiles/Anibdog.mbm    		c:/tsu_icl_cod_03/anibdog.mbm
-../TestFiles/bit1.mbm    			c:/tsu_icl_cod_03/bit1.mbm
-../TestFiles/bit2.mbm    			c:/tsu_icl_cod_03/bit2.mbm
-../TestFiles/bit3.mbm    			c:/tsu_icl_cod_03/bit3.mbm
-../TestFiles/bit4.mbm    			c:/tsu_icl_cod_03/bit4.mbm
-../TestFiles/bit5.mbm    			c:/tsu_icl_cod_03/bit5.mbm
-../TestFiles/bit6.mbm    			c:/tsu_icl_cod_03/bit6.mbm
-../TestFiles/bit7.mbm    			c:/tsu_icl_cod_03/bit7.mbm
-../TestFiles/bit8.mbm    			c:/tsu_icl_cod_03/bit8.mbm
-../TestFiles/stil1002.mbm    			c:/tsu_icl_cod_03/stil1002.mbm
-../TestFiles/640X480.mbm    			c:/tsu_icl_cod_03/640x480.mbm
-../TestFiles/160x120_5080.mbm    		c:/tsu_icl_cod_03/160x120_5080.mbm
-../TestFiles/80x60_5080.mbm    			c:/tsu_icl_cod_03/80x60_5080.mbm
-../TestFiles/anim_1_160x120_5080.mbm		c:/tsu_icl_cod_03/anim_1_160x120_5080.mbm
-../TestFiles/anim_2_160x120_5080.mbm		c:/tsu_icl_cod_03/anim_2_160x120_5080.mbm
-../TestFiles/anim_3_160x120_5080.mbm		c:/tsu_icl_cod_03/anim_3_160x120_5080.mbm
-../TestFiles/WMFRef/DibPatternBrush.mbm	c:/tsu_icl_cod_03/wmfref/dibpatternbrush.mbm
-../TestFiles/WMFRef/Intersect.mbm	c:/tsu_icl_cod_03/wmfref/intersect.mbm
-../TestFiles/WMFRef/PatBlt.mbm		c:/tsu_icl_cod_03/wmfref/patblt.mbm
-../TestFiles/WMFRef/Polygon.mbm		c:/tsu_icl_cod_03/wmfref/polygon.mbm
-../TestFiles/WMFRef/Rop2.mbm		c:/tsu_icl_cod_03/wmfref/rop2.mbm
-../TestFiles/WMFRef/Rop2NoBkgnd.mbm	c:/tsu_icl_cod_03/wmfref/rop2nobkgnd.mbm
-../TestFiles/WMFRef/Text.mbm		c:/tsu_icl_cod_03/wmfref/text.mbm
-../TestFiles/WMFRef/The_Rest.mbm	c:/tsu_icl_cod_03/wmfref/the_rest.mbm
-../TestFiles/WMFRef/mso290.mbm 		c:/tsu_icl_cod_03/wmfref/mso290.mbm
-
-../TestFiles/WMFRefMask/DibPatternBrush.mbm	c:/tsu_icl_cod_03/wmfrefmask/dibpatternbrush.mbm
-../TestFiles/WMFRefMask/Intersect.mbm		c:/tsu_icl_cod_03/wmfrefmask/intersect.mbm
-../TestFiles/WMFRefMask/PatBlt.mbm		c:/tsu_icl_cod_03/wmfrefmask/patblt.mbm
-../TestFiles/WMFRefMask/Polygon.mbm		c:/tsu_icl_cod_03/wmfrefmask/polygon.mbm
-../TestFiles/WMFRefMask/Rop2.mbm		c:/tsu_icl_cod_03/wmfrefmask/rop2.mbm
-../TestFiles/WMFRefMask/Rop2NoBkgnd.mbm		c:/tsu_icl_cod_03/wmfrefmask/rop2nobkgnd.mbm
-../TestFiles/WMFRefMask/Text.mbm		c:/tsu_icl_cod_03/wmfrefmask/text.mbm
-../TestFiles/WMFRefMask/The_Rest.mbm		c:/tsu_icl_cod_03/wmfrefmask/the_rest.mbm
-../TestFiles/WMFRefMask/mso290.mbm 		c:/tsu_icl_cod_03/wmfrefmask/mso290.mbm
-
-../TestFiles/WMFArmRef/DibPatternBrush.mbm	c:/tsu_icl_cod_03/wmfarmref/dibpatternbrush.mbm
-../TestFiles/WMFArmRef/Intersect.mbm		c:/tsu_icl_cod_03/wmfarmref/intersect.mbm
-../TestFiles/WMFArmRef/PatBlt.mbm		c:/tsu_icl_cod_03/wmfarmref/patblt.mbm
-../TestFiles/WMFArmRef/Polygon.mbm		c:/tsu_icl_cod_03/wmfarmref/polygon.mbm
-../TestFiles/WMFArmRef/Rop2.mbm			c:/tsu_icl_cod_03/wmfarmref/rop2.mbm
-../TestFiles/WMFArmRef/Rop2NoBkgnd.mbm		c:/tsu_icl_cod_03/wmfarmref/rop2nobkgnd.mbm
-../TestFiles/WMFArmRef/Text.mbm			c:/tsu_icl_cod_03/wmfarmref/text.mbm
-../TestFiles/WMFArmRef/The_Rest.mbm		c:/tsu_icl_cod_03/wmfarmref/the_rest.mbm
-../TestFiles/WMFArmRef/text_ne.mbm			c:/tsu_icl_cod_03/wmfarmref/text_ne.mbm
-../TestFiles/WMFArmRef/the_rest_ne.mbm		c:/tsu_icl_cod_03/wmfarmref/the_rest_ne.mbm
-../TestFiles/WMFArmRef/text_h6.mbm			c:/tsu_icl_cod_03/wmfarmref/text_h6.mbm
-../TestFiles/WMFArmRef/the_rest_h6.mbm		c:/tsu_icl_cod_03/wmfarmref/the_rest_h6.mbm
-../TestFiles/WMFArmRef/mso290.mbm 		c:/tsu_icl_cod_03/wmfarmref/mso290.mbm
-
-../TestFiles/WMFArmRefMask/DibPatternBrush.mbm	c:/tsu_icl_cod_03/wmfarmrefmask/dibpatternbrush.mbm
-../TestFiles/WMFArmRefMask/Intersect.mbm	c:/tsu_icl_cod_03/wmfarmrefmask/intersect.mbm
-../TestFiles/WMFArmRefMask/PatBlt.mbm		c:/tsu_icl_cod_03/wmfarmrefmask/patblt.mbm
-../TestFiles/WMFArmRefMask/Polygon.mbm		c:/tsu_icl_cod_03/wmfarmrefmask/polygon.mbm
-../TestFiles/WMFArmRefMask/Rop2.mbm		c:/tsu_icl_cod_03/wmfarmrefmask/rop2.mbm
-../TestFiles/WMFArmRefMask/Rop2NoBkgnd.mbm	c:/tsu_icl_cod_03/wmfarmrefmask/rop2nobkgnd.mbm
-../TestFiles/WMFArmRefMask/Text.mbm		c:/tsu_icl_cod_03/wmfarmrefmask/text.mbm
-../TestFiles/WMFArmRefMask/The_Rest.mbm		c:/tsu_icl_cod_03/wmfarmrefmask/the_rest.mbm
-../TestFiles/WMFArmRefMask/text_ne.mbm		c:/tsu_icl_cod_03/wmfarmrefmask/text_ne.mbm
-../TestFiles/WMFArmRefMask/the_rest_ne.mbm		c:/tsu_icl_cod_03/wmfarmrefmask/the_rest_ne.mbm
-../TestFiles/WMFArmRefMask/text_h6.mbm		c:/tsu_icl_cod_03/wmfarmrefmask/text_h6.mbm
-../TestFiles/WMFArmRefMask/the_rest_h6.mbm		c:/tsu_icl_cod_03/wmfarmrefmask/the_rest_h6.mbm
-../TestFiles/WMFArmRefMask/mso290.mbm 		c:/tsu_icl_cod_03/wmfarmrefmask/mso290.mbm
-
-../TestFiles/Image(078).mbm			c:/tsu_icl_cod_03/image(078).mbm
-../TestFiles/240_320_xy_15_15(1).mbm			c:/tsu_icl_cod_03/240_320_xy_15_15(1).mbm
-../TestFiles/240_320_xy_15_15(2).mbm			c:/tsu_icl_cod_03/240_320_xy_15_15(2).mbm
-../TestFiles/240_320_xy_15_15(3).mbm			c:/tsu_icl_cod_03/240_320_xy_15_15(3).mbm
-../TestFiles/ref_nail_peace.mbm		c:/tsu_icl_cod_03/ref_nail_peace.mbm
-../TestFiles/ref_mask_peace.mbm			c:/tsu_icl_cod_03/ref_mask_peace.mbm
-../TestFiles/ref_frame_peace.mbm		c:/tsu_icl_cod_03/ref_frame_peace.mbm
-../TestFiles/jfifthumb.mbm			c:/tsu_icl_cod_03/jfifthumb.mbm
-../TestFiles/ref_waterdrop_firstframe.mbm    		c:/tsu_icl_cod_03/ref_waterdrop_firstframe.mbm
-../TestFiles/clock-zero-sub-block.mbm    		c:/tsu_icl_cod_03/clock-zero-sub-block.mbm
-../TestFiles/ref_streamFFFFJpg.mbm              c:/tsu_icl_cod_03/ref_streamffffjpg.mbm
-
-../TestFiles/scaled1.mbm		c:/tsu_icl_cod_03/scaled1.mbm
-../TestFiles/rf4_bmp8bpp_8_bmp.mbm		c:/tsu_icl_cod_03/rf4_bmp8bpp_8_bmp.mbm
-../TestFiles/rf4_anim_640x480_5080_gif.mbm	c:/tsu_icl_cod_03/rf4_anim_640x480_5080_gif.mbm
-../TestFiles/rf4_icoepoc_ico.mbm		c:/tsu_icl_cod_03/rf4_icoepoc_ico.mbm
-../TestFiles/rf4_MISS0001_JPG.mbm		c:/tsu_icl_cod_03/rf4_miss0001_jpg.mbm
-../TestFiles/rf4_scaled1_mbm.mbm		c:/tsu_icl_cod_03/rf4_scaled1_mbm.mbm
-../TestFiles/rf4_operator_ota.mbm		c:/tsu_icl_cod_03/rf4_operator_ota.mbm
-../TestFiles/rf4_png8bpp_g0_b_png.mbm		c:/tsu_icl_cod_03/rf4_png8bpp_g0_b_png.mbm
-../TestFiles/rf4_tif3_4_tif.mbm			c:/tsu_icl_cod_03/rf4_tif3_4_tif.mbm
-../TestFiles/rf4_sun_wbmp.mbm			c:/tsu_icl_cod_03/rf4_sun_wbmp.mbm
-../TestFiles/mso290(2)_0.mbm 	c:/tsu_icl_cod_03/mso290(2)_0.mbm
-../TestFiles/mso290(3)_1.mbm 	c:/tsu_icl_cod_03/mso290(3)_1.mbm
-../TestFiles/mso290(4)_2.mbm 	c:/tsu_icl_cod_03/mso290(4)_2.mbm
-../TestFiles/mso290(5)_3.mbm 	c:/tsu_icl_cod_03/mso290(5)_3.mbm
-../TestFiles/mso290(6)_0.mbm 	c:/tsu_icl_cod_03/mso290(6)_0.mbm
-../TestFiles/mso290(7)_1.mbm 	c:/tsu_icl_cod_03/mso290(7)_1.mbm
-../TestFiles/mso290(8)_2.mbm 	c:/tsu_icl_cod_03/mso290(8)_2.mbm
-../TestFiles/multiscan_EColor16M_0rf.mbm			c:/tsu_icl_cod_03/multiscan_ecolor16m_0rf.mbm
-../TestFiles/multiscan_EColor16M_2rf.mbm			c:/tsu_icl_cod_03/multiscan_ecolor16m_2rf.mbm
-../TestFiles/multiscan_EColor4K_1rf.mbm				c:/tsu_icl_cod_03/multiscan_ecolor4k_1rf.mbm
-../TestFiles/multiscan_EGray2_0rf.mbm				c:/tsu_icl_cod_03/multiscan_egray2_0rf.mbm
-../TestFiles/multiscan_EGray256_3rf.mbm				c:/tsu_icl_cod_03/multiscan_egray256_3rf.mbm
-../TestFiles/multiscan_v_deleted_at_end.mbm			c:/tsu_icl_cod_03/multiscan_v_deleted_at_end.mbm
-../TestFiles/multiscan_uv_few_deleted_at_end.mbm	c:/tsu_icl_cod_03/multiscan_uv_few_deleted_at_end.mbm
-../TestFiles/multiscan1_EColor16M_0rf.mbm			c:/tsu_icl_cod_03/multiscan1_ecolor16m_0rf.mbm
-../TestFiles/multiscan_exif_EColor16M_1rf.mbm		c:/tsu_icl_cod_03/multiscan_exif_ecolor16m_1rf.mbm
-../TestFiles/testsource1.mbm		c:/tsu_icl_cod_03/testsource1.mbm
-../TestFiles/testsource2.mbm		c:/tsu_icl_cod_03/testsource2.mbm
-../TestFiles/os2v1header.mbm    	c:/tsu_icl_cod_03/os2v1header.mbm
-../TestFiles/valuesd1.mbm    		c:/tsu_icl_cod_03/valuesd1.mbm
-../TestFiles/valuesd4.mbm    		c:/tsu_icl_cod_03/valuesd4.mbm
-../TestFiles/valuesd8.mbm    		c:/tsu_icl_cod_03/valuesd8.mbm
-../TestFiles/valuesd24.mbm  	  	c:/tsu_icl_cod_03/valuesd24.mbm
-../TestFiles/winv3depth24withpalettebmp.mbm  	  	c:/tsu_icl_cod_03/winv3depth24withpalettebmp.mbm
-
-../TestFiles/test.dummy		c:/tsu_icl_cod_03/test.dummy
-../TestFiles/anim1_gif89_Reduced_Size_Mask.mbm c:/tsu_icl_cod_03/anim1_gif89_reduced_size_mask.mbm
-../TestFiles/refbut4.mbm		c:/tsu_icl_cod_03/refbut4.mbm
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/imagingandcamerafws/imagingunittest/TSU_ICL_COD_03/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -0,0 +1,177 @@
+// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRJ_PLATFORMS
+// specify the platforms your component needs to be built for here
+// may add platform for OMAP, Helen etc
+DEFAULT
+// DEFAULT MISA 
+// WINS ARMI THUMB
+// MINT
+
+PRJ_MMPFILES
+
+PRJ_EXPORTS
+
+PRJ_EXPORTS
+
+
+PRJ_TESTMMPFILES
+
+// TSI_WP5 files
+../MMPFiles/TSU_ICL_COD_03.mmp
+../MMPFiles/testiclresolver.mmp
+
+PRJ_TESTEXPORTS
+
+// scripts
+../scripts/TSU_ICL_COD_03.script	c:/tsu_icl_cod_03.script
+../scripts/TSU_ICL_COD_03_alloc.script	c:/tsu_icl_cod_03_alloc.script
+
+// iby
+TSU_ICL_COD_03.iby			/epoc32/rom/include/tsu_icl_cod_03.iby
+
+
+PRJ_TESTEXPORTS
+
+// test files
+../TestFiles/gifPalette.mbm    		c:/tsu_icl_cod_03/gifpalette.mbm
+../TestFiles/clinton.mbm    		c:/tsu_icl_cod_03/clinton.mbm
+../TestFiles/anmatcat.mbm    		c:/tsu_icl_cod_03/anmatcat.mbm
+../TestFiles/am475.mbm    		c:/tsu_icl_cod_03/am475.mbm
+../TestFiles/Restart0.mbm    		c:/tsu_icl_cod_03/restart0.mbm
+../TestFiles/InterlacResize.mbm    	c:/tsu_icl_cod_03/interlacresize.mbm
+../TestFiles/Cancel.mbm    		c:/tsu_icl_cod_03/cancel.mbm
+../TestFiles/Comment.mbm    		c:/tsu_icl_cod_03/comment.mbm
+../TestFiles/AdobeMono.mbm    		c:/tsu_icl_cod_03/adobemono.mbm
+../TestFiles/NGimage1.mbm    		c:/tsu_icl_cod_03/ngimage1.mbm
+../TestFiles/bmp1bpp.mbm		c:/tsu_icl_cod_03/bmp1bpp.mbm
+../TestFiles/png8bpp_g0_b.mbm    	c:/tsu_icl_cod_03/png8bpp_g0_b.mbm
+../TestFiles/png4bpp_g0_b.mbm    	c:/tsu_icl_cod_03/png4bpp_g0_b.mbm
+../TestFiles/png2bpp_g0_b.mbm    	c:/tsu_icl_cod_03/png2bpp_g0_b.mbm
+../TestFiles/Anibdog.mbm    		c:/tsu_icl_cod_03/anibdog.mbm
+../TestFiles/bit1.mbm    			c:/tsu_icl_cod_03/bit1.mbm
+../TestFiles/bit2.mbm    			c:/tsu_icl_cod_03/bit2.mbm
+../TestFiles/bit3.mbm    			c:/tsu_icl_cod_03/bit3.mbm
+../TestFiles/bit4.mbm    			c:/tsu_icl_cod_03/bit4.mbm
+../TestFiles/bit5.mbm    			c:/tsu_icl_cod_03/bit5.mbm
+../TestFiles/bit6.mbm    			c:/tsu_icl_cod_03/bit6.mbm
+../TestFiles/bit7.mbm    			c:/tsu_icl_cod_03/bit7.mbm
+../TestFiles/bit8.mbm    			c:/tsu_icl_cod_03/bit8.mbm
+../TestFiles/stil1002.mbm    			c:/tsu_icl_cod_03/stil1002.mbm
+../TestFiles/640X480.mbm    			c:/tsu_icl_cod_03/640x480.mbm
+../TestFiles/160x120_5080.mbm    		c:/tsu_icl_cod_03/160x120_5080.mbm
+../TestFiles/80x60_5080.mbm    			c:/tsu_icl_cod_03/80x60_5080.mbm
+../TestFiles/anim_1_160x120_5080.mbm		c:/tsu_icl_cod_03/anim_1_160x120_5080.mbm
+../TestFiles/anim_2_160x120_5080.mbm		c:/tsu_icl_cod_03/anim_2_160x120_5080.mbm
+../TestFiles/anim_3_160x120_5080.mbm		c:/tsu_icl_cod_03/anim_3_160x120_5080.mbm
+../TestFiles/WMFRef/DibPatternBrush.mbm	c:/tsu_icl_cod_03/wmfref/dibpatternbrush.mbm
+../TestFiles/WMFRef/Intersect.mbm	c:/tsu_icl_cod_03/wmfref/intersect.mbm
+../TestFiles/WMFRef/PatBlt.mbm		c:/tsu_icl_cod_03/wmfref/patblt.mbm
+../TestFiles/WMFRef/Polygon.mbm		c:/tsu_icl_cod_03/wmfref/polygon.mbm
+../TestFiles/WMFRef/Rop2.mbm		c:/tsu_icl_cod_03/wmfref/rop2.mbm
+../TestFiles/WMFRef/Rop2NoBkgnd.mbm	c:/tsu_icl_cod_03/wmfref/rop2nobkgnd.mbm
+../TestFiles/WMFRef/Text.mbm		c:/tsu_icl_cod_03/wmfref/text.mbm
+../TestFiles/WMFRef/The_Rest.mbm	c:/tsu_icl_cod_03/wmfref/the_rest.mbm
+../TestFiles/WMFRef/mso290.mbm 		c:/tsu_icl_cod_03/wmfref/mso290.mbm
+
+../TestFiles/WMFRefMask/DibPatternBrush.mbm	c:/tsu_icl_cod_03/wmfrefmask/dibpatternbrush.mbm
+../TestFiles/WMFRefMask/Intersect.mbm		c:/tsu_icl_cod_03/wmfrefmask/intersect.mbm
+../TestFiles/WMFRefMask/PatBlt.mbm		c:/tsu_icl_cod_03/wmfrefmask/patblt.mbm
+../TestFiles/WMFRefMask/Polygon.mbm		c:/tsu_icl_cod_03/wmfrefmask/polygon.mbm
+../TestFiles/WMFRefMask/Rop2.mbm		c:/tsu_icl_cod_03/wmfrefmask/rop2.mbm
+../TestFiles/WMFRefMask/Rop2NoBkgnd.mbm		c:/tsu_icl_cod_03/wmfrefmask/rop2nobkgnd.mbm
+../TestFiles/WMFRefMask/Text.mbm		c:/tsu_icl_cod_03/wmfrefmask/text.mbm
+../TestFiles/WMFRefMask/The_Rest.mbm		c:/tsu_icl_cod_03/wmfrefmask/the_rest.mbm
+../TestFiles/WMFRefMask/mso290.mbm 		c:/tsu_icl_cod_03/wmfrefmask/mso290.mbm
+
+../TestFiles/WMFArmRef/DibPatternBrush.mbm	c:/tsu_icl_cod_03/wmfarmref/dibpatternbrush.mbm
+../TestFiles/WMFArmRef/Intersect.mbm		c:/tsu_icl_cod_03/wmfarmref/intersect.mbm
+../TestFiles/WMFArmRef/PatBlt.mbm		c:/tsu_icl_cod_03/wmfarmref/patblt.mbm
+../TestFiles/WMFArmRef/Polygon.mbm		c:/tsu_icl_cod_03/wmfarmref/polygon.mbm
+../TestFiles/WMFArmRef/Rop2.mbm			c:/tsu_icl_cod_03/wmfarmref/rop2.mbm
+../TestFiles/WMFArmRef/Rop2NoBkgnd.mbm		c:/tsu_icl_cod_03/wmfarmref/rop2nobkgnd.mbm
+../TestFiles/WMFArmRef/Text.mbm			c:/tsu_icl_cod_03/wmfarmref/text.mbm
+../TestFiles/WMFArmRef/The_Rest.mbm		c:/tsu_icl_cod_03/wmfarmref/the_rest.mbm
+../TestFiles/WMFArmRef/text_ne.mbm			c:/tsu_icl_cod_03/wmfarmref/text_ne.mbm
+../TestFiles/WMFArmRef/the_rest_ne.mbm		c:/tsu_icl_cod_03/wmfarmref/the_rest_ne.mbm
+../TestFiles/WMFArmRef/text_h6.mbm			c:/tsu_icl_cod_03/wmfarmref/text_h6.mbm
+../TestFiles/WMFArmRef/the_rest_h6.mbm		c:/tsu_icl_cod_03/wmfarmref/the_rest_h6.mbm
+../TestFiles/WMFArmRef/mso290.mbm 		c:/tsu_icl_cod_03/wmfarmref/mso290.mbm
+
+../TestFiles/WMFArmRefMask/DibPatternBrush.mbm	c:/tsu_icl_cod_03/wmfarmrefmask/dibpatternbrush.mbm
+../TestFiles/WMFArmRefMask/Intersect.mbm	c:/tsu_icl_cod_03/wmfarmrefmask/intersect.mbm
+../TestFiles/WMFArmRefMask/PatBlt.mbm		c:/tsu_icl_cod_03/wmfarmrefmask/patblt.mbm
+../TestFiles/WMFArmRefMask/Polygon.mbm		c:/tsu_icl_cod_03/wmfarmrefmask/polygon.mbm
+../TestFiles/WMFArmRefMask/Rop2.mbm		c:/tsu_icl_cod_03/wmfarmrefmask/rop2.mbm
+../TestFiles/WMFArmRefMask/Rop2NoBkgnd.mbm	c:/tsu_icl_cod_03/wmfarmrefmask/rop2nobkgnd.mbm
+../TestFiles/WMFArmRefMask/Text.mbm		c:/tsu_icl_cod_03/wmfarmrefmask/text.mbm
+../TestFiles/WMFArmRefMask/The_Rest.mbm		c:/tsu_icl_cod_03/wmfarmrefmask/the_rest.mbm
+../TestFiles/WMFArmRefMask/text_ne.mbm		c:/tsu_icl_cod_03/wmfarmrefmask/text_ne.mbm
+../TestFiles/WMFArmRefMask/the_rest_ne.mbm		c:/tsu_icl_cod_03/wmfarmrefmask/the_rest_ne.mbm
+../TestFiles/WMFArmRefMask/text_h6.mbm		c:/tsu_icl_cod_03/wmfarmrefmask/text_h6.mbm
+../TestFiles/WMFArmRefMask/the_rest_h6.mbm		c:/tsu_icl_cod_03/wmfarmrefmask/the_rest_h6.mbm
+../TestFiles/WMFArmRefMask/mso290.mbm 		c:/tsu_icl_cod_03/wmfarmrefmask/mso290.mbm
+
+../TestFiles/Image(078).mbm			c:/tsu_icl_cod_03/image(078).mbm
+../TestFiles/240_320_xy_15_15(1).mbm			c:/tsu_icl_cod_03/240_320_xy_15_15(1).mbm
+../TestFiles/240_320_xy_15_15(2).mbm			c:/tsu_icl_cod_03/240_320_xy_15_15(2).mbm
+../TestFiles/240_320_xy_15_15(3).mbm			c:/tsu_icl_cod_03/240_320_xy_15_15(3).mbm
+../TestFiles/ref_nail_peace.mbm		c:/tsu_icl_cod_03/ref_nail_peace.mbm
+../TestFiles/ref_mask_peace.mbm			c:/tsu_icl_cod_03/ref_mask_peace.mbm
+../TestFiles/ref_frame_peace.mbm		c:/tsu_icl_cod_03/ref_frame_peace.mbm
+../TestFiles/jfifthumb.mbm			c:/tsu_icl_cod_03/jfifthumb.mbm
+../TestFiles/ref_waterdrop_firstframe.mbm    		c:/tsu_icl_cod_03/ref_waterdrop_firstframe.mbm
+../TestFiles/clock-zero-sub-block.mbm    		c:/tsu_icl_cod_03/clock-zero-sub-block.mbm
+../TestFiles/ref_streamFFFFJpg.mbm              c:/tsu_icl_cod_03/ref_streamffffjpg.mbm
+
+../TestFiles/scaled1.mbm		c:/tsu_icl_cod_03/scaled1.mbm
+../TestFiles/rf4_bmp8bpp_8_bmp.mbm		c:/tsu_icl_cod_03/rf4_bmp8bpp_8_bmp.mbm
+../TestFiles/rf4_anim_640x480_5080_gif.mbm	c:/tsu_icl_cod_03/rf4_anim_640x480_5080_gif.mbm
+../TestFiles/rf4_icoepoc_ico.mbm		c:/tsu_icl_cod_03/rf4_icoepoc_ico.mbm
+../TestFiles/rf4_MISS0001_JPG.mbm		c:/tsu_icl_cod_03/rf4_miss0001_jpg.mbm
+../TestFiles/rf4_scaled1_mbm.mbm		c:/tsu_icl_cod_03/rf4_scaled1_mbm.mbm
+../TestFiles/rf4_operator_ota.mbm		c:/tsu_icl_cod_03/rf4_operator_ota.mbm
+../TestFiles/rf4_png8bpp_g0_b_png.mbm		c:/tsu_icl_cod_03/rf4_png8bpp_g0_b_png.mbm
+../TestFiles/rf4_tif3_4_tif.mbm			c:/tsu_icl_cod_03/rf4_tif3_4_tif.mbm
+../TestFiles/rf4_sun_wbmp.mbm			c:/tsu_icl_cod_03/rf4_sun_wbmp.mbm
+../TestFiles/mso290(2)_0.mbm 	c:/tsu_icl_cod_03/mso290(2)_0.mbm
+../TestFiles/mso290(3)_1.mbm 	c:/tsu_icl_cod_03/mso290(3)_1.mbm
+../TestFiles/mso290(4)_2.mbm 	c:/tsu_icl_cod_03/mso290(4)_2.mbm
+../TestFiles/mso290(5)_3.mbm 	c:/tsu_icl_cod_03/mso290(5)_3.mbm
+../TestFiles/mso290(6)_0.mbm 	c:/tsu_icl_cod_03/mso290(6)_0.mbm
+../TestFiles/mso290(7)_1.mbm 	c:/tsu_icl_cod_03/mso290(7)_1.mbm
+../TestFiles/mso290(8)_2.mbm 	c:/tsu_icl_cod_03/mso290(8)_2.mbm
+../TestFiles/multiscan_EColor16M_0rf.mbm			c:/tsu_icl_cod_03/multiscan_ecolor16m_0rf.mbm
+../TestFiles/multiscan_EColor16M_2rf.mbm			c:/tsu_icl_cod_03/multiscan_ecolor16m_2rf.mbm
+../TestFiles/multiscan_EColor4K_1rf.mbm				c:/tsu_icl_cod_03/multiscan_ecolor4k_1rf.mbm
+../TestFiles/multiscan_EGray2_0rf.mbm				c:/tsu_icl_cod_03/multiscan_egray2_0rf.mbm
+../TestFiles/multiscan_EGray256_3rf.mbm				c:/tsu_icl_cod_03/multiscan_egray256_3rf.mbm
+../TestFiles/multiscan_v_deleted_at_end.mbm			c:/tsu_icl_cod_03/multiscan_v_deleted_at_end.mbm
+../TestFiles/multiscan_uv_few_deleted_at_end.mbm	c:/tsu_icl_cod_03/multiscan_uv_few_deleted_at_end.mbm
+../TestFiles/multiscan1_EColor16M_0rf.mbm			c:/tsu_icl_cod_03/multiscan1_ecolor16m_0rf.mbm
+../TestFiles/multiscan_exif_EColor16M_1rf.mbm		c:/tsu_icl_cod_03/multiscan_exif_ecolor16m_1rf.mbm
+../TestFiles/testsource1.mbm		c:/tsu_icl_cod_03/testsource1.mbm
+../TestFiles/testsource2.mbm		c:/tsu_icl_cod_03/testsource2.mbm
+../TestFiles/os2v1header.mbm    	c:/tsu_icl_cod_03/os2v1header.mbm
+../TestFiles/valuesd1.mbm    		c:/tsu_icl_cod_03/valuesd1.mbm
+../TestFiles/valuesd4.mbm    		c:/tsu_icl_cod_03/valuesd4.mbm
+../TestFiles/valuesd8.mbm    		c:/tsu_icl_cod_03/valuesd8.mbm
+../TestFiles/valuesd24.mbm  	  	c:/tsu_icl_cod_03/valuesd24.mbm
+../TestFiles/winv3depth24withpalettebmp.mbm  	  	c:/tsu_icl_cod_03/winv3depth24withpalettebmp.mbm
+
+../TestFiles/test.dummy		c:/tsu_icl_cod_03/test.dummy
+../TestFiles/anim1_gif89_Reduced_Size_Mask.mbm c:/tsu_icl_cod_03/anim1_gif89_reduced_size_mask.mbm
+../TestFiles/refbut4.mbm		c:/tsu_icl_cod_03/refbut4.mbm
--- a/imagingandcamerafws/imagingunittest/TSU_ICL_COD_04/group/BLD.INF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-
-PRJ_PLATFORMS
-// specify the platforms your component needs to be built for here
-// may add platform for OMAP, Helen etc
-DEFAULT
-
-PRJ_MMPFILES
-
-../MMPFiles/TSU_ICL_COD_04.mmp
-
-PRJ_EXPORTS
-
-// ini file
-../scripts/TSU_ICL_COD_04.ini	c:/tsu_icl_cod_04.ini
-
-// scripts
-../scripts/TSU_ICL_COD_04.script	c:/tsu_icl_cod_04.script
-../scripts/TSU_ICL_COD_04_alloc.script	c:/tsu_icl_cod_04_alloc.script
-../scripts/TSU_ICL_COD_04b.script	c:/tsu_icl_cod_04b.script
-
-../TestFiles/DecodeThumbnail.mbm	c:/tsu_icl_cod_04/decodethumbnail.mbm
-../TestFiles/EncodeTestSource.mbm	c:/tsu_icl_cod_04/encodetestsource.mbm
-../TestFiles/EncodeThumbnail.mbm	c:/tsu_icl_cod_04/encodethumbnail.mbm
-../TestFiles/CamSunset2MPRed2.mbm 			c:/tsu_icl_cod_04/camsunset2mpred2.mbm
-../TestFiles/CamSunset2MPRed3.mbm 			c:/tsu_icl_cod_04/camsunset2mpred3.mbm
-../TestFiles/CamSunset2MPRed2_64K.mbm 			c:/tsu_icl_cod_04/camsunset2mpred2_64k.mbm
-../TestFiles/289_8981100000300165521f.mbm 		c:/tsu_icl_cod_04/289_8981100000300165521f.mbm
-../TestFiles/system-3128-1.mbm 				c:/tsu_icl_cod_04/system-3128-1.mbm
-../TestFiles/NO_TRAIL.mbm 				c:/tsu_icl_cod_04/no_trail.mbm
-../TestFiles/TestCorruptThumbnailHeader.mbm	c:/tsu_icl_cod_04/testcorruptthumbnailheader.mbm
-../TestFiles/TestNoExifReference.mbm		c:/tsu_icl_cod_04/testnoexifreference.mbm
-
-// iby
-TSU_ICL_COD_04.iby			/epoc32/rom/include/tsu_icl_cod_04.iby
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/imagingandcamerafws/imagingunittest/TSU_ICL_COD_04/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -0,0 +1,54 @@
+// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+
+PRJ_PLATFORMS
+// specify the platforms your component needs to be built for here
+// may add platform for OMAP, Helen etc
+DEFAULT
+
+PRJ_MMPFILES
+
+PRJ_EXPORTS
+
+PRJ_TESTMMPFILES
+
+../MMPFiles/TSU_ICL_COD_04.mmp
+
+PRJ_TESTEXPORTS
+
+// ini file
+../scripts/TSU_ICL_COD_04.ini	c:/tsu_icl_cod_04.ini
+
+// scripts
+../scripts/TSU_ICL_COD_04.script	c:/tsu_icl_cod_04.script
+../scripts/TSU_ICL_COD_04_alloc.script	c:/tsu_icl_cod_04_alloc.script
+../scripts/TSU_ICL_COD_04b.script	c:/tsu_icl_cod_04b.script
+
+../TestFiles/DecodeThumbnail.mbm	c:/tsu_icl_cod_04/decodethumbnail.mbm
+../TestFiles/EncodeTestSource.mbm	c:/tsu_icl_cod_04/encodetestsource.mbm
+../TestFiles/EncodeThumbnail.mbm	c:/tsu_icl_cod_04/encodethumbnail.mbm
+../TestFiles/CamSunset2MPRed2.mbm 			c:/tsu_icl_cod_04/camsunset2mpred2.mbm
+../TestFiles/CamSunset2MPRed3.mbm 			c:/tsu_icl_cod_04/camsunset2mpred3.mbm
+../TestFiles/CamSunset2MPRed2_64K.mbm 			c:/tsu_icl_cod_04/camsunset2mpred2_64k.mbm
+../TestFiles/289_8981100000300165521f.mbm 		c:/tsu_icl_cod_04/289_8981100000300165521f.mbm
+../TestFiles/system-3128-1.mbm 				c:/tsu_icl_cod_04/system-3128-1.mbm
+../TestFiles/NO_TRAIL.mbm 				c:/tsu_icl_cod_04/no_trail.mbm
+../TestFiles/TestCorruptThumbnailHeader.mbm	c:/tsu_icl_cod_04/testcorruptthumbnailheader.mbm
+../TestFiles/TestNoExifReference.mbm		c:/tsu_icl_cod_04/testnoexifreference.mbm
+
+// iby
+TSU_ICL_COD_04.iby			/epoc32/rom/include/tsu_icl_cod_04.iby
+
--- a/imagingandcamerafws/imagingunittest/TSU_ICL_TMDAVID/group/BLD.INF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +0,0 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-
-PRJ_PLATFORMS
-// specify the platforms your component needs to be built for here
-// may add platform for OMAP, Helen etc
-DEFAULT
-// DEFAULT MISA 
-// WINS ARMI THUMB
-// MINT
-
-PRJ_MMPFILES
-
-// TSI_WP5 files
-../MMPFiles/TSU_ICL_TMDAVID.mmp
-
-PRJ_EXPORTS
-
-// scripts
-../scripts/TSU_ICL_TMDAVID.script	c:/tsu_icl_tmdavid.script
-
-// iby
-//TSU_ICL_TMDAVID.iby			\epoc32\rom\include\TSU_ICL_TMDAVID.iby
-
-// Test files
-
-../TestFiles/TMdaVid/mbm12bpp.mbm    c:/tmdavid/mbm12bpp.mbm
-../TestFiles/TMdaVid/mbm16bpp.mbm    c:/tmdavid/mbm16bpp.mbm
-../TestFiles/TMdaVid/mbm1bpp.mbm    c:/tmdavid/mbm1bpp.mbm
-../TestFiles/TMdaVid/mbm24bpp.mbm    c:/tmdavid/mbm24bpp.mbm
-../TestFiles/TMdaVid/mbm2bpp.mbm    c:/tmdavid/mbm2bpp.mbm
-../TestFiles/TMdaVid/mbm4bppc.mbm    c:/tmdavid/mbm4bppc.mbm
-../TestFiles/TMdaVid/mbm4bppm.mbm    c:/tmdavid/mbm4bppm.mbm
-../TestFiles/TMdaVid/mbm8bppc.mbm    c:/tmdavid/mbm8bppc.mbm
-../TestFiles/TMdaVid/mbm8bppm.mbm    c:/tmdavid/mbm8bppm.mbm
-../TestFiles/TMdaVid/tmdavid.mbm    c:/tmdavid/tmdavid.mbm
-../TestFiles/TMdaVid/Anon/otabitmap.mbm    c:/tmdavid/anon/otabitmap.mbm
-../TestFiles/TMdaVid/Anon/wirelessbitmap.mbm    c:/tmdavid/anon/wirelessbitmap.mbm
-
-../TestFiles/TMdaVid/Ref/bmp1bpp.mbm    c:/tmdavid/ref/bmp1bpp.mbm
-../TestFiles/TMdaVid/Ref/bmp24bpp.mbm    c:/tmdavid/ref/bmp24bpp.mbm
-../TestFiles/TMdaVid/Ref/bmp4bpp.mbm    c:/tmdavid/ref/bmp4bpp.mbm
-../TestFiles/TMdaVid/Ref/bmp8bpp.mbm    c:/tmdavid/ref/bmp8bpp.mbm
-../TestFiles/TMdaVid/Ref/bmprle4.mbm    c:/tmdavid/ref/bmprle4.mbm
-../TestFiles/TMdaVid/Ref/bmprle8.mbm    c:/tmdavid/ref/bmprle8.mbm
-../TestFiles/TMdaVid/Ref/jfif10.mbm    c:/tmdavid/ref/jfif10.mbm
-../TestFiles/TMdaVid/Ref/jfif100.mbm    c:/tmdavid/ref/jfif100.mbm
-../TestFiles/TMdaVid/Ref/jfif30.mbm    c:/tmdavid/ref/jfif30.mbm
-../TestFiles/TMdaVid/Ref/jfif420.mbm    c:/tmdavid/ref/jfif420.mbm
-../TestFiles/TMdaVid/Ref/jfif422.mbm    c:/tmdavid/ref/jfif422.mbm
-../TestFiles/TMdaVid/Ref/jfif444.mbm    c:/tmdavid/ref/jfif444.mbm
-../TestFiles/TMdaVid/Ref/jfif60.mbm    c:/tmdavid/ref/jfif60.mbm
-../TestFiles/TMdaVid/Ref/jfifMono.mbm    c:/tmdavid/ref/jfifmono.mbm
-../TestFiles/TMdaVid/Ref/jfifProg.mbm    c:/tmdavid/ref/jfifprog.mbm
-../TestFiles/TMdaVid/Ref/mbm12bpp.mbm    c:/tmdavid/ref/mbm12bpp.mbm
-../TestFiles/TMdaVid/Ref/mbm16bpp.mbm    c:/tmdavid/ref/mbm16bpp.mbm
-../TestFiles/TMdaVid/Ref/mbm1bpp.mbm    c:/tmdavid/ref/mbm1bpp.mbm
-../TestFiles/TMdaVid/Ref/mbm24bpp.mbm    c:/tmdavid/ref/mbm24bpp.mbm
-../TestFiles/TMdaVid/Ref/mbm2bpp.mbm    c:/tmdavid/ref/mbm2bpp.mbm
-../TestFiles/TMdaVid/Ref/mbm4bppc.mbm    c:/tmdavid/ref/mbm4bppc.mbm
-../TestFiles/TMdaVid/Ref/mbm4bppm.mbm    c:/tmdavid/ref/mbm4bppm.mbm
-../TestFiles/TMdaVid/Ref/mbm8bppc.mbm    c:/tmdavid/ref/mbm8bppc.mbm
-../TestFiles/TMdaVid/Ref/mbm8bppm.mbm    c:/tmdavid/ref/mbm8bppm.mbm
-../TestFiles/TMdaVid/Ref/png1.mbm    c:/tmdavid/ref/png1.mbm
-../TestFiles/TMdaVid/Ref/png2.mbm    c:/tmdavid/ref/png2.mbm
-../TestFiles/TMdaVid/Ref/png3.mbm    c:/tmdavid/ref/png3.mbm
-../TestFiles/TMdaVid/Ref/png4.mbm    c:/tmdavid/ref/png4.mbm
-../TestFiles/TMdaVid/Ref/scaled0.mbm    c:/tmdavid/ref/scaled0.mbm
-../TestFiles/TMdaVid/Ref/scaled1.mbm    c:/tmdavid/ref/scaled1.mbm
-../TestFiles/TMdaVid/Ref/scaled2.mbm    c:/tmdavid/ref/scaled2.mbm
-../TestFiles/TMdaVid/Ref/scaled3.mbm    c:/tmdavid/ref/scaled3.mbm
-../TestFiles/TMdaVid/Ref/scaled4.mbm    c:/tmdavid/ref/scaled4.mbm
-../TestFiles/TMdaVid/Ref/scaled5.mbm    c:/tmdavid/ref/scaled5.mbm
-../TestFiles/TMdaVid/Ref/tif1.mbm    c:/tmdavid/ref/tif1.mbm
-../TestFiles/TMdaVid/Ref/tif2.mbm    c:/tmdavid/ref/tif2.mbm
-../TestFiles/TMdaVid/Ref/tif3.mbm    c:/tmdavid/ref/tif3.mbm
-../TestFiles/TMdaVid/Ref/tmdavid.mbm    c:/tmdavid/ref/tmdavid.mbm
-../TestFiles/TMdaVid/Ref/trans.mbm    c:/tmdavid/ref/trans.mbm
-../TestFiles/TMdaVid/Ref/wmf1.mbm    c:/tmdavid/ref/wmf1.mbm
-../TestFiles/TMdaVid/Ref/wmf2.mbm    c:/tmdavid/ref/wmf2.mbm
-../TestFiles/TMdaVid/Ref/wmf3.mbm    c:/tmdavid/ref/wmf3.mbm
-../TestFiles/TMdaVid/Ref/wmf4.mbm    c:/tmdavid/ref/wmf4.mbm
-../TestFiles/TMdaVid/Ref/wmf5.mbm    c:/tmdavid/ref/wmf5.mbm
-../TestFiles/TMdaVid/Ref/wmf6.mbm    c:/tmdavid/ref/wmf6.mbm
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/imagingandcamerafws/imagingunittest/TSU_ICL_TMDAVID/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -0,0 +1,101 @@
+// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+
+PRJ_PLATFORMS
+// specify the platforms your component needs to be built for here
+// may add platform for OMAP, Helen etc
+DEFAULT
+// DEFAULT MISA 
+// WINS ARMI THUMB
+// MINT
+
+PRJ_MMPFILES
+
+PRJ_TESTMMPFILES
+
+// TSI_WP5 files
+../MMPFiles/TSU_ICL_TMDAVID.mmp
+
+PRJ_EXPORTS
+
+PRJ_TESTEXPORTS
+
+// scripts
+../scripts/TSU_ICL_TMDAVID.script	c:/tsu_icl_tmdavid.script
+
+// iby
+//TSU_ICL_TMDAVID.iby			\epoc32\rom\include\TSU_ICL_TMDAVID.iby
+
+// Test files
+
+../TestFiles/TMdaVid/mbm12bpp.mbm    c:/tmdavid/mbm12bpp.mbm
+../TestFiles/TMdaVid/mbm16bpp.mbm    c:/tmdavid/mbm16bpp.mbm
+../TestFiles/TMdaVid/mbm1bpp.mbm    c:/tmdavid/mbm1bpp.mbm
+../TestFiles/TMdaVid/mbm24bpp.mbm    c:/tmdavid/mbm24bpp.mbm
+../TestFiles/TMdaVid/mbm2bpp.mbm    c:/tmdavid/mbm2bpp.mbm
+../TestFiles/TMdaVid/mbm4bppc.mbm    c:/tmdavid/mbm4bppc.mbm
+../TestFiles/TMdaVid/mbm4bppm.mbm    c:/tmdavid/mbm4bppm.mbm
+../TestFiles/TMdaVid/mbm8bppc.mbm    c:/tmdavid/mbm8bppc.mbm
+../TestFiles/TMdaVid/mbm8bppm.mbm    c:/tmdavid/mbm8bppm.mbm
+../TestFiles/TMdaVid/tmdavid.mbm    c:/tmdavid/tmdavid.mbm
+../TestFiles/TMdaVid/Anon/otabitmap.mbm    c:/tmdavid/anon/otabitmap.mbm
+../TestFiles/TMdaVid/Anon/wirelessbitmap.mbm    c:/tmdavid/anon/wirelessbitmap.mbm
+
+../TestFiles/TMdaVid/Ref/bmp1bpp.mbm    c:/tmdavid/ref/bmp1bpp.mbm
+../TestFiles/TMdaVid/Ref/bmp24bpp.mbm    c:/tmdavid/ref/bmp24bpp.mbm
+../TestFiles/TMdaVid/Ref/bmp4bpp.mbm    c:/tmdavid/ref/bmp4bpp.mbm
+../TestFiles/TMdaVid/Ref/bmp8bpp.mbm    c:/tmdavid/ref/bmp8bpp.mbm
+../TestFiles/TMdaVid/Ref/bmprle4.mbm    c:/tmdavid/ref/bmprle4.mbm
+../TestFiles/TMdaVid/Ref/bmprle8.mbm    c:/tmdavid/ref/bmprle8.mbm
+../TestFiles/TMdaVid/Ref/jfif10.mbm    c:/tmdavid/ref/jfif10.mbm
+../TestFiles/TMdaVid/Ref/jfif100.mbm    c:/tmdavid/ref/jfif100.mbm
+../TestFiles/TMdaVid/Ref/jfif30.mbm    c:/tmdavid/ref/jfif30.mbm
+../TestFiles/TMdaVid/Ref/jfif420.mbm    c:/tmdavid/ref/jfif420.mbm
+../TestFiles/TMdaVid/Ref/jfif422.mbm    c:/tmdavid/ref/jfif422.mbm
+../TestFiles/TMdaVid/Ref/jfif444.mbm    c:/tmdavid/ref/jfif444.mbm
+../TestFiles/TMdaVid/Ref/jfif60.mbm    c:/tmdavid/ref/jfif60.mbm
+../TestFiles/TMdaVid/Ref/jfifMono.mbm    c:/tmdavid/ref/jfifmono.mbm
+../TestFiles/TMdaVid/Ref/jfifProg.mbm    c:/tmdavid/ref/jfifprog.mbm
+../TestFiles/TMdaVid/Ref/mbm12bpp.mbm    c:/tmdavid/ref/mbm12bpp.mbm
+../TestFiles/TMdaVid/Ref/mbm16bpp.mbm    c:/tmdavid/ref/mbm16bpp.mbm
+../TestFiles/TMdaVid/Ref/mbm1bpp.mbm    c:/tmdavid/ref/mbm1bpp.mbm
+../TestFiles/TMdaVid/Ref/mbm24bpp.mbm    c:/tmdavid/ref/mbm24bpp.mbm
+../TestFiles/TMdaVid/Ref/mbm2bpp.mbm    c:/tmdavid/ref/mbm2bpp.mbm
+../TestFiles/TMdaVid/Ref/mbm4bppc.mbm    c:/tmdavid/ref/mbm4bppc.mbm
+../TestFiles/TMdaVid/Ref/mbm4bppm.mbm    c:/tmdavid/ref/mbm4bppm.mbm
+../TestFiles/TMdaVid/Ref/mbm8bppc.mbm    c:/tmdavid/ref/mbm8bppc.mbm
+../TestFiles/TMdaVid/Ref/mbm8bppm.mbm    c:/tmdavid/ref/mbm8bppm.mbm
+../TestFiles/TMdaVid/Ref/png1.mbm    c:/tmdavid/ref/png1.mbm
+../TestFiles/TMdaVid/Ref/png2.mbm    c:/tmdavid/ref/png2.mbm
+../TestFiles/TMdaVid/Ref/png3.mbm    c:/tmdavid/ref/png3.mbm
+../TestFiles/TMdaVid/Ref/png4.mbm    c:/tmdavid/ref/png4.mbm
+../TestFiles/TMdaVid/Ref/scaled0.mbm    c:/tmdavid/ref/scaled0.mbm
+../TestFiles/TMdaVid/Ref/scaled1.mbm    c:/tmdavid/ref/scaled1.mbm
+../TestFiles/TMdaVid/Ref/scaled2.mbm    c:/tmdavid/ref/scaled2.mbm
+../TestFiles/TMdaVid/Ref/scaled3.mbm    c:/tmdavid/ref/scaled3.mbm
+../TestFiles/TMdaVid/Ref/scaled4.mbm    c:/tmdavid/ref/scaled4.mbm
+../TestFiles/TMdaVid/Ref/scaled5.mbm    c:/tmdavid/ref/scaled5.mbm
+../TestFiles/TMdaVid/Ref/tif1.mbm    c:/tmdavid/ref/tif1.mbm
+../TestFiles/TMdaVid/Ref/tif2.mbm    c:/tmdavid/ref/tif2.mbm
+../TestFiles/TMdaVid/Ref/tif3.mbm    c:/tmdavid/ref/tif3.mbm
+../TestFiles/TMdaVid/Ref/tmdavid.mbm    c:/tmdavid/ref/tmdavid.mbm
+../TestFiles/TMdaVid/Ref/trans.mbm    c:/tmdavid/ref/trans.mbm
+../TestFiles/TMdaVid/Ref/wmf1.mbm    c:/tmdavid/ref/wmf1.mbm
+../TestFiles/TMdaVid/Ref/wmf2.mbm    c:/tmdavid/ref/wmf2.mbm
+../TestFiles/TMdaVid/Ref/wmf3.mbm    c:/tmdavid/ref/wmf3.mbm
+../TestFiles/TMdaVid/Ref/wmf4.mbm    c:/tmdavid/ref/wmf4.mbm
+../TestFiles/TMdaVid/Ref/wmf5.mbm    c:/tmdavid/ref/wmf5.mbm
+../TestFiles/TMdaVid/Ref/wmf6.mbm    c:/tmdavid/ref/wmf6.mbm
--- a/imagingandcamerafws/imagingunittest/group/BLD.INF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// BLD.INF - Overall ICL UnitTest bld.inf file
-// 
-//
-
-
-PRJ_PLATFORMS
-// specify the platforms your component needs to be built for here
-// may add platform for OMAP, Helen etc
-DEFAULT
-
-
-#include "../testcodec/group/bld.inf"
-
-#include "../tsu_icl_frm_01/group/bld.inf"
-
-#include "../tsu_icl_cod_01/group/BLD.INF"
-
-#include "../tsu_icl_cod_02/group/BLD.INF"
-
-#include "../TSU_ICL_COD_03/group/BLD.INF"
-
-#include "../TSU_ICL_COD_04/group/BLD.INF"
-
-#include "../tsu_icl_mediasvr/group/bld.inf"
-
-#include "../tsu_icl_btrans_01/group/bld.inf"
-
-#include "../TSU_ICL_TMDAVID/group/BLD.INF"
-
-#include "../tsu_icl_imgdisp/group/bld.inf"
-
-#include "../tsu_icl_GenIclImgDisp_01/group/bld.inf"
-
-#include "../tsu_icl_MngImgDisp_01/group/bld.inf"
-
-#include "../tsu_icl_imageframe/group/bld.inf"
-
-#include "../tsu_icl_pfm_02/group/BLD.INF"
-
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/imagingandcamerafws/imagingunittest/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -0,0 +1,53 @@
+// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// BLD.INF - Overall ICL UnitTest bld.inf file
+// 
+//
+
+
+PRJ_PLATFORMS
+// specify the platforms your component needs to be built for here
+// may add platform for OMAP, Helen etc
+DEFAULT
+
+
+#include "../testcodec/group/bld.inf"
+
+#include "../tsu_icl_frm_01/group/bld.inf"
+
+#include "../tsu_icl_cod_01/group/bld.inf"
+
+#include "../tsu_icl_cod_02/group/bld.inf"
+
+#include "../TSU_ICL_COD_03/group/bld.inf"
+
+#include "../TSU_ICL_COD_04/group/bld.inf"
+
+#include "../tsu_icl_mediasvr/group/bld.inf"
+
+#include "../tsu_icl_btrans_01/group/bld.inf"
+
+#include "../TSU_ICL_TMDAVID/group/bld.inf"
+
+#include "../tsu_icl_imgdisp/group/bld.inf"
+
+#include "../tsu_icl_GenIclImgDisp_01/group/bld.inf"
+
+#include "../tsu_icl_MngImgDisp_01/group/bld.inf"
+
+#include "../tsu_icl_imageframe/group/bld.inf"
+
+#include "../tsu_icl_pfm_02/group/bld.inf"
+
+
--- a/imagingandcamerafws/imagingunittest/testcodec/group/bld.inf	Thu Jun 24 10:37:45 2010 +0100
+++ b/imagingandcamerafws/imagingunittest/testcodec/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -20,14 +20,17 @@
 
 PRJ_EXPORTS
 
+PRJ_MMPFILES
+
+PRJ_TESTEXPORTS
+
 // IBY file
 ExtendedTestCodec.iby		/epoc32/rom/include/extendedtestcodec.iby
 TestCodec.iby			/epoc32/rom/include/testcodec.iby
 fwexttestcodec.iby		/epoc32/rom/include/fwexttestcodec.iby
 
-PRJ_MMPFILES
+PRJ_TESTMMPFILES
 ../mmpfiles/ExtendedPlugin.mmp
 ../mmpfiles/ExtendedTestCodec.mmp
 ../mmpfiles/TestCodec.mmp
-../mmpfiles/fwexttestcodec.mmp
-
+../mmpfiles/fwexttestcodec.mmp
\ No newline at end of file
--- a/imagingandcamerafws/imagingunittest/tsu_icl_GenIclImgDisp_01/group/bld.inf	Thu Jun 24 10:37:45 2010 +0100
+++ b/imagingandcamerafws/imagingunittest/tsu_icl_GenIclImgDisp_01/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -16,9 +16,13 @@
 //
 
 PRJ_MMPFILES
+
+PRJ_EXPORTS
+
+PRJ_TESTMMPFILES
 ../mmpfiles/tsu_icl_GenIclImgDisp_01.mmp
 
-PRJ_EXPORTS
+PRJ_TESTEXPORTS
 
 // test scripts
 ../scripts/TSU_ICL_ExifImgDisp_01.script	c:/tsu_icl_exifimgdisp_01.script
@@ -84,4 +88,3 @@
 // .iby
 ../inc/tsu_icl_ExifImgDisp_01.iby	/epoc32/rom/include/tsu_icl_exifimgdisp_01.iby
 
-
--- a/imagingandcamerafws/imagingunittest/tsu_icl_MngImgDisp_01/group/bld.inf	Thu Jun 24 10:37:45 2010 +0100
+++ b/imagingandcamerafws/imagingunittest/tsu_icl_MngImgDisp_01/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -16,9 +16,14 @@
 //
 
 PRJ_MMPFILES
+
+PRJ_EXPORTS
+
+
+PRJ_TESTMMPFILES
 ../mmpfiles/tsu_icl_MngImgDisp_01.mmp
 
-PRJ_EXPORTS
+PRJ_TESTEXPORTS
 
 // test scripts
 ../scripts/TSU_ICL_MngImgDisp_01.script			c:/tsu_icl_mngimgdisp_01.script
@@ -98,4 +103,3 @@
 // .iby
 ../inc/tsu_icl_MngImgDisp_01.iby	/epoc32/rom/include/tsu_icl_mngimgdisp_01.iby
 
-
--- a/imagingandcamerafws/imagingunittest/tsu_icl_btrans_01/group/bld.inf	Thu Jun 24 10:37:45 2010 +0100
+++ b/imagingandcamerafws/imagingunittest/tsu_icl_btrans_01/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -17,9 +17,13 @@
 //
 
 PRJ_MMPFILES
+
+PRJ_EXPORTS
+
+PRJ_TESTMMPFILES
   ../mmpfiles/TSU_ICL_BTRANS_01.mmp
 
-PRJ_EXPORTS
+PRJ_TESTEXPORTS
 
 // test scripts
 ../scripts/TSU_ICL_BTRANS_01.script	c:/tsu_icl_btrans_01.script
--- a/imagingandcamerafws/imagingunittest/tsu_icl_btrans_01/inc/TSU_ICL_BTRANS_01.iby	Thu Jun 24 10:37:45 2010 +0100
+++ b/imagingandcamerafws/imagingunittest/tsu_icl_btrans_01/inc/TSU_ICL_BTRANS_01.iby	Fri Jul 09 12:23:13 2010 +0100
@@ -25,3 +25,5 @@
 data=EPOCROOT##epoc32\data\c\TSU_ICL_BTRANS_01_Panic.script     \TSU_ICL_BTRANS_01_Panic.script
 
 #endif
+
+
--- a/imagingandcamerafws/imagingunittest/tsu_icl_cod_01/group/BLD.INF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-
-PRJ_PLATFORMS
-// specify the platforms your component needs to be built for here
-// may add platform for OMAP, Helen etc
-DEFAULT
-// DEFAULT MISA 
-// WINS ARMI THUMB
-// MINT
-
-PRJ_MMPFILES
-
-// TSI_WP5 files
-../mmpfiles/TSU_ICL_COD_01.mmp
-
-PRJ_EXPORTS
-
-// scripts
-../scripts/TSU_ICL_COD_01.script	c:/tsu_icl_cod_01.script
-../scripts/TSU_ICL_COD_01_alloc.script	c:/tsu_icl_cod_01_alloc.script
-../scripts/TSU_ICL_COD_01b_alloc.script	c:/tsu_icl_cod_01b_alloc.script
-../scripts/TSU_ICL_COD_01c_alloc.script	c:/tsu_icl_cod_01c_alloc.script
-../scripts/TSU_ICL_COD_01_Panic.script	c:/tsu_icl_cod_01_panic.script
-../scripts/TSU_ICL_COD_01.ini			c:/tsu_icl_cod_01.ini
-
-// iby
-TSU_ICL_COD_01.iby			/epoc32/rom/include/tsu_icl_cod_01.iby
-
-PRJ_EXPORTS
-#include "bld_TImageTestExports.inf"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/imagingandcamerafws/imagingunittest/tsu_icl_cod_01/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -0,0 +1,51 @@
+// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+
+PRJ_PLATFORMS
+// specify the platforms your component needs to be built for here
+// may add platform for OMAP, Helen etc
+DEFAULT
+// DEFAULT MISA 
+// WINS ARMI THUMB
+// MINT
+
+PRJ_MMPFILES
+
+// TSI_WP5 files
+../mmpfiles/TSU_ICL_COD_01.mmp
+
+PRJ_EXPORTS
+
+PRJ_TESTMMPFILES
+
+// TSI_WP5 files
+../mmpfiles/TSU_ICL_COD_01.mmp
+
+PRJ_TESTEXPORTS
+
+// scripts
+../scripts/TSU_ICL_COD_01.script	c:/tsu_icl_cod_01.script
+../scripts/TSU_ICL_COD_01_alloc.script	c:/tsu_icl_cod_01_alloc.script
+../scripts/TSU_ICL_COD_01b_alloc.script	c:/tsu_icl_cod_01b_alloc.script
+../scripts/TSU_ICL_COD_01c_alloc.script	c:/tsu_icl_cod_01c_alloc.script
+../scripts/TSU_ICL_COD_01_Panic.script	c:/tsu_icl_cod_01_panic.script
+../scripts/TSU_ICL_COD_01.ini			c:/tsu_icl_cod_01.ini
+
+// iby
+TSU_ICL_COD_01.iby			/epoc32/rom/include/tsu_icl_cod_01.iby
+
+PRJ_TESTEXPORTS
+#include "bld_TImageTestExports.inf"
--- a/imagingandcamerafws/imagingunittest/tsu_icl_cod_02/group/BLD.INF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-PRJ_PLATFORMS
-// specify the platforms your component needs to be built for here
-// may add platform for OMAP, Helen etc
-DEFAULT
-// DEFAULT MISA 
-// WINS ARMI THUMB
-// MINT
-
-PRJ_MMPFILES
-
-// TSI_WP5 files
-../mmpfiles/TSU_ICL_COD_02.mmp
-../mmpfiles/TSU_ICL_COD_02_Recog.mmp
-
-PRJ_EXPORTS
-
-// scripts
-../scripts/TSU_ICL_COD_02.script		c:/tsu_icl_cod_02.script
-../scripts/TSU_ICL_COD_02_Recog.script		c:/tsu_icl_cod_02_recog.script
-../scripts/TSU_ICL_COD_02_Recog_ALLOC.script	c:/tsu_icl_cod_02_recog_alloc.script
-
-// iby
-TSU_ICL_COD_02.iby			/epoc32/rom/include/tsu_icl_cod_02.iby
-
-
-PRJ_EXPORTS
-
-// test files
-../TestFiles/wolf.mbm c:/tsu_icl_cod_02/wolf.mbm
-../TestFiles/A.txt c:/tsu_icl_cod_02/a.txt
-../TestFiles/B.txt c:/tsu_icl_cod_02/b.txt
-../TestFiles/G.txt c:/tsu_icl_cod_02/g.txt
-../TestFiles/Gif.txt c:/tsu_icl_cod_02/gif.txt
-../TestFiles/I.txt c:/tsu_icl_cod_02/i.txt
-../TestFiles/M.txt c:/tsu_icl_cod_02/m.txt
-../TestFiles/R.txt c:/tsu_icl_cod_02/r.txt
--- a/imagingandcamerafws/imagingunittest/tsu_icl_cod_02/group/TSU_ICL_COD_02.iby	Thu Jun 24 10:37:45 2010 +0100
+++ b/imagingandcamerafws/imagingunittest/tsu_icl_cod_02/group/TSU_ICL_COD_02.iby	Fri Jul 09 12:23:13 2010 +0100
@@ -26,6 +26,14 @@
 data=EPOCROOT##epoc32\data\c\TSU_ICL_COD_02_Recog.script   	\TSU_ICL_COD_02_Recog.script
 data=EPOCROOT##epoc32\data\c\TSU_ICL_COD_02_Recog_ALLOC.script   \TSU_ICL_COD_02_Recog_ALLOC.script
 
+data=EPOCROOT##epoc32\data\c\tsu_icl_cod_02\wolf.mbm   	   	\tsu_icl_cod_02\wolf.mbm
+data=EPOCROOT##epoc32\data\c\tsu_icl_cod_02\a.txt   	   	\tsu_icl_cod_02\a.txt
+data=EPOCROOT##epoc32\data\c\tsu_icl_cod_02\b.txt   	   	\tsu_icl_cod_02\b.txt
+data=EPOCROOT##epoc32\data\c\tsu_icl_cod_02\g.txt   	   	\tsu_icl_cod_02\g.txt
+data=EPOCROOT##epoc32\data\c\tsu_icl_cod_02\gif.txt   	   	\tsu_icl_cod_02\gif.txt
+data=EPOCROOT##epoc32\data\c\tsu_icl_cod_02\i.txt   	   	\tsu_icl_cod_02\i.txt
+data=EPOCROOT##epoc32\data\c\tsu_icl_cod_02\m.txt   	   	\tsu_icl_cod_02\m.txt
+data=EPOCROOT##epoc32\data\c\tsu_icl_cod_02\r.txt   	   	\tsu_icl_cod_02\r.txt
 
 #endif __TSU_ICL_COD_02_IBY__
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/imagingandcamerafws/imagingunittest/tsu_icl_cod_02/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -0,0 +1,57 @@
+// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRJ_PLATFORMS
+// specify the platforms your component needs to be built for here
+// may add platform for OMAP, Helen etc
+DEFAULT
+// DEFAULT MISA 
+// WINS ARMI THUMB
+// MINT
+
+PRJ_MMPFILES
+
+PRJ_EXPORTS
+
+PRJ_EXPORTS
+
+PRJ_TESTMMPFILES
+
+// TSI_WP5 files
+../mmpfiles/TSU_ICL_COD_02.mmp
+../mmpfiles/TSU_ICL_COD_02_Recog.mmp
+
+PRJ_TESTEXPORTS
+
+// scripts
+../scripts/TSU_ICL_COD_02.script		c:/tsu_icl_cod_02.script
+../scripts/TSU_ICL_COD_02_Recog.script		c:/tsu_icl_cod_02_recog.script
+../scripts/TSU_ICL_COD_02_Recog_ALLOC.script	c:/tsu_icl_cod_02_recog_alloc.script
+
+// iby
+TSU_ICL_COD_02.iby			/epoc32/rom/include/tsu_icl_cod_02.iby
+
+
+PRJ_TESTEXPORTS
+
+// test files
+../TestFiles/wolf.mbm c:/tsu_icl_cod_02/wolf.mbm
+../TestFiles/A.txt c:/tsu_icl_cod_02/a.txt
+../TestFiles/B.txt c:/tsu_icl_cod_02/b.txt
+../TestFiles/G.txt c:/tsu_icl_cod_02/g.txt
+../TestFiles/Gif.txt c:/tsu_icl_cod_02/gif.txt
+../TestFiles/I.txt c:/tsu_icl_cod_02/i.txt
+../TestFiles/M.txt c:/tsu_icl_cod_02/m.txt
+../TestFiles/R.txt c:/tsu_icl_cod_02/r.txt
\ No newline at end of file
--- a/imagingandcamerafws/imagingunittest/tsu_icl_frm_01/group/bld.inf	Thu Jun 24 10:37:45 2010 +0100
+++ b/imagingandcamerafws/imagingunittest/tsu_icl_frm_01/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -17,9 +17,13 @@
 //
 
 PRJ_MMPFILES
+
+PRJ_EXPORTS
+
+PRJ_TESTMMPFILES
   ../mmpfiles/TSU_ICL_FRM_01.mmp
 
-PRJ_EXPORTS
+PRJ_TESTEXPORTS
 
 // Test scripts
 ../scripts/TSU_ICL_FRM_01.script	c:/tsu_icl_frm_01.script
Binary file imagingandcamerafws/imagingunittest/tsu_icl_frm_01/testfiles/fw_ext_not_supported_test1.ppm has changed
--- a/imagingandcamerafws/imagingunittest/tsu_icl_gscal_01/group/bld.inf	Thu Jun 24 10:37:45 2010 +0100
+++ b/imagingandcamerafws/imagingunittest/tsu_icl_gscal_01/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -17,9 +17,13 @@
 //
 
 PRJ_MMPFILES
+
+PRJ_EXPORTS
+
+PRJ_TESTMMPFILES
 ../mmpfiles/TSU_ICL_GSCAL_01.mmp
 
-PRJ_EXPORTS
+PRJ_TESTEXPORTS
 
 // test scripts
 ../scripts/TSU_ICL_GSCAL_01.script		c:/tsu_icl_gscal_01.script
@@ -60,4 +64,3 @@
 
 ../TestFiles/png2_2_8pmThrsh.mbm		c:/tsu_icl_gscal_01/png2_2_8pmthrsh.mbm
 
-
--- a/imagingandcamerafws/imagingunittest/tsu_icl_imageframe/group/bld.inf	Thu Jun 24 10:37:45 2010 +0100
+++ b/imagingandcamerafws/imagingunittest/tsu_icl_imageframe/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -17,9 +17,14 @@
 //
 
 PRJ_MMPFILES
+
+
+PRJ_EXPORTS
+
+PRJ_TESTMMPFILES
 ../mmpfiles/tsu_icl_imageframe.mmp
 
-PRJ_EXPORTS
+PRJ_TESTEXPORTS
 
 // test scripts
 ../scripts/TSU_ICL_ImageFrame.script		c:/tsu_icl_imageframe.script
--- a/imagingandcamerafws/imagingunittest/tsu_icl_imgdisp/group/bld.inf	Thu Jun 24 10:37:45 2010 +0100
+++ b/imagingandcamerafws/imagingunittest/tsu_icl_imgdisp/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -17,10 +17,15 @@
 //
 
 PRJ_MMPFILES
+
+
+PRJ_EXPORTS
+
+PRJ_TESTMMPFILES
 ../mmpfiles/TestImgDisplay.mmp
 ../mmpfiles/tsu_icl_ImgDisp_01.mmp
 
-PRJ_EXPORTS
+PRJ_TESTEXPORTS
 
 // test scripts
 ../scripts/TSU_ICL_ImgDisp_01.script		c:/tsu_icl_imgdisp_01.script
@@ -36,4 +41,3 @@
 // .iby
 ../inc/tsu_icl_ImgDisp_01.iby	/epoc32/rom/include/tsu_icl_imgdisp_01.iby
 
-
--- a/imagingandcamerafws/imagingunittest/tsu_icl_itfm_01/group/bld.inf	Thu Jun 24 10:37:45 2010 +0100
+++ b/imagingandcamerafws/imagingunittest/tsu_icl_itfm_01/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -17,11 +17,16 @@
 //
 
 PRJ_MMPFILES
+
+PRJ_EXPORTS
+
+PRJ_TESTMMPFILES
 ../mmpfiles/TSU_ICL_itfm_01.mmp
 ../mmpfiles/TestTransformer.mmp
 ../mmpfiles/TestTransformerExt.mmp
 
-PRJ_EXPORTS
+
+PRJ_TESTEXPORTS
 
 // test scripts
 ../scripts/tsu_icl_itfm_01_nocap.script			c:/tsu_icl_itfm_01_nocap.script
@@ -43,4 +48,3 @@
 
 // .iby
 ../inc/tsu_icl_itfm_01.iby					/epoc32/rom/include/tsu_icl_itfm_01.iby
-
--- a/imagingandcamerafws/imagingunittest/tsu_icl_mediasvr/group/bld.inf	Thu Jun 24 10:37:45 2010 +0100
+++ b/imagingandcamerafws/imagingunittest/tsu_icl_mediasvr/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -17,9 +17,15 @@
 //
 
 PRJ_MMPFILES
+
+
+PRJ_EXPORTS
+
+
+PRJ_TESTMMPFILES
   ../mmpfiles/TSU_ICL_MediaSvr.mmp
 
-PRJ_EXPORTS
+PRJ_TESTEXPORTS
 
 // test scripts
 ../scripts/TSU_ICL_MediaSvr.script	c:/tsu_icl_mediasvr.script
--- a/imagingandcamerafws/imagingunittest/tsu_icl_pfm_01/group/BLD.INF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-PRJ_PLATFORMS
-// specify the platforms your component needs to be built for here
-// may add platform for OMAP, Helen etc
-DEFAULT
-// DEFAULT MISA 
-// WINS ARMI THUMB
-// MINT
-
-PRJ_MMPFILES
-
-// TSI_WP5 files
-../mmpfiles/TSU_ICL_PFM_01.mmp
-
-PRJ_EXPORTS
-
-// scripts
-../scripts/TSU_ICL_PFM_01.script	c:/tsu_icl_pfm_01.script
-
-// iby
-TSU_ICL_PFM_01.iby			/epoc32/rom/include/tsu_icl_pfm_01.iby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/imagingandcamerafws/imagingunittest/tsu_icl_pfm_01/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -0,0 +1,39 @@
+// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRJ_PLATFORMS
+// specify the platforms your component needs to be built for here
+// may add platform for OMAP, Helen etc
+DEFAULT
+// DEFAULT MISA 
+// WINS ARMI THUMB
+// MINT
+
+PRJ_MMPFILES
+
+PRJ_EXPORTS
+
+PRJ_TESTMMPFILES
+
+// TSI_WP5 files
+../mmpfiles/TSU_ICL_PFM_01.mmp
+
+PRJ_TESTEXPORTS
+
+// scripts
+../scripts/TSU_ICL_PFM_01.script	c:/tsu_icl_pfm_01.script
+
+// iby
+TSU_ICL_PFM_01.iby			/epoc32/rom/include/tsu_icl_pfm_01.iby
--- a/imagingandcamerafws/imagingunittest/tsu_icl_pfm_02/group/BLD.INF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-PRJ_PLATFORMS
-// specify the platforms your component needs to be built for here
-// may add platform for OMAP, Helen etc
-DEFAULT
-
-PRJ_MMPFILES
-
-../mmpfiles/TSU_ICL_PFM_02.mmp
-
-PRJ_EXPORTS
-
-// scripts
-../scripts/TSU_ICL_PFM_02.script	c:/tsu_icl_pfm_02.script
-
-// iby
-TSU_ICL_PFM_02.iby					/epoc32/rom/include/tsu_icl_pfm_02.iby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/imagingandcamerafws/imagingunittest/tsu_icl_pfm_02/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -0,0 +1,35 @@
+// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRJ_PLATFORMS
+// specify the platforms your component needs to be built for here
+// may add platform for OMAP, Helen etc
+DEFAULT
+
+PRJ_MMPFILES
+
+PRJ_EXPORTS
+
+PRJ_TESTMMPFILES
+
+../mmpfiles/TSU_ICL_PFM_02.mmp
+
+PRJ_TESTEXPORTS
+
+// scripts
+../scripts/TSU_ICL_PFM_02.script	c:/tsu_icl_pfm_02.script
+
+// iby
+TSU_ICL_PFM_02.iby					/epoc32/rom/include/tsu_icl_pfm_02.iby
--- a/imagingandcamerafws/imagingunittest/tsu_icl_pfm_02/scripts/TSU_ICL_PFM_02.script	Thu Jun 24 10:37:45 2010 +0100
+++ b/imagingandcamerafws/imagingunittest/tsu_icl_pfm_02/scripts/TSU_ICL_PFM_02.script	Fri Jul 09 12:23:13 2010 +0100
@@ -19,8 +19,7 @@
 PRINT 
 //PAUSE_AT_END
 
-// 
-MULTITHREAD
+// MULTITHREAD
 
 
 //
--- a/layers.sysdef.xml	Thu Jun 24 10:37:45 2010 +0100
+++ b/layers.sysdef.xml	Fri Jul 09 12:23:13 2010 +0100
@@ -115,6 +115,12 @@
 			<module name="">
 				<unit unitID="Utilities_group" mrp="" bldFile="&layer_real_source_path;/video/ARM_MDF_Decoders/Utilities/group" filter="sf_build" name="Utilities_group" />
 			</module>
-    </layer>    
+    </layer>
+
+  	<layer name="os_mm_mdfdevvideoextensions_layer">
+			<module name="mm_mdfdevvideoextensions">
+				<unit unitID="mm_mdfdevvideoextensions" mrp="" bldFile="&layer_real_source_path;/mdfdevvideoextensions/nga_mdf_postprocessor/group" name="mm_mdfdevvideoextensions" />
+			</module>
+   	 </layer>    
   </systemModel>
 </SystemDefinition>
\ No newline at end of file
--- a/mdfdevvideoextensions/nga_mdf_postprocessor/group/NGAPostProcHwDevice.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ b/mdfdevvideoextensions/nga_mdf_postprocessor/group/NGAPostProcHwDevice.mmp	Fri Jul 09 12:23:13 2010 +0100
@@ -39,7 +39,8 @@
 
 SOURCEPATH      ../src
 
-SOURCE					Colorspace_conv_yuv.c
+SOURCE			Colorspace_conv_yuv.c
+SOURCE			colorconversion.c
 SOURCE          NGAPostProcHwDevice.cpp
 SOURCE          ImplementationProxy.cpp
 SOURCE          NGAPostProcSessionManager.cpp
--- a/mdfdevvideoextensions/nga_mdf_postprocessor/group/nga_mdf_postprocessor.pkg	Thu Jun 24 10:37:45 2010 +0100
+++ b/mdfdevvideoextensions/nga_mdf_postprocessor/group/nga_mdf_postprocessor.pkg	Fri Jul 09 12:23:13 2010 +0100
@@ -20,7 +20,7 @@
 &EN
 
 ; Header
-#{"NGA MDF PostProcessor"},(0x0251318C), 1, 0, 0, TYPE=PU
+#{"NGA MDF PostProcessor"},(0x0251318C), 1, 0, 0, TYPE=SA,RU
 
 ; Localised Vendor name
 %{"Nokia"}
--- a/mdfdevvideoextensions/nga_mdf_postprocessor/inc/NGAPostProcHwDevice.h	Thu Jun 24 10:37:45 2010 +0100
+++ b/mdfdevvideoextensions/nga_mdf_postprocessor/inc/NGAPostProcHwDevice.h	Fri Jul 09 12:23:13 2010 +0100
@@ -41,9 +41,11 @@
 #include <advancedsecureoutputci.h>
 #include <graphics/suerror.h>
 
+#include "fetchframecustominterface.h"
 #include "MdfRDebug.h"
 #include "NGAPostProcHwDevice_UID.hrh"
 #include "NGAPostProcSessionManagerObserver.h"
+#include "common.h"
 
 class CNGAPostProcSessionManager;
 class CNGAPostProcSurfaceHandler;
@@ -528,8 +530,8 @@
             plug-in does not support snapshots."
     @pre    "This method can only be called after the hwdevice has been initialized with Initialize()."
     */
-//    TBool GetSnapshotL(TPictureData& aPictureData, const TUncompressedVideoFormat& aFormat) {return EFalse;};
-    TBool GetSnapshotL(TPictureData&, const TUncompressedVideoFormat& ) {return EFalse;};
+//  TBool GetSnapshotL(TPictureData& aPictureData, const TUncompressedVideoFormat& aFormat) {return EFalse;};
+    TBool GetSnapshotL(TPictureData& aPictureData, const TUncompressedVideoFormat& aFormat);
 
     /**
     When the snapshot is available, it will be returned to the client using the TimedSnapshotComplete()
@@ -1008,6 +1010,10 @@
 	#ifdef _DUMP_YUV_FRAMES
     void captureYuv(TVideoPicture* aPicture);
     #endif
+    
+    TInt SetSourceFormat();
+    TInt SetSourceRange();
+    TInt ColorConvert(tBaseVideoFrame* aInputFrame, TUint8* aDestPtr, tWndParam* aInputCropWindow, tWndParam* aOutputCropWindow);
 
 private:
 
@@ -1063,7 +1069,10 @@
     TInt 								    	iVideoFrameBufSize;	
     TBool 										iResourceLost;
     TBool 										iRedrawDone;
-    
+	// Flag to indicate that the redraw surface has been created, and
+	// can be used in a subsequent call ro Redraw()
+	TBool										iRedrawSurfaceInUse;
+
     //-- members for buffer management --
     MMmfVideoBufferManagementObserver*  		iVBMObserver;
     TBufferOptions                      		iVBMBufferOptions;
@@ -1083,6 +1092,8 @@
 	MMmfVideoPropertiesObserver*				iVPObserver;
 	RWsSession									iWsSession;
 	TSize										iPicSize;
+	TUint										iAspectRatioNum;
+	TUint										iAspectRatioDenom;
 	//-- members for Trickplay support --
 	TInt                                iStepFrameCount;
     TInt                                iPlayRate;       
@@ -1091,6 +1102,13 @@
     TUint8                              iSkippedFramesCountingBuffer[64];       
     TUint8                              iSkippedFramesInLast64Frames;       
     TUint8                              iCurrentPosInFramesCountingBuffer; 
+    TUncompressedVideoFormat 			iVideoFormat;
+        //---------- utility variables -------
+	// Image source format
+	TUint8 								iSourceFormat;
+
+	//Image range
+	TUint8		 						iSourceRange;
 };    
 
 /**
--- a/mdfdevvideoextensions/nga_mdf_postprocessor/inc/common.h	Thu Jun 24 10:37:45 2010 +0100
+++ b/mdfdevvideoextensions/nga_mdf_postprocessor/inc/common.h	Fri Jul 09 12:23:13 2010 +0100
@@ -55,6 +55,31 @@
 #define mIsSuccess(code)    ((code)>=0)
 #define mIsFailure(code)    ((code)<0)
 
+/* These define the srcImageFormats */
+#define EYuv420Chroma1_Planar		0x01
+#define EYuv420Chroma2_Planar		0x02
+#define EYuv420Chroma3_Planar		0x03
+#define EYuv422Chroma1_LE   0x04
+#define EYuv422Chroma2_LE   0x05
+#define EYuv422Chroma1_BE   0x06
+#define EYuv422Chroma2_BE   0x07
+
+/* These define the dstImageFormats */
+#define EBitmapColor4k_DitherOrdered	0x01
+#define EBitmapColor4k_DitherErrDiff	0x02
+#define EBitmapColor64k_DitherOrdered	0x03
+#define EBitmapColor64k_DitherErrDiff	0x04
+#define EBitmapColor16M					0x05
+#define EBitmapColor16MU				0x06
+
+/* These define the various color conversion schemes */
+#define EITU601_5_FULLRANGE		0X01
+#define EITU601_5_REDUCEDRANGE	0X02
+#define EB709_FULLRANGE			0X03
+#define EB709_REDUCEDRANGE		0X04
+
+#define COLOR_CONV_PRECISION    14
+#define COLOR_CONV_ROUND        8192
 /* This is the data structure for the output video frame buffer */
 typedef struct BaseVideoFrame
 {
@@ -69,4 +94,13 @@
 
 typedef enum {YUV422INT_LE, YUV422INT_BE} EBufferLayout422; 
 
+/* Crop window structure */
+typedef struct WndParam
+{  
+	uint16 xOffset;    
+	uint16 yOffset;
+	uint32 wndWidth;
+	uint32 wndHeight;
+}tWndParam;
+
 #endif  /* INCLUDE_COMMON */
--- a/mdfdevvideoextensions/nga_mdf_postprocessor/inc/surface_hints.h	Thu Jun 24 10:37:45 2010 +0100
+++ b/mdfdevvideoextensions/nga_mdf_postprocessor/inc/surface_hints.h	Fri Jul 09 12:23:13 2010 +0100
@@ -12,12 +12,17 @@
 * Contributors:
 *
 * Description:
-*
+* Surface Manager API
 */
 
 #ifndef __SURFACE_HINTS_LOCAL_H__
 #define __SURFACE_HINTS_LOCAL_H__
 
+//- Include Files  ----------------------------------------------------------
+
+#include <e32cmn.h>
+
+
 //- Namespace ---------------------------------------------------------------
 
 namespace surfaceHints
@@ -25,7 +30,7 @@
 
 //- Constants ---------------------------------------------------------------
 
-/** Hint of surface the content.
+/** Hint of the surface content.
     @see TSurfaceContent for possible values
 */
 const TInt KSurfaceContent = 0x1;
@@ -37,17 +42,37 @@
 */
 const TInt KSurfaceUpdate = 0x2;
 
-/** Hint of the surface content copy protected and can it be
+/** Hint whether the surface content is copy protected and can it be
     shown on external displays.
     @see TSurfaceProtection for possible values.
 */
 const TInt KSurfaceProtection = 0x3;
 
-/** Hint of the color space of the surface content.
-    Value is a pointer to TColorspace stucture.
-    @see TColorspace
-*/
-const TInt KSurfaceColorspace = 0x4;
+
+/** Values used for the KSurfaceContent key */
+enum TSurfaceContent
+    {
+    /** No specific use-case */
+    EGeneric,
+    /** Camera viewfinder frames */
+    EViewFinder,
+    /** Images captured by camera */
+    EStillImage,
+    /** Decoded video frames */
+    EVideoPlayback,
+    /** Video frames from video telephony */
+    EVideoTelephony,
+    /** EGL surface */
+    EGfx,
+    /** Main UI surface */
+    EUi,
+    /** Composition target surface */
+    ECompositionTarget,
+    /** Indicates that the surface has to accessible by ARM.
+        This can be orr'ed with other TSurfaceContent enumerations. */
+    EArmAccess = 0x80000000
+    };
+
 
 /** Values used for the KSurfaceProtection key. The values are bitmasks and can be combined
 * e.g. EAllowAnalogProtectionRequired | EAllowDigitalProtectionRequired.
@@ -95,6 +120,72 @@
     EAllowDigitalProtectionRequired     = 0x00000800,
     };
 
+
+class TSurfaceUpdate
+    {
+    /** Constructor.
+        @param aUpdateRate   How often the surface content is redrawn per second.
+        @param aTearingFree  When ETrue surface updates should be synchronized
+                             with display refresh rate, otherwise surface can
+                             be updated as fast as possible.
+    */
+    inline TSurfaceUpdate(TUint aUpdateRate, TBool aTearingFree);
+
+    /** Converts a value to TSurfaceUpdate */
+    inline TSurfaceUpdate(TInt aValue);
+
+    /** Converts TSurfaceUpdate to a signed integer, so it can be used as
+        a value for KSurfaceUpdate key. */
+    inline operator TInt() const;
+
+    /** Getter for surface update rate.
+        @return updates per second
+    */
+    inline TUint UpdateRate() const;
+
+    /** Getter for surface update synchronization.
+        @return ETrue - updates should be synchronized with display refresh rate,
+                EFalse - surface can be updated as fast as possible.
+    */
+    inline TBool TearingFree() const;
+
+    private:
+        TUint iValue;
+    };
+
+
+//- Forward Declarations ----------------------------------------------------
+
+
+//- Class Definitions -------------------------------------------------------
+
+
+//- Inline Functions --------------------------------------------------------
+
+TSurfaceUpdate::TSurfaceUpdate(TUint aUpdateRate, TBool aTearingFree)
+    : iValue( ( aUpdateRate & 0xFFFF ) | ( aTearingFree ? 0x80000000 : 0x0 ) )
+    {
+    }
+TSurfaceUpdate::TSurfaceUpdate(TInt aValue)
+    : iValue( static_cast<TUint>( aValue ) )
+    {
+    }
+
+TSurfaceUpdate::operator TInt() const
+    {
+    return static_cast<TInt>( iValue );
+    }
+
+TUint TSurfaceUpdate::UpdateRate() const
+    {
+    return ( iValue & 0xFFFF );
+    }
+
+TBool TSurfaceUpdate::TearingFree() const
+    {
+    return ( iValue & 0x80000000 ) ? ETrue : EFalse;
+    }
+
 }; //namespace surfaceHints
 
 #endif //__SURFACE_HINTS_LOCAL_H__
--- a/mdfdevvideoextensions/nga_mdf_postprocessor/src/NGAPostProcHwDevice.cpp	Thu Jun 24 10:37:45 2010 +0100
+++ b/mdfdevvideoextensions/nga_mdf_postprocessor/src/NGAPostProcHwDevice.cpp	Fri Jul 09 12:23:13 2010 +0100
@@ -19,7 +19,6 @@
 #include "NGAPostProcHwDevice.h"
 #include "NGAPostProcSessionManager.h"
 #include "NGAPostProcSurfaceHandler.h"
-#include "common.h"
 
 // post-processor info
 const TUid KUidVideoPostProcHwDevice = {KUidNGAPostProcHwDeviceImplUid};
@@ -47,6 +46,11 @@
 int32 gColorConvYUVtoYUV422Int (tBaseVideoFrame *yuv420Frame, tBaseVideoFrame* yuv422Frame,
 							   uint8 outClrFmt, int16 stride); 
 
+int32 Emz_VDec_gColorConv_YUVtoRGB ( 
+	  tBaseVideoFrame *srcImage, uint8 *dstImage, tWndParam *srcWindow, 
+	  tWndParam *dstWindow, uint8 srcImageFormat, uint8 dstImageFormat,
+	  uint8 colorConvScheme);
+		 	  
 #ifdef __cplusplus
 }
 #endif
@@ -95,6 +99,7 @@
             iVideoFrameBufSize(0),
             iResourceLost(EFalse),
             iRedrawDone(EFalse),
+			iRedrawSurfaceInUse(EFalse),
             iVBMObserver(NULL),
             count(0),
             iSurfaceMask(surfaceHints::EAllowAllExternals),
@@ -102,6 +107,8 @@
             iVideoSurfaceObserver(NULL),
             iVPObserver(NULL),
             iPicSize(0,0),
+			iAspectRatioNum(1),
+			iAspectRatioDenom(1),
             iStepFrameCount(0),
             iPlayRate(KDefPlayRate),
             iKeyFrameMode(EFalse),
@@ -142,6 +149,10 @@
     {
         TVideoPicture* pic = iVBMBufferReferenceQ[0];
         iVBMBufferReferenceQ.Remove(0);
+        if (iColorConversionQ.Count()>0)
+    	{
+	        iColorConversionQ.Remove(0);
+	    }
 
         if (pic->iHeader) delete pic->iHeader;
         delete pic->iData.iRawData;
@@ -154,6 +165,9 @@
     iVBMBufferReferenceQ.Reset();
     iVBMBufferReferenceQ.Close();
     
+    iColorConversionQ.Reset();
+    iColorConversionQ.Close();
+    
     iVBMBufferQ.Reset();
     iVBMBufferQ.Close();
     
@@ -168,7 +182,12 @@
     	if(!iSurfaceId.IsNull())
     	{
     		PP_DEBUG(_L("CNGAPostProcHwDevice[%x]::UnregisterSurface"), this);
-    		iWsSession.UnregisterSurface(0, iSurfaceId);
+			TInt numScreens = iWsSession.NumberOfScreens();
+    		for(TInt i=0;i < numScreens;i++)
+    		{
+    			iWsSession.UnregisterSurface(i, iSurfaceId);
+    		}
+    		iWsSession.Flush();
         	iSurfaceHandler->DestroySurface(iSurfaceId);
     	}
         delete iSurfaceHandler;
@@ -196,11 +215,15 @@
         User::Leave(KErrNotReady);
 	  }
 
-
-		if( ((aFormat.iYuvFormat.iPattern == EYuv420Chroma1) ||
-			(aFormat.iYuvFormat.iPattern == EYuv420Chroma2) ||
-    		(aFormat.iYuvFormat.iPattern == EYuv420Chroma3) ))
+		iVideoFormat = aFormat; 
+		if( ((iVideoFormat.iYuvFormat.iPattern == EYuv420Chroma1) ||
+			(iVideoFormat.iYuvFormat.iPattern == EYuv420Chroma2) ||
+    		(iVideoFormat.iYuvFormat.iPattern == EYuv420Chroma3) ))
 		{
+			iVideoFormat.iYuvFormat.iCoefficients  	     = EYuvBt709Range1;
+    		iVideoFormat.iYuvFormat.iPattern       	     = EYuv422Chroma1;
+    		iVideoFormat.iYuvFormat.iDataLayout          = EYuvDataInterleavedBE;
+			
 #if defined __WINSCW__				
 				iIsColorConversionNeeded = ETrue; 
 #else
@@ -349,7 +372,7 @@
 
 void CNGAPostProcHwDevice::WritePictureL(TVideoPicture* aPicture) 
 { 
-	PP_DEBUG(_L("CNGAPostProcHwDevice:WritePicture ++"));
+	PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:WritePicture bufId = %d"), this,GetID(aPicture));
 	TVideoPicture* pic;
 	if (iPPState==EInitializing || iPPState==EStopped || iIsInputEnded)
     {
@@ -363,15 +386,18 @@
 		User::Leave(KErrArgument);
 	}
 	pic = aPicture;	
-    if (iInputQ.Count() > 0)
-    {
-        AddToQ(pic);
-        AttemptToPost();
-    }
-    else
-    {
-		PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:WritePicture bufId = %d"), this,GetID(pic));
-		iPictureCounters.iTotalPictures++;
+	iPictureCounters.iTotalPictures++;
+	if((iPPState != EPlaying) && (iFirstPictureUpdated))
+	{
+		AddToQ(pic);
+	}
+	else if( iInputQ.Count() > 0 )
+	{
+		AddToQ(pic);
+		AttemptToPost();
+	}
+	else
+	{
 		TInt64 delta = 0;
 		TTimeToPost iTimeToPost = (TTimeToPost)IsTimeToPost(pic, delta);
 		if(!IsGceReady())
@@ -387,7 +413,13 @@
 	         PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:WritePictureL Too large delta .. skipping"), this ); 
 	         iTimeToPost = ESkipIt;
 	    }
-	
+		if(!iFirstPictureUpdated)
+		{
+            if(iTimeToPost == EDelayIt)
+            {
+                iTimeToPost = EPostIt;
+            }
+		}
 		switch(iTimeToPost)
 		{
 			case EDelayIt:
@@ -420,7 +452,10 @@
 				if(!iFirstPictureUpdated)
 				{
 					iFirstPictureUpdated = ETrue;
-					PublishSurfaceCreated();
+                    if(!iSurfaceCreatedEventPublished)
+                    {
+                        PublishSurfaceCreated();
+                    }
 				}
 			}
 			break;
@@ -827,12 +862,12 @@
 { 
 	PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:Redraw ++"), this);
 	TInt err = KErrNone;
-	if(iResourceLost && !iRedrawDone)
+	if(iRedrawSurfaceInUse && !iRedrawDone)
 	{
         err = AddHints();
         if (err != KErrNone)
         {
-            PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:MmvroResourcesLost -- failed to AddHints %d"), 
+            PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:Redraw -- failed to AddHints %d"), 
                          this, err);
             iProxy->MdvppFatalError(this, err);	
             return;   
@@ -841,7 +876,7 @@
 		err = RegisterSurface(iSurfaceId);
 		if (err != KErrNone)
 		{
-		   PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:MmvroResourcesLost -- failed to Register Surface %d"), 
+		   PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:Redraw -- failed to Register Surface %d"), 
 		   				this, err);
 		   	iSurfaceHandler->DestroySurface(iSurfaceId);
 	   		iSurfaceId = TSurfaceId::CreateNullId();
@@ -860,6 +895,7 @@
 {  
 	PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:Start ++"), this);
 	iPPState = EPlaying;
+	AttemptToPost();
 	PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:Start --"), this);
 }
 
@@ -904,7 +940,10 @@
 		PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:SetPosition FAILED: Unexpected state"), this);
         return;
     }
-    
+    if (iPPState == EPaused)
+    {	
+        iFirstPictureUpdated = EFalse;
+    }
     iCurrentPlaybackPosition = aPlaybackPosition;  
     
     ReleaseInputQ();
@@ -971,6 +1010,107 @@
     //not required for direct rendering 
 }
 
+TBool CNGAPostProcHwDevice::GetSnapshotL(TPictureData& aPictureData, const TUncompressedVideoFormat& /*aFormat*/)
+{ 
+	PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:GetSnapshotL %d %d ++"), this, iVBMEnabled, iProcessQ.Count());
+	TVideoPicture* 		pic = NULL;
+	TInt 				err = KErrNone;
+	TBool				frameAvailable =EFalse;
+	tWndParam			inputCropWindow;
+	tWndParam			outputCropWindow;
+	tBaseVideoFrame		inputFrame;
+	inputFrame.lum 		= NULL; 
+	
+	if(aPictureData.iDataFormat == ERgbFbsBitmap)
+	{	
+		if(iProcessQ.Count())
+		{
+			pic = iProcessQ[0]; //frame already submitted for display
+		}
+		else if(iInputQ.Count())
+		{
+			pic = iInputQ[0]; //frame yet to be displayed
+		}
+		if(pic) 
+		{
+			if (iVBMEnabled)
+		    {
+				inputFrame.lum	= (TUint8*)pic->iData.iRawData->Ptr();
+			}
+			else
+			{
+				if (iInputDecoderDevice)
+				{
+					MMmfVideoFetchFrame* VFHandler = NULL;
+					VFHandler = (MMmfVideoFetchFrame*)iInputDecoderDevice->CustomInterface(KUidMMFVideoFetchFrame);
+					if (VFHandler)
+					{
+						PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:GetSnapshotL() fetch frame"), this);
+						inputFrame.lum = (TUint8*)VFHandler->MmvffGetFrame(GetID(pic));
+					}
+					else
+					{
+						PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:GetSnapshotL() decoder yet to implement MMmfVideoFetchFrame CI"), this);
+					}
+				}
+			}
+		}
+		if(inputFrame.lum)
+		{
+			inputFrame.cb	= inputFrame.lum + iPicSize.iWidth * iPicSize.iHeight;
+			
+			if( ((iVideoFormat.iYuvFormat.iPattern == EYuv420Chroma1) ||
+				(iVideoFormat.iYuvFormat.iPattern == EYuv420Chroma2) ||
+	    		(iVideoFormat.iYuvFormat.iPattern == EYuv420Chroma3) ))						
+			{
+				inputFrame.cr = inputFrame.lum + (iPicSize.iWidth * iPicSize.iHeight*5)/4;
+			}
+			else
+			{
+				inputFrame.cr = inputFrame.lum + (iPicSize.iWidth * iPicSize.iHeight*3)/2;
+			}
+			
+			inputFrame.width	= (unsigned short)iPicSize.iWidth;
+			inputFrame.height	= (unsigned short)iPicSize.iHeight;
+			
+			outputCropWindow.wndHeight  = iPicSize.iHeight;	
+			outputCropWindow.wndWidth	= iPicSize.iWidth; 	
+			outputCropWindow.xOffset	= 0;
+			outputCropWindow.yOffset	= 0;
+			
+			inputCropWindow.wndHeight  = iPicSize.iHeight;	
+			inputCropWindow.wndWidth	= iPicSize.iWidth; 	
+			inputCropWindow.xOffset	= 0;
+			inputCropWindow.yOffset	= 0;
+			
+			RFbsSession fbs;
+			fbs.Connect();
+			CFbsBitmap* iOutBitmap = aPictureData.iRgbBitmap;
+			TInt status = iOutBitmap->Resize(iPicSize);
+			if (status == KErrNone)
+			{
+				// Lock the heap to prevent the FBS server from invalidating the address
+		        iOutBitmap->LockHeap();
+		        TUint8* dataAddress = (TUint8*)iOutBitmap->DataAddress();
+				err = ColorConvert(&inputFrame, dataAddress, &inputCropWindow, &outputCropWindow);
+				iOutBitmap->UnlockHeap();
+				frameAvailable = ETrue;
+			}
+			fbs.Disconnect();
+		}
+	}
+	else
+	{
+		err = KErrNotSupported;
+	}
+	if(err != KErrNone)
+	{
+		User::Leave(err);
+	}
+	PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:GetSnapshotL --"), this);
+	return(frameAvailable);
+}
+
 void CNGAPostProcHwDevice::InputEnd() 
 { 
    PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:InputEnd ++"), this);
@@ -1208,12 +1348,13 @@
 		
 		if(iVBMBufferReferenceQ.Count() == 0)
 		{
-				err = SetupSurface(aSize);
-				if(err)
-				{
-						PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:MmvbmGetBufferL() Surface Setup Failed %d"), this, err);
-						User::Leave(err);
-				}
+			iPicSize = aSize;
+			err = SetupSurface(aSize);
+			if(err)
+			{
+					PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:MmvbmGetBufferL() Surface Setup Failed %d"), this, err);
+					User::Leave(err);
+			}
 		}
 		
     if(!iVBMBufferQ.Count())
@@ -1280,10 +1421,12 @@
 		{
 			aCropRect.Intersection( iPicSize);
 		}
-	aPixelAspectRatio = TVideoAspectRatio(1,1);
-	PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:MmvssGetSurfaceParametersL()--  \
-		cropRectWidth = %d cropRectHeight = %d --"), this, aCropRect.Width(), aCropRect.Height());
-
+	aPixelAspectRatio = TVideoAspectRatio(iAspectRatioNum,iAspectRatioDenom);
+	PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:MmvssGetSurfaceParametersL()  \
+		cropRectWidth = %d cropRectHeight = %d"), this, aCropRect.Width(), aCropRect.Height());
+	PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:MmvssGetSurfaceParametersL()  \
+		PAR Num = %d PAR Denom = %d"), this, aPixelAspectRatio.iNumerator, aPixelAspectRatio.iDenominator);
+	PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:MmvssGetSurfaceParametersL() --"), this);
 }
 
 void CNGAPostProcHwDevice::MmvssSurfaceRemovedL(const TSurfaceId& aSurfaceId)
@@ -1292,10 +1435,20 @@
 	if(!aSurfaceId.IsNull())
 	{
 		PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:MmvssSurfaceRemovedL(): UnregisterSurface ID = 0x%x"), this, aSurfaceId );
-		iWsSession.UnregisterSurface(0, aSurfaceId);
+		TInt numScreens = iWsSession.NumberOfScreens();
+		for(TInt i=0;i < numScreens;i++)
+		{
+			iWsSession.UnregisterSurface(i, aSurfaceId);
+		}
+		iWsSession.Flush();
 		iSurfaceHandler->DestroySurface(aSurfaceId);
+		if(iSurfaceId == aSurfaceId)
+		{
+			iSurfaceCreatedEventPublished = EFalse;
+			iSurfaceId = TSurfaceId::CreateNullId();
+			iChunk.Close();
+		}
 	}
-		
 	PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:MmvssSurfaceRemovedL() --"), this);
 }
 
@@ -1307,7 +1460,9 @@
 	PP_DEBUG(_L("CNGAPostProcHwDevice[%x]::MmvpoUpdateVideoProperties PAR \
 		iAspectRatioNum = %d, iAspectRatioDenom = %d"), this,
 					 aYuvFormat.iAspectRatioNum,aYuvFormat.iAspectRatioDenom);
-					 iPicSize = aPictureSize;
+	iPicSize = aPictureSize;
+	iAspectRatioNum = aYuvFormat.iAspectRatioNum;
+	iAspectRatioDenom = aYuvFormat.iAspectRatioDenom;
 	PP_DEBUG(_L("CNGAPostProcHwDevice[%x]::MmvpoUpdateVideoProperties Picture Size \
 		iWidth = %d, iHeight = %d, iSurfaceCreatedEventPublished = %d"), 
 		this, iPicSize.iWidth,iPicSize.iHeight, iSurfaceCreatedEventPublished?1:0);
@@ -1336,7 +1491,12 @@
 		ReleaseInputQ();
 		iSessionManager->CancelUpdate();
 		ReleaseProcessQ();
-		iVideoSurfaceObserver->MmvsoRemoveSurface();
+		if(iVideoSurfaceObserver && iSurfaceCreatedEventPublished)
+		{
+			PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:MmvroResourcesLost - Telling client to remove surface"), this);
+			iVideoSurfaceObserver->MmvsoRemoveSurface();
+			iSurfaceCreatedEventPublished = EFalse;
+		}
 	}
 	else if(iResourceLost && iRedrawDone)
 	{
@@ -1382,24 +1542,15 @@
 
 void CNGAPostProcHwDevice::MmvshcRedrawBufferToSurface(TPtrC8& aRedrawBuffer)
 {
-    PP_DEBUG(_L("CNGAPostProcHwDevice::MmvshcRedrawBufferToSurface ++"), this);
+    PP_DEBUG(_L("CNGAPostProcHwDevice[%x]::MmvshcRedrawBufferToSurface ++"), this);
 	
-	TSize 			surfaceSize; 
     TUint8*         lPtr;
     TInt 			offset;
-    if(iPicSize.iWidth > iPicSize.iHeight)
-    {
-    	surfaceSize.iWidth = iPicSize.iWidth;
-    	surfaceSize.iHeight = iPicSize.iWidth;
-    }
-    else
-    {
-    	surfaceSize.iWidth = iPicSize.iHeight;
-    	surfaceSize.iHeight = iPicSize.iHeight;
-    }
+
+    PP_DEBUG(_L("CNGAPostProcHwDevice[%x]::MmvshcRedrawBufferToSurface -- Creating %d x %d surface"), this, iPicSize.iWidth, iPicSize.iHeight);
 
    	TInt err = KErrNone;
-	SetSurfaceAttributes(surfaceSize, 1); 
+	SetSurfaceAttributes(iPicSize, 1); 
 	
   	err = iSurfaceHandler->CreateSurface(iAttributes, iSurfaceId);
   	if (err != KErrNone)
@@ -1409,6 +1560,36 @@
 		iProxy->MdvppFatalError(this, err);	   				
 	    return;
 	}
+
+	err = iSurfaceHandler->SurfaceInfo(iSurfaceId, iInfo);
+	if (err != KErrNone)
+	{
+	   PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:MmvshcRedrawBufferToSurface -- failed to get Surface info %d"), 
+	   				this, err);
+	   	iSurfaceHandler->DestroySurface(iSurfaceId);
+	   	iSurfaceId = TSurfaceId::CreateNullId();
+		iProxy->MdvppFatalError(this, err);	   				
+	    return;
+	}
+
+	PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:MmvshcRedrawBufferToSurface() \
+		surfaceWidth = %d surfaceHeight = %d surfaceStride = %d"), this, iInfo().iSize.iWidth, iInfo().iSize.iHeight, iInfo().iStride);
+
+	TInt redrawBufferSize = aRedrawBuffer.Size();
+	TInt surfaceSize = iInfo().iStride * iInfo().iSize.iHeight;
+
+    PP_DEBUG(_L("CNGAPostProcHwDevice[%x]::MmvshcRedrawBufferToSurface RedrawBuffer size= %d Surface size = %d"), this, redrawBufferSize, surfaceSize);
+
+	// Check whether redraw buffer will fit onto the surface.
+	// If this check fails then we won't raise a fatal error - We just won't create the redraw surface
+	if (redrawBufferSize > surfaceSize)
+	{
+    	PP_DEBUG(_L("CNGAPostProcHwDevice[%x]::MmvshcRedrawBufferToSurface Redraw buffer size larger than surface size"), this);
+    	iSurfaceHandler->DestroySurface(iSurfaceId);
+	   	iSurfaceId = TSurfaceId::CreateNullId();
+    	return;
+	}
+
 	err = iSurfaceHandler->MapSurface(iSurfaceId, iChunk);
 	if (err != KErrNone)
 	{
@@ -1419,49 +1600,63 @@
 		iProxy->MdvppFatalError(this, err);	   				
 	    return;
 	}
-	err = iSurfaceHandler->SurfaceInfo(iSurfaceId, iInfo);
-	if (err != KErrNone)
-	{
-	   PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:MmvshcRedrawBufferToSurface -- failed to get Surface info %d"), 
-	   				this, err);
-	   	iSurfaceHandler->DestroySurface(iSurfaceId);
-	   	iSurfaceId = TSurfaceId::CreateNullId();
-		iProxy->MdvppFatalError(this, err);	   				
-	    return;
-	}
-	PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:MmvshcRedrawBufferToSurface() \
-		surfaceWidth = %d surfaceHeight = %d --"), this, iInfo().iSize.iWidth, iInfo().iSize.iHeight);
 
     if((err = iSurfaceHandler->GetBufferOffset(iSurfaceId, 0, offset)) != KErrNone)
     {
     	PP_DEBUG(_L("CNGAPostProcHwDevice[%x]::MmvshcRedrawBufferToSurface offset query failed %d"), this, err);
     	iSurfaceHandler->DestroySurface(iSurfaceId);
 	   	iSurfaceId = TSurfaceId::CreateNullId();
+		iChunk.Close();
     	iProxy->MdvppFatalError(this, err);
     	return;
     }
-    PP_DEBUG(_L("CNGAPostProcHwDevice[%x]::MmvshcRedrawBufferToSurface offset = %d aRedrawBuffer.Size()= %d  --"), this, offset, aRedrawBuffer.Size());
-    
+
+    PP_DEBUG(_L("CNGAPostProcHwDevice[%x]::MmvshcRedrawBufferToSurface offset = %d"), this, offset);
+
 	lPtr = reinterpret_cast<TUint8*>(iChunk.Base() + offset);
-	memcpy((TAny *)lPtr, (TAny *)aRedrawBuffer.Ptr(), aRedrawBuffer.Size());
-	
+	memcpy((TAny *)lPtr, (TAny *)aRedrawBuffer.Ptr(), redrawBufferSize);
+
+	iRedrawSurfaceInUse = ETrue;
+
+	PP_DEBUG(_L("CNGAPostProcHwDevice[%x]::MmvshcRedrawBufferToSurface(): New surface = 0x%x"), this, iSurfaceId);
+
     PP_DEBUG(_L("CNGAPostProcHwDevice[%x]::MmvshcRedrawBufferToSurface error = %d --"), this, err);
 }
 
 TInt CNGAPostProcHwDevice::SetupExternalSurface(const TSurfaceId &aSurfaceID)
 {
+	PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:SetupExternalSurface(): aSurfaceID = 0x%x"), this, aSurfaceID );
+
     TInt err = KErrNone;
     
     if(!iSurfaceId.IsNull())
     {
-    	PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:SetupExternalSurface Cleaning ReDraw Surface"), this);
-		iVideoSurfaceObserver->MmvsoRemoveSurface();
+		if (iVideoSurfaceObserver && iSurfaceCreatedEventPublished)
+		{
+			PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:SetupExternalSurface - Telling client to remove old surface"), this);
+			iVideoSurfaceObserver->MmvsoRemoveSurface();
+			iSurfaceCreatedEventPublished = EFalse;
+		}
+		else
+		{
+			// We never told the client about the surface, so we must destroy it ourselves
+			PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:SetupExternalSurface - Destroying old surface"), this);
+			TInt numScreens = iWsSession.NumberOfScreens();
+    		for(TInt i=0;i < numScreens;i++)
+    		{
+    			iWsSession.UnregisterSurface(i, iSurfaceId);
+    		}
+   			iWsSession.Flush();
+			iSurfaceHandler->DestroySurface(iSurfaceId);
+		}
+
+		iChunk.Close();
 	}
     
     iSurfaceId            = aSurfaceID;
     iUsingExternalSurface = ETrue;
-    
-    
+    iRedrawSurfaceInUse = EFalse;
+
     // Create the surface handler if it doesn't exist.
     if (!iSurfaceHandler)
     {
@@ -1652,7 +1847,10 @@
 				if(!iFirstPictureUpdated)
 				{
 					iFirstPictureUpdated = ETrue;
-					PublishSurfaceCreated();
+                    if(!iSurfaceCreatedEventPublished)
+                    {
+                        PublishSurfaceCreated();
+                    }
 				}	
 			}	// end of postit
 			break;
@@ -1688,12 +1886,12 @@
     TInt64 uPresTime = frame->iTimestamp.Int64();
       
     // Check if this is an out of order frame in case of forward playback
-    if((iCurrentPlaybackPosition.Int64() >= uPresTime) && (iPlayRate > 0))    
+    if((iCurrentPlaybackPosition.Int64() > uPresTime) && (iPlayRate > 0))    
     {      
          PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:IsTimeToPost : Out of order frame (forward playback) Tfm=%d"), this,(TInt)uPresTime);
          resp = ESkipIt;  //drop      
     }      // Check if this is an out of order frame in case of backward playback
-    else if((iCurrentPlaybackPosition.Int64() <= uPresTime) && (iPlayRate < 0))    
+    else if((iCurrentPlaybackPosition.Int64() < uPresTime) && (iPlayRate < 0))    
     {      
         PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:IsTimeToPost : Out of order frame (backward playback) Tfm=%d"), this,(TInt)uPresTime);
         resp = ESkipIt;  //drop      
@@ -1716,7 +1914,7 @@
        PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:IsTimeToPost .. Tfm=%d, Tcs=%d, delta=%d"), this, (TInt)uPresTime, (TInt)uSyncTime, (TInt)delta);
     }       
    
-   PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:IsTimeToPost -- %d"), this, resp);
+   PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:IsTimeToPost -- %d BufID = %d"), this, resp, GetID(frame));
     return resp;
 }
 
@@ -1901,7 +2099,13 @@
 TInt CNGAPostProcHwDevice::RegisterSurface(const TSurfaceId& aSurfaceId)
 {
 	PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:RegisterSurface(): RegisterSurface ID = 0x%x"), this, aSurfaceId);
-	return(iWsSession.RegisterSurface(0, aSurfaceId));
+	TInt err = KErrNone;
+	TInt numScreens = iWsSession.NumberOfScreens();
+	for(TInt i=0; (i < numScreens && err == KErrNone); i++)
+	{
+		err = iWsSession.RegisterSurface(i, aSurfaceId);
+	}	
+	return(err);
 }
 
 TInt CNGAPostProcHwDevice::IsGceReady()
@@ -2047,6 +2251,7 @@
 	    pOutPicture    = iColorConversionQ[0];
 	    iColorConversionQ.Remove(0);
 	    ConvertPostProcBuffer(aPicture, pOutPicture);
+	   	pOutPicture->iTimestamp = aPicture->iTimestamp;
 	    ReleasePicture(aPicture);    	    
     }				    
     else
@@ -2131,9 +2336,123 @@
 		err = iSurfaceHandler->SetSurfaceHint(iSurfaceId,iHint);
    }
    PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:AddHints. err = %d --"), this,err);
+   iHint.iKey.iUid = surfaceHints::KSurfaceContent;
+   iHint.iValue = surfaceHints::EVideoPlayback;
+   iHint.iMutable = ETrue;
+   err = iSurfaceHandler->AddSurfaceHint(iSurfaceId,iHint);
+   if(err == KErrAlreadyExists)
+   {
+		err = KErrNone;
+		err = iSurfaceHandler->SetSurfaceHint(iSurfaceId,iHint);
+   }
+   PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:AddHints. err = %d --"), this,err);
    return err;
 }
 
+TInt CNGAPostProcHwDevice::ColorConvert(tBaseVideoFrame* aInputFrame, TUint8* aDestPtr, tWndParam* aInputCropWindow, tWndParam* aOutputCropWindow)
+{
+	PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:ColorConvert ++"), this);
+	__ASSERT_ALWAYS(aDestPtr, User::Invariant());
+	TInt				lError = E_SUCCESS;
+	TInt				err = KErrNone;
+	
+	err = SetSourceFormat();
+	if(err == KErrNone)
+	{
+    	err = SetSourceRange();
+    	if(err == KErrNone)
+    	{
+						
+			lError = Emz_VDec_gColorConv_YUVtoRGB(aInputFrame,aDestPtr, 
+						aInputCropWindow, aOutputCropWindow, iSourceFormat,
+						EBitmapColor16MU, iSourceRange);
+
+			if(lError)
+			{
+				if(lError == E_OUT_OF_MEMORY)
+					{
+					err = KErrNoMemory;
+					}
+				else if(lError == E_FAILURE)
+					{
+					err = KErrNotSupported;
+					}
+				else
+					{
+					err = KErrGeneral;
+					}
+			}
+		}
+	}
+	
+	PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:ColorConvert --"), this);
+	return err;
+}
+
+TInt CNGAPostProcHwDevice::SetSourceFormat()
+{
+	PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:SetSourceFormatL ++"), this);
+	TInt err = KErrNone;
+	switch (iVideoFormat.iYuvFormat.iPattern)
+	{
+	    case EYuv420Chroma1:
+    		iSourceFormat = EYuv420Chroma1_Planar;
+    		break;
+        case EYuv420Chroma2:
+    		iSourceFormat = EYuv420Chroma2_Planar;
+    		break;
+        case EYuv420Chroma3:
+    		iSourceFormat = EYuv420Chroma3_Planar;
+    		break;
+	    case EYuv422Chroma1:
+			if( iVideoFormat.iYuvFormat.iDataLayout == EYuvDataInterleavedLE)
+    			iSourceFormat = EYuv422Chroma1_LE;
+	    	else if( iVideoFormat.iYuvFormat.iDataLayout == EYuvDataInterleavedBE )
+				iSourceFormat = EYuv422Chroma1_BE;
+			else
+			    err = KErrArgument;
+			break;
+    	case EYuv422Chroma2:
+    		if( iVideoFormat.iYuvFormat.iDataLayout == EYuvDataInterleavedLE)
+	    		iSourceFormat = EYuv422Chroma2_LE;
+    		else if( iVideoFormat.iYuvFormat.iDataLayout == EYuvDataInterleavedBE )
+    			iSourceFormat = EYuv422Chroma2_BE;
+			else
+			    err = KErrArgument;
+			break;
+      default:
+    		err = KErrNotSupported;
+	}
+	PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:SetSourceFormatL --"), this);
+	return err;
+}
+
+
+TInt CNGAPostProcHwDevice::SetSourceRange()
+{
+	PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:SetSourceRangeL ++"), this);
+	TInt err = KErrNone;
+	switch (iVideoFormat.iYuvFormat.iCoefficients)
+	{
+	    case EYuvBt601Range0:
+			iSourceRange = EITU601_5_REDUCEDRANGE;
+            break;
+        case EYuvBt601Range1:
+			iSourceRange = EITU601_5_FULLRANGE;
+			break;
+        case EYuvBt709Range0:
+			iSourceRange = EB709_REDUCEDRANGE;
+			break;
+        case EYuvBt709Range1:
+			iSourceRange = EB709_FULLRANGE;
+            break;
+	    default:
+		    err = KErrNotSupported;
+    }
+    PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:SetSourceRangeL --"), this);
+    return err;
+}
+
 CNGAPostProcTimer::CNGAPostProcTimer( CNGAPostProcHwDevice& aParent )
 :CTimer(EPriorityHigh),iParent(aParent)
 {
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mf_developer_build.config.xml	Fri Jul 09 12:23:13 2010 +0100
@@ -0,0 +1,101 @@
+<?xml version="1.0"?>
+<!DOCTYPE SystemDefinition SYSTEM "sysdef_1_4_0.dtd" [
+  <!ENTITY layer_real_source_path "../mm" >
+]> 
+
+<SystemDefinition name="os_mm_pkg" schema="1.4.0">
+	<systemModel>
+  <!-- Common file for prebuild layers-->
+  	<layer name="os_layer">
+	
+	
+			<module name="mm">
+				<unit unitID="mm" mrp="" bldFile="&layer_real_source_path;/group" name="mm" />
+			</module>
+			<module name="">
+				<unit unitID="AudioEqualizerUtility" mrp="" bldFile="&layer_real_source_path;/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build" name="AudioEqualizerUtility" />
+				<unit unitID="EnvironmentalReverbUtility" mrp="" bldFile="&layer_real_source_path;/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build" name="EnvironmentalReverbUtility" />
+			</module>
+			<module name="">
+				<unit unitID="AacEncoderPlugin" mrp="" bldFile="&layer_real_source_path;/audio/ARM_CMMF_codecs/AacEncoderPlugin/group" filter="!sf_build" name="AacEncoderPlugin" />
+			</module>
+			<module name="">
+				<unit unitID="AmrNbCodecPlugin" mrp="" bldFile="&layer_real_source_path;/audio/ARM_CMMF_codecs/AmrNbCodecPlugin/group" filter="!sf_build" name="AmrNbCodecPlugin" />
+			</module>
+			<module name="">
+				<unit unitID="AmrWbCodecPlugin" mrp="" bldFile="&layer_real_source_path;/audio/ARM_CMMF_codecs/AmrWbCodecPlugin/group" filter="!sf_build" name="AmrWbCodecPlugin" />
+			</module>
+			<module name="">
+				<unit unitID="EAacPlusCodecPlugin" mrp="" bldFile="&layer_real_source_path;/audio/ARM_CMMF_codecs/EAacPlusCodecPlugin/group" filter="!sf_build" name="EAacPlusCodecPlugin" />
+			</module>
+			<module name="">
+				<unit unitID="EAacPlusUtil" mrp="" bldFile="&layer_real_source_path;/audio/ARM_CMMF_codecs/EAacPlusUtil/group" filter="!sf_build" name="EAacPlusUtil" />
+			</module>		
+			<module name="">
+				<unit unitID="MP3CodecPlugin" mrp="" bldFile="&layer_real_source_path;/audio/ARM_CMMF_codecs/MP3CodecPlugin/group" filter="!sf_build" name="MP3CodecPlugin" />
+			</module>
+			<module name="">
+				<unit unitID="WMADecoderPlugin" mrp="" bldFile="&layer_real_source_path;/audio/ARM_CMMF_codecs/WMADecoderPlugin/group" filter="!sf_build" name="WMADecoderPlugin" />
+			</module>
+			<module name="">
+				<unit unitID="ARM_MDF_Decoders" mrp="" bldFile="&layer_real_source_path;/video/ARM_MDF_Decoders/group" filter="!sf_build" name="ARM_MDF_Decoders" />
+			</module>
+			<module name="">
+				<unit unitID="Utilities" mrp="" bldFile="&layer_real_source_path;/video/ARM_MDF_Decoders/Utilities/group" filter="sf_build" name="Utilities" />
+			</module>
+	
+			<module name="multimedia_icl">
+				<!--unit name="imagingfws" unitID="sos.imagingfws" mrp="" bldFile="&layer_real_source_path;/imagingandcamerafws/imagingfws/group" / -->				
+			</module>
+			<module name="multimedia_camera">				
+				<!--unit name="camerafw" unitID="sos.camerafw" mrp="" bldFile="&layer_real_source_path;/imagingandcamerafws/camerafw/group" /-->
+			</module>			
+			<module name="multimedia_imgplugins">
+				<unit name="imgplugins" unitID="sos.imgplugins" mrp="" bldFile="&layer_real_source_path;/mmplugins/imagingplugins/group" />
+			</module>
+			<module name="multimedia_mmlibs">
+				<unit name="mmutilitylib" unitID="sos.mmutilitylib" mrp="" bldFile="&layer_real_source_path;/mmlibs/mmutilitylib/group" />
+				<unit name="mmfw" unitID="sos.mmfw" mrp="" bldFile="&layer_real_source_path;/mmlibs/mmfw/group"/>
+			</module>			
+			<module name="multimedia_mmdevicefw">
+				<unit name="speechrecogsupport" unitID="sos.speechrecogsupport" mrp="" bldFile="&layer_real_source_path;/mmdevicefw/speechrecogsupport/group" />				
+			</module>			
+			<module name="multimedia_devsound">
+				<unit name="a3facf" unitID="sos.a3facf" mrp="" bldFile="&layer_real_source_path;/devsound/a3facf/group"/>
+				<unit name="a3fdevsound" unitID="sos.a3fdevsound" mrp="" bldFile="&layer_real_source_path;/devsound/a3fdevsound/group"/>
+				<unit name="a3fsrvstart" unitID="sos.a3fsrvstart" mrp="" bldFile="&layer_real_source_path;/devsound/a3fsrvstart/group"/> 
+				<unit name="a3ftrace" unitID="sos.a3ftrace" mrp="" bldFile="&layer_real_source_path;/devsound/a3ftrace/group"/>
+				<unit name="hwdevapi" unitID="sos.hwdevapi" mrp="" bldFile="&layer_real_source_path;/devsound/hwdevapi/group"/>	
+				<unit name="devsoundapi" unitID="sos.devsoundapi" mrp="" bldFile="&layer_real_source_path;/devsound/devsoundapi/group"/>	
+				<unit name="devsoundpluginsupport" unitID="sos.devsoundpluginsupport" mrp="" bldFile="&layer_real_source_path;/devsound/devsoundpluginsupport/group"/>
+			</module>
+			<module name="multimedia_mmhais">
+				<unit name="videohai" unitID="sos.videohai" mrp="" bldFile="&layer_real_source_path;/mmhais/videohai/group"/>
+			</module>
+			<module name="multimedia_mmplugins">
+				<unit name="lib3gp" unitID="sos.lib3gp" mrp="" bldFile="&layer_real_source_path;/mmplugins/lib3gp/group" />
+				<unit name="mmfplugin" unitID="sos.mmplugin" mrp="" bldFile="&layer_real_source_path;/mmplugins/mmfwplugins/group"/>
+			</module>
+			<module name="multimedia_mmswadaptation">
+				<unit name="videorenderer" unitID="sos.videorenderer" mrp="" bldFile="&layer_real_source_path;/mmswadaptation/videorenderer/group"/>
+			</module>
+			<module name="multimedia_testframework">
+				<unit name="mmtestfw" unitID="sos.mmtestfw" mrp="" bldFile="&layer_real_source_path;/mmtestenv/mmtestfw/group"/>
+			</module>
+			
+			<!-- Multimedia Foundation specific Test components-->
+			<module name="mf_multimedia_test_component">
+				<unit name="a3fchartest" unitID="sos.a3fchartest" bldFile="&layer_real_source_path;/devsound/a3fcharacterisationtest/group" mrp=""/>
+				<unit name="speechrecogsupporttest" unitID="sos.speechrecogsupporttest" bldFile="&layer_real_source_path;/mmdevicefw/speechrecogsupport/tsrc/ASR/group" mrp=""/>
+				<unit name="mmfintgdevsound" unitID="sos.mmfintgdevsound" bldFile="&layer_real_source_path;/mmlibs/mmfw/tsrc/mmfintegrationtest/devsound/group" mrp=""/>
+				<unit name="acod" unitID="sos.acod" bldFile="&layer_real_source_path;/mmlibs/mmfw/tsrc/mmfunittest/ACOD/group" mrp=""/>
+				<unit name="DevSoundTestCIPlugins" unitID="sos.DevSoundTestCIPlugins" bldFile="&layer_real_source_path;/mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/CIPlugins/group" mrp=""/>
+				<unit name="DevSoundTest" unitID="sos.DevSoundTest" bldFile="&layer_real_source_path;/mmlibs\mmfw\tsrc\mmfunittest\DevSoundTest\group" mrp=""/>
+				<unit name="SbcCodec" unitID="sos.SbcCodec" bldFile="&layer_real_source_path;/mmlibs/mmfw/tsrc/mmfunittest/SbcCodec/group" mrp=""/>
+				<unit name="mmtestfwunittest" unitID="sos.mmtestfwunittest" bldFile="&layer_real_source_path;/mmtestenv/mmtestfwunittest/group" mrp=""/>
+				<unit name="SDevSound" unitID="sos.SDevSound" bldFile="&layer_real_source_path;/mmlibs/mmfw/tsrc/mmfintegrationtest/SDevSound/group" mrp=""/>
+				<!--unit name="a3fintegrationtest" unitID="sos.a3fintegrationtest" bldFile="&layer_real_source_path;/devsound/a3fintegrationtest/group" mrp="" />-->				
+			</module>			
+    </layer>    
+  </systemModel>
+</SystemDefinition>
\ No newline at end of file
--- a/mm_info/mm_metadata/mm_metadata.mrp	Thu Jun 24 10:37:45 2010 +0100
+++ b/mm_info/mm_metadata/mm_metadata.mrp	Fri Jul 09 12:23:13 2010 +0100
@@ -1,19 +1,3 @@
-#
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description: 
-#
-
 component           mm_metadata
 source   \sf\os\mm\mm_info\mm_metadata 
 source   \sf\os\mm\package_definition.xml
--- a/mm_plat/audio_routing_api/inc/AudioOutput.h	Thu Jun 24 10:37:45 2010 +0100
+++ b/mm_plat/audio_routing_api/inc/AudioOutput.h	Fri Jul 09 12:23:13 2010 +0100
@@ -25,7 +25,7 @@
 #include <mdaaudiotoneplayer.h>
 #include <mdaaudiooutputstream.h>
 #include <midiclientutility.h>
-#include <MCustomInterface.h>
+#include <mcustominterface.h>
 
 // FORWARD DECLARATIONS
 class MAudioOutputObserver;
--- a/mm_plat/audio_routing_proxy_api/inc/AudioInputProxy.h	Thu Jun 24 10:37:45 2010 +0100
+++ b/mm_plat/audio_routing_proxy_api/inc/AudioInputProxy.h	Fri Jul 09 12:23:13 2010 +0100
@@ -22,7 +22,7 @@
 //  INCLUDES
 #include "AudioInput.h"
 #include <mmf/common/mmfcontrollerframework.h>
-#include <MCustomCommand.h>
+#include <mcustomcommand.h>
 // FORWARD DECLARATIONS
 class CCustomCommandUtility;
 class CCustomInterfaceUtility;
--- a/mm_plat/audio_routing_proxy_api/inc/AudioOutputProxy.h	Thu Jun 24 10:37:45 2010 +0100
+++ b/mm_plat/audio_routing_proxy_api/inc/AudioOutputProxy.h	Fri Jul 09 12:23:13 2010 +0100
@@ -22,7 +22,7 @@
 //  INCLUDES
 #include "AudioOutput.h"
 #include <mmf/common/mmfcontrollerframework.h>
-#include <MCustomCommand.h>
+#include <mcustomcommand.h>
 
 // FORWARD DECLARATIONS
 class CCustomCommandUtility;
--- a/mm_plat/custom_interface_proxy_factory_api/inc/CustomInterfaceProxyFactory.h	Thu Jun 24 10:37:45 2010 +0100
+++ b/mm_plat/custom_interface_proxy_factory_api/inc/CustomInterfaceProxyFactory.h	Fri Jul 09 12:23:13 2010 +0100
@@ -19,7 +19,7 @@
 #define __CUSTOMINTERFACEPROXYFACTORY_H
 
 #include <e32std.h>
-#include <MCustomCommand.h>
+#include <mcustomcommand.h>
 #include <CustomInterfaceUtility.h>
 
 class CCustomInterfaceProxyFactory
--- a/mm_plat/custom_interface_utility_api/inc/CustomCommandUtility.h	Thu Jun 24 10:37:45 2010 +0100
+++ b/mm_plat/custom_interface_utility_api/inc/CustomCommandUtility.h	Fri Jul 09 12:23:13 2010 +0100
@@ -20,7 +20,7 @@
 #define __CUSTOMCOMMANDUTILITY_H
 
 #include <e32base.h>
-#include <MCustomCommand.h>
+#include <mcustomcommand.h>
 //#include "CustomCommandTypes.h"
 
 
--- a/mm_plat/custom_interface_utility_api/inc/CustomInterfaceUtility.h	Thu Jun 24 10:37:45 2010 +0100
+++ b/mm_plat/custom_interface_utility_api/inc/CustomInterfaceUtility.h	Fri Jul 09 12:23:13 2010 +0100
@@ -19,7 +19,7 @@
 #define __CUSTOMINTERFACEUTILITY_H
 
 #include <e32base.h>
-#include <MCustomInterface.h>
+#include <mcustominterface.h>
 //#include "CustomCommandTypes.h"
 #include <CustomCommandUtility.h>
 class CProxyCustomInterfaceUtility;
--- a/mm_plat/eaacplusutil_api/eaacplusutil_api.metaxml	Thu Jun 24 10:37:45 2010 +0100
+++ b/mm_plat/eaacplusutil_api/eaacplusutil_api.metaxml	Fri Jul 09 12:23:13 2010 +0100
@@ -1,15 +1,15 @@
-<?xml version="1.0" ?>
-<api id="eadaefebbee015faff96ba746c3cebf6" dataversion="2.0">
-  <name>EAacPlusUtil API</name>
-  <description>This API is used by a media component to obtain information about the AAC content present in the buffer.</description>
-  <type>c++</type>
-  <collection>codecs</collection>
-  <libs>
-    <lib name="eaacplusutil.lib" />
-  </libs>
-  <release category="platform"/>
-  <attributes>
-     <htmldocprovided>no</htmldocprovided>
-     <adaptation>no<adaptation/>
-  </attributes>
-</api>
+<?xml version="1.0" ?>
+<api id="eadaefebbee015faff96ba746c3cebf6" dataversion="2.0">
+  <name>EAacPlusUtil API</name>
+  <description>This API is used by a media component to obtain information about the AAC content present in the buffer.</description>
+  <type>c++</type>
+  <collection>codecs</collection>
+  <libs>
+    <lib name="eaacplusutil.lib" />
+  </libs>
+  <release category="platform"/>
+  <attributes>
+     <htmldocprovided>no</htmldocprovided>
+     <adaptation>no<adaptation/>
+  </attributes>
+</api>
--- a/mm_plat/frametable_api/frametable_api.metaxml	Thu Jun 24 10:37:45 2010 +0100
+++ b/mm_plat/frametable_api/frametable_api.metaxml	Fri Jul 09 12:23:13 2010 +0100
@@ -1,15 +1,15 @@
-<?xml version="1.0" ?>
-<api id="0bea77e43b9b6c845eb748f7914355de" dataversion="2.0">
-  <name>Frametable API</name>
-  <description>This API media frame position information within the media content to the controllers. </description>
-  <type>c++</type>
-  <collection>codecs</collection>
-  <libs>
-    <lib name="frametable.lib" />
-  </libs>
-  <release category="platform"/>
-  <attributes>
-     <htmldocprovided>no</htmldocprovided>
-     <adaptation>no<adaptation/>
-  </attributes>
-</api>
+<?xml version="1.0" ?>
+<api id="0bea77e43b9b6c845eb748f7914355de" dataversion="2.0">
+  <name>Frametable API</name>
+  <description>This API media frame position information within the media content to the controllers. </description>
+  <type>c++</type>
+  <collection>codecs</collection>
+  <libs>
+    <lib name="frametable.lib" />
+  </libs>
+  <release category="platform"/>
+  <attributes>
+     <htmldocprovided>no</htmldocprovided>
+     <adaptation>no<adaptation/>
+  </attributes>
+</api>
--- a/mm_pub/audio_effects_api/inc/AudioEqualizerBase.h	Thu Jun 24 10:37:45 2010 +0100
+++ b/mm_pub/audio_effects_api/inc/AudioEqualizerBase.h	Fri Jul 09 12:23:13 2010 +0100
@@ -24,7 +24,7 @@
 #include <e32base.h>
 #include <AudioEffectBase.h>
 #include <AudioEqualizerData.h>
-#include <MCustomInterface.h>
+#include <mcustominterface.h>
 
 
 const TUid KUidAudioEqualizerEffect = {0x1020382A};
--- a/mm_pub/audio_effects_api/inc/BassBoostBase.h	Thu Jun 24 10:37:45 2010 +0100
+++ b/mm_pub/audio_effects_api/inc/BassBoostBase.h	Fri Jul 09 12:23:13 2010 +0100
@@ -24,7 +24,7 @@
 #include <e32base.h>
 #include <AudioEffectBase.h>
 #include <BassBoostData.h>
-#include <MCustomInterface.h>
+#include <mcustominterface.h>
 
 const TUid KUidBassBoostEffect = {0x10203827};
 
--- a/mm_pub/audio_effects_api/inc/DistanceAttenuationBase.h	Thu Jun 24 10:37:45 2010 +0100
+++ b/mm_pub/audio_effects_api/inc/DistanceAttenuationBase.h	Fri Jul 09 12:23:13 2010 +0100
@@ -24,7 +24,7 @@
 #include <e32base.h>
 #include <AudioEffectBase.h>
 #include <DistanceAttenuationData.h>
-#include <MCustomInterface.h>
+#include <mcustominterface.h>
 
 
 const TUid KUidDistanceAttenuationEffect = {0x1020382C};
--- a/mm_pub/audio_effects_api/inc/DopplerBase.h	Thu Jun 24 10:37:45 2010 +0100
+++ b/mm_pub/audio_effects_api/inc/DopplerBase.h	Fri Jul 09 12:23:13 2010 +0100
@@ -25,7 +25,7 @@
 #include <e32base.h>
 #include <AudioEffectBase.h>
 #include <DopplerData.h>
-#include <MCustomInterface.h>
+#include <mcustominterface.h>
 
 // CLASS DECLARATION
 
--- a/mm_pub/audio_effects_api/inc/EnvironmentalReverbBase.h	Thu Jun 24 10:37:45 2010 +0100
+++ b/mm_pub/audio_effects_api/inc/EnvironmentalReverbBase.h	Fri Jul 09 12:23:13 2010 +0100
@@ -24,7 +24,7 @@
 #include <e32base.h>
 #include <AudioEffectBase.h>
 #include <EnvironmentalReverbData.h>
-#include <MCustomInterface.h>
+#include <mcustominterface.h>
 
 const TUid KUidEnvironmentalReverbEffect = {0x10203837};
 
--- a/mm_pub/audio_effects_api/inc/ListenerDopplerBase.h	Thu Jun 24 10:37:45 2010 +0100
+++ b/mm_pub/audio_effects_api/inc/ListenerDopplerBase.h	Fri Jul 09 12:23:13 2010 +0100
@@ -23,7 +23,7 @@
 
 #include <e32base.h>
 #include <DopplerBase.h>
-#include <MCustomInterface.h>
+#include <mcustominterface.h>
 
 const TUid KUidListenerDopplerEffect = {0x10207B16};
 
--- a/mm_pub/audio_effects_api/inc/ListenerLocationBase.h	Thu Jun 24 10:37:45 2010 +0100
+++ b/mm_pub/audio_effects_api/inc/ListenerLocationBase.h	Fri Jul 09 12:23:13 2010 +0100
@@ -23,7 +23,7 @@
 
 #include <e32base.h>
 #include <LocationBase.h>
-#include <MCustomInterface.h>
+#include <mcustominterface.h>
 
 const TUid KUidListenerLocationEffect = {0x1020382D};
 
--- a/mm_pub/audio_effects_api/inc/ListenerOrientationBase.h	Thu Jun 24 10:37:45 2010 +0100
+++ b/mm_pub/audio_effects_api/inc/ListenerOrientationBase.h	Fri Jul 09 12:23:13 2010 +0100
@@ -23,7 +23,7 @@
 
 #include <e32base.h>
 #include <OrientationBase.h>
-#include <MCustomInterface.h>
+#include <mcustominterface.h>
 
 const TUid KUidListenerOrientationEffect = {0x1020382E};
 
--- a/mm_pub/audio_effects_api/inc/LoudnessBase.h	Thu Jun 24 10:37:45 2010 +0100
+++ b/mm_pub/audio_effects_api/inc/LoudnessBase.h	Fri Jul 09 12:23:13 2010 +0100
@@ -24,7 +24,7 @@
 #include <e32base.h>
 #include <AudioEffectBase.h>
 #include <LoudnessData.h>
-#include <MCustomInterface.h>
+#include <mcustominterface.h>
 
 const TUid KUidLoudnessEffect = {0x10207AA8};
 
--- a/mm_pub/audio_effects_api/inc/OrientationBase.h	Thu Jun 24 10:37:45 2010 +0100
+++ b/mm_pub/audio_effects_api/inc/OrientationBase.h	Fri Jul 09 12:23:13 2010 +0100
@@ -25,7 +25,7 @@
 #include <e32base.h>
 #include <AudioEffectBase.h>
 #include <OrientationData.h>
-#include <MCustomInterface.h>
+#include <mcustominterface.h>
 
 // CLASS DECLARATION
 
--- a/mm_pub/audio_effects_api/inc/RoomLevelBase.h	Thu Jun 24 10:37:45 2010 +0100
+++ b/mm_pub/audio_effects_api/inc/RoomLevelBase.h	Fri Jul 09 12:23:13 2010 +0100
@@ -24,7 +24,7 @@
 #include <e32base.h>
 #include <AudioEffectBase.h>
 #include <RoomLevelData.h>
-#include <MCustomInterface.h>
+#include <mcustominterface.h>
 
 const TUid KUidRoomLevelEffect = {0x10207B3C};
 
--- a/mm_pub/audio_effects_api/inc/SourceDopplerBase.h	Thu Jun 24 10:37:45 2010 +0100
+++ b/mm_pub/audio_effects_api/inc/SourceDopplerBase.h	Fri Jul 09 12:23:13 2010 +0100
@@ -23,7 +23,7 @@
 
 #include <e32base.h>
 #include <DopplerBase.h>
-#include <MCustomInterface.h>
+#include <mcustominterface.h>
 
 const TUid KUidSourceDopplerEffect = {0x10207B15};
 
--- a/mm_pub/audio_effects_api/inc/SourceLocationBase.h	Thu Jun 24 10:37:45 2010 +0100
+++ b/mm_pub/audio_effects_api/inc/SourceLocationBase.h	Fri Jul 09 12:23:13 2010 +0100
@@ -23,7 +23,7 @@
 
 #include <e32base.h>
 #include <LocationBase.h>
-#include <MCustomInterface.h>
+#include <mcustominterface.h>
 
 const TUid KUidSourceLocationEffect = {0x10203835};
 
--- a/mm_pub/audio_effects_api/inc/SourceOrientationBase.h	Thu Jun 24 10:37:45 2010 +0100
+++ b/mm_pub/audio_effects_api/inc/SourceOrientationBase.h	Fri Jul 09 12:23:13 2010 +0100
@@ -23,7 +23,7 @@
 
 #include <e32base.h>
 #include <OrientationBase.h>
-#include <MCustomInterface.h>
+#include <mcustominterface.h>
 
 const TUid KUidSourceOrientationEffect = {0x10203834};
 
--- a/mm_pub/audio_effects_api/inc/StereoWideningBase.h	Thu Jun 24 10:37:45 2010 +0100
+++ b/mm_pub/audio_effects_api/inc/StereoWideningBase.h	Fri Jul 09 12:23:13 2010 +0100
@@ -24,7 +24,7 @@
 #include <e32base.h>
 #include <AudioEffectBase.h>
 #include <StereoWideningData.h>
-#include <MCustomInterface.h>
+#include <mcustominterface.h>
 
 const TUid KUidStereoWideningEffect = {0x10203836};
 
--- a/mm_pub/audio_effects_presets_api/tsrc/EffectPresetsTest/src/EffectPresetTestCore.cpp	Thu Jun 24 10:37:45 2010 +0100
+++ b/mm_pub/audio_effects_presets_api/tsrc/EffectPresetsTest/src/EffectPresetTestCore.cpp	Fri Jul 09 12:23:13 2010 +0100
@@ -353,7 +353,7 @@
 TUint32 CTestAudioEqualizerUtility::NumberOfPreDefinePresets(TTestResult & aResult)
 	{
 		TInt err=KErrNone;
-		TUint32 aPredefinedPreset;
+		TUint32 aPredefinedPreset = 0;
 
 		TRAP(err, aPredefinedPreset=iAudioEqualizerUtility->NumberOfPreDefinedPresets());
 		aResult.iResult = err;
--- a/mm_pub/drm_audio_player_api/tsrc/DRMAudioPlay/src/DRMAudioPlay_core.cpp	Thu Jun 24 10:37:45 2010 +0100
+++ b/mm_pub/drm_audio_player_api/tsrc/DRMAudioPlay/src/DRMAudioPlay_core.cpp	Fri Jul 09 12:23:13 2010 +0100
@@ -21,7 +21,7 @@
 #include <caf.h>
 #include <caf/supplier.h>
 #include <caf/importfile.h>
-#include <oma2agent.h>
+#include <Oma2Agent.h>
 #include <BAUTILS.H>
 
 using namespace ContentAccess;
--- a/mm_pub/drm_audio_player_api/tsrc/DRMAudioPlay/src/SimpleSoundPlayer.cpp	Thu Jun 24 10:37:45 2010 +0100
+++ b/mm_pub/drm_audio_player_api/tsrc/DRMAudioPlay/src/SimpleSoundPlayer.cpp	Fri Jul 09 12:23:13 2010 +0100
@@ -249,7 +249,7 @@
 				if (iMetaInfoTest)
 				    {	//No error yet
 					TInt currMetaDataIndex = 0;
-					CMMFMetaDataEntry* currMetaData;
+					CMMFMetaDataEntry* currMetaData = NULL;
 					for ( currMetaDataIndex=0 ; currMetaDataIndex < NumMetaDatas ; currMetaDataIndex++)
 					    {
 					    currMetaData = iMdaPlayer->GetMetaDataEntryL(currMetaDataIndex);
@@ -783,9 +783,10 @@
 			return ETrue;
 			//break;
 		case KPlayerActionStopPlayUrl:
-			CUrlParameters *p = static_cast<CUrlParameters *>(aParams);
-			OpenUrlL(p->GetUrl() , p->GetIapId() , p->GetMimeType() );
-			break;
+		   CUrlParameters *p;
+			 p = static_cast<CUrlParameters *>(aParams);
+			 OpenUrlL(p->GetUrl() , p->GetIapId() , p->GetMimeType() );
+			 break;
 		case KPlayerActionStopPlayFileHandler:
 			Stop();
 		//	OpenFileHandlerL((static_cast<CFileNameParameters*>(aParams) )->GetFileName() , ETrue);
Binary file mm_pub/drm_audio_player_api/tsrc/data/mmc/drm/testamr.dcf has changed
Binary file mm_pub/drm_audio_player_api/tsrc/data/mmc/drm/testamrnb.dcf has changed
Binary file mm_pub/drm_audio_player_api/tsrc/data/mmc/drm/testamrwb.dcf has changed
Binary file mm_pub/drm_audio_player_api/tsrc/data/mmc/drm/testawb.dcf has changed
--- a/mmdevicefw/mdf/mmpfiles/audio/mdasoundadapter.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmdevicefw/mdf/mmpfiles/audio/mdasoundadapter.mmp	Fri Jul 09 12:23:13 2010 +0100
@@ -19,9 +19,6 @@
 UID             0x1000008d 0x102833D6
 VENDORID        0x70000001
 
-//If this macro is enabled, BytesPlayed() uses iBytesPlayed instead of RSoundSc's BytesTransferred()
-MACRO SYMBIAN_SOUNDADAPTER_BYTESPLAYED
-
 // Enable this for debug output
 //MACRO SYMBIAN_SOUNDADAPTER_DEBUG
 
@@ -54,7 +51,7 @@
 SOURCE			mdasoundadapterconsts.cpp
 
 LIBRARY			euser.lib
-LIBRARY			hal.lib //needed only when SYMBIAN_SOUNDADAPTER_BYTESPLAYED is enabled
+LIBRARY			hal.lib
 LIBRARY			audioutils.lib // for rate converter
 DEFFILE			mdasoundadapter.def
 NOSTRICTDEF
--- a/mmdevicefw/mdf/src/audio/mdasoundadapter/mdasoundadapter.cpp	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmdevicefw/mdf/src/audio/mdasoundadapter/mdasoundadapter.cpp	Fri Jul 09 12:23:13 2010 +0100
@@ -22,6 +22,17 @@
 	{
 	}
 		
+/*
+ @capability MultimediaDD
+ 
+ This function creates the handle to the sound media driver.
+ 
+ @param aUnit	A unit of the device.
+ 
+ @return KErrNone on success, otherwise system wide error code.
+ 
+ @capability MultimediaDD
+*/
 EXPORT_C TInt RMdaDevSound::Open(TInt aUnit)
 	{
 	TInt err = KErrNone;
@@ -35,7 +46,13 @@
 		}
 	return err;
 	}
-		
+
+/*
+ Gets the version object of sound media driver.
+
+@return version object.
+
+*/
 EXPORT_C TVersion RMdaDevSound::VersionRequired() const
 	{
 	if(iBody)
@@ -45,101 +62,215 @@
 	return TVersion();
 	}
 
+/*
+ Indicates whether the driver is sound media driver.
+
+@return KErrNone on success, otherwise System wide error code.
+
+*/
 EXPORT_C TInt RMdaDevSound::IsMdaSound()
 	{
 	return iBody->IsMdaSound();
 	}
 
+/*
+ This function gets the play volume. 
+ The range of volume level supported depends on the physical audio device used.
+
+@return Volume level.
+
+*/
 EXPORT_C TInt RMdaDevSound::PlayVolume()
 	{
 	__ASSERT_DEBUG(iBody != NULL, Panic(EDeviceNotOpened));
 	return iBody->PlayVolume();
 	}
 	
+/*
+ This function sets the play volume.
+ The volume level depends on the physical audio device used.
+	
+@param aVolume	Play volume level in the range 0 to 255 inclusive
+@see TSoundFormatsSupported
+
+*/
 EXPORT_C void RMdaDevSound::SetPlayVolume(TInt aVolume)
 	{
 	__ASSERT_DEBUG(iBody != NULL, Panic(EDeviceNotOpened));
 	iBody->SetPlayVolume(aVolume);
 	}
+
+/*
+ This function sets the play volume.
+ The volume level depends on the physical audio device used.
 	
+@param aVolume	Play volume level. Logarithmic value.
+@see TSoundFormatsSupported
+
+*/
 EXPORT_C void RMdaDevSound::SetVolume(TInt aLogarithmicVolume)
 	{
 	__ASSERT_DEBUG(iBody != NULL, Panic(EDeviceNotOpened));
 	iBody->SetVolume(aLogarithmicVolume);	
 	}
 	
+/*
+ This function cancels the currently playing sound.
+ If paused, the pause will be cancelled.
+ Will panic if not open.
+ Will not cancel Notify*Error().
+*/
 EXPORT_C void RMdaDevSound::CancelPlayData()
 	{
 	__ASSERT_DEBUG(iBody != NULL, Panic(EDeviceNotOpened));
 	iBody->CancelPlayData();
 	}
-	
+
+/*
+ Gets the sound record volume.
+ This depends on the physical audio device used.
+@return Record volume level.
+
+*/
 EXPORT_C TInt RMdaDevSound::RecordLevel()
 	{
 	__ASSERT_DEBUG(iBody != NULL, Panic(EDeviceNotOpened));
 	return iBody->RecordLevel();
 	}
-	
+
+/*
+ This function sets the device record volume level.
+ This depends on the physical audio device used.
+@param aLevel Record volume level.	
+@see TSoundFormatsSupported
+
+*/
 EXPORT_C void RMdaDevSound::SetRecordLevel(TInt aLevel)
 	{
 	__ASSERT_DEBUG(iBody != NULL, Panic(EDeviceNotOpened));
 	iBody->SetRecordLevel(aLevel);
 	}
-	
+
+/*
+ This function cancels the recording in progress.
+ If paused, the pause will be cancelled.
+ Any buffered data will be discarded.
+ Will panic if not open.
+ Will not cancel Notify*Error().
+*/
 EXPORT_C void RMdaDevSound::CancelRecordData()
 	{
 	__ASSERT_DEBUG(iBody != NULL, Panic(EDeviceNotOpened));
 	iBody->CancelRecordData();
 	}
-	
+
+/*
+ This function stops recording and completes the outstanding RecordData request immediately with any available data.
+ Any following RecordData calls will be completed immediately returning any buffered data, they will NOT restart recording.
+
+ It  maybe called either when recording or stopped.
+
+ The flushing state should be exited by calling CancelRecordData.
+ 
+ The adaptor implements this functionality via Pause, which results in slightly different behaviour to the old RMdaDevSound driver.
+ In particular the flushing state can also be exited by calling ResumeRecording, do NOT do  this... If you want this behaviour, use the
+ new PauseRecording/ResumeRecording functions.
+ */
 EXPORT_C void RMdaDevSound::FlushRecordBuffer()
 	{
 	__ASSERT_DEBUG(iBody != NULL, Panic(EDeviceNotOpened));
 	iBody->FlushRecordBuffer();
 	}
-	
+
+/*
+ This function returns the number of bytes played by the driver since calling Open or 
+ calling ResetBytesPlayed().
+
+ It is not reset by PlayData or PausePlayBuffer/ResumePlayBuffer
+
+@see RMdaDevSound::ResetBytesPlayed() 
+@return Number of bytes played.
+*/
 EXPORT_C TInt RMdaDevSound::BytesPlayed()
 	{
 	__ASSERT_DEBUG(iBody != NULL, Panic(EDeviceNotOpened));
 	return iBody->BytesPlayed();
 	}
 
+/*
+ Resets the count of bytes played.
+
+ If called whilst playing, the counter might not reset to exactly zero, it will reset to the number of bytes played in the current
+ internal transfer.
+*/
 EXPORT_C void RMdaDevSound::ResetBytesPlayed()
 	{
 	__ASSERT_DEBUG(iBody != NULL, Panic(EDeviceNotOpened));
 	return iBody->ResetBytesPlayed();
 	}
-	
+
+/*
+ This function changes the audio play state to pause.
+ It is legal to pause whilst not playing, in which case a following (single) PlayData request will be queued until
+ ResumePlaying is called.
+*/
 EXPORT_C void RMdaDevSound::PausePlayBuffer()
 	{
 	__ASSERT_DEBUG(iBody != NULL, Panic(EDeviceNotOpened));
 	iBody->PausePlayBuffer();
 	}
+
 	
+/*
+ This function starts the audio play from pause state.
+ If a PlaData request was active when the Pause was requested it will continue.
+ If a PlayData request was not active when the Pause was requested, but a one was issued whilst paused,
+ it will start.
+ If there is nothing to resume, we will notify KErrUnderflow.
+*/
 EXPORT_C void RMdaDevSound::ResumePlaying()
 	{
 	__ASSERT_DEBUG(iBody != NULL, Panic(EDeviceNotOpened));
 	iBody->ResumePlaying();
 	}
 
+/*
+ This function is identical to RMdaDevSound::ResumePlaying(), the parameter is ignored.
+*/
 EXPORT_C void RMdaDevSound::ResumePlaying(TRequestStatus&)
 	{
 	__ASSERT_DEBUG(iBody != NULL, Panic(EDeviceNotOpened));
 	iBody->ResumePlaying();
 	}
 
+/*
+The current record request will be completed early with partial contents and further
+recording paused.
+
+Any following RecordData calls will be completed immediately using any buffered data, it will NOT restart recording.
+
+*/
 EXPORT_C void RMdaDevSound::PauseRecordBuffer()
 	{
 	__ASSERT_DEBUG(iBody != NULL, Panic(EDeviceNotOpened));
 	iBody->PauseRecordBuffer();
 	}
 
+/*
+	Resume recording.
+	Recorded data will be buffered internally.
+	If an outstanding RecordData request was issued whilst paused it will be processed.
+*/
 EXPORT_C void RMdaDevSound::ResumeRecording()
 	{
 	__ASSERT_DEBUG(iBody != NULL, Panic(EDeviceNotOpened));
 	iBody->ResumeRecording();
 	}
 
+/*
+	Return the duration of the audio data which has been played.
+	Note that this may be less than the amount of data/time queued.
+*/
 EXPORT_C TInt RMdaDevSound::GetTimePlayed(TTimeIntervalMicroSeconds& aTimePlayed)
 	{
 	__ASSERT_DEBUG(iBody != NULL, Panic(EDeviceNotOpened));
@@ -147,37 +278,93 @@
 	}
 
 
-	
+/*
+ Gets the play format(capability) supported by this device. 
+ This record describes supported sample rate, encoding, volume level, channels, buffer size of the audio for playing. 
+
+@param  aFormatsSupported	A reference to a client supplied TSoundFormatsSupported class to be filled by this function. 
+@see TSoundFormatsSupported
+
+*/
 EXPORT_C void RMdaDevSound::PlayFormatsSupported(TSoundFormatsSupportedBuf& aFormatsSupported)
 	{
 	__ASSERT_DEBUG(iBody != NULL, Panic(EDeviceNotOpened));
 	iBody->PlayFormatsSupported(aFormatsSupported);
 	}
-	
+
+/*
+ This function gets the current play format.
+
+@param  aFormat	A reference to a client supplied TCurrentSoundFormat class to be filled by this function. 
+@see TCurrentSoundFormat
+
+*/
 EXPORT_C void RMdaDevSound::GetPlayFormat(TCurrentSoundFormatBuf& aFormat)
 	{
 	__ASSERT_DEBUG(iBody != NULL, Panic(EDeviceNotOpened));
 	iBody->GetPlayFormat(aFormat);
 	}
-	
+
+/*
+ This functions sets the play format.
+
+@param aFormat For the details refer to TCurrentSoundFormat. 
+
+@see TCurrentSoundFormat
+
+@return KErrNone on success,
+		KErrInUse if playing, 
+        KErrAccessDenied if play and recording sample rate is different,
+        KErrNotSupported if input sound format does not match with supported capability,
+        otherwise system wide error code.
+
+*/	
 EXPORT_C TInt RMdaDevSound::SetPlayFormat(const TCurrentSoundFormatBuf& aFormat)
 	{
 	__ASSERT_DEBUG(iBody != NULL, Panic(EDeviceNotOpened));
 	return iBody->SetPlayFormat(aFormat);
 	}
 
+/*
+ Gets the sound record format. 
+ This record describes supported sample rate, encoding, volume level, buffer size of the audio for recording.
+ This depends on the physical device used.
+
+@param  aFormatsSupported	A reference to a client supplied TSoundFormatsSupported class to be filled by this function.  
+@see TSoundFormatsSupported
+
+*/
 EXPORT_C void RMdaDevSound::RecordFormatsSupported(TSoundFormatsSupportedBuf& aFormatsSupported)
 	{
 	__ASSERT_DEBUG(iBody != NULL, Panic(EDeviceNotOpened));
 	iBody->RecordFormatsSupported(aFormatsSupported);
 	}
 
+/*
+ Gets a current sound format used for recording.
+ 
+@param aFormat	A reference to a client supplied TCurrentSoundFormat class to be filled by this function.
+@see TCurrentSoundFormat
+
+*/
 EXPORT_C void RMdaDevSound::GetRecordFormat(TCurrentSoundFormatBuf& aFormat)
 	{
 	__ASSERT_DEBUG(iBody != NULL, Panic(EDeviceNotOpened));
 	iBody->GetRecordFormat(aFormat);
 	}
 
+/*
+ Call this function to change the sound format used for recording.
+
+@param aFormat	For details refer to TCurrentSoundFormat. 
+@see TCurrentSoundFormat
+
+@return KErrNone on sucess,
+        KErrInUse  if recording already in progress,
+        KErrAccessDenied   play and record sample rates are different,
+        otherwise system wide error code.
+
+*/
 EXPORT_C TInt RMdaDevSound::SetRecordFormat(const TCurrentSoundFormatBuf& aFormat)
 	{
 	__ASSERT_DEBUG(iBody != NULL, Panic(EDeviceNotOpened));
@@ -203,42 +390,94 @@
 	return 0;
 	}
 
+/*
+ Call this function to play the audio data in the supplied descriptor.
+
+Only a single request may be outstanding at any point in time.
+
+If paused, the request will be queued until ResumePlaying is called.
+
+@param  aStatus	For details refer to TRequestStatus. 
+@see TRequestStatus
+
+@param	aData	Descriptor with play data
+
+*/
 EXPORT_C void RMdaDevSound::PlayData(TRequestStatus& aStatus, const TDesC8& aData)
 	{
 	__ASSERT_DEBUG(iBody != NULL, Panic(EDeviceNotOpened));
 	iBody->PlayData(aStatus, aData);
 	}
 
+/*
+ Records audio data into the supplied descriptor.
+
+Only a single request may be outstanding at any point in time.
+
+If paused, the request will be queued until ResumeRecording is called.
+
+@param  aStatus	Request status
+@see TRequestStatus
+
+@param  aData	Record buffer descriptor.
+
+*/
 EXPORT_C void RMdaDevSound::RecordData(TRequestStatus& aStatus, TDes8& aData)
 	{
 	__ASSERT_DEBUG(iBody != NULL, Panic(EDeviceNotOpened));
 	iBody->RecordData(aStatus, aData);
 	}
 
+/*
+ Call this function to notify any error encountered while recording audio.
+
+@param  aStatus	request object's completion code value 
+@see TRequestStatus
+
+*/
 EXPORT_C void RMdaDevSound::NotifyRecordError(TRequestStatus& aStatus)
 	{
 	__ASSERT_DEBUG(iBody != NULL, Panic(EDeviceNotOpened));
 	iBody->NotifyRecordError(aStatus);
 	}
 
+/*
+ Call this function to notify the play error encountered while playing the sound.
+
+@param aStatus	Error code stating the cause for the play error.
+
+*/
 EXPORT_C void RMdaDevSound::NotifyPlayError(TRequestStatus& aStatus)
 	{
 	__ASSERT_DEBUG(iBody != NULL, Panic(EDeviceNotOpened));
 	iBody->NotifyPlayError(aStatus);
 	}
 
+/*
+ This function cancels the play notification error.
+
+*/
 EXPORT_C void RMdaDevSound::CancelNotifyPlayError()
 	{
 	__ASSERT_DEBUG(iBody != NULL, Panic(EDeviceNotOpened));
 	iBody->CancelNotifyPlayError();
 	}
 
+/*
+ This function cancels the recording error notification.
+*/
 EXPORT_C void RMdaDevSound::CancelNotifyRecordError()
 	{
 	__ASSERT_DEBUG(iBody != NULL, Panic(EDeviceNotOpened));
 	iBody->CancelNotifyRecordError();
 	}
 
+/*
+This function cancels the currently playing sound.
+If paused, the pause will be cancelled.
+
+ This function is identical to CancelPlayData
+*/
 EXPORT_C void RMdaDevSound::FlushPlayBuffer()
 	{
 	__ASSERT_DEBUG(iBody != NULL, Panic(EDeviceNotOpened));
--- a/mmdevicefw/mdf/src/audio/mdasoundadapter/mdasoundadapter.h	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmdevicefw/mdf/src/audio/mdasoundadapter/mdasoundadapter.h	Fri Jul 09 12:23:13 2010 +0100
@@ -23,7 +23,7 @@
 	
 #define MDADEVSOUNDNAME _L8("RMdaDevSound")
 
-/**
+/*
  Adapter class which routes the calls on RMdaDevSound(old sound driver interface) to RSoundSc(new sound driver interface). 
  The purpose of this class is to use the new sound driver in MDF without changing the calling code. This class
  does not support any new functionalities supported by the shared chunk sound driver but supports the functionality of the 
@@ -33,165 +33,165 @@
 	{
 	class CBody;
 public:
-	/**
+	/*
 	enum for major, minor and build version of sound device driver.
 	*/
 	enum TVer {EMajorVersionNumber=1,EMinorVersionNumber=0,EBuildVersionNumber=KE32BuildVersionNumber};
-    /**
+    /*
 	enum for sound media device play/record request.
 	*/
 	enum TMdaRequest
 		{
-		/** Play data request */
+		/* Play data request */
 		EMdaRequestPlayData,
-		/** Play error notification */
+		/* Play error notification */
 		EMdaRequestPlayErrorNotification,
-		/** Record data request */
+		/* Record data request */
 		EMdaRequestRecordData,
-		/** Record error notification */
+		/* Record error notification */
 		EMdaRequestRecordErrorNotification
 		};
 	
-	/** enum for media device control request */
+	/* enum for media device control request */
 	enum TMdaControl
 		{
-		/** play format (capability) supported request */
+		/* play format (capability) supported request */
 		EMdaControlPlayFormatsSupported,
-		/** get the current play format request */
+		/* get the current play format request */
 		EMdaControlGetPlayFormat,
-		/** set the play format request  */
+		/* set the play format request  */
 		EMdaControlSetPlayFormat,
-		/** get play volume request */
+		/* get play volume request */
 		EMdaControlGetPlayVolume,
-		/** set play volume request */
+		/* set play volume request */
 		EMdaControlSetPlayVolume,
-		/** record format supported request */
+		/* record format supported request */
 		EMdaControlRecordFormatsSupported,
-		/** get the current record format request */
+		/* get the current record format request */
 		EMdaControlGetRecordFormat,
-		/** set record format request */
+		/* set record format request */
 		EMdaControlSetRecordFormat,
-		/** get record volume request */
+		/* get record volume request */
 		EMdaControlGetRecordLevel,
-		/** set record volume request */
+		/* set record volume request */
 		EMdaControlSetRecordLevel,
-		/** stop play request */
+		/* stop play request */
 		EMdaControlFlushPlayBuffer,
-		/** stop record request */
+		/* stop record request */
 		EMdaControlFlushRecordBuffer,
-		/** bytes played request  */
+		/* bytes played request  */
 		EMdaControlBytesPlayed,
-		/** set base value for the bytes played */
+		/* set base value for the bytes played */
 		EMdaControlResetBytesPlayed,
-		/** Investigate for sound media driver request */
+		/* Investigate for sound media driver request */
 		EMdaControlIsMdaSound,
-		/** pause play request */
+		/* pause play request */
 		EMdaControlPausePlayBuffer,
-		/** resume play request */
+		/* resume play request */
 		EMdaControlResumePlaying
 		};
 		
-	/**
+	/*
     This enum corresponds to supported sound encoding schemes
     */
 	enum TMdaSoundEncoding
 		{
-		/** sound encoding(compression) using 8 bit PCM (pulse code modulation) */
+		/* sound encoding(compression) using 8 bit PCM (pulse code modulation) */
 		EMdaSoundEncoding8BitPCM		= 0x00000001,
-		/** sound encoding using 16 bit PCM */
+		/* sound encoding using 16 bit PCM */
 		EMdaSoundEncoding16BitPCM		= 0x00000002,
-		/** sound encoding using 8 bit A law */
+		/* sound encoding using 8 bit A law */
 		EMdaSoundEncoding8BitALaw		= 0x00000004,
-		/** sound encoding using 8 bit Mu law */
+		/* sound encoding using 8 bit Mu law */
 		EMdaSoundEncoding8BitMuLaw		= 0x00000008,
 		};
 		
-	/**
+	/*
     This class corresponds to a supported sound format.
 	The format describes the supported audio device's min/max sampling rate, encoding, channels and buffer size of play/record and volume.
     */
 	class TSoundFormatsSupported
 		{
 	public:
-	/**
+	/*
     This corresponds to minimum sample rate supported. This depends on the physical sound device used(example: 8000 hertz). 
     */
 		TInt iMinRate;
 		
-	/**
+	/*
     This corresponds to maximum sample rate supported. This depends on the physical sound device used(example: 48000 hertz).
     */
 		TInt iMaxRate;
 		
-	/**
+	/*
     This corresponds to encoding format supported.  
 	@see  TMdaSoundEncoding
     */		
 		TUint32 iEncodings;
 		
-	/**
+	/*
     This corresponds to the number of sound channels supported. Possible values are EMono for a single channel and EStereo for two channel sound.
 	Also this depends on the physical device used.
     */
 		TInt iChannels;
 		
-	/**
+	/*
     This corresponds to minimum buffer size. This depends on the physical device used and sampling rate adapted.
 	@see KSoundMinBufferSize
     */
 		TInt iMinBufferSize;
 		
-	/**
+	/*
     This corresponds to maximum buffer size.This depends on the physical device used and sampling rate adapted. 
 	@see KSoundPlayBufferSize
     @see KSoundRecordBufferSize
     */
 		TInt iMaxBufferSize;
 
-	/**
+	/*
     This corresponds to minimum play/record volume. 
     */	
 		TInt iMinVolume;
 		
-	/**
+	/*
     This corresponds to maximum play/record volume. 
     */
 		TInt iMaxVolume;
 		};
 
-	/** A typedef'd packaged RMdaDevSound::TSoundFormatsSupported for passing through a generic API method */
+	/* A typedef'd packaged RMdaDevSound::TSoundFormatsSupported for passing through a generic API method */
 	typedef TPckgBuf<TSoundFormatsSupported> TSoundFormatsSupportedBuf;
 
-	/**
+	/*
     This class corresponds to current supported sound format. 
 	The format describes the supported audio device's sampling rate, encoding, channels and buffer size of play/record.
     */
 	class TCurrentSoundFormat
 		{
 	public:
-	/**
+	/*
     This corresponds to sound sampling rate like (44000 Hertz, 8000 Hertz). The possible values depends on the physical device used.
     */
 		TInt iRate;
 		
-	/**
+	/*
     @see TMdaSoundEncoding
     */
 		TMdaSoundEncoding iEncoding;
 		
-	/**
+	/*
     This corresponds to the number of sound channels supported. Possible values are EMono for a single channel and EStereo for two channel sound.
 	Also this depends on the physical device used.
     */
 		TInt iChannels;
 		
-	/**
+	/*
     Play or Record buffer size. The possible value depends on the physical device used. 
     */
 		TInt iBufferSize;
 		};
 
-	/** A typedef'd packaged RMdaDevSound::TCurrentSoundFormat for passing through a generic API method */
+	/* A typedef'd packaged RMdaDevSound::TCurrentSoundFormat for passing through a generic API method */
 	typedef TPckgBuf<TCurrentSoundFormat> TCurrentSoundFormatBuf;
 public:
 	IMPORT_C RMdaDevSound();
@@ -202,7 +202,9 @@
 	IMPORT_C void GetPlayFormat(TCurrentSoundFormatBuf& aFormat);
 	IMPORT_C TInt SetPlayFormat(const TCurrentSoundFormatBuf& aFormat);
 	IMPORT_C TInt PlayVolume();
-	IMPORT_C void SetPlayVolume(TInt aVolume);
+	// This function mimics RMdaDevSound interface with linear volume semantics
+	IMPORT_C void SetPlayVolume(TInt aLinearVolume);
+	// This function supports volume change with logarithmic semantics
 	IMPORT_C void SetVolume(TInt aLogarithmicVolume);
 	IMPORT_C void PlayData(TRequestStatus& aStatus,const TDesC8& aData);
 	IMPORT_C void CancelPlayData();
--- a/mmdevicefw/mdf/src/audio/mdasoundadapter/mdasoundadapterbody.cpp	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmdevicefw/mdf/src/audio/mdasoundadapter/mdasoundadapterbody.cpp	Fri Jul 09 12:23:13 2010 +0100
@@ -18,9 +18,7 @@
 
 #include "mmf/utils/rateconvert.h" // if we need to resample
 
-#ifdef SYMBIAN_SOUNDADAPTER_BYTESPLAYED
-	#include <hal.h>
-#endif
+#include <hal.h>
 
 _LIT(KPddFileName,"SOUNDSC.PDD");
 _LIT(KLddFileName,"ESOUNDSC.LDD");
@@ -37,7 +35,43 @@
 	{
 	User::Panic(KSoundAdapterPanicCategory, aPanicCode);
 	}
+
+
+const TText8 *RMdaDevSound::CBody::TState::Name() const
+	{
+	#ifdef SYMBIAN_SOUNDADAPTER_DEBUG	 
+	switch(iState)
+		{
+		case ENotReady:				return _S8("ENotReady");
+		case EStopped:				return _S8("EStopped");
+		case ERecording:			return _S8("ERecording");
+		case ERecordingPausedInHw:	return _S8("ERecordingPausedInHw");
+		case ERecordingPausedInSw:	return _S8("ERecordingPausedInSw");
+		case EPlaying:				return _S8("EPlaying");
+		case EPlayingPausedInHw: 	return _S8("EPlayingPausedInHw");
+		case EPlayingPausedInSw:	return _S8("EPlayingPausedInSw");
+		case EPlayingUnderrun:		return _S8("EPlayingUnderrun");
+		}
+	return _S8("CorruptState");
+	#else
+	return _S8("");
+	#endif
+	}
+
 	
+
+RMdaDevSound::CBody::TState &RMdaDevSound::CBody::TState::operator=(TStateEnum aNewState)
+	{
+    if(iState != aNewState)
+        {
+        #ifdef SYMBIAN_SOUNDADAPTER_DEBUG    
+        RDebug::Printf("RMdaDevSound state %s -> %s", Name(), TState(aNewState).Name());
+        #endif
+        iState = aNewState;
+        }
+	return *this;
+	}
+
 RMdaDevSound::CBody* RMdaDevSound::CBody::NewL()
 	{
 	CBody* self = new(ELeave) CBody();
@@ -49,21 +83,26 @@
 
 RMdaDevSound::CBody::~CBody()
 	{
-	for(TInt i = 0; i < KNumPlayers; i++)
+	for(TInt i = 0; i < KPlaySharedChunkBuffers; i++)
 		{
 		delete iPlayers[i];
 		iPlayers[i] = NULL;
 		}
-	iBufferRemaining.Close();
-	delete iPlayData.iConverter;
-	delete iRecordData.iConverter;
-	iChunk.Close();
+	delete iRecorder;
+	iRecorder = NULL;
+	delete iPlayFormatData.iConverter;
+	delete iRecordFormatData.iConverter;
+	iPlayChunk.Close();
 	iPlaySoundDevice.Close();
+	iRecordChunk.Close();
 	iRecordSoundDevice.Close();
+	iConvertedPlayData.Close();
+	iSavedTrailingData.Close();
+	iBufferedRecordData.Close();
 	}
 	
 RMdaDevSound::CBody::CBody()
-	:iState(ENotReady), iBufferIndex(-1), iBufferOffset(-1), iSecondPhaseData(0,0)
+	:iState(ENotReady), iBufferOffset(-1)
 	{
 	
 	}
@@ -99,13 +138,17 @@
     	{
     	User::Leave(err);
     	}
-	for(TInt i=0; i<KNumPlayers; i++)
+	for(TInt i=0; i<KPlaySharedChunkBuffers; i++)
 		{
 		iPlayers[i] = new(ELeave) CPlayer(CActive::EPriorityUserInput, *this, i);
+		iFreePlayers.Push(iPlayers[i]);
 		}
-#ifdef SYMBIAN_SOUNDADAPTER_BYTESPLAYED
-	User::LeaveIfError(HAL::Get(HALData::EFastCounterFrequency,iFCFrequency));
-#endif
+	
+	iRecorder = new(ELeave) CRecorder(CActive::EPriorityUserInput, *this);
+	
+	TInt tmp;
+	User::LeaveIfError(HAL::Get(HAL::ENanoTickPeriod, tmp));
+	iNTickPeriodInUsec = tmp;
 	}
 
 TInt RMdaDevSound::CBody::Open(TInt /*aUnit*/)
@@ -129,8 +172,22 @@
 		}
 	else
 	    {
-	    iState = EOpened;
+		TSoundFormatsSupportedV02Buf capsBuf;
+		iPlaySoundDevice.Caps(capsBuf);
+		TInt minBufferSize = KMinBufferSize;
+		#ifdef SYMBIAN_FORCE_32BIT_LENGTHS
+		minBufferSize = Max(minBufferSize, 4); // force to 32-bit buffer align
+		#endif
+		iRequestMinSize = Max(capsBuf().iRequestMinSize, minBufferSize); 
+		// work out mask so that x&iRequestMinMask is equiv to x/iRequestMinSize*iRequestMinSize
+		iRequestMinMask = ~(iRequestMinSize-1); // assume iRequestMinSize is power of 2
+		iSavedTrailingData.Close();
+		iSavedTrailingData.Create(iRequestMinSize);
+	
+	    iState = EStopped;
+		iBytesPlayed = 0;
 	    }
+
 	return err;
 	}
 		
@@ -160,12 +217,65 @@
 void RMdaDevSound::CBody::CancelPlayData()
 	{
     #ifdef SYMBIAN_SOUNDADAPTER_DEBUG	
-        RDebug::Print(_L("RMdaDevSound::CBody::CancelPlayData:"));
+    RDebug::Printf("RMdaDevSound::CBody::CancelPlayData: state %s", iState.Name());
     #endif	
 	__ASSERT_DEBUG(iPlaySoundDevice.Handle(), Panic(EDeviceNotOpened));
-	iPlaySoundDevice.CancelPlayData();
-	iPauseDeviceDriverOnNewData = EFalse;
-	SoundDeviceError(KErrNone);//cancel the players
+
+    // If there is a client request, cancel it
+    // Must do this before canceling players because otherwise they may just restart!
+    if(iClientPlayStatus)
+        {
+        #ifdef SYMBIAN_SOUNDADAPTER_DEBUG    
+        RDebug::Printf("msp PlayCancelled complete iClientPlayStatus");
+		#endif
+        User::RequestComplete(iClientPlayStatus, KErrCancel); // Call also sets iClientPlayStatus to NULL
+        }
+    
+    // Discard any buffered data
+    iClientPlayData.Set(0,0);
+	// Discard any saved trailing data (ie. data saved due driver requiring all requests to be a multiple of iRequestMinSize).
+	iSavedTrailingData.SetLength(0);
+
+    // Emulator RSoundSc PDD when running without a soundcard has a major
+    // issue with cancelling whilst paused. It will not clear the pending
+    // list (because the timer is not active) and therefore this list will
+    // later overflow causing hep corruption.
+    // This means that, for now, we MUST Resume before calling CancelPlayData
+    // to avoid kernel panics...
+    
+    // The device driver will not cancel a request which is in progress...
+    // So, if we are paused in hw, we must resume before cancelling the
+    // player otherwise it will hang in CActive::Cancel
+    if(iState == EPlayingPausedInHw)
+        {
+        #ifdef SYMBIAN_SOUNDADAPTER_DEBUG    
+        RDebug::Printf("msp Resume to avoid hang");
+        #endif
+        (void) iPlaySoundDevice.Resume();
+        }
+    
+    // Update state
+	iState = EStopped;
+	
+
+    // The RSoundSc driver will not cancel a request which is in progress (or paused).
+    // If we just loop across the players, cancelling each individual request and waiting for it to complete,
+    // several of them will actually play, which is both wrong and time consuming....
+    // Issue a block cancel upfront to avoid this
+    iPlaySoundDevice.CancelPlayData();
+ 
+	// Cancel all players
+	for (TUint playerIndex=0; playerIndex<KPlaySharedChunkBuffers; ++playerIndex)
+	    {
+	    // If the player is active it will call PlayRequestCompleted with aDueToCancelCommand true
+	    // to update the iFreePlayers and iActivePlayRequestSizes FIFOs.
+        iPlayers[playerIndex]->Cancel();
+	    }
+	
+	iBufferOffset = -1;
+	iBufferLength = 0;
+	
+	return;
 	}
 	
 TInt RMdaDevSound::CBody::RecordLevel()
@@ -184,64 +294,135 @@
 	{
 	__ASSERT_DEBUG(iRecordSoundDevice.Handle(), Panic(EDeviceNotOpened));
     #ifdef SYMBIAN_SOUNDADAPTER_DEBUG	
-        RDebug::Print(_L("RMdaDevSound::CBody::CancelRecordData:"));
+    RDebug::Printf("RMdaDevSound::CBody::CancelRecordData: state %s", iState.Name());
     #endif
-	iRecordSoundDevice.CancelRecordData();
-	SoundDeviceError(KErrNone);
+
+    // Stop recorder object (and its request)
+    iRecorder->Cancel();
+    
+    // Stop driver from recording
+    iRecordSoundDevice.CancelRecordData();
+             
+    // If there is a client request, cancel it
+    if(iClientRecordStatus)
+   		{
+        User::RequestComplete(iClientRecordStatus, KErrNone); // Call also sets iClientPlayStatus to NULL
+        }
+
+    iState = EStopped;
+    return;
 	}
 	
 void RMdaDevSound::CBody::FlushRecordBuffer()
 	{
 	__ASSERT_DEBUG(iRecordSoundDevice.Handle(), Panic(EDeviceNotOpened));
     #ifdef SYMBIAN_SOUNDADAPTER_DEBUG	
-        RDebug::Print(_L("RMdaDevSound::CBody::FlushRecordBuffer"));
+        RDebug::Print(_L("RMdaDevSound::CBody::FlushRecordBuffer - implemented by calling PauseRecordBuffer"));
     #endif
-	
-	if(iState == ERecording)
-	    {
-		iRecordSoundDevice.Pause();//this is equivalent call in the new sound driver
-    	}
+
+	PauseRecordBuffer();
 	}
 	
 TInt RMdaDevSound::CBody::BytesPlayed()
 	{
+    #ifdef SYMBIAN_SOUNDADAPTER_DEBUG    
+    RDebug::Printf("RMdaDevSound::BytesPlayed %s", iState.Name());
+	#endif
+
+	return I64LOW(BytesPlayed64());
+	}
+
+
+TUint64 RMdaDevSound::CBody::BytesPlayed64()
+	{
 	__ASSERT_DEBUG(iPlaySoundDevice.Handle(), Panic(EDeviceNotOpened));
-	TInt currentBytesPlayed = 0;
-#ifdef SYMBIAN_SOUNDADAPTER_BYTESPLAYED
-	if(iTimerActive)
+
+	TUint64 currentBytesPlayed = KMaxTUint64;
+
+	switch(iState)
+	{
+	case ENotReady:
+		Panic(EDeviceNotOpened);
+		break;
+
+	case EStopped:
+		currentBytesPlayed = iBytesPlayed;
+		break;
+
+	case ERecording:
+	case ERecordingPausedInHw:
+	case ERecordingPausedInSw:
+		Panic(EBadState);
+		break;
+
+	case EPlayingPausedInHw: // ie. Play request pending on h/w and paused
+		// Paused, so use pause time
+        #ifdef SYMBIAN_SOUNDADAPTER_DEBUG    
+		RDebug::Printf("EPlayingPausedInHw: iPausedBytes %x %x", I64HIGH(iPausedBytesPlayed), I64LOW(iPausedBytesPlayed));
+		#endif
+		currentBytesPlayed = iPausedBytesPlayed;
+		break;
+
+	case EPlayingPausedInSw: // ie. Driver not playing or paused
+		#ifdef SYMBIAN_SOUNDADAPTER_DEBUG	 
+		RDebug::Printf("EPlayingPausedInSw: iPausedBytesPlayed %x %x", I64HIGH(iPausedBytesPlayed), I64LOW(iPausedBytesPlayed));
+		#endif
+		currentBytesPlayed = iPausedBytesPlayed;
+		break;
+	case EPlayingUnderrun:
+		#ifdef SYMBIAN_SOUNDADAPTER_DEBUG	 
+		RDebug::Printf("EPlayingUnderrun: iBytesPlayed %x %x", I64HIGH(iBytesPlayed), I64LOW(iBytesPlayed));
+		#endif
+		currentBytesPlayed = iBytesPlayed;
+	    break;
+
+	case EPlaying:
 		{
-		TUint32 endTime = User::FastCounter();
-		TUint timePlayed = 0;
-		if(endTime<iStartTime)
-			{
-			timePlayed = (KMaxTUint32-iStartTime)+endTime;
-			}
-		else
+		// Playing so calculate time since last update to iBytesPlayed
+		TUint32 curTime = CurrentTimeInMsec();
+		TUint32 curRequestSize = iActivePlayRequestSizes.Peek();
+
+		TUint32 extraPlayTime = (curTime >= iStartTime) ? (curTime-iStartTime) : (KMaxTUint32 - (iStartTime-curTime));
+        #ifdef SYMBIAN_SOUNDADAPTER_DEBUG	 
+		RDebug::Printf("iStartTime %d curTime %d extraPlayTime %d", iStartTime, curTime, extraPlayTime);
+		
+		RDebug::Printf("iPlayFormatData.iSampleRate %d KBytesPerSample %d iNTickPeriodInUsec %d",
+					   iPlayFormatData.iSampleRate, KBytesPerSample, iNTickPeriodInUsec);
+        #endif
+		TUint32 extraBytesPlayed = TUint32((TUint64(extraPlayTime) * iPlayFormatData.iSampleRate * iPlayFormatData.iRequestedChannels * KBytesPerSample)/1000);
+		if(extraBytesPlayed > curRequestSize)
 			{
-			timePlayed = endTime-iStartTime;
-			}	
-        TUint64 bytesPlayed = iPlayData.iSampleRate*KBytesPerSample;    //A TUint64 is used because during the multiplying segment of the calculation we regularly overflow what a TUint32 can handle
-        bytesPlayed = (bytesPlayed * timePlayed)/iFCFrequency;  //The division brings it back into TUint32 territory, however.  We cannot do this before the multiplication without risking significant loss of accuracy
+            #ifdef SYMBIAN_SOUNDADAPTER_DEBUG	 
+			RDebug::Printf("caping extraBytes played from %d to %d", extraBytesPlayed, curRequestSize);
+            #endif
+			extraBytesPlayed = curRequestSize;
+			}
 
-		currentBytesPlayed = iBytesPlayed+I64LOW(bytesPlayed);
-        #ifdef SYMBIAN_SOUNDADAPTER_DEBUG
-            RDebug::Printf("EstimatedBytesPlayed[%d]  Driver's bytesPlayed[%d]", currentBytesPlayed, iBytesPlayed);
+		#ifdef SYMBIAN_SOUNDADAPTER_DEBUG
+		RDebug::Printf("iBytesPlayed %d extraBytesPlayed %d (curRequestSize %d) -> currentBytesPlayed %x %x",
+                iBytesPlayed, extraBytesPlayed, curRequestSize, I64HIGH(currentBytesPlayed), I64LOW(currentBytesPlayed));
         #endif
+
+		currentBytesPlayed = iBytesPlayed + extraBytesPlayed;
+		break;
 		}
-	else
-		{
-		currentBytesPlayed = iPlaySoundDevice.BytesTransferred();
-		}		
 	
-#else
-	currentBytesPlayed = iPlaySoundDevice.BytesTransferred();
-#endif
-	if (iPlayData.iConverter)
+	default:
+		Panic(EBadState);
+		break;
+	}
+ 
+
+    #ifdef SYMBIAN_SOUNDADAPTER_DEBUG
+	RDebug::Printf("iPlayFormatData.iConverter %x", iPlayFormatData.iConverter);
+    #endif
+
+	if (iPlayFormatData.iConverter)
 		{
 		// need to scale bytes played to fit with requested rate and channels, not actual
-		if (iPlayData.iActualChannels != iPlayData.iRequestedChannels)
+		if (iPlayFormatData.iActualChannels != iPlayFormatData.iRequestedChannels)
 			{
-			if (iPlayData.iActualChannels == 2)
+			if (iPlayFormatData.iActualChannels == 2)
 				{
 				// requested was mono, we have stereo
 				currentBytesPlayed /= 2;
@@ -252,99 +433,307 @@
 				currentBytesPlayed *= 2;
 				}
 			}
-		if (iPlayData.iSampleRate != iPlayData.iActualRate)
+		if (iPlayFormatData.iSampleRate != iPlayFormatData.iActualRate)
 			{
-			currentBytesPlayed = TInt(currentBytesPlayed*
-					TReal(iPlayData.iSampleRate)/TReal(iPlayData.iActualRate)); // don't round
+			currentBytesPlayed = TUint64(currentBytesPlayed*
+					TReal(iPlayFormatData.iSampleRate)/TReal(iPlayFormatData.iActualRate)); // don't round
 			}
 		}
+
+    #ifdef SYMBIAN_SOUNDADAPTER_DEBUG
+	RDebug::Printf("currentBytesPlayed %x %x", I64HIGH(currentBytesPlayed), I64LOW(currentBytesPlayed));
+    #endif
 	return currentBytesPlayed;
 	}
 
 void RMdaDevSound::CBody::ResetBytesPlayed()
 	{
+    #ifdef SYMBIAN_SOUNDADAPTER_DEBUG    
+    RDebug::Printf("RMdaDevSound::CBody::ResetBytesPlayed %s", iState.Name());
+	#endif
 	__ASSERT_DEBUG(iPlaySoundDevice.Handle(), Panic(EDeviceNotOpened));
-	return iPlaySoundDevice.ResetBytesTransferred();
+	iBytesPlayed = 0;
+	iPlaySoundDevice.ResetBytesTransferred();
+	return;
 	}
 	
 void RMdaDevSound::CBody::PausePlayBuffer()
 	{
-	if (iState == EPlaying)
+#ifdef SYMBIAN_SOUNDADAPTER_DEBUG   
+    RDebug::Printf("RMdaDevSound::CBody::PausePlayBuffer %s", iState.Name());
+#endif  
+	switch(iState)
 		{
-        #ifdef SYMBIAN_SOUNDADAPTER_DEBUG   
-            RDebug::Print(_L("RMdaDevSound::CBody::PausePlayBuffer() offset = %d length = %d"), iBufferOffset, iBufferLength);
-        #endif
-		__ASSERT_DEBUG(iPlaySoundDevice.Handle(), Panic(EDeviceNotOpened));
-		// If iPlayerStatus is NULL, we're not playing currently any data, and the device driver won't pause properly. In this case,
-		// we set a reminder to ourselves to pause the driver once we have data later
-		if (iPlayerStatus == NULL)
+		case ENotReady:
+			Panic(EDeviceNotOpened);
+			break;
+
+		case EStopped:
+			// Driver is not playing so pause in s/w
+			break;
+
+		case ERecording:
+		case ERecordingPausedInHw:
+		case ERecordingPausedInSw:
+			Panic(EBadState);
+			break;
+
+		case EPlayingPausedInHw: // ie. Play request pending on h/w and paused
+		case EPlayingPausedInSw: // ie. Driver not playing or paused
+			// Already paused so nothing to do.
+			break;
+		case EPlayingUnderrun:
+			iState = EPlayingPausedInSw;
+			break;
+			
+		case EPlaying:
 			{
-			iPauseDeviceDriverOnNewData = ETrue;
-			}
-		else
-			{
+			iPauseTime = CurrentTimeInMsec();
+			iPausedBytesPlayed = BytesPlayed64();
 			TInt res = iPlaySoundDevice.Pause();
 			#ifdef SYMBIAN_SOUNDADAPTER_DEBUG   
-				RDebug::Printf("iPlaySoundDevice.Pause res = %d", res);
+			RDebug::Printf("iPlaySoundDevice.Pause res = %d", res);
 			#endif
-			(void)res;
+ 			if(res == KErrNone)
+				{
+				iState = EPlayingPausedInHw;
+				}
+			else
+				{
+			    #ifdef SYMBIAN_SOUNDADAPTER_DEBUG    
+				RDebug::Printf("msp PausePlayBuffer hw pause unexpectedly failed, doing sw pause");
+				#endif
+				iState = EPlayingPausedInSw;
+				}
+			break;
 			}
-		iState = EPaused;
-		iTimerActive = EFalse;
-		}		
+		
+		default:
+			Panic(EBadState);
+			break;
+		}
+	
+	return;
 	}
 	
 void RMdaDevSound::CBody::ResumePlaying()
 	{
-	__ASSERT_DEBUG(iPlaySoundDevice.Handle(), Panic(EDeviceNotOpened));
-	iPauseDeviceDriverOnNewData = EFalse;
 	#ifdef SYMBIAN_SOUNDADAPTER_DEBUG   
-		RDebug::Printf("RMdaDevSound::CBody::ResumePlaying");
+	RDebug::Printf("RMdaDevSound::CBody::ResumePlaying %s", iState.Name());
 	#endif	
-	if (iFlushCalledDuringPause)
+    __ASSERT_DEBUG(iPlaySoundDevice.Handle(), Panic(EDeviceNotOpened));
+
+	switch(iState)
 		{
-		// if we resume having called flush, we can't just keep going as the driver does not work
-		// that way. Instead we cancel so that buffer play completes and a new buffer will be passed
-		iFlushCalledDuringPause = EFalse;
-		PlayCancelled();
+		case ENotReady:
+			Panic(EDeviceNotOpened);
+			break;
+				
+		case EStopped:
+			// No change
+			break;
+	
+		case ERecording:
+		case ERecordingPausedInHw:
+		case ERecordingPausedInSw:
+			Panic(EBadState);
+			break;
+			
+		case EPlaying:
+			// No change
+			break;
+
+		case EPlayingPausedInHw: // ie. Play request pending on h/w and paused
+			{
+			// Re-enable reporting of KErrUnderflow (will re-raise KErrUnderflow if nothing to start playing).
+			iUnderFlowReportedSinceLastPlayOrRecordRequest = EFalse;
+
+			TInt res = iPlaySoundDevice.Resume();
+#ifdef SYMBIAN_SOUNDADAPTER_DEBUG	
+			RDebug::Printf("ResumePlayBuffer EPlayingPausedInHw res = %d", res);
+#endif
+			if(res == KErrNone)
+				{
+				// Resume ok so a pending request will complete
+				iState = EPlaying;
+	            // Update iStartTime to allow for time spent paused
+	            TUint32 curTime = CurrentTimeInMsec();
+	            TUint32 timePaused = (curTime >= iPauseTime) ? (curTime-iPauseTime) : (KMaxTUint32 - (iPauseTime-curTime));
+	            iStartTime += timePaused; // nb. It is harmless if this wraps.
+				}
+			else
+				{
+				// Resume failed, therefore driver is not playing
+                // No need to update iStartTime/iPauseTime because these are only used within a driver request
+                // Change state to Stopped
+                iState = EStopped;
+                //  Attempt to start a new (pending) request.
+                StartPlayersAndUpdateState();
+				}
+			break;
+			}
+		case EPlayingPausedInSw: // ie. Driver not playing/paused
+			{
+			// Driver not playing
+			// Re-enable reporting of KErrUnderflow (will re-raise KErrUnderflow if nothing to start playing).
+			iUnderFlowReportedSinceLastPlayOrRecordRequest = EFalse;
+			// No need to update iStartTime/iPauseTime because these are only used within a driver request
+			// Change state to Stopped
+            iState = EStopped;
+            //	Attempt to start a new (pending) request.
+			StartPlayersAndUpdateState();
+			break;
+			}
+		case EPlayingUnderrun:
+			break;
+				
+		default:
+			Panic(EBadState);
+			break;
 		}
-	else
-		{
-		iState = EPlaying;
-		iPlaySoundDevice.Resume();
-		}
+	
+	return;	
 	}
 
 void RMdaDevSound::CBody::PauseRecordBuffer()
 	{
-	if(iState == ERecording)
-	    {	
-		__ASSERT_DEBUG(iRecordSoundDevice.Handle(), Panic(EDeviceNotOpened));
-        #ifdef SYMBIAN_SOUNDADAPTER_DEBUG	
-            RDebug::Printf("RMdaDevSound::CBody::PauseRecordBuffer");
-        #endif
-		iRecordSoundDevice.Pause();
-	    }
+    #ifdef SYMBIAN_SOUNDADAPTER_DEBUG   
+    RDebug::Printf("RMdaDevSound::CBody::PauseRecordBuffer %s", iState.Name());
+    #endif
+	
+	switch(iState)
+		{
+		case ENotReady:
+			Panic(EDeviceNotOpened);
+			break;
+			
+		case EStopped:
+			// Driver is not recording so pause in s/w
+		    // Do not pause because that will cause problems when CAudioDevice::Pause calls
+			break;
+
+		case ERecording:
+			{
+			TInt res = iRecordSoundDevice.Pause();
+			#ifdef SYMBIAN_SOUNDADAPTER_DEBUG	
+			RDebug::Printf("PauseRecordBuffer EPlaying res = %d", res);
+			#endif
+			if(res == KErrNone)
+				{
+				iState = ERecordingPausedInHw;
+				}
+			else
+				{
+				#ifdef SYMBIAN_SOUNDADAPTER_DEBUG	
+				RDebug::Printf("PauseRecordBuffer hw pause unexpectedly failed, doing sw pause");
+				#endif
+				iState = ERecordingPausedInSw;
+				}
+			break;
+			}
+		
+		case ERecordingPausedInHw:
+		case ERecordingPausedInSw:
+			// Already paused so nothing to do.
+			break;
+			
+		case EPlaying:
+		case EPlayingPausedInHw: // ie. Play request pending on h/w and paused
+            Panic(EBadState);
+            break;
+		    
+		case EPlayingPausedInSw: 
+		    // This is an ugly hack to maintain compatibility with CAudioDevice::Pause which
+		    // calls both PausePlayBuffer and PauseRecordBuffer whilst in stopped, then later calls ResumePlaying
+		    break;
+		case EPlayingUnderrun: // ie. Play request pending on h/w and paused
+			Panic(EBadState);
+		    break;
+		    
+		default:
+			Panic(EBadState);
+			break;
+		}
+
+	return;	
 	}
 
 void RMdaDevSound::CBody::ResumeRecording()
 	{
+    #ifdef SYMBIAN_SOUNDADAPTER_DEBUG   
+    RDebug::Printf("RMdaDevSound::CBody::ResumeRecording %s", iState.Name());
+    #endif
 	__ASSERT_DEBUG(iPlaySoundDevice.Handle(), Panic(EDeviceNotOpened));
-	iRecordSoundDevice.Resume();
+
+	switch(iState)
+		{
+		case ENotReady:
+			Panic(EDeviceNotOpened);
+			break;
+				
+		case EStopped:
+			// No change
+			break;
+	
+		case ERecording:
+			// No change
+			break;
+
+		case ERecordingPausedInHw:
+			{
+			TInt res = iRecordSoundDevice.Resume();
+			#ifdef SYMBIAN_SOUNDADAPTER_DEBUG	
+			RDebug::Printf("ResumeRecordBuffer ERecordingPausedInHw res = %d", res);
+			#endif
+			if(res == KErrNone)
+				{
+				// Resume ok so a pending request will complete
+				iState = ERecording;
+				}
+			else
+				{
+				iState = EStopped;
+				// Resume failed, so attempt to start a new (pending) request.
+				// If this works, it will update the state to ERecording.
+				StartRecordRequest();
+				}
+			break;
+			}
+		case ERecordingPausedInSw:
+			{
+			// Update state to stopped and attempt to start any pending request
+			iState = EStopped;
+			// If this works, it will update the state to ERecording.
+			StartRecordRequest();
+			break;
+			}
+
+		case EPlaying:
+		case EPlayingPausedInHw: // ie. Play request pending on h/w and paused
+		case EPlayingPausedInSw: // ie. Driver not playing/paused
+		case EPlayingUnderrun:
+		default:
+			Panic(EBadState);
+			break;
+		}
+		
+		return; 
+
+
 	}
 
 TInt RMdaDevSound::CBody::GetTimePlayed(TTimeIntervalMicroSeconds& aTimePlayed)
 	{
 	__ASSERT_DEBUG(iPlaySoundDevice.Handle(), Panic(EDeviceNotOpened));
-	TTimeIntervalMicroSecondsBuf aTimePlayedBuf;
-	TInt err;
-	err = iPlaySoundDevice.TimePlayed(aTimePlayedBuf);
-	if (err == KErrNone)
-	  {
-	    aTimePlayed = aTimePlayedBuf();
-	  }
+
+
+	TUint64 bytesPlayed = BytesPlayed64();
 
-	return err;
+	TUint64 timePlayed = 1000 * 1000 * bytesPlayed / (iPlayFormatData.iSampleRate * iPlayFormatData.iRequestedChannels * KBytesPerSample);
+
+	aTimePlayed = TTimeIntervalMicroSeconds(timePlayed);
+
+	return KErrNone;
 	}
 
 	
@@ -405,6 +794,138 @@
 	aFormat().iRate = aFormatData.iSampleRate;
 	}
 	
+void RMdaDevSound::CBody::StartPlayersAndUpdateState()
+	{
+	__ASSERT_DEBUG(iPlaySoundDevice.Handle(), Panic(EDeviceNotOpened));
+
+	switch(iState)
+		{
+		case ENotReady:
+			Panic(EDeviceNotOpened);
+			break;
+				
+		case EStopped:
+ 			// Allow following code to queue more driver play requests and check for stopped
+			break;
+	
+		case ERecording:
+		case ERecordingPausedInHw:
+		case ERecordingPausedInSw:
+			Panic(EBadState);
+			break;
+			
+		case EPlaying:
+           // Allow following code to queue more driver play requests  and check for stopped
+		    break;
+		case EPlayingPausedInHw: // ie. Play request pending on h/w and paused
+			// Allow following code to queue more driver play requests
+			break;
+		
+		case EPlayingPausedInSw:
+			// Paused but driver not playing+paused, therefore do not queue new requests until ResumePlaying
+			return;
+		case EPlayingUnderrun:
+			break;
+				
+		default:
+			Panic(EBadState);
+			break;
+		}
+
+	// iState is now either EStopped, EPlaying or EPlayingPausedInHw
+    __ASSERT_DEBUG(((iState == EStopped) || (iState == EPlaying) || (iState == EPlayingPausedInHw) || (iState == EPlayingUnderrun)), Panic(EBadState));
+
+	while( (iClientPlayData.Length() != 0) && (! iFreePlayers.IsEmpty()))
+		{
+		// More data to play and more players,  so issue another request 
+
+		bool wasIdle = iFreePlayers.IsFull();
+		// Get a free player		
+		CPlayer *player = iFreePlayers.Pop();
+		// Calculate length of request
+		TUint32 lengthToPlay = iClientPlayData.Length();
+		if(lengthToPlay > iDeviceBufferLength)
+		    {
+            lengthToPlay = iDeviceBufferLength;
+		    }
+
+		// Remember request length, so we can update bytes played when it finishes
+		iActivePlayRequestSizes.Push(lengthToPlay);
+
+		// Find offset to copy data to
+		TUint playerIndex = player->GetPlayerIndex();
+		ASSERT(playerIndex < KPlaySharedChunkBuffers);
+		TUint chunkOffset = iPlayBufferConfig.iBufferOffsetList[playerIndex];
+
+		// Copy data
+		TPtr8 destPtr(iPlayChunk.Base()+ chunkOffset, 0, iDeviceBufferLength);
+		destPtr.Copy(iClientPlayData.Mid(0, lengthToPlay));
+
+		// Update iClientPlayData to remove the data just queued
+		iClientPlayData.Set(iClientPlayData.Right(iClientPlayData.Length()-lengthToPlay));
+
+		// Start the CPlayer
+		player->PlayData(chunkOffset, lengthToPlay);
+		if(wasIdle)
+			{
+			iState = EPlaying;
+			iStartTime = CurrentTimeInMsec();
+			
+			}
+		
+		}
+
+	// Check if the client request is now complete
+	if(iClientPlayData.Length() == 0 && iClientPlayStatus)
+		{
+		// We have queued all the client play data to the driver so we can now complete the client request.
+		// If actual playback fails, we will notify the client via the Play Error notification mechanism.
+		#ifdef SYMBIAN_SOUNDADAPTER_DEBUG	
+		RDebug::Printf("RMdaDevSound::CBody::StartPlayersAndUpdateState completing client request");
+		#endif
+		User::RequestComplete(iClientPlayStatus, KErrNone); // This call also sets iClientPlayStatus to NULL
+		}
+	
+    //nb. iState is now either EStopped, EPlaying or EPlayingPausedInHw (see previous switch and assert)
+	if(iState != EPlayingPausedInHw)
+	    {
+        if(iFreePlayers.IsFull())
+            {
+            // Free fifo is full, therefore there are no active players
+            iState = EPlayingUnderrun;
+			if(! iUnderFlowReportedSinceLastPlayOrRecordRequest)
+				{
+				// We report KErrUnderflow if we have not already reported it since the last PlayData call.
+				// Note that 
+				// i) We do NOT report driver underflows.
+				// ii) We report underflow when we run out of data to pass to the driver.
+				// iii) We throttle this reporting
+				// iv) We WILL report KErrUnderflow if already stopped and asked to play a zero length buffer
+				// The last point is required because the client maps a manual stop command into a devsound play with a 
+				// zero length buffer and the last buffer flag set, this in turn is mapped to a Playdata calll with an empty buffer
+				// which is expected to complete ok and cause a KErrUnderflow error to be reported...
+				iUnderFlowReportedSinceLastPlayOrRecordRequest = ETrue;
+				#ifdef SYMBIAN_SOUNDADAPTER_DEBUG	
+		        RDebug::Printf("RMdaDevSound::CBody::StartPlayersAndUpdateState stopped and iUnderFlowReportedSinceLastPlayOrRecordRequest false so raising KErrUnderflow");
+				#endif
+				
+				// Discard any saved trailing data (ie. data saved due driver requiring all requests to be a multiple of iRequestMinSize).
+				// This maybe because client is delibrately letting us underflow to play silence. In that case we do not want to
+				// play the trailing data at the beginning of the new data issued after the silence...
+				iSavedTrailingData.SetLength(0);
+
+				SoundDeviceError(KErrUnderflow);
+				}
+            }
+        else
+            {
+            // Free fifo not full, therefore there are active players
+            iState = EPlaying;
+            }
+	    }
+	return;
+	}
+
 TInt RMdaDevSound::CBody::SetFormat(const TCurrentSoundFormatBuf& aFormat, 
 									RSoundSc& aSoundDevice,
 									TFormatData &aFormatData)
@@ -414,6 +935,7 @@
 	
 	delete aFormatData.iConverter; 
 	aFormatData.iConverter = NULL; // setting this to NULL indicates we are not using converter. No other flag
+	iConvertedPlayData.Close();
 	
 	TInt wantedRate = aFormat().iRate;
 	for(TInt index = 0; index < KNumSampleRates; index++ )
@@ -429,6 +951,11 @@
 	
 	if(err == KErrNone)
 		{
+		// Assume, for now, we support the requested channels and rate
+		aFormatData.iActualChannels = aFormatData.iRequestedChannels;
+		aFormatData.iActualRate = aFormatData.iSampleRate;
+
+		// Attempt to configure driver
 		formatBuf().iChannels = aFormat().iChannels;
 		formatBuf().iEncoding = ESoundEncoding16BitPCM;
 		formatBuf().iDataFormat = ESoundDataFormatInterleaved;
@@ -628,11 +1155,86 @@
 																		   aFormatData.iRequestedChannels));
 			}
 		}
+	if(err != KErrNone)
+		{
+		delete aFormatData.iConverter;
+		aFormatData.iConverter= NULL;
+		iConvertedPlayData.Close();
+		}
 	
 	return err;
 	}
 
+void RMdaDevSound::CBody::StartRecordRequest()
+	{
+	__ASSERT_DEBUG(iRecordSoundDevice.Handle(), Panic(EDeviceNotOpened));
 	
+	iRecorder->RecordData(iBufferLength);
+	}
+
+// Note both InRecordMode and InPlayMode return EFalse for ENotReady and EStopped
+TBool RMdaDevSound::CBody::InRecordMode()const
+	{
+	switch(iState)
+		{
+		case ENotReady:
+		case EStopped:
+			return EFalse;
+			
+		case ERecording:
+		case ERecordingPausedInHw:
+		case ERecordingPausedInSw:
+			return ETrue;
+			
+		case EPlaying:
+		case EPlayingPausedInHw: 
+		case EPlayingPausedInSw:
+		case EPlayingUnderrun:
+			return EFalse;
+			
+		default:
+			Panic(EBadState);
+			break;
+		}
+	return EFalse;
+	}
+
+TBool RMdaDevSound::CBody::InPlayMode() const
+	{
+	switch(iState)
+		{
+		case ENotReady:
+		case EStopped:
+			return EFalse;
+			
+		case ERecording:
+		case ERecordingPausedInHw:
+		case ERecordingPausedInSw:
+			return EFalse;
+			
+		case EPlaying:
+		case EPlayingPausedInHw: 
+		case EPlayingPausedInSw:
+		case EPlayingUnderrun:
+			return ETrue;
+			
+		default:
+			Panic(EBadState);
+			break;
+		}
+	
+	return EFalse;
+	}
+
+
+TUint32 RMdaDevSound::CBody::CurrentTimeInMsec() const
+	{
+	TUint64 tmp = User::NTickCount();
+	tmp *= iNTickPeriodInUsec;
+	tmp /= 1000;
+	return TUint32(tmp);
+	}
+
 void RMdaDevSound::CBody::PlayFormatsSupported(TSoundFormatsSupportedBuf& aFormatsSupported)
 	{
 	__ASSERT_DEBUG(iPlaySoundDevice.Handle(), Panic(EDeviceNotOpened));
@@ -642,13 +1244,13 @@
 void RMdaDevSound::CBody::GetPlayFormat(TCurrentSoundFormatBuf& aFormat)
 	{
 	__ASSERT_DEBUG(iPlaySoundDevice.Handle(), Panic(EDeviceNotOpened));
-	GetFormat(aFormat, iPlaySoundDevice, iPlayData);
+	GetFormat(aFormat, iPlaySoundDevice, iPlayFormatData);
 	}
 	
 TInt RMdaDevSound::CBody::SetPlayFormat(const TCurrentSoundFormatBuf& aFormat)
 	{
 	__ASSERT_DEBUG(iPlaySoundDevice.Handle(), Panic(EDeviceNotOpened));
-	return SetFormat(aFormat, iPlaySoundDevice, iPlayData);
+	return SetFormat(aFormat, iPlaySoundDevice, iPlayFormatData);
 	}
 
 void RMdaDevSound::CBody::RecordFormatsSupported(TSoundFormatsSupportedBuf& aFormatsSupported)
@@ -660,13 +1262,13 @@
 void RMdaDevSound::CBody::GetRecordFormat(TCurrentSoundFormatBuf& aFormat)
 	{
 	__ASSERT_DEBUG(iRecordSoundDevice.Handle(), Panic(EDeviceNotOpened));
-	GetFormat(aFormat, iRecordSoundDevice, iRecordData);	
+	GetFormat(aFormat, iRecordSoundDevice, iRecordFormatData);	
 	}
 
 TInt RMdaDevSound::CBody::SetRecordFormat(const TCurrentSoundFormatBuf& aFormat)
 	{
 	__ASSERT_DEBUG(iRecordSoundDevice.Handle(), Panic(EDeviceNotOpened));
-	return SetFormat(aFormat, iRecordSoundDevice, iRecordData);
+	return SetFormat(aFormat, iRecordSoundDevice, iRecordFormatData);
 	}
 	
 void RMdaDevSound::CBody::Close()
@@ -674,80 +1276,169 @@
     #ifdef SYMBIAN_SOUNDADAPTER_DEBUG
         RDebug::Printf("void RMdaDevSound::CBody::Close() started");
     #endif
-	iBufferIndex = -1;
 	iBufferOffset = -1;
 	iBufferLength = 0;
-	iCurrentPlayer = 0;
-	iTimerActive = EFalse;
-	iChunk.Close();
-	iPlaySoundDevice.Close();
-	iRecordSoundDevice.Close();
+
+	if(iPlaySoundDevice.Handle() != KNullHandle)
+	    {
+        // Make sure all player objects are idle
+        CancelPlayData();
+        iPlayChunk.Close();
+        iPlaySoundDevice.Close();
+	    }
+
+    if(iRecordSoundDevice.Handle() != KNullHandle)
+        {
+        CancelRecordData();
+        iRecordChunk.Close();
+        iRecordSoundDevice.Close();
+        }
+	
 	iState = ENotReady;
     #ifdef SYMBIAN_SOUNDADAPTER_DEBUG
         RDebug::Printf("void RMdaDevSound::CBody::Close() ended");
     #endif
 	}
-		
+
 TInt RMdaDevSound::CBody::Handle()
 	{//This method is actually used to check whether the device is opened. Below logic should work
 	if(iPlaySoundDevice.Handle())
 		{
 		return iPlaySoundDevice.Handle();
 		}
+	if(iRecordSoundDevice.Handle())
+		{
+		return iRecordSoundDevice.Handle();
+		}
 	return 0;
 	}
 
+
 void RMdaDevSound::CBody::PlayData(TRequestStatus& aStatus, const TDesC8& aData)
 	{
 	#ifdef SYMBIAN_SOUNDADAPTER_DEBUG
-        RDebug::Printf("RMdaDevSound::CBody::PlayData(0x%x,%d) State=%d Current=%d. Handle=%d.",&aStatus, 
-                aData.Length(), iState, iCurrentPlayer, iChunk.Handle());
-        RDebug::Printf("KPlayMaxSharedChunkBuffersMask=0x%x KNumPlayersMask=0x%x", 
-                KPlayMaxSharedChunkBuffersMask, KNumPlayersMask);
+    RDebug::Printf("RMdaDevSound::CBody::PlayData(0x%x,%d) State=%s Handle=%d.",&aStatus, 
+                   aData.Length(), iState.Name(), iPlayChunk.Handle());
 	#endif
+	
 	__ASSERT_DEBUG(iPlaySoundDevice.Handle(), Panic(EDeviceNotOpened));
 	aStatus = KRequestPending;
-	iPlayerStatus = &aStatus;//store the status of datapath player
-	//No support for simultaneous play and record in RMdaDevSound
-	if(iState == ERecording)
+
+	if((iClientPlayStatus != NULL) || InRecordMode())
 		{
-		SoundDeviceError(KErrInUse);
+		// We only support one outstanding request
+		// No support for simultaneous play and record in RMdaDevSound
+		TRequestStatus *pRequest = &aStatus;
+		User::RequestComplete(pRequest, KErrInUse);
 		return;
 		}
-	const TDes8* data = static_cast<const TDes8*>(&aData);
-	
-	if(!iChunk.Handle())
+	iClientPlayStatus = &aStatus;//store the status of datapath player
+
+	if(iPlayFormatData.iConverter || iSavedTrailingData.Length() != 0)
+		{
+		// Need a conversion buffer
+        // Needs to hold any trailing data truncated from the previous request (due
+        // to alignment requirements) and either the new data, or the new rate adapted data
+		TUint32 spaceRequired = iSavedTrailingData.Length();
+		if(iPlayFormatData.iConverter)
+			{
+			// Doing rate conversion so also need space for the converted data
+			spaceRequired += iPlayFormatData.iConverter->MaxConvertBufferSize(aData.Length());
+			}
+		else
+			{
+			// Not doing rate adaptation therefore only need to allow for the new incoming data
+			spaceRequired += aData.Length();
+			}
+		// Check if existing buffer exists and is big enough
+		if(iConvertedPlayData.MaxLength() < spaceRequired)
+			{
+			iConvertedPlayData.Close();
+			TInt err = iConvertedPlayData.Create(spaceRequired);
+			if(err)
+				{
+				User::RequestComplete(iClientPlayStatus, err);
+				return;
+				}
+			}
+
+		// Truncate iConvertedPlayData and copy in saved trailing data (if any)
+		iConvertedPlayData = iSavedTrailingData;
+		iSavedTrailingData.SetLength(0);
+		
+		// Now append rate adapted data or incoming data
+		if (iPlayFormatData.iConverter)
+			{
+            // The convertor will panic if it fails to convert any data, therefore
+            // we avoid passing it an empty source buffer
+			if(aData.Length() != 0)
+				{
+                TPtr8 destPtr((TUint8 *)iConvertedPlayData.Ptr()+iConvertedPlayData.Length(), 0, iConvertedPlayData.MaxLength()-iConvertedPlayData.Length());
+				TInt len = iPlayFormatData.iConverter->Convert(aData, destPtr);
+				iConvertedPlayData.SetLength(iConvertedPlayData.Length() + destPtr.Length());
+				if(len != aData.Length())
+					{
+					#ifdef SYMBIAN_SOUNDADAPTER_DEBUG
+					RDebug::Printf("RMdaDevSound::CBody::PlayData converted %d	but expected to convert %d", len, aData.Length());
+					#endif
+					}
+				}
+			}
+		else
+			{
+			iConvertedPlayData.Append(aData);
+			}
+		iClientPlayData.Set(iConvertedPlayData);
+		}
+	else
+		{
+		// Do not need a conversion buffer so just aim the descriptor at the data
+		iClientPlayData.Set(aData);
+		}
+	iUnderFlowReportedSinceLastPlayOrRecordRequest = EFalse;
+
+	// All driver requests must be an exact multiple of iRequestMinSize
+	TUint32 trailingDataLen = iClientPlayData.Length() % iRequestMinSize;
+	if(trailingDataLen)
+		{
+		// Not a multiple of iRequestMinSize, so need to truncate current request, and save trailing bytes for 
+		// inclusion at the beginning of the next request
+		iSavedTrailingData = iClientPlayData.Right(trailingDataLen);
+		iClientPlayData.Set(iClientPlayData.Left(iClientPlayData.Length()-trailingDataLen));
+		}
+
+    #ifdef SYMBIAN_FORCE_32BIT_LENGTHS
+	if (iClientPlayData.Length()%4 != 0)
+	    {
+        // simulate the limitation of some hardware, where -6 is generated if the
+        // buffer length is not divisible by 4.
+        TRequestStatus *pRequest = &aStatus;
+        User::RequestComplete(pRequest, KErrArgument);
+	}
+    #endif
+
+	iRecordChunk.Close();
+	if(!iPlayChunk.Handle())
 		{
 		//This is where we setup to play. 
 		//Configure the shared chunk for two buffers with iBufferSize each
-		iBufferConfig.iNumBuffers = KPlayMaxSharedChunkBuffers;
-		iDeviceBufferLength = data->MaxLength();
-		iBufferConfig.iFlags = 0;//data will be continuous
+		iPlayBufferConfig.iNumBuffers = KPlaySharedChunkBuffers;
+		iDeviceBufferLength = KPlaySharedChunkBufferSize;
+		#ifdef SYMBIAN_SOUNDADAPTER_DEBUG	
+		RDebug::Printf("iDeviceBufferLength %d", iDeviceBufferLength);
+		#endif
+		iPlayBufferConfig.iFlags = 0;//data will be continuous
 		// If required, use rate converter etc
-		if (iPlayData.iConverter)
-			{
-			iDeviceBufferLength = iPlayData.iConverter->MaxConvertBufferSize(iDeviceBufferLength, ETrue);
-			}
-		iBufferConfig.iBufferSizeInBytes = iDeviceBufferLength;
+		iPlayBufferConfig.iBufferSizeInBytes = iDeviceBufferLength;
         #ifdef SYMBIAN_SOUNDADAPTER_DEBUG
-            RDebug::Printf("number of buffers: [%d]",iBufferConfig.iNumBuffers);
-            RDebug::Printf("BufferSize in Bytes [%d]",iBufferConfig.iBufferSizeInBytes);
+            RDebug::Printf("number of buffers: [%d]",iPlayBufferConfig.iNumBuffers);
+            RDebug::Printf("BufferSize in Bytes [%d]",iPlayBufferConfig.iBufferSizeInBytes);
         #endif
-		TPckg<TPlaySharedChunkBufConfig> bufferConfigBuf(iBufferConfig);
-		TInt error = iPlaySoundDevice.SetBufferChunkCreate(bufferConfigBuf,iChunk);
+		TPckg<TPlaySharedChunkBufConfig> bufferConfigBuf(iPlayBufferConfig);
+		TInt error = iPlaySoundDevice.SetBufferChunkCreate(bufferConfigBuf,iPlayChunk);
 		if(error == KErrNone)
 			{
 			iPlaySoundDevice.GetBufferConfig(bufferConfigBuf);
-			TSoundFormatsSupportedV02Buf modnumber;
-			iPlaySoundDevice.Caps(modnumber);
-			TInt minBufferSize = KMinBufferSize;
-            #ifdef SYMBIAN_FORCE_32BIT_LENGTHS
-                minBufferSize = Max(minBufferSize, 4); // force to 32-bit buffer align
-            #endif
-			iRequestMinSize = Max(modnumber().iRequestMinSize, minBufferSize); 
-			error = iBufferRemaining.Create(iRequestMinSize);
-			// work out mask so that x&iRequestMinMask is equiv to x/iRequestMinSize*iRequestMinSize
-			iRequestMinMask = ~(iRequestMinSize-1); // assume iRequestMinSize is power of 2
 			}
 		if (error)
 			{
@@ -755,114 +1446,43 @@
 			return;
 			}
 		}
-	
-	iBufferIndex = (iBufferIndex+1) & KPlayMaxSharedChunkBuffersMask;
-	
-	TPtr8 dataPtr(iChunk.Base()+ iBufferConfig.iBufferOffsetList[iBufferIndex], 0, iDeviceBufferLength);
-
-	__ASSERT_DEBUG(!(iBufferRemaining.Length()>0 && iPlayData.iConverter), 
-		Panic(EPanicPartialBufferConverterNotSupported)); // can't deal with conversion with restrictions on buffer size
-	
-	if (iBufferRemaining.Length() != 0)
-		{
-		// This checks if any data was left over from last times rounding and adds it to the dataPtr
-		dataPtr.Copy(iBufferRemaining);
-		iBufferRemaining.SetLength(0);
-		}
-		
-	if (iPlayData.iConverter)
-		{
-		iPlayData.iConverter->Convert(aData, dataPtr);
-		ASSERT(iSecondPhaseData.Length()==0); // assume this below, so check 
-		ASSERT(iBufferRemaining.Length()==0);
-		}
-	else
-		{
-		TInt dataLength = aData.Length();
-
-		TInt lengthAlreadyInDeviceBuffer = dataPtr.Length();
-		TInt desiredDeviceBufferLength = (lengthAlreadyInDeviceBuffer + dataLength) & iRequestMinMask;
-		if (desiredDeviceBufferLength > dataPtr.MaxLength())
-			{
-			// the buffer would be two long to do in one go, so do as two phases
-			desiredDeviceBufferLength = (lengthAlreadyInDeviceBuffer + (dataLength/2)) & iRequestMinMask;
-			}
 
-		TInt lengthToCopy = desiredDeviceBufferLength - lengthAlreadyInDeviceBuffer;
-		lengthToCopy = Max(lengthToCopy, 0); // ensure lengthToCopy is not negative
-		
-		TInt remainingToBeCopied = dataLength - lengthToCopy;
-		TInt secondPhaseLength = remainingToBeCopied & iRequestMinMask;
-		TInt remainingForNextRun = remainingToBeCopied - secondPhaseLength;
-        #ifdef SYMBIAN_SOUNDADAPTER_DEBUG			
-            RDebug::Printf("dataLength: [%d]",dataLength);
-            RDebug::Printf("lengthAlreadyInDeviceBuffer: [%d]",lengthAlreadyInDeviceBuffer);
-            RDebug::Printf("desiredDeviceBufferLength: [%d]",desiredDeviceBufferLength);
-            RDebug::Printf("lengthToCopy: [%d]",lengthToCopy);
-            RDebug::Printf("remainingToBeCopied: [%d]",remainingToBeCopied);
-            RDebug::Printf("secondPhaseLength: [%d]",secondPhaseLength);
-            RDebug::Printf("remainingForNextRun: [%d]",remainingForNextRun);
-        #endif
-		dataPtr.Append(aData.Left(lengthToCopy));
-		iSecondPhaseData.Set(aData.Mid(lengthToCopy, secondPhaseLength));
-		iBufferRemaining.Copy(aData.Mid(lengthToCopy + secondPhaseLength, remainingForNextRun));
-		iHaveSecondPhaseData = secondPhaseLength>0;
-		}
-			
-	if(iState == EOpened || iState == EPlayBuffersFlushed)
-		{
-		if(dataPtr.Length() > 0 && iSecondPhaseData.Length()==0)
-			{
-			// Note: if we have identified second phase, don't call BufferEmptied() here as we can't cope with a new PlayData() call
-			//Make sure that next player do not overtake the current player, especially when recovering from underflow
-			TInt otherPlayer = (iCurrentPlayer+1) & KNumPlayersMask;
-			iPlayers[otherPlayer]->Deque();
-			CActiveScheduler::Add(iPlayers[otherPlayer]);
-			//Beginning we need to give two play requests for an uninterrupted playback	with the new driver
-			BufferEmptied();
-			}
-		iState = EPlaying;
-		}
-    #ifdef _DEBUG
-        TInt cachePlayer = iCurrentPlayer; // TODO: remove
-    #endif
-	iPlayers[iCurrentPlayer]->PlayData(iBufferConfig.iBufferOffsetList[iBufferIndex], dataPtr.Length());
-	ASSERT(iCurrentPlayer==cachePlayer); // check have not changed since previous calc
-	iCurrentPlayer = (iCurrentPlayer+1) & KNumPlayersMask;
-	#ifdef SYMBIAN_SOUNDADAPTER_DEBUG
-        RDebug::Printf("RMdaDevSound::CBody::PlayData() Exit. Current=%d, Handle=%d.", 
-                iCurrentPlayer, iChunk.Handle());
-	#endif
+    StartPlayersAndUpdateState();
+
+	return;	
 	}
 
 void RMdaDevSound::CBody::RecordData(TRequestStatus& aStatus, TDes8& aData)
 	{
 	__ASSERT_DEBUG(iRecordSoundDevice.Handle(), Panic(EDeviceNotOpened));
 	aStatus = KRequestPending;
-	iRecorderStatus = &aStatus;
-	//No support for simultaneous play and record in RMdaDevSound
-	if(iState == EPlaying)
+	if((iClientPlayStatus != NULL) || InPlayMode())
 		{
-		SoundDeviceError(KErrInUse);
+		// We only support one outstanding request
+		// No support for simultaneous play and record in RMdaDevSound
+		TRequestStatus *pRequest = &aStatus;
+		User::RequestComplete(pRequest, KErrInUse);
 		return;
 		}
+	iClientRecordStatus = &aStatus;
+	iClientRecordData = &aData;
+	iUnderFlowReportedSinceLastPlayOrRecordRequest = EFalse;
 
-	iData = &aData;
-	
-	if(!iChunk.Handle())
+	iPlayChunk.Close();
+	if(!iRecordChunk.Handle())
 		{
 		//Configure the shared chunk for two buffers with iBufferSize each
 		iRecordBufferConfig.iNumBuffers = KRecordMaxSharedChunkBuffers;
-		iDeviceBufferLength = iData->MaxLength(); // initial size - resize if needs be
-		if (iRecordData.iConverter)
+		iDeviceBufferLength = KRecordSharedChunkBufferSize; // initial size - resize if needs be
+		if (iRecordFormatData.iConverter)
 			{
 			// if number of channels used differs from request, resize buffer
 			// assume we have nice rounded values for buffer.
-			if (iRecordData.iActualChannels>iRecordData.iRequestedChannels)
+			if (iRecordFormatData.iActualChannels>iRecordFormatData.iRequestedChannels)
 				{
 				iDeviceBufferLength *= 2; // will record at stereo and convert to mono 
 				}
-			else if (iRecordData.iActualChannels<iRecordData.iRequestedChannels)
+			else if (iRecordFormatData.iActualChannels<iRecordFormatData.iRequestedChannels)
 				{
 				iDeviceBufferLength /= 2; // will record at mono and convert to stereo 
 				}
@@ -870,7 +1490,7 @@
 		iRecordBufferConfig.iBufferSizeInBytes = iDeviceBufferLength;
 		iRecordBufferConfig.iFlags = 0;
 		TPckg<TRecordSharedChunkBufConfig> bufferConfigBuf(iRecordBufferConfig);
-		TInt error = iRecordSoundDevice.SetBufferChunkCreate(bufferConfigBuf,iChunk);
+		TInt error = iRecordSoundDevice.SetBufferChunkCreate(bufferConfigBuf,iRecordChunk);
 		if(error == KErrNone)
 			{
 			iRecordSoundDevice.GetBufferConfig(bufferConfigBuf);
@@ -885,151 +1505,130 @@
     #ifdef SYMBIAN_SOUNDADAPTER_DEBUG
         RDebug::Printf("RMdaDevSound::CBody::RecordData,iBufferOffset[%d]",iBufferOffset);
     #endif
-	iPlayers[iCurrentPlayer]->RecordData(iBufferLength);
+
+	switch(iState)
+		{
+		case ENotReady:
+			Panic(EBadState);
+			break;
+
+		case EStopped:
+		case ERecording:
+			// Either idle or recording is in progress, therefore we can issue another request			
+			StartRecordRequest();
+			break;
+			
+		case ERecordingPausedInHw:
+			// Driver is paused, therefore we can issue a request which will immediately return buffered data
+			// or be aborted (in the driver) with KErrCancelled if there is no more data). nb. That KErrCancelled should not be
+			// returned to the client because the old RMdaDevSound driver would have completed with KErrNone and zero data length.
+			StartRecordRequest();
+			break;
+
+		case ERecordingPausedInSw:
+			// Paused in s/w but driver is not paused, therefore can not issue a new request to driver because
+			// it would re-start recording.
+			// This implies we were paused whilst the h/w was not recording, so there is no buffered data.
+			
+			// Complete the request with KErrNone and no data.
+			iClientRecordData->SetLength(0);
+			User::RequestComplete(iClientRecordStatus, KErrNone);
+			break;
+			
+		case EPlaying:
+		case EPlayingPausedInHw:
+		case EPlayingPausedInSw: 
+		case EPlayingUnderrun:
+			Panic(EBadState);
+			break;
+			
+		default:
+			Panic(EBadState);
+			break;
+		}
 	}
 	
-void RMdaDevSound::CBody::SoundDeviceError(TInt aError, TInt /*aPlayerIndex*/)
-// This is called by CPlayer objects when there is an error in RunL
-	{
-    #ifdef SYMBIAN_SOUNDADAPTER_DEBUG	
-	RDebug::Print(_L("RMdaDevSound::CBody::SoundDeviceError: aError[%d]"), aError);
-    #endif	
-
-	//When we get an underflow from one of the players and the other player is active, we are 
-	//bound to get an underflow from the other player too. So we ignore the first and process
-	//the second
-	TInt otherPlayerIndex = (iCurrentPlayer+1) & KNumPlayersMask;
-	if (iPlayers[otherPlayerIndex]->IsActive() && aError==KErrUnderflow)
-		{
-		return;
-		}
-	SoundDeviceError(aError);
-	}
 /**
-   Note for maintainers: Please note that this method is called from
-   CancelPlayData and CancelRecordData with KErrNone as a parameter in order to
-   cancel the players and reset the internal state.
+	Notify client of error.
+	
+	Note that we continue playing/recording if possible.
+	
+	We do not maintain information which could map the error back to a particular client play/record request
+	and therefore we have to notify the client of error every time it happens.
+	
+	nb. A client play/record request is completed with KErrNone if it queues ok - All errors are reported via the Notify*Error
+	mechanism.
  */
 void RMdaDevSound::CBody::SoundDeviceError(TInt aError)
 	{
     #ifdef SYMBIAN_SOUNDADAPTER_DEBUG
-	RDebug::Print(_L("RMdaDevSound::CBody::SoundDeviceError: Error[%d] CurrentPlayer[%d]"), aError, iCurrentPlayer);
+	RDebug::Printf("RMdaDevSound::CBody::SoundDeviceError: Error[%d] state %s", aError, iState.Name());
     #endif
 
-	for (TInt i=0; i<KNumPlayers; i++)
-		{
-		if(KErrNone == aError)
-			{
-			// If we are here, SoundDeviceError(KErrNone) has been called from
-			// CancelPlayData or CancelRecordData to maje sure the players are
-			// cancel and their state reset
-			iPlayers[i]->Stop();
-			}
-		else
-			{
-			if (!iPlayers[i]->IsActive())
-				{
-				iPlayers[i]->ResetPlayer();
-				}
-			}
-		}
-
-	iBufferRemaining.SetLength(0);
-	if(iPlayErrorStatus && aError!=KErrNone)//error receiver is only for errors
+	ASSERT(aError != KErrNone);
+	
+	if(iClientPlayErrorStatus)
 		{
         #ifdef SYMBIAN_SOUNDADAPTER_DEBUG
             RDebug::Printf("RMdaDevSound::CBody::SoundDeviceError Completing iPlayerErrorStatus");
         #endif
-		User::RequestComplete(iPlayErrorStatus, aError);
-		iPlayErrorStatus = NULL;
+
+		User::RequestComplete(iClientPlayErrorStatus, aError); // nb call also sets iClientPlayErrorStatus to NULL
 		}
-	if(iPlayerStatus)
-		{
-        #ifdef SYMBIAN_SOUNDADAPTER_DEBUG
-            RDebug::Printf("RMdaDevSound::CBody::SoundDeviceError Completing iPlayerStatus");
-        #endif
-		User::RequestComplete(iPlayerStatus, KErrNone); // effectively buffer emptied
-		iPlayerStatus = NULL;
-		}
-  	if(iRecordErrorStatus && aError!=KErrNone)
+
+  	if(iClientRecordErrorStatus)
 		{
         #ifdef SYMBIAN_SOUNDADAPTER_DEBUG
-            RDebug::Printf("RMdaDevSound::CBody::SoundDeviceError Completing iRecordErrorStatus");
-        #endif
-		User::RequestComplete(iRecordErrorStatus, aError);
-		iRecordErrorStatus = NULL;
-		}
-  	else if(iRecorderStatus)
-		{
-        #ifdef SYMBIAN_SOUNDADAPTER_DEBUG
-            RDebug::Printf("RMdaDevSound::CBody::SoundDeviceError Completing iRecorderStatus");
+            RDebug::Printf("RMdaDevSound::CBody::SoundDeviceError Completing iClientRecordErrorStatus");
         #endif
-		User::RequestComplete(iRecorderStatus, aError);
-		iRecorderStatus = NULL;
+		User::RequestComplete(iClientRecordErrorStatus, aError); // nb call also sets iClientRecordErrorStatus to NULL
 		}
-  	iBufferIndex = -1;
-	iCurrentPlayer = 0;
-	iBufferOffset = -1;
-	iBufferLength = 0;
-	iTimerActive = EFalse;
-	iState = EOpened;
+
+	return;
 	}
 
 void RMdaDevSound::CBody::NotifyRecordError(TRequestStatus& aStatus)
 	{
 	aStatus = KRequestPending;
-	iRecordErrorStatus = &aStatus;
+	iClientRecordErrorStatus = &aStatus;
 	}
 
 void RMdaDevSound::CBody::NotifyPlayError(TRequestStatus& aStatus)
 	{
 	aStatus = KRequestPending;
-	iPlayErrorStatus = &aStatus;
+	iClientPlayErrorStatus = &aStatus;
 	}
 
 void RMdaDevSound::CBody::CancelNotifyPlayError()
 	{
-	if(iPlayErrorStatus)
+	if(iClientPlayErrorStatus)
 		{
-		User::RequestComplete(iPlayErrorStatus, KErrCancel);
+		User::RequestComplete(iClientPlayErrorStatus, KErrCancel);
 		}
 	}
 
 void RMdaDevSound::CBody::CancelNotifyRecordError()
 	{
-	if(iRecordErrorStatus)
+	if(iClientRecordErrorStatus)
 		{
-		User::RequestComplete(iRecordErrorStatus, KErrCancel);
+		User::RequestComplete(iClientRecordErrorStatus, KErrCancel);
 		}
+	else
+	    {
+		#ifdef SYMBIAN_SOUNDADAPTER_DEBUG	
+        RDebug::Printf("msp BufferEmptied but iClientPlayStatus==NULL");
+		#endif
+	    }
 	}
 
 void RMdaDevSound::CBody::FlushPlayBuffer()
 	{
-	__ASSERT_DEBUG(iPlaySoundDevice.Handle(), Panic(EDeviceNotOpened));
-	//There is no equivalent of FlushPlaybuffer in the new sound driver. So use CancelPlayData
-	//to simulate the original behavior
-	if ((iState == EPlaying) || (iState == EPaused))
-		{
-        #ifdef SYMBIAN_SOUNDADAPTER_DEBUG
-            RDebug::Print(_L("RMdaDevSound::CBody::FlushPlayBuffers in Playing or Paused state"));
-        #endif
-
-		if (iState == EPaused)
-			{
-			iFlushCalledDuringPause = ETrue;
-			}
-
-
-		iPlaySoundDevice.CancelPlayData();
-		iBufferRemaining.SetLength(0);
-		iState = EPlayBuffersFlushed;			
-		}
-
+	#ifdef SYMBIAN_SOUNDADAPTER_DEBUG	
+    RDebug::Printf("RMdaDevSound::CBody::FlushPlayBuffer calling CancelPlayData");
+	#endif	
+	CancelPlayData();
 	}
 
-
-
-
 RSoundSc& RMdaDevSound::CBody::PlaySoundDevice()
 	{
 	return iPlaySoundDevice;
@@ -1040,22 +1639,11 @@
 	return iRecordSoundDevice;
 	}
 	
-RMdaDevSound::CBody::TState RMdaDevSound::CBody::State()
+const RMdaDevSound::CBody::TState &RMdaDevSound::CBody::State() const
 	{
 	return iState;
 	}
 
-void RMdaDevSound::CBody::BufferEmptied()
-	{
-	if(iPlayerStatus)
-		{
-        #ifdef SYMBIAN_SOUNDADAPTER_DEBUG
-            RDebug::Print(_L("***Buffer Emptied***"));
-        #endif
-		User::RequestComplete(iPlayerStatus, KErrNone);
-		iPlayerStatus = NULL;
-		}
-	}
 
 void RMdaDevSound::CBody::BufferFilled(TInt aBufferOffset)
 	{
@@ -1064,15 +1652,15 @@
     #endif	
 
 	ASSERT(aBufferOffset>=0 || aBufferOffset==KErrCancel);
-	ASSERT(iData); // request should not get this without
+	ASSERT(iClientRecordData); // request should not get this without
 
 	if(aBufferOffset==KErrCancel)
 		{
 		//we can get KErrCancel when we call pause and there is no more data left with the driver
 		//we send the empty buffer to the HwDevice, where this should trigger the shutdown mechanism
-		iData->SetLength(0);
-		User::RequestComplete(iRecorderStatus, KErrNone);
-		iRecorderStatus = NULL;
+		iClientRecordData->SetLength(0);
+		User::RequestComplete(iClientRecordStatus, KErrNone);
+		iClientRecordStatus = NULL;
 		return;
 		}
 		
@@ -1081,14 +1669,14 @@
 	//expects that the buffer size should always be even. Base suggested that we fix in multimedia
 	//as it is quite complicated to fix in overthere.
 	iBufferLength = iBufferLength & 0xfffffffe;
-	TPtr8 dataPtr(iChunk.Base()+ iBufferOffset, iBufferLength, iData->MaxLength());
-	if (iRecordData.iConverter)
+	TPtr8 dataPtr(iRecordChunk.Base()+ iBufferOffset, iBufferLength, iClientRecordData->MaxLength());
+	if (iRecordFormatData.iConverter)
 		{
-		iRecordData.iConverter->Convert(dataPtr, *iData);
+		iRecordFormatData.iConverter->Convert(dataPtr, *iClientRecordData);
 		}
 	else
 		{
-		iData->Copy(dataPtr);
+		iClientRecordData->Copy(dataPtr);
 		}
     #ifdef SYMBIAN_SOUNDADAPTER_DEBUG
         RDebug::Print(_L("RMdaDevSound::CBody::BufferFilled: BufferOffset[%d] BufferLen[%d]"), iBufferOffset, iBufferLength);
@@ -1097,52 +1685,124 @@
 		{
 		iRecordSoundDevice.ReleaseBuffer(iBufferOffset);
 		}
-	if(iRecorderStatus)
+	if(iClientRecordStatus)
 		{
-		User::RequestComplete(iRecorderStatus, KErrNone);
-		iRecorderStatus = NULL;
-		}
-	}
-							
-void RMdaDevSound::CBody::PlayCancelled()
-	{
-    #ifdef SYMBIAN_SOUNDADAPTER_DEBUG	
-        RDebug::Print(_L("RMdaDevSound::CBody::PlayCancelled:"));
-    #endif	
-
-	for (TInt index=0; index<KNumPlayers; index++)
-		{
-		iPlayers[index]->Cancel();
+		User::RequestComplete(iClientRecordStatus, KErrNone);
+		iClientRecordStatus = NULL;
 		}
-	iBufferIndex = -1;
-	iCurrentPlayer = 0;
-	iBufferOffset = -1;
-	iBufferLength = 0;
-	iTimerActive = EFalse;
-	if(iPlayerStatus)
-		{
-		User::RequestComplete(iPlayerStatus, KErrNone);
-		iPlayerStatus = NULL;
-		}
+	else
+	    {
+        RDebug::Printf("msp PlayCancelled but iClientPlayStatus==NULL");
+	    }
 	}
-	
-void RMdaDevSound::CBody::UpdateTimeAndBytesPlayed()
+		
+/*
+	This function is called to notify us that a CPlayer's request has completed and what its status was.
+
+	It is important to note that:-
+	1) RSoundSc driver PlayData requests are guaranteed to complete in order, oldest first
+	2) If we are overloaded, it is possible for more than one request to complete before any CPlayer::RunL is ran. In
+	this situation the CPlayer::RunL functions, and hence this callback, maybe invoked in non-oldest first order
+
+	but
+
+	a) It is impossible for callback for the second oldest CPlayer to occur before the driver request for the oldest has
+	been complete (because of 1)
+	b) We will always get exactly one callback for every complete request.
+
+	Therefore this callback notifies us of two subtly separate things:-
+
+	i) The oldest request has been completed (so we can reduce can increase the bytes played counter by its length
+	ii) CPlayer aPlayerIndex is free for re-use
+
+	but we can not assume that aPlayerIndex is the oldest request, therefore we save the play request lengths outside of
+	the CPlayer object.
+*/
+void RMdaDevSound::CBody::PlayRequestHasCompleted(CPlayer *aPlayer, TInt aStatus, TBool aDueToCancelCommand)
 	{
-	iBytesPlayed = iPlaySoundDevice.BytesTransferred();
-	iStartTime = User::FastCounter();
-	iTimerActive=ETrue;
-	}
+	// CPlayer is done so put it on the free queue
+	iFreePlayers.Push(aPlayer);
+
+	TUint32 bytesPlayed = iActivePlayRequestSizes.Pop();
+	// Request has finished therefore now timing the following request to simulate bytes played
+    iStartTime = CurrentTimeInMsec();
+	if(aDueToCancelCommand)
+	    {
+        // Callback due to CPlayer::Cancel/DoCancel being called, therefore we
+        // do not want to update bytes played, process state, report a error or start new players
+        return;
+	    }
+	
+	// Update iBytesPlayed by the length of the oldest request (which might not be the one that CPlayer was 
+	// handling).
+	iBytesPlayed += bytesPlayed;
+	#ifdef SYMBIAN_SOUNDADAPTER_DEBUG	
+    RDebug::Printf("PlayRequestHasCompleted increasing iBytesPlayed by %d to %d", bytesPlayed, iBytesPlayed);
+	#endif
 	
-TBool RMdaDevSound::CBody::TimerActive()
-	{
-	return iTimerActive;
+    // Process state
+	switch(iState)
+		{
+		case ENotReady:
+			Panic(EDeviceNotOpened);
+			break;
+				
+		case EStopped:
+			// Will happen if we are doing CancelPlayData processing with active players
+			break;
+		
+		case ERecording:
+		case ERecordingPausedInHw:
+		case ERecordingPausedInSw:
+			Panic(EBadState);
+			break;
+			
+		case EPlaying:
+			// Normal situation
+			break;
+
+		case EPlayingPausedInHw: 
+			// H/W was/is paused, but there must have been an already complete request that we had not 
+			// processed yet.
+			// There must be at least one more pending request on h/w, otherwise the h/w would have refused to pause
+			// I would expect this be rare, but it happens quite often...
+            #ifdef SYMBIAN_SOUNDADAPTER_DEBUG
+			ASSERT(iActivePlayRequestSizes.Length() != 0);
+            #endif
+			// Need to update the start and pause time to now because we have just updated the actual iBytesPlayed
+			// and logically the h/w is paused at the beginning of the next request
+			iStartTime = CurrentTimeInMsec();
+			iPauseTime = iStartTime;
+			break;
+		
+		case EPlayingPausedInSw:
+			// This will happen if there is only a single hw request outstanding, and the hardware has finished it, but the
+			// corresponding RunL has not run yet (in which case PausePlayBuffer will have attempted to use h/w pause,
+			// but the driver call would have failed, and the state changed to EPlayingPausedInSw).
+			iStartTime = CurrentTimeInMsec();
+			iPauseTime = iStartTime;
+			return;
+		case EPlayingUnderrun:
+			break;
+				
+		default:
+			Panic(EBadState);
+			break;
+		}
+
+
+	// If we have an error, report it to the client
+	// We NEVER report driver underflow, instead we report KErrUnderflow if we run out of data to pass to driver.
+	if( (aStatus != KErrNone) && (aStatus != KErrUnderflow) )
+		{
+		SoundDeviceError(aStatus);
+		}
+
+    // If appropriate start more players
+	StartPlayersAndUpdateState();
+	return;
 	}
 
-TBool RMdaDevSound::CBody::FlushCalledDuringPause()
-	{
-	return iFlushCalledDuringPause;
-	}
-	
 RMdaDevSound::CBody::CPlayer::CPlayer(TInt aPriority, RMdaDevSound::CBody& aParent, TInt aIndex):
 	CActive(aPriority), iParent(aParent), iIndex(aIndex), iBufferOffset(-1), iBufferLength(0)
 	{
@@ -1154,135 +1814,82 @@
 	Cancel();
 	}
 
+
 void RMdaDevSound::CBody::CPlayer::RunL()
 	{
     #ifdef SYMBIAN_SOUNDADAPTER_DEBUG	
-        RDebug::Print(_L("****RMdaDevSound::CBody::CPlayer(%d)::RunL: Error[%d] ParentState[%d] Outstanding[%d], pending[%d]"), 
-                            iIndex, iStatus.Int(), iParent.State(), iParent.iHaveSecondPhaseData, iRequestPending);
+    RDebug::Printf("****RMdaDevSound::CBody::CPlayer(%d)::RunL: Error[%d] ParentState[%s]", 
+                     iIndex, iStatus.Int(), iParent.State().Name());
+	RDebug::Printf("iActivePlayRequestSizes.Length() = %d iFreePlayers.Length() = %d (including this one as active)", 
+					iParent.iActivePlayRequestSizes.Length(), 
+					iParent.iFreePlayers.Length());
     #endif
-
-	//this is required to avoid receiving the request completions in the order diff. from the 
-	//issued order
-	Deque();
-	CActiveScheduler::Add(this);
-	
-	TInt error = iStatus.Int();
-	
-	// It's fine to schedule buffers to the driver in the paused state (i.e. iRequestPending == EFalse)
-	if(!iRequestPending && (iParent.State() == EPlaying || iParent.State() == EPaused) && error == KErrNone)
-		{
-		//this is from playdata
-		#ifdef SYMBIAN_SOUNDADAPTER_DEBUG	
-		RDebug::Print(_L("RMdaDevSound::CBody::CPlayer(%d)::RunL: Playing BufferOffset[%d] BufferLength[%d]"), iIndex, iBufferOffset, iBufferLength);
-		#endif
-		//Make sure the length is even. We may get odd for the last partial buffer.
-		iBufferLength = iBufferLength & 0xfffffffe;
-
-		PlaySoundDevice();
-		//Need this for the first time only
-		if(!iParent.TimerActive())
-			{
-			iParent.UpdateTimeAndBytesPlayed();
-			}
-		iRequestPending = ETrue;
-		}
-	// TODO: The case below shouldn't be valid under EPaused state, i.e. the driver shouldn't complete playback if it was paused. However due to a current problem in the driver we have to handle this case
-	else if (iRequestPending && (iParent.State() == EPlaying || iParent.State() == EPaused) && error == KErrNone) //this is from driver
-		{		
-		#ifdef SYMBIAN_SOUNDADAPTER_DEBUG	
-		RDebug::Print(_L("RMdaDevSound::CBody::CPlayer(%d)::RunL: Buffer emptied successfully"), iIndex);
-		#endif
-		if (iParent.iHaveSecondPhaseData)
-			{
-			TPtr8 dataPtr(iParent.iChunk.Base()+ iParent.iBufferConfig.iBufferOffsetList[iParent.iBufferIndex], 0, iParent.iDeviceBufferLength);
-			dataPtr.Copy(iParent.iSecondPhaseData);
-							
-			PlaySoundDevice();
-			iParent.iCurrentPlayer = (iParent.iCurrentPlayer+1) & KNumPlayersMask;
-			iParent.UpdateTimeAndBytesPlayed();
-			iParent.iHaveSecondPhaseData = EFalse;			
-			}
-		else
-			{
-			iRequestPending = EFalse;
-			iParent.UpdateTimeAndBytesPlayed();
-			iParent.BufferEmptied();
-			}
-		}
-	else if(iParent.State() == EPlayBuffersFlushed && error == KErrCancel)
-		{
-		iRequestPending = EFalse;
-		if (!iParent.FlushCalledDuringPause())
-			{
-			iParent.PlayCancelled();
-			}
-		}
-	else if(iParent.State() == ERecording && (error >= 0 || error == KErrCancel))
-		{//we can get KErrCancel when we call pause and there is no more data left with the driver
-		iParent.BufferFilled(error);
-		}
-	else 
-		{
-        #ifdef SYMBIAN_SOUNDADAPTER_DEBUG	
-            RDebug::Print(_L("RMdaDevSound::CBody::CPlayer(%d)::RunL: Error[%d] Outstanding[%d], pending[%d]"), 
-						  iIndex, error, iParent.iHaveSecondPhaseData,iRequestPending);
-        #endif
-		iParent.SoundDeviceError(error, iIndex);
-		}
+	iParent.PlayRequestHasCompleted(this, iStatus.Int(), EFalse);
+	return;
 	}
 
 TInt RMdaDevSound::CBody::CPlayer::RunError(TInt aError)
 	{
-	iParent.SoundDeviceError(aError, iIndex);
+	iParent.PlayRequestHasCompleted(this, aError, EFalse);
 	return KErrNone;
 	}
-	
+
 void RMdaDevSound::CBody::CPlayer::DoCancel()
 	{
-	//nothing to do
 #ifdef SYMBIAN_SOUNDADAPTER_DEBUG
 	RDebug::Printf("RMdaDevSound::CBody::CPlayer(%d)::DoCancel", iIndex);
 #endif
+	if(iStatus == KRequestPending)
+	    {
+        // Avoid cancelling requests which have already completed.
+        // It wastes time, and might provoke a sound driver problem
+	    #ifdef SYMBIAN_SOUNDADAPTER_DEBUG	
+        RDebug::Printf("RMdaDevSound::CBody::CPlayer::DoCancel - would have cancelled driver request");
+		#endif
+        iParent.PlaySoundDevice().Cancel(iStatus);
+	    }
+	iParent.PlayRequestHasCompleted(this, KErrCancel, ETrue);
 	}
 
-void RMdaDevSound::CBody::CPlayer::ResetPlayer()
-	{
-    #ifdef SYMBIAN_SOUNDADAPTER_DEBUG	
-	RDebug::Print(_L("RMdaDevSound::CBody::CPlayer(%d)::ResetPlayer: IsActive[%d] pending[%d] iBufferOffset[%d] iBufferLength[%d]"), iIndex, IsActive(), iRequestPending, iBufferOffset, iBufferLength);
-    #endif
-
-	iRequestPending = EFalse;
-	iBufferOffset = -1;
-	iBufferLength = 0;
-	}
-
-void RMdaDevSound::CBody::CPlayer::Stop()
+void RMdaDevSound::CBody::CPlayer::PlayData(TUint aChunkOffset, TInt aLength)
 	{
     #ifdef SYMBIAN_SOUNDADAPTER_DEBUG	
-	RDebug::Print(_L("RMdaDevSound::CBody::CPlayer(%d)::Stop: IsActive[%d] pending[%d] iBufferOffset[%d] iBufferLength[%d]"), iIndex, IsActive(), iRequestPending, iBufferOffset, iBufferLength);
-    #endif
+	RDebug::Print(_L("RMdaDevSound::CBody::CPlayer(%d)::PlayData : IsActive[%d]"),
+				  iIndex,    IsActive());
+	RDebug::Printf("iActivePlayRequestSizes.Length() = %d iFreePlayers.Length() = %d (inc this player)", 
+					iParent.iActivePlayRequestSizes.Length(), 
+					iParent.iFreePlayers.Length());
+    #endif	
+	
+	iBufferOffset = aChunkOffset;
+	iBufferLength = aLength;
 
-	ResetPlayer();
-	Cancel();
+    //Make sure the length is a multiple of 4 to work around an h6 limitation.
+	iBufferLength = iBufferLength & 0xfffffffc;
+
+	// Issue the RSoundSc request
+	iParent.PlaySoundDevice().PlayData(iStatus, iBufferOffset, iBufferLength, EFalse);
+	SetActive();
+	return;
 	}
 	
-void RMdaDevSound::CBody::CPlayer::PlayData(TInt aBufferOffset, TInt aLength)
+TUint RMdaDevSound::CBody::CPlayer::GetPlayerIndex() const
 	{
-    #ifdef SYMBIAN_SOUNDADAPTER_DEBUG	
-	RDebug::Print(_L("RMdaDevSound::CBody::CPlayer(%d)::PlayData : IsActive[%d]"), iIndex,    IsActive());
-    #endif	
+	return iIndex;
+	}
 
-	ASSERT(!IsActive()); // TODO: remove or replace redundant test
-	iBufferOffset = aBufferOffset;
-	iBufferLength = aLength;
+RMdaDevSound::CBody::CRecorder::CRecorder(TInt aPriority, RMdaDevSound::CBody& aParent):
+    CActive(aPriority), iParent(aParent), iBufferOffset(-1), iBufferLength(0)
+    {
+    CActiveScheduler::Add(this);
+    }
 
-	iStatus = KRequestPending;
-	SetActive();
-	TRequestStatus* status = &iStatus;
-	User::RequestComplete(status, KErrNone);
-	}
-	
-void RMdaDevSound::CBody::CPlayer::RecordData(TInt& aBufferLength)
+RMdaDevSound::CBody::CRecorder::~CRecorder()
+    {
+    Cancel();
+    }
+
+void RMdaDevSound::CBody::CRecorder::RecordData(TInt& aBufferLength)
 	{
 	if (!IsActive())
 	    {
@@ -1295,34 +1902,43 @@
 	    }
 	}
 
-void RMdaDevSound::CBody::CPlayer::PlaySoundDevice()
+void RMdaDevSound::CBody::CRecorder::RunL()
 	{
     #ifdef SYMBIAN_SOUNDADAPTER_DEBUG	
-	RDebug::Print(_L("RMdaDevSound::CBody::CPlayer(%d)::PlaySoundDevice : IsActive[%d]"), iIndex, IsActive());
-    #endif	
+    RDebug::Printf("****RMdaDevSound::CBody::CRecorder()::RunL: Error[%d] ParentState[%s]", 
+                     iStatus.Int(), iParent.State().Name());
+    #endif
 
-#ifdef SYMBIAN_FORCE_32BIT_LENGTHS
-	if (iBufferLength%4 != 0)
-		{
-		// simulate the limitation of some hardware, where -6 is generated if the
-		// buffer length is not divisible by 4.
-		TRequestStatus*status = &iStatus;
-		User::RequestComplete(status, KErrArgument);
+	
+	TInt error = iStatus.Int();
+	
+	if((error >= 0) || (error == KErrCancel))
+		{//we can get KErrCancel when we call pause and there is no more data left with the driver
+		iParent.BufferFilled(error);
 		}
-	else
-#endif
+	else 
 		{
-		iParent.PlaySoundDevice().PlayData(iStatus, iBufferOffset, iBufferLength, EFalse);
-		// Pause was called when there was no data available. Now that we have data available, we should pause the driver
-		if (iParent.iPauseDeviceDriverOnNewData)
-			{
-			#ifdef SYMBIAN_SOUNDADAPTER_DEBUG
-				RDebug::Printf("Pausing the driver after receiving data to play");
-			#endif			
-			iParent.PlaySoundDevice().Pause();
-			iParent.iPauseDeviceDriverOnNewData = EFalse;
-			}
+        #ifdef SYMBIAN_SOUNDADAPTER_DEBUG	
+            RDebug::Print(_L("RMdaDevSound::CBody::CPlayer()::RunL: Error[%d]"), error);
+        #endif
+		iParent.SoundDeviceError(error);
 		}
-	SetActive();
+	}
+
+	
+TInt RMdaDevSound::CBody::CRecorder::RunError(TInt aError)
+    {
+    iParent.SoundDeviceError(aError);
+    return KErrNone;
+    }
 
-	}
+void RMdaDevSound::CBody::CRecorder::DoCancel()
+    {
+#ifdef SYMBIAN_SOUNDADAPTER_DEBUG
+    RDebug::Printf("RMdaDevSound::CBody::CRecorder()::DoCancel");
+#endif
+    iParent.RecordSoundDevice().Cancel(iStatus);
+    }
+
+
+// End of file
--- a/mmdevicefw/mdf/src/audio/mdasoundadapter/mdasoundadapterbody.h	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmdevicefw/mdf/src/audio/mdasoundadapter/mdasoundadapterbody.h	Fri Jul 09 12:23:13 2010 +0100
@@ -29,6 +29,10 @@
 	{
 	EDeviceNotOpened,
 	EPanicPartialBufferConverterNotSupported,
+	EBadState,
+	ENoClientPlayRequest,
+	EFifoEmpty,
+	EFifoFull
 	};
 	
 //Structure used to map samples per second to the corresponding enums in RSoundSc
@@ -321,23 +325,28 @@
 							{255,254}
 						};
 
-//Total Number of sample rates
-const TInt KNumSampleRates = 9;
-//Number of shared chunk buffers used for playing
-const TInt KPlayMaxSharedChunkBuffers = 2;
-const TInt KPlayMaxSharedChunkBuffersMask = KPlayMaxSharedChunkBuffers-1; // use for % KPlayMaxSharedChunkBuffers
+// Total Number of sample rates
+const TUint KNumSampleRates = 9;
+// Number of shared chunk buffers used for playing
+// Each buffer is permanently mapped, via an index number, to a particular buffer in the chunk
+// The esoundsc.ldd can only handle a max of 8 pending play requests, therefore no point in having
+// more than 8 play buffers...
+const TUint KPlaySharedChunkBuffers = 8;
+// Size of RSoundSc play buffers
+const TUint KPlaySharedChunkBufferSize = 4096;
+
 //Number of shared chunk buffers used for recording
-const TInt KRecordMaxSharedChunkBuffers = 3;
-//we need to two players for playing and one is sufficient for recording
-const TInt KNumPlayers = 2;
-const TInt KNumPlayersMask = KNumPlayers-1; // & KNumPlayersMask is equiv to % KNumPlayers
+const TUint KRecordMaxSharedChunkBuffers = 8;
+// Size of RSoundSc record buffers
+const TUint KRecordSharedChunkBufferSize = 4096;
+
 //Shared chunk driver does not support max. buffer size. 16K is given in order to simulate the old driver behavior.
-const TInt KMaxBufferSize = 0x4000;
+const TUint KMaxBufferSize = 0x4000;
 
 class TPlaySharedChunkBufConfig : public TSharedChunkBufConfigBase
 	{
 public:
-	TInt iBufferOffsetList[KPlayMaxSharedChunkBuffers];
+	TInt iBufferOffsetList[KPlaySharedChunkBuffers];
 	};
 
 class TRecordSharedChunkBufConfig : public TSharedChunkBufConfigBase
@@ -348,6 +357,83 @@
 	
 class CChannelAndSampleRateConverter; // forward dec
 
+GLDEF_C void Panic(TSoundAdapterPanicCodes aPanicCode);//forward declaration
+
+// RFifo class which manages a fifo of up to COUNT items of type T
+template<typename T, TUint32 COUNT> class RFifo
+	{
+public:
+	RFifo()
+		: iWriteIndex(0), iReadIndex(0)
+		{}
+	TBool IsEmpty() const
+		{
+		return iWriteIndex == iReadIndex;
+		}
+	TBool IsFull() const
+		{
+		// Full if writing one more item would make iWriteIndex equal to iReadIndex
+		TUint32 next = NextIndex(iWriteIndex);
+		return next == iReadIndex;
+		}
+	/// Push item into FIFO. Does not take ownership. Will PANIC with EFifoFull if full.
+	void Push(const T &aItem)
+		{
+		if(IsFull())
+			{
+			Panic(EFifoFull);
+			}
+		iFifo[iWriteIndex] = aItem;
+		iWriteIndex = NextIndex(iWriteIndex);
+		}
+    /// Pop item from FIFO. Will PANIC with EFifoEmpty if empty 
+	T Pop()
+		{
+		if(IsEmpty())
+			{
+			Panic(EFifoEmpty);
+			}
+		TUint32 tmp = iReadIndex;
+		iReadIndex = NextIndex(iReadIndex);
+		return iFifo[tmp];
+		}
+
+    /// Peek first item from FIFO. Will PANIC with EFifoEmpty if empty 
+	T Peek()
+		{
+		if(IsEmpty())
+			{
+			Panic(EFifoEmpty);
+			}
+		return iFifo[iReadIndex];
+		}
+	TUint Length() const
+		{
+		TUint len;
+		if(iWriteIndex >= iReadIndex)
+			{
+			len = iWriteIndex - iReadIndex;
+			}
+		else
+			{
+			len =  COUNT+1 - (iReadIndex - iWriteIndex);
+			}
+		return len;
+		}
+private:
+	TUint32 NextIndex(TUint32 aIndex) const
+		{
+		++aIndex;
+		aIndex %= (COUNT+1);
+		return aIndex;
+		}
+	T iFifo[COUNT+1];
+	TUint32 iWriteIndex;
+	TUint32 iReadIndex;
+	};
+
+
+
 //Body class for the adapter
 NONSHARABLE_CLASS( RMdaDevSound::CBody ): public CBase
 	{
@@ -361,27 +447,58 @@
 		void RunL();
 		TInt RunError(TInt aError);
 		void DoCancel();
+		void PlayData(TUint aChunkOffset, TInt aLength);
+
+		TUint GetPlayerIndex() const;
+
+	private:		
+		RMdaDevSound::CBody& iParent;
+		const TUint iIndex; // index of this object in parent
+		
+		TInt iBufferOffset;
+		TInt iBufferLength;
+		};
+
+	
+	NONSHARABLE_CLASS( CRecorder ) : public CActive
+		{
+	public:
+		explicit CRecorder(TInt aPriority, RMdaDevSound::CBody& aParent);
+		~CRecorder();
+		void RunL();
+		TInt RunError(TInt aError);
+		void DoCancel();
 		void RecordData(TInt& aLength);
-		void PlayData(TInt aBufferOffset, TInt aBufferLength);
-		void Stop();
-		void ResetPlayer();
-		void PlaySoundDevice();
-	private:
+
+	private:		
 		RMdaDevSound::CBody& iParent;
-		const TInt iIndex; // index of this object in parent
-		TBool iRequestPending;
+
 		TInt iBufferOffset;
 		TInt iBufferLength;
 		};
 	
-	enum TState
+	enum TStateEnum
 		{
 		ENotReady,
-		EOpened,
-		EPlaying,
+		EStopped,
 		ERecording,
-		EPlayBuffersFlushed,
-		EPaused
+		ERecordingPausedInHw,
+		ERecordingPausedInSw,
+		EPlaying,
+		EPlayingPausedInHw, // ie. Play request pending on h/w and paused
+		EPlayingPausedInSw, // ie. Driver not playing or paused
+		EPlayingUnderrun
+		};
+
+	NONSHARABLE_CLASS( TState )
+		{
+		public:
+			TState(TStateEnum aState) : iState(aState) {}
+			const TText8 *Name() const;
+			TState &operator=(TStateEnum aNewState);
+			operator TStateEnum() const { return iState; }
+		private:
+			TStateEnum iState;
 		};
 		
 	class TFormatData
@@ -442,40 +559,55 @@
 	
 	//for players
 	void SoundDeviceError(TInt aError);
-	void SoundDeviceError(TInt aError, TInt aPlayerIndex);
 	RSoundSc& PlaySoundDevice();
 	RSoundSc& RecordSoundDevice();
-	TState State();
+	const TState &State() const;
 	void BufferFilled(TInt aError);
-	void BufferEmptied();
-	void PlayCancelled();
-	void UpdateTimeAndBytesPlayed();
-	TBool TimerActive();
-	TBool FlushCalledDuringPause();
+
+	// Called whenever a player becomes inactive.
+	// This includes driver request ok, driver request failed, CPlayer:::RunError invoked.
+	void PlayRequestHasCompleted(CPlayer *aPlayer, TInt aStatus, TBool aDueToCancelCommand);
 
 private:
 	CBody();
 	void ConstructL();
 	
 	TInt NegotiateFormat(const TCurrentSoundFormatBuf& aFormat, RSoundSc& aDevice, TFormatData &aFormatData);
+
+	void StartPlayersAndUpdateState();
+	void StartRecordRequest();
+
+	const char *StateName() const;
+
+	TBool InRecordMode() const;
+	TBool InPlayMode() const;
+
+	TUint32 CurrentTimeInMsec() const;
+	TUint64 BytesPlayed64();
+
 private:
 	RSoundSc iPlaySoundDevice;
+	RChunk iPlayChunk;//handle to the shared chunk
 	RSoundSc iRecordSoundDevice;
-	RChunk iChunk;//handle to the shared chunk
+	RChunk iRecordChunk;//handle to the shared chunk
 	TState iState;
-	CPlayer* iPlayers[KNumPlayers];//we need atleast two players for playing and one for recording
-	
+
 	//Playing Properties
-	TPlaySharedChunkBufConfig iBufferConfig;
-	TInt iBufferIndex;
-	TInt iCurrentPlayer;
+	TPlaySharedChunkBufConfig iPlayBufferConfig;
 	TInt iDeviceBufferLength;
+	
 	//Stores the status of CDataPathPlayer
-	TRequestStatus* iPlayerStatus;
+	TRequestStatus* iClientPlayStatus;
+	TPtrC8 iClientPlayData;
 	//Stores the status of CSoundDevPlayErrorReceiver
-	TRequestStatus* iPlayErrorStatus;
-	RBuf8 iBufferRemaining;
-	TBool iHaveSecondPhaseData;
+	TRequestStatus* iClientPlayErrorStatus;
+	RBuf8 iConvertedPlayData;
+	RBuf8 iSavedTrailingData;
+
+	CPlayer* iPlayers[KPlaySharedChunkBuffers];
+	RFifo<CPlayer *, KPlaySharedChunkBuffers> iFreePlayers;
+	RFifo<TUint32, KPlaySharedChunkBuffers> iActivePlayRequestSizes;
+	
 	TInt iRequestMinSize;
 	TUint iRequestMinMask;
 	
@@ -483,23 +615,25 @@
 	TRecordSharedChunkBufConfig iRecordBufferConfig;
 	TInt iBufferOffset;
 	TInt iBufferLength;
-	TPtrC8 iSecondPhaseData;
+
 	//Stores the status of CDataPathRecorder
-	TRequestStatus* iRecorderStatus;
+	TRequestStatus* iClientRecordStatus;
 	//Stores the status of CSoundDevRecordErrorReceiver
-	TRequestStatus* iRecordErrorStatus;
-	TDes8* iData;//stores the data pointer from datapath recorder
-	TInt iBytesPlayed;
-#ifdef SYMBIAN_SOUNDADAPTER_BYTESPLAYED
-	TInt iFCFrequency;
+	TRequestStatus* iClientRecordErrorStatus;
+	TDes8* iClientRecordData;//stores the data pointer from datapath recorder
+	RBuf8 iBufferedRecordData; // Used if RSoundSc returns more data than current client request requires.
+
+	CRecorder* iRecorder; // We only need one recorder. The driver will buffer data for us.
+
+	TBool iUnderFlowReportedSinceLastPlayOrRecordRequest;
+	
+	TUint64 iBytesPlayed;
+	TUint32 iNTickPeriodInUsec;
+	TUint32 iStartTime; // Time when previous driver PlayData completed (or first was issued) in msec
+	TUint32 iPauseTime; // Time when pause started in msec
+	TUint64 iPausedBytesPlayed;
+
+	TFormatData iPlayFormatData;
+	TFormatData iRecordFormatData;
+	};
 #endif
-	TUint32 iStartTime;
-	TBool iTimerActive;
-	TBool iFlushCalledDuringPause;
-	TBool iPauseDeviceDriverOnNewData;
-
-	TFormatData iPlayData;
-	TFormatData iRecordData;
-	};
-GLDEF_C void Panic(TSoundAdapterPanicCodes aPanicCode);//forward declaration
-#endif
--- a/mmdevicefw/mdfunittest/codecapi/PU/pcmcodec/group/BLD.INF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-
-
-PRJ_EXPORTS
-../inc/pcmprocessingunit.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mdf/pcmprocessingunit.h)
-
-// .iby
-TSU_MDF_PCMPROCESSINGUNIT.iby	/epoc32/rom/include/tsu_mdf_pcmprocessingunit.iby
-
-PRJ_MMPFILES
-../MMPFiles/pcmprocessingunit.mmp
-
-PRJ_TESTMMPFILES
-PRJ_TESTEXPORTS
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mmdevicefw/mdfunittest/codecapi/PU/pcmcodec/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -0,0 +1,29 @@
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+
+
+PRJ_EXPORTS
+../inc/pcmprocessingunit.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mdf/pcmprocessingunit.h)
+
+// .iby
+TSU_MDF_PCMPROCESSINGUNIT.iby	/epoc32/rom/include/tsu_mdf_pcmprocessingunit.iby
+
+PRJ_MMPFILES
+../MMPFiles/pcmprocessingunit.mmp
+
+PRJ_TESTMMPFILES
+PRJ_TESTEXPORTS
+
--- a/mmdevicefw/mdfunittest/codecapi/PU/video/group/bld.inf	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmdevicefw/mdfunittest/codecapi/PU/video/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -16,13 +16,12 @@
 PRJ_PLATFORMS
 DEFAULT
 
-PRJ_MMPFILES
+PRJ_TESTMMPFILES
 
 ../mmpfiles/VideoTestEncoderPU.mmp
 ../mmpfiles/VideoTestDecoderPU.mmp
 
-PRJ_EXPORTS
+PRJ_TESTEXPORTS
 
 // .iby
 TSU_MDF_VIDEOTESTPROCESSINGUNITS.iby	/epoc32/rom/include/tsu_mdf_videotestprocessingunits.iby
-
--- a/mmdevicefw/mdfunittest/codecapi/audio/group/bld.inf	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmdevicefw/mdfunittest/codecapi/audio/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -13,7 +13,7 @@
 // Description:
 //
 
-PRJ_EXPORTS
+PRJ_TESTEXPORTS
 ../scripts/tsu_mdf_audiocodecs_01.script c:/tsu_mdf_audiocodecs_01.script
 
 // Export test file
@@ -22,5 +22,5 @@
 // .iby
 TSU_MDF_AUDIOCODECS.iby	/epoc32/rom/include/tsu_mdf_audiocodecs.iby
 
-PRJ_MMPFILES
+PRJ_TESTMMPFILES
 ../mmpfiles/tsu_mdf_audiocodecs.mmp
--- a/mmdevicefw/mdfunittest/codecapi/codecapi/group/bld.inf	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmdevicefw/mdfunittest/codecapi/codecapi/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -13,7 +13,7 @@
 // Description:
 //
 
-PRJ_EXPORTS
+PRJ_TESTEXPORTS
 ../scripts/tsu_mdf_codecapi_01.script c:/tsu_mdf_codecapi_01.script
 
 // Export test file
@@ -22,5 +22,5 @@
 // .iby
 TSU_MDF_CODECAPI.iby	/epoc32/rom/include/tsu_mdf_codecapi.iby
 
-PRJ_MMPFILES
+PRJ_TESTMMPFILES
 ../mmpfiles/tsu_mdf_codecapi.mmp
--- a/mmdevicefw/mdfunittest/codecapi/omxvorbis/group/bld.inf	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmdevicefw/mdfunittest/codecapi/omxvorbis/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -13,7 +13,7 @@
 // Description:
 //
 
-PRJ_EXPORTS
+PRJ_TESTEXPORTS
 ../scripts/tsu_mdf_omxvorbiscodecs_01.script c:/tsu_mdf_omxvorbiscodecs_01.script
 
 // Export test file
@@ -23,6 +23,6 @@
 // .iby
 TSU_MDF_OMXVORBISCODECS.iby	/epoc32/rom/include/tsu_mdf_omxvorbiscodecs.iby
 
-PRJ_MMPFILES
+PRJ_TESTMMPFILES
 ../mmpfiles/tsu_mdf_omxvorbiscodecs.mmp
 ../mmpfiles/audiocodectestadapter.mmp
\ No newline at end of file
--- a/mmdevicefw/mdfunittest/codecapi/video/group/TSU_MDF_VIDEOCODECS.iby	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmdevicefw/mdfunittest/codecapi/video/group/TSU_MDF_VIDEOCODECS.iby	Fri Jul 09 12:23:13 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -18,10 +18,14 @@
 
 // debug build
 
-file=ABI_DIR\DEBUG_DIR\tsu_mdf_videocodecs.dll	System\Libs\tsu_mdf_videocodecs.dll
+#include <TSU_MDF_VIDEOCODECS_excl_test.iby>
 
 data=EPOCROOT##epoc32\data\c\tsu_mdf_videocodecs_01.script	tsu_mdf_videocodecs_01.script
 data=EPOCROOT##epoc32\data\c\tsu_mdf_videocodecs_cov.script	tsu_mdf_videocodecs_cov.script
 data=EPOCROOT##epoc32\data\c\tsu_mdf_videocodecs_cov_panic.script	tsu_mdf_videocodecs_cov_panic.script
 
+// Test files
+data=EPOCROOT##epoc32\data\c\mm\mmf\testfiles\mdf\clock.gif	\mm\mmf\testfiles\mdf\clock.gif
+data=EPOCROOT##epoc32\data\c\mm\mmf\testfiles\mdf\decodervideotest.in	\mm\mmf\testfiles\mdf\decodervideotest.in
+
 #endif // TSU_MDF_VIDEOCODECS_IBY
--- a/mmdevicefw/mdfunittest/codecapi/video/group/bld.inf	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmdevicefw/mdfunittest/codecapi/video/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -13,7 +13,7 @@
 // Description:
 //
 
-PRJ_EXPORTS
+PRJ_TESTEXPORTS
 ../scripts/tsu_mdf_videocodecs_01.script 	c:/tsu_mdf_videocodecs_01.script
 ../scripts/tsu_mdf_videocodecs_cov.script 	c:/tsu_mdf_videocodecs_cov.script
 ../scripts/tsu_mdf_videocodecs_cov_panic.script	c:/tsu_mdf_videocodecs_cov_panic.script
@@ -22,6 +22,7 @@
 
 // .iby
 TSU_MDF_VIDEOCODECS.iby	/epoc32/rom/include/tsu_mdf_videocodecs.iby
+TSU_MDF_VIDEOCODECS_excl_test.iby	/epoc32/rom/include/tsu_mdf_videocodecs_excl_test.iby
 
-PRJ_MMPFILES
+PRJ_TESTMMPFILES
 ../mmpfiles/tsu_mdf_videocodecs.mmp
--- a/mmdevicefw/mdfunittest/group/BLD.INF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// bld.inf - Overall mdf UnitTest bld.inf file
-// 
-//
-
-
-PRJ_PLATFORMS
-
-DEFAULT
-#ifdef SYMBIAN_MULTIMEDIA_CODEC_API	
-#include "../codecapi/audio/group/bld.inf"
-#include "../codecapi/video/group/bld.inf"
-#include "../codecapi/omx/pcmcodec/group/bld.inf"
-#include "../codecapi/PU/pcmcodec/group/BLD.INF"
-#include "../codecapi/PU/video/group/bld.inf"
-#include "../codecapi/codecapi/group/bld.inf"
-#include "../codecapi/omxvorbis/group/bld.inf"
-#endif // SYMBIAN_MULTIMEDIA_CODEC_API	
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mmdevicefw/mdfunittest/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -0,0 +1,30 @@
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// bld.inf - Overall mdf UnitTest bld.inf file
+// 
+//
+
+
+PRJ_PLATFORMS
+
+DEFAULT
+#ifdef SYMBIAN_MULTIMEDIA_CODEC_API	
+#include "../codecapi/audio/group/bld.inf"
+#include "../codecapi/video/group/bld.inf"
+#include "../codecapi/omx/pcmcodec/group/bld.inf"
+#include "../codecapi/PU/pcmcodec/group/bld.inf"
+#include "../codecapi/PU/video/group/bld.inf"
+#include "../codecapi/codecapi/group/bld.inf"
+#include "../codecapi/omxvorbis/group/bld.inf"
+#endif // SYMBIAN_MULTIMEDIA_CODEC_API	
--- a/mmdevicefw/speechrecogsupport/tsrc/ASR/group/bld.inf	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmdevicefw/speechrecogsupport/tsrc/ASR/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -17,14 +17,14 @@
 PRJ_PLATFORMS
 DEFAULT
 
-PRJ_MMPFILES
+PRJ_TESTMMPFILES
 
 // ASR TEst 
 ../MmpFiles/TSU_MMF_ASRCL.mmp
 ../MmpFiles/CustomMmfASRController.mmp
 
 
-PRJ_EXPORTS
+PRJ_TESTEXPORTS
 
 // test scripts
 ../scripts/TSU_MMF_ASRCL.script 		c:/tsu_mmf_asrcl.script
--- a/mmdevicefw/speechrecogsupport/tsrc/ASR/src/TSU_MMF_ASRCL.cpp	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmdevicefw/speechrecogsupport/tsrc/ASR/src/TSU_MMF_ASRCL.cpp	Fri Jul 09 12:23:13 2010 +0100
@@ -38,7 +38,7 @@
 	TRAPD(err, speechClient = CSpeechRecognitionUtility::NewL(*this, uid));
 	if (err != KErrNone)
 		{
-		INFO_PRINTF1(_L("Failure Creating Speech Recognition Utility"));
+		INFO_PRINTF2(_L("Failure Creating Speech Recognition Utility and error is %d"), err);
 		return EFail;
 		}
 	delete speechClient;
@@ -78,7 +78,7 @@
 					CleanupStack::PopAndDestroy(speechClient));
 	if (err != KErrNone)
 		{
-		INFO_PRINTF1(_L("Failure Creating Speech Recognition Utility"));
+		INFO_PRINTF2(_L("Failure Creating Speech Recognition Utility and the error is %d"), err);
 		return EFail;
 		}
 	return EPass;
--- a/mmhais/a3facl/group/multimedia_a3f_acl.mrp	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmhais/a3facl/group/multimedia_a3f_acl.mrp	Fri Jul 09 12:23:13 2010 +0100
@@ -1,17 +1,6 @@
+#multimedia_a3f_acl.mrp
 #
-# Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description: 
+#Copyright (c) Symbian Software Ltd 2007.  All rights reserved.
 #
 
 component	multimedia_a3f_acl
--- a/mmhais/a3fdevsoundcustomisation/group/multimedia_a3f_devsoundadaptationinfo.mrp	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmhais/a3fdevsoundcustomisation/group/multimedia_a3f_devsoundadaptationinfo.mrp	Fri Jul 09 12:23:13 2010 +0100
@@ -1,17 +1,6 @@
+#multimedia_a3f_devsound.mrp
 #
-# Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description: 
+#Copyright (c) Symbian Software Ltd 2007.  All rights reserved.
 #
 
 component	multimedia_a3f_devsoundadaptationinfo
--- a/mmhais/dvbhunittest/hai/dvbh/group/bld.inf	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmhais/dvbhunittest/hai/dvbh/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -14,15 +14,16 @@
 //
 
 
-PRJ_MMPFILES
+PRJ_TESTMMPFILES
 ../group/tsu_dvbh_hai.mmp
 
 
-PRJ_EXPORTS
+PRJ_TESTEXPORTS
 ../scripts/tsu_dvbh_hai.script c:/tsu_dvbh_hai.script
 ../scripts/tsu_dvbh_hai_panic_debug.script c:/tsu_dvbh_hai_panic_debug.script
 
 // .iby
 ../group/tsu_dvbh_hai.iby /epoc32/rom/include/tsu_dvbh_hai.iby
+../group/tsu_dvbh_hai_excl_test.iby /epoc32/rom/include/tsu_dvbh_hai_excl_test.iby
 
 
--- a/mmhais/dvbhunittest/hai/dvbh/group/tsu_dvbh_hai.iby	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmhais/dvbhunittest/hai/dvbh/group/tsu_dvbh_hai.iby	Fri Jul 09 12:23:13 2010 +0100
@@ -16,11 +16,8 @@
 #ifndef  TSU_DVBH_HAI_IBY
 #define  TSU_DVBH_HAI_IBY
 
-// debug build
-
-#include <dvbhreceiverstub.iby>
-
-file=ABI_DIR\DEBUG_DIR\TSU_DVBH_HAI.dll 	Sys\bin\TSU_DVBH_HAI.dll
+//Testscripts & other ibys
+#include <tsu_dvbh_hai_excl_test.iby>
 
 data=EPOCROOT##epoc32\data\c\tsu_dvbh_hai.script     	tsu_dvbh_hai.script
 data=EPOCROOT##epoc32\data\c\tsu_dvbh_hai_panic_debug.script  tsu_dvbh_hai_panic_debug.script
--- a/mmhais/refacladapt/group/multimedia_a3f_refacladaptation.mrp	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmhais/refacladapt/group/multimedia_a3f_refacladaptation.mrp	Fri Jul 09 12:23:13 2010 +0100
@@ -1,17 +1,6 @@
+#multimedia_a3f_refacladaptation.mrp
 #
-# Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description: 
+#Copyright (c) Symbian Software Ltd 2007.  All rights reserved.
 #
 
 component	multimedia_a3f_refacladaptation
--- a/mmlibs/mmfw/group/BLD.INF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,236 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Multimedia framework
-// 
-//
-
-/**
-@file
-*/
-
-#ifdef SYMBIAN_VARIABLE_BITRATE_CODEC // use system wide flag to trigger model controller build
-#define SYMBIAN_MMF_MODEL_CONTROLLERS
-#endif
-
-
-PRJ_PLATFORMS
-// specify the platforms your component needs to be built for here
-// may add platform for OMAP, Helen etc
-DEFAULT
-
-PRJ_EXPORTS
-// Client utility Class API headers
-../inc/MdaAudioSamplePlayer.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mdaaudiosampleplayer.h)
-../inc/MdaAudioSampleEditor.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mdaaudiosampleeditor.h)
-../inc/MdaAudioTonePlayer.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mdaaudiotoneplayer.h)
-../inc/MdaAudioOutputStream.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mdaaudiooutputstream.h)
-../inc/MdaAudioInputStream.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mdaaudioinputstream.h)
-../inc/VideoPlayer.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(videoplayer.h)
-../inc/VideoRecorder.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(videorecorder.h)
-../inc/MmfClntUtility.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmfclntutility.h)
-
-// Shared client/server headers
-../inc/mmf/common/MmfBase.h		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/common/mmfbase.h)
-../inc/mmf/common/MmfAudio.h		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/common/mmfaudio.h)
-../inc/mmf/common/MmfVideo.h		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/common/mmfvideo.h)
-../inc/mmf/common/mmfvideoenums.h		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmf/common/mmfvideoenums.h)
-../inc/mmf/common/MmfUtilities.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/common/mmfutilities.h)
-../inc/mmf/common/MmfUtilities.inl	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/common/mmfutilities.inl)
-../inc/mmf/common/mmfhelper.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmf/common/mmfhelper.h)
-../inc/mmf/common/mmcaf.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmf/common/mmcaf.h)
-../inc/mmf/common/MmfFourCC.h		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/common/mmffourcc.h)
-../inc/mmf/common/MmfPanicCodes.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/common/mmfpaniccodes.h)
-../inc/mmf/common/mmferrors.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmf/common/mmferrors.h)
-../inc/mmf/common/MmfMeta.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/common/mmfmeta.h)
-../inc/mmf/common/MmfIpc.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/common/mmfipc.h)
-../inc/mmf/common/MmfIpc.inl	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/common/mmfipc.inl)
-../inc/mmf/common/mmfipcserver.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/common/mmfipcserver.h)
-../inc/mmf/common/mmfipcserver.inl	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/common/mmfipcserver.inl)
-../inc/mmf/common/mmfbase.hrh		/epoc32/include/mmf/common/mmfbase.hrh
-
-// Shared headers for 3rd party controller & format
-../inc/mmf/server/mmfformat.h		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/server/mmfformat.h)
-../inc/mmf/server/mmfformat.inl		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/server/mmfformat.inl)
-../inc/mmf/server/Mmfclip.h			SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/server/mmfclip.h)
-../inc/mmf/server/mmfdatabuffer.h		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/server/mmfdatabuffer.h)
-../inc/mmf/server/MmfFile.h			SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/server/mmffile.h)
-../inc/mmf/server/MmfDes.h		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/server/mmfdes.h)
-../inc/mmf/server/mmfurl.h		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/server/mmfurl.h)
-../inc/mmf/server/mmfbuffer.h		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/server/mmfbuffer.h)
-../inc/mmf/server/mmfdatasink.h		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/server/mmfdatasink.h)
-../inc/mmf/server/mmfdatasource.h		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/server/mmfdatasource.h)
-../inc/mmf/server/mmfdatasourcesink.hrh	/epoc32/include/mmf/server/mmfdatasourcesink.hrh
-../inc/mmf/server/mmfbuffer.hrh		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/server/mmfbuffer.hrh)
-../inc/mmf/server/mmfdatapath.h		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/server/mmfdatapath.h)
-../inc/mmf/server/mmfdatapath2.h		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/server/mmfdatapath2.h)
-../inc/mmf/server/mmfsubthreadbase.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/server/mmfsubthreadbase.h)
-../inc/mmf/server/mmfsubthreadbaseimpl.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmf/server/mmfsubthreadbaseimpl.h)
-../inc/mmf/server/MmfAudioOutput.h		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/server/mmfaudiooutput.h)
-../inc/mmf/server/MmfAudioInput.h		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/server/mmfaudioinput.h)
-../inc/mmf/server/mmfvideoframebuffer.h		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/server/mmfvideoframebuffer.h)
-../inc/mmf/server/mmfdatapathproxy.h		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/server/mmfdatapathproxy.h)
-../inc/mmf/server/mmfdatapathproxyserver.h		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmf/server/mmfdatapathproxyserver.h)
-../inc/mmf/server/MmfCodec.h				SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/server/mmfcodec.h)
-../inc/mmf/server/mmfformatstandardcustominterfaces.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmf/server/mmfformatstandardcustominterfaces.h)
-
-../inc/mmf/ControllerFramework/mmfcontroller.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/common/mmfcontroller.h)
-../inc/mmf/ControllerFramework/mmfcontrollerextendeddata.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmf/common/mmfcontrollerextendeddata.h)
-../inc/mmf/ControllerFramework/mmfcustomcommandparsermanager.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmf/common/mmfcustomcommandparsermanager.h)
-../inc/mmf/ControllerFramework/mmfcontrollerpluginresolver.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/common/mmfcontrollerpluginresolver.h)
-../inc/mmf/ControllerFramework/taggeddataparser.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmf/common/taggeddataparser.h)
-../inc/mmf/ControllerFramework/mmfcontrollerframework.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/common/mmfcontrollerframework.h)
-../inc/mmf/ControllerFramework/mmfcontrollerframeworkclasses.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/common/mmfcontrollerframeworkclasses.h)
-../inc/mmf/ControllerFramework/mmfcontrollerframeworkbase.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/common/mmfcontrollerframeworkbase.h)
-../inc/mmf/ControllerFramework/mmfstandardcustomcommands.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/common/mmfstandardcustomcommands.h)
-../inc/mmf/ControllerFramework/mmfstandardcustomcommandsimpl.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmf/common/mmfstandardcustomcommandsimpl.h)
-../inc/mmf/ControllerFramework/mmfstandardcustomcommandsenums.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmf/common/mmfstandardcustomcommandsenums.h)
-../inc/mmf/ControllerFramework/mmfdrmcustomcommands.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmf/common/mmfdrmcustomcommands.h)
-../inc/mmf/ControllerFramework/mmfdrmcustomcommandsenum.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmf/common/mmfdrmcustomcommandsenum.h)
-../inc/mmf/ControllerFramework/mmfdurationinfocustomcommands.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/common/mmfdurationinfocustomcommands.h)
-../inc/mmf/ControllerFramework/mmfdurationinfocustomcommandsimpl.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmf/common/mmfdurationinfocustomcommandsimpl.h)
-../inc/mmf/ControllerFramework/mmfdurationinfocustomcommandsenums.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmf/common/mmfdurationinfocustomcommandsenums.h)
-../inc/mmf/mcustominterface.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmf/common/mcustominterface.h)
-../inc/mmf/mcustomcommand.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmf/common/mcustomcommand.h)
-
-// SecureDRM header
-../SecureDRM/inc/Client/MmfDrmPluginServerProxy.h		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmf/server/mmfdrmpluginserverproxy.h)
-
-#ifdef SYMBIAN_BUILD_GCE
-../inc/mmf/ControllerFramework/mmfvideosurfacecustomcommands.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmf/common/mmfvideosurfacecustomcommands.h)
-../inc/videoplayer2.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(videoplayer2.h)
-../inc/surfaceeventhandler.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(surfaceeventhandler.h)
-../inc/mediaclientvideodisplay.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mediaclientvideodisplay.h)
-../inc/mmf/PLUGIN/mmfmediaclientextdisplayinterface.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmf/plugin/mmfmediaclientextdisplayinterface.h)
-../inc/mmf/PLUGIN/mmfmediaclientextdisplayinterface.hrh SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmf/plugin/mmfmediaclientextdisplayinterface.hrh)
-#endif
-
-#ifdef SYMBIAN_MULTIMEDIA_SUBTITLE_SUPPORT 
-../inc/mmf/ControllerFramework/mmfvideosubtitlecustomcommands.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmf/common/mmfvideosubtitlecustomcommands.h)
-#endif
-
-// Plug-in ECom headers
-../inc/mmf/PLUGIN/mmfPluginInterfaceUIDs.hrh		/epoc32/include/mmf/plugin/mmfplugininterfaceuids.hrh
-../inc/mmf/PLUGIN/mmfCodecImplementationUIDs.hrh 	/epoc32/include/mmf/plugin/mmfcodecimplementationuids.hrh
-../inc/mmf/PLUGIN/mmfFormatImplementationUIDs.hrh	/epoc32/include/mmf/plugin/mmfformatimplementationuids.hrh
-../inc/mmf/PLUGIN/mmfControllerImplementationUIDs.hrh	/epoc32/include/mmf/plugin/mmfcontrollerimplementationuids.hrh
-../inc/mmf/PLUGIN/mmfAudioIOInterfaceUIDs.hrh		/epoc32/include/mmf/plugin/mmfaudioiointerfaceuids.hrh
-//Plug-in ECom headers located in same location as 7.0s
-//these headers were incorrectly located in 7.0s but to prevent build problems they are also
-//copied to the 7.0s location.  Future releases cannot be guaranteed to use epoc32/include
-//for these files - it is recommended to use "\epoc32\include\mmf\plugin\"
-../inc/mmf/PLUGIN/mmfPluginInterfaceUIDs.hrh /epoc32/include/mmfplugininterfaceuids.hrh
-../inc/mmf/PLUGIN/mmfFormatImplementationUIDs.hrh /epoc32/include/mmfformatimplementationuids.hrh
-../inc/mmf/PLUGIN/mmfControllerImplementationUIDs.hrh /epoc32/include/mmfcontrollerimplementationuids.hrh
-../inc/mmf/PLUGIN/mmfAudioIOInterfaceUIDs.hrh /epoc32/include/mmfaudioiointerfaceuids.hrh
-
-//
-// export enough of the original MDA headers to support include of MdaImageConverter.h and MMF (no more)
-
-// Client low level API headers
-../inc/Mda/Client/Base.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mda/client/base.h)
-../inc/Mda/Client/Controller.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mda/client/controller.h)
-../inc/Mda/Client/Port.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mda/client/port.h)
-../inc/Mda/Client/Resource.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mda/client/resource.h)
-../inc/Mda/Client/Utility.h			SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mda/client/utility.h)
-../inc/Mda/Client/Video.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mda/client/video.h)
-../inc/Mda/Client/Video.inl			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mda/client/video.inl)
-
-// Shared client/server headers
-../inc/Mda/Common/Base.h			SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mda/common/base.h)
-../inc/Mda/Common/Base.inl			SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mda/common/base.inl)
-../inc/Mda/Common/Base.hrh			SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mda/common/base.hrh)
-../inc/Mda/Common/Controller.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mda/common/controller.h)
-../inc/Mda/Common/Port.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mda/common/port.h)
-../inc/Mda/Common/Port.hrh			/epoc32/include/mda/common/port.hrh
-../inc/Mda/Common/Resource.h			SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mda/common/resource.h)
-../inc/Mda/Common/Resource.hrh			/epoc32/include/mda/common/resource.hrh
-../inc/Mda/Common/Video.h			SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mda/common/video.h)
-../inc/Mda/Common/Video.hrh			/epoc32/include/mda/common/video.hrh
-../inc/Mda/Common/Video.inl			SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mda/common/video.inl)
-../inc/Mda/Common/Audio.h			SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mda/common/audio.h)
-../inc/Mda/Common/Audio.hrh			/epoc32/include/mda/common/audio.hrh
-../inc/Mda/Common/AudioStream.hrh		/epoc32/include/mda/common/audiostream.hrh
-../inc/Mda/Common/GsmAudio.h			SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mda/common/gsmaudio.h)
-../inc/Mda/Common/mdagsmwavcodec.h		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mda/common/mdagsmwavcodec.h)
-../inc/Mda/Common/GsmAudio.hrh			/epoc32/include/mda/common/gsmaudio.hrh
-
-// end of old media server exports
-
-
-// Headers for reference components, will be added later
-// Headers for reference components
-
-// Documentation, will be added later
-
-// Romkit include files 
-../inc/mmf.iby       /epoc32/rom/include/mmf.iby  
-../SecureDRM/inc/MmfDrmPlugin.iby	/epoc32/rom/include/mmfdrmplugin.iby
-
-PRJ_MMPFILES
-
-// server base classes
-../MMPFiles/server/mmfserverbaseclasses.mmp
-
-// Secure DRM server proxy in which MmfControllerFramework depends on
-../SecureDRM/MMPFiles/Client/MmfDrmPluginServerProxy.mmp
-
-//Controller Framework
-../MMPFiles/ControllerFramework/MmfControllerFramework.mmp
-../MMPFiles/ControllerFramework/MmfStandardCustomCommands.mmp
-
-//utils
-../MMPFiles/utils/audioutils.mmp
-
-// Secure DRM server which depends on MmfControllerFramework
-../SecureDRM/MMPFiles/Server/MmfDrmPluginServer.mmp
-
-// Add codecs common code on which the codec plugins depend
-#include "../Codecs/Group/bld_include.inf"
-
-
-// Add ../Midi build instructions - NOTE - Must be inserted here in MMP list
-#include "../MIDI/group/bld_include.inf"
-
-PRJ_MMPFILES
-
-// Client shared dlls
-../MMPFiles/client/MediaClient.mmp
-../MMPFiles/client/MediaClientUtility.mmp
-../MMPFiles/client/MediaClientAudio.mmp
-../MMPFiles/client/MediaClientAudioStream.mmp
-../MMPFiles/client/MediaClientAudioInputStream.mmp
-#ifdef SYMBIAN_BUILD_GCE
-../MMPFiles/client/mediaclientvideodisplay.mmp
-#endif
-../MMPFiles/client/MediaClientVideo.mmp
-
-//plugin
-../MMPFiles/plugin_common/MmfStdSourceAndSinkPlugin.mmp
-../MMPFiles/plugin_common/MmfAudioController.mmp //replaces wav controller
-../MMPFiles/plugin_common/MMFLinearAudioCodecs.mmp
-../MMPFiles/plugin_common/Gsm610.mmp
-../MMPFiles/plugin_common/mmfaudiooutput.mmp 
-../MMPFiles/plugin_common/mmfaudioinput.mmp
-../MMPFiles/plugin_common/MMFFormatBaseClasses.mmp
-
-#ifdef SYMBIAN_USE_MMF_RUF_RECOGNIZER
-../Recogniser/mmpfiles/mmruf.mmp
-#else
-// Now build the MMF recogniser
-../MMPFiles/Recognizer/RecMmf.mmp
-#endif
-
-// Effects
-#include "../Effect/group/Effect.inf"
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mmlibs/mmfw/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -0,0 +1,236 @@
+// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// Multimedia framework
+// 
+//
+
+/**
+@file
+*/
+
+#ifdef SYMBIAN_VARIABLE_BITRATE_CODEC // use system wide flag to trigger model controller build
+#define SYMBIAN_MMF_MODEL_CONTROLLERS
+#endif
+
+
+PRJ_PLATFORMS
+// specify the platforms your component needs to be built for here
+// may add platform for OMAP, Helen etc
+DEFAULT
+
+PRJ_EXPORTS
+// Client utility Class API headers
+../inc/MdaAudioSamplePlayer.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mdaaudiosampleplayer.h)
+../inc/MdaAudioSampleEditor.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mdaaudiosampleeditor.h)
+../inc/MdaAudioTonePlayer.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mdaaudiotoneplayer.h)
+../inc/MdaAudioOutputStream.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mdaaudiooutputstream.h)
+../inc/MdaAudioInputStream.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mdaaudioinputstream.h)
+../inc/VideoPlayer.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(videoplayer.h)
+../inc/VideoRecorder.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(videorecorder.h)
+../inc/MmfClntUtility.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmfclntutility.h)
+
+// Shared client/server headers
+../inc/mmf/common/MmfBase.h		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/common/mmfbase.h)
+../inc/mmf/common/MmfAudio.h		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/common/mmfaudio.h)
+../inc/mmf/common/MmfVideo.h		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/common/mmfvideo.h)
+../inc/mmf/common/mmfvideoenums.h		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmf/common/mmfvideoenums.h)
+../inc/mmf/common/MmfUtilities.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/common/mmfutilities.h)
+../inc/mmf/common/MmfUtilities.inl	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/common/mmfutilities.inl)
+../inc/mmf/common/mmfhelper.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmf/common/mmfhelper.h)
+../inc/mmf/common/mmcaf.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmf/common/mmcaf.h)
+../inc/mmf/common/MmfFourCC.h		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/common/mmffourcc.h)
+../inc/mmf/common/MmfPanicCodes.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/common/mmfpaniccodes.h)
+../inc/mmf/common/mmferrors.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmf/common/mmferrors.h)
+../inc/mmf/common/MmfMeta.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/common/mmfmeta.h)
+../inc/mmf/common/MmfIpc.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/common/mmfipc.h)
+../inc/mmf/common/MmfIpc.inl	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/common/mmfipc.inl)
+../inc/mmf/common/mmfipcserver.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/common/mmfipcserver.h)
+../inc/mmf/common/mmfipcserver.inl	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/common/mmfipcserver.inl)
+../inc/mmf/common/mmfbase.hrh		/epoc32/include/mmf/common/mmfbase.hrh
+
+// Shared headers for 3rd party controller & format
+../inc/mmf/server/mmfformat.h		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/server/mmfformat.h)
+../inc/mmf/server/mmfformat.inl		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/server/mmfformat.inl)
+../inc/mmf/server/Mmfclip.h			SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/server/mmfclip.h)
+../inc/mmf/server/mmfdatabuffer.h		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/server/mmfdatabuffer.h)
+../inc/mmf/server/MmfFile.h			SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/server/mmffile.h)
+../inc/mmf/server/MmfDes.h		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/server/mmfdes.h)
+../inc/mmf/server/mmfurl.h		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/server/mmfurl.h)
+../inc/mmf/server/mmfbuffer.h		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/server/mmfbuffer.h)
+../inc/mmf/server/mmfdatasink.h		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/server/mmfdatasink.h)
+../inc/mmf/server/mmfdatasource.h		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/server/mmfdatasource.h)
+../inc/mmf/server/mmfdatasourcesink.hrh	/epoc32/include/mmf/server/mmfdatasourcesink.hrh
+../inc/mmf/server/mmfbuffer.hrh		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/server/mmfbuffer.hrh)
+../inc/mmf/server/mmfdatapath.h		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/server/mmfdatapath.h)
+../inc/mmf/server/mmfdatapath2.h		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/server/mmfdatapath2.h)
+../inc/mmf/server/mmfsubthreadbase.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/server/mmfsubthreadbase.h)
+../inc/mmf/server/mmfsubthreadbaseimpl.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmf/server/mmfsubthreadbaseimpl.h)
+../inc/mmf/server/MmfAudioOutput.h		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/server/mmfaudiooutput.h)
+../inc/mmf/server/MmfAudioInput.h		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/server/mmfaudioinput.h)
+../inc/mmf/server/mmfvideoframebuffer.h		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/server/mmfvideoframebuffer.h)
+../inc/mmf/server/mmfdatapathproxy.h		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/server/mmfdatapathproxy.h)
+../inc/mmf/server/mmfdatapathproxyserver.h		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmf/server/mmfdatapathproxyserver.h)
+../inc/mmf/server/MmfCodec.h				SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/server/mmfcodec.h)
+../inc/mmf/server/mmfformatstandardcustominterfaces.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmf/server/mmfformatstandardcustominterfaces.h)
+
+../inc/mmf/ControllerFramework/mmfcontroller.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/common/mmfcontroller.h)
+../inc/mmf/ControllerFramework/mmfcontrollerextendeddata.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmf/common/mmfcontrollerextendeddata.h)
+../inc/mmf/ControllerFramework/mmfcustomcommandparsermanager.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmf/common/mmfcustomcommandparsermanager.h)
+../inc/mmf/ControllerFramework/mmfcontrollerpluginresolver.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/common/mmfcontrollerpluginresolver.h)
+../inc/mmf/ControllerFramework/taggeddataparser.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmf/common/taggeddataparser.h)
+../inc/mmf/ControllerFramework/mmfcontrollerframework.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/common/mmfcontrollerframework.h)
+../inc/mmf/ControllerFramework/mmfcontrollerframeworkclasses.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/common/mmfcontrollerframeworkclasses.h)
+../inc/mmf/ControllerFramework/mmfcontrollerframeworkbase.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/common/mmfcontrollerframeworkbase.h)
+../inc/mmf/ControllerFramework/mmfstandardcustomcommands.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/common/mmfstandardcustomcommands.h)
+../inc/mmf/ControllerFramework/mmfstandardcustomcommandsimpl.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmf/common/mmfstandardcustomcommandsimpl.h)
+../inc/mmf/ControllerFramework/mmfstandardcustomcommandsenums.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmf/common/mmfstandardcustomcommandsenums.h)
+../inc/mmf/ControllerFramework/mmfdrmcustomcommands.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmf/common/mmfdrmcustomcommands.h)
+../inc/mmf/ControllerFramework/mmfdrmcustomcommandsenum.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmf/common/mmfdrmcustomcommandsenum.h)
+../inc/mmf/ControllerFramework/mmfdurationinfocustomcommands.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mmf/common/mmfdurationinfocustomcommands.h)
+../inc/mmf/ControllerFramework/mmfdurationinfocustomcommandsimpl.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmf/common/mmfdurationinfocustomcommandsimpl.h)
+../inc/mmf/ControllerFramework/mmfdurationinfocustomcommandsenums.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmf/common/mmfdurationinfocustomcommandsenums.h)
+../inc/mmf/mcustominterface.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmf/common/mcustominterface.h)
+../inc/mmf/mcustomcommand.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmf/common/mcustomcommand.h)
+
+// SecureDRM header
+../SecureDRM/inc/Client/MmfDrmPluginServerProxy.h		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmf/server/mmfdrmpluginserverproxy.h)
+
+#ifdef SYMBIAN_BUILD_GCE
+../inc/mmf/ControllerFramework/mmfvideosurfacecustomcommands.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmf/common/mmfvideosurfacecustomcommands.h)
+../inc/videoplayer2.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(videoplayer2.h)
+../inc/surfaceeventhandler.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(surfaceeventhandler.h)
+../inc/mediaclientvideodisplay.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mediaclientvideodisplay.h)
+../inc/mmf/PLUGIN/mmfmediaclientextdisplayinterface.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmf/plugin/mmfmediaclientextdisplayinterface.h)
+../inc/mmf/PLUGIN/mmfmediaclientextdisplayinterface.hrh SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmf/plugin/mmfmediaclientextdisplayinterface.hrh)
+#endif
+
+#ifdef SYMBIAN_MULTIMEDIA_SUBTITLE_SUPPORT 
+../inc/mmf/ControllerFramework/mmfvideosubtitlecustomcommands.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmf/common/mmfvideosubtitlecustomcommands.h)
+#endif
+
+// Plug-in ECom headers
+../inc/mmf/PLUGIN/mmfPluginInterfaceUIDs.hrh		/epoc32/include/mmf/plugin/mmfplugininterfaceuids.hrh
+../inc/mmf/PLUGIN/mmfCodecImplementationUIDs.hrh 	/epoc32/include/mmf/plugin/mmfcodecimplementationuids.hrh
+../inc/mmf/PLUGIN/mmfFormatImplementationUIDs.hrh	/epoc32/include/mmf/plugin/mmfformatimplementationuids.hrh
+../inc/mmf/PLUGIN/mmfControllerImplementationUIDs.hrh	/epoc32/include/mmf/plugin/mmfcontrollerimplementationuids.hrh
+../inc/mmf/PLUGIN/mmfAudioIOInterfaceUIDs.hrh		/epoc32/include/mmf/plugin/mmfaudioiointerfaceuids.hrh
+//Plug-in ECom headers located in same location as 7.0s
+//these headers were incorrectly located in 7.0s but to prevent build problems they are also
+//copied to the 7.0s location.  Future releases cannot be guaranteed to use epoc32/include
+//for these files - it is recommended to use "\epoc32\include\mmf\plugin\"
+../inc/mmf/PLUGIN/mmfPluginInterfaceUIDs.hrh /epoc32/include/mmfplugininterfaceuids.hrh
+../inc/mmf/PLUGIN/mmfFormatImplementationUIDs.hrh /epoc32/include/mmfformatimplementationuids.hrh
+../inc/mmf/PLUGIN/mmfControllerImplementationUIDs.hrh /epoc32/include/mmfcontrollerimplementationuids.hrh
+../inc/mmf/PLUGIN/mmfAudioIOInterfaceUIDs.hrh /epoc32/include/mmfaudioiointerfaceuids.hrh
+
+//
+// export enough of the original MDA headers to support include of MdaImageConverter.h and MMF (no more)
+
+// Client low level API headers
+../inc/Mda/Client/Base.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mda/client/base.h)
+../inc/Mda/Client/Controller.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mda/client/controller.h)
+../inc/Mda/Client/Port.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mda/client/port.h)
+../inc/Mda/Client/Resource.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mda/client/resource.h)
+../inc/Mda/Client/Utility.h			SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mda/client/utility.h)
+../inc/Mda/Client/Video.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mda/client/video.h)
+../inc/Mda/Client/Video.inl			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mda/client/video.inl)
+
+// Shared client/server headers
+../inc/Mda/Common/Base.h			SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mda/common/base.h)
+../inc/Mda/Common/Base.inl			SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mda/common/base.inl)
+../inc/Mda/Common/Base.hrh			SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mda/common/base.hrh)
+../inc/Mda/Common/Controller.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mda/common/controller.h)
+../inc/Mda/Common/Port.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mda/common/port.h)
+../inc/Mda/Common/Port.hrh			/epoc32/include/mda/common/port.hrh
+../inc/Mda/Common/Resource.h			SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mda/common/resource.h)
+../inc/Mda/Common/Resource.hrh			/epoc32/include/mda/common/resource.hrh
+../inc/Mda/Common/Video.h			SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mda/common/video.h)
+../inc/Mda/Common/Video.hrh			/epoc32/include/mda/common/video.hrh
+../inc/Mda/Common/Video.inl			SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mda/common/video.inl)
+../inc/Mda/Common/Audio.h			SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mda/common/audio.h)
+../inc/Mda/Common/Audio.hrh			/epoc32/include/mda/common/audio.hrh
+../inc/Mda/Common/AudioStream.hrh		/epoc32/include/mda/common/audiostream.hrh
+../inc/Mda/Common/GsmAudio.h			SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mda/common/gsmaudio.h)
+../inc/Mda/Common/mdagsmwavcodec.h		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mda/common/mdagsmwavcodec.h)
+../inc/Mda/Common/GsmAudio.hrh			/epoc32/include/mda/common/gsmaudio.hrh
+
+// end of old media server exports
+
+
+// Headers for reference components, will be added later
+// Headers for reference components
+
+// Documentation, will be added later
+
+// Romkit include files 
+../inc/mmf.iby       /epoc32/rom/include/mmf.iby  
+../SecureDRM/inc/MmfDrmPlugin.iby	/epoc32/rom/include/mmfdrmplugin.iby
+
+PRJ_MMPFILES
+
+// server base classes
+../MMPFiles/server/mmfserverbaseclasses.mmp
+
+// Secure DRM server proxy in which MmfControllerFramework depends on
+../SecureDRM/MMPFiles/Client/MmfDrmPluginServerProxy.mmp
+
+//Controller Framework
+../MMPFiles/ControllerFramework/MmfControllerFramework.mmp
+../MMPFiles/ControllerFramework/MmfStandardCustomCommands.mmp
+
+//utils
+../MMPFiles/utils/audioutils.mmp
+
+// Secure DRM server which depends on MmfControllerFramework
+../SecureDRM/MMPFiles/Server/MmfDrmPluginServer.mmp
+
+// Add codecs common code on which the codec plugins depend
+#include "../Codecs/Group/bld_include.inf"
+
+
+// Add ../Midi build instructions - NOTE - Must be inserted here in MMP list
+#include "../MIDI/group/bld_include.inf"
+
+PRJ_MMPFILES
+
+// Client shared dlls
+../MMPFiles/client/MediaClient.mmp
+../MMPFiles/client/MediaClientUtility.mmp
+../MMPFiles/client/MediaClientAudio.mmp
+../MMPFiles/client/MediaClientAudioStream.mmp
+../MMPFiles/client/MediaClientAudioInputStream.mmp
+#ifdef SYMBIAN_BUILD_GCE
+../MMPFiles/client/mediaclientvideodisplay.mmp
+#endif
+../MMPFiles/client/MediaClientVideo.mmp
+
+//plugin
+../MMPFiles/plugin_common/MmfStdSourceAndSinkPlugin.mmp
+../MMPFiles/plugin_common/MmfAudioController.mmp //replaces wav controller
+../MMPFiles/plugin_common/MMFLinearAudioCodecs.mmp
+../MMPFiles/plugin_common/Gsm610.mmp
+../MMPFiles/plugin_common/mmfaudiooutput.mmp 
+../MMPFiles/plugin_common/mmfaudioinput.mmp
+../MMPFiles/plugin_common/MMFFormatBaseClasses.mmp
+
+#ifdef SYMBIAN_USE_MMF_RUF_RECOGNIZER
+../Recogniser/mmpfiles/mmruf.mmp
+#else
+// Now build the MMF recogniser
+../MMPFiles/Recognizer/RecMmf.mmp
+#endif
+
+// Effects
+#include "../Effect/group/Effect.inf"
+
--- a/mmlibs/mmfw/inc/mmf/PLUGIN/mmfmediaclientextdisplayinterface.h	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmlibs/mmfw/inc/mmf/PLUGIN/mmfmediaclientextdisplayinterface.h	Fri Jul 09 12:23:13 2010 +0100
@@ -23,7 +23,19 @@
 
 #include <e32base.h>
 
-#define MMF_MEDIA_CLIENT_EXT_DISPLAY_INTERFACE_V2
+#define MMF_MEDIA_CLIENT_EXT_DISPLAY_INTERFACE_V3
+
+/**
+
+Enumeration used to indicate external display current connection status
+
+**/
+enum TExtDisplayConnectionProviderConnType
+    {
+    EExtDisplayConnectionProviderConnTypeDisconnected,
+    EExtDisplayConnectionProviderConnTypeHdmi,
+    EExtDisplayConnectionProviderConnTypeAnalog
+    };
 
 /**
 
@@ -33,7 +45,7 @@
 class MExtDisplayConnectionProviderCallback
     {
 public:
-    virtual void MedcpcExtDisplayNotifyConnected(TBool aExtDisplayConnected) = 0;
+    virtual void MedcpcExtDisplayNotifyConnected(TExtDisplayConnectionProviderConnType aExtDisplayConnType) = 0;
     };
 
 /**
@@ -63,15 +75,14 @@
         A reference to an object that can be used by the provider to send events back to the client.
     */
     virtual void SetExtDisplayConnectionProviderCallback(MExtDisplayConnectionProviderCallback& aCallback) = 0;
-	    
+
     /**
-    Function to be implemented by connection provider that indicates whether an external display is
-    connected.
+    Function to be implemented by connection provider that indicates the external display connection type 
     
-    @return ETrue if external display is connected otherwise EFalse.
+    @return One of values defined in TExtDisplayConnectionProviderConnType
     */
-	virtual TBool ExtDisplayConnected() = 0;
-
+    virtual TExtDisplayConnectionProviderConnType ExtDisplayConnType() = 0;
+	
     /**
     Function to be implemented by connection provider that indicates the display id that should
     be used for the external display port.
--- a/mmlibs/mmfw/src/Client/Video/mediaclientextdisplayhandler.cpp	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmlibs/mmfw/src/Client/Video/mediaclientextdisplayhandler.cpp	Fri Jul 09 12:23:13 2010 +0100
@@ -96,3 +96,10 @@
     DEBUG_PRINTF("CMediaClientExtDisplayHandler::DisplaySizeInPixels ---");
     return iScreen->SizeInPixels();
     }
+
+void CMediaClientExtDisplayHandler::UpdateWindow()
+    {
+    DEBUG_PRINTF("CMediaClientExtDisplayHandler::UpdateWindow +++");
+    iExternalDisplayWindow.SetExtent(TPoint(0,0), iScreen->SizeInPixels());
+    DEBUG_PRINTF("CMediaClientExtDisplayHandler::UpdateWindow ---");
+    }
--- a/mmlibs/mmfw/src/Client/Video/mediaclientextdisplayhandler.h	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmlibs/mmfw/src/Client/Video/mediaclientextdisplayhandler.h	Fri Jul 09 12:23:13 2010 +0100
@@ -31,6 +31,7 @@
     
     RWindowBase* Window();
     TSize DisplaySizeInPixels();
+    void UpdateWindow();
     
     ~CMediaClientExtDisplayHandler();
 
--- a/mmlibs/mmfw/src/Plugin/Codec/audio/MMFImaAdPcmToPcm16Codec.h	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmlibs/mmfw/src/Plugin/Codec/audio/MMFImaAdPcmToPcm16Codec.h	Fri Jul 09 12:23:13 2010 +0100
@@ -22,6 +22,7 @@
 #include <mmf/server/devsoundstandardcustominterfaces.h>
 
 const TUint KMaxImaAdpcmBlockAlign = 2048;
+const TUint KImaAdpcmBitsPerSample = 4;
 
 //mono so iImaAdpcmTo16Pcm constructed with 1 (mono)
 class CMMFImaAdPcmPcm16Codec : public CMMFCodec, public MMMFDevSoundCustomInterfaceFileBlockLength
--- a/mmlibs/mmfw/src/Plugin/Codec/audio/MmfimaadpcmTopcm16codec.cpp	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmlibs/mmfw/src/Plugin/Codec/audio/MmfimaadpcmTopcm16codec.cpp	Fri Jul 09 12:23:13 2010 +0100
@@ -233,7 +233,7 @@
 			User::Leave(KErrArgument);
 		}
 	
-	const TUint KImaAdpcmBitsPerSample = 4;
+	
 	// SamplesPerBlock = [(BlockAlign - 4 * Channels) * 8] / (BitsPerSample * Channels) + 1
 	iSamplesPerBlock = (iBlockAlign - 4 * iChannels) * 8 / (KImaAdpcmBitsPerSample * iChannels) + 1;
 	}
@@ -252,7 +252,9 @@
 	}
 
 void CMMFImaAdPcmPcm16Codec::SetFileBlockLength(TUint aBlockAlign)
-	{
-	iBlockAlign = aBlockAlign;		
+	{	
+    iBlockAlign = aBlockAlign;		
+  	iSamplesPerBlock = (iBlockAlign - 4 * iChannels) * 8 / (KImaAdpcmBitsPerSample * iChannels) + 1;
+  		    
 	}
 
--- a/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/video/play/group/bld.inf	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/video/play/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -22,4 +22,6 @@
 ../scripts/char_mmf_videoplay.script	c:/char/mmf/char_mmf_videoplay.script
 ../scripts/char_mmf_videoplay_notification.script	c:/char/mmf/char_mmf_videoplay_notification.script
 ../scripts/char_mmf_videoplay.ini	c:/char/mmf/char_mmf_videoplay.ini
+
 ../group/char_mmf_videoplay.iby		/epoc32/rom/include/char_mmf_videoplay.iby
+../group/char_mmf_videoplay_excl_test.iby		/epoc32/rom/include/char_mmf_videoplay_excl_test.iby
--- a/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/video/play/group/char_mmf_videoplay.iby	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/video/play/group/char_mmf_videoplay.iby	Fri Jul 09 12:23:13 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -16,8 +16,7 @@
 #ifndef CHAR_MMF_VIDEOPLAY_IBY
 #define CHAR_MMF_VIDEOPLAY_IBY
 
-// debug build
-file=ABI_DIR\DEBUG_DIR\char_mmf_videoplay.dll 	System\Libs\char_mmf_videoplay.dll
+#include <char_mmf_videoplay_excl_test.iby>
 
 // ini
 data=EPOCROOT##epoc32\data\c\char\mmf\char_mmf_videoplay.ini             \char\mmf\char_mmf_videoplay.ini
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/TestConverter.cpp	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/TestConverter.cpp	Fri Jul 09 12:23:13 2010 +0100
@@ -1653,9 +1653,8 @@
 	INFO_PRINTF1( _L("TestConverter : Config"));
 	TVerdict ret = EFail;
 
-	TPtrC fromFilename, fromFilename2;
-	if ((!GetStringFromConfig(_L("SectionOne"), _L("cropAudioFile"), fromFilename))
-		|| (!GetStringFromConfig(_L("SectionOne"), _L("PCM16"), fromFilename2))
+	TPtrC fromFilename;
+	if ((!GetStringFromConfig(_L("SectionOne"), _L("PCM16"), fromFilename))
 		|| (!GetStringFromConfig(_L("SectionFour"), _L("configAudio"), iToFilename))
 		|| (!GetStringFromConfig(_L("SectionFour"), _L("configAudio11"), iToFilename2)))
 		return EInconclusive;
@@ -1671,7 +1670,7 @@
 		iAudioSettings.iSampleRate = KInvalidNumber;
 		iAudioSettings.iChannels = KInvalidNumber;
 		//to keep CCover happy
-		converter->OpenL(fromFilename2, iToFilename2) ;
+		converter->OpenL(fromFilename, iToFilename2) ;
 			//&location, iFormat, iCodec, &iAudioSettings);
 		}
 	else
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/SDevSound/group/BLD.INF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-PRJ_TESTMMPFILES
-
-// Secure DEVSOUND
-../mmpfiles/TSI_MMF_SDEVSOUND.mmp
-
-PRJ_TESTEXPORTS
-// Secure DevSound scripts
-../scriptFiles/TSI_MMF_SDEVSOUND_01.script	c:/tsi_mmf_sdevsound_01.script
-../scriptFiles/TSI_MMF_SDEVSOUND_01_Panic.script	c:/tsi_mmf_sdevsound_01_panic.script
-../scriptFiles/TSI_MMF_SDEVSOUND_NOCAP.script	c:/tsi_mmf_sdevsound_nocap.script
-../scriptFiles/TSI_MMF_SDEVSOUND_MMDDCAP.script	c:/tsi_mmf_sdevsound_mmddcap.script
-../scriptFiles/TSI_MMF_SDEVSOUND_UECAP.script	c:/tsi_mmf_sdevsound_uecap.script
-../scriptFiles/TSI_MMF_SDEVSOUND_01_PREEMPTION.script	c:/tsi_mmf_sdevsound_01_preemption.script
-
-// Secure DEVSOUND data files
-../data/PCM_08_16_m.raw			c:/sdevsoundinttestdata/pcm_08_16_m.raw
-../data/8bitmPcm.wav			c:/sdevsoundinttestdata/8bitmpcm.wav
-../data/mainTst.wav			c:/sdevsoundinttestdata/maintst.wav
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/SDevSound/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -0,0 +1,33 @@
+// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRJ_TESTMMPFILES
+
+// Secure DEVSOUND
+../mmpfiles/TSI_MMF_SDEVSOUND.mmp
+
+PRJ_TESTEXPORTS
+// Secure DevSound scripts
+../scriptFiles/TSI_MMF_SDEVSOUND_01.script	c:/tsi_mmf_sdevsound_01.script
+../scriptFiles/TSI_MMF_SDEVSOUND_01_Panic.script	c:/tsi_mmf_sdevsound_01_panic.script
+../scriptFiles/TSI_MMF_SDEVSOUND_NOCAP.script	c:/tsi_mmf_sdevsound_nocap.script
+../scriptFiles/TSI_MMF_SDEVSOUND_MMDDCAP.script	c:/tsi_mmf_sdevsound_mmddcap.script
+../scriptFiles/TSI_MMF_SDEVSOUND_UECAP.script	c:/tsi_mmf_sdevsound_uecap.script
+../scriptFiles/TSI_MMF_SDEVSOUND_01_PREEMPTION.script	c:/tsi_mmf_sdevsound_01_preemption.script
+
+// Secure DEVSOUND data files
+../data/PCM_08_16_m.raw			c:/sdevsoundinttestdata/pcm_08_16_m.raw
+../data/8bitmPcm.wav			c:/sdevsoundinttestdata/8bitmpcm.wav
+../data/mainTst.wav			c:/sdevsoundinttestdata/maintst.wav
\ No newline at end of file
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/SecureDRM/data/videocontent2.xml	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<DRMFiles>
-	<content cid="RTADRMVideo001">
-		<filename>
-		c:\securedrm\xvidonly.avi
-		</filename>
-		<name>
-		audvid
-		</name>
-		<uniqueid>
-		audvidId
-		</uniqueid>
-		<stringattribute name="mimetype">
-		video/x-msvideo
-		</stringattribute>
-	</content>
-</DRMFiles>
-
-
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/SecureDRM/data/videorights2.xml	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?> 
-<drmrights>
-	<rights cid="RTADRMVideo001">
-		<Intent type="play">
-			<count>
-			1000
-			</count>
-			<expiry>
-				<day>
-				1
-				</day>
-				<month>
-				1
-				</month>
-				<year>
-				2999
-				</year>
-			</expiry>				
-		</Intent>
-	</rights>
-</drmrights>
-
Binary file mmlibs/mmfw/tsrc/mmfintegrationtest/SecureDRM/data/xvidonly.avi has changed
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/bwins/TSI_MMFACLNTU.DEF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-EXPORTS
-	?NewTestSuiteL@@YAPAVCTestSuite@@XZ @ 1 NONAME ; class CTestSuite * __cdecl NewTestSuiteL(void)
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/bwins/TSI_MMFCTLFRMU.DEF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?NewTestSuiteL@@YAPAVCTestSuite@@XZ @ 1 NONAME ; class CTestSuite * __cdecl NewTestSuiteL(void)
-
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/bwins/TSI_MMFCUSTOMCOMMANDSU.DEF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-EXPORTS
-	?GetAudioQuality@RTSIMmfCustomCommands@@QAEHAAVTDes8@@@Z @ 1 NONAME ; public: int __thiscall RTSIMmfCustomCommands::GetAudioQuality(class TDes8 &)
-	?HandleRequest@CTSIMmfCustomCommandParser@@UAEXAAVTMMFMessage@@@Z @ 2 NONAME ; public: virtual void __thiscall CTSIMmfCustomCommandParser::HandleRequest(class TMMFMessage &)
-	?NewL@CTSIMmfCustomCommandParser@@SAPAV1@VTUid@@@Z @ 3 NONAME ; public: static class CTSIMmfCustomCommandParser * __cdecl CTSIMmfCustomCommandParser::NewL(class TUid)
-	?NewL@RTSIMmfCustomCommands@@SAPAV1@AAVRMMFController@@VTUid@@@Z @ 4 NONAME ; public: static class RTSIMmfCustomCommands * __cdecl RTSIMmfCustomCommands::NewL(class RMMFController &,class TUid)
-	?NewLC@CTSIMmfCustomCommandParser@@SAPAV1@VTUid@@@Z @ 5 NONAME ; public: static class CTSIMmfCustomCommandParser * __cdecl CTSIMmfCustomCommandParser::NewLC(class TUid)
-	?NewLC@RTSIMmfCustomCommands@@SAPAV1@AAVRMMFController@@VTUid@@@Z @ 6 NONAME ; public: static class RTSIMmfCustomCommands * __cdecl RTSIMmfCustomCommands::NewLC(class RMMFController &,class TUid)
-	?SetAudioQuality@RTSIMmfCustomCommands@@QAEHABVTDesC8@@@Z @ 7 NONAME ; public: int __thiscall RTSIMmfCustomCommands::SetAudioQuality(class TDesC8 const &)
-
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/bwins/TSI_MMFVCLNTU.DEF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?NewTestSuiteL@@YAPAVCTestSuite@@XZ @ 1 NONAME ; class CTestSuite * __cdecl NewTestSuiteL(void)
-
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/devsound/group/bld.inf	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/devsound/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -16,12 +16,12 @@
 PRJ_PLATFORMS
 DEFAULT
 
-PRJ_MMPFILES
+PRJ_TESTMMPFILES
 
 // DEVSOUND
 ../mmpfiles/tsi_mmf_devsound.mmp
 
-PRJ_EXPORTS
+PRJ_TESTEXPORTS
 
 // test scripts
 ../scripts/tsi_mmf_devsound_debug.script    c:/mm/tsi_mmf_devsound_debug.script
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/devvideo/group/bld.inf	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/devvideo/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -16,12 +16,12 @@
 PRJ_PLATFORMS
 DEFAULT
 
-PRJ_MMPFILES
+PRJ_TESTMMPFILES
 
 // DEVVIDEO
 ../mmpfiles/tsi_mmf_devvideo.mmp
 
-PRJ_EXPORTS
+PRJ_TESTEXPORTS
 
 // test scripts
 ../scripts/tsi_mmf_devvideo_00.script        c:/mm/tsi_mmf_devvideo_00.script
@@ -40,3 +40,4 @@
 
 // iby files
 ../group/tsi_mmf_devvideo.iby       /epoc32/rom/include/tsi_mmf_devvideo.iby
+../group/tsi_mmf_devvideo_excl_test.iby       /epoc32/rom/include/tsi_mmf_devvideo_excl_test.iby
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/devvideo/group/tsi_mmf_devvideo.iby	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/devvideo/group/tsi_mmf_devvideo.iby	Fri Jul 09 12:23:13 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -16,16 +16,14 @@
 #ifndef TSI_MMF_DEVVIDEO_IBY
 #define TSI_MMF_DEVVIDEO_IBY
 
-#include <testframework.iby>
-
-file=ABI_DIR\DEBUG_DIR\tsi_mmf_devvideo.dll             System\Libs\tsi_mmf_devvideo.dll
+#include <tsi_mmf_devvideo_excl_test.iby>
 
 // DevVideo script files
 data=epocroot##epoc32\data\c\mm\tsi_mmf_devvideo_00.script          \tsi_mmf_devvideo_00.script
 data=epocroot##epoc32\data\c\mm\tsi_mmf_devvideo_01.script          \tsi_mmf_devvideo_01.script
 data=epocroot##epoc32\data\c\mm\tsi_mmf_devvideo_02.script          \tsi_mmf_devvideo_02.script
 data=epocroot##epoc32\data\c\mm\tsi_mmf_devvideo_alloc.script       \tsi_mmf_devvideo_alloc.script
-data=epocroot##epoc32\data\c\mm\tsi_mmf_devvideo.ini                \tsi_mmf_devvideo.ini
+data=epocroot##epoc32\data\c\mm\tsi_mmf_devvideo.ini                \mm\tsi_mmf_devvideo.ini
 
 // DevVideo data files
 data=EPOCROOT##epoc32\data\c\tsi_mmf_devvideo\xvid_decframe.mp4v    \tsi_mmf_devvideo\xvid_decframe.mp4v
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/devvideo/mmpfiles/tsi_mmf_devvideo.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/devvideo/mmpfiles/tsi_mmf_devvideo.mmp	Fri Jul 09 12:23:13 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -33,7 +33,7 @@
 SOURCE          tsi_mmf_devvideo_play.cpp
 SOURCE          tsi_mmf_devvideo_record.cpp
 
-USERINCLUDE     ../src
+USERINCLUDE     ../inc
 
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 
@@ -49,4 +49,3 @@
 
 SMPSAFE
 
-SMPSAFE
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/devvideo/src/tsi_mmf_devvideo_play.h	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,355 +0,0 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Declaration of test step classes for DevVideoPlay.
-// 
-//
-
-
-#ifndef TSI_MMF_DEVVIDEOPLAY_H
-#define TSI_MMF_DEVVIDEOPLAY_H
-
-#include <mmf/devvideo/devvideoplay.h>
-#include <mmf/devvideo/videoplayhwdevice.h>
-
-#include "tsi_mmf_devvideo_stepbase.h"
-
-/**
- *
- * RTestStepDevVideoPlayBase
- * - base class for all DevVideoPlay test steps.
- *
- */
-class RTestStepDevVideoPlayBase : public RTestStepDevVideoBase, public MMMFDevVideoPlayObserver
-    {
-public:
-    RTestStepDevVideoPlayBase(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, const TUid& aDecoderUid);
-
-    // Executes events of DevVideoPlay 
-    void Fsm(TMmfDevVideoPlayEvents aDevVideoPlayEvent);
-    // from RTestStep, implementation to be used by all tests
-    virtual TVerdict DoTestStepPreambleL();
-    virtual TVerdict DoTestStepPostambleL();
-    // Set the Input and output video formats for Decode
-    TInt SetInputOutputFormatsL();
-    // check the file header information
-    void CheckHeaderInfoL();
-    
-    // from MMMFDevVideoPlayObserver
-    virtual void MdvpoNewBuffers();
-    virtual void MdvpoReturnPicture(TVideoPicture* aPicture);
-    virtual void MdvpoSupplementalInformation(const TDesC8& aData, 
-                    const TTimeIntervalMicroSeconds& aTimestamp, 
-                    const TPictureId& aPictureId);
-    virtual void MdvpoPictureLoss();
-    virtual void MdvpoPictureLoss(const TArray<TPictureId>& aPictures);
-    virtual void MdvpoSliceLoss(TUint aFirstMacroblock, TUint aNumMacroblocks, const TPictureId& aPicture);
-    virtual void MdvpoReferencePictureSelection(const TDesC8& aSelectionData);
-    virtual void MdvpoTimedSnapshotComplete(TInt aError, 
-                    TPictureData* aPictureData, 
-                    const TTimeIntervalMicroSeconds& aPresentationTimestamp, 
-                    const TPictureId& aPictureId);
-    virtual void MdvpoNewPictures();
-    virtual void MdvpoFatalError(TInt aError);
-    virtual void MdvpoInitComplete(TInt aError);
-    virtual void MdvpoStreamEnd();
-
-protected:
-    CMMFDevVideoPlay* iMMFDevVideoPlay;
-    THwDeviceId iDecoderHwDeviceId;
-    TUid iDecoderUid;
-    TInt iTotalBytesRead;
-    TBool iNewPictures;
-    TBool iInputEnd;
-    TBool iStreamEnd;
-    };
-
-
-// Positive Tests
-
-/**
- *
- * RTestDevVideoPlaySimple
- * - Play a video file, encoded using XviD codec.
- *
- */
-class RTestDevVideoPlaySimple : public RTestStepDevVideoPlayBase
-    {
-public:
-    static RTestDevVideoPlaySimple* NewL(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, const TUid& aDecoderUid);
-
-    // from RTestStep
-    virtual TVerdict DoTestStepL();
-
-private:
-    RTestDevVideoPlaySimple(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, const TUid& aDecoderUid);
-    };
-
-/**
- *
- * RTestDevVideoListVideoDecoders
- * - Get a list of available video decoders.
- *
- */
-class RTestDevVideoListVideoDecoders : public RTestStepDevVideoPlayBase
-    {
-public:
-    static RTestDevVideoListVideoDecoders* NewL(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, const TUid& aDecoderUid);
-
-    // from RTestStep
-    virtual TVerdict DoTestStepL();
-
-private:
-    RTestDevVideoListVideoDecoders(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, const TUid& aDecoderUid);
-    };
-
-/**
- *
- * RTestDevVideoListVideoPostProcessors
- * - Get a list of available video post-processors.
- *
- */
-class RTestDevVideoListVideoPostProcessors : public RTestStepDevVideoPlayBase
-    {
-public:
-    static RTestDevVideoListVideoPostProcessors* NewL(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, const TUid& aDecoderUid);
-
-    // from RTestStep
-    virtual TVerdict DoTestStepL();
-
-private:
-    RTestDevVideoListVideoPostProcessors(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, const TUid& aDecoderUid);
-    };
-
-/**
- *
- * RTestDevVideoPlayConfHwDev
- * - Configure and reconfigure the video HwDevice and play a video file, encoded using XviD codec.
- *
- */
-class RTestDevVideoPlayConfHwDev : public RTestStepDevVideoPlayBase
-    {
-public:
-    static RTestDevVideoPlayConfHwDev* NewL(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, const TUid& aDecoderUid);
-
-    // Executes events of DevVideoPlay
-    void Fsm(TMmfDevVideoPlayEvents aDevVideoPlayEvent);
-
-    // from RTestStep
-    virtual TVerdict DoTestStepL();
-
-    // from MMMFDevVideoPlayObserver
-    virtual void MdvpoFatalError(TInt aError);
-    virtual void MdvpoInitComplete(TInt aError);
-    virtual void MdvpoStreamEnd();
-
-private:
-    RTestDevVideoPlayConfHwDev(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, const TUid& aDecoderUid);
-    };
-
-/**
- *
- * RTestDevVideoPlayAlloc
- * - Alloc test to load a video HwDevice to play a video file, encoded using XviD codec.
- *
- */
-class RTestDevVideoPlayAlloc : public RTestStepDevVideoPlayBase
-    {
-public:
-    static RTestDevVideoPlayAlloc* NewL(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, const TUid& aDecoderUid);
-
-    void VideoPlayAllocL();
-    void DoTestL();
-    
-    // from RTestStep
-    virtual TVerdict DoTestStepL();
-    
-    // from MMMFDevVideoPlayObserver
-    virtual void MdvpoNewBuffers();
-    virtual void MdvpoNewPictures();
-    virtual void MdvpoFatalError(TInt aError);
-    virtual void MdvpoInitComplete(TInt aError);
-    virtual void MdvpoStreamEnd();
-
-private:
-    RTestDevVideoPlayAlloc(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, const TUid& aDecoderUid);
-    TBool iSchedulerStarted;
-    };
-
-/**
- *
- * RTestDevVideoPlayStop
- * - Play/stop playing a video file, encoded using XviD codec.
- *
- */
-class RTestDevVideoPlayStop : public RTestStepDevVideoPlayBase
-    {
-public:
-    static RTestDevVideoPlayStop* NewL(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, const TUid& aDecoderUid);
-
-    // Executes events of DevVideoPlay
-    void Fsm(TMmfDevVideoPlayEvents aDevVideoPlayEvent);
-
-    // from RTestStep
-    virtual TVerdict DoTestStepL();
-
-    // from MMMFDevVideoPlayObserver
-    virtual void MdvpoNewBuffers();
-    virtual void MdvpoNewPictures();
-
-    // timer handling
-    static TInt Check(TAny* aObject);
-    void DoCheck();
-private:
-    RTestDevVideoPlayStop(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, const TUid& aDecoderUid);
-    
-protected:
-    CPeriodic* iTimer;    
-    TInt iCheckCounter;
-    TBool iNewBuffers;    
-    TBool iIsActive;
-    };
-
-/**
- *
- * RTestDevVideoPlayPause
- * - Play/pause the play of a video file, encoded using XviD codec.
- *
- */
-class RTestDevVideoPlayPause : public RTestStepDevVideoPlayBase
-    {
-public:
-    static RTestDevVideoPlayPause* NewL(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, const TUid& aDecoderUid);
-
-    // Executes events of DevVideoPlay
-    void Fsm(TMmfDevVideoPlayEvents aDevVideoPlayEvent);
-
-    // from RTestStep
-    virtual TVerdict DoTestStepL();
-
-    // from MMMFDevVideoPlayObserver
-    virtual void MdvpoNewBuffers();
-    virtual void MdvpoNewPictures();
-
-    // timer handling
-    static TInt Check(TAny* aObject);
-    void DoCheck();
-private:
-    RTestDevVideoPlayPause(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, const TUid& aDecoderUid);
-    
-protected:
-    CPeriodic* iTimer;    
-    TInt iCheckCounter;
-    TBool iNewBuffers;    
-    TBool iIsActive;
-    };
-
-/**
- *
- * RTestDevVideoPlayDecodePlaybackPos
- * - Set and get the decoding and playback position and play the video file.
- *
- */
-class RTestDevVideoPlayDecodePlaybackPos : public RTestStepDevVideoPlayBase
-    {
-public:
-    static RTestDevVideoPlayDecodePlaybackPos* NewL(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, const TUid& aDecoderUid);
-    // from RTestStep
-    virtual TVerdict DoTestStepL();
-    // to handle the callback and get the positions
-    virtual void MdvpoNewPictures();
-    virtual void MdvpoStreamEnd();
-private:
-    RTestDevVideoPlayDecodePlaybackPos(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, const TUid& aDecoderUid);
-    TTimeIntervalMicroSeconds iInitDecodingPos;
-    TTimeIntervalMicroSeconds iInitPlaybackPos;
-    TTimeIntervalMicroSeconds iFinalDecodingPos;
-    TTimeIntervalMicroSeconds iFinalPlaybackPos;
-    };
-
-/**
- *
- * RTestDevVideoPlayDecoderInfo
- * - Get information about a specified decoder.
- *
- */
-class RTestDevVideoPlayDecoderInfo : public RTestStepDevVideoPlayBase
-    {
-public:
-    static RTestDevVideoPlayDecoderInfo* NewL(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, const TUid& aDecoderUid);
-
-    // from RTestStep
-    virtual TVerdict DoTestStepL();
-
-private:
-    RTestDevVideoPlayDecoderInfo(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, const TUid& aDecoderUid);
-    TBool ValidDecoderInfo(CVideoDecoderInfo* aInfo);
-    };
-
-// Negative Tests
-
-/**
- *
- * RTestDevVideoPlayUidHwDev
- * - Play a video file, encoded using XviD codec, specifying invalid Uid of video HwDevice.
- *
- */
-class RTestDevVideoPlayUidHwDev : public RTestStepDevVideoPlayBase
-    {
-public:
-    static RTestDevVideoPlayUidHwDev* NewL(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, const TUid& aDecoderUid);
-
-    // from RTestStep
-    virtual TVerdict DoTestStepL();
-
-private:
-    RTestDevVideoPlayUidHwDev(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, const TUid& aDecoderUid);
-    };
-
-/**
- *
- * RTestDevVideoPlayCorruptFile
- * - Play a corrupted video file, encoded using XviD codec.
- *
- */
-class RTestDevVideoPlayCorruptFile : public RTestStepDevVideoPlayBase
-    {
-public:
-    static RTestDevVideoPlayCorruptFile* NewL(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, const TUid& aDecoderUid);
-
-    // from RTestStep
-    virtual TVerdict DoTestStepL();
-
-private:
-    RTestDevVideoPlayCorruptFile(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, const TUid& aDecoderUid);
-    };
-
-/**
- *
- * RTestDevVideoPlayWithoutVideoType
- * - Open and play video file without specifying input / output video  types.
- *
- */
-class RTestDevVideoPlayWithoutVideoType : public RTestStepDevVideoPlayBase
-    {
-public:
-    static RTestDevVideoPlayWithoutVideoType* NewL(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, const TUid& aDecoderUid);
-
-    // from RTestStep
-    virtual TVerdict DoTestStepL();
-
-private:
-    RTestDevVideoPlayWithoutVideoType(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, const TUid& aDecoderUid);
-    };
-
-#endif    // TSI_MMF_DEVVIDEOPLAY_H
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/devvideo/src/tsi_mmf_devvideo_record.h	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,303 +0,0 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Declaration of test step classes for DevVideoRecord.
-// 
-//
-
-
-#ifndef TSI_MMF_DEVVIDEORECORD_H
-#define TSI_MMF_DEVVIDEORECORD_H
-
-#include <mmf/devvideo/devvideorecord.h>
-
-#include "tsi_mmf_devvideo_stepbase.h"
-
-
-/**
- *
- * RTestStepDevVideoRecordBase
- * - base class for all DevVideoRecord test steps.
- *
- */
-class RTestStepDevVideoRecordBase : public RTestStepDevVideoBase, public MMMFDevVideoRecordObserver 
-    {
-public:
-    RTestStepDevVideoRecordBase(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, const TUid& aEncoderUid);
-    // Executes events of DevSound
-    void Fsm(TMmfDevVideoRecordEvents aDevVideoRecordEvent);
-    // from RTestStep, implementation to be used by all tests
-    virtual TVerdict DoTestStepPreambleL();
-    virtual TVerdict DoTestStepPostambleL();
-    // Set the Input and output video formats for Encode
-    TInt SetInputOutputFormatsL();
-    // from MMMFDevVideoRecordObserver
-    virtual void MdvroReturnPicture(TVideoPicture* aPicture);
-    virtual void MdvroSupplementalInfoSent();
-    virtual void MdvroNewBuffers();
-    virtual void MdvroFatalError(TInt aError);
-    virtual void MdvroInitializeComplete(TInt aError);
-    virtual void MdvroStreamEnd();
-
-protected:
-    CMMFDevVideoRecord* iMMFDevVideoRecord;
-    THwDeviceId iEncoderHwDeviceId;
-    TUid iEncoderUid;
-    CFbsBitmap* iBitmap;
-    HBufC8* iDataBuf;
-    TVideoOutputBuffer* iOutputBuf;
-    TInt iCallback1;
-    TInt iCallback2;
-    };
-
-// Positive Tests
-
-/**
- *
- * RTestDevVideoRecordSimple
- * - Record a video file, encoded using XviD codec.
- *
- */
-class RTestDevVideoRecordSimple : public RTestStepDevVideoRecordBase
-    {
-public:
-    static RTestDevVideoRecordSimple* NewL(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, const TUid& aEncoderUid);
-    // from RTestStep
-    virtual TVerdict DoTestStepL();
-    // from MMMFDevVideoRecordObserver
-    virtual void MdvroNewBuffers();
-
-private:
-    RTestDevVideoRecordSimple(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, const TUid& aEncoderUid);
-    };
-
-/**
- *
- * RTestDevVideoRecordUidHwDev
- * - Record a video file, encoded using XviD codec, specifying Uid of video HwDevice.
- * - Record a video file, encoded using XviD codec, specifying invalid Uid of video HwDevice.
- *
- */
-class RTestDevVideoRecordUidHwDev : public RTestStepDevVideoRecordBase
-    {
-public:
-    static RTestDevVideoRecordUidHwDev* NewL(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TTestType aTestType, const TUid& aEncoderUid);
-    void Fsm(TMmfDevVideoRecordEvents aDevVideoRecordEvent);
-    // from RTestStep
-    virtual TVerdict DoTestStepL();
-    // from MMMFDevVideoRecordObserver
-    virtual void MdvroNewBuffers();
-    
-private:
-    RTestDevVideoRecordUidHwDev(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TTestType aTestType, const TUid& aEncoderUid);
-    };
-
-/**
- *
- * RTestDevVideoListVideoEncoders 
- * - Get a list of available video encoders.
- *
- */
-class RTestDevVideoListVideoEncoders : public RTestStepDevVideoRecordBase
-    {
-public:
-    static RTestDevVideoListVideoEncoders* NewL(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, const TUid& aEncoderUid);
-    // from RTestStep
-    virtual TVerdict DoTestStepL();
-
-private:
-    RTestDevVideoListVideoEncoders(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, const TUid& aEncoderUid);
-    };
-
-/**
- *
- * RTestDevVideoListVideoPreProcessors
- * - Get a list of available video pre-processors.
- *
- */
-class RTestDevVideoListVideoPreProcessors : public RTestStepDevVideoRecordBase
-    {
-public:
-    static RTestDevVideoListVideoPreProcessors* NewL(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, const TUid& aEncoderUid);
-    // from RTestStep
-    virtual TVerdict DoTestStepL();
-
-private:
-    RTestDevVideoListVideoPreProcessors(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, const TUid& aEncoderUid);
-    };
-
-/**
- *
- * RTestDevVideoRecordConfHwDev
- * - Configure and reconfigure the video HwDevice and record a video file, encoded using XviD codec.
- *
- */
-class RTestDevVideoRecordConfHwDev : public RTestStepDevVideoRecordBase
-    {
-public:
-    static RTestDevVideoRecordConfHwDev* NewL(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, const TUid& aEncoderUid);
-    // from RTestStep
-    virtual TVerdict DoTestStepL();
-    // from MMMFDevVideoRecordObserver
-    virtual void MdvroNewBuffers();
-    
-private:
-    RTestDevVideoRecordConfHwDev(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, const TUid& aEncoderUid);
-    };
-
-/**
- *
- * RTestDevVideoRecordAlloc
- * - Alloc test to load a video HwDevice to record a video file, encoded using XviD codec.
- *
- */
-class RTestDevVideoRecordAlloc : public RTestStepDevVideoRecordBase
-    {
-public:
-    static RTestDevVideoRecordAlloc* NewL(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, const TUid& aEncoderUid);
-    void VideoRecordAllocL();
-    void DoTestL();
-    
-    // from RTestStep
-    virtual TVerdict DoTestStepL();
-    
-    // from MMMFDevVideoRecordObserver
-    virtual void MdvroNewBuffers();
-    virtual void MdvroFatalError(TInt aError);
-    
-private:
-    RTestDevVideoRecordAlloc(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, const TUid& aEncoderUid);
-    TBool iSchedulerStarted;
-    };
-
-/**
- *
- * RTestDevVideoRecordWithAudioVideoTypes
- * - Open and record video file specifying video and audio types.
- *
- */
-class RTestDevVideoRecordWithAudioVideoTypes : public RTestStepDevVideoRecordBase
-    {
-public:
-    static RTestDevVideoRecordWithAudioVideoTypes* NewL(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, const TUid& aEncoderUid);
-    // from RTestStep
-    virtual TVerdict DoTestStepL();
-
-private:
-    RTestDevVideoRecordWithAudioVideoTypes(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, const TUid& aEncoderUid);
-    };
-
-/**
- *
- * RTestDevVideoRecordWithoutVideoType
- * - Open and record video file without specifying video type.
- *
- */
-class RTestDevVideoRecordWithoutVideoType : public RTestStepDevVideoRecordBase
-    {
-public:
-    static RTestDevVideoRecordWithoutVideoType* NewL(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, const TUid& aEncoderUid);
-    void Fsm(TMmfDevVideoRecordEvents aDevVideoRecordEvent);
-    // from RTestStep
-    virtual TVerdict DoTestStepL();
-
-private:
-    RTestDevVideoRecordWithoutVideoType(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, const TUid& aEncoderUid);
-    };
-
-
-/**
- *
- * RTestDevVideoRecordStop
- * - Record/stop recording a video file, encoded using XviD codec.
- *
- */
-class RTestDevVideoRecordStop : public RTestStepDevVideoRecordBase
-    {
-public:
-    static RTestDevVideoRecordStop* NewL(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, const TUid& aEncoderUid);
-    // Executes events of DevSound
-    void Fsm(TMmfDevVideoRecordEvents aDevVideoRecordEvent);
-    // from RTestStep
-    virtual TVerdict DoTestStepL();
-    // from MMMFDevVideoRecordObserver
-    virtual void MdvroFatalError(TInt aError);
-    virtual void MdvroInitializeComplete(TInt aError);
-    virtual void MdvroStreamEnd();
-
-private:
-    RTestDevVideoRecordStop(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, const TUid& aEncoderUid);
-    };
-
-/**
- *
- * RTestDevVideoRecordPause
- * - Record/pause recording of a video file, encoded using XviD codec.
- *
- */
-class RTestDevVideoRecordPause : public RTestStepDevVideoRecordBase
-    {
-public:
-    static RTestDevVideoRecordPause* NewL(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, const TUid& aEncoderUid);
-    // Executes events of DevSound
-    void Fsm(TMmfDevVideoRecordEvents aDevVideoRecordEvent);
-    // from RTestStep
-    virtual TVerdict DoTestStepL();
-    // from MMMFDevVideoRecordObserver
-    virtual void MdvroFatalError(TInt aError);
-    virtual void MdvroInitializeComplete(TInt aError);
-    virtual void MdvroStreamEnd();
-
-private:
-    RTestDevVideoRecordPause(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, const TUid& aEncoderUid);
-    };
-
-/**
- *
- * RTestDevVideoRecordRecordingPos
- * - Get current recording position of the video file.
- *
- */
-class RTestDevVideoRecordRecordingPos : public RTestStepDevVideoRecordBase
-    {
-public:
-    static RTestDevVideoRecordRecordingPos* NewL(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, const TUid& aEncoderUid);
-    // from RTestStep
-    virtual TVerdict DoTestStepL();
-    // from MMMFDevVideoRecordObserver
-    virtual void MdvroNewBuffers();
-    
-private:
-    RTestDevVideoRecordRecordingPos(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, const TUid& aEncoderUid);
-    };
-
-/**
- *
- * RTestDevVideoRecordEncoderInfo
- * - Get information about a specified encoder.
- *
- */
-class RTestDevVideoRecordEncoderInfo : public RTestStepDevVideoRecordBase
-    {
-public:
-    static RTestDevVideoRecordEncoderInfo* NewL(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, const TUid& aEncoderUid);
-    // from RTestStep
-    virtual TVerdict DoTestStepL();
-
-private:
-    RTestDevVideoRecordEncoderInfo(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, const TUid& aEncoderUid);
-    TBool ValidEncoderInfoL(CVideoEncoderInfo* aInfo);
-    };
-
-#endif    // TSI_MMF_DEVVIDEORECORD_H
-
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/devvideo/src/tsi_mmf_devvideo_stepbase.h	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,209 +0,0 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// This file contains step class declaration for DevVideo integration tests.
-// 
-//
-
-
-#ifndef TSI_MMF_DEVVIDEO_STEP_H
-#define TSI_MMF_DEVVIDEO_STEP_H
-
-// system includes
-#include <testframework.h>
-#include <mmf/devvideo/videoplayhwdevice.h>
-
-// forward declaration
-class CTestSuiteDevVideo;
-
-// size constant declarations
-const TInt KNameBufSize = 25;
-const TInt KSizeBuf = 256;
-const TInt KHeaderBytesSize = 1024;
-const TInt KInputBufferSize = 8192;
-
-// Test compressed video format utility function
-static inline CCompressedVideoFormat* GetTestCVFormatL( const TDesC8& aMimeType )
-    {
-    CCompressedVideoFormat* temp = CCompressedVideoFormat::NewL( aMimeType, KNullDesC8);
-    return temp;
-    }
-
-// Position constants
-const TInt KTestPosition = 12345;
-const TInt KTestDecodePosition = 256;
-const TInt KTestPlayPosition = 512;
-const TInt KTestRecordPosition = 100000;
-
-// Video header information
-const TVideoDataUnitType KTestDataUnitType           = EDuCodedPicture;
-const TVideoDataUnitEncapsulation KTestDataUnitEncap = EDuElementaryStream;
-const TVideoPictureHeader::THeaderOptions KTestPictureHeaderOptions  = TVideoPictureHeader::EPresentationTimestamp;
-const TVideoInputBuffer::TVideoBufferOptions KTestInputBufferOptions = TVideoInputBuffer::EPresentationTimestamp;
-const TInt KTestInputBufferTimestamp = 1000000;
-_LIT8(KTestInputBufferData, "I'm a lumber jack and I'm OK!");
-
-// Invalid video HwDevice UIDs
-const TUid KInvalidUidDevVideoTestDecodeHwDevice = {0x1001F7D3};
-const TUid KInvalidUidDevVideoTestEncodeHwDevice = {0x1001F7D3};
-
-// unsupported Video formats
-const TUncompressedVideoFormat KTestPostProcInfoNegativeFormat = {EYuvRawData};
-
-// Conversion matrices
-const TYuvConversionMatrix KTestYuvMatrix1 = {{1, 2, 3}, {4, 5, 6, 7, 8, 9, 10, 11, 12}, {13, 14, 15}};
-const TYuvConversionMatrix KTestYuvMatrix2 = {{-1, -2, -3}, {-4, -5, -6, -7, -8, -9, -10, -11, -12}, {-13, -14, -15}};
-const TYuvFormat KTestYuvFormat1 = {EYuvRange0, EYuv420Chroma1, EYuvDataPlanar, const_cast <TYuvConversionMatrix*> (&KTestYuvMatrix1), const_cast <TYuvConversionMatrix*> (&KTestYuvMatrix2), 10, 20};
-
-// XviD Devices stuff //
-// XviD HwDevice UIDs
-const TUid KUidDevVideoXvidDecodeHwDeviceUid = {0x10273775};
-const TUid KUidDevVideoXvidEncodeHwDeviceUid = {0x10273777};
-// XviD HwDevice PUs
-const TUid KUidTestVideoPuXvidDecoderDevice = {0x102737C4};
-const TUid KUidTestVideoPuXvidEncoderDevice = {0x102737C2};
-//const TUid KUidTestVideoPuXvidDecoderDevice = {0x10273775};
-//const TUid KUidTestVideoPuXvidEncoderDevice = {0x10273777};
-
-//
-// DevVideo test Devices stuff //
-// DevVideo Test HwDevice UIDs
-const TUid KUidTestVideoDecodeHwDeviceAdapter = {0x102737ED};
-const TUid KUidTestVideoEncodeHwDeviceAdapter = {0x102737EB};
-const TUid KUidDevVideoTestDecodeHwDevice1 = {0x101F7D93};
-const TUid KUidDevVideoTestEncodeHwDevice1 = {0x101FFA02};
-// DevVideo Test HwDevice PUs
-const TUid KUidTestVideoDecodeStubPU = {0x102737E6};
-const TUid KUidTestVideoEncodeStubPU = {0x102737E4};
-//
-
-// -- Decoder Info
-const TUint32 KXvidDecoderInfoCount = 1;
-_LIT8(KXvidDecoderMimeType, "video/mp4v-es2");
-_LIT8(KTestDecoderMimeType, "video/x-symbiantest");
-_LIT(KXvidDecoderInfoManufacturer, "Symbian Ltd.");
-_LIT8(KXvidDecoderInfoCSInfo, "Coded by Symbian");
-_LIT8(KXvidDecoderInfoISInfo, "Implemented by Symbian");
-const TInt KXvidDecoderInfoVersionMaj = 0;
-const TInt KXvidDecoderInfoVersionMin = 1;
-const TInt KXvidDecoderInfoVersionBuild = 1;
-const TInt KXvidDecoderInfoMaxPicSizeX = 640;
-const TInt KXvidDecoderInfoMaxPicSizeY = 480;
-const TInt KXvidDecoderInfoMaxPicRate = 30;
-
-// -- Encoder Info
-const TUint32 KXvidEncoderInfoCount = 1;
-_LIT8(KXvidEncoderMimeType, "video/mp4v-es2");
-_LIT8(KTestEncoderMimeType, "video/x-symbiantest");
-_LIT(KXvidEncoderInfoManufacturer, "Symbian Ltd.");
-_LIT8(KXvidEncoderInfoCSInfo, "Coded by Symbian");
-_LIT8(KXvidEncoderInfoISInfo, "Implemented by Symbian");
-const TInt KXvidEncoderInfoVersionMaj = 0;
-const TInt KXvidEncoderInfoVersionMin = 1;
-const TInt KXvidEncoderInfoVersionBuild = 1;
-const TInt KXvidEncoderInfoMaxSizeX = 640;
-const TInt KXvidEncoderInfoMaxSizeY = 480;
-const TReal KXvidEncoderInfoMaxRate = 30.0;
-const TUint KXvidEncoderInfoMaxUEPLevels = 1;
-const TUint KXvidEncoderInfoMaxBitrate = KMaxTUint32;
-const TUint KXvidEncoderInfoMaxILSSteps = 1;
-const TUint32 KXvidEncoderInfoPictureOptions = 0;
-const TUint KXvidNumBitrateLayers = 1;
-const TVideoDataUnitType KXvidUnitType1 = EDuCodedPicture;
-const TVideoDataUnitEncapsulation KXvidEncapType1 = EDuElementaryStream;
-const TInt KXvidEncoderInfoMaxPicSizeX = 640;
-const TInt KXvidEncoderInfoMaxPicSizeY = 480;
-const TReal KXvidEncoderInfoMaxPicRate = 30.0;
-
-// Test compressed XviD video format utility function
-static inline CCompressedVideoFormat* GetXvidCVFormatL()
-    {
-    CCompressedVideoFormat* temp = CCompressedVideoFormat::NewL( KXvidDecoderMimeType, KNullDesC8 );
-    return temp;
-    }
-
-// local function to get the drive name
-TAny GetDriveName(TDes& aFilename);
-
-// DevVideoPlay events
-enum TMmfDevVideoPlayEvents
-    {
-    EDevVideoPlayInit = 0,
-    EDevVideoPlayStart
-    };
-
-// DevVideoRecord events
-enum TMmfDevVideoRecordEvents
-    {
-    EDevVideoRecordInit = 0,
-    EDevVideoRecordStart
-    };
-
-// Type of test whether it is normal test or considers Uid, for example
-enum TTestType
-    {
-    ENormalTest = 0,
-    EUidTest,           // Specifies whether a test uses Uid or not, during initialization.
-    EInvalidUidTest,    // Specifies whether a test uses invalid Uid for initialization.
-    ENoVideoTypeTest    // Specifies a test with no video type set.
-    };
-
-/**
- *
- * RTestStepDevVideoBase
- * - base class for all test steps.
- *
- */
-class RTestStepDevVideoBase : public RTestStep
-    {
-public:
-    RTestStepDevVideoBase();
-
-    // Set the suite name
-    void SetTestSuite(const CTestSuiteDevVideo* aTestSuite);
-
-protected:
-    // Stores error values for testing
-    TInt iError;
-
-    // Section name for retrieving filename
-    TBuf<KNameBufSize> iSectName;
-
-    // Key name for retrieving filename
-    TBuf<KNameBufSize> iKeyName;
-
-    // Active Scheduler
-    CActiveScheduler* iActiveScheduler;
-
-    // Pointer to suite which owns this test
-    const CTestSuiteDevVideo* iTestSuiteDevVideo;
-
-   // Filename of video file
-    TBuf<KSizeBuf> iFilename;
-
-    // Creating and opening the video file for playing and recording
-    RFile iFile;
-
-    // Handle to a file server session
-    RFs iFs;
-
-    // Whether video HwDevice is reconfigured or not
-    TBool iReConfigure;
-
-    // Keep track on number of times MdvroStreamEnd/MdvroStreamEnd callback is called
-    TUint iEndCount;
-
-    TTestType iTestType;
-    };
-
-#endif    // TSI_MMF_DEVVIDEO_STEP_H
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/devvideo/src/tsi_mmf_devvideo_suite.h	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// This file contains suite class declaration for DevVideo integration tests.
-// 
-//
-
-
-#ifndef TSI_MMF_DEVVIDEO_SUITE_H
-#define TSI_MMF_DEVVIDEO_SUITE_H
-
-// forward declaration
-class CTestSuite;
-
-/**
- *
- * CTestSuiteDevVideo
- * - Test suite class
- *
- */
-class CTestSuiteDevVideo : public CTestSuite
-    {
-public:
-    virtual ~CTestSuiteDevVideo();
-
-    // from CTestSuite
-    // Creates all the test steps and stores them inside CTestSuiteDevVideo
-    void InitialiseL();
-
-    // from CTestSuite, gets test suite version
-    TPtrC GetVersion() const;
-
-    // from CTestSuite, adds a test step into the suite
-    void AddTestStepL(RTestStepDevVideoBase* ptrTestStep);
-    };
-
-#endif    // TSI_MMF_DEVVIDEO_SUITE_H
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/eabi/TSI_MMFACLNTU.DEF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,567 +0,0 @@
-EXPORTS
-	_Z13NewTestSuiteLv @ 1 NONAME
-	_ZTI14CCallBackTimer @ 2 NONAME ; #<TI>#
-	_ZTI15CRightsDatabase @ 3 NONAME ; #<TI>#
-	_ZTI16CTestMmfAclntUrl @ 4 NONAME ; #<TI>#
-	_ZTI17CTestMmfAclntCrop @ 5 NONAME ; #<TI>#
-	_ZTI17CTestMmfAclntDesc @ 6 NONAME ; #<TI>#
-	_ZTI17CTestMmfAclntFile @ 7 NONAME ; #<TI>#
-	_ZTI17CTestMmfAclntStep @ 8 NONAME ; #<TI>#
-	_ZTI17CTestMmfAclntTone @ 9 NONAME ; #<TI>#
-	_ZTI17CWavDecodeUtility @ 10 NONAME ; #<TI>#
-	_ZTI18CDelayedMethodCall @ 11 NONAME ; #<TI>#
-	_ZTI18CTestMmfAclntSuite @ 12 NONAME ; #<TI>#
-	_ZTI18CTestMmfFormatRead @ 13 NONAME ; #<TI>#
-	_ZTI19CTestMmfAclntDelete @ 14 NONAME ; #<TI>#
-	_ZTI19CTestMmfAclntDoConv @ 15 NONAME ; #<TI>#
-	_ZTI19CTestMmfAclntNoLoad @ 16 NONAME ; #<TI>#
-	_ZTI19CTestMmfAclntRecDes @ 17 NONAME ; #<TI>#
-	_ZTI19CTestMmfAclntRecUrl @ 18 NONAME ; #<TI>#
-	_ZTI19CTestMmfAclntRecord @ 19 NONAME ; #<TI>#
-	_ZTI20CTestMmfAclntARN1301 @ 20 NONAME ; #<TI>#
-	_ZTI20CTestMmfAclntARN1302 @ 21 NONAME ; #<TI>#
-	_ZTI20CTestMmfAclntARN1303 @ 22 NONAME ; #<TI>#
-	_ZTI20CTestMmfAclntARN1304 @ 23 NONAME ; #<TI>#
-	_ZTI20CTestMmfAclntARN1311 @ 24 NONAME ; #<TI>#
-	_ZTI20CTestMmfAclntARN1312 @ 25 NONAME ; #<TI>#
-	_ZTI20CTestMmfAclntARN1313 @ 26 NONAME ; #<TI>#
-	_ZTI20CTestMmfAclntARN1314 @ 27 NONAME ; #<TI>#
-	_ZTI20CTestMmfAclntARN1321 @ 28 NONAME ; #<TI>#
-	_ZTI20CTestMmfAclntARN1322 @ 29 NONAME ; #<TI>#
-	_ZTI20CTestMmfAclntARN1323 @ 30 NONAME ; #<TI>#
-	_ZTI20CTestMmfAclntARN1324 @ 31 NONAME ; #<TI>#
-	_ZTI20CTestMmfAclntARN8011 @ 32 NONAME ; #<TI>#
-	_ZTI20CTestMmfAclntARN8012 @ 33 NONAME ; #<TI>#
-	_ZTI20CTestMmfAclntARN8013 @ 34 NONAME ; #<TI>#
-	_ZTI20CTestMmfAclntARN8014 @ 35 NONAME ; #<TI>#
-	_ZTI20CTestMmfAclntARN8015 @ 36 NONAME ; #<TI>#
-	_ZTI20CTestMmfAclntARN8016 @ 37 NONAME ; #<TI>#
-	_ZTI20CTestMmfAclntARN8021 @ 38 NONAME ; #<TI>#
-	_ZTI20CTestMmfAclntARN8022 @ 39 NONAME ; #<TI>#
-	_ZTI20CTestMmfAclntARN8023 @ 40 NONAME ; #<TI>#
-	_ZTI20CTestMmfAclntARN8024 @ 41 NONAME ; #<TI>#
-	_ZTI20CTestMmfAclntARN8025 @ 42 NONAME ; #<TI>#
-	_ZTI20CTestMmfAclntARN8026 @ 43 NONAME ; #<TI>#
-	_ZTI20CTestMmfAclntARN8101 @ 44 NONAME ; #<TI>#
-	_ZTI20CTestMmfAclntARN8102 @ 45 NONAME ; #<TI>#
-	_ZTI20CTestMmfAclntARN8103 @ 46 NONAME ; #<TI>#
-	_ZTI20CTestMmfAclntARN8104 @ 47 NONAME ; #<TI>#
-	_ZTI20CTestMmfAclntARN8105 @ 48 NONAME ; #<TI>#
-	_ZTI20CTestMmfAclntARN8106 @ 49 NONAME ; #<TI>#
-	_ZTI20CTestMmfAclntARN8107 @ 50 NONAME ; #<TI>#
-	_ZTI20CTestMmfAclntARN8108 @ 51 NONAME ; #<TI>#
-	_ZTI20CTestMmfAclntARN9001 @ 52 NONAME ; #<TI>#
-	_ZTI20CTestMmfAclntARN9002 @ 53 NONAME ; #<TI>#
-	_ZTI20CTestMmfAclntARN9003 @ 54 NONAME ; #<TI>#
-	_ZTI20CTestMmfAclntARN9004 @ 55 NONAME ; #<TI>#
-	_ZTI20CTestMmfAclntARN9005 @ 56 NONAME ; #<TI>#
-	_ZTI20CTestMmfAclntARN9006 @ 57 NONAME ; #<TI>#
-	_ZTI20CTestMmfAclntARN9007 @ 58 NONAME ; #<TI>#
-	_ZTI20CTestMmfAclntARN9008 @ 59 NONAME ; #<TI>#
-	_ZTI20CTestMmfAclntRecFile @ 60 NONAME ; #<TI>#
-	_ZTI20CTestMmfAclntRecGain @ 61 NONAME ; #<TI>#
-	_ZTI20CTestMmfAclntToneDes @ 62 NONAME ; #<TI>#
-	_ZTI20CTestStepAudInStream @ 63 NONAME ; #<TI>#
-	_ZTI20CToneCallbackHandler @ 64 NONAME ; #<TI>#
-	_ZTI21CStateCallbackHandler @ 65 NONAME ; #<TI>#
-	_ZTI21CTestMmfAclntCaps0012 @ 66 NONAME ; #<TI>#
-	_ZTI21CTestMmfAclntCaps0014 @ 67 NONAME ; #<TI>#
-	_ZTI21CTestMmfAclntConQuery @ 68 NONAME ; #<TI>#
-	_ZTI21CTestMmfAclntDescOpen @ 69 NONAME ; #<TI>#
-	_ZTI21CTestMmfAclntDualTone @ 70 NONAME ; #<TI>#
-	_ZTI21CTestMmfAclntPlayPlay @ 71 NONAME ; #<TI>#
-	_ZTI21CTestMmfAclntPriority @ 72 NONAME ; #<TI>#
-	_ZTI21CTestMmfAclntSEQNFile @ 73 NONAME ; #<TI>#
-	_ZTI21CTestMmfAclntToneDtmf @ 74 NONAME ; #<TI>#
-	_ZTI21CTestMmfAclntToneFile @ 75 NONAME ; #<TI>#
-	_ZTI21CTestStepAudOutStream @ 76 NONAME ; #<TI>#
-	_ZTI22CPlayerCallbackHandler @ 77 NONAME ; #<TI>#
-	_ZTI22CTestMmfAclntAudioMeta @ 78 NONAME ; #<TI>#
-	_ZTI22CTestMmfAclntAudioRamp @ 79 NONAME ; #<TI>#
-	_ZTI22CTestMmfAclntAudioType @ 80 NONAME ; #<TI>#
-	_ZTI22CTestMmfAclntCodecTest @ 81 NONAME ; #<TI>#
-	_ZTI22CTestMmfAclntConConfig @ 82 NONAME ; #<TI>#
-	_ZTI22CTestMmfAclntConWindow @ 83 NONAME ; #<TI>#
-	_ZTI22CTestMmfAclntRecDelete @ 84 NONAME ; #<TI>#
-	_ZTI22CTestMmfAclntRecLength @ 85 NONAME ; #<TI>#
-	_ZTI22CTestMmfAclntRecordARN @ 86 NONAME ; #<TI>#
-	_ZTI22CTestMmfAclntToneAudio @ 87 NONAME ; #<TI>#
-	_ZTI22CTestMmfAclntToneCount @ 88 NONAME ; #<TI>#
-	_ZTI22CTestMmfAclntToneFixed @ 89 NONAME ; #<TI>#
-	_ZTI22CTestMmfAclntToneNames @ 90 NONAME ; #<TI>#
-	_ZTI23CTestMmfAclntAudioQuery @ 91 NONAME ; #<TI>#
-	_ZTI23CTestMmfAclntConvertDes @ 92 NONAME ; #<TI>#
-	_ZTI23CTestMmfAclntConvertUrl @ 93 NONAME ; #<TI>#
-	_ZTI23CTestMmfAclntCorruptDes @ 94 NONAME ; #<TI>#
-	_ZTI23CTestMmfAclntDeletePlay @ 95 NONAME ; #<TI>#
-	_ZTI23CTestMmfAclntFileSource @ 96 NONAME ; #<TI>#
-	_ZTI23CTestMmfAclntOnOffPause @ 97 NONAME ; #<TI>#
-	_ZTI23CTestMmfAclntRecBalance @ 98 NONAME ; #<TI>#
-	_ZTI23CTestMmfAclntRecFormats @ 99 NONAME ; #<TI>#
-	_ZTI23CTestMmfAclntRecSetMeta @ 100 NONAME ; #<TI>#
-	_ZTI23CTestMmfAclntToneLength @ 101 NONAME ; #<TI>#
-	_ZTI23CTestMmfAclntToneRepeat @ 102 NONAME ; #<TI>#
-	_ZTI23CTestMmfAclntToneVolume @ 103 NONAME ; #<TI>#
-	_ZTI23CTestMmfAclntVolumeRamp @ 104 NONAME ; #<TI>#
-	_ZTI24CTestMmfAclntAudioRepeat @ 105 NONAME ; #<TI>#
-	_ZTI24CTestMmfAclntConDuration @ 106 NONAME ; #<TI>#
-	_ZTI24CTestMmfAclntConPosition @ 107 NONAME ; #<TI>#
-	_ZTI24CTestMmfAclntConvertCrop @ 108 NONAME ; #<TI>#
-	_ZTI24CTestMmfAclntConvertStop @ 109 NONAME ; #<TI>#
-	_ZTI24CTestMmfAclntRecDuration @ 110 NONAME ; #<TI>#
-	_ZTI24CTestMmfAclntRecFilePlay @ 111 NONAME ; #<TI>#
-	_ZTI24CTestMmfAclntRecNoRecord @ 112 NONAME ; #<TI>#
-	_ZTI24CTestMmfAclntRecPosition @ 113 NONAME ; #<TI>#
-	_ZTI24CTestMmfAclntRecPriority @ 114 NONAME ; #<TI>#
-	_ZTI24CTestMmfAclntToneBalance @ 115 NONAME ; #<TI>#
-	_ZTI24CTestMmfAclntToneCancelP @ 116 NONAME ; #<TI>#
-	_ZTI25CTestMmfAclntAudioBalance @ 117 NONAME ; #<TI>#
-	_ZTI25CTestMmfAclntAudioBitRate @ 118 NONAME ; #<TI>#
-	_ZTI25CTestMmfAclntConCloseOpen @ 119 NONAME ; #<TI>#
-	_ZTI25CTestMmfAclntDescReadOnly @ 120 NONAME ; #<TI>#
-	_ZTI25CTestMmfAclntOldCodecFile @ 121 NONAME ; #<TI>#
-	_ZTI25CTestMmfAclntOpenFile1211 @ 122 NONAME ; #<TI>#
-	_ZTI25CTestMmfAclntOpenFile7803 @ 123 NONAME ; #<TI>#
-	_ZTI25CTestMmfAclntOpenFile7804 @ 124 NONAME ; #<TI>#
-	_ZTI25CTestMmfAclntOpenFile7805 @ 125 NONAME ; #<TI>#
-	_ZTI25CTestMmfAclntOpenFile7806 @ 126 NONAME ; #<TI>#
-	_ZTI25CTestMmfAclntOpenFile7901 @ 127 NONAME ; #<TI>#
-	_ZTI25CTestMmfAclntOpenFile7902 @ 128 NONAME ; #<TI>#
-	_ZTI25CTestMmfAclntOpenFile7904 @ 129 NONAME ; #<TI>#
-	_ZTI25CTestMmfAclntOpenFile7905 @ 130 NONAME ; #<TI>#
-	_ZTI25CTestMmfAclntOpenFile7906 @ 131 NONAME ; #<TI>#
-	_ZTI25CTestMmfAclntOpenFile7908 @ 132 NONAME ; #<TI>#
-	_ZTI25CTestMmfAclntOpenFile8801 @ 133 NONAME ; #<TI>#
-	_ZTI25CTestMmfAclntOpenToneFile @ 134 NONAME ; #<TI>#
-	_ZTI25CTestMmfAclntRecCloseOpen @ 135 NONAME ; #<TI>#
-	_ZTI25CTestMmfAclntRecStateTran @ 136 NONAME ; #<TI>#
-	_ZTI25CTestStepAudOutStreamOpen @ 137 NONAME ; #<TI>#
-	_ZTI25CTestStepAudOutStreamStop @ 138 NONAME ; #<TI>#
-	_ZTI26CTestMmfAclntAudioDuration @ 139 NONAME ; #<TI>#
-	_ZTI26CTestMmfAclntAudioPosition @ 140 NONAME ; #<TI>#
-	_ZTI26CTestMmfAclntConvertLength @ 141 NONAME ; #<TI>#
-	_ZTI26CTestMmfAclntConvertRepeat @ 142 NONAME ; #<TI>#
-	_ZTI26CTestMmfAclntDRMPlayerOpen @ 143 NONAME ; #<TI>#
-	_ZTI26CTestMmfAclntPriorityTones @ 144 NONAME ; #<TI>#
-	_ZTI26CTestMmfAclntRecFileAppend @ 145 NONAME ; #<TI>#
-	_ZTI26CTestMmfAclntRecFileSource @ 146 NONAME ; #<TI>#
-	_ZTI26CTestMmfAclntRecNoPlayback @ 147 NONAME ; #<TI>#
-	_ZTI26CTestMmfAclntToneCancelIni @ 148 NONAME ; #<TI>#
-	_ZTI26CTestMmfDRMAudioPlayerBase @ 149 NONAME ; #<TI>#
-	_ZTI27CTestMmfAclntAudioCloseOpen @ 150 NONAME ; #<TI>#
-	_ZTI27CTestMmfAclntAudioPlayerARN @ 151 NONAME ; #<TI>#
-	_ZTI27CTestMmfAclntMultiClientARN @ 152 NONAME ; #<TI>#
-	_ZTI27CTestMmfAclntRecRawFilePlay @ 153 NONAME ; #<TI>#
-	_ZTI27CTestStepAudInStreamNoUECap @ 154 NONAME ; #<TI>#
-	_ZTI27CTestStepAudInStreamSetGain @ 155 NONAME ; #<TI>#
-	_ZTI27CTestStepAudInStreamSetProp @ 156 NONAME ; #<TI>#
-	_ZTI27CTestStepAudOutStreamSetVol @ 157 NONAME ; #<TI>#
-	_ZTI28CTestMmfAclntAudioPlayVolume @ 158 NONAME ; #<TI>#
-	_ZTI28CTestMmfAclntAudioPlayWindow @ 159 NONAME ; #<TI>#
-	_ZTI28CTestMmfAclntAudioPlayerUtil @ 160 NONAME ; #<TI>#
-	_ZTI28CTestMmfAclntAudioRecordRamp @ 161 NONAME ; #<TI>#
-	_ZTI28CTestMmfAclntDRMRecorderPlay @ 162 NONAME ; #<TI>#
-	_ZTI28CTestMmfAclntRecNoRecordDesc @ 163 NONAME ; #<TI>#
-	_ZTI28CTestMmfAclntRecNoRecordFile @ 164 NONAME ; #<TI>#
-	_ZTI28CTestMmfAclntRecSrcAuBitrate @ 165 NONAME ; #<TI>#
-	_ZTI28CTestMmfDRMAudioRecorderBase @ 166 NONAME ; #<TI>#
-	_ZTI28CTestMmfOggAudioRecorderBase @ 167 NONAME ; #<TI>#
-	_ZTI28CTestStepAudInStreamGetBytes @ 168 NONAME ; #<TI>#
-	_ZTI28CTestStepAudOutStreamSetProp @ 169 NONAME ; #<TI>#
-	_ZTI29CTestMmfAclntDRMConverterFail @ 170 NONAME ; #<TI>#
-	_ZTI29CTestMmfAclntFileHandleSource @ 171 NONAME ; #<TI>#
-	_ZTI29CTestMmfAclntOpenWhileConvert @ 172 NONAME ; #<TI>#
-	_ZTI29CTestMmfAclntRecordDestFormat @ 173 NONAME ; #<TI>#
-	_ZTI29CTestMmfAclntRecordGetBalance @ 174 NONAME ; #<TI>#
-	_ZTI29CTestStepAudInStreamWithUECap @ 175 NONAME ; #<TI>#
-	_ZTI29CTestStepAudOutStreamGetBytes @ 176 NONAME ; #<TI>#
-	_ZTI29CTestStepAudOutStreamPosition @ 177 NONAME ; #<TI>#
-	_ZTI29CTestStepAudOutStreamSetPrior @ 178 NONAME ; #<TI>#
-	_ZTI29CTestStepAudioOutputStreamARN @ 179 NONAME ; #<TI>#
-	_ZTI30CTestMmfAclntAudioRecordVolume @ 180 NONAME ; #<TI>#
-	_ZTI30CTestMmfAclntConvertDestFormat @ 181 NONAME ; #<TI>#
-	_ZTI30CTestMmfAclntConvertSourceInfo @ 182 NONAME ; #<TI>#
-	_ZTI30CTestMmfAclntDRMPlayerNoRights @ 183 NONAME ; #<TI>#
-	_ZTI30CTestMmfAclntRecNoPlaybackDesc @ 184 NONAME ; #<TI>#
-	_ZTI30CTestMmfAclntRecNoPlaybackFile @ 185 NONAME ; #<TI>#
-	_ZTI30CTestMmfAclntRecPlayFileSource @ 186 NONAME ; #<TI>#
-	_ZTI30CTestMmfAclntRecordDestBitRate @ 187 NONAME ; #<TI>#
-	_ZTI30CTestMmfAclntRecordSetPriority @ 188 NONAME ; #<TI>#
-	_ZTI30CTestStepAudInStreamSetBalance @ 189 NONAME ; #<TI>#
-	_ZTI31CTestMmfAclntAudioPlayStopStart @ 190 NONAME ; #<TI>#
-	_ZTI31CTestMmfAclntConvertDestBitRate @ 191 NONAME ; #<TI>#
-	_ZTI31CTestMmfAclntRecFileForceFormat @ 192 NONAME ; #<TI>#
-	_ZTI31CTestMmfAclntRecordDestChannels @ 193 NONAME ; #<TI>#
-	_ZTI31CTestMmfAclntRecordDestDataType @ 194 NONAME ; #<TI>#
-	_ZTI31CTestStepAudInStreamSetPriority @ 195 NONAME ; #<TI>#
-	_ZTI31CTestStepAudOutStreamSetBalance @ 196 NONAME ; #<TI>#
-	_ZTI32CTestMmfAclntAudioPlayPauseStart @ 197 NONAME ; #<TI>#
-	_ZTI32CTestMmfAclntConvertDestDataType @ 198 NONAME ; #<TI>#
-	_ZTI32CTestMmfAclntDRMRecorderNoRights @ 199 NONAME ; #<TI>#
-	_ZTI33CTestMmfAclntDRMPlayerRightsCount @ 200 NONAME ; #<TI>#
-	_ZTI33CTestMmfAclntRecordDestSampleRate @ 201 NONAME ; #<TI>#
-	_ZTI33CTestMmfAudioPlayDRMEnableAgentUI @ 202 NONAME ; #<TI>#
-	_ZTI34CTestMdaAudioPlayerCallbackSupport @ 203 NONAME ; #<TI>#
-	_ZTI34CTestMmfAclntConvertDestSampleRate @ 204 NONAME ; #<TI>#
-	_ZTI34CTestMmfAclntRecordAudioDeviceMode @ 205 NONAME ; #<TI>#
-	_ZTI35CTestMmfAclntAudioPlayPausePlayTest @ 206 NONAME ; #<TI>#
-	_ZTI35CTestMmfAclntDRMRecorderRightsCount @ 207 NONAME ; #<TI>#
-	_ZTI35CTestMmfAclntRecBitrateRecordedFile @ 208 NONAME ; #<TI>#
-	_ZTI35CTestMmfAclntRecNoRecordForceFormat @ 209 NONAME ; #<TI>#
-	_ZTI36CTestMdaAudioRecorderCallbackSupport @ 210 NONAME ; #<TI>#
-	_ZTI36CTestMmfAudioRecPlayDRMEnableAgentUI @ 211 NONAME ; #<TI>#
-	_ZTI37CTestMmfAclntRecNoPlaybackForceFormat @ 212 NONAME ; #<TI>#
-	_ZTI37CTestMmfAudioPlayDRMDisableAutoIntent @ 213 NONAME ; #<TI>#
-	_ZTI39CTestMdaAudioMultiClientCallbackSupport @ 214 NONAME ; #<TI>#
-	_ZTI39CTestMmfAclntRecNoRecordForceFormatDesc @ 215 NONAME ; #<TI>#
-	_ZTI40CTestMdaAudioOutputStreamCallbackSupport @ 216 NONAME ; #<TI>#
-	_ZTI40CTestMmfAclntConvertDestNumberOfChannels @ 217 NONAME ; #<TI>#
-	_ZTI40CTestMmfAudioRecPlayDRMDisableAutoIntent @ 218 NONAME ; #<TI>#
-	_ZTI41CTestMmfAclntRecNoPlaybackForceFormatDesc @ 219 NONAME ; #<TI>#
-	_ZTI43CTestMmfAclntRecNoRecordDescForceController @ 220 NONAME ; #<TI>#
-	_ZTI43CTestMmfAclntRecNoRecordFileForceController @ 221 NONAME ; #<TI>#
-	_ZTI45CTestMmfAclntRecNoPlaybackDescForceController @ 222 NONAME ; #<TI>#
-	_ZTI45CTestMmfAclntRecNoPlaybackFileForceController @ 223 NONAME ; #<TI>#
-	_ZTIN20CTestStepAudInStream18CWriteBufferActiveE @ 224 NONAME ; #<TI>#
-	_ZTIN21CTestMmfAclntCaps001214CServerMonitorE @ 225 NONAME ; #<TI>#
-	_ZTIN21CTestMmfAclntCaps001414CServerMonitorE @ 226 NONAME ; #<TI>#
-	_ZTIN21CTestStepAudOutStream17CReadBufferActiveE @ 227 NONAME ; #<TI>#
-	_ZTV14CCallBackTimer @ 228 NONAME ; #<VT>#
-	_ZTV15CRightsDatabase @ 229 NONAME ; #<VT>#
-	_ZTV16CTestMmfAclntUrl @ 230 NONAME ; #<VT>#
-	_ZTV17CTestMmfAclntCrop @ 231 NONAME ; #<VT>#
-	_ZTV17CTestMmfAclntDesc @ 232 NONAME ; #<VT>#
-	_ZTV17CTestMmfAclntFile @ 233 NONAME ; #<VT>#
-	_ZTV17CTestMmfAclntStep @ 234 NONAME ; #<VT>#
-	_ZTV17CTestMmfAclntTone @ 235 NONAME ; #<VT>#
-	_ZTV17CWavDecodeUtility @ 236 NONAME ; #<VT>#
-	_ZTV18CDelayedMethodCall @ 237 NONAME ; #<VT>#
-	_ZTV18CTestMmfAclntSuite @ 238 NONAME ; #<VT>#
-	_ZTV18CTestMmfFormatRead @ 239 NONAME ; #<VT>#
-	_ZTV19CTestMmfAclntDelete @ 240 NONAME ; #<VT>#
-	_ZTV19CTestMmfAclntDoConv @ 241 NONAME ; #<VT>#
-	_ZTV19CTestMmfAclntNoLoad @ 242 NONAME ; #<VT>#
-	_ZTV19CTestMmfAclntRecDes @ 243 NONAME ; #<VT>#
-	_ZTV19CTestMmfAclntRecUrl @ 244 NONAME ; #<VT>#
-	_ZTV19CTestMmfAclntRecord @ 245 NONAME ; #<VT>#
-	_ZTV20CTestMmfAclntARN1301 @ 246 NONAME ; #<VT>#
-	_ZTV20CTestMmfAclntARN1302 @ 247 NONAME ; #<VT>#
-	_ZTV20CTestMmfAclntARN1303 @ 248 NONAME ; #<VT>#
-	_ZTV20CTestMmfAclntARN1304 @ 249 NONAME ; #<VT>#
-	_ZTV20CTestMmfAclntARN1311 @ 250 NONAME ; #<VT>#
-	_ZTV20CTestMmfAclntARN1312 @ 251 NONAME ; #<VT>#
-	_ZTV20CTestMmfAclntARN1313 @ 252 NONAME ; #<VT>#
-	_ZTV20CTestMmfAclntARN1314 @ 253 NONAME ; #<VT>#
-	_ZTV20CTestMmfAclntARN1321 @ 254 NONAME ; #<VT>#
-	_ZTV20CTestMmfAclntARN1322 @ 255 NONAME ; #<VT>#
-	_ZTV20CTestMmfAclntARN1323 @ 256 NONAME ; #<VT>#
-	_ZTV20CTestMmfAclntARN1324 @ 257 NONAME ; #<VT>#
-	_ZTV20CTestMmfAclntARN8011 @ 258 NONAME ; #<VT>#
-	_ZTV20CTestMmfAclntARN8012 @ 259 NONAME ; #<VT>#
-	_ZTV20CTestMmfAclntARN8013 @ 260 NONAME ; #<VT>#
-	_ZTV20CTestMmfAclntARN8014 @ 261 NONAME ; #<VT>#
-	_ZTV20CTestMmfAclntARN8015 @ 262 NONAME ; #<VT>#
-	_ZTV20CTestMmfAclntARN8016 @ 263 NONAME ; #<VT>#
-	_ZTV20CTestMmfAclntARN8021 @ 264 NONAME ; #<VT>#
-	_ZTV20CTestMmfAclntARN8022 @ 265 NONAME ; #<VT>#
-	_ZTV20CTestMmfAclntARN8023 @ 266 NONAME ; #<VT>#
-	_ZTV20CTestMmfAclntARN8024 @ 267 NONAME ; #<VT>#
-	_ZTV20CTestMmfAclntARN8025 @ 268 NONAME ; #<VT>#
-	_ZTV20CTestMmfAclntARN8026 @ 269 NONAME ; #<VT>#
-	_ZTV20CTestMmfAclntARN8101 @ 270 NONAME ; #<VT>#
-	_ZTV20CTestMmfAclntARN8102 @ 271 NONAME ; #<VT>#
-	_ZTV20CTestMmfAclntARN8103 @ 272 NONAME ; #<VT>#
-	_ZTV20CTestMmfAclntARN8104 @ 273 NONAME ; #<VT>#
-	_ZTV20CTestMmfAclntARN8105 @ 274 NONAME ; #<VT>#
-	_ZTV20CTestMmfAclntARN8106 @ 275 NONAME ; #<VT>#
-	_ZTV20CTestMmfAclntARN8107 @ 276 NONAME ; #<VT>#
-	_ZTV20CTestMmfAclntARN8108 @ 277 NONAME ; #<VT>#
-	_ZTV20CTestMmfAclntARN9001 @ 278 NONAME ; #<VT>#
-	_ZTV20CTestMmfAclntARN9002 @ 279 NONAME ; #<VT>#
-	_ZTV20CTestMmfAclntARN9003 @ 280 NONAME ; #<VT>#
-	_ZTV20CTestMmfAclntARN9004 @ 281 NONAME ; #<VT>#
-	_ZTV20CTestMmfAclntARN9005 @ 282 NONAME ; #<VT>#
-	_ZTV20CTestMmfAclntARN9006 @ 283 NONAME ; #<VT>#
-	_ZTV20CTestMmfAclntARN9007 @ 284 NONAME ; #<VT>#
-	_ZTV20CTestMmfAclntARN9008 @ 285 NONAME ; #<VT>#
-	_ZTV20CTestMmfAclntRecFile @ 286 NONAME ; #<VT>#
-	_ZTV20CTestMmfAclntRecGain @ 287 NONAME ; #<VT>#
-	_ZTV20CTestMmfAclntToneDes @ 288 NONAME ; #<VT>#
-	_ZTV20CTestStepAudInStream @ 289 NONAME ; #<VT>#
-	_ZTV20CToneCallbackHandler @ 290 NONAME ; #<VT>#
-	_ZTV21CStateCallbackHandler @ 291 NONAME ; #<VT>#
-	_ZTV21CTestMmfAclntCaps0012 @ 292 NONAME ; #<VT>#
-	_ZTV21CTestMmfAclntCaps0014 @ 293 NONAME ; #<VT>#
-	_ZTV21CTestMmfAclntConQuery @ 294 NONAME ; #<VT>#
-	_ZTV21CTestMmfAclntDescOpen @ 295 NONAME ; #<VT>#
-	_ZTV21CTestMmfAclntDualTone @ 296 NONAME ; #<VT>#
-	_ZTV21CTestMmfAclntPlayPlay @ 297 NONAME ; #<VT>#
-	_ZTV21CTestMmfAclntPriority @ 298 NONAME ; #<VT>#
-	_ZTV21CTestMmfAclntSEQNFile @ 299 NONAME ; #<VT>#
-	_ZTV21CTestMmfAclntToneDtmf @ 300 NONAME ; #<VT>#
-	_ZTV21CTestMmfAclntToneFile @ 301 NONAME ; #<VT>#
-	_ZTV21CTestStepAudOutStream @ 302 NONAME ; #<VT>#
-	_ZTV22CPlayerCallbackHandler @ 303 NONAME ; #<VT>#
-	_ZTV22CTestMmfAclntAudioMeta @ 304 NONAME ; #<VT>#
-	_ZTV22CTestMmfAclntAudioRamp @ 305 NONAME ; #<VT>#
-	_ZTV22CTestMmfAclntAudioType @ 306 NONAME ; #<VT>#
-	_ZTV22CTestMmfAclntCodecTest @ 307 NONAME ; #<VT>#
-	_ZTV22CTestMmfAclntConConfig @ 308 NONAME ; #<VT>#
-	_ZTV22CTestMmfAclntConWindow @ 309 NONAME ; #<VT>#
-	_ZTV22CTestMmfAclntRecDelete @ 310 NONAME ; #<VT>#
-	_ZTV22CTestMmfAclntRecLength @ 311 NONAME ; #<VT>#
-	_ZTV22CTestMmfAclntRecordARN @ 312 NONAME ; #<VT>#
-	_ZTV22CTestMmfAclntToneAudio @ 313 NONAME ; #<VT>#
-	_ZTV22CTestMmfAclntToneCount @ 314 NONAME ; #<VT>#
-	_ZTV22CTestMmfAclntToneFixed @ 315 NONAME ; #<VT>#
-	_ZTV22CTestMmfAclntToneNames @ 316 NONAME ; #<VT>#
-	_ZTV23CTestMmfAclntAudioQuery @ 317 NONAME ; #<VT>#
-	_ZTV23CTestMmfAclntConvertDes @ 318 NONAME ; #<VT>#
-	_ZTV23CTestMmfAclntConvertUrl @ 319 NONAME ; #<VT>#
-	_ZTV23CTestMmfAclntCorruptDes @ 320 NONAME ; #<VT>#
-	_ZTV23CTestMmfAclntDeletePlay @ 321 NONAME ; #<VT>#
-	_ZTV23CTestMmfAclntFileSource @ 322 NONAME ; #<VT>#
-	_ZTV23CTestMmfAclntOnOffPause @ 323 NONAME ; #<VT>#
-	_ZTV23CTestMmfAclntRecBalance @ 324 NONAME ; #<VT>#
-	_ZTV23CTestMmfAclntRecFormats @ 325 NONAME ; #<VT>#
-	_ZTV23CTestMmfAclntRecSetMeta @ 326 NONAME ; #<VT>#
-	_ZTV23CTestMmfAclntToneLength @ 327 NONAME ; #<VT>#
-	_ZTV23CTestMmfAclntToneRepeat @ 328 NONAME ; #<VT>#
-	_ZTV23CTestMmfAclntToneVolume @ 329 NONAME ; #<VT>#
-	_ZTV23CTestMmfAclntVolumeRamp @ 330 NONAME ; #<VT>#
-	_ZTV24CTestMmfAclntAudioRepeat @ 331 NONAME ; #<VT>#
-	_ZTV24CTestMmfAclntConDuration @ 332 NONAME ; #<VT>#
-	_ZTV24CTestMmfAclntConPosition @ 333 NONAME ; #<VT>#
-	_ZTV24CTestMmfAclntConvertCrop @ 334 NONAME ; #<VT>#
-	_ZTV24CTestMmfAclntConvertStop @ 335 NONAME ; #<VT>#
-	_ZTV24CTestMmfAclntRecDuration @ 336 NONAME ; #<VT>#
-	_ZTV24CTestMmfAclntRecFilePlay @ 337 NONAME ; #<VT>#
-	_ZTV24CTestMmfAclntRecNoRecord @ 338 NONAME ; #<VT>#
-	_ZTV24CTestMmfAclntRecPosition @ 339 NONAME ; #<VT>#
-	_ZTV24CTestMmfAclntRecPriority @ 340 NONAME ; #<VT>#
-	_ZTV24CTestMmfAclntToneBalance @ 341 NONAME ; #<VT>#
-	_ZTV24CTestMmfAclntToneCancelP @ 342 NONAME ; #<VT>#
-	_ZTV25CTestMmfAclntAudioBalance @ 343 NONAME ; #<VT>#
-	_ZTV25CTestMmfAclntAudioBitRate @ 344 NONAME ; #<VT>#
-	_ZTV25CTestMmfAclntConCloseOpen @ 345 NONAME ; #<VT>#
-	_ZTV25CTestMmfAclntDescReadOnly @ 346 NONAME ; #<VT>#
-	_ZTV25CTestMmfAclntOldCodecFile @ 347 NONAME ; #<VT>#
-	_ZTV25CTestMmfAclntOpenFile1211 @ 348 NONAME ; #<VT>#
-	_ZTV25CTestMmfAclntOpenFile7803 @ 349 NONAME ; #<VT>#
-	_ZTV25CTestMmfAclntOpenFile7804 @ 350 NONAME ; #<VT>#
-	_ZTV25CTestMmfAclntOpenFile7805 @ 351 NONAME ; #<VT>#
-	_ZTV25CTestMmfAclntOpenFile7806 @ 352 NONAME ; #<VT>#
-	_ZTV25CTestMmfAclntOpenFile7901 @ 353 NONAME ; #<VT>#
-	_ZTV25CTestMmfAclntOpenFile7902 @ 354 NONAME ; #<VT>#
-	_ZTV25CTestMmfAclntOpenFile7904 @ 355 NONAME ; #<VT>#
-	_ZTV25CTestMmfAclntOpenFile7905 @ 356 NONAME ; #<VT>#
-	_ZTV25CTestMmfAclntOpenFile7906 @ 357 NONAME ; #<VT>#
-	_ZTV25CTestMmfAclntOpenFile7908 @ 358 NONAME ; #<VT>#
-	_ZTV25CTestMmfAclntOpenFile8801 @ 359 NONAME ; #<VT>#
-	_ZTV25CTestMmfAclntOpenToneFile @ 360 NONAME ; #<VT>#
-	_ZTV25CTestMmfAclntRecCloseOpen @ 361 NONAME ; #<VT>#
-	_ZTV25CTestMmfAclntRecStateTran @ 362 NONAME ; #<VT>#
-	_ZTV25CTestStepAudOutStreamOpen @ 363 NONAME ; #<VT>#
-	_ZTV25CTestStepAudOutStreamStop @ 364 NONAME ; #<VT>#
-	_ZTV26CTestMmfAclntAudioDuration @ 365 NONAME ; #<VT>#
-	_ZTV26CTestMmfAclntAudioPosition @ 366 NONAME ; #<VT>#
-	_ZTV26CTestMmfAclntConvertLength @ 367 NONAME ; #<VT>#
-	_ZTV26CTestMmfAclntConvertRepeat @ 368 NONAME ; #<VT>#
-	_ZTV26CTestMmfAclntDRMPlayerOpen @ 369 NONAME ; #<VT>#
-	_ZTV26CTestMmfAclntPriorityTones @ 370 NONAME ; #<VT>#
-	_ZTV26CTestMmfAclntRecFileAppend @ 371 NONAME ; #<VT>#
-	_ZTV26CTestMmfAclntRecFileSource @ 372 NONAME ; #<VT>#
-	_ZTV26CTestMmfAclntRecNoPlayback @ 373 NONAME ; #<VT>#
-	_ZTV26CTestMmfAclntToneCancelIni @ 374 NONAME ; #<VT>#
-	_ZTV26CTestMmfDRMAudioPlayerBase @ 375 NONAME ; #<VT>#
-	_ZTV27CTestMmfAclntAudioCloseOpen @ 376 NONAME ; #<VT>#
-	_ZTV27CTestMmfAclntAudioPlayerARN @ 377 NONAME ; #<VT>#
-	_ZTV27CTestMmfAclntMultiClientARN @ 378 NONAME ; #<VT>#
-	_ZTV27CTestMmfAclntRecRawFilePlay @ 379 NONAME ; #<VT>#
-	_ZTV27CTestStepAudInStreamNoUECap @ 380 NONAME ; #<VT>#
-	_ZTV27CTestStepAudInStreamSetGain @ 381 NONAME ; #<VT>#
-	_ZTV27CTestStepAudInStreamSetProp @ 382 NONAME ; #<VT>#
-	_ZTV27CTestStepAudOutStreamSetVol @ 383 NONAME ; #<VT>#
-	_ZTV28CTestMmfAclntAudioPlayVolume @ 384 NONAME ; #<VT>#
-	_ZTV28CTestMmfAclntAudioPlayWindow @ 385 NONAME ; #<VT>#
-	_ZTV28CTestMmfAclntAudioPlayerUtil @ 386 NONAME ; #<VT>#
-	_ZTV28CTestMmfAclntAudioRecordRamp @ 387 NONAME ; #<VT>#
-	_ZTV28CTestMmfAclntDRMRecorderPlay @ 388 NONAME ; #<VT>#
-	_ZTV28CTestMmfAclntRecNoRecordDesc @ 389 NONAME ; #<VT>#
-	_ZTV28CTestMmfAclntRecNoRecordFile @ 390 NONAME ; #<VT>#
-	_ZTV28CTestMmfAclntRecSrcAuBitrate @ 391 NONAME ; #<VT>#
-	_ZTV28CTestMmfDRMAudioRecorderBase @ 392 NONAME ; #<VT>#
-	_ZTV28CTestMmfOggAudioRecorderBase @ 393 NONAME ; #<VT>#
-	_ZTV28CTestStepAudInStreamGetBytes @ 394 NONAME ; #<VT>#
-	_ZTV28CTestStepAudOutStreamSetProp @ 395 NONAME ; #<VT>#
-	_ZTV29CTestMmfAclntDRMConverterFail @ 396 NONAME ; #<VT>#
-	_ZTV29CTestMmfAclntFileHandleSource @ 397 NONAME ; #<VT>#
-	_ZTV29CTestMmfAclntOpenWhileConvert @ 398 NONAME ; #<VT>#
-	_ZTV29CTestMmfAclntRecordDestFormat @ 399 NONAME ; #<VT>#
-	_ZTV29CTestMmfAclntRecordGetBalance @ 400 NONAME ; #<VT>#
-	_ZTV29CTestStepAudInStreamWithUECap @ 401 NONAME ; #<VT>#
-	_ZTV29CTestStepAudOutStreamGetBytes @ 402 NONAME ; #<VT>#
-	_ZTV29CTestStepAudOutStreamPosition @ 403 NONAME ; #<VT>#
-	_ZTV29CTestStepAudOutStreamSetPrior @ 404 NONAME ; #<VT>#
-	_ZTV29CTestStepAudioOutputStreamARN @ 405 NONAME ; #<VT>#
-	_ZTV30CTestMmfAclntAudioRecordVolume @ 406 NONAME ; #<VT>#
-	_ZTV30CTestMmfAclntConvertDestFormat @ 407 NONAME ; #<VT>#
-	_ZTV30CTestMmfAclntConvertSourceInfo @ 408 NONAME ; #<VT>#
-	_ZTV30CTestMmfAclntDRMPlayerNoRights @ 409 NONAME ; #<VT>#
-	_ZTV30CTestMmfAclntRecNoPlaybackDesc @ 410 NONAME ; #<VT>#
-	_ZTV30CTestMmfAclntRecNoPlaybackFile @ 411 NONAME ; #<VT>#
-	_ZTV30CTestMmfAclntRecPlayFileSource @ 412 NONAME ; #<VT>#
-	_ZTV30CTestMmfAclntRecordDestBitRate @ 413 NONAME ; #<VT>#
-	_ZTV30CTestMmfAclntRecordSetPriority @ 414 NONAME ; #<VT>#
-	_ZTV30CTestStepAudInStreamSetBalance @ 415 NONAME ; #<VT>#
-	_ZTV31CTestMmfAclntAudioPlayStopStart @ 416 NONAME ; #<VT>#
-	_ZTV31CTestMmfAclntConvertDestBitRate @ 417 NONAME ; #<VT>#
-	_ZTV31CTestMmfAclntRecFileForceFormat @ 418 NONAME ; #<VT>#
-	_ZTV31CTestMmfAclntRecordDestChannels @ 419 NONAME ; #<VT>#
-	_ZTV31CTestMmfAclntRecordDestDataType @ 420 NONAME ; #<VT>#
-	_ZTV31CTestStepAudInStreamSetPriority @ 421 NONAME ; #<VT>#
-	_ZTV31CTestStepAudOutStreamSetBalance @ 422 NONAME ; #<VT>#
-	_ZTV32CTestMmfAclntAudioPlayPauseStart @ 423 NONAME ; #<VT>#
-	_ZTV32CTestMmfAclntConvertDestDataType @ 424 NONAME ; #<VT>#
-	_ZTV32CTestMmfAclntDRMRecorderNoRights @ 425 NONAME ; #<VT>#
-	_ZTV33CTestMmfAclntDRMPlayerRightsCount @ 426 NONAME ; #<VT>#
-	_ZTV33CTestMmfAclntRecordDestSampleRate @ 427 NONAME ; #<VT>#
-	_ZTV33CTestMmfAudioPlayDRMEnableAgentUI @ 428 NONAME ; #<VT>#
-	_ZTV34CTestMdaAudioPlayerCallbackSupport @ 429 NONAME ; #<VT>#
-	_ZTV34CTestMmfAclntConvertDestSampleRate @ 430 NONAME ; #<VT>#
-	_ZTV34CTestMmfAclntRecordAudioDeviceMode @ 431 NONAME ; #<VT>#
-	_ZTV35CTestMmfAclntAudioPlayPausePlayTest @ 432 NONAME ; #<VT>#
-	_ZTV35CTestMmfAclntDRMRecorderRightsCount @ 433 NONAME ; #<VT>#
-	_ZTV35CTestMmfAclntRecBitrateRecordedFile @ 434 NONAME ; #<VT>#
-	_ZTV35CTestMmfAclntRecNoRecordForceFormat @ 435 NONAME ; #<VT>#
-	_ZTV36CTestMdaAudioRecorderCallbackSupport @ 436 NONAME ; #<VT>#
-	_ZTV36CTestMmfAudioRecPlayDRMEnableAgentUI @ 437 NONAME ; #<VT>#
-	_ZTV37CTestMmfAclntRecNoPlaybackForceFormat @ 438 NONAME ; #<VT>#
-	_ZTV37CTestMmfAudioPlayDRMDisableAutoIntent @ 439 NONAME ; #<VT>#
-	_ZTV39CTestMdaAudioMultiClientCallbackSupport @ 440 NONAME ; #<VT>#
-	_ZTV39CTestMmfAclntRecNoRecordForceFormatDesc @ 441 NONAME ; #<VT>#
-	_ZTV40CTestMdaAudioOutputStreamCallbackSupport @ 442 NONAME ; #<VT>#
-	_ZTV40CTestMmfAclntConvertDestNumberOfChannels @ 443 NONAME ; #<VT>#
-	_ZTV40CTestMmfAudioRecPlayDRMDisableAutoIntent @ 444 NONAME ; #<VT>#
-	_ZTV41CTestMmfAclntRecNoPlaybackForceFormatDesc @ 445 NONAME ; #<VT>#
-	_ZTV43CTestMmfAclntRecNoRecordDescForceController @ 446 NONAME ; #<VT>#
-	_ZTV43CTestMmfAclntRecNoRecordFileForceController @ 447 NONAME ; #<VT>#
-	_ZTV45CTestMmfAclntRecNoPlaybackDescForceController @ 448 NONAME ; #<VT>#
-	_ZTV45CTestMmfAclntRecNoPlaybackFileForceController @ 449 NONAME ; #<VT>#
-	_ZTVN20CTestStepAudInStream18CWriteBufferActiveE @ 450 NONAME ; #<VT>#
-	_ZTVN21CTestMmfAclntCaps001214CServerMonitorE @ 451 NONAME ; #<VT>#
-	_ZTVN21CTestMmfAclntCaps001414CServerMonitorE @ 452 NONAME ; #<VT>#
-	_ZTVN21CTestStepAudOutStream17CReadBufferActiveE @ 453 NONAME ; #<VT>#
-	_ZTI27CFsmAudioOutputStreamClient @ 454 NONAME ; #<TI>#
-	_ZTI30CTestStepAudioOutputStreamARN2 @ 455 NONAME ; #<TI>#
-	_ZTV27CFsmAudioOutputStreamClient @ 456 NONAME ; #<VT>#
-	_ZTV30CTestStepAudioOutputStreamARN2 @ 457 NONAME ; #<VT>#
-	_ZTI26CTestStepAudInStreamSglBuf @ 458 NONAME ; #<TI>#
-	_ZTV26CTestStepAudInStreamSglBuf @ 459 NONAME ; #<VT>#
-	_ZTI11CFsmTrigger @ 460 NONAME
-	_ZTI33CAsyncTestMmfAclntAudioPlayRepeat @ 461 NONAME
-	_ZTI33CAsyncTestMmfAclntAudioPlayerUtil @ 462 NONAME
-	_ZTI37CAsyncTestMmfAclntAudioPlayRepeatRamp @ 463 NONAME
-	_ZTI41CAsyncTestMmfAclntAudioNegativeRepeatPlay @ 464 NONAME
-	_ZTI41CAsyncTestMmfAclntAudioPlayNegativeRepeat @ 465 NONAME
-	_ZTI41CAsyncTestMmfAclntAudioRepeatPlayStopPlay @ 466 NONAME
-	_ZTI42CAsyncTestMmfAclntAudioPlayPauseRepeatPlay @ 467 NONAME
-	_ZTI42CAsyncTestMmfAclntAudioRepeatPlayPausePlay @ 468 NONAME
-	_ZTI43CAsyncTestMmfAclntAudioPlayRepeatRepeatPlay @ 469 NONAME
-	_ZTI43CAsyncTestMmfAclntAudioRepeatPlayRepeatPlay @ 470 NONAME
-	_ZTI48CAsyncTestMmfAclntAudioPlayRepeatPauseRepeatPlay @ 471 NONAME
-	_ZTI48CAsyncTestMmfAclntAudioRepeatPlayPauseRepeatPlay @ 472 NONAME
-	_ZTV11CFsmTrigger @ 473 NONAME
-	_ZTV33CAsyncTestMmfAclntAudioPlayRepeat @ 474 NONAME
-	_ZTV33CAsyncTestMmfAclntAudioPlayerUtil @ 475 NONAME
-	_ZTV37CAsyncTestMmfAclntAudioPlayRepeatRamp @ 476 NONAME
-	_ZTV41CAsyncTestMmfAclntAudioNegativeRepeatPlay @ 477 NONAME
-	_ZTV41CAsyncTestMmfAclntAudioPlayNegativeRepeat @ 478 NONAME
-	_ZTV41CAsyncTestMmfAclntAudioRepeatPlayStopPlay @ 479 NONAME
-	_ZTV42CAsyncTestMmfAclntAudioPlayPauseRepeatPlay @ 480 NONAME
-	_ZTV42CAsyncTestMmfAclntAudioRepeatPlayPausePlay @ 481 NONAME
-	_ZTV43CAsyncTestMmfAclntAudioPlayRepeatRepeatPlay @ 482 NONAME
-	_ZTV43CAsyncTestMmfAclntAudioRepeatPlayRepeatPlay @ 483 NONAME
-	_ZTV48CAsyncTestMmfAclntAudioPlayRepeatPauseRepeatPlay @ 484 NONAME
-	_ZTV48CAsyncTestMmfAclntAudioRepeatPlayPauseRepeatPlay @ 485 NONAME
-	_ZTI40CAsyncTestMmfAclntAudioRepeatForeverPlay @ 486 NONAME
-	_ZTV40CAsyncTestMmfAclntAudioRepeatForeverPlay @ 487 NONAME
-	_ZTI44CAsyncTestMmfAclntAudioRepeatPlayGetPosition @ 488 NONAME
-	_ZTV44CAsyncTestMmfAclntAudioRepeatPlayGetPosition @ 489 NONAME
-	_ZTI31CAsyncTestMmfAclntDRMRepeatPlay @ 490 NONAME
-	_ZTV31CAsyncTestMmfAclntDRMRepeatPlay @ 491 NONAME
-	_ZTI28CTestMmfAclntRepeatPlayAlloc @ 492 NONAME
-	_ZTI37CAsyncTestMmfAclntRepeatMultipleFiles @ 493 NONAME
-	_ZTI39CAsyncTestMmfAclntAudioRepeatBeforeOpen @ 494 NONAME
-	_ZTI47CAsyncTestMmfAclntAudioRepeatPlayRepositionPlay @ 495 NONAME
-	_ZTV28CTestMmfAclntRepeatPlayAlloc @ 496 NONAME
-	_ZTV37CAsyncTestMmfAclntRepeatMultipleFiles @ 497 NONAME
-	_ZTV39CAsyncTestMmfAclntAudioRepeatBeforeOpen @ 498 NONAME
-	_ZTV47CAsyncTestMmfAclntAudioRepeatPlayRepositionPlay @ 499 NONAME
-	_ZTI20CTestMmfAclntARN8109 @ 500 NONAME
-	_ZTI46CAsyncTestMmfAclntAudioSetPlayWindowRepeatPlay @ 501 NONAME
-	_ZTV20CTestMmfAclntARN8109 @ 502 NONAME
-	_ZTV46CAsyncTestMmfAclntAudioSetPlayWindowRepeatPlay @ 503 NONAME
-	_ZTI23CTestMmfAclntRecStopRec @ 504 NONAME
-	_ZTI23RMdaToneUtilityTestBase @ 505 NONAME
-	_ZTI24RMdaOutputStreamTestBase @ 506 NONAME
-	_ZTI25RMdaPlayerUtilityTestBase @ 507 NONAME
-	_ZTI25RMdaToneUtilityResumeTest @ 508 NONAME
-	_ZTI26RMdaOutputStreamResumeTest @ 509 NONAME
-	_ZTI30RMdaToneUtilityPauseNonA3fTest @ 510 NONAME
-	_ZTI30RMdaToneUtilityResumeThreeTest @ 511 NONAME
-	_ZTI31RMdaOutputStreamPauseNonA3FTest @ 512 NONAME
-	_ZTI31RMdaToneUtilityConfigResumeTest @ 513 NONAME
-	_ZTI32RMdaOutputStreamResumeThriceTest @ 514 NONAME
-	_ZTI33RMdaOutputStreamConfigInPauseTest @ 515 NONAME
-	_ZTI33RMdaToneUtilityNegPauseResumeTest @ 516 NONAME
-	_ZTI33RMdaToneUtilityPrepareInPauseTest @ 517 NONAME
-	_ZTI34RMdaOutputStreamInvalidFormatsTest @ 518 NONAME
-	_ZTI34RMdaToneUtilityPauseBeforePlayTest @ 519 NONAME
-	_ZTI35RMdaOutputStreamGetBytesInPauseTest @ 520 NONAME
-	_ZTI36RMdaPlayerUtilityPauseAndPlaySqnTest @ 521 NONAME
-	_ZTI36RMdaToneUtilityPlayPauseStopPlayTest @ 522 NONAME
-	_ZTI37RMdaOutputStreamPlayPauseStopPlayTest @ 523 NONAME
-	_ZTI39RMdaPlayerUtiliyPauseStopAndPlayWavTest @ 524 NONAME
-	_ZTI40RMdaOutputStreamInvalidConfigInPauseTest @ 525 NONAME
-	_ZTI40RMdaPlayerUtilityPauseAndPlayFormatsTest @ 526 NONAME
-	_ZTI40RMdaPlayerUtilityPauseStopAndPlaySqnTest @ 527 NONAME
-	_ZTI41RMdaPlayerUtilityQueryPauseAndPlayWavTest @ 528 NONAME
-	_ZTI42RMdaOutputStreamPauseResumeBeforeWriteTest @ 529 NONAME
-	_ZTI46RMdaPlayerUtilityPauseAndPlayThreeTimesSqnTest @ 530 NONAME
-	_ZTI55RMdaPlayerUtilityGetVolumeAndBalancePauseAndPlaySqnTest @ 531 NONAME
-	_ZTV23CTestMmfAclntRecStopRec @ 532 NONAME
-	_ZTV23RMdaToneUtilityTestBase @ 533 NONAME
-	_ZTV24RMdaOutputStreamTestBase @ 534 NONAME
-	_ZTV25RMdaPlayerUtilityTestBase @ 535 NONAME
-	_ZTV25RMdaToneUtilityResumeTest @ 536 NONAME
-	_ZTV26RMdaOutputStreamResumeTest @ 537 NONAME
-	_ZTV30RMdaToneUtilityPauseNonA3fTest @ 538 NONAME
-	_ZTV30RMdaToneUtilityResumeThreeTest @ 539 NONAME
-	_ZTV31RMdaOutputStreamPauseNonA3FTest @ 540 NONAME
-	_ZTV31RMdaToneUtilityConfigResumeTest @ 541 NONAME
-	_ZTV32RMdaOutputStreamResumeThriceTest @ 542 NONAME
-	_ZTV33RMdaOutputStreamConfigInPauseTest @ 543 NONAME
-	_ZTV33RMdaToneUtilityNegPauseResumeTest @ 544 NONAME
-	_ZTV33RMdaToneUtilityPrepareInPauseTest @ 545 NONAME
-	_ZTV34RMdaOutputStreamInvalidFormatsTest @ 546 NONAME
-	_ZTV34RMdaToneUtilityPauseBeforePlayTest @ 547 NONAME
-	_ZTV35RMdaOutputStreamGetBytesInPauseTest @ 548 NONAME
-	_ZTV36RMdaPlayerUtilityPauseAndPlaySqnTest @ 549 NONAME
-	_ZTV36RMdaToneUtilityPlayPauseStopPlayTest @ 550 NONAME
-	_ZTV37RMdaOutputStreamPlayPauseStopPlayTest @ 551 NONAME
-	_ZTV39RMdaPlayerUtiliyPauseStopAndPlayWavTest @ 552 NONAME
-	_ZTV40RMdaOutputStreamInvalidConfigInPauseTest @ 553 NONAME
-	_ZTV40RMdaPlayerUtilityPauseAndPlayFormatsTest @ 554 NONAME
-	_ZTV40RMdaPlayerUtilityPauseStopAndPlaySqnTest @ 555 NONAME
-	_ZTV41RMdaPlayerUtilityQueryPauseAndPlayWavTest @ 556 NONAME
-	_ZTV42RMdaOutputStreamPauseResumeBeforeWriteTest @ 557 NONAME
-	_ZTV46RMdaPlayerUtilityPauseAndPlayThreeTimesSqnTest @ 558 NONAME
-	_ZTV55RMdaPlayerUtilityGetVolumeAndBalancePauseAndPlaySqnTest @ 559 NONAME
-	_ZTI20CTestMmfAclntARN8110 @ 560 NONAME
-	_ZTI20CTestMmfAclntARN8111 @ 561 NONAME
-	_ZTI20CTestMmfAclntARN8112 @ 562 NONAME
-	_ZTV20CTestMmfAclntARN8110 @ 563 NONAME
-	_ZTV20CTestMmfAclntARN8111 @ 564 NONAME
-	_ZTV20CTestMmfAclntARN8112 @ 565 NONAME
-
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/eabi/TSI_MMFCustomCommandsU.DEF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-EXPORTS
-	_ZN21RTSIMmfCustomCommands15GetAudioQualityER5TDes8 @ 1 NONAME
-	_ZN21RTSIMmfCustomCommands15SetAudioQualityERK6TDesC8 @ 2 NONAME
-	_ZN21RTSIMmfCustomCommands4NewLER14RMMFController4TUid @ 3 NONAME
-	_ZN21RTSIMmfCustomCommands5NewLCER14RMMFController4TUid @ 4 NONAME
-	_ZN26CTSIMmfCustomCommandParser13HandleRequestER11TMMFMessage @ 5 NONAME
-	_ZN26CTSIMmfCustomCommandParser4NewLE4TUid @ 6 NONAME
-	_ZN26CTSIMmfCustomCommandParser5NewLCE4TUid @ 7 NONAME
-	_ZTI26CTSIMmfCustomCommandParser @ 8 NONAME ; #<TI>#
-	_ZTV26CTSIMmfCustomCommandParser @ 9 NONAME ; #<VT>#
-
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/eabi/TSI_MMFVCLNTU.DEF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	_Z13NewTestSuiteLv @ 1 NONAME
-
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/eabi/TSI_MmfCtlfrmU.DEF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	_Z13NewTestSuiteLv @ 1 NONAME
-
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/group/BLD.INF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,281 +0,0 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-PRJ_PLATFORMS
-DEFAULT
-// DEFAULT MISA 
-// WINS ARMI THUMB
-// MINT
-
-#ifdef SYMBIAN_MULTIMEDIA_CODEC_API
-#include "../devsound/group/bld.inf"
-#include "../devvideo/group/bld.inf"
-#endif // SYMBIAN_MULTIMEDIA_CODEC_API
-
-#ifdef SYMBIAN_VARIABLE_BITRATE_CODEC // use system wide flag to trigger model controler build
-#define SYMBIAN_MMF_MODEL_CONTROLLERS
-#endif
-
-//#ifdef SYMBIAN_MMF_MODEL_CONTROLLERS //This is commented as this test harness needs to be built for 9.2 as well.
-#include "../vclntavi/group/bld.inf"
-//#endif
-
-PRJ_MMPFILES
-
-// Server for Capability testing
-../mmpfiles/DSCapTestServer.mmp
-../ACLNT/CapTestServer/group/CapTestServer.mmp
-../SDevSound/SDSCapTestServer/group/SDSCapTestServer.mmp
-../SDevSound/SDSCapTestServer/group/SDSMMDDTestServer.mmp
-
-
-// TSI_WP5 files
-// Add ../SoundDev build instructions - NOTE - Must be inserted here in MMP list
-../mmpfiles/TSI_MMFACLNT.mmp
-../mmpfiles/TSI_MMFUseOldCodecAudioController.mmp
-../mmpfiles/TSI_MMFVCLNT.mmp
-
-// MMF Controller files
-../mmpfiles/TSI_MMFDataSink.mmp
-../mmpfiles/TSI_MMFDataSource.mmp
-../mmpfiles/TSI_MMFCustomCommands.mmp
-../mmpfiles/TSI_MMFController.mmp
-../mmpfiles/TSI_MMFController2.mmp
-../mmpfiles/TSI_MMFCTLFRM.mmp
-../mmpfiles/TSI_MMFFORMAT.mmp
-
-// MMF recognizer files
-#ifndef SYMBIAN_USE_MMF_RUF_RECOGNIZER
-../mmpfiles/TSI_MMFRECOG.mmp
-#endif
-
-// Secure DEVSOUND
-../mmpfiles/TSI_MMF_SDEVSOUND.mmp
-
-PRJ_EXPORTS
-// common
-../group/IntTest_Mmf.iby			/epoc32/rom/include/inttest_mmf.iby
-
-// ACLNT scripts
-../scriptFiles/TSI_MMF_ACLNT_00.script		c:/tsi_mmf_aclnt_00.script
-../scriptFiles/TSI_MMF_ACLNT_01.script		c:/tsi_mmf_aclnt_01.script
-../scriptFiles/TSI_MMF_ACLNT_02.script		c:/tsi_mmf_aclnt_02.script
-../scriptFiles/TSI_MMF_ACLNT_03.script		c:/tsi_mmf_aclnt_03.script
-../scriptFiles/TSI_MMF_ACLNT_04.script		c:/tsi_mmf_aclnt_04.script
-../scriptFiles/TSI_MMF_ACLNT_Panic.script	c:/tsi_mmf_aclnt_panic.script
-../scriptFiles/audio.ini			c:/audio.ini
-../scriptFiles/tsi_mmf_aclnt_00_not_ne.script			c:/tsi_mmf_aclnt_00_not_ne.script
-../scriptFiles/TSI_MMF_ACLNT_00_PREEMPTION.script		c:/tsi_mmf_aclnt_00_preemption.script
-../scriptFiles/TSI_MMF_ACLNT_01_PREEMPTION.script		c:/tsi_mmf_aclnt_01_preemption.script
-../scriptFiles/TSI_MMF_ACLNT_03_PREEMPTION.script		c:/tsi_mmf_aclnt_03_preemption.script
-
-#ifdef SYMBIAN_MULTIMEDIA_A3FDEVSOUND	
-../scriptFiles/tsi_mmf_aclnt_00_truepause.script		c:/tsi_mmf_aclnt_00_truepause.script
-../scriptFiles/tsi_mmf_aclnt_03_truepause.script		c:/tsi_mmf_aclnt_03_truepause.script
-#else
-../scriptFiles/tsi_mmf_aclnt_00_nona3f.script		c:/tsi_mmf_aclnt_00_nona3f.script
-../scriptFiles/tsi_mmf_aclnt_03_nona3f.script		c:/tsi_mmf_aclnt_03_nona3f.script
-#endif
-
-// VCLNT scripts
-../scriptFiles/TSI_MMF_VCLNT_WM.script		c:/tsi_mmf_vclnt_wm.script
-../scriptFiles/video.ini			c:/video.ini
-
-// CTLFRM scripts
-../scriptFiles/TSI_MMF_CTLFRM.script		c:/tsi_mmf_ctlfrm.script
-../scriptFiles/TSI_MMF_CTLFRM_POS.script	c:/tsi_mmf_ctlfrm_pos.script
-../scriptFiles/TSI_MMF_CTLFRM_NEG.script	c:/tsi_mmf_ctlfrm_neg.script
-../scriptFiles/TSI_MMF_CTLFRM_PREEMPTION.script	c:/tsi_mmf_ctlfrm_preemption.script
-../scriptFiles/TSI_MMF_CTLFRM_POS_PREEMPTION.script	c:/tsi_mmf_ctlfrm_pos_preemption.script
-../scriptFiles/TSI_MMF_CTLFRM_NEG_PREEMPTION.script	c:/tsi_mmf_ctlfrm_neg_preemption.script
-
-#ifndef SYMBIAN_USE_MMF_RUF_RECOGNIZER
-// RECOG scripts
-../scriptFiles/TSI_MMF_RECOG.script		c:/tsi_mmf_recog.script
-../scriptFiles/TSI_MMF_RECOG_ALLOC.script	c:/tsi_mmf_recog_alloc.script
-#endif
-
-// Secure DevSound scripts
-../scriptFiles/TSI_MMF_SDEVSOUND_01.script	c:/tsi_mmf_sdevsound_01.script
-../scriptFiles/TSI_MMF_SDEVSOUND_01_Panic.script	c:/tsi_mmf_sdevsound_01_panic.script
-../scriptFiles/TSI_MMF_ACLNT_SD.script		c:/tsi_mmf_aclnt_sd.script
-../scriptFiles/TSI_MMF_ACLNT_SD_NOCAP.script	c:/tsi_mmf_aclnt_sd_nocap.script
-../scriptFiles/TSI_MMF_ACLNT_SD_MMDDCAP.script	c:/tsi_mmf_aclnt_sd_mmddcap.script
-../scriptFiles/TSI_MMF_ACLNT_SD_UECAP.script	c:/tsi_mmf_aclnt_sd_uecap.script
-../scriptFiles/TSI_MMF_SDEVSOUND_NOCAP.script	c:/tsi_mmf_sdevsound_nocap.script
-../scriptFiles/TSI_MMF_SDEVSOUND_MMDDCAP.script	c:/tsi_mmf_sdevsound_mmddcap.script
-../scriptFiles/TSI_MMF_SDEVSOUND_UECAP.script	c:/tsi_mmf_sdevsound_uecap.script
-../scriptFiles/TSI_MMF_ACLNT_SD_PREEMPTION.script		c:/tsi_mmf_aclnt_sd_preemption.script
-../scriptFiles/TSI_MMF_SDEVSOUND_01_PREEMPTION.script	c:/tsi_mmf_sdevsound_01_preemption.script
-
-// VCLNT scripts (additional)
-../scriptFiles/TSI_MMF_VCLNT_OF.script		c:/tsi_mmf_vclnt_of.script
-../scriptFiles/TSI_MMF_VCLNT_OF_ALLOC.script	c:/tsi_mmf_vclnt_of_alloc.script
-
-// ACLNT scripts (additional)
-../scriptFiles/TSI_MMF_ACLNT_OF.script		c:/tsi_mmf_aclnt_of.script
-../scriptFiles/TSI_MMF_ACLNT_OF_ALLOC.script	c:/tsi_mmf_aclnt_of_alloc.script
-
-../scriptFiles/TSI_MMF_ACLNT_FS.script		c:/tsi_mmf_aclnt_fs.script
-../scriptFiles/TSI_MMF_ACLNT_DRM.script		c:/tsi_mmf_aclnt_drm.script
-
-// ACLNT scripts for Audio Resource Notification Tests
-../scriptFiles/TSI_MMF_ACLNT_ARN.script		c:/tsi_mmf_aclnt_arn.script
-
-#ifdef SYMBIAN_MMF_MODEL_CONTROLLERS
-// ACLNT for Ogg-Vorbis
-../scriptFiles/TSI_MMF_ACLNTOGG_PLAY.script     c:/tsi_mmf_aclntogg_play.script
-../scriptFiles/TSI_MMF_ACLNTOGG_REC.script      c:/tsi_mmf_aclntogg_rec.script
-../scriptFiles/TSI_MMF_ACLNTOGG_ALLOC.script    c:/tsi_mmf_aclntogg_alloc.script
-../scriptFiles/TSI_MMF_ACLNTOGG_DRM.script      c:/tsi_mmf_aclntogg_drm.script
-../scriptFiles/TSI_MMF_ACLNTOGG_PLAY_PREEMPTION.script     c:/tsi_mmf_aclntogg_play_preemption.script
-../scriptFiles/TSI_MMF_ACLNTOGG_REC_PREEMPTION.script     c:/tsi_mmf_aclntogg_rec_preemption.script
-../scriptFiles/TSI_MMF_ACLNTOGG_APR.script      c:/tsi_mmf_aclntogg_apr.script
-
-#endif
-
-// SecureDRM scripts
-../scriptFiles/TSI_MMF_SECUREDRM_VIDEO_MMDDCAP.script	c:/tsi_mmf_securedrm_video_mmddcap.script
-../scriptFiles/TSI_MMF_SECUREDRM_AUDIO.script	c:/tsi_mmf_securedrm_audio.script
-../scriptFiles/TSI_MMF_SECUREDRM_AUDIO_MMDDCAP.script	c:/tsi_mmf_securedrm_audio_mmddcap.script
-../scriptFiles/TSI_MMF_SECUREDRM_TESTDATA.script	c:/tsi_mmf_securedrm_testdata.script
-../scriptFiles/securedrm_audio.ini				c:/securedrm_audio.ini
-../scriptFiles/securedrm_video.ini				c:/securedrm_video.ini
-../scriptFiles/securedrm_testdata.ini			c:/securedrm_testdata.ini
-
-// audio test files
-
-../ACLNT/Data/16bitmPcm.wav		c:/aclntitestdata/16bitmpcm.wav
-../ACLNT/Data/8bitmAlaw.wav		c:/aclntitestdata/8bitmalaw.wav
-../ACLNT/Data/8bitmPcm.wav		c:/aclntitestdata/8bitmpcm.wav
-../ACLNT/Data/8bitmPcm-6144bytes.wav    c:/aclntitestdata/8bitmpcm-6144bytes.wav
-../ACLNT/Data/8bitmuLaw.wav		c:/aclntitestdata/8bitmulaw.wav
-../ACLNT/Data/8bitmUPCM.raw		c:/aclntitestdata/8bitmupcm.raw
-../ACLNT/Data/Gsm610.wav		c:/aclntitestdata/gsm610.wav
-../ACLNT/Data/IMAD.wav			c:/aclntitestdata/imad.wav
-../ACLNT/Data/IMAS.wav			c:/aclntitestdata/imas.wav
-../ACLNT/Data/PCMU16BE.wav		c:/aclntitestdata/pcmu16be.wav
-../ACLNT/Data/PCMU16.wav		c:/aclntitestdata/pcmu16.wav
-../ACLNT/Data/mainTst.wav		c:/aclntitestdata/maintst.wav
-../ACLNT/Data/small.wav			c:/aclntitestdata/small.wav
-../ACLNT/Data/small.au			c:/aclntitestdata/small.au
-../ACLNT/Data/test.wav			c:/aclntitestdata/test.wav
-../ACLNT/Data/test16m2.au		c:/aclntitestdata/test16m2.au
-../ACLNT/Data/test16m2.wav		c:/aclntitestdata/test16m2.wav
-../ACLNT/Data/test2.wav			c:/aclntitestdata/test2.wav
-../ACLNT/Data/unsupported.wav		c:/aclntitestdata/unsupported.wav
-../ACLNT/Data/alf-noproblem.wav		c:/aclntitestdata/alf-noproblem.wav
-../ACLNT/Data/100khzSRate1KhzTone.wav	c:/aclntitestdata/100khzsrate1khztone.wav
-../ACLNT/Data/7.33khzSRate1KhzTone.wav	c:/aclntitestdata/7.33khzsrate1khztone.wav
-../ACLNT/Data/OneSample.wav		c:/aclntitestdata/onesample.wav
-../ACLNT/Data/sequence1.sqn		c:/aclntitestdata/sequence1.sqn
-../ACLNT/Data/sequence2.sqn		c:/aclntitestdata/sequence2.sqn
-../ACLNT/Data/16bitmPcm.xxx		c:/aclntitestdata/16bitmpcm.xxx
-../ACLNT/Data/explo.wav			c:/aclntitestdata/explo.wav
-../ACLNT/Data/drmwavfile.drm		c:/aclntitestdata/drmwavfile.drm
-
-//TruePause
-../ACLNT/Data/imad2.wav			c:/aclntitestdata/imad2.wav
-
-../ACLNT/Data/Pcm16bitMono.wav		c:/aclntitestdata/pcm16bitmono.wav
-../ACLNT/Data/PCM16bitStereo.wav	c:/aclntitestdata/pcm16bitstereo.wav
-../ACLNT/Data/PCM16bitMono.au		c:/aclntitestdata/pcm16bitmono.au
-../ACLNT/Data/PCM16bitStereo.au		c:/aclntitestdata/pcm16bitstereo.au
-
-../ACLNT/Data/PCM8BitMono.wav		c:/aclntitestdata/pcm8bitmono.wav
-../ACLNT/Data/PCM8BitStereo.wav		c:/aclntitestdata/pcm8bitstereo.wav	
-../ACLNT/Data/PCM8bitMono.au		c:/aclntitestdata/pcm8bitmono.au
-../ACLNT/Data/PCM8bitStereo.au		c:/aclntitestdata/pcm8bitstereo.au
-
-../ACLNT/Data/8bitmuPcm.wav		c:/aclntitestdata/8bitmupcm.wav
-../ACLNT/Data/mainTst2.wav		c:/aclntitestdata/maintst2.wav
-../ACLNT/Data/main.wav			c:/aclntitestdata/main.wav
-../ACLNT/Data/test.raw			c:/aclntitestdata/test.raw
-//..\aclnt\data\noexist.wav		C:\AclntITestData\noexist.wav
-../ACLNT/Data/pcm8mono44khz.wav         c:/aclntitestdata/pcm8mono44khz.wav
-../ACLNT/Data/pcm16mono44khz.wav         c:/aclntitestdata/pcm16mono44khz.wav
-../ACLNT/Data/pcm16mono48khz.wav         c:/aclntitestdata/pcm16mono48khz.wav
-../ACLNT/Data/pcm16mono12khz.wav         c:/aclntitestdata/pcm16mono12khz.wav
-../ACLNT/Data/pcm16mono24khz.wav         c:/aclntitestdata/pcm16mono24khz.wav
-
-../ACLNT/Data/A.txt		c:/aclntitestdata/a.txt
-../ACLNT/Data/B.txt		c:/aclntitestdata/b.txt
-../ACLNT/Data/G.txt		c:/aclntitestdata/g.txt
-../ACLNT/Data/Gif.txt		c:/aclntitestdata/gif.txt
-../ACLNT/Data/I.txt		c:/aclntitestdata/i.txt
-../ACLNT/Data/M.txt		c:/aclntitestdata/m.txt
-../ACLNT/Data/R.txt		c:/aclntitestdata/r.txt
-
-../ACLNT/Data/recog_wav.wav	c:/aclntitestdata/recog_wav.wav
-../ACLNT/Data/recog_wav.au	c:/aclntitestdata/recog_wav.au
-../ACLNT/Data/recog_wav		c:/aclntitestdata/recog_wav
-../ACLNT/Data/recog_au.au	c:/aclntitestdata/recog_au.au
-../ACLNT/Data/recog_au.wav	c:/aclntitestdata/recog_au.wav
-../ACLNT/Data/recog_raw.wav	c:/aclntitestdata/recog_raw.wav
-
-// SYMBIAN_CAF_V2
-../ACLNT/Data/Audio.content			c:/aclntitestdata/audio.content
-../ACLNT/Data/Audio.contentrights		c:/aclntitestdata/audio.contentrights
-#ifdef SYMBIAN_MMF_MODEL_CONTROLLERS
-../ACLNT/Data/AudioOgg.content			c:/aclntitestdata/audioogg.content
-../ACLNT/Data/AudioOgg.contentrights		c:/aclntitestdata/audioogg.contentrights
-#endif
-
-// video test files
-../vclnt/data/LongVideo.dummy		c:/vclntitestdata/longvideo.dummy
-../vclnt/data/ShortVideo.dummy		c:/vclntitestdata/shortvideo.dummy
-../vclnt/data/DRMVideo.drm		c:/vclntitestdata/drmvideo.drm
-
-// controller framework test files
-
-../Ctlfrm/data/test.wav			c:/tsimmfctlfrmdata/test.wav
-../Ctlfrm/data/test2.wav		c:/tsimmfctlfrmdata/test2.wav
-../Ctlfrm/data/Test.abc			c:/aclntitestdata/test.abc
-../Ctlfrm/data/Test.xyz			c:/aclntitestdata/test.xyz
-
-
-// Secure DEVSOUND data files
-../SDevSound/data/PCM_08_16_m.raw		c:/sdevsoundinttestdata/pcm_08_16_m.raw
-../SDevSound/data/8bitmPcm.wav			c:/sdevsoundinttestdata/8bitmpcm.wav
-../SDevSound/data/mainTst.wav			c:/sdevsoundinttestdata/maintst.wav
-
-// Media Access by File Handle test files
-../ACLNT/Data/textOutput.wav			c:/aclntitestdata/textoutput.wav
-../ACLNT/Data/textInput.wav			c:/aclntitestdata/textinput.wav
-../vclnt/data/textOutput.dummy			c:/vclntitestdata/textoutput.dummy
-../vclnt/data/textInput.dummy			c:/vclntitestdata/textinput.dummy
-
-// Used by  SYMBIAN_CAF_V2 and SYMBIAN_MMF_AUTOPAUSE_RESUME
-../ACLNT/Data/mainTst3.wav			c:/aclntitestdata/maintst3.wav
-
-// Audio Resource Notification test data files
-../ACLNT/Data/test2.raw				c:/aclntitestdata/test2.raw
-../ACLNT/Data/test3.raw				c:/aclntitestdata/test3.raw
-
-#ifdef SYMBIAN_MMF_MODEL_CONTROLLERS
-// ACLNT for Ogg-Vorbis
-../ACLNT/Data/MainTst.ogg		c:/aclntitestdata/maintst.ogg
-../ACLNT/Data/MainTst2.ogg		c:/aclntitestdata/maintst2.ogg
-../ACLNT/Data/MainTst3.ogg		c:/aclntitestdata/maintst3.ogg
-../ACLNT/Data/small.ogg			c:/aclntitestdata/small.ogg
-#endif
-
-// SecureDRM test data
-../SecureDRM/data/audiocontent2.xml	c:/securedrm/audiocontent2.xml
-../SecureDRM/data/audiorights2.xml	c:/securedrm/audiorights2.xml
-../SecureDRM/data/videocontent2.xml	c:/securedrm/videocontent2.xml
-../SecureDRM/data/videorights2.xml	c:/securedrm/videorights2.xml
-../SecureDRM/data/small.wav	   		c:/securedrm/small.wav
-../SecureDRM/data/xvidonly.avi		c:/securedrm/xvidonly.avi
\ No newline at end of file
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/group/IntTest_Mmf.iby	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/group/IntTest_Mmf.iby	Fri Jul 09 12:23:13 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -16,53 +16,14 @@
 #ifndef __INTTEST_MMF_IBY__
 #define __INTTEST_MMF_IBY__
 
-#ifdef SYMBIAN_VARIABLE_BITRATE_CODEC // use system wide flag to trigger model controller build
-#define SYMBIAN_MMF_MODEL_CONTROLLERS
-#endif
-
-file=ABI_DIR\BUILD_DIR\TSI_MMFACLNT.DLL 	System\Libs\TSI_MMFACLNT.DLL
-file=ABI_DIR\BUILD_DIR\TSI_MMFVCLNT.DLL 	System\Libs\TSI_MMFVCLNT.DLL
-file=ABI_DIR\BUILD_DIR\TSI_MMFCTLFRM.DLL 	System\Libs\TSI_MMFCTLFRM.DLL
-
-#ifndef SYMBIAN_USE_MMF_RUF_RECOGNIZER
-file=ABI_DIR\BUILD_DIR\TSI_MMFRECOG.DLL 	System\Libs\TSI_MMFRECOG.DLL
-#endif
-
-file=ABI_DIR\BUILD_DIR\TSI_MMF_SDEVSOUND.dll 	System\Libs\TSI_MMF_SDEVSOUND.dll
-file=ABI_DIR\DEBUG_DIR\CapTestServer.exe	System\Libs\CapTestServer.exe
-file=ABI_DIR\DEBUG_DIR\DSCapTestServer.exe	System\Libs\DSCapTestServer.exe
-file=ABI_DIR\DEBUG_DIR\SDSCapTestServer.exe	System\Libs\SDSCapTestServer.exe
+#include <IntTest_Mmf_excl_test.iby>
+#include <sdevsound_test.iby>
 
 //ini
 data=EPOCROOT##epoc32\data\c\audio.ini        			\audio.ini
-data=EPOCROOT##epoc32\data\c\video.ini        			\video.ini
 data=EPOCROOT##epoc32\data\c\securedrm_testdata.ini             \securedrm_testdata.ini
-data=EPOCROOT##epoc32\data\c\securedrm_video.ini                \securedrm_video.ini
 data=EPOCROOT##epoc32\data\c\securedrm_audio.ini                \securedrm_audio.ini
 
-// plugins for ACLNT
-ECOM_PLUGIN(tsi_mmfuseoldcodecaudiocontroller.dll,101f7d39.rsc)
-
-// plugins for CTLFRM
-
-ECOM_PLUGIN(tsi_mmfcontroller.dll,101f7bf9.rsc)
-ECOM_PLUGIN(tsi_mmfcontroller2.dll,101f7bfb.rsc)
-file=ABI_DIR\BUILD_DIR\TSI_MMFCUSTOMCOMMANDS.DLL 	System\Libs\TSI_MMFCUSTOMCOMMANDS.DLL
-
-ECOM_PLUGIN(tsi_mmfdatasink.dll,101f7bfd.rsc)
-ECOM_PLUGIN(tsi_mmfdatasource.dll,101f7bff.rsc)
-
-ECOM_PLUGIN(CUSTOMMMFAUDIOCONTROLLER.DLL,101f7d29.rsc)
-
-ECOM_PLUGIN(tsi_mmfformat.dll,101ffa10.rsc)
-
-// plugins for VCLNT
-
-file=ABI_DIR\BUILD_DIR\TS_CMMFVideoTestCustomCommands.dll 	System\Libs\TS_CMMFVideoTestCustomCommands.dll
-ECOM_PLUGIN(TS_VideoInput.dll,101f7f8c.rsc)
-ECOM_PLUGIN(TS_VideoOutput.dll,101f7f8d.rsc)
-ECOM_PLUGIN(TS_VideoTestFormat.dll,101f7f89.rsc)
-
 
 // scripts
 
@@ -93,10 +54,6 @@
 data=EPOCROOT##epoc32\data\c\tsi_mmf_aclnt_03_nona3f.script        	\tsi_mmf_aclnt_03_nona3f.script
 #endif // SYMBIAN_MULTIMEDIA_A3FDEVSOUND
 
-data=EPOCROOT##epoc32\data\c\TSI_MMF_VCLNT.script        	\TSI_MMF_VCLNT.script
-data=EPOCROOT##epoc32\data\c\TSI_MMF_VCLNT_OF.script        	\TSI_MMF_VCLNT_OF.script
-data=EPOCROOT##epoc32\data\c\TSI_MMF_VCLNT_OF_ALLOC.script      \TSI_MMF_VCLNT_OF_ALLOC.script
-
 data=EPOCROOT##epoc32\data\c\TSI_MMF_CTLFRM.script        	\TSI_MMF_CTLFRM.script
 data=EPOCROOT##epoc32\data\c\TSI_MMF_CTLFRM_POS.script        	\TSI_MMF_CTLFRM_POS.script
 data=EPOCROOT##epoc32\data\c\TSI_MMF_CTLFRM_NEG.script        	\TSI_MMF_CTLFRM_NEG.script
@@ -110,11 +67,8 @@
 data=EPOCROOT##epoc32\data\c\TSI_MMF_RECOG_ALLOC.script       	\TSI_MMF_RECOG_ALLOC.script
 #endif
 
-data=EPOCROOT##epoc32\data\c\TSI_MMF_SDEVSOUND_01.script        \TSI_MMF_SDEVSOUND_01.script
 data=EPOCROOT##epoc32\data\c\TSI_MMF_ACLNT_SD.script        	\TSI_MMF_ACLNT_SD.script
-data=EPOCROOT##epoc32\data\c\TSI_MMF_SDEVSOUND_NOCAP.script     \TSI_MMF_SDEVSOUND_NOCAP.script
 
-data=EPOCROOT##epoc32\data\c\TSI_MMF_SDEVSOUND_01_PREEMPTION.script        \TSI_MMF_SDEVSOUND_01_PREEMPTION.script
 data=EPOCROOT##epoc32\data\c\TSI_MMF_ACLNT_SD_PREEMPTION.script        	\TSI_MMF_ACLNT_SD_PREEMPTION.script
 
 data=EPOCROOT##epoc32\data\c\TSI_MMF_ACLNT_FS.script	\TSI_MMF_ACLNT_FS.script
@@ -136,7 +90,6 @@
 
 // Scripts for SecureDRM
 data=EPOCROOT##epoc32\data\c\tsi_mmf_securedrm_testdata.script      \tsi_mmf_securedrm_testdata.script
-data=EPOCROOT##epoc32\data\c\tsi_mmf_securedrm_video_mmddcap.script         \tsi_mmf_securedrm_video_mmddcap.script
 data=EPOCROOT##epoc32\data\c\tsi_mmf_securedrm_audio_mmddcap.script         \tsi_mmf_securedrm_audio_mmddcap.script
 
 // data
@@ -184,8 +137,6 @@
 // Media Access by File Handles
 data=EPOCROOT##epoc32\data\c\AclntITestData\textInput.wav	\AclntITestData\textInput.wav
 data=EPOCROOT##epoc32\data\c\AclntITestData\textOutput.wav	\AclntITestData\textOutput.wav
-data=EPOCROOT##epoc32\data\c\VclntITestData\textInput.wav	\VclntITestData\textInput.wav
-data=EPOCROOT##epoc32\data\c\VclntITestData\textOutput.wav	\VclntITestData\textOutput.wav
 
 // SYMBIAN_CAF_V2
 data=EPOCROOT##epoc32\data\c\AclntITestData\Audio.content			\AclntITestData\Audio.content
@@ -195,10 +146,6 @@
 data=EPOCROOT##epoc32\data\c\AclntITestData\AudioOgg.contentrights		\AclntITestData\AudioOgg.contentrights
 #endif
 
-// SYMBIAN_CAF_V2
-data=EPOCROOT##epoc32\data\c\VclntITestData\Video.contentrights		\VclntITestData\Video.contentrights
-data=EPOCROOT##epoc32\data\c\VclntITestData\Video.content			\VclntITestData\Video.content
-
 REM test files - au
 data=\epoc32\data\c\aclnt_05itestdata\8bitPCM.au	\aclnt_05itestdata\8bitPCM.au
 data=\epoc32\data\c\aclnt_05itestdata\16bitPCM.au	\aclnt_05itestdata\16bitPCM.au
@@ -240,10 +187,6 @@
 data=\epoc32\data\c\aclnt_05itestdata\Corr_Datasize_longer.au           \aclnt_05itestdata\Corr_Datasize_longer.au
 data=\epoc32\data\c\aclnt_05itestdata\Corr_Datasize_shorter.au          \aclnt_05itestdata\Corr_Datasize_shorter.au
 
-data=EPOCROOT##epoc32\data\c\sdevsoundinttestdata\PCM_08_16_m.raw     	\sdevsoundinttestdata\PCM_08_16_m.raw
-data=EPOCROOT##epoc32\data\c\sdevsoundinttestdata\8bitmPcm.wav     	\sdevsoundinttestdata\8bitmPcm.wav
-data=EPOCROOT##epoc32\data\c\sdevsoundinttestdata\mainTst.wav         	\sdevsoundinttestdata\mainTst.wav
-
 // test files - Audio Resource Notification (ARN)
 data=EPOCROOT##epoc32\data\c\AclntITestData\mainTst3.wav	\AclntITestData\mainTst3.wav
 data=EPOCROOT##epoc32\data\c\AclntITestData\test2.raw		\AclntITestData\test2.raw
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -0,0 +1,71 @@
+// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRJ_PLATFORMS
+DEFAULT
+// DEFAULT MISA 
+// WINS ARMI THUMB
+// MINT
+
+#include "videoGroup/bld.inf"
+
+#ifdef SYMBIAN_MULTIMEDIA_CODEC_API
+#include "../devsound/group/bld.inf"
+#endif // SYMBIAN_MULTIMEDIA_CODEC_API
+
+#ifdef SYMBIAN_VARIABLE_BITRATE_CODEC // use system wide flag to trigger model controler build
+#define SYMBIAN_MMF_MODEL_CONTROLLERS
+#endif
+
+#include "../SDevsound/group/bld.inf"
+#include "../ACLNT/group/bld.inf"
+#include "../CTLFRM/group/bld.inf"
+#include "../SecureDRM/group/bld.inf"
+
+
+PRJ_MMPFILES
+
+PRJ_TESTEXPORTS
+// common
+../group/IntTest_Mmf.iby			/epoc32/rom/include/inttest_mmf.iby
+../group/IntTest_Mmf_excl_test.iby			/epoc32/rom/include/inttest_mmf_excl_test.iby
+
+
+PRJ_EXPORTS
+
+#ifdef SYMBIAN_MMF_MODEL_CONTROLLERS
+// ACLNT for Ogg-Vorbis
+../scriptFiles/TSI_MMF_ACLNTOGG_PLAY.script     c:/tsi_mmf_aclntogg_play.script
+../scriptFiles/TSI_MMF_ACLNTOGG_REC.script      c:/tsi_mmf_aclntogg_rec.script
+../scriptFiles/TSI_MMF_ACLNTOGG_ALLOC.script    c:/tsi_mmf_aclntogg_alloc.script
+../scriptFiles/TSI_MMF_ACLNTOGG_DRM.script      c:/tsi_mmf_aclntogg_drm.script
+../scriptFiles/TSI_MMF_ACLNTOGG_PLAY_PREEMPTION.script     c:/tsi_mmf_aclntogg_play_preemption.script
+../scriptFiles/TSI_MMF_ACLNTOGG_REC_PREEMPTION.script     c:/tsi_mmf_aclntogg_rec_preemption.script
+../scriptFiles/TSI_MMF_ACLNTOGG_APR.script      c:/tsi_mmf_aclntogg_apr.script
+
+#endif
+
+#ifdef SYMBIAN_MMF_MODEL_CONTROLLERS
+../ACLNT/Data/AudioOgg.content			c:/aclntitestdata/audioogg.content
+../ACLNT/Data/AudioOgg.contentrights		c:/aclntitestdata/audioogg.contentrights
+#endif
+
+#ifdef SYMBIAN_MMF_MODEL_CONTROLLERS
+// ACLNT for Ogg-Vorbis
+../ACLNT/Data/MainTst.ogg		c:/aclntitestdata/maintst.ogg
+../ACLNT/Data/MainTst2.ogg		c:/aclntitestdata/maintst2.ogg
+../ACLNT/Data/MainTst3.ogg		c:/aclntitestdata/maintst3.ogg
+../ACLNT/Data/small.ogg			c:/aclntitestdata/small.ogg
+#endif
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/mmpfiles/DSCapTestServer.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Using relative paths for sourcepath and user includes
-// 
-//
-
-
-TARGET      dscaptestserver.exe
-CAPABILITY ALL -TCB
-TARGETTYPE  exe
-UID             0x1000007A 0x101FFA22
-VENDORID 0x70000001
-
-SOURCEPATH  	../DSCapTestServer
-SOURCE		CapTestServer.cpp
-SOURCE		DevSoundServerTestStep.cpp
-
-USERINCLUDE     ../DSCapTestServer
-USERINCLUDE	../SDevSound/inc
-USERINCLUDE	../../../../../devsound/devsoundrefplugin/src/PlatSec/SoundDevice
-USERINCLUDE	../../../../../devsound/devsoundrefplugin/src/server
-USERINCLUDE	../../../../../devsound/devsoundrefplugin/src/PlatSec/Server/AudioServer
-USERINCLUDE	../../../../../devsound/devsoundrefplugin/src/PlatSec/Client
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-LIBRARY		euser.lib
-LIBRARY		testframeworkclient.lib
-
-
-START WINS
-#ifndef WINSCW
-WIN32_LIBRARY   CHKSTK.OBJ
-#endif
-END
-
-SMPSAFE
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/mmpfiles/TSI_MMFACLNT.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,96 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// using relative paths for sourcepath and user includes
-//
-
-TARGET        	tsi_mmfaclnt.dll
-CAPABILITY ALL -TCB
-TARGETTYPE    	dll
-UID           	0x1000008d 0x101F460D
-VENDORID 0x70000001
-
-// Define this macro to look for test files on C: drive. (Z: will be used otherwise)
-// This macro only affects the target build
-MACRO			__TEST_FILES_ON_C_DRIVE__
-MACRO 			_TYPHOON_TEST_
-
-SOURCEPATH    ../ACLNT
-SOURCE        TSI_MMFACLNT.cpp
-SOURCE        Ts_MMFACLNTsuite.cpp
-SOURCE		  TestPlayerUtils.cpp
-SOURCE		  TestConverter.cpp
-SOURCE		  TestRecorder.cpp
-SOURCE		  TestTone.cpp
-SOURCE        TestOldCodec.cpp
-SOURCE		  testDRM.cpp
-SOURCE        WavDecodeUtility.cpp
-
-SOURCE        OpenFileByHandle7803.cpp
-SOURCE        OpenFileByHandle7804.cpp
-SOURCE        OpenFileByHandle7805.cpp
-SOURCE        OpenFileByHandle7806.cpp
-SOURCE        OpenFileByHandle7901.cpp
-SOURCE        OpenFileByHandle7902.cpp
-SOURCE        OpenFileByHandle7904.cpp
-SOURCE        OpenFileByHandle7905.cpp
-SOURCE        OpenFileByHandle7906.cpp
-SOURCE        OpenFileByHandle7908.cpp
-SOURCE        OpenFileByHandle8801.cpp
-SOURCE        OpenFileByHandle1211.cpp
-SOURCE        OpenFileByHandle_PlayTone.cpp
-
-SOURCE        TestPlayerUtilsARN.cpp
-SOURCE        TestRecorderARN.cpp
-SOURCE        TestOutputStreamARN.cpp
-SOURCE        TestMultiClientARN.cpp
-
-SOURCE        TestPlayerFileSource.cpp
-SOURCE        TestRecorderFileSource.cpp
-SOURCE        TestAudioPlayerDRM.cpp
-SOURCE        TestAudioRecorderDRM.cpp
-SOURCE        TestOggRecorder.cpp
-
-SOURCEPATH    ../../../../../mmtestenv/mmtestagent/src/database
-SOURCE		  rightsdatabase.cpp
-
-SOURCEPATH    ../ACLNT
-SOURCE		  TestCapabilities0012.cpp
-SOURCE		  TestCapabilities0014.cpp
-
-//True Pause
-SOURCE        playtruepause.cpp
-SOURCE        tonetruepause.cpp
-SOURCE        testoutputstreamtruepause.cpp
-
-USERINCLUDE	../../../../../mmplugins/mmfwplugins/src/Plugin/Format/MmfWAVFormat
-USERINCLUDE	../../../../../mmlibs/mmfw/inc/mmf/common
-USERINCLUDE	../../../../../mmlibs/mmfw/inc/mmf/server
-USERINCLUDE	../../../../../mmtestenv/mmtestagent/inc
-USERINCLUDE	../../../../../mmlibs/mmfw/src/Client/Audio
-USERINCLUDE	../../../../../mmlibs/mmfw/src/Plugin/Format/FormatUtils
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-LIBRARY	      euser.lib testframeworkclient.lib 
-LIBRARY       mediaclientaudio.lib  efsrv.lib mediaclientaudioinputstream.lib
-LIBRARY	      mmfcontrollerframework.lib mediaclientaudiostream.lib
-LIBRARY       hal.lib
-LIBRARY		  estor.lib edbms.lib
-LIBRARY	ecom.lib
-
-LIBRARY	mmcommon.lib
-
-DEFFILE	TSI_MMFACLNT.DEF
-
-SMPSAFE
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/mmpfiles/TSI_MMFCTLFRM.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// using relative paths for sourcepath and user includes
-//
-
-TARGET        	tsi_mmfctlfrm.dll
-CAPABILITY ALL -TCB
-TARGETTYPE    	dll
-UID           	0x1000008d 0x101f460f
-VENDORID 0x70000001
-
-SOURCEPATH    ../Ctlfrm
-SOURCE        TSI_MmfCtlfrm.cpp
-SOURCE        TSI_MmfCtlfrmNeg.cpp
-SOURCE        TSI_MmfCtlfrmSuite.cpp
-SOURCE        TSI_MmfCtlfrmStep.cpp
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-LIBRARY		euser.lib  
-LIBRARY		testframeworkclient.lib 
-LIBRARY		mmfcontrollerframework.lib
-LIBRARY		mmfstandardcustomcommands.lib
-
-#ifdef EABI
-library			ecom.lib
-NOEXPORTLIBRARY
-#endif
-
-
-SMPSAFE
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/mmpfiles/TSI_MMFController.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// using relative paths for sourcepath and user includes
-// 
-//
-
-target tsi_mmfcontroller.dll
-CAPABILITY ALL -TCB
-targettype plugin
-UID           	0x10009d8d 0x101f7bf9
-VENDORID 0x70000001
-
-SOURCEPATH      ../Ctlfrm/TSI_MMFController
-SOURCE          TSI_MMFController.cpp
-
-USERINCLUDE   ../Ctlfrm
-USERINCLUDE   ../Ctlfrm/TSI_MMFController
-USERINCLUDE   ../Ctlfrm/tsi_mmfcustomcommands
-USERINCLUDE   ../../../../../mmlibs/mmfw/inc/mmf/ControllerFramework
-USERINCLUDE   ../../../../../mmlibs/mmfw/inc/mmf
-USERINCLUDE   ../../../../../mmlibs/mmfw/inc/mmf/common
-USERINCLUDE   ../../../../../mmlibs/mmfw/inc/mmf/server
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-start resource 101f7bf9.rss
-target tsi_mmfcontroller.rsc
-end
-
-LIBRARY			euser.lib 
-LIBRARY         mmfcontrollerframework.lib
-LIBRARY			tsi_mmfcustomcommands.lib
-LIBRARY         mmfstandardcustomcommands.lib
-#ifdef EABI
-library			ecom.lib
-#endif
-
-
-
-SMPSAFE
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/mmpfiles/TSI_MMFController2.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// using relative paths for sourcepath and user includes
-// 
-//
-
-target tsi_mmfcontroller2.dll
-CAPABILITY ALL -TCB
-targettype plugin
-UID           	0x10009d8d 0x101f7bfb
-VENDORID 0x70000001
-
-SOURCEPATH      ../Ctlfrm/TSI_MMFController2
-SOURCE          TSI_MMFController2.cpp
-
-USERINCLUDE   ../Ctlfrm
-USERINCLUDE   ../Ctlfrm/TSI_MMFController2
-USERINCLUDE   ../Ctlfrm/tsi_mmfcustomcommands
-USERINCLUDE   ../../../../../mmlibs/mmfw/inc/mmf/ControllerFramework
-USERINCLUDE   ../../../../../mmlibs/mmfw/inc/mmf
-USERINCLUDE   ../../../../../mmlibs/mmfw/inc/mmf/common
-USERINCLUDE   ../../../../../mmlibs/mmfw/inc/mmf/server
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-start resource 101f7bfb.rss
-target tsi_mmfcontroller2.rsc
-end
-
-LIBRARY			euser.lib 
-LIBRARY         mmfcontrollerframework.lib
-LIBRARY			tsi_mmfcustomcommands.lib
-LIBRARY         mmfstandardcustomcommands.lib
-#ifdef EABI
-library			ecom.lib
-#endif
-
-
-
-SMPSAFE
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/mmpfiles/TSI_MMFCustomCommands.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-target			tsi_mmfcustomcommands.dll
-CAPABILITY ALL -TCB
-targettype		DLL
-UID				0x1000008d 0x101f78A0	// WILL CHANGE
-VENDORID 0x70000001
-
-SOURCEPATH		../Ctlfrm/tsi_mmfcustomcommands
-source			TSI_MMFCustomCommands.cpp
-
-USERINCLUDE   ../Ctlfrm
-USERINCLUDE   ../Ctlfrm/tsi_mmfcustomcommands
-USERINCLUDE   ../../../../../mmlibs/mmfw/inc/mmf
-USERINCLUDE   ../../../../../mmlibs/mmfw/inc/mmf/ControllerFramework
-USERINCLUDE   ../../../../../mmlibs/mmfw/inc/mmf/common
-USERINCLUDE   ../../../../../mmlibs/mmfw/inc/mmf/server
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-LIBRARY			euser.lib
-LIBRARY			mmfcontrollerframework.lib
-LIBRARY			ecom.lib
-
-SMPSAFE
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/mmpfiles/TSI_MMFDataSink.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// using relative paths for sourcepath and user includes
-// 
-//
-
-target tsi_mmfdatasink.dll
-CAPABILITY ALL -TCB
-targettype plugin
-UID           	0x10009d8d 0x101f7bfd
-VENDORID 0x70000001
-
-SOURCEPATH      ../Ctlfrm/TSI_MMFDataSink
-SOURCE          TSI_MMFDataSink.cpp
-
-USERINCLUDE     ../Ctlfrm
-USERINCLUDE   ../Ctlfrm/TSI_MMFDataSink
-USERINCLUDE   ../../../../../mmlibs/mmfw/inc/mmf
-USERINCLUDE   ../../../../../mmlibs/mmfw/inc/mmf/ControllerFramework
-USERINCLUDE   ../../../../../mmlibs/mmfw/inc/mmf/common
-USERINCLUDE   ../../../../../mmlibs/mmfw/inc/mmf/server
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-start resource 101f7bfd.rss
-target tsi_mmfdatasink.rsc
-end
-
-LIBRARY		euser.lib 
-LIBRARY     ecom.lib
-LIBRARY		mmfcontrollerframework.lib
-
-
-
-SMPSAFE
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/mmpfiles/TSI_MMFDataSource.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// using relative paths for sourcepath and user includes
-// 
-//
-
-target tsi_mmfdatasource.dll
-CAPABILITY ALL -TCB
-targettype plugin
-UID           	0x10009d8d 0x101f7bff
-VENDORID 0x70000001
-
-SOURCEPATH      ../Ctlfrm/TSI_MMFDataSource
-SOURCE          TSI_MMFDataSource.cpp
-
-USERINCLUDE     ../Ctlfrm
-USERINCLUDE   ../Ctlfrm/TSI_MMFDataSource
-USERINCLUDE   ../../../../../mmlibs/mmfw/inc/mmf
-USERINCLUDE   ../../../../../mmlibs/mmfw/inc/mmf/ControllerFramework
-USERINCLUDE   ../../../../../mmlibs/mmfw/inc/mmf/common
-USERINCLUDE   ../../../../../mmlibs/mmfw/inc/mmf/server
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-start resource 101f7bff.rss
-target tsi_mmfdatasource.rsc
-end
-
-LIBRARY			euser.lib 
-LIBRARY         ecom.lib
-LIBRARY			mmfcontrollerframework.lib
-
-
-SMPSAFE
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/mmpfiles/TSI_MMFFORMAT.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// using relative paths for sourcepath and user includes
-// 
-//
-
-target tsi_mmfformat.dll
-CAPABILITY ALL -TCB
-targettype plugin
-UID           	0x10009d8d 0x101FFA10
-VENDORID 0x70000001
-
-SOURCEPATH      ../Ctlfrm/TSI_MMFFormat
-SOURCE          TSI_MMFFormat.cpp
-
-USERINCLUDE   ../Ctlfrm
-USERINCLUDE   ../Ctlfrm/TSI_MMFFormat
-USERINCLUDE   ../Ctlfrm/tsi_mmfcustomcommands
-USERINCLUDE   ../../../../../mmlibs/mmfw/inc/mmf/ControllerFramework
-USERINCLUDE   ../../../../../mmlibs/mmfw/inc/mmf
-USERINCLUDE   ../../../../../mmlibs/mmfw/inc/mmf/common
-USERINCLUDE   ../../../../../mmlibs/mmfw/inc/mmf/server
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-start resource 101FFA10.rss
-target tsi_mmfformat.rsc
-end
-
-LIBRARY			euser.lib 
-LIBRARY         mmfcontrollerframework.lib
-LIBRARY         ecom.lib
-
-
-
-SMPSAFE
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/mmpfiles/TSI_MMFUseOldCodecAudioController.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-target tsi_mmfuseoldcodecaudiocontroller.dll
-CAPABILITY ALL -TCB
-targettype plugin
-
-// ECom Dll recognition UID followed by the unique UID for this dll
-UID 0x10009D8D 0x101F7D39
-VENDORID 0x70000001
-
-SOURCEPATH		../ACLNT/UseOldCodecAudioController
-SOURCE			TestUseOldCodecAudioController.cpp
-SOURCE			TestUseOldCodecAudioControllerFactory.cpp 
-
-USERINCLUDE	../ACLNT/UseOldCodecAudioController	
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-start resource 101F7D39.rss
-target tsi_mmfuseoldcodecaudiocontroller.rsc
-end
-
-LIBRARY euser.lib
-LIBRARY mmfserverbaseclasses.lib
-LIBRARY mmfdevsound.lib
-LIBRARY mmfcontrollerframework.lib
-LIBRARY mmfstandardcustomcommands.lib
-#ifdef EABI
-library			ecom.lib
-#endif
-
-SMPSAFE
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/mmpfiles/TSI_MMFVCLNT.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// using relative paths for sourcepath and user includes
-// 
-//
-
-TARGET        	tsi_mmfvclnt.dll
-CAPABILITY ALL -TCB
-TARGETTYPE    	dll
-UID           	0x1000008d 0x101F460E
-VENDORID 0x70000001
-
-SOURCEPATH    ../vclnt
-SOURCE        TSI_MMFVCLNT.cpp
-SOURCE        TS_MMFVCLNTsuite.cpp
-SOURCE		  TestPlayer.cpp
-SOURCE		  TestRecord.cpp
-SOURCE		  DRMTestVidPlayer.cpp
-SOURCE		  OpenFileByHandle0034.cpp
-SOURCE		  OpenFileByHandle0036.cpp
-SOURCE		  OpenFileByHandle0522.cpp
-SOURCE		  OpenFileByHandle0523.cpp
-SOURCE		  OpenFileByHandle0524.cpp
-SOURCE		  OpenFileByHandle1011.cpp
-SOURCE		  OpenFileByHandle_PlayText.cpp
-SOURCE		  OpenFileByHandle1511.cpp
-SOURCE		  OpenFileByHandle1512.cpp
-SOURCE		  OpenFileByHandle1513.cpp
-
-SOURCEPATH    ../../../../../mmtestenv/mmtestagent/src/database
-SOURCE		  rightsdatabase.cpp
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-USERINCLUDE	../../../../../mmtestenv/mmtestagent/inc
-USERINCLUDE	  ../vclnt
-
-
-LIBRARY		euser.lib  testframeworkclient.lib 
-LIBRARY		efsrv.lib  mediaclientvideo.lib
-LIBRARY		mmfcontrollerframework.lib
-LIBRARY		ws32.lib
-LIBRARY		bafl.lib
-LIBRARY		estor.lib edbms.lib fbscli.lib 
-LIBRARY		mmcommon.lib
-LIBRARY		ecom.lib
-
-#ifdef EABI
-NOEXPORTLIBRARY
-#endif
-
-SMPSAFE
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/mmpfiles/TSI_MMF_SDEVSOUND.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-TARGET		tsi_mmf_sdevsound.dll
-CAPABILITY	ALL -TCB
-TARGETTYPE	dll
-UID		0x1000008d 0x101FFA28
-VENDORID 0x70000001
-
-SOURCEPATH	../SDevSound/src
-SOURCE		TSI_MMF_SDEVSOUND_SUITE.cpp
-SOURCE		TSI_MMF_SDEVSOUND_STEP.cpp
-SOURCE		TSI_MMF_SDEVSOUND_MPBASE.cpp
-SOURCE		TSI_MMF_SDEVSOUND_0002_STEP.cpp
-SOURCE		TSI_MMF_SDEVSOUND_0004_STEP.cpp
-SOURCE		TSI_MMF_SDEVSOUND_0006_STEP.cpp
-SOURCE		TSI_MMF_SDEVSOUND_0008_STEP.cpp
-SOURCE		TSI_MMF_SDEVSOUND_0010_STEP.cpp
-//SOURCE 		  TestCapabilities0012.cpp
-//SOURCE		  TestCapabilities0014.cpp
-SOURCE		TSI_MMF_SDEVSOUND_0036_STEP.cpp
-SOURCE		captestinfosession.cpp
-
-USERINCLUDE	../SDevSound/inc
-USERINCLUDE	../SDevSound/SDSCapTestServer/src
-
-USERINCLUDE	../../../../../devsound/devsoundrefplugin/src/PlatSec/SoundDevice
-USERINCLUDE	../../../../../devsound/devsoundrefplugin/src/server
-USERINCLUDE	../../../../../devsound/devsoundrefplugin/src/PlatSec/Server/AudioServer
-USERINCLUDE	../../../../../devsound/devsoundrefplugin/src/PlatSec/Client
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-LIBRARY		euser.lib
-LIBRARY		efsrv.lib
-LIBRARY	    	testframeworkclient.lib
-LIBRARY		mmfdevsound.lib
-LIBRARY		mmfserverbaseclasses.lib
-
-Library 	mediaclientaudio.lib
-
-START WINS
-#ifndef WINSCW
-WIN32_LIBRARY   CHKSTK.OBJ
-#endif
-END
-
-SMPSAFE
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNT_00.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,339 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-LOAD_SUITE TSI_MMFACLNT.DLL
-#PAUSE_AT_END
-
-# wait for ring.wav to finish playing
-delay 1000
-
-###################### POSITIVE TEST ###############
-
-#Req. under test REQ172.1.3.5
-# Load and initialise an audio file.
-# RUN_UTILS makeReadWrite c:\AclntITestData\mainTst.wav
-# RUN_UTILS makeReadWrite c:\AclntITestData\mainTst2.wav
-# RUN_UTILS makeReadWrite c:\AclntITestData\main.wav
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst.wav
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst2.wav
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0001-CP
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-0001-CP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.3.6
-# Load and initialise an audio descriptor.
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0002-CP
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-0002-CP \audio.ini
-TEST_COMPLETE
-
-#Req. none
-# Load and initialise an audio descriptor (read-only)
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0202-LP
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-0202-LP \audio.ini
-TEST_COMPLETE
-
-#Req. none
-# Load and initialise an audio descriptor (DescOpen)
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0302-LP
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-0302-LP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.3.19
-# Open an audio file and play.
-//! @SYMTestCaseID MM-MMF-ACLNT-I-2009-HP
-RUN_TEST_STEP 10000, ACLNT, MM-MMF-ACLNT-I-2009-HP  \audio.ini
-TEST_COMPLETE
-
-# Open a 100Khz audio file and play. (INC023339)
-//! @SYMTestCaseID MM-MMF-ACLNT-I-2014-LP
-RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-2014-LP  \audio.ini
-TEST_COMPLETE
-
-# Open a 7.33Khz audio file and play. (INC023339)
-//! @SYMTestCaseID MM-MMF-ACLNT-I-2015-LP
-RUN_TEST_STEP 10000, ACLNT, MM-MMF-ACLNT-I-2015-LP  \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.3.6    REQ172.1.3.8
-# Open audio from a descriptor and play.
-//! @SYMTestCaseID MM-MMF-ACLNT-I-3009-HP
-RUN_TEST_STEP 10000, ACLNT, MM-MMF-ACLNT-I-3009-HP  \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.3.7    REQ172.1.3.8
-# Open audio from a URL.
-//! @SYMTestCaseID MM-MMF-ACLNT-I-4001-HP
-RUN_TEST_STEP 10000, ACLNT, MM-MMF-ACLNT-I-4001-HP  \audio.ini
-TEST_COMPLETE
-
-# Req. none
-# Open audio from a URL and play.
-//! @SYMTestCaseID MM-MMF-ACLNT-I-4201-LP
-RUN_TEST_STEP 10000, ACLNT, MM-MMF-ACLNT-I-4201-LP  \audio.ini
-TEST_COMPLETE
-
-#Req. none
-# Pause play and continue play.
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0213-LP
-RUN_TEST_STEP 150000, ACLNT, MM-MMF-ACLNT-I-0213-LP  \audio.ini
-TEST_COMPLETE
-
-#Req. none
-# Play, pause, play, pause, play.
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0214-LP
-RUN_TEST_STEP 750000, ACLNT, MM-MMF-ACLNT-I-0214-LP  \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.3.14    REQ172.1.3.15
-# Set and enquire volume.
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0014-CP
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-0014-CP \audio.ini
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst.wav
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst2.wav
-TEST_COMPLETE
-
-#Req. under test REQ172.1.3.24   REQ172.1.3.25
-# Set and enquire balance.
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst.wav
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst2.wav
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0016-LP
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-0016-LP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.3.13
-# Enquire audio duration
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst.wav
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst2.wav
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0018-HP
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-0018-HP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.1.1
-# Request audio type.
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst.wav
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst2.wav
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0024-HP
-# RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-0024-HP \audio.ini
-# TEST_COMPLETE
-
-#Req. under test  REQ172.1.3.16
-#Enquire Maximum volume
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst.wav
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst2.wav
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0030-HP
-RUN_TEST_STEP 120000,ACLNT, MM-MMF-ACLNT-I-0030-HP \audio.ini
-TEST_COMPLETE
-
-#Req. under test  REQ172.1.3.18
-#Get meta information
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst.wav
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst2.wav
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0032-LP
-RUN_TEST_STEP 120000,ACLNT, MM-MMF-ACLNT-I-0032-LP \audio.ini
-TEST_COMPLETE
-
-#Req. under test  REQ172.1.3.3 REQ172.1.3.4
-# Open an audio file, close it then open a new one.
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst.wav
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst2.wav
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0033-LP
-RUN_TEST_STEP 120000,ACLNT, MM-MMF-ACLNT-I-0033-LP \audio.ini
-TEST_COMPLETE
-
-# Currently not supported by the API (06 August 2002) Test not performed for Typhoon.
-#Req. under test  REQ172.1.1.1
-# Query playback formats.
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst.wav
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst2.wav
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0035-LP
-# RUN_TEST_STEP 120000,ACLNT, MM-MMF-ACLNT-I-0035-LP  \audio.ini
-# TEST_COMPLETE
-
-
-################  NEGATIVE TESTS ###############
-
-#Req. under test REQ172.1.3.24         REQ172.1.3.25
-# Set invalid balance.
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst.wav
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst2.wav
-//! @SYMTestCaseID MM-MMF-ACLNT-I-1002-LP
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-1002-LP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.3.24         REQ172.1.3.25
-# Set invalid balance.
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst.wav
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst2.wav
-//! @SYMTestCaseID MM-MMF-ACLNT-I-1014-LP
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-1014-LP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.3.19
-# Set invalid play window and attempt to play.
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst.wav
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst2.wav
-//! @SYMTestCaseID MM-MMF-ACLNT-I-1004-HP
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-1004-HP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.3.5     REQ172.1.3.8
-# Play with no loaded sound file.
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst.wav
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst2.wav
-//! @SYMTestCaseID MM-MMF-ACLNT-I-1005-LP
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-1005-LP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.3.5
-# Load unsupported file.
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst.wav
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst2.wav
-//! @SYMTestCaseID MM-MMF-ACLNT-I-1007-HP
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-1007-HP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.3.5
-# Load file that doesn't exist.
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst.wav
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst2.wav
-//! @SYMTestCaseID MM-MMF-ACLNT-I-1008-HP
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-1008-HP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.3.11
-# Set invalid audio position and play
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst.wav
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst2.wav
-//! @SYMTestCaseID MM-MMF-ACLNT-I-1015-LP
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-1015-LP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.3.8
-# Audio clip - Delete object before play operation has completed.
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst.wav
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst2.wav
-//! @SYMTestCaseID MM-MMF-ACLNT-I-1010-HP
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-1010-HP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.3.5     REQ172.1.3.8
-# Open new file while audio player is playing.
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst.wav
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst2.wav
-//! @SYMTestCaseID MM-MMF-ACLNT-I-1011-LP
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-1011-LP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.3.6      REQ172.1.3.8
-# Play using a corrupt descriptor.
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst.wav
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst2.wav
-//! @SYMTestCaseID MM-MMF-ACLNT-I-1012-LP
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-1012-LP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.3.11
-# Playing when position set to the end of the audio.
-PRINT <FONT COLOR=RED>TEST MM-MMF-ACLNT-I-1100-LP is commented out as it affects other tests</FONT>
-PRINT <FONT COLOR=RED>(Possibly corrupting test data files?)</FONT>
-//! @SYMTestCaseID MM-MMF-ACLNT-I-1100-LP
-#RUN_TEST_STEP -1, ACLNT, MM-MMF-ACLNT-I-1100-LP \audio.ini
-
-
-################################################################################
-############### Tests for C Cover reprted missing API methods ##################
-################################################################################
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-6020-CP
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-6020-CP \audio.ini
-TEST_COMPLETE
-//! @SYMTestCaseID MM-MMF-ACLNT-I-6021-CP
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-6021-CP \audio.ini
-TEST_COMPLETE
-//! @SYMTestCaseID MM-MMF-ACLNT-I-6022-CP
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-6022-CP \audio.ini
-TEST_COMPLETE
-//! @SYMTestCaseID MM-MMF-ACLNT-I-6023-CP
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-6023-CP \audio.ini
-TEST_COMPLETE
-//! @SYMTestCaseID MM-MMF-ACLNT-I-6024-CP
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-6024-CP \audio.ini
-TEST_COMPLETE
-//! @SYMTestCaseID MM-MMF-ACLNT-I-6025-CP
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-6025-CP \audio.ini
-TEST_COMPLETE
-//! @SYMTestCaseID MM-MMF-ACLNT-I-6026-CP
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-6026-CP \audio.ini
-TEST_COMPLETE
-//! @SYMTestCaseID MM-MMF-ACLNT-I-6027-CP
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-6027-CP \audio.ini
-TEST_COMPLETE
-//! @SYMTestCaseID MM-MMF-ACLNT-I-6028-CP
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-6028-CP \audio.ini
-TEST_COMPLETE
-//! @SYMTestCaseID MM-MMF-ACLNT-I-6029-CP
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-6029-CP \audio.ini
-TEST_COMPLETE
-
-
-
-# INPUT STREAM API
-//! @SYMTestCaseID MM-MMF-ACLNT-I-6030-CP
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-6030-CP \audio.ini
-TEST_COMPLETE
-//! @SYMTestCaseID MM-MMF-ACLNT-I-6031-CP
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-6031-CP \audio.ini
-TEST_COMPLETE
-//! @SYMTestCaseID MM-MMF-ACLNT-I-6032-CP
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-6032-CP \audio.ini
-TEST_COMPLETE
-//! @SYMTestCaseID MM-MMF-ACLNT-I-6034-CP
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-6034-CP \audio.ini
-TEST_COMPLETE
-
-
-#For CR1424 For player test(AudioController)
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0070-HP
-RUN_TEST_STEP 180000,ACLNT, MM-MMF-ACLNT-I-0070-HP  \audio.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0074-HP
-RUN_TEST_STEP 180000,ACLNT, MM-MMF-ACLNT-I-0074-HP  \audio.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0080-HP
-RUN_TEST_STEP 180000,ACLNT, MM-MMF-ACLNT-I-0080-HP  \audio.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0081-HP
-RUN_TEST_STEP 2000000,ACLNT, MM-MMF-ACLNT-I-0081-HP  \audio.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0088-HP
-RUN_TEST_STEP 2000000,ACLNT, MM-MMF-ACLNT-I-0088-HP  \audio.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0150-HP
-RUN_TEST_STEP 180000,ACLNT, MM-MMF-ACLNT-I-0150-HP  \audio.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0151-HP
-RUN_TEST_STEP 180000,ACLNT, MM-MMF-ACLNT-I-0151-HP  \audio.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-6035-CP
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-6035-CP \audio.ini
-TEST_COMPLETE
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNT_00_PREEMPTION.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-LOAD_SUITE TSI_MMFACLNT.DLL
-#PAUSE_AT_END
-
-# wait for ring.wav to finish playing
-delay 1000
-
-#Req. under test REQ172.1.3.23
-# Audio priority preference time.
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst.wav
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst2.wav
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0019-HP
-
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-0019-HP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.3.23
-# Audio priority preference quality.
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst.wav
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst2.wav
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0020-HP
-
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-0020-HP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.3.23
-# Audio priority preference time and quality.
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0021-HP
-
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-0021-HP \audio.ini
-TEST_COMPLETE
-
-#Req. none
-# Audio priority preference - call SetPriority
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0219-LP
-
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-0219-LP \audio.ini
-TEST_COMPLETE
\ No newline at end of file
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNT_01.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,497 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-LOAD_SUITE TSI_MMFACLNT.DLL
-#PAUSE_AT_END
-
-# wait for ring.wav to finish playing
-delay 1000
-
-###################### POSITIVE TEST ###############
-
-#Req. under test 
-# Set and enquire gain.
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0017-LP
-
-RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-0017-LP \audio.ini
-TEST_COMPLETE
-
-#Req. None
-# Enquire state at each state transition.
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0025-HP
-
-RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-0025-HP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.28.15
-# Audio croping.
-# RUN_UTILS makeReadWrite c:\AclntITestData\main.wav
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\CropMe.wav
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0027-LP
-
-RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-0027-LP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.28.15
-# Audio croping.
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\CropMe.wav
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0028-LP
-
-RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-0028-LP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.28.2   REQ172.1.28.3    REQ172.1.28.4
-# Record audio.
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0050-HP
-
-RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-0050-HP \audio.ini
-TEST_COMPLETE
-
-#Req. under test  REQ172.1.28.2 REQ172.1.28.3 REQ172.1.28.4
-# Open a file based clip and record
-//! @SYMTestCaseID MM-MMF-ACLNT-I-5001-HP
-
-RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5001-HP \audio.ini
-TEST_COMPLETE
-
-#Req. under test  REQ172.1.28.2 REQ172.1.28.3 REQ172.1.28.4
-# Open a file based clip and record
-//! @SYMTestCaseID MM-MMF-ACLNT-I-5002-HP
-
-RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5002-HP \audio.ini
-TEST_COMPLETE
-
-#Req. under test  REQ172.1.28.2 REQ172.1.28.3 REQ172.1.28.4
-# Open a file based clip and record
-//! @SYMTestCaseID MM-MMF-ACLNT-I-5003-HP
-
-RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5003-HP \audio.ini
-TEST_COMPLETE
-
-#Req. under test  REQ172.1.28.2 REQ172.1.28.3 REQ172.1.28.4
-# Open a file based clip and record
-//! @SYMTestCaseID MM-MMF-ACLNT-I-5004-HP
-
-RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5004-HP \audio.ini
-TEST_COMPLETE
-
-#Req. under test  REQ172.1.28.2 REQ172.1.28.3 REQ172.1.28.4
-# Open a file based clip and record
-//! @SYMTestCaseID MM-MMF-ACLNT-I-5005-HP
-
-RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5005-HP \audio.ini
-TEST_COMPLETE
-
-#Req. under test  REQ172.1.28.2 REQ172.1.28.3 REQ172.1.28.4
-# Open a file based clip and record
-//! @SYMTestCaseID MM-MMF-ACLNT-I-5006-HP
-
-RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5006-HP \audio.ini
-TEST_COMPLETE
-
-#Req. under test  REQ172.1.28.2 REQ172.1.28.3 REQ172.1.28.4
-# Open a file based clip and record
-//! @SYMTestCaseID MM-MMF-ACLNT-I-5007-HP
-
-RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5007-HP \audio.ini
-TEST_COMPLETE
-
-#Req. under test  REQ172.1.28.2 REQ172.1.28.3 REQ172.1.28.4
-# Open a file based clip and record
-//! @SYMTestCaseID MM-MMF-ACLNT-I-5008-HP
-
-RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5008-HP \audio.ini
-TEST_COMPLETE
-
-#Req. under test  REQ172.1.28.2 REQ172.1.28.3 REQ172.1.28.4
-# Open a file based clip and record
-//! @SYMTestCaseID MM-MMF-ACLNT-I-5009-HP
-
-RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5009-HP \audio.ini
-TEST_COMPLETE
-
-#INC21946
-# Open a file based clip and record, specifying the format to use
-//! @SYMTestCaseID MM-MMF-ACLNT-I-5010-HP
-
-RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5010-HP \audio.ini
-TEST_COMPLETE
-
-#INC21946
-# Open a file based clip and record, specifying the format to use
-//! @SYMTestCaseID MM-MMF-ACLNT-I-5011-HP
-
-RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5011-HP \audio.ini
-TEST_COMPLETE
-
-#DEF036641 
-# record to an existing IMAD .wav file	
-//! @SYMTestCaseID MM-MMF-ACLNT-I-5013-HP
-
-RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5013-HP \audio.ini
-TEST_COMPLETE
-
-#DEF036640
-# record to an existing .wav file with a different sample rate	
-//! @SYMTestCaseID MM-MMF-ACLNT-I-5014-HP
-
-RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5014-HP \audio.ini
-TEST_COMPLETE
-
-#Req. under test 
-# Set and enquire gain.
-RUN_UTILS CopyFile c:\AclntITestData\explo.wav c:\AclntITestData\explo.$$$
-//! @SYMTestCaseID MM-MMF-ACLNT-I-5015-HP
-
-RUN_TEST_STEP -1, ACLNT, MM-MMF-ACLNT-I-5015-HP \audio.ini
-TEST_COMPLETE
-
-#INC038043 Play a file with a different sample rate/number of channels
-//! @SYMTestCaseID MM-MMF-ACLNT-I-5016-HP
-
-RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5016-HP \audio.ini
-TEST_COMPLETE
-
-#DEF039308 - No integration test to test playback of recorded raw file
-//! @SYMTestCaseID MM-MMF-ACLNT-I-5017-HP
-
-RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5017-HP \audio.ini
-TEST_COMPLETE
-
-#Req. under test  REQ172.1.28.5 REQ172.1.28.8 REQ172.1.28.9
-# Open a descriptor based clip and record
-//! @SYMTestCaseID MM-MMF-ACLNT-I-6001-HP
-
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-6001-HP \audio.ini
-TEST_COMPLETE
-
-#Req. under test  REQ172.1.28.5 REQ172.1.28.8 REQ172.1.28.9
-# Open a descriptor based clip and record
-//! @SYMTestCaseID MM-MMF-ACLNT-I-6002-HP
-
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-6002-HP \audio.ini
-TEST_COMPLETE
-
-#Req. under test  REQ172.1.28.5 REQ172.1.28.8 REQ172.1.28.9
-# Open a descriptor based clip and record
-//! @SYMTestCaseID MM-MMF-ACLNT-I-6003-HP
-
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-6003-HP \audio.ini
-TEST_COMPLETE
-
-#Req. under test  REQ172.1.28.5 REQ172.1.28.8 REQ172.1.28.9
-# Open a descriptor based clip and record
-//! @SYMTestCaseID MM-MMF-ACLNT-I-6004-HP
-
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-6004-HP \audio.ini
-TEST_COMPLETE
-
-#Req. under test  REQ172.1.28.5 REQ172.1.28.8 REQ172.1.28.9
-# Open a descriptor based clip and record
-//! @SYMTestCaseID MM-MMF-ACLNT-I-6005-HP
-
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-6005-HP \audio.ini
-TEST_COMPLETE
-
-#Req. under test  REQ172.1.28.5 REQ172.1.28.8 REQ172.1.28.9
-# Open a descriptor based clip and record
-//! @SYMTestCaseID MM-MMF-ACLNT-I-6006-HP
-
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-6006-HP \audio.ini
-TEST_COMPLETE
-
-#Req. under test  REQ172.1.28.5 REQ172.1.28.8 REQ172.1.28.9
-# Open a descriptor based clip and record
-//! @SYMTestCaseID MM-MMF-ACLNT-I-6007-HP
-
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-6007-HP \audio.ini
-TEST_COMPLETE
-
-#Req. under test  REQ172.1.28.5 REQ172.1.28.8 REQ172.1.28.9
-# Open a descriptor based clip and record
-//! @SYMTestCaseID MM-MMF-ACLNT-I-6008-HP
-
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-6008-HP \audio.ini
-TEST_COMPLETE
-
-#Req. under test  REQ172.1.28.5 REQ172.1.28.8 REQ172.1.28.9
-# Open a descriptor based clip and record
-//! @SYMTestCaseID MM-MMF-ACLNT-I-6009-HP
-
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-6009-HP \audio.ini
-TEST_COMPLETE
-
-#Req. under test  REQ172.1.28.7
-# Open a URL
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0054-LP
-
-#RUN_TEST_STEP 10000, ACLNT, MM-MMF-ACLNT-I-0054-LP \audio.ini
-#TEST_COMPLETE
-
-#Req. under test  REQ172.1.28.14 
-# Set and enquire position
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0055-LP
-
-RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-0055-LP \audio.ini
-TEST_COMPLETE
-
-#Req. under test  REQ172.1.28.13
-# enquire duration
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0056-LP
-
-RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-0056-LP \audio.ini
-TEST_COMPLETE
-
-#Req. under test  REQ172.1.28.19
-# set meta information
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0057-LP
-
-RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-0057-LP \audio.ini
-TEST_COMPLETE
-
-#Req. under test  REQ172.1.28.22 REQ172.1.28.23
-# Set and enquire balance
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0059-LP
-
-RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-0059-LP \audio.ini
-TEST_COMPLETE
-
-#Req. under test  REQ172.1.28.10
-# Set maximum length of file in bytes and record
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0060-LP
-
-RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-0060-LP \audio.ini
-TEST_COMPLETE
-
-#Req. under test  REQ172.1.28.2 REQ172.1.2.1
-# Query recordable formats
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0061-LP
-
-RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-0061-LP \audio.ini
-TEST_COMPLETE
-
-
-#Sierra REQ2870 Audio Bitrate
-# Query audio bitrate
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0062-LP
-
-RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-0062-LP \audio.ini
-TEST_COMPLETE
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0063-LP
-
-RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-0063-LP \audio.ini
-TEST_COMPLETE
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0064-LP
-
-RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-0064-LP \audio.ini
-TEST_COMPLETE
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0065-LP
-
-RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-0065-LP \audio.ini
-TEST_COMPLETE
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0066-LP
-
-RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-0066-LP \audio.ini
-TEST_COMPLETE
-
-################  NEGATIVE TESTS ###############
-
-#Req. under test REQ172.1.28.5        REQ172.1.28.8
-# Record audio to unsupported file.
-//! @SYMTestCaseID MM-MMF-ACLNT-I-1200-CP
-
-RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-1200-CP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.28.5        REQ172.1.28.8      REQ172.1.28.9
-# Record utility - Delete object before record operation has completed.
-//! @SYMTestCaseID MM-MMF-ACLNT-I-1201-HP
-
-RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-1201-HP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.28.16       REQ172.1.28.17         REQ172.1.28.18
-# set gain to invalid gain value
-//! @SYMTestCaseID MM-MMF-ACLNT-I-1204-LP
-
-RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-1204-LP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.28.16       REQ172.1.28.17         REQ172.1.28.18
-# set gain to invalid gain value
-//! @SYMTestCaseID MM-MMF-ACLNT-I-1208-LP
-
-RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-1208-LP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.28.14
-# Set invalid position
-//! @SYMTestCaseID MM-MMF-ACLNT-I-1205-HP
-
-RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-1205-HP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.28.14
-# Set invalid position
-//! @SYMTestCaseID MM-MMF-ACLNT-I-1209-HP
-
-RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-1209-HP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.28.22       REQ172.1.28.23
-# Set invalid balance
-//! @SYMTestCaseID MM-MMF-ACLNT-I-1206-LP
-
-RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-1206-LP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.28.22       REQ172.1.28.23
-# Set invalid balance
-//! @SYMTestCaseID MM-MMF-ACLNT-I-1210-LP
-
-RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-1210-LP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.28.10
-# Set invalid maximum length of file in bytes and record
-//! @SYMTestCaseID MM-MMF-ACLNT-I-1207-LP
-
-RUN_TEST_STEP 300000, ACLNT, MM-MMF-ACLNT-I-1207-LP \audio.ini
-TEST_COMPLETE
-
-
-
-
-
-
-
-
-
-//These tests have been written to prove CMdaAudioRecorderUtility when only one
-//controller has been identified (recorder or playback) INC25475
-//They use the wav format and the standard audio controller; but require the
-//wav interface (101F53C0.rss) to be edited to remove support for playback/record.
-//When conducting tests 5100-5105, remove the DEcode format interface.
-//When conducting tests 5110-5115, remove the ENcode format interface.
-
-//Due to the need to edit the wav format resource file, only one block of tests can be run
-//at a time 5100-5105 or 5110-5115.
-
-//Also, CMdaAudioRecorderUtility  is written to try the record controller as the playback 
-//controller if a playback controller has not been specified; this must be disabled. 
-//Edit the methods CMMFMdaAudioRecorderUtility::DoOpenFile and DoOpenDes() as follows.
-//
-//	if(aPlaybackControllerUid == KNullUid)
-//	  {
-//	  PlaybackControllerUidSupplied = EFalse;
-//	  aPlaybackControllerUid = aControllerUid;
-
-//	add
-//	-->> TUid tmpid = {0x9999};
-//	-->> aPlaybackControllerUid = tmpid;
-//	  }
-
-
-//These tests confirm operation where no playback controller has been identified
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-5100-HP
-
-//RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5100-HP \audio.ini
-//TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-5101-HP
-
-//RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5101-HP \audio.ini
-//TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-5102-HP
-
-//RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5102-HP \audio.ini
-//TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-5103-HP
-
-//RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5103-HP \audio.ini
-//TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-5104-HP
-
-//RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5104-HP \audio.ini
-//TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-5105-HP
-
-//RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5105-HP \audio.ini
-//TEST_COMPLETE
-
-
-
-//These tests confirm operation where no record controller has been identified
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-5110-HP
-
-//RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5110-HP \audio.ini
-//TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-5111-HP
-
-//RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5111-HP \audio.ini
-//TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-5112-HP
-
-//RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5112-HP \audio.ini
-//TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-5113-HP
-
-//RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5113-HP \audio.ini
-//TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-5114-HP
-
-//RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5114-HP \audio.ini
-//TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-5115-HP
-
-//RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5115-HP \audio.ini
-//TEST_COMPLETE
-
-//This test for DEF039893 Call GetBalance when SetBalance has not been set
-//! @SYMTestCaseID MM-MMF-ACLNT-I-6050-LP
-
-RUN_TEST_STEP -1, ACLNT, MM-MMF-ACLNT-I-6050-LP \audio.ini
-TEST_COMPLETE
-
-//This test for DEF039850 An MMF format plugin with empty header tag results in any file being recognized
-//! @SYMTestCaseID MM-MMF-ACLNT-I-6051-LP
-
-RUN_TEST_STEP -1, ACLNT, MM-MMF-ACLNT-I-6051-LP \audio.ini
-TEST_COMPLETE
-
-//CR1566
-//!@SYMTestCaseID             MM-MMF-ACLNT-I-5018-HP
-//!@SYMTestCaseDesc           Record-Stop-Record audio
-//!@SYMREQ                    
-//!@SYMPREQ                   
-//!@SYMTestPriority           
-//!@SYMTestActions             1. Open a WAV file for recording
-//!                            2. Start recording
-//!                            3. After 2 seconds stop recording
-//!                            4. Start recording again
-//!@SYMTestExpectedResults    Check transitions correspond to the performed operations
-RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-5018-HP \audio.ini
-TEST_COMPLETE
\ No newline at end of file
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNT_01_PREEMPTION.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-LOAD_SUITE TSI_MMFACLNT.DLL
-#PAUSE_AT_END
-
-# wait for ring.wav to finish playing
-delay 1000
-
-#Req. under test  REQ172.1.28.21
-# set priority
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0058-LP
-
-RUN_TEST_STEP -1, ACLNT, MM-MMF-ACLNT-I-0058-LP \audio.ini
-TEST_COMPLETE
\ No newline at end of file
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNT_02.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,292 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-LOAD_SUITE TSI_MMFACLNT.DLL
-#PAUSE_AT_END
-
-# wait for ring.wav to finish playing
-delay 5000
-
-###################### POSITIVE TEST ###############
-
-#Req. under test REQ172.1.51.2   REQ172.1.51.8.1   REQ172.1.51.2
-# Convert ? to ?.
-//! @SYMTestCaseID MM-MMF-ACLNT-I-7001-HP
-
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-7001-HP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.51.2 REQ172.1.51.8.1 REQ172.1.51.8.2 REQ172.1.51.9 REQ172.1.51.6
-#Converts PCM16 -> PCM8 
-//! @SYMTestCaseID MM-MMF-ACLNT-I-7003-LP
-
-RUN_TEST_STEP -1, ACLNT, MM-MMF-ACLNT-I-7003-LP, \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.51.2 REQ172.1.51.8.1 REQ172.1.51.8.2 REQ172.1.51.9 REQ172.1.51.6
-#Converts PCM16 -> ALAW 
-//! @SYMTestCaseID MM-MMF-ACLNT-I-7004-LP
-
-RUN_TEST_STEP -1, ACLNT, MM-MMF-ACLNT-I-7004-LP, \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.51.2 REQ172.1.51.8.1 REQ172.1.51.8.2 REQ172.1.51.9 REQ172.1.51.6
-#Converts PCM16 -> PCMU16 
-//! @SYMTestCaseID MM-MMF-ACLNT-I-7005-LP
-
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-7005-LP, \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.51.2 REQ172.1.51.8.1 REQ172.1.51.8.2 REQ172.1.51.9 REQ172.1.51.6
-#Converts PCM16 -> PCMU8 
-//! @SYMTestCaseID MM-MMF-ACLNT-I-7006-LP
-
-RUN_TEST_STEP -1, ACLNT, MM-MMF-ACLNT-I-7006-LP, \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.51.2 REQ172.1.51.8.1 REQ172.1.51.8.2 REQ172.1.51.9 REQ172.1.51.6
-#Converts PCM16 -> uLAW 
-//! @SYMTestCaseID MM-MMF-ACLNT-I-7007-LP
-
-RUN_TEST_STEP -1, ACLNT, MM-MMF-ACLNT-I-7007-LP, \audio.ini
-TEST_COMPLETE
-
-
-#Req. under test REQ172.1.51.2 REQ172.1.51.8.1 REQ172.1.51.8.2 REQ172.1.51.9 REQ172.1.51.7
-#Converts PCM16 file -> ALAW  URL
-//! @SYMTestCaseID MM-MMF-ACLNT-I-7008-LP
-
-RUN_TEST_STEP -1, ACLNT, MM-MMF-ACLNT-I-7008-LP, \audio.ini
-TEST_COMPLETE
-
-#inc21946
-# Convert ? to ?.
-//! @SYMTestCaseID MM-MMF-ACLNT-I-7009-HP
-
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-7009-HP \audio.ini
-TEST_COMPLETE
-
-#Req. under test  REQ172.1.51.2 REQ172.1.51.3 REQ172.1.51.4
-# Open source and destination audio. Close them and open a new destination.
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0102-HP
-
-RUN_TEST_STEP 10000, ACLNT, MM-MMF-ACLNT-I-0102-HP \audio.ini
-TEST_COMPLETE
-
-#Req. under test  REQ172.1.51.14 REQ172.1.51.15 REQ172.1.51.19
-# Set convert window. Delete window
-#PRINT <FONT COLOR=RED>TEST MM-MMF-ACLNT-I-0103-HP is commented out untill defect DEF011573 is fixed</FONT>
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0103-HP
-
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-0103-HP \audio.ini
-TEST_COMPLETE
-
-#Req. under test  REQ172.1.51.13
-# Enquire duration
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0104-LP
-
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-0104-LP \audio.ini
-TEST_COMPLETE
-
-#Req. under test  REQ172.1.51.11 REQ172.1.51.12
-# Set position and equire position
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0105-LP
-
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-0105-LP \audio.ini
-TEST_COMPLETE
-
-#Req. under test  REQ172.1.51.8.*
-# Set and config destination clip
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0106-HP
-
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-0106-HP \audio.ini
-TEST_COMPLETE
-
-#Req. under test  REQ172.1.51.18
-# query transformations available.
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0107-LP
-
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-0107-LP \audio.ini
-TEST_COMPLETE
-
-###################### POSITIVE CODE COVERAGE TESTS ###############
-
-#Req. under test REQ172.1.51.2 REQ172.1.51.8.1 REQ172.1.51.8.2 REQ172.1.51.9
-# Checks aviable destination bit rates.
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0108-LP
-
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-0108-LP, \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.51.2 REQ172.1.51.8.1 REQ172.1.51.8.2 REQ172.1.51.9
-#Checks  aviable destination sample rates 
-#untill defect DEF011573   isn't fixed
-#PRINT <FONT COLOR=RED>TEST MM-MMF-ACLNT-I-0109-LP is commented out untill defect DEF011573 is fixed</FONT>
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0109-LP
-
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-0109-LP, \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.51.2 REQ172.1.51.8.1 REQ172.1.51.8.2 REQ172.1.51.9
-# Checks  aviable destination number of channels
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0110-LP
-
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-0110-LP, \audio.ini
-TEST_COMPLETE
-
-
-#Req. under test REQ172.1.51.2 REQ172.1.51.8.1 REQ172.1.51.8.2 REQ172.1.51.9
-#Checks  aviable destination data types 
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0111-LP
-
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-0111-LP, \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.51.2 REQ172.1.51.8.1 REQ172.1.51.8.2 REQ172.1.51.9
-# Checks  aviable destination formats
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0112-LP
-
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-0112-LP, \audio.ini
-TEST_COMPLETE
-
-
-#Req. under test REQ172.1.51.2 REQ172.1.51.8.1 REQ172.1.51.8.2 REQ172.1.51.9
-#Checks  source info information 
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0114-LP
-
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-0114-LP, \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.51.2 REQ172.1.51.8.1 REQ172.1.51.8.2 REQ172.1.51.9
-# Checks checks one of OpenL() functions and CropL() function
-#untill defect DEF011573   isn't fixed
-#PRINT <FONT COLOR=RED>TEST MM-MMF-ACLNT-I-0115-LP is commented out untill defect DEF011573 is fixed</FONT>
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0115-LP
-
-RUN_TEST_STEP -1, ACLNT, MM-MMF-ACLNT-I-0115-LP, \audio.ini
-TEST_COMPLETE
-
-
-#Req. under test REQ172.1.51.2 REQ172.1.51.8.1 REQ172.1.51.8.2 REQ172.1.51.9
-# Checks checks  one of OpenL() functions and CropFromBeginingL() function  
-#PRINT <FONT COLOR=RED>TEST MM-MMF-ACLNT-I-0116-LP is commented out untill defect DEF011573 is fixed</FONT>
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0116-LP
-
-RUN_TEST_STEP -1, ACLNT, MM-MMF-ACLNT-I-0116-LP, \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.51.2 REQ172.1.51.8.1 REQ172.1.51.8.2 REQ172.1.51.9
-# Checks checks  SetMaxWriteLength() function  
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0117-LP
-
-RUN_TEST_STEP -1, ACLNT, MM-MMF-ACLNT-I-0117-LP, \audio.ini
-TEST_COMPLETE
-
-
-#Req. under test REQ172.1.51.2 REQ172.1.51.8.1 REQ172.1.51.8.2 REQ172.1.51.9
-# Checks checks  PlayL() and SetRepeats() functions 
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0118-LP
-
-RUN_TEST_STEP -1, ACLNT, MM-MMF-ACLNT-I-0118-LP, \audio.ini
-TEST_COMPLETE
-
-
-#Req. under test REQ172.1.51.10
-# Checks  checks  PlayL() and Stop() functions
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0119-LP
-
-RUN_TEST_STEP -1, ACLNT, MM-MMF-ACLNT-I-0119-LP, \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.51.2 REQ172.1.51.8.1 REQ172.1.51.8.2 REQ172.1.51.9
-# Checks checks  SetMaxWriteLength() function  
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0117-LP
-
-RUN_TEST_STEP -1, ACLNT, MM-MMF-ACLNT-I-0117-LP, \audio.ini
-TEST_COMPLETE
-
-
-#Req. under test REQ172.1.51.2 REQ172.1.51.8.1 REQ172.1.51.8.2 REQ172.1.51.9
-# Checks checks  PlayL() and SetRepeats() functions 
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0118-LP
-
-RUN_TEST_STEP -1, ACLNT, MM-MMF-ACLNT-I-0118-LP, \audio.ini
-TEST_COMPLETE
-
-
-#Req. under test REQ172.1.51.10
-# Checks  checks  PlayL() and Stop() functions
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0119-LP
-
-RUN_TEST_STEP -1, ACLNT, MM-MMF-ACLNT-I-0119-LP, \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.51.10
-# Checks CropL() function
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0120-LP
-
-RUN_TEST_STEP -1, ACLNT, MM-MMF-ACLNT-I-0120-LP, \audio.ini
-TEST_COMPLETE
-
-################  NEGATIVE TESTS ###############
-
-#Req. under test REQ172.1.51.8.*
-# Invalid Destination configuration.
-//! @SYMTestCaseID MM-MMF-ACLNT-I-1006-LP
-
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-1006-LP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.51.2               REQ172.1.51.8.1     REQ172.1.51.8.2
-# Convert audio to unsupported format.
-//! @SYMTestCaseID MM-MMF-ACLNT-I-1050-LP
-
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-1050-LP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.51.2               REQ172.1.51.8.1     REQ172.1.51.8.2
-# Conversion utility - Delete object before conversion operation has completed.
-//! @SYMTestCaseID MM-MMF-ACLNT-I-1051-CP
-
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-1051-CP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.51.2      REQ172.1.51.3       REQ172.1.51.4
-# Open new file while audio converter is converting. Open a new audio file.
-//! @SYMTestCaseID MM-MMF-ACLNT-I-1052-LP
-
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-1052-LP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.51.11        REQ172.1.51.12
-# Set invalid position
-//! @SYMTestCaseID MM-MMF-ACLNT-I-1053-LP
-
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-1053-LP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.51.11        REQ172.1.51.12
-# Set invalid position
-//! @SYMTestCaseID MM-MMF-ACLNT-I-1054-LP
-
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-1054-LP \audio.ini
-TEST_COMPLETE
-
-#inc21946
-# Convert audio to unsupported format.
-//! @SYMTestCaseID MM-MMF-ACLNT-I-1055-LP
-
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-1055-LP \audio.ini
-TEST_COMPLETE
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNT_03.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,188 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-LOAD_SUITE TSI_MMFACLNT.DLL
-#PAUSE_AT_END
-
-# wait for ring.wav to finish playing
-delay 5000
-
-###################### POSITIVE TEST ###############
-
-#Req. under test 
-# Play a tone
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0151-CP
-
-RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-0151-CP
-TEST_COMPLETE
-
-#Req. under test 
-# Play a DTMF string
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0152-HP
-
-RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-0152-HP
-TEST_COMPLETE
-
-#Req. under test 
-# Play a tone file
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0153-HP
-
-RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-0153-HP \audio.ini
-TEST_COMPLETE
-
-#Req. under test 
-# Play a tone from a descriptor.
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0154-HP
-
-RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-0154-HP
-TEST_COMPLETE
-
-#Req. under test 
-# Play a predefined/fixed tone
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0155-CP
-
-RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-0155-CP
-TEST_COMPLETE
-
-#Req. under test 
-# Cancel tone play
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0157-CP
-
-RUN_TEST_STEP -1, ACLNT, MM-MMF-ACLNT-I-0157-CP
-TEST_COMPLETE
-
-#Req. under test 
-# Cancel tone prepare.
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0158-CP
-
-RUN_TEST_STEP -1, ACLNT, MM-MMF-ACLNT-I-0158-CP
-TEST_COMPLETE
-
-#Req. under test 
-# Enquire sequence name
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0159-LP
-
-RUN_TEST_STEP -1, ACLNT, MM-MMF-ACLNT-I-0159-LP
-TEST_COMPLETE
-
-#Req. under test 
-# Enquire sequence count
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0160-LP
-
-RUN_TEST_STEP -1, ACLNT, MM-MMF-ACLNT-I-0160-LP \audio.ini
-TEST_COMPLETE
-
-#Req. under test  REQ172.1.71.2 REQ172.1.71.3 REQ172.1.71.4
-# Set volume to max and enquire volume.
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0161-HP
-
-RUN_TEST_STEP -1, ACLNT, MM-MMF-ACLNT-I-0161-HP \audio.ini
-TEST_COMPLETE
-
-#Req. under test  REQ172.1.71.5
-# Set volume ramp.
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0162-LP
-
-RUN_TEST_STEP -1, ACLNT, MM-MMF-ACLNT-I-0162-LP
-TEST_COMPLETE
-
-#Req. under test  REQ172.1.71.8
-# Set repeats.
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0163-LP
-
-RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-0163-LP
-TEST_COMPLETE
-
-#Req. under test  REQ172.1.71.9
-# Config tone on length, tone off length, pause a length of DTMF tones.
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0164-HP
-
-RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-0164-HP
-TEST_COMPLETE
-
-#Req. under test  REQ172.1.71.13 REQ172.1.71.14
-# Set balance and enquire balance.
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0166-LP
-
-RUN_TEST_STEP -1, ACLNT, MM-MMF-ACLNT-I-0166-LP
-TEST_COMPLETE
-
-#### Sirocco CR Test
-#Req. under test 
-# Play a Dual tone
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0167-CP
-
-RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-0167-CP
-TEST_COMPLETE
-
-################  NEGATIVE TESTS ###############
-
-#Req. under test REQ172.1.71.11
-# Attempt to play an invalid DTMF string
-//! @SYMTestCaseID MM-MMF-ACLNT-I-1150-HP
-
-RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-1150-HP
-TEST_COMPLETE
-
-#Req. under test  REQ172.1.71.20
-# Play a tone from a bad descriptor.
-//! @SYMTestCaseID MM-MMF-ACLNT-I-1151-HP
-
-RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-1151-HP
-TEST_COMPLETE
-
-#Req. under test REQ172.1.71.21
-# Play a predefined/fixed tone that doesn't exist
-//! @SYMTestCaseID MM-MMF-ACLNT-I-1152-HP
-
-RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-1152-HP
-TEST_COMPLETE
-
-#Req. under test RE172.1.71.2        REQ172.1.71.3                 REQ172.1.71.4
-# Set volume beyond the maximum and enquire volume
-//! @SYMTestCaseID MM-MMF-ACLNT-I-1153-LP
-
-RUN_TEST_STEP -1, ACLNT, MM-MMF-ACLNT-I-1153-LP
-TEST_COMPLETE
-
-#Req. under test RE172.1.71.2        REQ172.1.71.3                 REQ172.1.71.4
-# Set volume beyond the minimum and enquire volume
-//! @SYMTestCaseID MM-MMF-ACLNT-I-1157-LP
-
-RUN_TEST_STEP -1, ACLNT, MM-MMF-ACLNT-I-1157-LP
-TEST_COMPLETE
-
-#Req. under test REQ172.1.71.5
-# Set volume ramp to invalid value
-//! @SYMTestCaseID MM-MMF-ACLNT-I-1154-HP
-
-RUN_TEST_STEP -1, ACLNT, MM-MMF-ACLNT-I-1154-HP
-TEST_COMPLETE
-
-#Req. under test REQ172.1.71.5
-# Set volume ramp to invalid value
-//! @SYMTestCaseID MM-MMF-ACLNT-I-1159-HP
-
-RUN_TEST_STEP -1, ACLNT, MM-MMF-ACLNT-I-1159-HP
-TEST_COMPLETE
-
-#Req. under test REQ172.1.71.9
-# Set up tone on, off and pause length to illegal values.
-//! @SYMTestCaseID MM-MMF-ACLNT-I-1155-HP
-
-RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-1155-HP
-TEST_COMPLETE
-
-
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNT_03_PREEMPTION.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-LOAD_SUITE TSI_MMFACLNT.DLL
-#PAUSE_AT_END
-
-# wait for ring.wav to finish playing
-delay 1000
-
-#Req. under test 
-# Playing a tone and playing an audio file.
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0156-LP
-
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-0156-LP \audio.ini
-TEST_COMPLETE
-
-#Req. under test  REQ172.1.71.7
-# Set priorities of tones.
-//! @SYMTestCaseID MM-MMF-ACLNT-I-0165-HP
-
-# RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-0165-HP
-# TEST_COMPLETE
\ No newline at end of file
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNT_04.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,144 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-LOAD_SUITE TSI_MMFACLNT.DLL
-#PAUSE_AT_END
-
-# wait for ring.wav to finish playing
-delay 5000
-
-
-# OUTPUT STREAM API
-//! @SYMTestCaseID MM-MMF-ACLNT-I-6040-CP
-
-RUN_TEST_STEP -1, ACLNT, MM-MMF-ACLNT-I-6040-CP \audio.ini
-TEST_COMPLETE
-//! @SYMTestCaseID MM-MMF-ACLNT-I-6041-CP
-
-RUN_TEST_STEP -1, ACLNT, MM-MMF-ACLNT-I-6041-CP \audio.ini
-TEST_COMPLETE
-//! @SYMTestCaseID MM-MMF-ACLNT-I-6042-CP
-
-RUN_TEST_STEP -1, ACLNT, MM-MMF-ACLNT-I-6042-CP \audio.ini
-TEST_COMPLETE
-//! @SYMTestCaseID MM-MMF-ACLNT-I-6043-CP
-
-RUN_TEST_STEP -1, ACLNT, MM-MMF-ACLNT-I-6043-CP \audio.ini
-TEST_COMPLETE
-//! @SYMTestCaseID MM-MMF-ACLNT-I-6044-CP
-
-RUN_TEST_STEP -1, ACLNT, MM-MMF-ACLNT-I-6044-CP \audio.ini
-TEST_COMPLETE
-//! @SYMTestCaseID MM-MMF-ACLNT-I-6045-CP
-
-RUN_TEST_STEP -1, ACLNT, MM-MMF-ACLNT-I-6045-CP \audio.ini
-TEST_COMPLETE
-//! @SYMTestCaseID MM-MMF-ACLNT-I-6046-CP
-
-RUN_TEST_STEP -1, ACLNT, MM-MMF-ACLNT-I-6046-CP \audio.ini
-TEST_COMPLETE
-//Currently this test is expected to hang on a3f. timeout of -1 is making the test hang infinitely. 
-//Changed the timeout in order to aviod that situation during CR1424
-//! @SYMTestCaseID MM-MMF-ACLNT-I-6047-CP
-
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-6047-CP \audio.ini
-TEST_COMPLETE
-
-# Use CMMFCodecs rather than CMMFHwDevice play and record tests.
-# DEF039267
-//! @SYMTestCaseID MM-MMF-ACLNT-I-8002-HP
-
-RUN_TEST_STEP 20000, ACLNT, MM-MMF-ACLNT-I-8002-HP  \audio.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-8004-HP
-
-RUN_TEST_STEP 20000, ACLNT, MM-MMF-ACLNT-I-8004-HP  \audio.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-8005-HP
-
-RUN_TEST_STEP 20000, ACLNT, MM-MMF-ACLNT-I-8005-HP  \audio.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-8006-HP
-
-RUN_TEST_STEP 20000, ACLNT, MM-MMF-ACLNT-I-8006-HP  \audio.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-8007-HP
-
-RUN_TEST_STEP 20000, ACLNT, MM-MMF-ACLNT-I-8007-HP  \audio.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-8008-HP
-
-RUN_TEST_STEP 20000, ACLNT, MM-MMF-ACLNT-I-8008-HP  \audio.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-8010-HP
-
-RUN_TEST_STEP 20000, ACLNT, MM-MMF-ACLNT-I-8010-HP  \audio.ini
-TEST_COMPLETE
-
-# DRM tests
-//! @SYMTestCaseID MM-MMF-ACLNT-I-9000-LP
-
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-9000-LP  \audio.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-9001-LP
-
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-9001-LP  \audio.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-9002-LP
-
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-9002-LP  \audio.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-9003-LP
-
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-9003-LP  \audio.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-9004-LP
-
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-9004-LP  \audio.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-9005-LP
-
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-9005-LP  \audio.ini
-TEST_COMPLETE
-
-
-// It fails because of the incorrect implementation of the Multimedia test CAF agent 
-// i.e. the agent doesn't properly support GetAttribute(EIsProtected, value);
-//! @SYMTestCaseID MM-MMF-ACLNT-I-9006-LP
-
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-9006-LP  \audio.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-1001-LP
-
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-1001-LP, \audio.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-1013-LP
-
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-1013-LP  \audio.ini
-TEST_COMPLETE
-
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNT_ARN.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,636 +0,0 @@
-@file TSI_MMF_ACLNT_ARN.script
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-# Audio Client Utilities Audio Resource Notification Tests
-
-LOAD_SUITE TSI_MMFACLNT.DLL
-
-delay 10000
-
-/////////////////////////////////////////////////////////////////////
-/////////////////////////// POSITIVE TESTS //////////////////////////
-/////////////////////////////////////////////////////////////////////
-
-######################### Audio Player tests #########################
-
-//
-//!@SYMTestCaseID             MM-MMF-ACLNT-I-8101-HP
-//!@SYMTestCaseDesc           Register for notification, but make no request to play audio
-//!@SYMREQ                    REQ3834
-//!@SYMPREQ                   PREQ797
-//!@SYMTestPriority           2
-//!@SYMTestActions            iAudioPlayer[1] - Medium Priority iAudioPlayer[2] - High Priority a. Open 2 clients b. Open iAudioPlayer[1] c. Register
-//! iAudioPlayer[1] for Notification d. Open and Play iAudioPlayer[2] e. iAudioPlayer[2] completes playing f. iAudioPlayer[1] is NOT notified (as it dis
-//! not make a request for play)
-//!@SYMTestExpectedResults    The Client which has registered for notification, but makes no request for playing, should not receive the notification.
-//! KErrNone should be returned.
-RUN_TEST_STEP 600000 ACLNT MM-MMF-ACLNT-I-8101-HP \audio.ini
-TEST_COMPLETE
-
-//
-//!@SYMTestCaseID             MM-MMF-ACLNT-I-8102-HP
-//!@SYMTestCaseDesc           Register (b4 play, after Open) and Receive Notification of a Resource Available Event.(when audio resource is currently
-//! unavailable and then available)
-//!@SYMREQ                    REQ3834.1
-//!@SYMPREQ                   PREQ797
-//!@SYMTestPriority           2
-//!@SYMTestActions            iAudioPlayer[1] - Low Priority iAudioPlayer[2] - High Priority a. Open 2 clients b. Open iAudioPlayer[1] c. Register iAudioPlayer[1]
-//! for Notification d. Check if registration is successful, and notification is not received immediately. e. Open and Play iAudioPlayer[2] f. Play iAudioPlayer[1]
-//! (get Play Error as iAudioPlayer[2] is still playing) g. iAudioPlayer[2] stops playing h. Check if iAudioPlayer[1] is notified.
-//!@SYMTestExpectedResults    The Client should be able to receive the notification succesfully, without any errors in the process. KErrNone should be
-//! returned.
-RUN_TEST_STEP 600000 ACLNT MM-MMF-ACLNT-I-8102-HP \audio.ini
-TEST_COMPLETE
-
-//
-//!@SYMTestCaseID             MM-MMF-ACLNT-I-8103-HP
-//!@SYMTestCaseDesc           Register (at the time of Play) and Receive Notification of a Resource Available Event.(when audio resource is currently
-//! available and subsequently unavailable, and then available)
-//!@SYMREQ                    REQ3834.1
-//!@SYMPREQ                   PREQ797
-//!@SYMTestPriority           2
-//!@SYMTestActions            iAudioPlayer[1] - Low Priority iAudioPlayer[2] - High Priority a. Open 2 clients b. Open and Play iAudioPlayer[1] c. Register
-//! iAudioPlayer[1] for Notification d. Check if registration is successful, and notification is not received immediately. e. Open and Play iAudioPlayer[2]
-//! f. iAudioPlayer[2] completes playing g. Check if iAudioPlayer[1] is notified.
-//!@SYMTestExpectedResults    The Client should be able to receive the notification succesfully, without any errors in the process. KErrNone should be
-//! returned.
-RUN_TEST_STEP 600000 ACLNT MM-MMF-ACLNT-I-8103-HP \audio.ini
-TEST_COMPLETE
-
-//
-//!@SYMTestCaseID             MM-MMF-ACLNT-I-8104-HP
-//!@SYMTestCaseDesc           Registration (b4 File Open) and Cancellation of  the notification request
-//!@SYMREQ                    REQ3834.3
-//!@SYMPREQ                   PREQ797
-//!@SYMTestPriority           2
-//!@SYMTestActions            iAudioPlayer[1] - Medium Priority iAudioPlayer[2] - High Priority a. Open 2 clients b. Register iAudioPlayer[1] for Notification
-//! c. Check if registration is successful. d. Open and Play iAudioPlayer[1] e. Open and Play iAudioPlayer[2] f. Cancel the notification request for iAudioPlayer[1]
-//! g. Check if cancellation is successful. h. iAudioPlayer[2] stops playing i. Check if iAudioPlayer[1] is NOT notified.
-//!@SYMTestExpectedResults    The Client should be able to cancel the notification succesfully, without any errors in the process. KErrNone should be
-//! returned.
-RUN_TEST_STEP 600000 ACLNT MM-MMF-ACLNT-I-8104-HP \audio.ini
-TEST_COMPLETE
-
-//
-//!@SYMTestCaseID             MM-MMF-ACLNT-I-8105-HP
-//!@SYMTestCaseDesc           Register (after Play Error) and Get the actual position from where the paused audio can be resumed. Low priority client
-//! is played first.
-//!@SYMREQ                    REQ3837
-//!@SYMPREQ                   PREQ797
-//!@SYMTestPriority           2
-//!@SYMTestActions            iAudioPlayer[1] - Medium Priority iAudioPlayer[2] - High Priority a. Open 2 clients b. Open and Play iAudioPlayer[1] c.
-//! Open and Play iAudioPlayer[2] d. Play Error is received by iAudioPlayer[1]. Note the time when iAudioPlayer[1] is paused e. Register iAudioPlayer[1]
-//! for Notification f. Check if registration is successful. g. iAudioPlayer[2] completes playing h. iAudioPlayer[1] is notified. i. Get the position, and
-//! check whether it matches the position got from step d.
-//!@SYMTestExpectedResults    The medium priority Client should be able to receive the offset time and that should be correct without any errors in the
-//! process. KErrNone should be returned.
-RUN_TEST_STEP 600000 ACLNT MM-MMF-ACLNT-I-8105-HP \audio.ini
-TEST_COMPLETE
-
-//
-//!@SYMTestCaseID             MM-MMF-ACLNT-I-8106-HP
-//!@SYMTestCaseDesc           Register (after Play Error) and Get the actual position from where the paused audio can be resumed. High priority client
-//! is played first.
-//!@SYMREQ                    REQ3837
-//!@SYMPREQ                   PREQ797
-//!@SYMTestPriority           2
-//!@SYMTestActions            iAudioPlayer[1] - Medium Priority iAudioPlayer[2] - High Priority a. Open 2 clients b. Open and Play iAudioPlayer[2] c.
-//! Open and Play iAudioPlayer[1] d. Play Error is received by iAudioPlayer[1]. iAudioPlayer[1] not played. e. Register iAudioPlayer[1] for Notification
-//! f. Check if registration is successful. g. iAudioPlayer[2] completes playing h. iAudioPlayer[1] is notified. i. Get the position, and check whether it
-//! is zero (initial position).
-//!@SYMTestExpectedResults    The medium priority Client should be able to receive the offset time and that should be correct without any errors in the
-//! process. KErrNone should be returned.
-RUN_TEST_STEP 600000 ACLNT MM-MMF-ACLNT-I-8106-HP \audio.ini
-TEST_COMPLETE
-
-//
-//!@SYMTestCaseID             MM-MMF-ACLNT-I-8107-HP
-//!@SYMTestCaseDesc           Client does not need to Re-register for the same event when the event is received i.e API is not one shot. (Will resume
-//! play is called)
-//!@SYMREQ                    REQ3834
-//!@SYMPREQ                   PREQ797
-//!@SYMTestPriority           2
-//!@SYMTestActions            iAudioPlayer[1] - Medium Priority iAudioPlayer[2] - High Priority a. Open 2 clients b. Open and Play iAudioPlayer[1] c.
-//! Register iAudioPlayer[1] for Notification e. Open and Play iAudioPlayer[2] g. iAudioPlayer[2] completes playing h. iAudioPlayer[1] is notified, calls
-//! WillResumePlay() and after 5 seconds resumes playing. i. Play iAudioPlayer[2] again. j. iAudioPlayer[2] completes playing k. Check if iAudioPlayer[2]
-//! is notified again.
-//!@SYMTestExpectedResults    The Client should be able to register for notification only once, and should receive the notification if the resource is
-//! lost and regained more than once succesfully. KErrNone should be returned.
-RUN_TEST_STEP 600000 ACLNT MM-MMF-ACLNT-I-8107-HP \audio.ini
-TEST_COMPLETE
-
-//
-//!@SYMTestCaseID             MM-MMF-ACLNT-I-8108-HP
-//!@SYMTestCaseDesc           Call WillResumePlay()
-//!@SYMREQ                    REQ3837
-//!@SYMPREQ                   PREQ797
-//!@SYMTestPriority           2
-//!@SYMTestActions            iAudioPlayer[1] - Medium Priority iAudioPlayer[2] - High Priority iAudioPlayer[3] - Low Priority a. Open 3 clients b. Open
-//! and Play iAudioPlayer[1] c. Register iAudioPlayer[1] for Notification d. Register iAudioPlayer[3] for Notification e. Check if registration is successful.
-//! f. Open iAudioPlayer[3] g. Open and Play iAudioPlayer[2] h. iAudioPlayer[2] stops playing i. iAudioPlayer[1] is notified. j. iAudioPlayer[1] calls WillResumePlay()
-//! k. Check after 5 seconds, iAudioPlayer[3] does not get the notification. l. iAudioPlayer[1] starts playing. m. iAudioPlayer[1] completes playing. n.
-//! Check if iAudioPlayer[3] gets the notification now.
-//!@SYMTestExpectedResults    The low priority Client should NOT receive notification if the medium priority client calls WillResumePlay()
-RUN_TEST_STEP 600000 ACLNT MM-MMF-ACLNT-I-8108-HP \audio.ini
-TEST_COMPLETE
-
-//CR1424:  high priority client 
-//plays, low priority client does not get the resources when the high priority client is playing silence for every repeat.
-
-RUN_TEST_STEP 600000 ACLNT MM-MMF-ACLNT-I-8109-HP \audio.ini
-TEST_COMPLETE
-
-//DevCR KEVN-7T5EHA:  Dont register for ARN, get pre-empted and then resume from same position. 
-//
-
-RUN_TEST_STEP 600000 ACLNT MM-MMF-ACLNT-I-8110-HP \audio.ini
-TEST_COMPLETE
-
-RUN_TEST_STEP 600000 ACLNT MM-MMF-ACLNT-I-8111-HP \audio.ini
-TEST_COMPLETE
-
-RUN_TEST_STEP 600000 ACLNT MM-MMF-ACLNT-I-8112-HP \audio.ini
-TEST_COMPLETE
-
-######################## Audio Recorder tests ########################
-
-//
-//!@SYMTestCaseID             MM-MMF-ACLNT-I-8011-HP
-//!@SYMTestCaseDesc           Register for notification, but make no request to play audio
-//!@SYMREQ                    REQ3834
-//!@SYMPREQ                   PREQ797
-//!@SYMTestPriority           2
-//!@SYMTestActions            iAudioRecorder[1] - Medium Priority iAudioRecorder[2] - High Priority a. Open 2 clients b. Open iAudioRecorder[1] c. Register
-//! iAudioRecorder[1] for Notification d. Open and Play iAudioRecorder[2] e. iAudioRecorder[2] completes playing f. iAudioRecorder[1] is NOT notified (as
-//! it dis not make a request for play)
-//!@SYMTestExpectedResults    The Client which has registered for notification, but makes no request for playing, should not receive the notification.
-//! KErrNone should be returned.
-RUN_TEST_STEP 600000 ACLNT MM-MMF-ACLNT-I-8011-HP \audio.ini
-TEST_COMPLETE
-
-//
-//!@SYMTestCaseID             MM-MMF-ACLNT-I-8012-HP
-//!@SYMTestCaseDesc           Register (b4 play, after Open) and Receive Notification of a Resource Available Event.(when audio resource is currently
-//! unavailable and then available)
-//!@SYMREQ                    REQ3834.1
-//!@SYMPREQ                   PREQ797
-//!@SYMTestPriority           2
-//!@SYMTestActions            iAudioRecorder[1] - Low Priority iAudioRecorder[2] - High Priority a. Open 2 clients b. Open iAudioRecorder[1] c. Register
-//! iAudioRecorder[1] for Notification d. Check if registration is successful, and notification is not received immediately. e. Open and Play iAudioRecorder[2]
-//! f. Play iAudioRecorder[1] (get Play Error as iAudioRecorder[2] is still playing) g. iAudioRecorder[2] stops playing h. Check if iAudioRecorder[1] is
-//! notified.
-//!@SYMTestExpectedResults    The Client should be able to receive the notification succesfully, without any errors in the process. KErrNone should be
-//! returned.
-RUN_TEST_STEP 600000 ACLNT MM-MMF-ACLNT-I-8012-HP \audio.ini
-TEST_COMPLETE
-
-//
-//!@SYMTestCaseID             MM-MMF-ACLNT-I-8013-HP
-//!@SYMTestCaseDesc           Register (at the time of Play) and Receive Notification of a Resource Available Event.(when audio resource is currently
-//! available and subsequently unavailable, and then available)
-//!@SYMREQ                    REQ3834.1
-//!@SYMPREQ                   PREQ797
-//!@SYMTestPriority           2
-//!@SYMTestActions            iAudioRecorder[1] - Low Priority iAudioRecorder[2] - High Priority a. Open 2 clients b. Open and Play iAudioRecorder[1]
-//! c. Register iAudioRecorder[1] for Notification d. Check if registration is successful, and notification is not received immediately. e. Open and Play
-//! iAudioRecorder[2] f. iAudioRecorder[2] stops playing g. Check if iAudioRecorder[1] is notified.
-//!@SYMTestExpectedResults    The Client should be able to receive the notification succesfully, without any errors in the process. KErrNone should be
-//! returned.
-RUN_TEST_STEP 600000 ACLNT MM-MMF-ACLNT-I-8013-HP \audio.ini
-TEST_COMPLETE
-
-//
-//!@SYMTestCaseID             MM-MMF-ACLNT-I-8014-HP
-//!@SYMTestCaseDesc           Registration (b4 File Open) and Cancellation of  the notification request
-//!@SYMREQ                    REQ3834.3
-//!@SYMPREQ                   PREQ797
-//!@SYMTestPriority           2
-//!@SYMTestActions            iAudioRecorder[1] - Medium Priority iAudioRecorder[2] - High Priority a. Open 2 clients b. Register iAudioRecorder[1] for
-//! Notification c. Check if registration is successful. d. Open and Play iAudioRecorder[1] e. Open and Play iAudioRecorder[2] f. Cancel the notification
-//! request for iAudioRecorder[1] g. Check if cancellation is successful. h. iAudioRecorder[2] stops playing i. Check if iAudioRecorder[1] is NOT notifie
-//!d.
-//!@SYMTestExpectedResults    The Client should be able to cancel the notification succesfully, without any errors in the process. KErrNone should be
-//! returned.
-RUN_TEST_STEP 600000 ACLNT MM-MMF-ACLNT-I-8014-HP \audio.ini
-TEST_COMPLETE
-
-//
-//!@SYMTestCaseID             MM-MMF-ACLNT-I-8015-HP
-//!@SYMTestCaseDesc           Get the actual position from where the paused audio can be resumed.
-//!@SYMREQ                    REQ3837
-//!@SYMPREQ                   PREQ797
-//!@SYMTestPriority           2
-//!@SYMTestActions            iAudioRecorder[1] - Medium Priority iAudioRecorder[2] - High Priority a. Open 2 clients b. Open and Play iAudioRecorder[1]
-//! c. Register iAudioRecorder[1] for Notification d. Check if registration is successful. e. Open and Play iAudioRecorder[2] f. Note the time when iAudioRecorder[1]
-//! is paused g. iAudioRecorder[2] stops playing h. iAudioRecorder[1] is notified. i. Get the position, and check whether it matches the position got from
-//! step f.
-//!@SYMTestExpectedResults    The medium priority Client should be able to receive the offset time and that should be correct without any errors in the
-//! process. KErrNone should be returned.
-RUN_TEST_STEP 600000 ACLNT MM-MMF-ACLNT-I-8015-HP \audio.ini
-TEST_COMPLETE
-
-//
-//!@SYMTestCaseID             MM-MMF-ACLNT-I-8016-HP
-//!@SYMTestCaseDesc           Call WillResumePlay()
-//!@SYMREQ                    REQ3837
-//!@SYMPREQ                   PREQ797
-//!@SYMTestPriority           2
-//!@SYMTestActions            iAudioRecorder[1] - Medium Priority iAudioRecorder[2] - High Priority iAudioRecorder[3] - Low Priority a. Open 2 clients
-//! b. Open and Play iAudioRecorder[1] c. Register iAudioRecorder[1] for Notification d. Register iAudioRecorder[3] for Notification e. Check if registration
-//! is successful. f. Open iAudioRecorder[3] g. Open and Play iAudioRecorder[2] h. iAudioRecorder[2] stops playing i. iAudioRecorder[1] is notified. j. iAudioRecorder[1]
-//! calls WillResumePlay() k. Check after 1 second, iAudioRecorder[3] does not get the notification. l. iAudioRecorder[1] starts playing. m. iAudioRecorder[1]
-//! completes playing. n. Check if iAudioRecorder[3] gets the notification now.
-//!@SYMTestExpectedResults    The low priority Client should NOT receive notification if the medium priority client calls WillResumePlay()
-RUN_TEST_STEP 600000 ACLNT MM-MMF-ACLNT-I-8016-HP \audio.ini
-TEST_COMPLETE
-
-##################### Audio Output Stream tests ######################
-
-//
-//!@SYMTestCaseID             MM-MMF-ACLNT-I-8021-HP
-//!@SYMTestCaseDesc           Register for notification, but make no request to play audio
-//!@SYMREQ                    REQ3834
-//!@SYMPREQ                   PREQ797
-//!@SYMTestPriority           2
-//!@SYMTestActions            iAudioOutputStream[1] - Medium Priority iAudioOutputStream[2] - High Priority a. Open 2 clients b. Open iAudioOutputStream[1]
-//! c. Register iAudioOutputStream[1] for Notification d. Open and Play iAudioOutputStream[2] e. iAudioOutputStream[2] completes playing f. iAudioOutputStream[1]
-//! is NOT notified (as it dis not make a request for play)
-//!@SYMTestExpectedResults    The Client which has registered for notification, but makes no request for playing, should not receive the notification.
-//! KErrNone should be returned.
-RUN_TEST_STEP 600000 ACLNT MM-MMF-ACLNT-I-8021-HP \audio.ini
-TEST_COMPLETE
-
-//
-//!@SYMTestCaseID             MM-MMF-ACLNT-I-8022-HP
-//!@SYMTestCaseDesc           Register (b4 play, after Open) and Receive Notification of a Resource Available Event.(when audio resource is currently
-//! unavailable and then available)
-//!@SYMREQ                    REQ3834.1
-//!@SYMPREQ                   PREQ797
-//!@SYMTestPriority           2
-//!@SYMTestActions            iAudioOutputStream[1] - Low Priority iAudioOutputStream[2] - High Priority a. Open 2 clients b. Open iAudioOutputStream[1]
-//! c. Register iAudioOutputStream[1] for Notification d. Check if registration is successful, and notification is not received immediately. (after 1 second)
-//! e. Open and Play iAudioOutputStream[2] f. Play iAudioOutputStream[1] (get Play Error as iAudioOutputStream[2] is still playing) g. iAudioOutputStream[2]
-//! stops playing h. Check if iAudioOutputStream[1] is notified.
-//!@SYMTestExpectedResults    The Client should be able to receive the notification succesfully, without any errors in the process. KErrNone should be
-//! returned.
-RUN_TEST_STEP 600000 ACLNT MM-MMF-ACLNT-I-8022-HP \audio.ini
-TEST_COMPLETE
-
-//
-//!@SYMTestCaseID             MM-MMF-ACLNT-I-8023-HP
-//!@SYMTestCaseDesc           Register (at the time of Play) and Receive Notification of a Resource Available Event.(when audio resource is currently
-//! available and subsequently unavailable, and then available)
-//!@SYMREQ                    REQ3834.1
-//!@SYMPREQ                   PREQ797
-//!@SYMTestPriority           2
-//!@SYMTestActions            iAudioOutputStream[1] - Low Priority iAudioOutputStream[2] - High Priority a. Open 2 clients b. Open and Play iAudioOutputStream[1]
-//! c. Register iAudioOutputStream[1] for Notification d. Check if registration is successful, and notification is not received immediately. (after 1 second)
-//! e. Open and Play iAudioOutputStream[2] f. iAudioOutputStream[2] stops playing g. Check if iAudioOutputStream[1] is notified.
-//!@SYMTestExpectedResults    The Client should be able to receive the notification succesfully, without any errors in the process. KErrNone should be
-//! returned.
-RUN_TEST_STEP 600000 ACLNT MM-MMF-ACLNT-I-8023-HP \audio.ini
-TEST_COMPLETE
-
-//
-//!@SYMTestCaseID             MM-MMF-ACLNT-I-8024-HP
-//!@SYMTestCaseDesc           Registration (b4 File Open) and Cancellation of  the notification request
-//!@SYMREQ                    REQ3834.3
-//!@SYMPREQ                   PREQ797
-//!@SYMTestPriority           2
-//!@SYMTestActions            iAudioOutputStream[1] - Medium Priority iAudioOutputStream[2] - High Priority a. Open 2 clients b. Register iAudioOutputStream[1]
-//! for Notification c. Check if registration is successful. d. Open and Play iAudioOutputStream[1] e. Open and Play iAudioOutputStream[2] f. Cancel the
-//! notification request for iAudioOutputStream[1] g. Check if cancellation is successful. h. iAudioOutputStream[2] stops playing i. Check if iAudioOutputStream[1]
-//! is NOT notified.
-//!@SYMTestExpectedResults    The Client should be able to cancel the notification succesfully, without any errors in the process. KErrNone should be
-//! returned.
-RUN_TEST_STEP 600000 ACLNT MM-MMF-ACLNT-I-8024-HP \audio.ini
-TEST_COMPLETE
-
-//
-//!@SYMTestCaseID             MM-MMF-ACLNT-I-8025-HP
-//!@SYMTestCaseDesc           Get the offset time from where the paused audio can be resumed
-//!@SYMREQ                    REQ3837
-//!@SYMPREQ                   PREQ797
-//!@SYMTestPriority           2
-//!@SYMTestActions            iAudioOutputStream[1] - Medium Priority iAudioOutputStream[2] - High Priority a. Open 2 clients b. Open and Play iAudioOutputStream[1]
-//! c. Register iAudioOutputStream[1] for Notification d. Check if registration is successful. e. Open and Play iAudioOutputStream[2] f. Note the time when
-//! iAudioOutputStream[1] is paused g. iAudioOutputStream[2] stops playing h. iAudioOutputStream[1] is notified. i. Get the offset position, and check whether
-//! it is equal to 0 (for ReferenceDevSound).
-//!@SYMTestExpectedResults    The medium priority Client should be able to receive the offset time and that should be correct without any errors in the
-//! process. KErrNone should be returned.
-RUN_TEST_STEP 600000 ACLNT MM-MMF-ACLNT-I-8025-HP \audio.ini
-TEST_COMPLETE
-
-//
-//!@SYMTestCaseID             MM-MMF-ACLNT-I-8026-HP
-//!@SYMTestCaseDesc           Call WillResumePlay()
-//!@SYMREQ                    REQ3837
-//!@SYMPREQ                   PREQ797
-//!@SYMTestPriority           2
-//!@SYMTestActions            iAudioOutputStream[1] - Medium Priority iAudioOutputStream[2] - High Priority iAudioOutputStream[3] - Low Priority a. Open
-//! 2 clients b. Open and Play iAudioOutputStream[1] c. Register iAudioOutputStream[1] for Notification d. Register iAudioOutputStream[3] for Notification
-//! e. Check if registration is successful. f. Open iAudioOutputStream[3] g. Open and Play iAudioOutputStream[2] h. iAudioOutputStream[2] stops playing i.
-//! iAudioOutputStream[1] is notified. j. iAudioOutputStream[1] calls WillResumePlay() k. Check after 1 second, iAudioOutputStream[3] does not get the notification.
-//! l. iAudioOutputStream[1] starts playing. m. iAudioOutputStream[1] completes playing. n. Check if iAudioOutputStream[3] gets the notification now.
-//!@SYMTestExpectedResults    The low priority Client should NOT receive notification if the medium priority client calls WillResumePlay()
-RUN_TEST_STEP 600000 ACLNT MM-MMF-ACLNT-I-8026-HP \audio.ini
-TEST_COMPLETE
-
-
-
-###################### Audio Multi Client tests ######################
-
-//
-//!@SYMTestCaseID             MM-MMF-ACLNT-I-9001-HP
-//!@SYMTestCaseDesc           Receipt of Notification (on deleting the Audio Play Client instance of a Notified Client) of a Resource Available Event.
-//!@SYMREQ                    REQ3834.1
-//!@SYMPREQ                   PREQ797
-//!@SYMTestPriority           2
-//!@SYMTestActions            iAudioPlayer - Medium Priority iAudioRecorder - High Priority iAudioOutputStream - Low Priority a. Create 3 clients b. Open
-//! and Play iAudioPlayer c. Open and Play iAudioRecorder d. Register iAudioPlayer for Notification e. Register iAudioOutputStream for Notification. f. Delete
-//! the instance iAudioPlayer g. iAudioRecorder stops playing h. Check if iAudioOutputStream gets the notification
-//!@SYMTestExpectedResults    The Client should be able to receive the notification succesfully, without any errors in the process. KErrNone should be
-//! returned.
-RUN_TEST_STEP 600000 ACLNT MM-MMF-ACLNT-I-9001-HP \audio.ini
-TEST_COMPLETE
-
-//
-//!@SYMTestCaseID             MM-MMF-ACLNT-I-9002-HP
-//!@SYMTestCaseDesc           Receipt of Notification (on completion of play of a Notifed Client) of a Resource Available Event.
-//!@SYMREQ                    REQ3834.1
-//!@SYMPREQ                   PREQ797
-//!@SYMTestPriority           2
-//!@SYMTestActions            iAudioPlayer - Medium Priority iAudioRecorder - High Priority iAudioOutputStream - Low Priority a. Create 3 clients b. Open
-//! and Play iAudioPlayer c. Open and Play iAudioRecorder d. Register iAudioPlayer for Notification e. Register iAudioOutputStream for Notification. f. iAudioRecorder
-//! stops playing g. iAudioPlayer receives teh notification and resumes playback h. iAudioPlayer completes the playback i. Check if iAudioOutputStream gets
-//! the notification
-//!@SYMTestExpectedResults    The Client should be able to receive the notification succesfully, without any errors in the process. KErrNone should be
-//! returned.
-RUN_TEST_STEP 600000 ACLNT MM-MMF-ACLNT-I-9002-HP \audio.ini
-TEST_COMPLETE
-
-//
-//!@SYMTestCaseID             MM-MMF-ACLNT-I-9003-HP
-//!@SYMTestCaseDesc           Receipt of Notification (on stopping play of a Notitifed Client) of a Resource Available Event.
-//!@SYMREQ                    REQ3834.1
-//!@SYMPREQ                   PREQ797
-//!@SYMTestPriority           2
-//!@SYMTestActions            iAudioPlayer - Medium Priority iAudioRecorder - High Priority iAudioOutputStream - Low Priority a. Create 3 clients b. Open
-//! and Play iAudioPlayer c. Open and Play iAudioRecorder d. Register iAudioPlayer for Notification e. Register iAudioOutputStream for Notification. f. iAudioRecorder
-//! stops playing g. iAudioPlayer receives the notification and resumes playback h. The playback of iAudioPlayer is stopped midway i. Check if iAudioOutputStream
-//! gets the notification
-//!@SYMTestExpectedResults    The Client should be able to receive the notification succesfully, without any errors in the process. KErrNone should be
-//! returned.
-RUN_TEST_STEP 600000 ACLNT MM-MMF-ACLNT-I-9003-HP \audio.ini
-TEST_COMPLETE
-
-//
-//!@SYMTestCaseID             MM-MMF-ACLNT-I-9004-HP
-//!@SYMTestCaseDesc           Receipt of Notification (chronological order for equal priority clients) of a Resource Available Event.
-//!@SYMREQ                    REQ3834.1
-//!@SYMPREQ                   PREQ797
-//!@SYMTestPriority           2
-//!@SYMTestActions            iAudioPlayer - Low Priority iAudioRecorder - High Priority iAudioOutputStream - Low Priority a. Create 3 clients b. Open
-//! and Play iAudioPlayer c. Open and Play iAudioRecorder d. Register iAudioOutputStream for Notification e. Register iAudioPlayer for Notification f. iAudioRecorder
-//! stops playing g. Check if iAudioOutputStream gets the notification
-//!@SYMTestExpectedResults    The Client should be able to receive the notification succesfully, without any errors in the process. KErrNone should be
-//! returned.
-RUN_TEST_STEP 600000 ACLNT MM-MMF-ACLNT-I-9004-HP \audio.ini
-TEST_COMPLETE
-
-//
-//!@SYMTestCaseID             MM-MMF-ACLNT-I-9005-HP
-//!@SYMTestCaseDesc           Non Receipt of Notification (on calling WillResumePlay() of a notified client) of a Resource Available Event.
-//!@SYMREQ                    REQ3834.2
-//!@SYMPREQ                   PREQ797
-//!@SYMTestPriority           2
-//!@SYMTestActions            iAudioPlayer - Medium Priority iAudioRecorder - High Priority iAudioOutputStream - Low Priority a. Create 3 clients b. Open
-//! and Play iAudioPlayer c. Open and Play iAudioRecorder d. Register iAudioPlayer for Notification. e. Register iAudioOutputStream for Notification. f.
-//! iAudioRecorder stops playing g. iAudioPlayer receives the notification. h. iAudioPlayer calls WillResumePlay(). i. Check if iAudioOutputStream does not
-//! get the notification (after 2 second))
-//!@SYMTestExpectedResults    The Client should be able to receive the notification succesfully, without any errors in the process. KErrNone should be
-//! returned.
-RUN_TEST_STEP 600000 ACLNT MM-MMF-ACLNT-I-9005-HP \audio.ini
-TEST_COMPLETE
-
-//
-//!@SYMTestCaseID             MM-MMF-ACLNT-I-9006-HP
-//!@SYMTestCaseDesc           Receipt of Notification (on timeout of a notified client, 1 sec assumed, call WillResumePlay() after 1 second) of a Resource
-//! Available Event.
-//!@SYMREQ                    REQ3834.2
-//!@SYMPREQ                   PREQ797
-//!@SYMTestPriority           2
-//!@SYMTestActions            iAudioPlayer - Medium Priority iAudioRecorder - High Priority iAudioOutputStream - Low Priority a. Create 3 clients b. Open
-//! and Play iAudioPlayer c. Open and Play iAudioRecorder d. Register iAudioPlayer for Notification. e. Register iAudioOutputStream for Notification. f.
-//! iAudioRecorder stops playing g. iAudioPlayer receives the notification. h. After 1 second, iAudioPlayer calls WillResumePlay(). h. iAudioPlayer does
-//! not resume playback. i. Check if iAudioOutputStream gets the notification (after 1 second)
-//!@SYMTestExpectedResults    The Client should be able to receive the notification succesfully, without any errors in the process. KErrNone should be
-//! returned.
-RUN_TEST_STEP 600000 ACLNT MM-MMF-ACLNT-I-9006-HP \audio.ini
-TEST_COMPLETE
-
-//
-//!@SYMTestCaseID             MM-MMF-ACLNT-I-9007-HP
-//!@SYMTestCaseDesc           Receipt of Notification (on cancellation of the notification of a client that has requested for notification) of a Resource
-//! Available Event.  [Cancel before receipt of Notification]
-//!@SYMREQ                    REQ3834.3
-//!@SYMPREQ                   PREQ797
-//!@SYMTestPriority           2
-//!@SYMTestActions            iAudioPlayer - Medium Priority iAudioRecorder - High Priority iAudioOutputStream - Low Priority a. Create 3 clients b. Open
-//! and Play iAudioPlayer c. Open and Play iAudioRecorder d. Register iAudioPlayer for Notification e. Register iAudioOutputStream for Notification f. Cancel
-//! the notification request for iAudioPlayer g. iAudioRecorder stops playing h. Check if iAudioOutputStream gets the notification
-//!@SYMTestExpectedResults    The medium priority Client should be able to cancel the notification succesfully, and the low priority client should be
-//! able to receive the notification without any errors in the process. KErrNone should be returned.
-RUN_TEST_STEP 600000 ACLNT MM-MMF-ACLNT-I-9007-HP \audio.ini
-TEST_COMPLETE
-
-//
-//!@SYMTestCaseID             MM-MMF-ACLNT-I-9008-HP
-//!@SYMTestCaseDesc           Receipt of Notification (on cancellation of notification of a client that has just received notification) of a Resource
-//! Available Event. [Cancel after receipt of Notification]
-//!@SYMREQ                    REQ3834.3
-//!@SYMPREQ                   PREQ797
-//!@SYMTestPriority           2
-//!@SYMTestActions            iAudioPlayer - Medium Priority iAudioRecorder - High Priority iAudioOutputStream - Low Priority a. Create 3 clients b. Open
-//! and Play iAudioPlayer c. Open and Play iAudioRecorder d. Register iAudioPlayer for Notification e. Register iAudioOutputStream for Notification f. iAudioRecorder
-//! stops playing g. iAudioPlayer receives notification and it starts playing h. Cancel the notification request for iAudioPlayer i. Play iAudioRecorder
-//! j.  iAudioRecorder stops playing k. Check if iAudioOutputStream gets the notification (but not the iAudioPlayer)
-//!@SYMTestExpectedResults    The medium priority Client should be able to cancel the notification succesfully, and the low priority client should be
-//! able to receive the notification without any errors in the process. KErrNone should be returned.
-RUN_TEST_STEP 600000 ACLNT MM-MMF-ACLNT-I-9008-HP \audio.ini
-TEST_COMPLETE
-
-/////////////////////////////////////////////////////////////////////
-/////////////////////////// NEGATIVE TESTS //////////////////////////
-/////////////////////////////////////////////////////////////////////
-
-######################### Audio Player tests #########################
-
-//
-//!@SYMTestCaseID             MM-MMF-ACLNT-I-1301-HP
-//!@SYMTestCaseDesc           Register for notification with an unsupported event type.
-//!@SYMREQ                    REQ3834
-//!@SYMPREQ                   PREQ797
-//!@SYMTestPriority           2
-//!@SYMTestActions            iAudioPlayer[0] - Medium Priority iAudioPlayer[1] - High Priority a. Create 2 clients b. Open & Play iAudioPlayer[0] c.
-//! Open & Play iAudioPlayer[1] d. Register iAudioPlayer[0] for notification, passing an unsupported event type as parameter.
-//!@SYMTestExpectedResults    KErrNotSupported should be returned.
-RUN_TEST_STEP 600000 ACLNT MM-MMF-ACLNT-I-1301-HP \audio.ini
-TEST_COMPLETE
-
-//
-//!@SYMTestCaseID             MM-MMF-ACLNT-I-1302-HP
-//!@SYMTestCaseDesc           Cancel the request for notification with an unsupported event type.
-//!@SYMREQ                    REQ3834.3
-//!@SYMPREQ                   PREQ797
-//!@SYMTestPriority           2
-//!@SYMTestActions            iAudioPlayer[0] - Medium Priority iAudioPlayer[1] - High Priority a. Create 2 clients b. Open & Play iAudioPlayer[0] c.
-//! Open & Play iAudioPlayer[1] d. Register iAudioPlayer[0] for notification. e. Cancel the notification request for iAudioPlayer[0], passing an unsupported
-//! event type as parameter.
-//!@SYMTestExpectedResults    KErrNotSupported should be returned.
-RUN_TEST_STEP 600000 ACLNT MM-MMF-ACLNT-I-1302-HP \audio.ini
-TEST_COMPLETE
-
-//
-//!@SYMTestCaseID             MM-MMF-ACLNT-I-1303-HP
-//!@SYMTestCaseDesc           Cancel when no resource Notification is requested.
-//!@SYMREQ                    REQ3834.3
-//!@SYMPREQ                   PREQ797
-//!@SYMTestPriority           2
-//!@SYMTestActions            iAudioPlayer[0] - Medium Priority iAudioPlayer[1] - High Priority a. Create 2 clients b. Open & Play iAudioPlayer[0] c.
-//! Open & Play iAudioPlayer[1] d. Cancel the notification request for iAudioPlayer[0]
-//!@SYMTestExpectedResults    KErrNotSupported should be returned.
-RUN_TEST_STEP 600000 ACLNT MM-MMF-ACLNT-I-1303-HP \audio.ini
-TEST_COMPLETE
-
-//
-//!@SYMTestCaseID             MM-MMF-ACLNT-I-1304-HP
-//!@SYMTestCaseDesc           Multiple Registration for notification for the same event type.
-//!@SYMREQ                    REQ3834
-//!@SYMPREQ                   PREQ797
-//!@SYMTestPriority           2
-//!@SYMTestActions            iAudioPlayer[0] - Medium Priority iAudioPlayer[1] - High Priority a. Create 2 clients b. Open & Play iAudioPlayer[0] c.
-//! Open & Play iAudioPlayer[1] d. Register iAudioPlayer[0] for audio resource available notification e. Register iAudioPlayer[0] again for audio resource
-//! available notification
-//!@SYMTestExpectedResults    KErrInUse / KErrAlreadyExists should be returned.
-RUN_TEST_STEP 600000 ACLNT MM-MMF-ACLNT-I-1304-HP \audio.ini
-TEST_COMPLETE
-
-
-######################## Audio Recorder tests ########################
-
-//
-//!@SYMTestCaseID             MM-MMF-ACLNT-I-1311-HP
-//!@SYMTestCaseDesc           Register for notification with an unsupported event type.
-//!@SYMREQ                    REQ3834
-//!@SYMPREQ                   PREQ797
-//!@SYMTestPriority           2
-//!@SYMTestActions            iAudioRecorder[0] - Medium Priority iAudioRecorder[1] - High Priority a. Create 2 clients b. Open & Play iAudioRecorder[0]
-//! c. Open & Play iAudioRecorder[1] d. Register iAudioRecorder[0] for notification, passing an unsupported event type as parameter.
-//!@SYMTestExpectedResults    KErrNotSupported should be returned.
-RUN_TEST_STEP 600000 ACLNT MM-MMF-ACLNT-I-1311-HP \audio.ini
-TEST_COMPLETE
-
-//
-//!@SYMTestCaseID             MM-MMF-ACLNT-I-1312-HP
-//!@SYMTestCaseDesc           Cancel the request for notification with an unsupported event type.
-//!@SYMREQ                    REQ3834.3
-//!@SYMPREQ                   PREQ797
-//!@SYMTestPriority           2
-//!@SYMTestActions            iAudioRecorder[0] - Medium Priority iAudioRecorder[1] - High Priority a. Create 2 clients b. Open & Play iAudioRecorder[0]
-//! c. Open & Play iAudioRecorder[1] d. Register iAudioRecorder[0] for notification. e. Cancel the notification request for iAudioRecorder[0], passing an
-//! unsupported event type as parameter.
-//!@SYMTestExpectedResults    KErrNotSupported should be returned.
-RUN_TEST_STEP 600000 ACLNT MM-MMF-ACLNT-I-1312-HP \audio.ini
-TEST_COMPLETE
-
-//
-//!@SYMTestCaseID             MM-MMF-ACLNT-I-1313-HP
-//!@SYMTestCaseDesc           Cancel when no resource Notification is requested.
-//!@SYMREQ                    REQ3834.3
-//!@SYMPREQ                   PREQ797
-//!@SYMTestPriority           2
-//!@SYMTestActions            iAudioRecorder[0] - Medium Priority iAudioRecorder[1] - High Priority a. Create 2 clients b. Open & Play iAudioRecorder[0]
-//! c. Open & Play iAudioRecorder[1] d. Cancel the notification request for iAudioRecorder[0]
-//!@SYMTestExpectedResults    KErrNotSupported should be returned.
-RUN_TEST_STEP 600000 ACLNT MM-MMF-ACLNT-I-1313-HP \audio.ini
-TEST_COMPLETE
-
-//
-//!@SYMTestCaseID             MM-MMF-ACLNT-I-1314-HP
-//!@SYMTestCaseDesc           Multiple Registration for notification for the same event type.
-//!@SYMREQ                    REQ3834
-//!@SYMPREQ                   PREQ797
-//!@SYMTestPriority           2
-//!@SYMTestActions            iAudioRecorder[0] - Medium Priority iAudioRecorder[1] - High Priority a. Create 2 clients b. Open & Play iAudioRecorder[0]
-//! c. Open & Play iAudioRecorder[1] d. Register iAudioRecorder[0] for audio resource available notification e. Register iAudioRecorder[0] again for audio
-//! resource available notification
-//!@SYMTestExpectedResults    KErrInUse / KErrAlreadyExists should be returned.
-RUN_TEST_STEP 600000 ACLNT MM-MMF-ACLNT-I-1314-HP \audio.ini
-TEST_COMPLETE
-
-
-##################### Audio Output Stream tests ######################
-
-//
-//!@SYMTestCaseID             MM-MMF-ACLNT-I-1321-HP
-//!@SYMTestCaseDesc           Register for notification with an unsupported event type.
-//!@SYMREQ                    REQ3834
-//!@SYMPREQ                   PREQ797
-//!@SYMTestPriority           2
-//!@SYMTestActions            iAudioOutputStream[0] - Medium Priority iAudioOutputStream[1] - High Priority a. Create 2 clients b. Open & Play iAudioOutputStream[0]
-//! c. Open & Play iAudioOutputStream[1] d. Register iAudioOutputStream[0] for notification, passing an unsupported event type as parameter.
-//!@SYMTestExpectedResults    KErrNotSupported should be returned.
-RUN_TEST_STEP 600000 ACLNT MM-MMF-ACLNT-I-1321-HP \audio.ini
-TEST_COMPLETE
-
-//
-//!@SYMTestCaseID             MM-MMF-ACLNT-I-1322-HP
-//!@SYMTestCaseDesc           Cancel the request for notification with an unsupported event type.
-//!@SYMREQ                    REQ3834.3
-//!@SYMPREQ                   PREQ797
-//!@SYMTestPriority           2
-//!@SYMTestActions            iAudioOutputStream[0] - Medium Priority iAudioOutputStream[1] - High Priority a. Create 2 clients b. Open & Play iAudioOutputStream[0]
-//! c. Open & Play iAudioOutputStream[1] d. Register iAudioOutputStream[0] for notification. e. Cancel the notification request for iAudioOutputStream[0],
-//! passing an unsupported event type as parameter.
-//!@SYMTestExpectedResults    KErrNotSupported should be returned.
-RUN_TEST_STEP 600000 ACLNT MM-MMF-ACLNT-I-1322-HP \audio.ini
-TEST_COMPLETE
-
-//
-//!@SYMTestCaseID             MM-MMF-ACLNT-I-1323-HP
-//!@SYMTestCaseDesc           Cancel when no resource Notification is requested.
-//!@SYMREQ                    REQ3834.3
-//!@SYMPREQ                   PREQ797
-//!@SYMTestPriority           2
-//!@SYMTestActions            iAudioOutputStream[0] - Medium Priority iAudioOutputStream[1] - High Priority a. Create 2 clients b. Open & Play iAudioOutputStream[0]
-//! c. Open & Play iAudioOutputStream[1] d. Cancel the notification request for iAudioOutputStream[0]
-//!@SYMTestExpectedResults    KErrNotSupported should be returned.
-RUN_TEST_STEP 600000 ACLNT MM-MMF-ACLNT-I-1323-HP \audio.ini
-TEST_COMPLETE
-
-//
-//!@SYMTestCaseID             MM-MMF-ACLNT-I-1324-HP
-//!@SYMTestCaseDesc           Multiple Registration for notification for the same event type.
-//!@SYMREQ                    REQ3834
-//!@SYMPREQ                   PREQ797
-//!@SYMTestPriority           2
-//!@SYMTestActions            iAudioOutputStream[0] - Medium Priority iAudioOutputStream[1] - High Priority a. Create 2 clients b. Open & Play iAudioOutputStream[0]
-//! c. Open & Play iAudioOutputStream[1] d. Register iAudioOutputStream[0] for audio resource available notification e. Register iAudioOutputStream[0] again
-//! for audio resource available notification
-//!@SYMTestExpectedResults    KErrInUse / KErrAlreadyExists should be returned.
-RUN_TEST_STEP 600000 ACLNT MM-MMF-ACLNT-I-1324-HP \audio.ini
-TEST_COMPLETE
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNT_DRM.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +0,0 @@
-@file TSI_MMF_ACLNT_DRM.script
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Integration tests for PREQ777.
-// 
-//
-
-LOAD_SUITE TSI_MMFACLNT.DLL
-
-delay 1000
-
-### Positive Testing ###
-# CMdaAudioPlayerUtility
-
-// Test for enabling agent's user interface for errors and confirmation requests property.
-//!@SYMTestCaseID             MM-MMF-ACLNT-I-9011-HP
-//!@SYMTestCaseDesc           Enable agent's user interface for errors and confirmation requests property. Open and play a protected audio clip from a
-//! file for PLAY intent.
-//!@SYMPREQ                   PREQ777
-//!@SYMTestPriority           2
-//!@SYMTestActions            1. Open an audio clip from a file. 2. Enable agent's user interface for errors and confirmation requests property. 3. Play
-//! the audio clip.
-//!@SYMTestExpectedResults    KErrNone error code should be returned. Errors / confirmations should be displayed.
-RUN_TEST_STEP 600000 	TSI_MMFACLNT 	MM-MMF-ACLNT-I-9011-HP	C:\audio.ini
-TEST_COMPLETE
-
-// Test for disabling automatic intent.
-//!@SYMTestCaseID             MM-MMF-ACLNT-I-9012-HP
-//!@SYMTestCaseDesc           Open a protected audio file and disable automatic intent. Play.
-//!@SYMPREQ                   PREQ777
-//!@SYMTestPriority           2
-//!@SYMTestActions            1. Open an audio clip from a file. 2. Disable automatic intent by the player. 3. Execute the play intent. 4. Play the audio
-//! clip.
-//!@SYMTestExpectedResults    The client should set the intent and the audio should be able to be played.
-RUN_TEST_STEP 600000 	TSI_MMFACLNT 	MM-MMF-ACLNT-I-9012-HP	C:\audio.ini
-TEST_COMPLETE
-
-
-# CMdaAudioRecorderUtility
-
-// Test for enabling agent's user interface for errors and confirmation requests property.
-//!@SYMTestCaseID             MM-MMF-ACLNT-I-9021-HP
-//!@SYMTestCaseDesc           Enable agent's user interface for errors and confirmation requests property. Open and play a protected audio clip from a
-//! file for PLAY intent.
-//!@SYMPREQ                   PREQ777
-//!@SYMTestPriority           2
-//!@SYMTestActions            1. Open an audio clip from a file. 2. Enable agent's user interface for errors and confirmation requests property. 3. Play
-//! the audio clip.
-//!@SYMTestExpectedResults    KErrNone error code should be returned. Errors / confirmations should be displayed.
-RUN_TEST_STEP 600000 	TSI_MMFACLNT 	MM-MMF-ACLNT-I-9021-HP	C:\audio.ini
-TEST_COMPLETE
-
-// Test for disabling automatic intent.
-//!@SYMTestCaseID             MM-MMF-ACLNT-I-9022-HP
-//!@SYMTestCaseDesc           Open a protected audio file and disable automatic intent. Play.
-//!@SYMPREQ                   PREQ777
-//!@SYMTestPriority           2
-//!@SYMTestActions            1. Open an audio clip from a file. 2. Disable automatic intent by the player. 3. Execute the play intent. 4. Play the audio
-//! clip.
-//!@SYMTestExpectedResults    The client should set the intent and the audio should be able to be played.
-RUN_TEST_STEP 600000 	TSI_MMFACLNT 	MM-MMF-ACLNT-I-9022-HP	C:\audio.ini
-TEST_COMPLETE
-
-//CR1424 test 
-//! @SYMTestCaseID MM-MMF-ACLNT-I-9023-HP
-
-RUN_TEST_STEP 120000,ACLNT, MM-MMF-ACLNT-I-9023-HP  \audio.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-9024-HP
-
-RUN_TEST_STEP 120000,ACLNT, MM-MMF-ACLNT-I-9024-HP  \audio.ini
-TEST_COMPLETE
\ No newline at end of file
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNT_FS.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-@file TSI_MMF_ACLNT_FS.script
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Integration tests for TMMFileSource/TMMFileHandleSource.
-// 
-//
-
-
-LOAD_SUITE TSI_MMFACLNT.DLL
-
-delay 1000
-
-# CMdaAudioPlayerUtility::OpenFile() supplying TMMFileSource. Play file
-//!@SYMTestCaseID             MM-MMF-ACLNT-I-2031-HP
-//!@SYMTestCaseDesc           Open an audio file passing TMMFileSource. Play.
-//!@SYMPREQ                   PREQ777
-//!@SYMTestPriority           2
-//!@SYMTestActions            1. Open an audio clip from a file. 2. Play the audio clip.
-//!@SYMTestExpectedResults    The audio file should be opened and played.
-RUN_TEST_STEP 600000 ACLNT MM-MMF-ACLNT-I-2031-HP \audio.ini
-TEST_COMPLETE
-
-# CMdaAudioPlayerUtility::OpenFile() supplying TMMFileHandleSource. Play file
-//!@SYMTestCaseID             MM-MMF-ACLNT-I-2032-HP
-//!@SYMTestCaseDesc           Open an audio file passing TMMFileHandleSource. Play.
-//!@SYMPREQ                   PREQ777
-//!@SYMTestPriority           2
-//!@SYMTestActions            1. Open an audio clip from a file. 2. Play the audio clip.
-//!@SYMTestExpectedResults    The audio file should be opened and played.
-RUN_TEST_STEP 600000 ACLNT MM-MMF-ACLNT-I-2032-HP \audio.ini
-TEST_COMPLETE
-
-# CMdaAudioRecorderUtility::OpenFileL() supplying TMMFileSource. Record file.
-//!@SYMTestCaseID             MM-MMF-ACLNT-I-5021-HP
-//!@SYMTestCaseDesc           Open a file based clip passing TMMFileSource. Record.
-//!@SYMPREQ                   PREQ777
-//!@SYMTestPriority           2
-//!@SYMTestActions            1. Open an audio clip from a file passing TMMFileSource. 2. Record the audio clip.
-//!@SYMTestExpectedResults    File should record with no errors.
-RUN_TEST_STEP 30000 ACLNT MM-MMF-ACLNT-I-5021-HP \audio.ini
-TEST_COMPLETE
-
-# CMdaAudioRecorderUtility::OpenFileL() supplying TMMFileHandleSource. Record file.
-//!@SYMTestCaseID             MM-MMF-ACLNT-I-5022-HP
-//!@SYMTestCaseDesc           Open a file based clip passing TMMFileHandleSource. Record.
-//!@SYMPREQ                   PREQ777
-//!@SYMTestPriority           2
-//!@SYMTestActions            1. Open an audio clip from a file passing TMMFileHandleSource. 2. Record the audio clip.
-//!@SYMTestExpectedResults    File should record with no errors.
-RUN_TEST_STEP 30000 ACLNT MM-MMF-ACLNT-I-5022-HP \audio.ini
-TEST_COMPLETE
-
-# CMdaAudioRecorderUtility::OpenFileL() supplying TMMFileSource. Record & Play file.
-//!@SYMTestCaseID             MM-MMF-ACLNT-I-5031-HP
-//!@SYMTestCaseDesc           Open a file based clip passing TMMFileSource. Record and Play.
-//!@SYMPREQ                   PREQ777
-//!@SYMTestPriority           2
-//!@SYMTestActions            1. Open an audio clip from a file passing TMMFileSource. 2. Record and play the audio clip.
-//!@SYMTestExpectedResults    File should record and play with no errors.
-RUN_TEST_STEP 30000 ACLNT MM-MMF-ACLNT-I-5031-HP \audio.ini
-TEST_COMPLETE
-
-# CMdaAudioRecorderUtility::OpenFileL() supplying TMMFileHandleSource. Record & Play file.
-//!@SYMTestCaseID             MM-MMF-ACLNT-I-5032-HP
-//!@SYMTestCaseDesc           Open a file based clip passing TMMFileHandleSource. Record and Play.
-//!@SYMPREQ                   PREQ777
-//!@SYMTestPriority           2
-//!@SYMTestActions            1. Open an audio clip from a file passing TMMFileHandleSource. 2. Record and play the audio clip.
-//!@SYMTestExpectedResults    File should record and play with no errors.
-RUN_TEST_STEP 30000 ACLNT MM-MMF-ACLNT-I-5032-HP \audio.ini
-TEST_COMPLETE
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNT_OF.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-
-LOAD_SUITE TSI_MMFACLNT.DLL
-
-delay 1000
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-7803-HP
-
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-7803-HP  \audio.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-7804-HP
-
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-7804-HP  \audio.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-7901-HP
-
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-7901-HP  \audio.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-7902-HP
-
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-7902-HP  \audio.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-7904-HP
-
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-7904-HP  \audio.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-7905-HP
-
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-7905-HP  \audio.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-7906-HP
-
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-7906-HP  \audio.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-8801-HP
-
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-8801-HP  \audio.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-1211-HP
-
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-1211-HP  \audio.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-1212-HP
-
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-1212-HP  \audio.ini
-TEST_COMPLETE
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNT_OF_ALLOC.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-
-LOAD_SUITE TSI_MMFACLNT.DLL
-
-delay 1000
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-7805-HP
-
-RUN_TEST_STEP 3600000, ACLNT, MM-MMF-ACLNT-I-7805-HP  \audio.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-7806-HP
-
-RUN_TEST_STEP 3600000, ACLNT, MM-MMF-ACLNT-I-7806-HP  \audio.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-I-7908-HP
-
-RUN_TEST_STEP 7000000, ACLNT, MM-MMF-ACLNT-I-7908-HP  \audio.ini
-TEST_COMPLETE
-
-//CR1424 alloc test
-//! @SYMTestCaseID MM-MMF-ACLNT-I-7807-HP
-
-RUN_TEST_STEP 7000000, ACLNT, MM-MMF-ACLNT-I-7807-HP  \audio.ini
-TEST_COMPLETE
\ No newline at end of file
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNT_Panic.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-LOAD_SUITE TSI_MMFACLNT.DLL
-#PAUSE_AT_END
-
-#Req. under test REQ172.1.3.14       REQ172.1.3.15
-# Set invalid volume.
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst.wav
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst2.wav
-//! @SYMTestCaseID MM-MMF-ACLNT-I-1001-LP
-
-#RUN_PANIC_STEP 120000, ACLNT, MM-MMF-ACLNT-I-1001-LP, MMFAudioClient,0, \audio.ini
-#TEST_COMPLETE
-
-#Req. under test REQ172.1.3.14       REQ172.1.3.15
-# Set invalid volume.
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst.wav
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst2.wav
-//! @SYMTestCaseID MM-MMF-ACLNT-I-1013-LP
-
-#RUN_PANIC_STEP 120000, ACLNT, MM-MMF-ACLNT-I-1013-LP, MMFAudioClient,0, \audio.ini
-#TEST_COMPLETE
-
-#Req. under test REQ172.1.71.13      REQ172.1.71.14
-# Set balance to invalid value (less than min).
-//! @SYMTestCaseID MM-MMF-ACLNT-I-1156-HP
-
-RUN_PANIC_STEP 10000, ACLNT, MM-MMF-ACLNT-I-1156-HP, MMFAudioClient,0, \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.71.13      REQ172.1.71.14
-# Set balance to invalid value (more than max).
-//! @SYMTestCaseID MM-MMF-ACLNT-I-1158-HP
-
-RUN_PANIC_STEP 10000, ACLNT, MM-MMF-ACLNT-I-1158-HP, MMFAudioClient,0, \audio.ini
-TEST_COMPLETE
\ No newline at end of file
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNT_SD.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-@file TSI_MMF_ACLNT_SD.script
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-
-LOAD_SUITE TSI_MMFACLNT.DLL
-
-delay 1000
-
-//!@SYMTestCaseID             MM-MMF-SDEVSOUND-I-0034-HP
-//!@SYMTestCaseDesc           SecureDevSound - CMdaAudioRecorderUtility to open a file based clip and record with ALL -TCB capabilities
-//!@SYMPREQ                   PREQ277
-//!@SYMTestPriority           2
-//!@SYMTestActions            audioInpStream[0] call Open() and ReadL(). audioInpStream[0] has MultimediaDD & UserEnvironment capability.
-//!@SYMTestExpectedResults    Check that the callback was called correctly and with no errors.
-RUN_TEST_STEP 120000 ACLNT MM-MMF-SDEVSOUND-I-0034-HP \audio.ini
-TEST_COMPLETE
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNT_SD_MMDDCAP.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-@file TSI_MMF_ACLNT_SD_MMDDCAP.script
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-
-LOAD_SUITE TSI_MMFACLNT.DLL
-
-delay 5000
-
-//!@SYMTestCaseID             MM-MMF-SDEVSOUND-I-0032-HP
-//!@SYMTestCaseDesc           SecureDevSound - Open CMdaAudioInputStream and record to a buffer with only MultimediaDD capability
-//!@SYMPREQ                   PREQ277
-//!@SYMTestPriority           2
-//!@SYMTestActions            audioInpStream[0] call Open() and ReadL(). audioInpStream[0] has MultimediaDD capability.
-//!@SYMTestExpectedResults    Check whether KErrPermissionDenied is returned.
-RUN_TEST_STEP 120000 ACLNT MM-MMF-SDEVSOUND-I-0032-HP \audio.ini
-TEST_COMPLETE
-
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNT_SD_NOCAP.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-@file TSI_MMF_ACLNT_SD_NOCAP.script
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-
-LOAD_SUITE TSI_MMFACLNT.DLL
-
-delay 5000
-
-//!@SYMTestCaseID             MM-MMF-SDEVSOUND-I-0031-HP
-//!@SYMTestCaseDesc           SecureDevSound - Open CMdaAudioInputStream and record to a buffer with no cap
-//!@SYMPREQ                   PREQ277
-//!@SYMTestPriority           2
-//!@SYMTestActions            audioInpStream[0] call Open() and ReadL(). audioInpStream[0] has no UserEnv capability (NONE capability).
-//!@SYMTestExpectedResults    Check whether KErrPermissionDenied is returned. (Earlier returned no errors as recording behaviour has changed)
-RUN_TEST_STEP 120000 ACLNT MM-MMF-SDEVSOUND-I-0031-HP \audio.ini
-TEST_COMPLETE
-
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNT_SD_PREEMPTION.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-@file TSI_MMF_ACLNT_SD_PREEMPTION.script
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-
-LOAD_SUITE TSI_MMFACLNT.DLL
-
-delay 1000
-
-//!@SYMTestCaseID             MM-MMF-SDEVSOUND-I-0012-HP
-//!@SYMTestCaseDesc           SecureDevSound - CMdaAudioPlayerUtility to open an audio file and play (DevSound[0] with no cap and HP, DevSound[1] with
-//! cap and LP)
-//!@SYMPREQ                   PREQ277
-//!@SYMTestPriority           2
-//!@SYMTestActions            There are two processes of AudioPlayerUtility instances, audioUtil[0] and audioUtil[1]. They both call OpenAndPlayFileL.
-//! audioUtil[0] has no MultimediaDD capability. It is set as HIGH priority and played first.  audioUtil[1] has MultimediaDD capability. It is set as LOW
-//! priority and played next.
-//!@SYMTestExpectedResults    audioUtil[0] stops and returns KErrInUse. audioUtil[1] starts to play and returns KErrNone. The 'playing' file plays audio,
-//! Doesn't leave. MapcInitComplete Callback returns KErrNone MapcPlayComplete Callback returns KErrNone
-RUN_TEST_STEP 120000 ACLNT MM-MMF-SDEVSOUND-I-0012-HP \audio.ini
-TEST_COMPLETE
-
-//!@SYMTestCaseID             MM-MMF-SDEVSOUND-I-0014-HP
-//!@SYMTestCaseDesc           SecureDevSound - CMdaAudioRecorderUtility to open a file based clip and record (DevSound[0] with UserEnv cap and HP, DevSound[1]
-//! with all cap and LP)
-//!@SYMPREQ                   PREQ277
-//!@SYMTestPriority           2
-//!@SYMTestActions            There are two processes of AudioRecorderUtility instances, audioRec[0] and audioRec[1]. They both call OpenFileL and RecordL.
-//! audioRec[0] has UserEnv capability. It is set as HIGH priority and recorded first.  audioRec[1] has ALL capability. It is set as LOW priority and recorded
-//! next.
-//!@SYMTestExpectedResults    audioRec[0] stops and returns KErrInUse. audioRec[1] starts to record and returns KErrNone.
-RUN_TEST_STEP 120000 ACLNT MM-MMF-SDEVSOUND-I-0014-HP \audio.ini
-TEST_COMPLETE
\ No newline at end of file
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNT_SD_UECAP.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-@file TSI_MMF_ACLNT_SD_UECAP.script
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-
-LOAD_SUITE TSI_MMFACLNT.DLL
-
-delay 5000
-
-//!@SYMTestCaseID             MM-MMF-SDEVSOUND-I-0033-HP
-//!@SYMTestCaseDesc           SecureDevSound - CMdaAudioRecorderUtility to open a file based clip and record with only UserEnvironment capability
-//!@SYMPREQ                   PREQ277
-//!@SYMTestPriority           2
-//!@SYMTestActions            audioInpStream[0] call Open() and ReadL(). audioInpStream[0] has UserEnvironment capability.
-//!@SYMTestExpectedResults    Check that the callback was called correctly and with no errors.
-RUN_TEST_STEP 120000 ACLNT MM-MMF-SDEVSOUND-I-0033-HP \audio.ini
-TEST_COMPLETE
-
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_CTLFRM.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Run MMF Controller Framework Integration tests
-// 
-//
-
-RUN_SCRIPT TSI_MMF_CTLFRM_POS
-//
-RUN_SCRIPT TSI_MMF_CTLFRM_NEG
-//
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_CTLFRM_NEG.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,124 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Run Multimedia Framework Controller Integration tests
-// 
-//
-
-LOAD_SUITE TSI_MMFCTLFRM.dll
-//
-//! @SYMTestCaseID MM-MMF-CTLFRM-I-0502
-
-RUN_TEST_STEP 30000, TSI_MMFCTLFRM, MM-MMF-CTLFRM-I-0502
-TEST_COMPLETE
-//
-//! @SYMTestCaseID MM-MMF-CTLFRM-I-0504
-
-RUN_TEST_STEP 30000, TSI_MMFCTLFRM, MM-MMF-CTLFRM-I-0504
-TEST_COMPLETE
-//
-//! @SYMTestCaseID MM-MMF-CTLFRM-I-0511
-
-RUN_TEST_STEP 30000, TSI_MMFCTLFRM, MM-MMF-CTLFRM-I-0511
-TEST_COMPLETE
-//
-//! @SYMTestCaseID MM-MMF-CTLFRM-I-0512
-
-RUN_TEST_STEP 30000, TSI_MMFCTLFRM, MM-MMF-CTLFRM-I-0512
-TEST_COMPLETE
-//
-//! @SYMTestCaseID MM-MMF-CTLFRM-I-0513
-
-RUN_TEST_STEP 30000, TSI_MMFCTLFRM, MM-MMF-CTLFRM-I-0513
-TEST_COMPLETE
-//
-//! @SYMTestCaseID MM-MMF-CTLFRM-I-0514
-
-RUN_TEST_STEP 30000, TSI_MMFCTLFRM, MM-MMF-CTLFRM-I-0514
-TEST_COMPLETE
-//
-//! @SYMTestCaseID MM-MMF-CTLFRM-I-0515
-
-RUN_TEST_STEP 30000, TSI_MMFCTLFRM, MM-MMF-CTLFRM-I-0515
-TEST_COMPLETE
-//
-//! @SYMTestCaseID MM-MMF-CTLFRM-I-0521
-
-RUN_TEST_STEP 30000, TSI_MMFCTLFRM, MM-MMF-CTLFRM-I-0521
-TEST_COMPLETE
-//
-//! @SYMTestCaseID MM-MMF-CTLFRM-I-0522
-
-RUN_TEST_STEP 30000, TSI_MMFCTLFRM, MM-MMF-CTLFRM-I-0522
-TEST_COMPLETE
-//
-//! @SYMTestCaseID MM-MMF-CTLFRM-I-0523
-
-RUN_TEST_STEP 30000, TSI_MMFCTLFRM, MM-MMF-CTLFRM-I-0523
-TEST_COMPLETE
-//
-//! @SYMTestCaseID MM-MMF-CTLFRM-I-0524
-
-RUN_TEST_STEP 30000, TSI_MMFCTLFRM, MM-MMF-CTLFRM-I-0524
-TEST_COMPLETE
-//
-//! @SYMTestCaseID MM-MMF-CTLFRM-I-0525
-
-RUN_TEST_STEP 30000, TSI_MMFCTLFRM, MM-MMF-CTLFRM-I-0525
-TEST_COMPLETE
-//
-//! @SYMTestCaseID MM-MMF-CTLFRM-I-0526
-
-RUN_TEST_STEP 30000, TSI_MMFCTLFRM, MM-MMF-CTLFRM-I-0526
-TEST_COMPLETE
-//
-//! @SYMTestCaseID MM-MMF-CTLFRM-I-0527
-
-RUN_TEST_STEP 30000, TSI_MMFCTLFRM, MM-MMF-CTLFRM-I-0527
-TEST_COMPLETE
-//
-//! @SYMTestCaseID MM-MMF-CTLFRM-I-0531
-
-RUN_TEST_STEP 30000, TSI_MMFCTLFRM, MM-MMF-CTLFRM-I-0531
-TEST_COMPLETE
-//
-//! @SYMTestCaseID MM-MMF-CTLFRM-I-0541
-
-RUN_TEST_STEP 30000, TSI_MMFCTLFRM, MM-MMF-CTLFRM-I-0541
-TEST_COMPLETE
-//
-//! @SYMTestCaseID MM-MMF-CTLFRM-I-0542
-
-RUN_TEST_STEP 30000, TSI_MMFCTLFRM, MM-MMF-CTLFRM-I-0542
-TEST_COMPLETE
-//
-//! @SYMTestCaseID MM-MMF-CTLFRM-I-0551
-
-RUN_TEST_STEP 30000, TSI_MMFCTLFRM, MM-MMF-CTLFRM-I-0551
-TEST_COMPLETE
-//
-//! @SYMTestCaseID MM-MMF-CTLFRM-I-0552
-
-RUN_TEST_STEP 30000, TSI_MMFCTLFRM, MM-MMF-CTLFRM-I-0552
-TEST_COMPLETE
-//
-//! @SYMTestCaseID MM-MMF-CTLFRM-I-0553
-
-RUN_TEST_STEP 30000, TSI_MMFCTLFRM, MM-MMF-CTLFRM-I-0553
-TEST_COMPLETE
-//
-//! @SYMTestCaseID MM-MMF-CTLFRM-I-0554
-
-RUN_TEST_STEP 30000, TSI_MMFCTLFRM, MM-MMF-CTLFRM-I-0554
-TEST_COMPLETE
-//
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_CTLFRM_NEG_PREEMPTION.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Run Multimedia Framework Controller Integration tests
-// 
-//
-
-LOAD_SUITE TSI_MMFCTLFRM.dll
-
-//Load two controllers, assign identical priorities to them.
-//! @SYMTestCaseID MM-MMF-CTLFRM-I-0532
-
-RUN_TEST_STEP 30000, TSI_MMFCTLFRM, MM-MMF-CTLFRM-I-0532
-TEST_COMPLETE
\ No newline at end of file
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_CTLFRM_POS.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,180 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Run Multimedia Framework Controller Integration tests
-// 
-//
-
-LOAD_SUITE TSI_MMFCTLFRM.dll
-//
-//! @SYMTestCaseID MM-MMF-CTLFRM-I-0001
-
-RUN_TEST_STEP 20000, TSI_MMFCTLFRM, MM-MMF-CTLFRM-I-0001
-TEST_COMPLETE
-//
-//! @SYMTestCaseID MM-MMF-CTLFRM-I-0002
-
-RUN_TEST_STEP 30000, TSI_MMFCTLFRM, MM-MMF-CTLFRM-I-0002
-TEST_COMPLETE
-//
-//! @SYMTestCaseID MM-MMF-CTLFRM-I-0003
-
-RUN_TEST_STEP 30000, TSI_MMFCTLFRM, MM-MMF-CTLFRM-I-0003
-TEST_COMPLETE
-//
-//---------------------------------------------
-//
-//! @SYMTestCaseID MM-MMF-CTLFRM-I-0102
-
-RUN_TEST_STEP 30000, TSI_MMFCTLFRM, MM-MMF-CTLFRM-I-0102
-TEST_COMPLETE
-//
-//! @SYMTestCaseID MM-MMF-CTLFRM-I-0105
-
-RUN_TEST_STEP 30000, TSI_MMFCTLFRM, MM-MMF-CTLFRM-I-0105
-TEST_COMPLETE
-//
-//! @SYMTestCaseID MM-MMF-CTLFRM-I-0106
-
-RUN_TEST_STEP 30000, TSI_MMFCTLFRM, MM-MMF-CTLFRM-I-0106
-TEST_COMPLETE
-//
-//! @SYMTestCaseID MM-MMF-CTLFRM-I-0107
-
-RUN_TEST_STEP 30000, TSI_MMFCTLFRM, MM-MMF-CTLFRM-I-0107
-TEST_COMPLETE
-//
-//! @SYMTestCaseID MM-MMF-CTLFRM-I-0108
-
-RUN_TEST_STEP 30000, TSI_MMFCTLFRM, MM-MMF-CTLFRM-I-0108
-TEST_COMPLETE
-//
-//! @SYMTestCaseID MM-MMF-CTLFRM-I-0109
-
-RUN_TEST_STEP 30000, TSI_MMFCTLFRM, MM-MMF-CTLFRM-I-0109
-TEST_COMPLETE
-//
-//! @SYMTestCaseID MM-MMF-CTLFRM-I-0111
-
-RUN_TEST_STEP 30000, TSI_MMFCTLFRM, MM-MMF-CTLFRM-I-0111
-TEST_COMPLETE
-//
-//! @SYMTestCaseID MM-MMF-CTLFRM-I-0112
-
-RUN_TEST_STEP 30000, TSI_MMFCTLFRM, MM-MMF-CTLFRM-I-0112
-TEST_COMPLETE
-//
-//! @SYMTestCaseID MM-MMF-CTLFRM-I-0113
-
-RUN_TEST_STEP 30000, TSI_MMFCTLFRM, MM-MMF-CTLFRM-I-0113
-TEST_COMPLETE
-//
-//! @SYMTestCaseID MM-MMF-CTLFRM-I-0114
-
-RUN_TEST_STEP 30000, TSI_MMFCTLFRM, MM-MMF-CTLFRM-I-0114
-TEST_COMPLETE
-//
-//! @SYMTestCaseID MM-MMF-CTLFRM-I-0117
-
-RUN_TEST_STEP 30000, TSI_MMFCTLFRM, MM-MMF-CTLFRM-I-0117
-TEST_COMPLETE
-//
-//! @SYMTestCaseID MM-MMF-CTLFRM-I-0118
-
-RUN_TEST_STEP 30000, TSI_MMFCTLFRM, MM-MMF-CTLFRM-I-0118
-TEST_COMPLETE
-//
-//! @SYMTestCaseID MM-MMF-CTLFRM-I-0119
-
-RUN_TEST_STEP 30000, TSI_MMFCTLFRM, MM-MMF-CTLFRM-I-0119
-TEST_COMPLETE
-//
-//! @SYMTestCaseID MM-MMF-CTLFRM-I-0120
-
-RUN_TEST_STEP 30000, TSI_MMFCTLFRM, MM-MMF-CTLFRM-I-0120
-TEST_COMPLETE
-//
-//! @SYMTestCaseID MM-MMF-CTLFRM-I-0121
-
-RUN_TEST_STEP 30000, TSI_MMFCTLFRM, MM-MMF-CTLFRM-I-0121
-TEST_COMPLETE
-//
-//! @SYMTestCaseID MM-MMF-CTLFRM-I-0122
-
-RUN_TEST_STEP 30000, TSI_MMFCTLFRM, MM-MMF-CTLFRM-I-0122
-TEST_COMPLETE
-//
-//! @SYMTestCaseID MM-MMF-CTLFRM-I-0123
-
-RUN_TEST_STEP 30000, TSI_MMFCTLFRM, MM-MMF-CTLFRM-I-0123
-TEST_COMPLETE
-//
-//! @SYMTestCaseID MM-MMF-CTLFRM-I-0124
-
-RUN_TEST_STEP 30000, TSI_MMFCTLFRM, MM-MMF-CTLFRM-I-0124
-TEST_COMPLETE
-//
-//! @SYMTestCaseID MM-MMF-CTLFRM-I-0128
-
-RUN_TEST_STEP 30000, TSI_MMFCTLFRM, MM-MMF-CTLFRM-I-0128
-TEST_COMPLETE
-//
-//! @SYMTestCaseID MM-MMF-CTLFRM-I-0129
-
-RUN_TEST_STEP 30000, TSI_MMFCTLFRM, MM-MMF-CTLFRM-I-0129
-TEST_COMPLETE
-//
-//! @SYMTestCaseID MM-MMF-CTLFRM-I-0131
-
-RUN_TEST_STEP 30000, TSI_MMFCTLFRM, MM-MMF-CTLFRM-I-0131
-TEST_COMPLETE
-//
-//! @SYMTestCaseID MM-MMF-CTLFRM-I-0132
-
-RUN_TEST_STEP 30000, TSI_MMFCTLFRM, MM-MMF-CTLFRM-I-0132
-TEST_COMPLETE
-//
-//! @SYMTestCaseID MM-MMF-CTLFRM-I-0141
-
-RUN_TEST_STEP 30000, TSI_MMFCTLFRM, MM-MMF-CTLFRM-I-0141
-TEST_COMPLETE
-//
-//! @SYMTestCaseID MM-MMF-CTLFRM-I-0142
-
-RUN_TEST_STEP 30000, TSI_MMFCTLFRM, MM-MMF-CTLFRM-I-0142
-TEST_COMPLETE
-//
-//! @SYMTestCaseID MM-MMF-CTLFRM-I-0143
-
-RUN_TEST_STEP 30000, TSI_MMFCTLFRM, MM-MMF-CTLFRM-I-0143
-TEST_COMPLETE
-//
-//! @SYMTestCaseID MM-MMF-CTLFRM-I-0144
-
-RUN_TEST_STEP 30000, TSI_MMFCTLFRM, MM-MMF-CTLFRM-I-0144
-TEST_COMPLETE
-//
-//! @SYMTestCaseID MM-MMF-CTLFRM-I-0151
-
-RUN_TEST_STEP 30000, TSI_MMFCTLFRM, MM-MMF-CTLFRM-I-0151
-TEST_COMPLETE
-//
-//! @SYMTestCaseID MM-MMF-CTLFRM-I-0152
-
-RUN_TEST_STEP 30000, TSI_MMFCTLFRM, MM-MMF-CTLFRM-I-0152
-TEST_COMPLETE
-//
-
-
-
-
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_CTLFRM_POS_PREEMPTION.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Run Multimedia Framework Controller Integration tests
-// 
-//
-
-LOAD_SUITE TSI_MMFCTLFRM.dll
-
-//Client attempts to play a clip while another controller with a higher priority is playing
-//! @SYMTestCaseID MM-MMF-CTLFRM-I-0125
-
-RUN_TEST_STEP 20000, TSI_MMFCTLFRM, MM-MMF-CTLFRM-I-0125
-TEST_COMPLETE
-
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_CTLFRM_PREEMPTION.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Run MMF Controller Framework Preemption Integration tests
-// 
-//
-
-RUN_SCRIPT TSI_MMF_CTLFRM_POS_PREEMPTION
-//
-RUN_SCRIPT TSI_MMF_CTLFRM_NEG_PREEMPTION
-//
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_SDEVSOUND_01.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-@file TSI_MMF_SDEVSOUND_01.script
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-
-LOAD_SUITE TSI_MMF_SDEVSOUND.dll
-
-delay 5000
-
-//!@SYMTestCaseID             MM-MMF-SDEVSOUND-I-0023-HP
-//!@SYMTestCaseDesc           SecureDevSound - CMdaAudioRecorderUtility to open a file based clip and record with both MultimediaDD & UserEnvironment
-//! capabilities.
-//!@SYMPREQ                   PREQ277
-//!@SYMTestPriority           2
-//!@SYMTestActions            audioRec[0] call OpenFileL and RecordL. audioRec[0] has MultimediaDD & UserEnvironment capability.
-//!@SYMTestExpectedResults    Check that the callback was called correctly and with no errors.
-RUN_TEST_STEP 440000 TSI_MMF_SDEVSOUND MM-MMF-SDEVSOUND-I-0023-HP \audio.ini
-TEST_COMPLETE
-
-//!@SYMTestCaseID             MM-MMF-SDEVSOUND-I-0037-HP
-//!@SYMTestCaseDesc           SecureDevSound - Reset client thread ID of a DevSound instance with an invalid thread Id.
-//!@SYMPREQ                   CR1058
-//!@SYMTestPriority           2
-//!@SYMTestActions            iMMFDevSound[0] has MultimediaDD capability. iMMFDevSound[0] set with INVALID thread Id .
-//!@SYMTestExpectedResults    SetClientThreadInfo() will return .
-RUN_TEST_STEP 440000 TSI_MMF_SDEVSOUND MM-MMF-SDEVSOUND-I-0037-HP
-TEST_COMPLETE
-
-//!@SYMTestCaseID             MM-MMF-SDEVSOUND-I-1036-HP
-//!@SYMTestCaseDesc           SecureDevSound - PlaySimpleTone using SetClientThreadInfo but first call CustomInterface(). SetClientThreadInfo should fail.
-//!@SYMPREQ                   CR1058
-//!@SYMTestPriority           2
-//!@SYMTestActions            iMMFDevSound[0] has MMDD cap while iMMFDevSound[1] doesn't. Call SetClientThreadInfo() on both but on iMMFDevSound[0] first call CustomInterface() with invalid UID.
-//!@SYMTestExpectedResults    iMMFDevSound[0] SetClientThreadInfo() should return return KErrNotReady
-RUN_TEST_STEP 440000 TSI_MMF_SDEVSOUND MM-MMF-SDEVSOUND-I-1036-HP
-TEST_COMPLETE
-
-
-
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_SDEVSOUND_01_PREEMPTION.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,93 +0,0 @@
-@file TSI_MMF_SDEVSOUND_01_PREEMPTION.script
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-
-LOAD_SUITE TSI_MMF_SDEVSOUND.dll
-
-delay 5000
-
-//!@SYMTestCaseID             MM-MMF-SDEVSOUND-I-0002-HP
-//!@SYMTestCaseDesc           SecureDevSound - PlaySimpleTone (DevSound[0] with no cap and HP, DevSound[1] with cap and LP)
-//!@SYMPREQ                   PREQ277
-//!@SYMTestPriority           2
-//!@SYMTestActions            There are two processes of DevSound instances, iMMFDevSound[0] and iMMFDevSound[1]. They both play simple tone. iMMFDevSound[0]
-//! has no MultimediaDD capability. It is set as HIGH priority and played first.  iMMFDevSound[1] has MultimediaDD capability. It is set as LOW priority
-//! and played next.
-//!@SYMTestExpectedResults    iMMFDevSound[0] stops and returns KErrInUse. iMMFDevSound[1] starts to play and returns KErrNone. Check that the callback
-//! was called correctly and with no errors.
-RUN_TEST_STEP -1 TSI_MMF_SDEVSOUND MM-MMF-SDEVSOUND-I-0002-HP
-TEST_COMPLETE
-
-//!@SYMTestCaseID             MM-MMF-SDEVSOUND-I-0004-HP
-//!@SYMTestCaseDesc           SecureDevSound - DTMFTones (DevSound[0] with no cap and HP, DevSound[1] with cap and LP)
-//!@SYMPREQ                   PREQ277
-//!@SYMTestPriority           2
-//!@SYMTestActions            There are two processes of DevSound instances, iMMFDevSound[0] and iMMFDevSound[1]. They both play DTMF tone. iMMFDevSound[0]
-//! has no MultimediaDD capability. It is set as HIGH priority and played first.  iMMFDevSound[1] has MultimediaDD capability. It is set as LOW priority
-//! and played next.
-//!@SYMTestExpectedResults    iMMFDevSound[0] stops and returns KErrInUse. iMMFDevSound[1] starts to play and returns KErrNone. Check that the callback
-//! was called correctly and with no errors.
-RUN_TEST_STEP -1 TSI_MMF_SDEVSOUND MM-MMF-SDEVSOUND-I-0004-HP
-TEST_COMPLETE
-
-//!@SYMTestCaseID             MM-MMF-SDEVSOUND-I-0006-HP
-//!@SYMTestCaseDesc           SecureDevSound - PlayDualTone (DevSound[0] with no cap and HP, DevSound[1] with cap and LP)
-//!@SYMPREQ                   PREQ277
-//!@SYMTestPriority           2
-//!@SYMTestActions            There are two processes of DevSound instances, iMMFDevSound[0] and iMMFDevSound[1]. They both play Dual Tone. iMMFDevSound[0]
-//! has no MultimediaDD capability. It is set as HIGH priority and played first.  iMMFDevSound[1] has MultimediaDD capability. It is set as LOW priority
-//! and played next.
-//!@SYMTestExpectedResults    iMMFDevSound[0] stops and returns KErrInUse. iMMFDevSound[1] starts to play and returns KErrNone. Check that the callback
-//! was called correctly and with no errors.
-RUN_TEST_STEP -1 TSI_MMF_SDEVSOUND MM-MMF-SDEVSOUND-I-0006-HP
-TEST_COMPLETE
-
-//!@SYMTestCaseID             MM-MMF-SDEVSOUND-I-0008-HP
-//!@SYMTestCaseDesc           SecureDevSound - PlayEOFPCM16 (DevSound[0] with no cap and HP, DevSound[1] with cap and LP)
-//!@SYMPREQ                   PREQ277
-//!@SYMTestPriority           2
-//!@SYMTestActions            There are two processes of DevSound instances, iMMFDevSound[0] and iMMFDevSound[1]. They both call PlayData() to play buffers
-//! till end of file. iMMFDevSound[0] has no MultimediaDD capability. It is set as HIGH priority and played first.  iMMFDevSound[1] has MultimediaDD capability.
-//! It is set as LOW priority and played next.
-//!@SYMTestExpectedResults    iMMFDevSound[0] stops and returns KErrInUse. iMMFDevSound[1] starts to play and returns KErrNone. The 'playing file' keeps
-//! playing while the callback error is KErrNone. When the buffer read from the test file is less than the read buffer length then the test sets last buffer
-//! to true. Also DevSound called PlayError with KErrUnderFlow.
-RUN_TEST_STEP -1 TSI_MMF_SDEVSOUND MM-MMF-SDEVSOUND-I-0008-HP
-TEST_COMPLETE
-
-//!@SYMTestCaseID             MM-MMF-SDEVSOUND-I-0010-HP
-//!@SYMTestCaseDesc           SecureDevSound - Record10BuffersPCM16 (DevSound[0] with UserEnvironment cap and HP, DevSound[1] with all cap and LP)
-//!@SYMPREQ                   PREQ277
-//!@SYMTestPriority           2
-//!@SYMTestActions            There are two processes of DevSound instances, iMMFDevSound[0] and iMMFDevSound[1]. They both call RecordData() to record
-//! 10 buffers of pcm16 data. iMMFDevSound[0] has UserEnvironment capability. It is set as HIGH priority and played first.  iMMFDevSound[1] has All capability.
-//! It is set as LOW priority and played next.
-//!@SYMTestExpectedResults    iMMFDevSound[0] stops and returns KErrInUse. iMMFDevSound[1] starts to play and returns KErrNone. The 'recording file' keeps
-//! recording while the callback error is KErrNone. Also every buffer has been recorded with one BufferToBeEmptied() callback. It finally produces C:\TSU
-//!_MMF_DEVSOUND_SUITE\Output\Rec10BufferPCM.raw
-RUN_TEST_STEP -1 TSI_MMF_SDEVSOUND MM-MMF-SDEVSOUND-I-0010-HP
-TEST_COMPLETE
-
-//!@SYMTestCaseID             MM-MMF-SDEVSOUND-I-0036-HP
-//!@SYMTestCaseDesc           SecureDevSound - PlaySimpleTone (DevSound[0] with cap and LP, DevSound[1] without cap and HP)
-//!@SYMPREQ                   CR1058
-//!@SYMTestPriority           2
-//!@SYMTestActions            iMMFDevSound[0] has MMDD cap while iMMFDevSound[1] doesn't. Before they start playing their own tone in their own process, 
-//! they exchange thread ID and reset their thread ID with SetClientThreadInfo()
-//!@SYMTestExpectedResults    iMMFDevSound[0] stops and tone finishes with KErrInUse. iMMFDevSound[1] starts to play and tones finishes with KErrUnderflow.
-RUN_TEST_STEP 440000 TSI_MMF_SDEVSOUND MM-MMF-SDEVSOUND-I-0036-HP
-TEST_COMPLETE
-
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_SDEVSOUND_01_Panic.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// TSI_MMF_SDEVSOUND_Panic.script
-//
-
-
-LOAD_SUITE TSI_MMF_SDEVSOUND.dll
-
-delay 5000
-
-//! @SYMTestCaseID MM-MMF-SDEVSOUND-I-0017-HP
-RUN_PANIC_STEP -1, TSI_MMF_SDEVSOUND, MM-MMF-SDEVSOUND-I-0017-HP, MmfDevSoundProxy, 0
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-SDEVSOUND-I-0018-HP
-RUN_PANIC_STEP -1, TSI_MMF_SDEVSOUND, MM-MMF-SDEVSOUND-I-0018-HP, MmfDevSoundProxy, 1
-TEST_COMPLETE
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_SDEVSOUND_MMDDCAP.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-@file TSI_MMF_SDEVSOUND_MMDDCAP.script
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-
-LOAD_SUITE TSI_MMF_SDEVSOUND.dll
-
-delay 5000
-
-//!@SYMTestCaseID             MM-MMF-SDEVSOUND-I-0021-HP
-//!@SYMTestCaseDesc           SecureDevSound - CMdaAudioRecorderUtility to open a file based clip and record with only MultimediaDD capability
-//!@SYMPREQ                   PREQ277
-//!@SYMTestPriority           2
-//!@SYMTestActions            audioRec[0] call OpenFileL and RecordL. audioRec[0] has MultimediaDD capability.
-//!@SYMTestExpectedResults    Check whether KErrPermissionDenied is returned.
-RUN_TEST_STEP -1 TSI_MMF_SDEVSOUND MM-MMF-SDEVSOUND-I-0021-HP \audio.ini
-TEST_COMPLETE
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_SDEVSOUND_NOCAP.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-@file TSI_MMF_SDEVSOUND_NOCAP.script
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-
-LOAD_SUITE TSI_MMF_SDEVSOUND.dll
-
-delay 5000
-
-//!@SYMTestCaseID             MM-MMF-SDEVSOUND-I-0001-HP
-//!@SYMTestCaseDesc           SecureDevSound - PlaySimpleTone with no cap
-//!@SYMPREQ                   PREQ277
-//!@SYMTestPriority           2
-//!@SYMTestActions            iMMFDevSound[0] play simple tone. iMMFDevSound[0] has no MultimediaDD capability
-//!@SYMTestExpectedResults    Check that the callback was called correctly and with no errors.
-RUN_TEST_STEP -1 TSI_MMF_SDEVSOUND MM-MMF-SDEVSOUND-I-0001-HP
-TEST_COMPLETE
-
-//!@SYMTestCaseID             MM-MMF-SDEVSOUND-I-0003-HP
-//!@SYMTestCaseDesc           SecureDevSound - DTMFTones with no cap
-//!@SYMPREQ                   PREQ277
-//!@SYMTestPriority           2
-//!@SYMTestActions            iMMFDevSound[0] play DTMF tone. iMMFDevSound[0] has no MultimediaDD capability
-//!@SYMTestExpectedResults    Check that the callback was called correctly and with no errors.
-RUN_TEST_STEP -1 TSI_MMF_SDEVSOUND MM-MMF-SDEVSOUND-I-0003-HP
-TEST_COMPLETE
-
-//!@SYMTestCaseID             MM-MMF-SDEVSOUND-I-0005-HP
-//!@SYMTestCaseDesc           SecureDevSound - PlayDualTone with no cap
-//!@SYMPREQ                   PREQ277
-//!@SYMTestPriority           2
-//!@SYMTestActions            iMMFDevSound[0] play Dual Tone. iMMFDevSound[0] has no MultimediaDD capability
-//!@SYMTestExpectedResults    Check that the callback was called correctly and with no errors.
-RUN_TEST_STEP -1 TSI_MMF_SDEVSOUND MM-MMF-SDEVSOUND-I-0005-HP
-TEST_COMPLETE
-
-//!@SYMTestCaseID             MM-MMF-SDEVSOUND-I-0007-HP
-//!@SYMTestCaseDesc           SecureDevSound - PlayEOFPCM16 with no cap
-//!@SYMPREQ                   PREQ277
-//!@SYMTestPriority           2
-//!@SYMTestActions            iMMFDevSound[0] call PlayData() to play buffers till end of file. iMMFDevSound[0] has no MultimediaDD capability
-//!@SYMTestExpectedResults    Check that the callback was called correctly and with no errors.
-RUN_TEST_STEP -1 TSI_MMF_SDEVSOUND MM-MMF-SDEVSOUND-I-0007-HP
-TEST_COMPLETE
-
-//!@SYMTestCaseID             MM-MMF-SDEVSOUND-I-0011-HP
-//!@SYMTestCaseDesc           SecureDevSound - CMdaAudioPlayerUtility to open an audio file and play with no cap
-//!@SYMPREQ                   PREQ277
-//!@SYMTestPriority           2
-//!@SYMTestActions            audioUtil[0] call PlayFileL. audioUtil[0] has no MultimediaDD capability
-//!@SYMTestExpectedResults    Check that the callback was called correctly and with no errors.
-RUN_TEST_STEP -1 TSI_MMF_SDEVSOUND MM-MMF-SDEVSOUND-I-0011-HP \audio.ini
-TEST_COMPLETE
-
-//!@SYMTestCaseID             MM-MMF-SDEVSOUND-I-0013-HP
-//!@SYMTestCaseDesc           SecureDevSound - CMdaAudioRecorderUtility to open a file based clip and record with no cap
-//!@SYMPREQ                   PREQ277
-//!@SYMTestPriority           2
-//!@SYMTestActions            audioRec[0] call OpenFileL and RecordL. audioRec[0] has no UserEnv capability (NONE capability).
-//!@SYMTestExpectedResults    Check whether KErrPermissionDenied is returned. (Earlier returned no errors as recording behaviour has changed)
-RUN_TEST_STEP -1 TSI_MMF_SDEVSOUND MM-MMF-SDEVSOUND-I-0013-HP \audio.ini
-TEST_COMPLETE
-
-//!@SYMTestCaseID             MM-MMF-SDEVSOUND-I-0035-HP
-//!@SYMTestCaseDesc           SecureDevSound - Reset client thread ID of a DevSound instance from a process without MultimediaDD capability
-//!@SYMPREQ                   CR1058
-//!@SYMTestPriority           2
-//!@SYMTestActions            iMMFDevSound[0] set with current client thread Id. iMMFDevSound[0] has no MultimediaDD capability
-//!@SYMTestExpectedResults    SetClientThreadInfo() returns KErrPermissionDenied.
-RUN_TEST_STEP 440000 TSI_MMF_SDEVSOUND MM-MMF-SDEVSOUND-I-0035-HP
-TEST_COMPLETE
-
-
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_SDEVSOUND_UECAP.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-@file TSI_MMF_SDEVSOUND_UECAP.script
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-
-LOAD_SUITE TSI_MMF_SDEVSOUND.dll
-
-delay 1000
-
-//!@SYMTestCaseID             MM-MMF-SDEVSOUND-I-0022-HP
-//!@SYMTestCaseDesc           SecureDevSound - CMdaAudioRecorderUtility to open a file based clip and record with only UserEnvironment capability
-//!@SYMPREQ                   PREQ277
-//!@SYMTestPriority           2
-//!@SYMTestActions            audioRec[0] call OpenFileL and RecordL. audioRec[0] has UserEnvironment capability.
-//!@SYMTestExpectedResults    Check that the callback was called correctly and with no errors.
-RUN_TEST_STEP -1 TSI_MMF_SDEVSOUND MM-MMF-SDEVSOUND-I-0022-HP \audio.ini
-TEST_COMPLETE
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_SECUREDRM_AUDIO.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-@file TSI_MMF_SECUREDRM_AUDIO.script
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Integration tests for CR1058.
-// 
-//
-
-LOAD_SUITE TSI_MMFACLNT.DLL
-
-delay 1000
-
-/////////////////////////////// NEGATIVE TESTS /////////////////////////////////////
-
-
-//!@SYMTestCaseID             MM-MMF-SECDRM-I-0003-HP
-//!@SYMTestCaseDesc           Play protected audio file from file handle without ShareProtected 
-//							  with DRM cap, so bypasses process. Actually fails as needs ShareProtected
-//                            for RefTestAgent
-//!@SYMPREQ                   
-//!@SYMTestPriority           1
-//!@SYMTestActions            Initialise audio utility with a protected audio file and play.
-PRINT Try to play DRM encrypted file with DRM cap but without ShareProtected()
-PRINT Fails as RefTestAgent requires ShareProtected
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-7803-HP \securedrm_audio.ini MM-MMF-SECDRM-I-0003-HP
-TEST_COMPLETE
-
-
-
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_SECUREDRM_AUDIO_MMDDCAP.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-@file TSI_MMF_SECUREDRM_AUDIO_MMDDCAP.script
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Integration tests for CR1058.
-// 
-//
-
-LOAD_SUITE TSI_MMFACLNT.DLL
-
-delay 1000
-
-/////////////////////////////// POSITIVE TESTS /////////////////////////////////////
-
-//
-//!@SYMTestCaseID             MM-MMF-SECUREDRM-AUDIO-I-0001-CP
-//!@SYMTestCaseDesc           Play protected audio file from file name
-//!@SYMPREQ                   
-//!@SYMTestPriority           1
-//!@SYMTestActions            Initialise audio utility with a protected audio file and play.
-//!@SYMTestExpectedResults    KErrNone
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-0001-CP \securedrm_audio.ini MM-MMF-SECUREDRM-AUDIO-I-0001-CP
-TEST_COMPLETE
-//
-//!@SYMTestCaseID             MM-MMF-SECUREDRM-AUDIO-I-0002-CP
-//!@SYMTestCaseDesc           Play protected audio file from file handle
-//!@SYMPREQ
-//!@SYMTestPriority           1
-//!@SYMTestActions            Initialise audio utility with a protected audio file and play.
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-7803-HP \securedrm_audio.ini MM-MMF-SECUREDRM-AUDIO-I-0002-CP
-TEST_COMPLETE
-
-//!@SYMTestCaseID             MM-MMF-SECDRM-I-0002-HP
-//!@SYMTestCaseDesc           Play protected audio file from file handle without ShareProtected
-//!@SYMPREQ                   
-//!@SYMTestPriority           1
-//!@SYMTestActions            Initialise audio utility with a protected audio file and play.
-PRINT Try to play DRM encrypted file without DRM cap but without ShareProtected()
-PRINT Fails as RefTestAgent requires ShareProtected. 
-//Error is -8. Would have been before this feature change too
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-7803-HP \securedrm_audio.ini MM-MMF-SECDRM-I-0002-HP
-TEST_COMPLETE
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_SECUREDRM_TESTDATA.script	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_SECUREDRM_TESTDATA.script	Fri Jul 09 12:23:13 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -26,8 +26,6 @@
 
 LOAD_SUITE RTAUtils
 
-RUN_TEST_STEP 1000 RTAUtils CreateDrmArchive \securedrm_testdata.ini CreateDrmArchiveVideo
-RUN_TEST_STEP 1000 RTAUtils ImportDrmArchive \securedrm_testdata.ini ImportDrmArchiveVideo
 RUN_TEST_STEP 1000 RTAUtils CreateDrmArchive \securedrm_testdata.ini CreateDrmArchiveAudio
 RUN_TEST_STEP 1000 RTAUtils ImportDrmArchive \securedrm_testdata.ini ImportDrmArchiveAudio
 
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_SECUREDRM_VIDEO_MMDDCAP.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-@file tsi_mmf_securedrm_video_mmddcap.script
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-LOAD_SUITE tsi_mmf_vclntavi.dll
-
-/////////////////////////////// POSITIVE TESTS /////////////////////////////////////
-
-//
-//!@SYMTestCaseID             MM-MMF-SECUREDRM-VIDEO-I-0001-CP
-//!@SYMTestCaseDesc           Play protected video file from file name
-//!@SYMPREQ                   
-//!@SYMTestPriority           1
-//!@SYMTestActions            Initialise video utility with a protected video file and play.
-//!@SYMTestExpectedResults    KErrNone
-RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-0001-CP \securedrm_video.ini MM-MMF-SECUREDRM-VIDEO-I-0001-CP
-TEST_COMPLETE
-//
-//!@SYMTestCaseID             MM-MMF-SECUREDRM-VIDEO-I-0002-CP
-//!@SYMTestCaseDesc           Play protected video file from file handle
-//!@SYMPREQ                   
-//!@SYMTestPriority           1
-//!@SYMTestActions            Initialise video utility with a protected video file and play.
-//!@SYMTestExpectedResults    KErrNone
-RUN_TEST_STEP 200000 TSI_MMF_VCLNTAVI MM-MMF-VCLNTAVI-I-0022-HP \securedrm_video.ini MM-MMF-SECUREDRM-VIDEO-I-0002-CP
-TEST_COMPLETE
\ No newline at end of file
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_VCLNT_OF.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Run Multimedia Framework Video Clients Integration tests
-// Wait for Window Manager
-// 
-//
-
-DELAY 5000
-
-LOAD_SUITE TSI_MMFVCLNT.DLL
-
-//! @SYMTestCaseID MM-MMF-VCLNT-I-0034-CP
-
-RUN_TEST_STEP 120000, VCLNT, MM-MMF-VCLNT-I-0034-CP   c:\video.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-VCLNT-I-0522-CP
-
-RUN_TEST_STEP 120000, VCLNT, MM-MMF-VCLNT-I-0522-CP   c:\video.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-VCLNT-I-0523-CP
-
-RUN_TEST_STEP 120000, VCLNT, MM-MMF-VCLNT-I-0523-CP   c:\video.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-VCLNT-I-1011-CP
-
-RUN_TEST_STEP 120000, VCLNT, MM-MMF-VCLNT-I-1011-CP   c:\video.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-VCLNT-I-1010-CP
-
-RUN_TEST_STEP 120000, VCLNT, MM-MMF-VCLNT-I-1010-CP   c:\video.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-VCLNT-I-1511-CP
-
-RUN_TEST_STEP 120000, VCLNT, MM-MMF-VCLNT-I-1511-CP   c:\video.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-VCLNT-I-1512-CP
-
-RUN_TEST_STEP 120000, VCLNT, MM-MMF-VCLNT-I-1512-CP   c:\video.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-VCLNT-I-1513-CP
-
-RUN_TEST_STEP 120000, VCLNT, MM-MMF-VCLNT-I-1513-CP   c:\video.ini
-TEST_COMPLETE 
-
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_VCLNT_OF_ALLOC.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Run Multimedia Framework Video Clients Integration tests
-// Wait for Window Manager
-// 
-//
-
-DELAY 5000
-
-LOAD_SUITE TSI_MMFVCLNT.DLL
-
-//! @SYMTestCaseID MM-MMF-VCLNT-I-0036-CP
-
-RUN_TEST_STEP 4600000, VCLNT, MM-MMF-VCLNT-I-0036-CP   c:\video.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-VCLNT-I-0524-CP
-
-RUN_TEST_STEP 4600000, VCLNT, MM-MMF-VCLNT-I-0524-CP   c:\video.ini
-TEST_COMPLETE 
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_VCLNT_WM.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,410 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// TSI_MMF_VCLNT.script
-// Run Multimedia Framework Video Clients Integration tests
-// Wait for Window Manager
-// 
-//
-
-DELAY 5000
-
-LOAD_SUITE TSI_MMFVCLNT.DLL
-#PAUSE_AT_END
-
-
-###################### POSITIVE TEST ###############
-
-#Req. under test REQ172.2.4           REQ172.2.7        REQ172.2.10
-# Play video file
-//! @SYMTestCaseID MM-MMF-VCLNT-I-0001-CP
-
-RUN_TEST_STEP -1, VCLNT, MM-MMF-VCLNT-I-0001-CP   c:\video.ini
-TEST_COMPLETE 
-
-#Req. under test REQ172.2.4        REQ172.2.8        REQ172.2.10
-# Play video descriptor
-//! @SYMTestCaseID MM-MMF-VCLNT-I-0002-CP
-
-RUN_TEST_STEP -1, VCLNT, MM-MMF-VCLNT-I-0002-CP   c:\video.ini
-TEST_COMPLETE 
-
-#Req. under test REQ172.2.28      
-# Set and enquire framerate
-//! @SYMTestCaseID MM-MMF-VCLNT-I-0010-CP
-
-RUN_TEST_STEP -1, VCLNT, MM-MMF-VCLNT-I-0010-CP   c:\video.ini
-TEST_COMPLETE 
-
-#Req. under test REQ172.2.13          REQ172.2.14
-# set position and play form this position.
-//! @SYMTestCaseID MM-MMF-VCLNT-I-0011-CP
-
-RUN_TEST_STEP -1, VCLNT, MM-MMF-VCLNT-I-0011-CP   c:\video.ini
-TEST_COMPLETE 
-
-#Req. under test REQ172.2.25
-# Video priority 
-//! @SYMTestCaseID MM-MMF-VCLNT-I-0012-CP
-
-RUN_TEST_STEP -1, VCLNT, MM-MMF-VCLNT-I-0012-CP   c:\video.ini
-TEST_COMPLETE 
-
-#Req. under test REQ172.2.25
-# Enquire video duration
-//! @SYMTestCaseID MM-MMF-VCLNT-I-0015-HP
-
-RUN_TEST_STEP -1, VCLNT, MM-MMF-VCLNT-I-0015-HP   c:\video.ini
-TEST_COMPLETE 
-
-
-#Req. under test REQ172.2.16        REQ172.2.17        REQ172.2.18
-# Set the volume to the maximum.
-//! @SYMTestCaseID MM-MMF-VCLNT-I-0016-HP
-
-RUN_TEST_STEP -1, VCLNT, MM-MMF-VCLNT-I-0016-HP   c:\video.ini
-TEST_COMPLETE 
-
-#Req. under test REQ172.2.4        REQ172.2.5       REQ172.2.6
-# Open a clip, close the clip and open a new clip.
-//! @SYMTestCaseID MM-MMF-VCLNT-I-0017-HP
-
-RUN_TEST_STEP -1, VCLNT, MM-MMF-VCLNT-I-0017-HP   c:\video.ini
-TEST_COMPLETE 
-
-
-#Req. under test REQ172.2.10            REQ172.2.11
-# Pause a clip
-//! @SYMTestCaseID MM-MMF-VCLNT-I-0018-HP
-
-RUN_TEST_STEP -1, VCLNT, MM-MMF-VCLNT-I-0018-HP   c:\video.ini
-TEST_COMPLETE 
-
-
-#Req. under test REQ172.2.30        REQ172.2.31
-# Set and Enquire balance
-//! @SYMTestCaseID MM-MMF-VCLNT-I-0019-HP
-
-RUN_TEST_STEP -1, VCLNT, MM-MMF-VCLNT-I-0019-HP   c:\video.ini
-TEST_COMPLETE 
-
-#Req. under test REQ172.2.21          REQ172.2.22
-# Set the play window, delete the play window.
-//! @SYMTestCaseID MM-MMF-VCLNT-I-0020-HP
-
-RUN_TEST_STEP -1, VCLNT, MM-MMF-VCLNT-I-0020-HP   c:\video.ini
-TEST_COMPLETE 
-
-
-#Req. under test REQ172.2.20
-# Get meta information
-//! @SYMTestCaseID MM-MMF-VCLNT-I-0021-HP
-
-RUN_TEST_STEP -1, VCLNT, MM-MMF-VCLNT-I-0021-HP   c:\video.ini
-TEST_COMPLETE 
-
-
-#Req. under test REQ172.2.27
-# query the framesize
-//! @SYMTestCaseID MM-MMF-VCLNT-I-0022-HP
-
-RUN_TEST_STEP -1, VCLNT, MM-MMF-VCLNT-I-0022-HP   c:\video.ini
-TEST_COMPLETE 
-
-
-#Req. under test REQ172.2.23
-# Set number of time to repeat play
-//! @SYMTestCaseID MM-MMF-VCLNT-I-0023-HP
-
-RUN_TEST_STEP -1, VCLNT, MM-MMF-VCLNT-I-0023-HP   c:\video.ini
-TEST_COMPLETE 
-
-#Req. not mapped
-# Query the MIME type
-//! @SYMTestCaseID MM-MMF-VCLNT-I-0031-LP
-
-RUN_TEST_STEP -1, VCLNT, MM-MMF-VCLNT-I-0031-LP   c:\video.ini
-TEST_COMPLETE 
-
-#Req. not mapped
-# Register for rebuffering
-//! @SYMTestCaseID MM-MMF-VCLNT-I-0032-LP
-
-RUN_TEST_STEP -1, VCLNT, MM-MMF-VCLNT-I-0032-LP   c:\video.ini
-TEST_COMPLETE 
-
-###################### NEGATIVE TEST ###############
-
-#Req. under test REQ172.2.4           REQ172.2.7        REQ172.2.10
-# Video utility - Delete object before play operation has completed.
-//! @SYMTestCaseID MM-MMF-VCLNT-I-1001-CP
-
-RUN_TEST_STEP -1, VCLNT, MM-MMF-VCLNT-I-1001-CP   c:\video.ini
-TEST_COMPLETE 
-
-#Req. under test REQ172.2.28
-# Set invalid framerate
-//! @SYMTestCaseID MM-MMF-VCLNT-I-1002-CP
-
-RUN_TEST_STEP -1, VCLNT, MM-MMF-VCLNT-I-1002-CP   c:\video.ini
-TEST_COMPLETE 
-
-#Req. under test REQ172.2.13          REQ172.2.14
-# Set invalid video position and play (above maximum).
-//! @SYMTestCaseID MM-MMF-VCLNT-I-1003-CP
-
-RUN_TEST_STEP -1, VCLNT, MM-MMF-VCLNT-I-1003-CP   c:\video.ini
-TEST_COMPLETE 
-
-#Req. under test REQ172.2.13          REQ172.2.14
-# Set invalid video position and play (below minimum).
-//! @SYMTestCaseID MM-MMF-VCLNT-I-1004-CP
-
-RUN_TEST_STEP -1, VCLNT, MM-MMF-VCLNT-I-1004-CP   c:\video.ini
-TEST_COMPLETE 
-
-#Req. under test REQ172.2.16        REQ172.2.17        REQ172.2.18
-# Set invalid volume.
-//! @SYMTestCaseID MM-MMF-VCLNT-I-1005-HP
-
-RUN_TEST_STEP -1, VCLNT, MM-MMF-VCLNT-I-1005-HP   c:\video.ini
-TEST_COMPLETE 
-
-#Req. under test REQ172.2.16        REQ172.2.17        REQ172.2.18
-# Set invalid volume.
-//! @SYMTestCaseID MM-MMF-VCLNT-I-1010-HP
-
-RUN_TEST_STEP -1, VCLNT, MM-MMF-VCLNT-I-1010-HP   c:\video.ini
-TEST_COMPLETE 
-
-#Req. under test REQ172.2.30        REQ172.2.31
-# Set invalid balance
-//! @SYMTestCaseID MM-MMF-VCLNT-I-1006-HP
-
-RUN_TEST_STEP -1, VCLNT, MM-MMF-VCLNT-I-1006-HP   c:\video.ini
-TEST_COMPLETE 
-
-#Req. under test REQ172.2.30        REQ172.2.31
-# Set invalid balance
-//! @SYMTestCaseID MM-MMF-VCLNT-I-1011-HP
-
-RUN_TEST_STEP -1, VCLNT, MM-MMF-VCLNT-I-1011-HP   c:\video.ini
-TEST_COMPLETE 
-
-#Req. under test REQ172.2.21          REQ172.2.22
-# Set invalid play window.
-//! @SYMTestCaseID MM-MMF-VCLNT-I-1007-HP
-
-RUN_TEST_STEP -1, VCLNT, MM-MMF-VCLNT-I-1007-HP   c:\video.ini
-TEST_COMPLETE 
-
-#Req. under test REQ172.2.4           REQ172.2.7        REQ172.2.10
-# Load corrupted file.
-//! @SYMTestCaseID MM-MMF-VCLNT-I-1008-HP
-
-//RUN_TEST_STEP -1, VCLNT, MM-MMF-VCLNT-I-1008-HP   c:\video.ini
-//TEST_COMPLETE 
-
-
-#Req. under test REQ172.2.4           REQ172.2.7        REQ172.2.10
-# Load a video clip that uses a codec that isn't supported.
-//! @SYMTestCaseID MM-MMF-VCLNT-I-1009-HP
-
-//RUN_TEST_STEP -1, VCLNT, MM-MMF-VCLNT-I-1009-HP   c:\video.ini
-//TEST_COMPLETE 
-
-###################### POSITIVE TEST ###############
-
-#Req. under test REQ172.16.3       REQ172.16.6    REQ172.16.9
-# Open file-based clip and record.
-//! @SYMTestCaseID MM-MMF-VCLNT-I-0502-CP
-
-RUN_TEST_STEP -1, VCLNT, MM-MMF-VCLNT-I-0502-CP c:\video.ini
-TEST_COMPLETE 
-
-#Req. under test REQ172.16.3              REQ172.16.7           REQ172.16.9
-# Open descriptor based clip and record.
-//! @SYMTestCaseID MM-MMF-VCLNT-I-0503-CP
-
-RUN_TEST_STEP -1, VCLNT, MM-MMF-VCLNT-I-0503-CP c:\video.ini
-TEST_COMPLETE 
-
-#Req. under test REQ172.16.3       REQ172.16.8
-# Open URL-based clip.
-//! @SYMTestCaseID MM-MMF-VCLNT-I-0504-LP
-
-RUN_TEST_STEP -1, VCLNT, MM-MMF-VCLNT-I-0504-LP c:\video.ini
-TEST_COMPLETE 
-
-#Req. under test REQ172.16.3       REQ172.16.6      REQ172.16.4    REQ172.16.5
-# Open file-based clip. Close the clip and then open the clip again.
-//! @SYMTestCaseID MM-MMF-VCLNT-I-0505-HP
-
-RUN_TEST_STEP -1, VCLNT, MM-MMF-VCLNT-I-0505-HP c:\video.ini
-TEST_COMPLETE 
-
-#Req. under test REQ172.16.11         REQ172.16.9
-# Configure the recorded file and record.
-//! @SYMTestCaseID MM-MMF-VCLNT-I-0506-CP
-
-RUN_TEST_STEP -1, VCLNT, MM-MMF-VCLNT-I-0506-CP c:\video.ini
-TEST_COMPLETE 
-
-#Req. under test REQ172.16.9           REQ172.16.10
-# Start recording then stop on request.
-//! @SYMTestCaseID MM-MMF-VCLNT-I-0507-HP
-
-RUN_TEST_STEP -1, VCLNT, MM-MMF-VCLNT-I-0507-HP c:\video.ini
-TEST_COMPLETE 
-
-#Req. under test REQ172.16.14
-# Check duration
-//! @SYMTestCaseID MM-MMF-VCLNT-I-0509-HP
-
-RUN_TEST_STEP -1, VCLNT, MM-MMF-VCLNT-I-0509-HP c:\video.ini
-TEST_COMPLETE 
-
-#Req. under test REQ172.16.15
-# Query record time
-//! @SYMTestCaseID MM-MMF-VCLNT-I-0510-HP
-
-RUN_TEST_STEP -1, VCLNT, MM-MMF-VCLNT-I-0510-HP c:\video.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.16.16
-# Crop clip
-//! @SYMTestCaseID MM-MMF-VCLNT-I-0511-HP
-
-RUN_TEST_STEP -1, VCLNT, MM-MMF-VCLNT-I-0511-HP c:\video.ini
-TEST_COMPLETE 
-
-#Req. under test REQ172.16.17      REQ172.16.18       REQ172.16.19
-# Set gain to maximum and enquire.
-//! @SYMTestCaseID MM-MMF-VCLNT-I-0512-HP
-
-RUN_TEST_STEP -1, VCLNT, MM-MMF-VCLNT-I-0512-HP c:\video.ini
-TEST_COMPLETE 
-
-#Req. under test REQ172.16.20
-# Set meta-information.
-//! @SYMTestCaseID MM-MMF-VCLNT-I-0513-LP
-
-RUN_TEST_STEP -1, VCLNT, MM-MMF-VCLNT-I-0513-LP c:\video.ini
-TEST_COMPLETE 
-
-#Req. under test REQ172.16.22
-# Set priority
-//! @SYMTestCaseID MM-MMF-VCLNT-I-0514-LP
-
-RUN_TEST_STEP -1, VCLNT, MM-MMF-VCLNT-I-0514-LP c:\video.ini
-TEST_COMPLETE 
-
-#Req. under test REQ172.16.23              REQ172.16.24
-# Set balance and enquire the balance.
-//! @SYMTestCaseID MM-MMF-VCLNT-I-0515-HP
-
-RUN_TEST_STEP -1, VCLNT, MM-MMF-VCLNT-I-0515-HP c:\video.ini
-TEST_COMPLETE 
-
-#Req. under test REQ172.16.26
-# Specify maximum clip size in bytes.
-//! @SYMTestCaseID MM-MMF-VCLNT-I-0516-LP
-
-RUN_TEST_STEP -1, VCLNT, MM-MMF-VCLNT-I-0516-LP c:\video.ini
-TEST_COMPLETE 
-
-#Req. not mapped
-# Set / get audio / video types.
-//! @SYMTestCaseID MM-MMF-VCLNT-I-0521-LP
-
-RUN_TEST_STEP -1, VCLNT, MM-MMF-VCLNT-I-0521-LP c:\video.ini
-TEST_COMPLETE 
-
-###################### NEGATIVE TEST ###############
-
-#Req. under test REQ172.16.11         REQ172.16.9
-# Record audio to unsupported codec.
-//! @SYMTestCaseID MM-MMF-VCLNT-I-1501-HP
-
-RUN_TEST_STEP -1, VCLNT, MM-MMF-VCLNT-I-1501-HP c:\video.ini
-TEST_COMPLETE 
-
-#Req. under test REQ172.16.11         REQ172.16.9
-# Record utility - Delete object before record operation has completed.
-//! @SYMTestCaseID MM-MMF-VCLNT-I-1502-LP
-
-RUN_TEST_STEP -1, VCLNT, MM-MMF-VCLNT-I-1502-LP c:\video.ini
-TEST_COMPLETE 
-
-#Req. under test REQ172.16.17     REQ172.16.18      REQ172.16.19
-# set gain to invalid gain value (above maximum)
-//! @SYMTestCaseID MM-MMF-VCLNT-I-1503-HP
-
-RUN_TEST_STEP -1, VCLNT, MM-MMF-VCLNT-I-1503-HP c:\video.ini
-TEST_COMPLETE 
-
-#Req. under test REQ172.16.17     REQ172.16.18      REQ172.16.19
-# set gain to invalid gain value (below minimum)
-//! @SYMTestCaseID MM-MMF-VCLNT-I-1504-HP
-
-RUN_TEST_STEP -1, VCLNT, MM-MMF-VCLNT-I-1504-HP c:\video.ini
-TEST_COMPLETE 
-
-#Req. under test REQ172.16.23              REQ172.16.24
-# Set invalid balance (above maximum)
-//! @SYMTestCaseID MM-MMF-VCLNT-I-1507-HP
-
-RUN_TEST_STEP -1, VCLNT, MM-MMF-VCLNT-I-1507-HP c:\video.ini
-TEST_COMPLETE 
-
-#Req. under test REQ172.16.23              REQ172.16.24
-# Set invalid balance (below minimum).
-//! @SYMTestCaseID MM-MMF-VCLNT-I-1508-HP
-
-RUN_TEST_STEP -1, VCLNT, MM-MMF-VCLNT-I-1508-HP c:\video.ini
-TEST_COMPLETE 
-
-#Req. under test REQ172.16.26
-# Set invalid maximum length of file in bytes and record
-//! @SYMTestCaseID MM-MMF-VCLNT-I-1510-LP
-
-RUN_TEST_STEP -1, VCLNT, MM-MMF-VCLNT-I-1510-LP c:\video.ini
-TEST_COMPLETE 
-
-#Req. under test REQ1952
-# get Frame from unprotected video file:c:\VclntITestData\LongVideo.avi
-//! @SYMTestCaseID MM-MMF-VCLNT-I-1600-LP
-
-RUN_TEST_STEP -1, VCLNT, MM-MMF-VCLNT-I-1600-LP c:\video.ini
-TEST_COMPLETE 
-
-#Req. under test REQ1952
-# Get a frame from a DRM protected file
-//! @SYMTestCaseID MM-MMF-VCLNT-I-1601-LP
-
-RUN_TEST_STEP -1, VCLNT, MM-MMF-VCLNT-I-1601-LP c:\video.ini
-TEST_COMPLETE 
-
-#Req. under test REQ1952
-# Open DRM protected file with no rights set
-//! @SYMTestCaseID MM-MMF-VCLNT-I-1602-LP
-
-RUN_TEST_STEP -1, VCLNT, MM-MMF-VCLNT-I-1602-LP c:\video.ini
-TEST_COMPLETE 
-
-#Req. under test REQ1952
-# Open DRM protected video and play MIME type provide by Agent
-//! @SYMTestCaseID MM-MMF-VCLNT-I-1603-LP
-
-RUN_TEST_STEP -1, VCLNT, MM-MMF-VCLNT-I-1603-LP c:\video.ini
-TEST_COMPLETE 
\ No newline at end of file
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/audio.ini	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,177 +0,0 @@
-[SectionOne]
-sectionNum= 1
-playerAudioFile = \AclntITestData\mainTst.wav
-playerAudioFile2 = \AclntITestData\mainTst2.wav
-sequenceFile= \AclntITestData\test.sqn
-PCM8 = \AclntITestData\8bitmPcm.wav
-PCM8-6144bytes = \AclntITestData\8bitmPcm-6144bytes.wav
-PCM8output = \AclntITestData\8bitmPcmOutput.wav
-ALAW = \AclntITestData\8bitmAlaw.wav
-PCM16 = \AclntITestData\16bitmPcm.wav
-PCMU8 = \AclntITestData\8bitmUPCM.wav
-PCMU16BE = \AclntITestData\PCMU16BE.wav
-PCMU16 = \AclntITestData\PCMU16.wav
-MULAW = \AclntITestData\8bitmuLaw.wav
-IMAD = \AclntITestData\IMAD.wav
-IMAS = \AclntITestData\IMAS.wav
-GSM610 = \AclntITestData\Gsm610.wav
-cropAudioFile = \AclntITestData\CropMe.wav
-Pcm8Mono44khz = \AclntITestData\pcm8mono44khz.wav  
-Pcm16Mono44khz = \AclntITestData\pcm16mono44khz.wav
-PCMU8_22254Hz_ALF = \AclntITestData\alf-noproblem.wav
-Pcm16Mono48khz = \AclntITestData\pcm16mono48khz.wav
-100khzSRate1KhzTone = \AclntITestData\100khzSRate1KhzTone.wav
-7.33khzSRate1KhzTone = \AclntITestData\7.33khzSRate1KhzTone.wav
-Sequence1 = \AclntITestData\sequence1.sqn
-Sequence2 = \AclntITestData\sequence2.sqn
-PCM16WrongExtension1 = \AclntITestData\16bitmPcm.xxx
-PCM16WrongExtension2 = \AclntITestData\explo.$$$
-Pcm16Mono12khz = \AclntITestData\pcm16mono12khz.wav  
-Pcm16Mono24khz = \AclntITestData\pcm16mono24khz.wav  
-inputTextFile = \AclntITestData\textInput.wav
-
-[SectionTwo]
-sectionNum = 2
-playerAudioFile = \AclntITestData\small.wav
-
-[SectionThree]
-OneSampleFile = \AclntITestData\OneSample.wav
-outputAudioFile = \AclntITestData\ouput.wav
-outputAudioFileRaw = \AclntITestData\ouput.raw
-outputTextFile = \AclntITestData\textOutput.wav
-playerAudioFile = \AclntITestData\mainTst.wav
-cropAudioFile = \AclntITestData\CropMe.wav
-
-[SectionFour]
-auAudioFile = \AclntITestData\Gsm610.wav
-wavAudioFile = \AclntITestData\mainTest.wav
-configAudio = c:\AclntITestData\testOut.wav
-configAudio2 = c:\AclntTestData\testOut2.wav
-configAudio3 = c:\AclntTestData\testOut3.wav
-configAudio4 = c:\AclntTestData\testOut4.wav
-configAudio5 = c:\AclntTestData\testOut5.wav
-configAudio6 = c:\AclntTestData\testOut6.wav
-configAudio7 = c:\AclntTestData\testOut7.wav
-configAudio8 = c:\AclntTestData\testOut8.wav
-configAudio9 = c:\AclntTestData\testOut9.wav
-configAudio10 = c:\AclntTestData\testOut10.wav
-configAudio11 = c:\AclntTestData\testOut.au
-configAudio12 = c:\AclntITestData\testOut2.wav
-
-
-PCM16_out = c:\AclntITestData\16bitmPcm_out.wav
-PCM8_out = c:\AclntITestData\8bitmPcm_out.wav
-
-PCM16_out_au = c:\AclntITestData\16bitPcm_out.au
-PCM8_out_au = c:\AclntITestData\8bitPcm_out.au
-
-[SectionFive]
-playerAudioFile = \AclntITestData\unsupported.wav
-outputAudioFile = \AclntITestData\output5.wav
-
-[SectionSix]
-playerAudioFile = \AclntITestData\noexist.wav
-outputAudioFile = c:\AclntITestData\output6.wav
-
-[SectionSeven]
-toneSequence = \AclntITestData\test.sqn
-
-[SectionEight]
-playerAudioFile = \AclntITestData\small.wav
-playerAudioFileAU = \AclntITestData\small.au
-
-[SectionNine]
-PCM8bitMonoWav = \AclntITestData\PCM8BitMono.wav
-PCM8bitStereoWav = \AclntITestData\PCM8BitStereo.wav
-PCM8bitMonoAu = \AclntITestData\PCM8BitMono.au
-PCM8bitStereoAu = \AclntITestData\PCM8BitStereo.au
-bitrate64 = 64000
-bitrate128 = 128000
-bitrate256 = 256000
-WAV128 = \AclntITestData\PCM16BitMono.wav
-WAV256 = \AclntITestData\PCM16BitStereo.wav
-AU128 = \AclntITestData\PCM16BitMono.au
-AU256 = \AclntITestData\PCM16BitStereo.au
-
-[SectionTen]
-PCM8 = \sdevsoundinttestdata\8bitmPcm.wav
-outputAudioFile = \sdevsoundinttestdata\ouput.wav
-
-[SectionDRM]
-AudioContent = \AclntITestData\Audio.content
-AudioContentRights = \AclntITestData\Audio.contentrights
-
-;Deprecated - Phase 1
-DRMWavFile = \AclntITestData\drmwavfile.drm
-DRMWavMime = audio/wav
-TestConvertFile = \AclntITestData\testout.wav
-
-[SectionARN]
-playerAudioFile1 = \AclntITestData\mainTst.wav
-playerAudioFile2 = \AclntITestData\mainTst2.wav
-playerAudioFile3 = \AclntITestData\mainTst3.wav
-
-[SectionOgg]
-playerAudioFile = \AclntITestData\mainTst.ogg
-playerAudioFile2 = \AclntITestData\mainTst2.ogg
-cropAudioFile = \AclntITestData\CropMe.ogg
-
-[SectionOggSmall]
-playerAudioFile = \AclntITestData\small.ogg
-
-[SectionOggRec]
-outputAudioFile = \AclntITestData\ouput.ogg
-playerAudioFile = \AclntITestData\small.ogg
-cropAudioFile = \AclntITestData\CropMe.ogg
-
-[SectionOggRecState]
-outputAudioFile = c:\AclntITestData\output6.ogg
-
-[SectionOggAPR]
-playerAudioFile1 = \AclntITestData\mainTst.ogg
-playerAudioFile2 = \AclntITestData\mainTst2.ogg
-playerAudioFile3 = \AclntITestData\mainTst3.ogg
-
-[SectionOggDRM]
-AudioContent = \AclntITestData\AudioOgg.content
-AudioContentRights = \AclntITestData\AudioOgg.contentrights
-
-[SectionRepeatCount]
-numOfRepeat = 2
-newRepeatValue = 4
-maxRepeatValue = 15
-
-[SectionSilence]
-silence = 0
-[SectionTruePause]
-Sequence = \AclntITestData\sequence2.sqn
-Volume = 77
-Balance = 77
-Duration = 17000000
-Pause = 2
-
-[SectionTruePauseAOS]
-RawFile = \AclntITestData\test.raw
-OggFile = \AclntITestData\maintst.ogg
-Pause = 1
-Volume = 77
-Balance = 77
-
-[SectionPlayTrue]
-FilenameWAV = \aclntitestdata\main.wav
-FilenameSQN = \aclntitestdata\sequence1.sqn
-FilenamePCM8 = \AclntITestData\8bitmPcm.wav
-FilenamePCM16 = \AclntITestData\16bitmPcm.wav
-FilenamePCMU8 = \AclntITestData\8bitmUPCM.wav
-FilenamePCMU16 = \AclntITestData\PCMU16.wav
-FilenameAlaw = \AclntITestData\8bitmAlaw.wav
-FilenameMulaw = \AclntITestData\8bitmuLaw.wav
-FilenameIMAD = \aclntitestdata\imad2.wav
-FilenameGSM610 = \AclntITestData\Gsm610.wav
-FilenameOGG = \aclntitestdata\maintst.ogg
-FilenamePCMU16BE = \AclntITestData\PCMU16BE.wav
-Volume = 77
-Balance = 77
-Duration1 = 2
-DurationMiliSec = 700
-
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/securedrm_audio.ini	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-[SectionOne]
-sectionNum= 1
-playerAudioFile = \securedrm\audio2.content
-PCM16 = \securedrm\audio2.content
-
-[MM-MMF-SECDRM-I-0002-HP]
-SkipShareProtected = true
-ExpectToFail = true
-ExpectedError = -8
-
-[MM-MMF-SECDRM-I-0003-HP]
-SkipShareProtected = true
-ExpectToFail = true
-ExpectedError = -8
-
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/securedrm_testdata.ini	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/securedrm_testdata.ini	Fri Jul 09 12:23:13 2010 +0100
@@ -13,16 +13,3 @@
 ; from the input file and stored separately (in the Rights database).
 source = c:\securedrm\audio2.contentrights
 target = c:\securedrm\audio2.content
-
-[CreateDrmArchiveVideo]
-; Create a self-contained DRM protected content file, which comprises content and rights.
-ContentDescription = c:\securedrm\videocontent2.xml
-RightsDescription = c:\securedrm\videorights2.xml
-OutputFile = c:\securedrm\video2.contentrights
-
-[ImportDrmArchiveVideo]
-; Create a DRM protected content file, without rights.  The rights are stripped
-; from the input file and stored separately (in the Rights database).
-source = c:\securedrm\video2.contentrights
-target = c:\securedrm\video2.content
-
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/securedrm_video.ini	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-[SectionOne]
-filename = \securedrm\video2.content
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/tsi_mmf_aclnt_00_nona3f.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-LOAD_SUITE TSI_MMFACLNT.DLL
-#PAUSE_AT_END
-
-# wait for ring.wav to finish playing
-delay 5000
-
-
-#True Pause
-//! @SYMTestCaseID			MM-MMF-ACLNT-I-0184-HP
-//! @SYMTestCaseDesc			Negative: Pause-Resume non-a3f mode
-//! @SYMTestPriority			High
-//! @SYMTestType			Alternative usecase
-//! @SYMREQ				REQ11462
-//! @SYMPREQ				1540
-//! @SYMTestActions 			1.Create a CMdaAudioOutputStream object
-//!                                     2. Call Open
-//!                                     3. Wait for MaosOpenComplete()
-//!                                     5. Call WriteL
-//!                                     6. Call Pause.
-//!                                     7. Call Resume
-//!                                     8. Call WriteL until MaoscPlayComplete(TInt)
-//! @SYMTestExpectedResults 		Pause will return KErrNotSupported. Resume will return KErrNotReady. Audio will not be paused
-//! 
-PRINT Negative: Pause-Resume non-a3f mode 
-RUN_TEST_STEP 30000,ACLNT, MM-MMF-ACLNT-I-0184-HP  \audio.ini
-TEST_COMPLETE
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/tsi_mmf_aclnt_00_not_ne.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,322 +0,0 @@
-// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-LOAD_SUITE TSI_MMFACLNT.DLL
-#PAUSE_AT_END
-
-# wait for ring.wav to finish playing
-delay 1000
-
-###################### POSITIVE TEST ###############
-
-#Req. under test REQ172.1.3.19
-# Open an audio file and play.
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst.wav
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst2.wav
-RUN_TEST_STEP 10000, ACLNT, MM-MMF-ACLNT-I-2001-HP  \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.3.19
-# Open an audio file and play.
-RUN_TEST_STEP 10000, ACLNT, MM-MMF-ACLNT-I-2002-HP  \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.3.19
-# Open an audio file and play.
-RUN_TEST_STEP 10000, ACLNT, MM-MMF-ACLNT-I-2003-HP  \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.3.19
-# Open an audio file and play.
-RUN_TEST_STEP 10000, ACLNT, MM-MMF-ACLNT-I-2004-HP  \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.3.19
-# Open an audio file and play.
-RUN_TEST_STEP 10000, ACLNT, MM-MMF-ACLNT-I-2005-HP  \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.3.19
-# Open an audio file and play.
-RUN_TEST_STEP 10000, ACLNT, MM-MMF-ACLNT-I-2006-HP  \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.3.19
-# Open an audio file and play.
-RUN_TEST_STEP 10000, ACLNT, MM-MMF-ACLNT-I-2007-HP  \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.3.19
-# Open an audio file and play.
-RUN_TEST_STEP 10000, ACLNT, MM-MMF-ACLNT-I-2008-HP  \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.3.19
-# Open an audio file and play.
-RUN_TEST_STEP 10000, ACLNT, MM-MMF-ACLNT-I-2010-HP  \audio.ini
-TEST_COMPLETE
-
-# Open an audio file and play.
-RUN_TEST_STEP 10000, ACLNT, MM-MMF-ACLNT-I-2011-LP  \audio.ini
-TEST_COMPLETE
-
-# Open a 44Khz audio file and play.
-RUN_TEST_STEP 10000, ACLNT, MM-MMF-ACLNT-I-2012-HP  \audio.ini
-TEST_COMPLETE
-
-# Open a 48Khz audio file and play. (DEF021477)
-RUN_TEST_STEP 10000, ACLNT, MM-MMF-ACLNT-I-2013-HP  \audio.ini
-TEST_COMPLETE
-
-# Use file which is 6144 bytes in length (INC23133)
-RUN_TEST_STEP 10000, ACLNT, MM-MMF-ACLNT-I-2016-HP  \audio.ini
-TEST_COMPLETE
-
-# Play a sequence file through the audio player utility. INC024064
-RUN_TEST_STEP 20000, ACLNT, MM-MMF-ACLNT-I-2017-HP  \audio.ini
-TEST_COMPLETE
-
-# Play a sequence file through the audio player utility. INC024064
-RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-2018-HP  \audio.ini
-TEST_COMPLETE
-
-# Play a valid but incorrectly named file through the audio player utility. INC036267
-RUN_TEST_STEP 20000, ACLNT, MM-MMF-ACLNT-I-2019-HP  \audio.ini
-TEST_COMPLETE
-
-# Open a 12Khz audio file and play. (INC041837)
-RUN_TEST_STEP 10000, ACLNT, MM-MMF-ACLNT-I-2020-CP  \audio.ini
-TEST_COMPLETE
-
-# Open a 24Khz audio file and play. (INC041837)
-RUN_TEST_STEP 10000, ACLNT, MM-MMF-ACLNT-I-2021-CP  \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.3.6    REQ172.1.3.8
-# Open audio from a descriptor and play.
-RUN_TEST_STEP 10000, ACLNT, MM-MMF-ACLNT-I-3001-HP  \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.3.6    REQ172.1.3.8
-# Open audio from a descriptor and play.
-RUN_TEST_STEP 10000, ACLNT, MM-MMF-ACLNT-I-3002-HP  \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.3.6    REQ172.1.3.8
-# Open audio from a descriptor and play.
-RUN_TEST_STEP 10000, ACLNT, MM-MMF-ACLNT-I-3003-HP  \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.3.6    REQ172.1.3.8
-# Open audio from a descriptor and play.
-RUN_TEST_STEP 10000, ACLNT, MM-MMF-ACLNT-I-3004-HP  \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.3.6    REQ172.1.3.8
-# Open audio from a descriptor and play.
-RUN_TEST_STEP 10000, ACLNT, MM-MMF-ACLNT-I-3005-HP  \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.3.6    REQ172.1.3.8
-# Open audio from a descriptor and play.
-RUN_TEST_STEP 10000, ACLNT, MM-MMF-ACLNT-I-3006-HP  \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.3.6    REQ172.1.3.8
-# Open audio from a descriptor and play.
-RUN_TEST_STEP 10000, ACLNT, MM-MMF-ACLNT-I-3007-HP  \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.3.6    REQ172.1.3.8
-# Open audio from a descriptor and play.
-RUN_TEST_STEP 10000, ACLNT, MM-MMF-ACLNT-I-3008-HP  \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.3.6    REQ172.1.3.8
-# Open audio from a descriptor and play.
-RUN_TEST_STEP 10000, ACLNT, MM-MMF-ACLNT-I-3010-HP  \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.3.8    REQ172.1.3.9
-# Stop play and continue play.
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst.wav
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst2.wav
-RUN_TEST_STEP 150000, ACLNT, MM-MMF-ACLNT-I-0013-CP  \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.21
-# Repeat play an audio file.
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst.wav
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst2.wav
-RUN_TEST_STEP 50000, ACLNT, MM-MMF-ACLNT-I-0015-LP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.3.11
-# Set play position.
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst.wav
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst2.wav
-RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-0022-HP \audio.ini
-TEST_COMPLETE
-
-#Req. under test REQ172.1.3.19
-# Set play window.
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst.wav
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst2.wav
-RUN_TEST_STEP 30000, ACLNT, MM-MMF-ACLNT-I-0023-LP \audio.ini
-TEST_COMPLETE
-
-#Req. under test  REQ172.1.3.17
-#Set volume ramp and play
-RUN_TEST_STEP 120000,ACLNT, MM-MMF-ACLNT-I-0031-LP \audio.ini
-TEST_COMPLETE
-
-#Req. under test  REQ172.1.3.20
-# Delete a defined play window.
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst.wav
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst2.wav
-RUN_TEST_STEP 20000,ACLNT, MM-MMF-ACLNT-I-0034-LP  \audio.ini
-TEST_COMPLETE
-
-#Req. under test  REQ2870
-RUN_TEST_STEP 120000,ACLNT, MM-MMF-ACLNT-I-0036-HP  \audio.ini
-TEST_COMPLETE
-
-RUN_TEST_STEP 120000,ACLNT, MM-MMF-ACLNT-I-0037-HP  \audio.ini
-TEST_COMPLETE
-
-RUN_TEST_STEP 120000,ACLNT, MM-MMF-ACLNT-I-0038-HP  \audio.ini
-TEST_COMPLETE
-
-RUN_TEST_STEP 120000,ACLNT, MM-MMF-ACLNT-I-0039-HP  \audio.ini
-TEST_COMPLETE
-
-################  NEGATIVE TESTS ###############
-
-#Req. under test REQ172.1.3.11
-# Set invalid audio position and play
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst.wav
-# RUN_UTILS CopyFile c:\AclntITestData\main.wav c:\AclntITestData\mainTst2.wav
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-1009-LP \audio.ini
-TEST_COMPLETE
-
-
-################################################################################
-############### Tests for C Cover reprted missing API methods ##################
-################################################################################
-
-# RECORD CLIENT API
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-6010-CP \audio.ini
-TEST_COMPLETE
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-6011-CP \audio.ini
-TEST_COMPLETE
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-6012-CP \audio.ini
-TEST_COMPLETE
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-6013-CP \audio.ini
-TEST_COMPLETE
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-6014-CP \audio.ini
-TEST_COMPLETE
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-6015-CP \audio.ini
-TEST_COMPLETE
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-6016-CP \audio.ini
-TEST_COMPLETE
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-6017-CP \audio.ini
-TEST_COMPLETE
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-6018-CP \audio.ini
-TEST_COMPLETE
-
-
-
-# INPUT STREAM API
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-6033-CP \audio.ini
-TEST_COMPLETE
-
-#For CR1424 For player test(AudioController)
-
-RUN_TEST_STEP 180000,ACLNT, MM-MMF-ACLNT-I-0071-HP  \audio.ini
-TEST_COMPLETE
-
-RUN_TEST_STEP 2000000,ACLNT, MM-MMF-ACLNT-I-0072-HP  \audio.ini
-TEST_COMPLETE
-
-RUN_TEST_STEP 300000,ACLNT, MM-MMF-ACLNT-I-0073-HP  \audio.ini
-TEST_COMPLETE
-
-RUN_TEST_STEP 180000,ACLNT, MM-MMF-ACLNT-I-0075-HP  \audio.ini
-TEST_COMPLETE
-
-RUN_TEST_STEP 180000,ACLNT, MM-MMF-ACLNT-I-0076-HP  \audio.ini
-TEST_COMPLETE
-
-RUN_TEST_STEP 180000,ACLNT, MM-MMF-ACLNT-I-0077-HP  \audio.ini
-TEST_COMPLETE
-
-RUN_TEST_STEP 180000,ACLNT, MM-MMF-ACLNT-I-0078-HP  \audio.ini
-TEST_COMPLETE
-
-RUN_TEST_STEP 180000,ACLNT, MM-MMF-ACLNT-I-0079-HP  \audio.ini
-TEST_COMPLETE
-
-RUN_TEST_STEP 500000,ACLNT, MM-MMF-ACLNT-I-0082-HP  \audio.ini
-TEST_COMPLETE
-
-RUN_TEST_STEP 180000,ACLNT, MM-MMF-ACLNT-I-0083-HP  \audio.ini
-TEST_COMPLETE
-
-RUN_TEST_STEP 180000,ACLNT, MM-MMF-ACLNT-I-0084-HP  \audio.ini
-TEST_COMPLETE
-
-RUN_TEST_STEP 180000,ACLNT, MM-MMF-ACLNT-I-0085-HP  \audio.ini
-TEST_COMPLETE
-
-RUN_TEST_STEP 180000,ACLNT, MM-MMF-ACLNT-I-0086-HP  \audio.ini
-TEST_COMPLETE
-
-RUN_TEST_STEP 180000,ACLNT, MM-MMF-ACLNT-I-0087-HP  \audio.ini
-TEST_COMPLETE
-
-RUN_TEST_STEP 2000000,ACLNT, MM-MMF-ACLNT-I-0088-HP  \audio.ini
-TEST_COMPLETE
-
-#For .sqn files(Tone Controller)
-RUN_TEST_STEP 180000,ACLNT, MM-MMF-ACLNT-I-0140-HP  \audio.ini
-TEST_COMPLETE
-
-RUN_TEST_STEP 180000,ACLNT, MM-MMF-ACLNT-I-0141-HP  \audio.ini
-TEST_COMPLETE
-
-RUN_TEST_STEP 180000,ACLNT, MM-MMF-ACLNT-I-0142-HP  \audio.ini
-TEST_COMPLETE
-
-RUN_TEST_STEP 360000,ACLNT, MM-MMF-ACLNT-I-0143-HP  \audio.ini
-TEST_COMPLETE
-
-RUN_TEST_STEP 180000,ACLNT, MM-MMF-ACLNT-I-0144-HP  \audio.ini
-TEST_COMPLETE
-
-RUN_TEST_STEP 180000,ACLNT, MM-MMF-ACLNT-I-0145-HP  \audio.ini
-TEST_COMPLETE
-
-RUN_TEST_STEP 180000,ACLNT, MM-MMF-ACLNT-I-0146-HP  \audio.ini
-TEST_COMPLETE
-
-RUN_TEST_STEP 180000,ACLNT, MM-MMF-ACLNT-I-0147-HP  \audio.ini
-TEST_COMPLETE
-
-RUN_TEST_STEP 180000,ACLNT, MM-MMF-ACLNT-I-0148-HP  \audio.ini
-TEST_COMPLETE
-
-RUN_TEST_STEP 180000,ACLNT, MM-MMF-ACLNT-I-0149-HP  \audio.ini
-TEST_COMPLETE
-
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/tsi_mmf_aclnt_00_truepause.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,299 +0,0 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-LOAD_SUITE TSI_MMFACLNT.DLL
-#PAUSE_AT_END
-
-# wait for ring.wav to finish playing
-delay 5000
-
-
-#True Pause
-//! @SYMTestCaseID			MM-MMF-ACLNT-I-0175-HP
-//! @SYMTestCaseDesc			Negative: Call Pause before WriteL
-//! @SYMTestPriority			High
-//! @SYMTestType			Exception usecase
-//! @SYMREQ				REQ11462
-//! @SYMPREQ				1540
-//! @SYMTestActions 			1.Create a CMdaAudioOutputStream object
-//! 					2. Call Pause
-//! 					3. Call Open
-//! 					4. Call Pause
-//! @SYMTestExpectedResults 		CMdaAudioToneUtility::Pause() returns with KErrNotReady
-//! 
-PRINT Negative: Call Pause before WriteL 
-RUN_TEST_STEP 30000,ACLNT, MM-MMF-ACLNT-I-0175-HP  \audio.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID			MM-MMF-ACLNT-I-0176-HP
-//! @SYMTestCaseDesc			Positive: Pause-Resume
-//! @SYMTestPriority			High
-//! @SYMTestType			Normal usecase
-//! @SYMREQ				REQ11462
-//! @SYMPREQ				1540
-//! @SYMTestActions 			1.Create a CMdaAudioOutputStream object
-//! 					2. Call Open
-//! 					3. Wait for MaosOpenComplete()
-//! 					4. Call WriteL
-//! 					5. Call Pause. Wait 2 seconds
-//!					6. Resume playback
-//! 					7. Call WriteL until MaoscPlayComplete(TInt)
-//! @SYMTestExpectedResults 		MMdaAudioOutputStreamCallback::MaoscBufferCopied callback will not be received after Pause. 
-//!					Audio continues from paused position. Pause and Resume return with KErrNone
-//! 
-PRINT Positive: Pause-Resume
-RUN_TEST_STEP 30000,ACLNT, MM-MMF-ACLNT-I-0176-HP  \audio.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID			MM-MMF-ACLNT-I-0177-HP
-//! @SYMTestCaseDesc			Positive: Pause-Resume three times
-//! @SYMTestPriority			High
-//! @SYMTestType			Normal usecase
-//! @SYMREQ				REQ11462
-//! @SYMPREQ				1540
-//! @SYMTestActions 			1.Create a CMdaAudioOutputStream object
-//! 					2. Call Open
-//! 					3. Wait for MaosOpenComplete()
-//! 					4. Call WriteL
-//! 					5. Call Pause. Wait 2 seconds
-//! 					6. Repeat steps 4&5 two times
-//! 					7. Call WriteL until MaoscPlayComplete(TInt)
-//! @SYMTestExpectedResults 		MMdaAudioOutputStreamCallback::MaoscBufferCopied callback will not be received after Pause. 
-//!					Audio continues from paused position. Pause and Resume return with KErrNone
-//! 
-PRINT Positive: Pause-Resume three times
-RUN_TEST_STEP 30000,ACLNT, MM-MMF-ACLNT-I-0177-HP  \audio.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID			MM-MMF-ACLNT-I-0178-HP
-//! @SYMTestCaseDesc			Positive: Change configuration while in Pause
-//! @SYMTestPriority			High
-//! @SYMTestType			Alternative usecase
-//! @SYMREQ				REQ11462
-//! @SYMPREQ				1540
-//! @SYMTestActions 			1. Play preloaded audio
-//! 					2. Pause playback
-//! 					3. Change volume and balance to values different from default.
-//! 					4. Resume playback
-//! 					5. Check the values have been changed
-//! @SYMTestExpectedResults 		Volume and balance can be changed in paused state. Changed values are maintained after resume
-//!					Audio continues from paused position. Pause and Resume return with KErrNone
-//! 
-PRINT Positive: Change configuration while in Pause (file sequence)
-RUN_TEST_STEP 30000,ACLNT, MM-MMF-ACLNT-I-0178-HP  \audio.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID			MM-MMF-ACLNT-I-0179-HP
-//! @SYMTestCaseDesc			Negative: Change invalid config while in pause
-//! @SYMTestPriority			High
-//! @SYMTestType			Alternative usecase
-//! @SYMREQ				REQ11462
-//! @SYMPREQ				1540
-//! @SYMTestActions 			1.Create a CMdaAudioOutputStream object
-//! 					2. Call Open
-//! 					3. Wait for MaosOpenComplete()
-//! 					4. Call WriteL
-//! 					5. Call Pause.
-//! 					6. Call SetAudioPropertiesL
-//! 					7. Call WriteL
-//! @SYMTestExpectedResults 	SetAudioPropertiesL should leave with KErrNotSupported
-//!				Audio continues from paused position. Pause and Resume return with KErrNone
-//! 
-PRINT Negative: Change invalid config while in pause
-RUN_TEST_STEP 30000,ACLNT, MM-MMF-ACLNT-I-0179-HP  \audio.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID			MM-MMF-ACLNT-I-0180-HP
-//! @SYMTestCaseDesc			Positive: GetBytes during pause
-//! @SYMTestPriority			High
-//! @SYMTestType			Alternative usecase
-//! @SYMREQ				REQ11462
-//! @SYMPREQ				1540
-//! @SYMTestActions 			1.Create a CMdaAudioOutputStream object
-//! 					2. Call Open
-//! 					3. Wait for MaosOpenComplete()
-//! 					4. Call WriteL
-//! 					5. Call Pause.
-//! 					6. Call GetBytes. Wait 2 seconds
-//! 					7. Call GetBytes again
-//! 					8. Call WriteL until MaoscPlayComplete(TInt)
-//! @SYMTestExpectedResults 		GetBytes should return the same number while in Pause
-//!					Audio continues from paused position. Pause and Resume return with KErrNone
-//! 
-PRINT Positive: GetBytes during pause
-RUN_TEST_STEP 30000,ACLNT, MM-MMF-ACLNT-I-0180-HP  \audio.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID			MM-MMF-ACLNT-I-0181-HP
-//! @SYMTestCaseDesc			Positive: Write-Pause-Stop-Write
-//! @SYMTestPriority			High
-//! @SYMTestType			Normal usecase
-//! @SYMREQ				REQ11462
-//! @SYMPREQ				1540
-//! @SYMTestActions 			1.Create a CMdaAudioOutputStream object
-//! 					2. Call Open
-//! 					3. Wait for MaosOpenComplete()
-//! 					4. Call WriteL
-//! 					5. Call Pause. Wait 2 seconds
-//! 					6. Call Stop
-//!                                     7. Call Resume
-//! 					8. Call WriteL until MaoscPlayComplete(TInt)
-//! @SYMTestExpectedResults 		Pause returns with KErrNone. Resume returns with KErrNotReady while stopped. Audio should be resumed from the start
-//! 
-PRINT Positive: Write-Pause-Stop-Resume-Write
-RUN_TEST_STEP 30000,ACLNT, MM-MMF-ACLNT-I-0181-HP  \audio.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID			MM-MMF-ACLNT-I-0182-HP
-//! @SYMTestCaseDesc			Negative: Pause-Resume non-support formats
-//! @SYMTestPriority			High
-//! @SYMTestType			Alternative usecase
-//! @SYMREQ				REQ11462
-//! @SYMPREQ				1540
-//! @SYMTestActions 			1.Create a CMdaAudioOutputStream object
-//! 					2. Call Open
-//! 					3. Wait for MaosOpenComplete()
-//! 					4. SetDataTypeL
-//! 					5. Call WriteL
-//! 					6. Call Pause. Wait 2 seconds
-//! 					7. Call WriteL until MaoscPlayComplete(TInt)
-//! @SYMTestExpectedResults 		Pause returns KErrNotSupported
-//! 
-PRINT Negative: Pause-Resume non-support formats
-RUN_TEST_STEP 30000,ACLNT, MM-MMF-ACLNT-I-0182-HP  \audio.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID			MM-MMF-ACLNT-I-0185-HP
-//! @SYMTestCaseDec			Play-Pause-Stop-Play
-//! @SYMTestPriority			High
-//! @SYMTestType			Normal usecase
-//! @SYMREQ				REQ11462
-//!					REQ11459
-//!					REQ11460
-//! @SYMPREQ				1540
-//! @SYMTestActions			1. Play preloaded audio
-//!					2. Pause
-//!					3. Stop
-//!					4. Continue play. Checking that play continues correctly.
-//! @SYMTestExpectedResults		Audio does not continue from paused position. Audio is restarted
-//!
-PRINT Play-Pause-Stop-Play
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-0185-HP c:\audio.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID			MM-MMF-ACLNT-I-0186-HP
-//! @SYMTestCaseDec			Change configuration while in Pause
-//! @SYMTestPriority			High
-//! @SYMTestType			Alternative usecase
-//! @SYMREQ				REQ11462
-//!					REQ11459
-//!					REQ11460
-//! @SYMPREQ				1540
-//! @SYMTestActions: 
-//!					1. Play preloaded audio
-//!					2. Pause playback
-//!					3. Change volume and balance to values different from default.
-//!					4. Resume playback
-//!					5. Check the values have been changed
-//! @SYMTestExpectedResults:		Volume and balance can be changed in paused state. Changed values are maintained after resume
-//!
-PRINT Change configuration while in Pause
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-0186-HP c:\audio.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID			MM-MMF-ACLNT-I-0187-HP
-//! @SYMTestCaseDec			Pause play and continue play (sqn).
-//! @SYMTestPriority			High
-//! @SYMTestType			Normal usecase
-//! @SYMREQ				REQ11461
-//! @SYMPREQ				1540
-//! @SYMTestActions
-//!					1. Play preloaded audio
-//!					2. Pause
-//!					3. Continue play. Checking that play continues correctly.
-//! @SYMTestExpectedResults		Audio continues from paused position.
-//!					
-PRINT Pause play and continue play (sqn).
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-0187-HP c:\audio.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID			MM-MMF-ACLNT-I-0188-HP
-//! @SYMTestCaseDec			Pause play and continue play three times (sqn)
-//! @SYMTestPriority			High
-//! @SYMTestType			Normal usecase
-//! @SYMREQ				REQ11461
-//! @SYMPREQ				1540
-//! @SYMTestActions: 
-//!					1. Play preloaded audio
-//!					2. Pause
-//!					3. Continue play
-//!					4. Repeat steps 2-3 two more times
-//! @SYMTestExpectedResults		Audio continues from paused position.
-//!					
-PRINT Pause play and continue play three times (sqn)
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-0188-HP c:\audio.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID			MM-MMF-ACLNT-I-0189-HP
-//! @SYMTestCaseDec			Play-Pause-Stop-Play (sqn)
-//! @SYMTestPriority			High
-//! @SYMTestType			Normal usecase
-//! @SYMREQ				REQ11461
-//! @SYMPREQ				1540
-//! @SYMTestActions 
-//!					1. Play preloaded audio
-//!					2. Pause
-//!					3. Stop
-//!					4. Continue play. Checking that play continues correctly.
-//! @SYMTestExpectedResults		Audio does not continue from paused position.
-//!					
-PRINT Play-Pause-Stop-Play (sqn)
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-0189-HP c:\audio.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID			MM-MMF-ACLNT-I-0190-HP
-//! @SYMTestCaseDec			Change configuration while in Pause (sqn)
-//! @SYMTestPriority			High
-//! @SYMTestType			Alternative usecase
-//! @SYMREQ				REQ11461
-//! @SYMPREQ				1540
-//! @SYMTestActions
-//!					1. Play preloaded audio
-//!					2. Pause playback
-//!					3. Change volume and balance to values different from default.
-//!					4. Resume playback
-//!					5. Check the values have been changed
-//! @SYMTestExpectedResults		Volume and balance can be changed in paused state. Changed values are maintained after resume
-//!
-PRINT Change configuration while in Pause (sqn)
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-0190-HP c:\audio.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID			MM-MMF-ACLNT-I-0191-HP
-//! @SYMTestCaseDec			Pause play and continue play using different codecs.
-//! @SYMTestPriority			High
-//! @SYMTestType			Alternative usecase
-//! @SYMREQ				REQ11461
-//! @SYMPREQ				1540
-//! @SYMTestActions
-//!					1. Play preloaded audio
-//!					2. Pause
-//!					3. Continue play. Checking that play continues correctly.
-//!					4. Repeat this with all supported formats
-//! @SYMTestExpectedResults		Audio continues from paused position for each format
-//!				
-PRINT Pause play and continue play using different codecs.
-RUN_TEST_STEP 120000, ACLNT, MM-MMF-ACLNT-I-0191-HP c:\audio.ini
-TEST_COMPLETE
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/tsi_mmf_aclnt_03_nona3f.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-LOAD_SUITE TSI_MMFACLNT.DLL
-#PAUSE_AT_END
-
-# wait for ring.wav to finish playing
-delay 5000
-
-#True Pause
-//! @SYMTestCaseID			MM-MMF-ACLNT-I-0183-HP
-//! @SYMTestCaseDesc			Negative: Pause play in non-a3f mode
-//! @SYMTestPriority			High
-//! @SYMTestType			Alternative usecase
-//! @SYMREQ 				REQ11461
-//!					REQ11462
-//! @SYMPREQ				1540
-//! @SYMTestActions 			1. Call PrepareToPlayFileSequence
-//!                                     2. Play tone
-//!                                     3. Call Pause
-//!                                     4. Call Resume
-//!                                     5. Wait for MMdaAudioToneObserver::MatoPrepareComplete(TInt) indicating playback has finished
-//! @SYMTestExpectedResults 		Pause will return KErrNotSupported. Resume will return KErrNotSupported. MMdaAudioToneObserver::MatoPlayComplete(TInt) will be received after Pause without calling play again
-//! 
-PRINT Negative: Pause play in non-a3f mode
-RUN_TEST_STEP 180000,ACLNT, MM-MMF-ACLNT-I-0183-HP  \audio.ini
-TEST_COMPLETE
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/tsi_mmf_aclnt_03_truepause.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,145 +0,0 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-LOAD_SUITE TSI_MMFACLNT.DLL
-#PAUSE_AT_END
-
-# wait for ring.wav to finish playing
-delay 5000
-
-#True Pause
-//! @SYMTestCaseID			MM-MMF-ACLNT-I-0168-HP
-//! @SYMTestCaseDesc			Positive: Pause play and continue play (file sequence).
-//! @SYMTestPriority			High
-//! @SYMTestType			Normal usecase
-//! @SYMREQ 				REQ11461
-//!					REQ11462
-//! @SYMPREQ				1540
-//! @SYMTestActions 			1.	Play preloaded audio
-//! 					2.	After two seconds Pause playback
-//! 					3.	After two seconds continue playing.
-//! @SYMTestExpectedResults 	Audio continues from paused position. Pause returns with KErrNone. Resume returns with KErrNone.
-//! 
-PRINT Positive: Pause play and continue play (file sequence).
-RUN_TEST_STEP 180000,ACLNT, MM-MMF-ACLNT-I-0168-HP  \audio.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID			MM-MMF-ACLNT-I-0169-HP
-//! @SYMTestCaseDesc			Positive: Pause play and continue play three times (file sequence)
-//! @SYMTestPriority			High
-//! @SYMTestType			Normal usecase
-//! @SYMREQ 				REQ11461
-//!					REQ11462
-//! @SYMPREQ				1540
-//! @SYMTestActions 			1.	Play preloaded audio
-//! 					2.	After two seconds Pause playback
-//! 					3.	After two seconds continue playing.
-//!					4.	Repeat steps 2 and 3 two more times
-//! @SYMTestExpectedResults 	Audio continues from paused position each time. Pause returns with KErrNone. Resume returns with KErrNone.
-//! 
-PRINT Positive: Pause play and continue play three times (file sequence)
-RUN_TEST_STEP 180000,ACLNT, MM-MMF-ACLNT-I-0169-HP  \audio.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID			MM-MMF-ACLNT-I-0170-HP
-//! @SYMTestCaseDesc			Positive: Play-Pause-CancelPlay-Play
-//! @SYMTestPriority			High
-//! @SYMTestType			Normal usecase
-//! @SYMREQ 				REQ11461
-//!					REQ11462
-//! @SYMPREQ				1540
-//! @SYMTestActions 			1.	Play preloaded audio
-//! 					2.	After two seconds Pause playback
-//! 					3.	After two seconds stop playing (CancelPlay).
-//!					4.	Resume playback
-//! @SYMTestExpectedResults 	Audio does not continue from paused position. Playback is restarted. Pause returns KErrNotReady while stopped
-//! 
-PRINT Positive: Play-Pause-CancelPlay-Play
-RUN_TEST_STEP 180000,ACLNT, MM-MMF-ACLNT-I-0170-HP  \audio.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID			MM-MMF-ACLNT-I-0171-HP
-//! @SYMTestCaseDesc			Positive: Change configuration while in Pause (file sequence)
-//! @SYMTestPriority			High
-//! @SYMTestType			Alternative usecase
-//! @SYMREQ 				REQ11461
-//!					REQ11462
-//! @SYMPREQ				1540
-//! @SYMTestActions 			1. Play preloaded audio
-//! 					2. Pause playback
-//! 					3. Change volume and balance to values different from default.
-//! 					4. Resume playback
-//! 					5. Check the values have been changed
-//! @SYMTestExpectedResults 	Volume and balance can be changed in paused state. Changed values are maintained after resume
-//!                        	Audio continues from paused position. Pause returns with KErrNone. Resume returns with KErrNone.
-//! 
-PRINT Positive: Change configuration while in Pause (file sequence)
-RUN_TEST_STEP 180000,ACLNT, MM-MMF-ACLNT-I-0171-HP  \audio.ini
-TEST_COMPLETE
-
-#Test removed from script. This scenario is no longer valid
-//! @SYMTestCaseID			MM-MMF-ACLNT-I-0172-HP
-//! @SYMTestCaseDesc			Negative: Call PrepareToPlayFileSequence while in Pause
-//! @SYMTestPriority			High
-//! @SYMTestType			Alternative usecase
-//! @SYMREQ 				REQ11461
-//!					REQ11462
-//! @SYMPREQ				1540
-//! @SYMTestActions 			1. Play preloaded audio
-//! 					2. Pause playback
-//! 					3. Call PrepareToPlayFileSequence
-//! 					4. Wait for MMdaAudioToneObserver::MatoPrepareComplete(TInt)
-//! 					5. Resume playback
-//! @SYMTestExpectedResults 	MMdaAudioToneObserver::MatoPrepareComplete(TInt) should return with KErrNone. 
-//!                        	Playback will be restarted from the beginning
-//! 
-//PRINT Negative: Call PrepareToPlayFileSequence while in Pause
-//RUN_TEST_STEP 180000,ACLNT, MM-MMF-ACLNT-I-0172-HP  \audio.ini
-//TEST_COMPLETE
-
-//! @SYMTestCaseID			MM-MMF-ACLNT-I-0173-HP
-//! @SYMTestCaseDesc			Negative: Call Pause before Play
-//! @SYMTestPriority			High
-//! @SYMTestType			Exception usecase
-//! @SYMREQ 				REQ11461
-//!					REQ11462
-//! @SYMPREQ				1540
-//! @SYMTestActions 			1.Create a CMdaAudioToneUtility object
-//! 					2. Call Pause
-//! 					3. Call PrepareToPlayFileSequence
-//! 					4. Call Pause
-//! @SYMTestExpectedResults 	CMdaAudioToneUtility::Pause() returns with KErrNotReady
-//! 
-PRINT MM-MMF-ACLNT-I-0173-HP
-RUN_TEST_STEP 180000,ACLNT, MM-MMF-ACLNT-I-0173-HP  \audio.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID			MM-MMF-ACLNT-I-0174-HP
-//! @SYMTestCaseDesc			Negative: Pause play while not playing a file sequence
-//! @SYMTestPriority			High
-//! @SYMTestType			Alternative usecase
-//! @SYMREQ 				REQ11461
-//!					REQ11462
-//! @SYMPREQ				1540
-//! @SYMTestActions 			1. Call PrepareToPlayDTMFString
-//! 					2. Play tone
-//! 					3. Call Pause
-//! 					4. Wait for MMdaAudioToneObserver::MatoPrepareComplete(TInt) indicating playback has finished
-//! 					5. Repeat steps 1-4 for remaining tone formats (Tone, DualTone, FixedSequence)
-//! @SYMTestExpectedResults 	CMdaAudioToneUtility::Pause() will return KErrNotSupported. MMdaAudioToneObserver::MatoPlayComplete(TInt) will be received after Pause without calling play again
-//! 
-PRINT Negative: Pause play while not playing a file sequence
-RUN_TEST_STEP 180000,ACLNT, MM-MMF-ACLNT-I-0174-HP  \audio.ini
-TEST_COMPLETE
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/video.ini	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-[SectionOne]
-sectionNum = 1
-filename = c:\VclntITestData\LongVideo.dummy
-corruptFile = c:\VclntITestData\VideoCorrupt.dummy
-NoCodecFile = c:\VclntITestData\VideoNoCodec.dummy
-textFile = c:\VclntITestData\textInput.dummy
-
-[SectionTwo]
-sectionNum = 2
-filename = c:\VclntITestData\LongVideo.dummy
-unsupported = c:\VclntITestData\VideoUnsupported.dummy
-textFile = c:\VclntITestData\textOutput.dummy
-
-[SectionDRM]
-VideoContent = c:\VclntITestData\Video.content
-VideoContentNoRights = c:\VclntITestData\VideoContentNoRights.content
-
-;Deprecated - Phase 1
-filename = c:\VclntITestData\LongVideo.dummy
-DRMFile = c:\VclntITestData\DRMVideo.drm
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/group/bld.inf	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -13,12 +13,13 @@
 // Description:
 //
 
-PRJ_MMPFILES
+PRJ_TESTMMPFILES
 ../mmpfiles/tsi_mmf_vclntavi.mmp
 
-PRJ_EXPORTS
+PRJ_TESTEXPORTS
 // iby
 ../group/tsi_mmf_vclntavi.iby           /epoc32/rom/include/tsi_mmf_vclntavi.iby
+../group/tsi_mmf_vclntavi_excl_test.iby           /epoc32/rom/include/tsi_mmf_vclntavi_excl_test.iby
 
 // ini
 ../scripts/video_avi.ini                c:/vclntavi/video_avi.ini
@@ -58,6 +59,12 @@
 ../scripts/tsi_mmf_vclntavi_subtitles_urel.script c:/vclntavi/tsi_mmf_vclntavi_subtitles_urel.script
 #endif //SYMBIAN_MULTIMEDIA_SUBTITLE_SUPPORT
 
+// SecureDRM scripts
+../scripts/securedrm_video.ini				c:/securedrm_video.ini
+../scripts/securedrm_video_testdata.ini			c:/securedrm_video_testdata.ini
+../scripts/TSI_MMF_SECUREDRM_VIDEO_TESTDATA.script	c:/tsi_mmf_securedrm_video_testdata.script
+../scripts/TSI_MMF_SECUREDRM_VIDEO_MMDDCAP.script	c:/tsi_mmf_securedrm_video_mmddcap.script
+
 // test data files
 ../data/longvideo.avi       c:/vclntavi/longvideo.avi
 ../data/shortvideo.avi      c:/vclntavi/shortvideo.avi
@@ -81,4 +88,9 @@
 ../data/xvid_subtitle.srt         c:/vclntavi/xvid_subtitle.srt
 #endif //SYMBIAN_MULTIMEDIA_SUBTITLE_SUPPORT
 
+// SecureDRM test data
+../data/SecureDRM/videocontent2.xml	c:/securedrm/videocontent2.xml
+../data/SecureDRM/videorights2.xml	c:/securedrm/videorights2.xml
+../data/SecureDRM/xvidonly.avi		c:/securedrm/xvidonly.avi
+
 #include "../bctest/aviplaycontroller/group/bld.inf"
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/group/tsi_mmf_vclntavi.iby	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/group/tsi_mmf_vclntavi.iby	Fri Jul 09 12:23:13 2010 +0100
@@ -15,21 +15,15 @@
 
 #ifndef TSI_MMF_VCLNTAVI_IBY
 #define TSI_MMF_VCLNTAVI_IBY
-
-// debug build
-
-file=ABI_DIR\BUILD_DIR\tsi_mmf_vclntavi.dll 	System\Libs\tsi_mmf_vclntavi.dll
+#include <tsi_mmf_vclntavi_excl_test.iby>
 
-// include regardless if using gce or not
-#ifndef SAMPLEGRAPHICSURFACE_DLL
-file=ABI_DIR\BUILD_DIR\samplegraphicsurface.dll sys\bin\samplegraphicsurface.dll
-ECOM_PLUGIN(10285C4A.dll, 10285C4A.rsc)
-#define SAMPLEGRAPHICSURFACE_DLL
-#endif // SAMPLEGRAPHICSURFACE_DLL
+
 
 
 //ini
 data=EPOCROOT##epoc32\data\c\vclntavi\video_avi.ini             \vclntavi\video_avi.ini
+data=EPOCROOT##epoc32\data\c\securedrm_video_testdata.ini             \securedrm_video_testdata.ini
+data=EPOCROOT##epoc32\data\c\securedrm_video.ini                \securedrm_video.ini
 
 //scripts
 #ifdef SYMBIAN_VARIABLE_BITRATE_CODEC
@@ -62,9 +56,10 @@
 data=EPOCROOT##epoc32\data\c\vclntavi\tsi_mmf_vclntavi_alloc_bc.script      \vclntavi\tsi_mmf_vclntavi_alloc_bc.script
 data=EPOCROOT##epoc32\data\c\vclntavi\tsi_mmf_vclntavi_apr_bc.script       	\vclntavi\tsi_mmf_vclntavi_apr_bc.script
 data=EPOCROOT##epoc32\data\c\vclntavi\tsi_mmf_vclntavi_apr_alloc_bc.script  \vclntavi\tsi_mmf_vclntavi_apr_alloc_bc.script
+data=EPOCROOT##epoc32\data\c\vclntavi\tsi_mmf_vclntavi_play_secdisp_bc.script  \vclntavi\tsi_mmf_vclntavi_play_secdisp_bc.script
 
 // Old BC controller
-#include <vclntavi.iby>
+
 #else
 // Do not run this test unless you've compiled MMF with #define SYMBIAN_BUILD_GCE
 data=EPOCROOT##epoc32\data\c\vclntavi\tsi_mmf_vclntavi_surf_noGCE.script      \vclntavi\tsi_mmf_vclntavi_surf_noGCE.script
@@ -77,6 +72,11 @@
 data=EPOCROOT##epoc32\data\c\vclntavi\tsi_mmf_vclntavi_subtitles_alloc.script \vclntavi\tsi_mmf_vclntavi_subtitles_alloc.script
 #endif //SYMBIAN_MULTIMEDIA_SUBTITLE_SUPPORT
 
+// Scripts for SecureDRM
+data=EPOCROOT##epoc32\data\c\tsi_mmf_securedrm_video_testdata.script   	\tsi_mmf_securedrm_video_testdata.script
+data=EPOCROOT##epoc32\data\c\tsi_mmf_securedrm_video_mmddcap.script 	\tsi_mmf_securedrm_video_mmddcap.script
+
+
 //data files
 //exported using copydatatocf.bat and usbldr.pm, so removed from iby file
 
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/mmpfiles/tsi_mmf_vclntavi.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/mmpfiles/tsi_mmf_vclntavi.mmp	Fri Jul 09 12:23:13 2010 +0100
@@ -40,7 +40,7 @@
 SOURCE        testvideoplayer_subtitles.cpp
 #endif //SYMBIAN_MULTIMEDIA_SUBTITLE_SUPPORT
 
-USERINCLUDE   ../src
+USERINCLUDE   ../inc
 
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/scripts/tsi_mmf_vclntavi_alloc.script	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/scripts/tsi_mmf_vclntavi_alloc.script	Fri Jul 09 12:23:13 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/src/graphicsurface.h	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,198 +0,0 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Reference sample client-side "provider" interface CWsGraphic plugin using GCE Surfaces
-// Copied from common/generic/graphics/wserv/nga/samplegraphicsurfacedrawer
-// if the CRP tests suddenly starts to break or fail to build it might be due to this file has changed in CBR
-// 
-//
-
-#ifndef __GRAPHICSURFACE_H__
-#define __GRAPHICSURFACE_H__
-
-#include <w32std.h>
-#include <w32stdgraphic.h>
-#include <graphics/surface.h>
-#include <graphics/surfaceconfiguration.h>
-
-enum TDrawWsGraphicArgumentFlags
-	{
-	EDrawWsAllScreens							=0x00000001,
-	EDrawWsTSurfaceIdIgnored 					=0x00000002,	//<Indicates that the client should NOT supply
-	EDrawWsNotifyProviderTSurfaceIdChanged		=0x00000100,
-	EDrawWsNotifyProviderConfigChanged			=0x00000200,
-	EDrawWsNotifyProviderPlayControlsChanged	=0x00000400,
-	EDrawWsNotifyProviderSurfaceUnreferenced	=0x00000800,
-	EDrawWsNotifyProviderConfigRereferenced		=0x00001000,	//<Triggers a one-shot config notification when drawn after an unreference
-	EDrawWsNotifyProviderConfigNextReref		=0x00002000,	//<Automatic one-shot set after unreferenced if 
-	EDrawWsNotifyError							=0x00010000,
-	EDrawWsNotifyProviderAll					=0x000FFF00,
-	EDrawWsUpdateTSurfaceId						=0x00100000,
-	EDrawWsUpdateConfiguration					=0x00200000,
-	EDrawWsUpdatePlayerControls					=0x00400000,
-	EDrawWsUpdateAll							=0x0FF00000,
-	};
-
-//KUidGraphicMsgSurface=  0x10285C57 	  To    0x10285C5B
-class TWsSurfaceConfiguration: public TWsGraphicMsgFixedBase
-/** data attached to a CWindowGc::DrawWsGraphic to allow the artwork to understand surface configuration commands.
-Also use to notify owner client of config change.
-
-@publishedAll
-@released
-*/	{
-public:
-	enum
-		{
-		ETypeId = 0x10285C57
-		};
-		TWsSurfaceConfiguration()
-		:	TWsGraphicMsgFixedBase(TUid::Uid(ETypeId),sizeof(*this))
-		{	}
-		TWsSurfaceConfiguration(const TSurfaceConfiguration& aConfig)
-		:	TWsGraphicMsgFixedBase(TUid::Uid(ETypeId),sizeof(*this)),
-			iConfig(aConfig)
-			
-		{	}
-	TSurfaceConfiguration iConfig;
-	};
-
-class TWsDebugResultCode: public TWsGraphicMsgFixedBase
-/** Data attached to a message to the artwork provider notifying it of a command result code
-This code is always followed by the command that caused it (TSurfaceConfig)
-*/
-	{
-public:
-	enum
-		{
-		ETypeId = 0x10285C5A
-		};
-	TWsDebugResultCode():	TWsGraphicMsgFixedBase(TUid::Uid(ETypeId),sizeof(*this))
-		{	}
-	TInt iResult;
-	TInt iExtra;
-	TInt iLineNum;
-	};
-
-
-class TWsSurfaceUnreferenced: public TWsGraphicMsgFixedBase
-/** data attached to a message to the artwork provider to allow it to react if a surface is no longer drawn
-play-stop-pause commands.
-
-@publishedAll
-@released
-*/	{
-public:
-	enum
-		{
-		ETypeId = 0x10285C58
-		};
-	TWsSurfaceUnreferenced():	TWsGraphicMsgFixedBase(TUid::Uid(ETypeId),sizeof(*this))
-		{	}
-	TSurfaceId iId;
-	};
-class CWsGraphicDrawerSurface;
-class TWsDebugResultCode;
-class CWsGraphicSurface: public CWsGraphic
-/** Client representation of a window-server-side CFbsBitmap owned by this Client
-
-@publishedAll
-@released
-*/
-	{
-	friend class CWsGraphicDrawerSurface;
-public:
-	IMPORT_C static CWsGraphicSurface* NewL(const TSurfaceConfiguration& aSurface, TUint aDrawWsGraphicArgumentFlags, const TArray<TUint>*  aScreensMap=NULL);
-	IMPORT_C static CWsGraphicSurface* NewL(TUid aUid,const TSurfaceConfiguration& aSurface, TUint aDrawWsGraphicArgumentFlags, const TArray<TUint>*  aScreensMap=NULL);
-	IMPORT_C static CWsGraphicSurface* NewL(const TWsGraphicId& aReplace,const TSurfaceConfiguration& aSurface, TUint aDrawWsGraphicArgumentFlags, const TArray<TUint>*  aScreensMap=NULL);
-	IMPORT_C  void ConstructL(const TSurfaceConfiguration& aSurface, TUint aDrawWsGraphicArgumentFlags, const TArray<TUint>*  aScreensMap=NULL);
-	IMPORT_C  void ConstructL(TUid aUid,const TSurfaceConfiguration& aSurface, TUint aDrawWsGraphicArgumentFlags, const TArray<TUint>*  aScreensMap=NULL);
-	IMPORT_C  void ConstructL(const TWsGraphicId& aReplace,const TSurfaceConfiguration& aSurface, TUint aDrawWsGraphicArgumentFlags, const TArray<TUint>*  aScreensMap=NULL);
-	IMPORT_C ~CWsGraphicSurface();
-protected: 
-	IMPORT_C TInt ShareGlobally();
-	IMPORT_C TInt UnShareGlobally();
-	IMPORT_C TInt Share(TSecureId aClientId);
-	IMPORT_C TInt UnShare(TSecureId aClientId);
-	IMPORT_C TInt SendMessage(const TSurfaceConfiguration&);
-	IMPORT_C TInt SendMessage(const TWsGraphicAnimation&);
-
-	virtual void HandleMessage(const TSurfaceConfiguration&)		{}
-	virtual void HandleMessage(const TWsGraphicAnimation&)			{}
-	virtual void HandleMessage(const TWsSurfaceUnreferenced&)		{}
-	virtual void HandleMessage(const TWsDebugResultCode&)		{}
-	virtual void HandleOtherMessage(const TWsGraphicMsgFixedBase&)	{}
-	IMPORT_C virtual TInt CWsGraphicSurface_Reserved1();
-	IMPORT_C virtual TInt CWsGraphicSurface_Reserved2();
-	IMPORT_C virtual TInt CWsGraphicSurface_Reserved3();
-protected:
-	class TConstructParams;
-	IMPORT_C TConstructParams* MakeParamsLC(const TSurfaceConfiguration& aSurface, TUint aDrawWsGraphicArgumentFlags, const TArray<TUint>*  aScreensMap=NULL);
-	IMPORT_C CWsGraphicSurface();		//Derivers should implement NewL to call ConstructL
-	IMPORT_C void RegisterScreens(const TSurfaceConfiguration& aSurface,const TArray<TUint>*  aScreensMap=NULL);
-	IMPORT_C void UnRegisterScreens();
-private:
-	void HandleMessage(const TDesC8& aData);
-	void OnReplace();
-
-private: //data
-	TSurfaceId		iRegisteredId;
-	RArray<TUint>	iRegisteredScreens;
-	};
-
-/** Used as the parameter payload to construct the drawer
-*/
-class CWsGraphicSurface::TConstructParams
-	{
-public:
-	TInt Size()
-		{	return iParamFlags.Size()+iConfig.Size()+2*sizeof(TWsGraphicMsgFixedBase);	}
-	void* operator new(TUint size,TInt aNumExtras)
-		{
-		return ::operator new(size+((aNumExtras>=0)?aNumExtras*sizeof(TInt):0));
-		}
-	void operator delete(void* aObj,TInt /*aNumExtras*/)
-		{
-		::operator delete(aObj);
-		}
-	void operator delete(void* aObj)
-		{
-		::operator delete(aObj);
-		}
-	TWsSurfaceConfiguration iConfig;
-	class TParamFlags:public TWsGraphicMsgFixedBase
-		{
-		public:
-		enum
-			{
-			ETypeId = 0x10285C59
-			};
-
-		TParamFlags(): TWsGraphicMsgFixedBase(TUid::Uid(ETypeId),sizeof(*this))
-			{}
-		TParamFlags(TInt aNumExtras): TWsGraphicMsgFixedBase(TUid::Uid(ETypeId),sizeof(*this)+aNumExtras*sizeof(TInt))
-			{}
-		TUint iDrawWsGraphicArgumentFlags;
-		TUint iScreensMap[1];	//THIS MUST BE THE LAST FIELD!!!
-		} iParamFlags;
-	TConstructParams()	
-	{	}
-	TConstructParams(const TSurfaceConfiguration& aConfig,TInt aNumExtras=0)
-	:	iConfig(aConfig),iParamFlags(aNumExtras)
-	{	}
-	TCleanupItem	CleanupItem()	{ return TCleanupItem(Cleanup,this);	}
-	static void Cleanup(void* p)	{	delete(TConstructParams*)p;	}	
-	};
-
-#endif //__GRAPHICSURFACE_H__
-
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/src/teststepvclnt2crp.h	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-#ifndef TESTSTEPVCLNT2CRP_H
-#define TESTSTEPVCLNT2CRP_H
-
-#include <surfaceeventhandler.h>
-#include <graphics/surface.h>
-
-#include "testvideoplayer2.h"
-
-class RTestStepVclnt2CRP : 
-	public RTestVclnt2PlayFile,
-	public MMMFSurfaceEventHandler
-	{
-public:
-	static RTestStepVclnt2CRP* NewL(const TDesC& aName);
-	~RTestStepVclnt2CRP();
-
-	// MMMFSurfaceEventHandler
-	void MmsehSurfaceCreated(TInt aDisplayId, const TSurfaceId& aId, const TRect& aCropRect, TVideoAspectRatio aAspectRatio);
-	void MmsehSurfaceParametersChanged(const TSurfaceId& aId, const TRect& aCropRect, TVideoAspectRatio aAspectRatio);
-	void MmsehRemoveSurface(const TSurfaceId& aId);
-
-protected:
-	TVerdict DoTestStepPreambleL();
-	TVerdict DoTestStepPostambleL();
-
-	virtual void HandleOpenCompleteL();
-
-private:
-	RTestStepVclnt2CRP(const TDesC& aName);
-
-	void FailTest(const TDesC& aMessage);
-
-private:
-	TBool iUseCRP;
-	TBool iAddDisplay;
-	TBool iAddWindow;
-	TSurfaceId iSurfaceId;
-	TRect iCropRect;
-	RWindow* iSurfaceWindow;
-	};
-
-#endif // TESTSTEPVCLNT2CRP_H
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/src/testvideoplayer.h	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,542 +0,0 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Header file: Video Player Tests.
-// 
-//
-
-#ifndef __TESTVIDEOPLAYER_H__
-#define __TESTVIDEOPLAYER_H__
-
-#include "tsi_mmf_vclntavi_stepbase.h"
-#include "u32hal.h"
-#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
-#include <mmf/common/mmfvideoenums.h>
-#endif
-
-
-/**
- * Load and initialise a video file.
- *
- * RTestVclntPlayAviFile
- *
- */
-class RTestVclntPlayAviFile : public RTestVclntAviPlayerStep
-    {
-public:
-    RTestVclntPlayAviFile(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError, const TBool aPlay);
-    static RTestVclntPlayAviFile* NewL(const TDesC& aTestName,const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError, const TBool aPlay);
-    static RTestVclntPlayAviFile* NewLC(const TDesC& aTestName,const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError, const TBool aPlay);
-    virtual TVerdict DoTestStepL();
-    virtual TVerdict DoTestL(CVideoPlayerUtility* aVideo);
-    virtual void FsmL(TVclntTestPlayEvents aEventCode);
-    virtual TVerdict SetCacheSize();
-protected:
-    const TBool iPlay;
-    TTimeIntervalMicroSeconds iDuration;
-    };
-
-
-/**
- * Load and initialise an video descriptor.
- *
- * RTestVclntPlayAviDes
- *
- */
-class RTestVclntPlayAviDes : public RTestVclntAviPlayerStep
-    {
-public:
-    RTestVclntPlayAviDes(const TDesC& aTestName,const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError,const TBool aPlay) ;
-    static RTestVclntPlayAviDes* NewL(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError,const TBool aPlay);
-    static RTestVclntPlayAviDes* NewLC(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError,const TBool aPlay);
-    virtual TVerdict DoTestStepL();
-    virtual TVerdict DoTestStepPreambleL();
-    virtual TVerdict DoTestStepPostambleL();
-    virtual TVerdict DoTestL(CVideoPlayerUtility* aPlayer);
-    virtual void FsmL(TVclntTestPlayEvents aEventCode);
-protected:
-    HBufC8* iVideo;                        // Buffer for holding video descriptor data
-    TTimeIntervalMicroSeconds iDuration;// Stores duration of video
-    const TBool iPlay;                    // Does this test require playing the video
-    } ;
-
-/**
- * Open video from a URL and play.
- *
- * RTestVclntPlayAviUrl
- *
- */
- 
-class RTestVclntPlayAviUrl : public RTestVclntAviPlayerStep
-    {
-public:
-    RTestVclntPlayAviUrl(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError, const TBool aPlay);
-    static RTestVclntPlayAviUrl* NewL(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError, const TBool aPlay);
-    static RTestVclntPlayAviUrl* NewLC(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError, const TBool aPlay);
-    virtual TVerdict DoTestStepL();
-    virtual TVerdict DoTestL(CVideoPlayerUtility* aPlayer);
-    virtual void FsmL(TVclntTestPlayEvents aEventCode);
-protected:
-    TTimeIntervalMicroSeconds iDuration;// Stores duration of video
-    const TBool iPlay;                    // Does this test require playing the video
-    };
-
-/**
- * Set and enquire framerate
- *
- * RTestVclntEnqFrameRate
- *
- */
-class RTestVclntEnqFrameRate : public RTestVclntPlayAviFile
-    {
-public:
-    static RTestVclntEnqFrameRate* NewL(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError, const TInt aFrameRate);
-    virtual TVerdict DoTestL(CVideoPlayerUtility* aPlayer);
-
-private:
-    RTestVclntEnqFrameRate(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError, const TInt aFrameRate);
-
-private:
-    TReal32 iFrameRate;
-    };
-
-
-/**
- * set position and play form this position.
- * 
- * RTestVclntPosition
- *
- */
-class RTestVclntPosition : public RTestVclntPlayAviFile
-    {
-public:
-    static RTestVclntPosition* NewL(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError, const TTimeIntervalMicroSeconds aPosition);
-    virtual TVerdict DoTestL(CVideoPlayerUtility* aPlayer);
-private:
-    RTestVclntPosition(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError, const TTimeIntervalMicroSeconds aPosition);
-
-private:
-    TTimeIntervalMicroSeconds iPosition;
-    };
-
-/**
- * Video priority
- * 
- * RTestVclntPriority
- *
- */
-class RTestVclntPriority : public RTestVclntPlayAviFile
-    {
-public:
-    static RTestVclntPriority* NewL(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError, const TInt aPriority);
-    virtual TVerdict DoTestL(CVideoPlayerUtility* aPlayer);
-private:
-    RTestVclntPriority(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError, const TInt aPriority);
-
-private:
-    TInt iPriority;
-    };
-
-
-/**
- * Video duration
- * 
- * RTestVclntDuration
- *
- */
-class RTestVclntDuration : public RTestVclntPlayAviFile
-    {
-public:
-    static RTestVclntDuration* NewL(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError, const TTimeIntervalMicroSeconds aDuration);
-    virtual TVerdict DoTestL(CVideoPlayerUtility* aPlayer);
-    virtual TVerdict SetCacheSize();
-private:
-    RTestVclntDuration(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError, const TTimeIntervalMicroSeconds aDuration);
-    SVMCacheInfo iCurrentCacheSize;
-    TVerdict CheckCacheError(TInt aError);
-    };
-
-
-/**
- * Video Volume
- * 
- * RTestVclntVolume
- *
- */
-class RTestVclntVolume : public RTestVclntPlayAviFile
-    {
-public:
-    static RTestVclntVolume* NewL(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError, const TInt aVolume);
-    virtual TVerdict DoTestL(CVideoPlayerUtility* aPlayer);
-private:
-    RTestVclntVolume(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError, const TInt aVolume);
-
-private:
-    TInt iVolume;
-    };
-
-
-/**
- * Video open, close and then open again.
- * 
- * RTestVclntCloseOpen
- *
- */
-class RTestVclntCloseOpen : public RTestVclntPlayAviFile
-    {
-public:
-    static RTestVclntCloseOpen* NewL(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    virtual TVerdict DoTestStepL();
-    virtual void FsmL(TVclntTestPlayEvents aEventCode);
-private:
-    RTestVclntCloseOpen(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    TInt iOpenCount;
-    };
-
-
-
-/**
- * Video pause.
- * 
- * RTestVclntPause
- *
- */
-class RTestVclntPause : public RTestVclntPlayAviFile
-    {
-public:
-    static RTestVclntPause* NewL(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    virtual TVerdict DoTestStepL();
-    virtual void FsmL(TVclntTestPlayEvents aEventCode);
-private:
-    RTestVclntPause(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    TUint iPlayerDuration;
-    TUint iActualDuration;
-    };
-
-
-/**
- * Video pause.
- * 
- * RTestVclntBalance
- *
- */
-class RTestVclntBalance : public RTestVclntPlayAviFile
-    {
-public:
-    static RTestVclntBalance* NewL(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError, const TInt aBalance);
-    virtual TVerdict DoTestL(CVideoPlayerUtility* aPlayer);
-private:
-    RTestVclntBalance(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError, const TInt aBalance);
-
-private:
-    TInt iBalance;
-    };
-
-
-
-/**
- * Video set play window and delete play window.
- * 
- * RTestVclntPlayWindow
- *
- */
-class RTestVclntPlayWindow : public RTestVclntPlayAviFile
-    {
-public:
-    static RTestVclntPlayWindow* NewL(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError, const TTimeIntervalMicroSeconds aStart, const TTimeIntervalMicroSeconds aEnd);
-    virtual TVerdict DoTestL(CVideoPlayerUtility* aPlayer);
-private:
-    RTestVclntPlayWindow(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError, const TTimeIntervalMicroSeconds aStart, const TTimeIntervalMicroSeconds aEnd);
-
-private:
-    TTimeIntervalMicroSeconds iStart;
-    TTimeIntervalMicroSeconds iEnd;
-    };
-
-
-/**
- * Video get meta data.
- * 
- * RTestVclntMeta
- *
- */
-class RTestVclntMeta : public RTestVclntPlayAviFile
-    {
-public:
-    static RTestVclntMeta* NewL(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    virtual TVerdict DoTestL(CVideoPlayerUtility* aPlayer);
-private:
-    RTestVclntMeta(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-
-private:
-    TTimeIntervalMicroSeconds iStart;
-    TTimeIntervalMicroSeconds iEnd;
-    };
-
-
-/**
- * Video get framesize.
- * 
- * RTestVclntFrameSize
- *
- */
-class RTestVclntFrameSize : public RTestVclntPlayAviFile
-    {
-public:
-    static RTestVclntFrameSize* NewL(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    virtual TVerdict DoTestL(CVideoPlayerUtility* aPlayer);
-private:
-    RTestVclntFrameSize(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-private:
-    TSize iFrameSize;
-    };
-
-
-/**
- * Video get mime type.
- * 
- * RTestVclntMimeType
- *
- */
-class RTestVclntMimeType : public RTestVclntPlayAviFile
-    {
-public:
-    static RTestVclntMimeType* NewL(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-    virtual TVerdict DoTestL(CVideoPlayerUtility* aPlayer);
-private:
-    RTestVclntMimeType(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    };
-
-
-/**
- * Video player scale values test.
- * 
- * RTestVclntScale
- *
- */
-class RTestVclntScale : public RTestVclntPlayAviFile
-    {
-public:
-    static RTestVclntScale* NewL(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-    virtual TVerdict DoTestL(CVideoPlayerUtility* aPlayer);
-private:
-    RTestVclntScale(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    };
-    
-/**
- * Crop test for video
- * 
- * RTestVclntCrop
- *
- */
-class RTestVclntCrop : public RTestVclntPlayAviFile
-    {
-public:
-    static RTestVclntCrop* NewL(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-    virtual TVerdict DoTestL(CVideoPlayerUtility* aPlayer);
-private:
-    RTestVclntCrop(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    };
-
-#ifdef SYMBIAN_BUILD_GCE
-
-/**
-Auto scale test for video
-*/
-
-class RTestVclntAutoScale : public RTestVclntPlayAviFile
-	{
-public:
-	static RTestVclntAutoScale* NewL(const TDesC& aTestName);
-    virtual TVerdict DoTestL(CVideoPlayerUtility* aPlayer);
-private:
-    RTestVclntAutoScale(const TDesC& aTestName);	
-	};
-
-#endif // SYMBIAN_BUILD_GCE
-
-/**
- * Frame test for video.
- * 
- * RTestVclntGetFrame
- *
- */
-class RTestVclntGetFrame : public RTestVclntPlayAviFile
-    {
-public:
-    static RTestVclntGetFrame* NewL(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError, TBool aUseIntentAPI);
-    virtual TVerdict DoTestStepL();
-    virtual void FsmL(TVclntTestPlayEvents aEventCode);
-protected:
-    virtual void MvpuoFrameReady(CFbsBitmap& aFrame,TInt aError);
-private:
-    RTestVclntGetFrame(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError, TBool aUseIntentAPI);
-    TBool iUseIntentAPI;
-    };
-
-
-/**
- * Video rebuffering.
- * 
- * RTestVclntRebuffering
- *
- */
-class RTestVclntRebuffering : public RTestVclntPlayAviFile, public MVideoLoadingObserver
-    {
-public:
-    static RTestVclntRebuffering* NewL(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    virtual TVerdict DoTestL(CVideoPlayerUtility* aPlayer);
-    void MvloLoadingStarted();
-    void MvloLoadingComplete();
-private:
-    RTestVclntRebuffering(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    };
-
-/**
- * Video get framesize.
- * 
- * RTestVclntRepeat
- *
- */
-class RTestVclntRepeat : public RTestVclntPlayAviFile
-    {
-public:
-    static RTestVclntRepeat* NewL(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError, const TInt aRepeat);
-    virtual TVerdict DoTestL(CVideoPlayerUtility* aPlayer);
-private:
-    RTestVclntRepeat(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError, const TInt aRepeat);
-private:
-    TInt iRepeat;
-    };
-
-
-
-/**
- * Video Delete object while playing
- * 
- * RTestVclntDelete
- *
- */
-class RTestVclntDelete : public RTestVclntPlayAviFile
-    {
-public:
-    static RTestVclntDelete* NewL(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    virtual TVerdict DoTestStepL();
-    virtual void FsmL(TVclntTestPlayEvents aEventCode);
-private:
-    RTestVclntDelete(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    };
-
-/**
- * Play Video file
- * 
- * RTestVclntPlayAviFileHandle
- *
- */
-class RTestVclntPlayAviFileHandle : public RTestVclntAviPlayerStep
-    {
-public:
-    RTestVclntPlayAviFileHandle(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError, const TBool aAlloc);
-    static RTestVclntPlayAviFileHandle* NewL(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError, const TBool aAlloc);
-    static RTestVclntPlayAviFileHandle* NewLC(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError, const TBool aAlloc);
-    virtual TVerdict DoTestStepL();
-    virtual void FsmL(TVclntTestPlayEvents aEventCode);
-	virtual TInt SetCacheSize();
-	virtual TInt CheckCacheError(TInt aError);
-
-protected:
-    TVerdict PerformTestStepL();
-    const TBool iAlloc;                        // Is this test an Alloc test
-    TTimeIntervalMicroSeconds iDuration;    // Stores duration of video
-    RFs iFs;
-    RFile iFile;
-    TBool iIsOpen;
-    };
-    
-/**
-
-RTestVideoPlayCapabilityVelocity
-
-*/
-class RTestVideoPlayCapabilityVelocity: public RTestVclntAviPlayerStep
-    {
-public:
-	RTestVideoPlayCapabilityVelocity(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-    static RTestVideoPlayCapabilityVelocity* NewL(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-    virtual TVerdict DoTestStepL();
-    virtual void FsmL(TVclntTestPlayEvents aEventCode);
-protected:
-	TVideoPlayRateCapabilities iVideoPlayRateCapabilities;
-	TInt iPlayVelocity;
-    RFs iFs;
-    RFile iFile;
-    };
-
-/**
-
-RTestVideoPlayStepFrame
-
-*/
-class RTestVideoPlayStepFrame: public RTestVclntAviPlayerStep
-    {
-public:
-	RTestVideoPlayStepFrame(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-    static RTestVideoPlayStepFrame* NewL(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-    virtual TVerdict DoTestStepL();
-    virtual void FsmL(TVclntTestPlayEvents aEventCode);
-    static TInt TimerCallback(TAny* aPtr);
-protected:
-	TVideoPlayRateCapabilities iVideoPlayRateCapabilities;
-	CPeriodic* iTimer;
-	TInt iPlayVelocity;
-    RFs iFs;
-    RFile iFile;
-    };
-    
-/**
-
-RTestVideoPlayCapabilityVelocity
-
-*/
-class RTestVideoPlayAudVidEnable: public RTestVclntAviPlayerStep
-    {
-public:
-	RTestVideoPlayAudVidEnable(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-    static RTestVideoPlayAudVidEnable* NewL(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-    virtual TVerdict DoTestStepL();
-    virtual void FsmL(TVclntTestPlayEvents aEventCode);
-protected:
-	TInt iPlayVelocity;
-    RFs iFs;
-    RFile iFile;
-    };
-
-/**
-
-RTestVideoPlayAutoScale
-
-*/
-class RTestVideoPlayAutoScale: public RTestVclntAviPlayerStep
-    {
-public:
-	RTestVideoPlayAutoScale(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-    static RTestVideoPlayAutoScale* NewL(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-    virtual TVerdict DoTestStepL();
-    virtual void FsmL(TVclntTestPlayEvents aEventCode);
-protected:
-	TInt iPlayVelocity;
-    RFs iFs;
-    RFile iFile;
-    };
-
-#endif //__TESTVIDEOPLAYER_H__
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/src/testvideoplayer2.h	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,735 +0,0 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Header file: Video Player 2 Tests.
-// 
-//
-
-#ifndef TESTVIDEOPLAYER2_H
-#define TESTVIDEOPLAYER2_H
-
-#include "tsi_mmf_vclntavi_stepbase.h"
-#include <surfaceeventhandler.h>
-
-/**
- * Load and play a video file using graphics surface
- *
- * RTestVclnt2PlayFile
- *
- */
-class RTestVclnt2PlayFile : public RTestVclnt2AviPlayerStep
-    {
-public:
-    static RTestVclnt2PlayFile* NewL(const TDesC& aTestName,const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-        
-protected:    
-    virtual TVerdict DoTestStepPreambleL();
-    virtual TVerdict DoTestStepPostambleL();
-
-    virtual void FsmL(TVclntTestPlayEvents aEventCode);
-    
-    virtual void HandleIdleL();
-    virtual void HandleOpenCompleteL();
-    virtual void HandlePrepareCompleteL();
-    virtual void HandlePlayCompleteL();
-    
-    // called by HandlePrepareCompleteL to trigger the video playback
-    virtual void StartPlayback();    
-
-    // constructor    
-    RTestVclnt2PlayFile(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    };
-#ifdef SYMBIAN_BUILD_GCE
-/**
- * Test CMediaClientVideoDisplay.This test makes sure that the new dll 
- * (mediaclientvideodisplay) is loaded and used.
- *
- * RTestMediaClientVideoDisplay
- *
- */
-class RTestMediaClientVideoDisplay : public RTestVclnt2AviPlayerStep
-    {
-public:
-    static RTestMediaClientVideoDisplay* NewL(const TDesC& aTestName,const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-        
-protected:    
-    virtual TVerdict DoTestStepPreambleL();
-    virtual TVerdict DoTestStepPostambleL();
-
-    virtual void FsmL(TVclntTestPlayEvents aEventCode);
-    
-    virtual void HandleIdleL();
-    virtual void HandleOpenCompleteL();
-    virtual void HandlePrepareCompleteL();
-    virtual void HandlePlayCompleteL();
-    
-    // called by HandlePrepareCompleteL to trigger the video playback
-    virtual void StartPlayback();    
-
-    // constructor    
-    RTestMediaClientVideoDisplay(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    };
-    
-#endif
-
-
-/**
- * Load and play a video file using graphics surface with default window position, video
- * extent and clip rect, then during playback, perform some actions specified within the 
- * implementation of the function DoThisActionDuringPlaybackL().  Before exiting 
- * DoThisActionDuringPlaybackL, SetActionPerformed() should be called to signal that 
- * all user action to be performed during video playback is completed.
- *
- * RTestVclnt2ActionDuringVideoPlayback 
- *
- */
-class RTestVclnt2PerformActionDuringVideoPlayback : public RTestVclnt2PlayFile
-    {
-protected:    
-    RTestVclnt2PerformActionDuringVideoPlayback(const TDesC& aTestName,
-                                                const TDesC& aSectName,
-                                                const TDesC& aKeyName, 
-                                                TInt aExpectedError);
-    
-    // overriden in this class to trigger start video playback and then proceed to
-    // perform the action detailed within DoThisActionDuringPlaybackL
-    virtual void StartPlayback();    
-    
-    virtual void HandlePlayCompleteL();    
-    virtual void DoThisActionDuringPlaybackL(CVideoPlayerUtility2& aPlayer) = 0;
-    
-private:
-    TInt iActionError;
-    };
-
-
-/**
- * Load and play a video file using graphics surface with specific window position, video
- * extent and clip rect
- *
- * RTestVclnt2AddWin
- *
- */
-class RTestVclnt2AddWin : public RTestVclnt2PlayFile
-    {
-public:
-    static RTestVclnt2AddWin* NewL(const TDesC& aTestName, 
-                                   const TDesC& aSectName,
-                                   const TDesC& aKeyName, 
-                                   TInt aExpectedError);
-    
-protected:    
-    // constructor
-    RTestVclnt2AddWin(const TDesC& aTestName,
-                      const TDesC& aSectName,
-                      const TDesC& aKeyName, 
-                      TInt aExpectedError);
-
-    virtual void HandlePrepareCompleteL();
-    };
-
-
-/**
- * Load and play a video file using graphics surface, then change the display window during playback
- *
- * RTestVclnt2RemoveWin
- *
- */
-class RTestVclnt2RemoveWin : public RTestVclnt2PerformActionDuringVideoPlayback
-    {
-public:
-    static RTestVclnt2RemoveWin* NewL(const TDesC& aTestName, 
-                                      const TDesC& aSectName,
-                                      const TDesC& aKeyName, 
-                                      TInt aExpectedError,
-                                      TBool aAddBack);
-    
-protected:    
-    virtual void HandlePrepareCompleteL();
-    virtual void DoThisActionDuringPlaybackL(CVideoPlayerUtility2& aPlayer);
-    
-private:
-    // constructor
-    RTestVclnt2RemoveWin(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError, TBool aAddBack);
-    
-private:
-	/** If true, Add the display back again after removing it. */ 
-	TBool iAddBack;
-    };
-
-
-/**
- * Load and play a video file using graphics surface, then change the window position during playback
- *
- * RTestVclnt2WinPos
- *
- */
-class RTestVclnt2WinPos : public RTestVclnt2PerformActionDuringVideoPlayback
-    {
-    public:
-        static RTestVclnt2WinPos* NewL(const TDesC& aTestName, 
-                                       const TDesC& aSectName,
-                                       const TDesC& aKeyName, 
-                                       TInt aExpectedError);
-    
-    protected:    
-        virtual void DoThisActionDuringPlaybackL(CVideoPlayerUtility2& aPlayer);
-
-    private:
-        RTestVclnt2WinPos(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    };
-
-
-/**
- * Load and play a video file using graphics surface, then change the video extent during playback
- *
- * RTestVclnt2VideoExt
- *
- */
-class RTestVclnt2VideoExt : public RTestVclnt2PerformActionDuringVideoPlayback
-    {
-    public:
-        static RTestVclnt2VideoExt* NewL(const TDesC& aTestName, 
-                                         const TDesC& aSectName,
-                                         const TDesC& aKeyName, 
-                                         TInt aExpectedError);
-    
-    protected:    
-        virtual void DoThisActionDuringPlaybackL(CVideoPlayerUtility2& aPlayer);
-
-    private:
-        // constructor
-        RTestVclnt2VideoExt(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    };
-
-
-/**
- * Load and play a video file using graphics surface, then change the clipping rect during playback
- *
- * RTestVclnt2ClipRect
- *
- */
-class RTestVclnt2ClipRect : public RTestVclnt2PerformActionDuringVideoPlayback
-    {
-    public:
-        static RTestVclnt2ClipRect* NewL(const TDesC& aTestName, 
-                                         const TDesC& aSectName,
-                                         const TDesC& aKeyName, 
-                                         TInt aExpectedError);
-    
-    protected:    
-        virtual void DoThisActionDuringPlaybackL(CVideoPlayerUtility2& aPlayer);
-
-    private:
-        RTestVclnt2ClipRect(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    };
-
-
-/**
- * Load and play a video file using graphics surface, then change the scale factor during playback
- *
- * RTestVclnt2Scale
- *
- */
-class RTestVclnt2Scale : public RTestVclnt2PerformActionDuringVideoPlayback
-    {
-    public:
-        static RTestVclnt2Scale* NewL(const TDesC& aTestName, 
-                                      const TDesC& aSectName,
-                                      const TDesC& aKeyName, 
-                                      TInt aExpectedError);
-    
-    protected:    
-        virtual void DoThisActionDuringPlaybackL(CVideoPlayerUtility2& aPlayer);
-        
-        virtual void HandlePrepareCompleteL();
-
-    private:
-        // constructor
-        RTestVclnt2Scale(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    };
-    
-/**
- * Load a video file, set the crop region and then play video using graphics surface with non-default window
- * clipping rect or video extent
- *
- * RTestVclnt2Viewport
- *
- */    
-class RTestVclnt2Viewport : public RTestVclnt2PlayFile
-    {
-public:
-    static RTestVclnt2Viewport* NewL(const TDesC& aTestName, 
-                                     const TDesC& aSectName,
-                                     const TDesC& aKeyName, 
-                                     const TSize& aViewportSize,
-                                     TInt aExpectedError = KErrNone);
-
-protected:    
-	virtual void HandlePrepareCompleteL();
-
-private:
-    void HandlePrepareCompleteL(const TRect& aCropRegion, const TRect& aVideoExtent, const TRect& aClipRect);
-    
-    // constructor
-    RTestVclnt2Viewport(const TDesC& aTestName,
-                        const TDesC& aSectName,
-                        const TDesC& aKeyName, 
-                        const TSize& aViewportSize,
-                        TInt aExpectedError);
-
-protected:
-    TSize iViewportSize;
-    };
-    
-/**
- * Load a video file, set an invalid crop region and then play video using graphics surface 
- *
- * RTestVclnt2InvalidViewport
- *
- */    
-class RTestVclnt2InvalidViewport : public RTestVclnt2PlayFile
-    {
-public:
-    static RTestVclnt2InvalidViewport* NewL(const TDesC& aTestName, 
-                                     const TDesC& aSectName,
-                                     const TDesC& aKeyName, 
-                                     TInt aExpectedError = KErrNone);
-    
-protected:    
-    virtual void HandlePrepareCompleteL();
-
-private:
-    // constructor
-    RTestVclnt2InvalidViewport(const TDesC& aTestName,
-                               const TDesC& aSectName,
-                               const TDesC& aKeyName, 
-                               TInt aExpectedError);    
-    };    
-
-/**
- * Load and play a video file using graphics surface with rotation set
- *
- * RTestVclnt2Rotation
- *
- */
-class RTestVclnt2Rotation : public RTestVclnt2PlayFile
-    {
-public:
-    static RTestVclnt2Rotation* NewL(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    
-protected:    
-    virtual void HandlePrepareCompleteL();
-    
-private:
-    // constructor
-    RTestVclnt2Rotation(const TDesC& aTestName,const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError) ;    
-    };
-    
-
-/**
- * Load and play a video file using graphics surface with specific crop region, autoscale, 
- * video extent and clip rect settings.
- *
- * RTestVclnt2Settings
- *
- */
-class RTestVclnt2Settings : public RTestVclnt2PlayFile
-    {
-public:
-    static RTestVclnt2Settings* NewL(const TDesC& aTestName, 
-                                     const TDesC& aSectName,
-                                     const TDesC& aKeyName, 
-                                     TInt aExpectedError = KErrNone);
-    
-protected:    
-    virtual void HandlePrepareCompleteL();
-    
-private:
-    // constructor
-    RTestVclnt2Settings(const TDesC& aTestName,const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError) ;    
-    };   
-
-/**
- * Load and play a video file using graphics surface with specific crop region, content alignment, 
- * scale factor, video extent and clip rect settings.  The video clip will be playbacked multiple times, 
- * each with a different combination of the settings.
- *
- * RTestVclnt2SettingsAndAlignments
- *
- */
-class RTestVclnt2SettingsAndAlignments : public RTestVclnt2PlayFile
-    {
-public:
-    static RTestVclnt2SettingsAndAlignments* NewL(const TDesC& aTestName, 
-                                                  const TDesC& aSectName,
-                                                  const TDesC& aKeyName, 
-                                                  TInt aExpectedError = KErrNone);
-    
-protected:    
-    virtual void HandlePrepareCompleteL();
-    virtual void HandlePlayCompleteL();    
-    virtual TVerdict DoTestStepPreambleL();
-    
-private:    
-    // constructor
-    RTestVclnt2SettingsAndAlignments(const TDesC& aTestName,
-                                     const TDesC& aSectName,
-                                     const TDesC& aKeyName, 
-                                     TInt aExpectedError);   
-
-    // helpers
-    void AddDisplayWindowL(const TRect& aCropRegion);
-    void SetCropRegionL(TRect& aCropRegion);
-    void SetContentOffsetL();
-    void SetScaleFactorL();
-    void SetContentAlignmentL();
-    
-private:
-    TInt iCount;
-    };
-
-
-/**
- * Load and play a video file using graphics surface on a second display
- *
- * RTestVclnt2SecDisplay
- *
- */
-class RTestVclnt2SecDisplay : public RTestVclnt2PlayFile
-    {
-public:
-    static RTestVclnt2SecDisplay* NewL(const TDesC& aTestName, 
-                                       const TDesC& aSectName,
-                                       const TDesC& aKeyName, 
-                                       TInt aExpectedError = KErrNone);
-    
-protected:    
-    // test framework
-    virtual TVerdict DoTestStepPreambleL();
-    virtual TVerdict DoTestStepPostambleL();
-    
-    virtual void HandlePrepareCompleteL();    
-    
-private:
-    // constructor
-    RTestVclnt2SecDisplay(const TDesC& aTestName, 
-                          const TDesC& aSectName, 
-                          const TDesC& aKeyName, 
-                          TInt aExpectedError);
-    
-private:
-    CWsScreenDevice* iSecondScreen;    
-    };
-
-
-/**
- * Load and play a video file using graphics surface, then pause the video and attempt
- * to change the crop region and continue to playback the video.
- *
- * RTestVclnt2CropRectPause
- *
- */
-class RTestVclnt2CropRectPause : public RTestVclnt2PerformActionDuringVideoPlayback
-    {
-    public:
-        static RTestVclnt2CropRectPause* NewL(const TDesC& aTestName, 
-                                              const TDesC& aSectName,
-                                              const TDesC& aKeyName, 
-                                              TInt aExpectedError = KErrNone);
-    
-    protected:    
-        virtual void DoThisActionDuringPlaybackL(CVideoPlayerUtility2& aPlayfser);
-
-    private:
-        RTestVclnt2CropRectPause(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);        
-    };
-
-
-/**
- * Load and play a video file using graphics surface with overlay graphics on top of video picture
- *
- * RTestVclnt2Overlay
- *
- */
-class RTestVclnt2Overlay : public RTestVclnt2PlayFile
-    {
-public:
-    static RTestVclnt2Overlay* NewL(const TDesC& aTestName, 
-                                    const TDesC& aSectName,
-                                    const TDesC& aKeyName, 
-                                    TInt aExpectedError);
-    
-protected:    
-    // constructor
-    RTestVclnt2Overlay(const TDesC& aTestName,
-                       const TDesC& aSectName,
-                       const TDesC& aKeyName, 
-                       TInt aExpectedError);
-
-    virtual TVerdict DoTestStepPreambleL();
-    virtual TVerdict DoTestStepPostambleL();
-
-    virtual void HandlePrepareCompleteL();
-    
-private:
-    CFont*      iFont;    
-    };
-
-/**
- * Load and play a video file using graphics surface and attempting to add the same display window twice
- * using default values
- *
- * RTestVclnt2AddWin2
- *
- */
-class RTestVclnt2AddWin2 : public RTestVclnt2PlayFile
-    {
-public:
-    static RTestVclnt2AddWin2* NewL(const TDesC& aTestName, 
-                                    const TDesC& aSectName,
-                                    const TDesC& aKeyName, 
-                                    TInt aExpectedError);
-    
-protected:    
-    // constructor
-    RTestVclnt2AddWin2(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-
-    virtual void HandlePrepareCompleteL();
-    };
-
-/**
- * Load and play a video file using graphics surface and attempting to add the display window with specific
- * settings then add the same display window using default values again 
- *
- * RTestVclnt2AddWin2WithSettings
- *
- */
-class RTestVclnt2AddWin2WithSettings : public RTestVclnt2PlayFile
-    {
-    public:
-        static RTestVclnt2AddWin2WithSettings* NewL(const TDesC& aTestName, 
-                                                    const TDesC& aSectName,
-                                                    const TDesC& aKeyName, 
-                                                    TInt aExpectedError);
-        
-    protected:    
-        // constructor
-        RTestVclnt2AddWin2WithSettings(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-
-        // state machine
-        virtual void HandlePrepareCompleteL();
-    };
-
-/**
- * Load and play a video file using graphics surface and set content offset and/or content alignment
- *
- * RTestVclnt2ContOffset
- *
- */
-class RTestVclnt2ContOffset : public RTestVclnt2PlayFile
-	{
-    public:
-    	static RTestVclnt2ContOffset* NewL(const TDesC& aTestName, 
-    	                                   const TDesC& aSectName, 
-    	                                   const TDesC& aKeyName, 
-    	                                   TInt aExpectedError);
-    	
-    protected:
-        // state machine
-        virtual void HandlePrepareCompleteL();
-    	
-    private:
-        // constructor
-    	RTestVclnt2ContOffset(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-	};
-	
-/**
- * Load and play a video file using graphics surface and set content offset during playback
- *
- * RTestVclnt2ContOffsetAtPlay
- *
- */	
-class RTestVclnt2ContOffsetAtPlay : public RTestVclnt2PerformActionDuringVideoPlayback
-	{
-    public:
-    	static RTestVclnt2ContOffsetAtPlay* NewL(const TDesC& aTestName, 
-    	                                         const TDesC& aSectName, 
-    	                                         const TDesC& aKeyName, 
-    	                                         TInt aExpectedError);
-    	
-    protected:    
-        virtual void DoThisActionDuringPlaybackL(CVideoPlayerUtility2& aPlayer);
-
-    private:
-        // constructor
-    	RTestVclnt2ContOffsetAtPlay(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-	};
-
-/**
- * Load and play a video file using graphics surface and set content aligment during playback
- *
- * RTestVclnt2Align
- *
- */	
-class RTestVclnt2Align : public RTestVclnt2PerformActionDuringVideoPlayback
-	{
-    public:
-    	static RTestVclnt2Align* NewL(const TDesC& aTestName, 
-    	                              const TDesC& aSectName, 
-    	                              const TDesC& aKeyName, 
-    	                              TInt aExpectedError);
-    	
-    protected:
-        virtual void HandlePrepareCompleteL();
-        virtual void DoThisActionDuringPlaybackL(CVideoPlayerUtility2& aPlayer);	
-    	
-    private:
-        // constructor
-    	RTestVclnt2Align(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-	};
-	
-/**
- * Load and play a video file using graphics surface and set auto scale
- *
- * RTestVclnt2AutoScale
- *
- */	
-class RTestVclnt2AutoScale : public RTestVclnt2PerformActionDuringVideoPlayback
-	{
-    public:
-    	static RTestVclnt2AutoScale* NewL(const TDesC& aTestName, 
-    	                                  const TDesC& aSectName, 
-    	                                  const TDesC& aKeyName, 
-    	                                  TInt aExpectedError);
-	
-    protected:
-        virtual void HandlePrepareCompleteL();
-        virtual void DoThisActionDuringPlaybackL(CVideoPlayerUtility2& aPlayer);	
-	
-    private:
-    	RTestVclnt2AutoScale(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-	};
-
-/**
- * Load and play a video file using graphics surface
- *
- * RTestVclnt2PlayFile
- *
- */
-class RTestVclnt2OldController : public RTestVclnt2PlayFile
-    {
-public:
-    static RTestVclnt2OldController* NewL(const TDesC& aTestName,const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-        
-protected:
-    virtual void HandleIdleL();
-    virtual void HandlePrepareCompleteL();
-    
-private:
-	RTestVclnt2OldController(const TDesC& aTestName,const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    };
-
-/**
- * Without opening a file, try doing surface related functions
- *
- * RTestVclnt2NoFile
- *
- */
-class RTestVclnt2NoFile : public RTestVclnt2PlayFile
-	{
-public:
-	static RTestVclnt2NoFile* NewL(const TDesC& aTestName,const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-
-protected:
-	virtual void HandleIdleL();
-
-private:
-	RTestVclnt2NoFile(const TDesC& aTestName,const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-	};
-
-/**
- * Attempt to play video without display
- *
- * RTestVclnt2PlayAfterRemoveWin
- *
- */
-class RTestVclnt2PlayAfterRemoveWin : public RTestVclnt2PlayFile
-	{
-public:
-	static RTestVclnt2PlayAfterRemoveWin* NewL(const TDesC& aTestName,const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-
-protected:
-	virtual void HandlePrepareCompleteL();
-	virtual void HandlePlayCompleteL();
-
-private:
-	RTestVclnt2PlayAfterRemoveWin(const TDesC& aTestName,const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-
-private:
-	TInt iPlayAttempt;
-	};
-	
-/**
- * Use surface utility API without GCE support
- *
- * RTestVclnt2NoGce
- *
- */
-class RTestVclnt2NoGce : public RTestVclnt2PlayFile
-	{
-public:
-    static RTestVclnt2NoGce* NewL(const TDesC& aTestName,const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-        
-protected:
-    virtual void HandleIdleL();
-    virtual void HandleOpenCompleteL();
-    
-private:
-	RTestVclnt2NoGce(const TDesC& aTestName,const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    };
-
-/**
- * Alloc tests (using Client heap) for Video Player utility 2.
- *
- * RTestVclnt2Alloc
- *
- */
-class RTestVclnt2Alloc : public RTestVclnt2PlayFile
-	{
-public:
-    static RTestVclnt2Alloc* NewL(const TDesC& aTestName,const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    virtual TVerdict DoTestStepL();
-   
-protected:
-	virtual TVerdict DoTestStepPreambleL();
-    virtual TVerdict PerformTestL();
-    
-private:
-	RTestVclnt2Alloc(const TDesC& aTestName,const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    };
-
-class RTestVclnt2InvalidScaleFactor : public RTestVclnt2PlayFile
-	{
-public:
-	static RTestVclnt2InvalidScaleFactor* NewL(const TDesC& aTestName,const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-	
-protected:
-	// From RTestVclnt2PlayFile
-	void HandlePrepareCompleteL();
-	
-private:
-	RTestVclnt2InvalidScaleFactor(const TDesC& aTestName,const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-	};
-
-#endif // TESTVIDEOPLAYER2_H
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/src/testvideoplayer_apr.h	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,531 +0,0 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Header file: Declaration for Various Classes used for Audio Resource Notification tests for Video Client.
-// 
-//
-
-/**
- @file Testvideoplayer_apr.h
-*/
-
-#ifndef TESTVIDEOPLAYER_APR_H
-#define TESTVIDEOPLAYER_APR_H
-
-
-#include "testvideoplayer.h"
-#include "mdaaudiosampleplayer.h"
-#include "u32hal.h"
-
-
-const TInt KSizeBuf = 256;
-const TInt KMaxEvents = 2;
-
-//------------------------------------------------------------------------------
-//********************PREQ 797 - Audio Resource Notification********************
-//------------------------------------------------------------------------------
-
-/**
- * stopActiveScheduler
- */
-static TInt stopActiveScheduler(TAny*)
-	{
-	CActiveScheduler::Stop();
-	return KErrNone;
-	}
-
-//
-//Declarations//
-//
-
-//
-//Custom Error Codes & CONST Declarations.
-//
-const TInt KErrUser = -1000;
-const TInt KErrBadResult = (KErrUser - 1);
-const TInt KMicroSecsInOneSec = 1000000; 
-const TUint KSampleRate8000Hz  = 8000;
-
-//
-//Forward class declarations
-//
-class CCallbackTimer;
-class CTestAVPlayerAPRCallbackSupport;
-class CVclntAviAprWillResumeTimer;
-//------------------------------------------------------------------------------
-//******************CR 0805 - Auto Pause Resume for video client*******************
-//------------------------------------------------------------------------------
-
-//
-//ENUM DECLARATIONS//
-//
-
-// Enum to describe the current state.
-enum TAVPlayerAPRState
-	{
-	EStateBegin = 0,
-	EStateOpenAudioPlayer1,
-	EStateOpenAudioPlayer2,
-	EStateAudioPlaying1,
-	EStateAudioPlaying2,
-	EStateEndAudioPlay1,
-	EStateEndAudioPlay1A,
-	EStateEndAudioPlay2,
-	EStateEndAudioPlay2A,
-	EStateErrInUseAudioPlayer1,
-	EStateErrInUseAudioPlayer2,
-	EStateNotifiedAudioPlayer1,
-	EStateNotifiedAudioPlayer2,
-	EStateErrInUseAudioPlayer1A,
-	EStateNotifiedAudioPlayer1A,
-	EStateAudioPlaying2A,
-	EStateAudioEndPlay2A,
-	EStatePrepareVideoPlayer,
-	EStateOpenVideoPlayer,
-	EStateVideoPlaying,
-	EStateEndVideoPlay,
-	EStateErrInUseVideoPlayer,
-	EStateNotifiedVideoPlayer,
-	EStateErrInUseVideoPlayer1A,
-	EStateNotifiedVideoPlayer1A,
-	EStateVideoPlaying2A,
-	EStateEndVideoPlay2A,
-	EStateNoOtherPlayerNotified
-	};
-
-// Enum to decide which Event has occured.
-enum TAVPlayerAPREvents
-	{
-	EIdlePlayer = 0,
-	EMvpuoOpenComplete,
-	EMvpuoPrepareComplete,
-	EMvpuoFrameReady,
-	EMvpuoPlayComplete,
-	EMvpuoEvent,
-	EMapcInitComplete1,
-	EMapcInitComplete2,
-	EMapcPlayComplete1,
-	EMapcPlayComplete2,
-	EMarncResourceAvailable1,
-	EMarncResourceAvailable2,
-	EMarncResourceAvailable3
-	};
-
-//
-//BASE CLASS DECLARATIONS//
-//
-
-/**
- * timer support
- *
- * @class CCallBackTimer
- *
- */
-
-class CCallBackTimer : public CTimer
-	{
-public:
-	static CCallBackTimer* NewL(TCallBack aCallBack, TPriority aPriority = EPriorityStandard);
-private:
-	virtual void RunL();
-private:
-	CCallBackTimer(TCallBack aCallBack, TPriority aPriority);
-private:
-	TCallBack iCallBack;
-	};
-
-
-/**
- * Observer class to identify and pass events to the test step class
- * 
- * @class MTestAVPlayerAPRCallback
- *
- */
-class MTestAVPlayerAPRCallback
-	{
-public :
-	virtual void MvpuoOpenCompleteTest(TInt aError, CTestAVPlayerAPRCallbackSupport& aMdaVideoPlayerCallbackSupport) = 0;
-	virtual void MvpuoPrepareCompleteTest(TInt aError, CTestAVPlayerAPRCallbackSupport& aMdaVideoPlayerCallbackSupport)= 0;
-	virtual void MvpuoFrameReadyTest(CFbsBitmap &aFrame, TInt aError, CTestAVPlayerAPRCallbackSupport& aMdaVideoPlayerCallbackSupport)=0;
-	virtual void MvpuoPlayCompleteTest(TInt aError,CTestAVPlayerAPRCallbackSupport& aMdaVideoPlayerCallbackSupport)=0;
-	virtual void MvpuoEventTest(const TMMFEvent &aEvent, CTestAVPlayerAPRCallbackSupport& aMdaVideoPlayerCallbackSupport)=0;
-	virtual void MapcInitCompleteTest(TInt aError, const TTimeIntervalMicroSeconds &aDuration, CTestAVPlayerAPRCallbackSupport& aMdaVideoPlayerCallbackSupport)=0;
-	virtual void MapcPlayCompleteTest(TInt aError, CTestAVPlayerAPRCallbackSupport& aMdaVideoPlayerCallbackSupport)=0;
-	virtual void MarncResourceAvailableTest(TUid aNotificationEventId, const TDesC8& aNotificationData, CTestAVPlayerAPRCallbackSupport& aMdaVideoPlayerCallbackSupport) = 0;
-	};
-
-/**
- * Support class to pass the events to the test step class using the MTestAVPlayerAPRCallback
- * 
- * @class CTestAVPlayerAPRCallbackSupport
- *
- */
-class CTestAVPlayerAPRCallbackSupport : public CBase, public MVideoPlayerUtilityObserver, public MMMFAudioResourceNotificationCallback, public MMdaAudioPlayerCallback
-	{
-public :
-	static CTestAVPlayerAPRCallbackSupport* NewL(MTestAVPlayerAPRCallback& aCallback);
-	virtual void MvpuoOpenComplete(TInt aError);
-	virtual void MvpuoPrepareComplete(TInt aError);
-	virtual void MvpuoFrameReady(CFbsBitmap &aFrame, TInt aError);
-	virtual void MvpuoPlayComplete(TInt aError);
-	virtual void MvpuoEvent(const TMMFEvent &aEvent);
-	virtual void MapcInitComplete(TInt aError, const TTimeIntervalMicroSeconds &aDuration);
-	virtual void MapcPlayComplete(TInt aError);
-	virtual void MarncResourceAvailable(TUid aNotificationEventId, const TDesC8& aNotificationData);
-	
-protected:
-	CTestAVPlayerAPRCallbackSupport(MTestAVPlayerAPRCallback& aCallback);
-	void ConstructL();
-private :
-	MTestAVPlayerAPRCallback& iCallback;
-	};
-
-
-/**
- * Base Class for APR functionality for most APR video player tests
- * 
- * @class RTestMmfVclntVideoPlayerAPR
- *
- */
-class RTestMmfVclntVideoPlayerAPR : public RTestMmfVclntAviStep, public MTestAVPlayerAPRCallback
-	{
-public :
-	// Constructor
-	RTestMmfVclntVideoPlayerAPR(const TDesC& aTestName, const TDesC& aSectName);
-
-	// Virtual methods for Preamble and Postamble.
-	virtual TVerdict DoTestStepCreateL();
-	virtual TVerdict DoTestStepDeleteL();
-	// Virtual function to access test specific methods
-	virtual TVerdict DoTestStepL();
-	// Pure function to access test specific methods
-	virtual TVerdict DoTestL()=0;
-	// from MTestAVPlayerAPRCallback
-	virtual void MvpuoOpenCompleteTest(TInt aError, CTestAVPlayerAPRCallbackSupport& aMdaVideoPlayerCallbackSupport);
-	virtual void MvpuoPrepareCompleteTest(TInt aError, CTestAVPlayerAPRCallbackSupport& aMdaVideoPlayerCallbackSupport);
-	virtual void MvpuoFrameReadyTest(CFbsBitmap &aFrame, TInt aError, CTestAVPlayerAPRCallbackSupport& aMdaVideoPlayerCallbackSupport);
-	virtual void MvpuoPlayCompleteTest(TInt aError,CTestAVPlayerAPRCallbackSupport& aMdaVideoPlayerCallbackSupport);
-	virtual void MvpuoEventTest(const TMMFEvent &aEvent, CTestAVPlayerAPRCallbackSupport& aMdaVideoPlayerCallbackSupport);
-	virtual void MarncResourceAvailableTest(TUid aNotificationEventId, const TDesC8& aNotificationData, CTestAVPlayerAPRCallbackSupport& aMdaVideoPlayerCallbackSupport);
-	virtual void MapcInitCompleteTest(TInt aError, const TTimeIntervalMicroSeconds &aDuration, CTestAVPlayerAPRCallbackSupport& aMdaVideoPlayerCallbackSupport);
-	virtual void MapcPlayCompleteTest(TInt aError, CTestAVPlayerAPRCallbackSupport& aMdaVideoPlayerCallbackSupport);
-	
-	// Centralised State Handler
-	virtual void Fsm(TAVPlayerAPREvents aEventCode, TInt aError)=0;
-	virtual TBool FsmCheck(TAVPlayerAPREvents aEventCode, TInt aError);
-	virtual TInt SetCacheSize();
-	virtual TInt CheckCacheError(TInt aError);
-		
-protected :	
-		// StateInit Function
-	void StateInit();
-	// StateChange Function
-	void StateChange(TAVPlayerAPRState aState, TAVPlayerAPREvents aExpectedEvent, TInt aExpectedError=KErrNone, TInt aEventIndex = 1);
-	// check if we can go to the next state
-	TInt AnalyseInput(TAVPlayerAPREvents aEventCode, TInt aError);
-protected :	
-
-	// CMdaAudioPlayerUtility instances
-	CMdaAudioPlayerUtility* iTestAudioPlayer1;
-	CMdaAudioPlayerUtility* iTestAudioPlayer2;
-	// CVideoPlayerUtility instances
-	CVideoPlayerUtility* iTestVideoPlayer;
-	// CTestAVPlayerAPRCallbackSupport instances
-	CTestAVPlayerAPRCallbackSupport* iVideoPlayerCallbackSupport1;
-	CTestAVPlayerAPRCallbackSupport* iAudioPlayerCallbackSupport1;
-	CTestAVPlayerAPRCallbackSupport* iAudioPlayerCallbackSupport2;
-
-	
-	// Other class variable declarations
-	TBuf<KSizeBuf> iFilename1;
-	TBuf<KSizeBuf> iFilename2;
-	TBuf<KSizeBuf> iFilename3;
-	TTimeIntervalMicroSeconds iPosition;
-	TTimeIntervalMicroSeconds iDuration;
-	TInt iError;
-	TAVPlayerAPRState iState;
-	TRequestStatus iRequestStatus;
-	CCallBackTimer* iCallBackTimer;
-	TAVPlayerAPREvents iExpectedEvent[KMaxEvents];
-	TInt iExpectedError[KMaxEvents];
-	TBool iCanStateChange;
-	TInt iExpEventCount;
-	TInt iActEventCount;
-	};
-
-//
-//POSITIVE TESTS//
-//
-
-/** 
- * One-time registration for same event by a player.
- *
- * RTestVclntAprRegOnce4SameEvent
- * MM-MMF-VCLNTAVIAPR-I-0001-HP
- * 
- */
-class RTestVclntAprRegOnce4SameEvent : public RTestMmfVclntVideoPlayerAPR
-	{
-public:
-	static RTestVclntAprRegOnce4SameEvent* NewL( const TDesC& aTestName, const TDesC& aSectName );
-	virtual TVerdict DoTestL();
-	virtual void Fsm(TAVPlayerAPREvents aEventCode, TInt aError);
-	
-protected:
-	RTestVclntAprRegOnce4SameEvent( const TDesC& aTestName, const TDesC& aSectName );
-	TVerdict PerformTestL();
-	};
-
-/** 
- * Register before opening Video player and receive notification of a resource available event 
- *
- * RTestVclntAprRegB4Open
- * MM-MMF-VCLNTAVIAPR-I-0002-HP
- * 
- */
-class RTestVclntAprRegB4Open : public RTestMmfVclntVideoPlayerAPR
-	{
-public:
-	static RTestVclntAprRegB4Open* NewL( const TDesC& aTestName, const TDesC& aSectName );
-	virtual TVerdict DoTestL();
-	virtual void Fsm(TAVPlayerAPREvents aEventCode, TInt aError);
-	
-protected:
-	RTestVclntAprRegB4Open( const TDesC& aTestName, const TDesC& aSectName );
-	TVerdict PerformTestL();
-	};
-
-/** 
- * Register (after Open and before Play of video) , receive notification of a resource available event.
- *
- * RTestVclntAprRegAftrOpenAndB4Play
- * MM-MMF-VCLNTAVIAPR-I-0003-HP
- * 
- */
-class RTestVclntAprRegAftrOpenAndB4Play : public RTestMmfVclntVideoPlayerAPR
-	{
-public:
-	static RTestVclntAprRegAftrOpenAndB4Play* NewL( const TDesC& aTestName, const TDesC& aSectName );
-	virtual TVerdict DoTestL();
-	virtual void Fsm(TAVPlayerAPREvents aEventCode, TInt aError);
-	TTimeIntervalMicroSeconds iVidPosition;
-	
-protected:
-	RTestVclntAprRegAftrOpenAndB4Play( const TDesC& aTestName, const TDesC& aSectName );
-	TVerdict PerformTestL();
-	};
-
-/** 
- * Register after the highest priority client (Audio) completes playing and receive the notification of a resource availalble event.
- *
- * RTestVclntAprRegAftrHpClntCompltPlay
- * MM-MMF-VCLNTAVIAPR-I-0004-HP
- * 
- */
-class RTestVclntAprRegAftrHpClntCompltPlay : public RTestMmfVclntVideoPlayerAPR
-	{
-public:
-	static RTestVclntAprRegAftrHpClntCompltPlay* NewL( const TDesC& aTestName, const TDesC& aSectName );
-	virtual TVerdict DoTestL();
-	virtual void Fsm(TAVPlayerAPREvents aEventCode, TInt aError);
-	
-protected:
-	RTestVclntAprRegAftrHpClntCompltPlay( const TDesC& aTestName, const TDesC& aSectName );
-	TVerdict PerformTestL();
-	};
-	
-/** 
- * Receive notification by same priority players in the order of registration
- *
- * RTestVclntAprRegSamePriorityPlayers
- * MM-MMF-VCLNTAVIAPR-I-0005-HP
- * 
- */
-class RTestVclntAprRegSamePriorityPlayers : public RTestMmfVclntVideoPlayerAPR
-	{
-public:
-	static RTestVclntAprRegSamePriorityPlayers* NewL( const TDesC& aTestName, const TDesC& aSectName );
-	virtual TVerdict DoTestL();
-	virtual void Fsm(TAVPlayerAPREvents aEventCode, TInt aError);
-	
-protected:
-	RTestVclntAprRegSamePriorityPlayers( const TDesC& aTestName, const TDesC& aSectName );
-	TVerdict PerformTestL();
-	};
-
-
-/** 
- * Register (at the time of Play) and Cancellation of the notification request
- *
- * RTestVclntAprRegAtPlayAndCancelNfn
- * MM-MMF-VCLNTAVIAPR-I-0006-HP
- * 
- */
-class RTestVclntAprRegAtPlayAndCancelNfn : public RTestMmfVclntVideoPlayerAPR
-	{
-public:
-	static RTestVclntAprRegAtPlayAndCancelNfn* NewL( const TDesC& aTestName, const TDesC& aSectName );
-	virtual TVerdict DoTestL();
-	virtual void Fsm(TAVPlayerAPREvents aEventCode, TInt aError);
-	
-protected:
-	RTestVclntAprRegAtPlayAndCancelNfn( const TDesC& aTestName, const TDesC& aSectName );
-	TVerdict PerformTestL();
-	};
-
-/** 
- * Test for WillResumePlay() using 3 clients.
- *
- * RTestVclntAprTestWillResumePlay
- * MM-MMF-VCLNTAVIAPR-I-0007-HP
- * 
- */
-class RTestVclntAprTestWillResumePlay : public RTestMmfVclntVideoPlayerAPR
-	{
-public:
-	static RTestVclntAprTestWillResumePlay* NewL( const TDesC& aTestName, const TDesC& aSectName );
-	virtual TVerdict DoTestL();
-	virtual void Fsm(TAVPlayerAPREvents aEventCode, TInt aError);
-	virtual void FinishedL(); // for CVclntAviAprWillResumeTimer	
-
-protected:
-	RTestVclntAprTestWillResumePlay( const TDesC& aTestName, const TDesC& aSectName );
-	TVerdict PerformTestL();
-	CVclntAviAprWillResumeTimer* iWillResumePlayTimer;
-	};
-
-/**
- * 
- * CVclntAviAprWillResumeTimer
- * MM-MMF-VCLNTAVIAPR-I-0007-HP
- * - Timer for checking if no notification occurs in 5 seconds
- *   after calling WillResumePlay()
- *
- */
-class CVclntAviAprWillResumeTimer : public CTimer
-    {
-public:
-    static CVclntAviAprWillResumeTimer* NewL(RTestVclntAprTestWillResumePlay* aParent, TTimeIntervalMicroSeconds32 aWaitTime);
-    void Start();
-protected:
-    TInt RunError(TInt aError);
-    void RunL();
-private:
-    CVclntAviAprWillResumeTimer(RTestVclntAprTestWillResumePlay* aParent, TTimeIntervalMicroSeconds32 aWaitTime);
-    RTestVclntAprTestWillResumePlay* iParent;
-    TTimeIntervalMicroSeconds32 iWaitTime;
-    };
-
-/** 
- * APR Alloc tests (using shared heap) for Video Player utility.
- *
- * RTestVclntAprAllocUsingSharedHeap
- * MM-MMF-VCLNTAVIAPR-I-0008-HP
- * 
- */
-class RTestVclntAprAllocUsingSharedHeap : public RTestMmfVclntVideoPlayerAPR
-	{
-public:
-	static RTestVclntAprAllocUsingSharedHeap* NewL( const TDesC& aTestName, const TDesC& aSectName );
-	void VideoPlayAllocL();
-	virtual TVerdict DoTestStepL();
-	virtual TVerdict DoTestL();
-	virtual void Fsm(TAVPlayerAPREvents aEventCode, TInt aError);
-		
-protected:
-	RTestVclntAprAllocUsingSharedHeap( const TDesC& aTestName, const TDesC& aSectName );
-	TVerdict PerformTestL();
-	};
-	
-
-//
-//NEGATIVE TESTS//
-//
-
-/** 
- * Multiple Registration (at the time of Play) and receive notification of a resource available event
- *
- * RTestVclntAprMultRegAtPlay
- * MM-MMF-VCLNTAVIAPR-I-0101-HP
- * 
- */
-class RTestVclntAprMultRegAtPlay : public RTestMmfVclntVideoPlayerAPR
-	{
-public:
-	static RTestVclntAprMultRegAtPlay* NewL( const TDesC& aTestName, const TDesC& aSectName );
-	virtual TVerdict DoTestL();
-	virtual void Fsm(TAVPlayerAPREvents aEventCode, TInt aError);
-	
-protected:
-	RTestVclntAprMultRegAtPlay( const TDesC& aTestName, const TDesC& aSectName );
-	TVerdict PerformTestL();
-	};
-	
-/** 
- * Cancel when no resource Notification is requested.
- *
- * RTestVclntAprCancelNoResourceNfn
- * MM-MMF-VCLNTAVIAPR-I-0102-HP
- * 
- */
- class RTestVclntAprCancelNoResourceNfn : public RTestMmfVclntVideoPlayerAPR
-	{
-public:
-	static RTestVclntAprCancelNoResourceNfn* NewL( const TDesC& aTestName, const TDesC& aSectName );
-	virtual TVerdict DoTestL();
-	virtual void Fsm(TAVPlayerAPREvents aEventCode, TInt aError);
-	
-protected:
-	RTestVclntAprCancelNoResourceNfn( const TDesC& aTestName, const TDesC& aSectName );
-	TVerdict PerformTestL();
-	};
-	
-/** 
- * Register for notification with an unsupported event type.
- *
- * RTestVclntAprRegUnsupportedEvent
- * MM-MMF-VCLNTAVIAPR-I-0103-HP
- * 
- */
-class RTestVclntAprRegUnsupportedEvent : public RTestMmfVclntVideoPlayerAPR
-	{
-public:
-	static RTestVclntAprRegUnsupportedEvent* NewL( const TDesC& aTestName, const TDesC& aSectName );
-	virtual TVerdict DoTestL();
-	virtual void Fsm(TAVPlayerAPREvents aEventCode, TInt aError);
-	
-protected:
-	RTestVclntAprRegUnsupportedEvent( const TDesC& aTestName, const TDesC& aSectName );
-	TVerdict PerformTestL();
-	};
-	
-/** 
- * Cancellation of  notification with an unsupported event type.
- *
- * RTestVclntAprCancelUnsupportedEvent
- * MM-MMF-VCLNTAVIAPR-I-0104-HP
- * 
- */
-class RTestVclntAprCancelUnsupportedEvent : public RTestMmfVclntVideoPlayerAPR
-	{
-public:
-	static RTestVclntAprCancelUnsupportedEvent* NewL( const TDesC& aTestName, const TDesC& aSectName );
-	virtual TVerdict DoTestL();
-	virtual void Fsm(TAVPlayerAPREvents aEventCode, TInt aError);
-	
-protected:
-	RTestVclntAprCancelUnsupportedEvent( const TDesC& aTestName, const TDesC& aSectName );
-	TVerdict PerformTestL();
-	};
-	
-#endif
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/src/testvideoplayer_secdisp.h	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,234 +0,0 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Header file: Video Player Tests.
-// 
-//
-
-#ifndef TESTVIDEOPLAYER_SECDISP_H
-#define TESTVIDEOPLAYER_SECDISP_H
-
-#include "tsi_mmf_vclntavi_stepbase.h"
-
-class CTestVclntAviPlayTimer;
-
-/**
- *
- * RTestVclntSetScrIdAndPlayBase
- *
- */
-class RTestVclntSetScrIdAndPlayBase : public RTestVclntAviPlayerStep
-    {
-public:
-    RTestVclntSetScrIdAndPlayBase(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError, TInt aScreenNumber);
-    
-    virtual void FsmL(TVclntTestPlayEvents aEventCode) = 0;
-    // timer handling
-    virtual void FinishedL();
-    // Just to handle the behaviour of ARMV5
-    virtual void MvpuoOpenComplete(TInt aError);
-protected:
-    TInt iScreenNumber; // Stores screen number
-    TInt iCurrentScreenNumber; // Stores currently active screen number
-    };
-
-/**
- * Set the screen id and Play the video file.
- * Set the invalid screen id and Play the video file.
- *
- * RTestVclntSetScrIdAndPlayAviFile
- * MM-MMF-VCLNTAVI-I-0201-CP, MM-MMF-VCLNTAVI-I-0251-CP
- *
- */
-class RTestVclntSetScrIdAndPlayAviFile : public RTestVclntSetScrIdAndPlayBase
-    {
-public:
-    static RTestVclntSetScrIdAndPlayAviFile* NewL(const TDesC& aTestName,const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError, TInt aScreenNumber);
-    virtual TVerdict DoTestStepL();
-    virtual void FsmL(TVclntTestPlayEvents aEventCode);
-private:
-    RTestVclntSetScrIdAndPlayAviFile(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError, TInt aScreenNumber);
-    };
-
-
-/**
- * Set the screen id and Play video descriptor.
- *
- * RTestVclntSetScrIdAndPlayAviDes
- * MM-MMF-VCLNTAVI-I-0202-CP
- *
- */
-class RTestVclntSetScrIdAndPlayAviDes : public RTestVclntSetScrIdAndPlayBase
-    {
-public:
-    static RTestVclntSetScrIdAndPlayAviDes* NewL(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError, TInt aScreenNumber);
-    virtual TVerdict DoTestStepL();
-    virtual TVerdict DoTestStepPreambleL();
-    virtual TVerdict DoTestStepPostambleL();
-    virtual void FsmL(TVclntTestPlayEvents aEventCode);
-protected:
-    HBufC8* iVideo;                        // Buffer for holding video descriptor data
-private:
-    RTestVclntSetScrIdAndPlayAviDes(const TDesC& aTestName,const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError, TInt aScreenNumber) ;    
-    } ;
-
-/**
- * Set the screen id and Play video from URL.
- *
- * RTestVclntSetScrIdAndPlayAviUrl
- * MM-MMF-VCLNTAVI-I-0203-CP
- *
- */
- 
-class RTestVclntSetScrIdAndPlayAviUrl : public RTestVclntSetScrIdAndPlayBase
-    {
-public:
-    static RTestVclntSetScrIdAndPlayAviUrl* NewL(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError, TInt aScreenNumber);
-    virtual TVerdict DoTestStepL();
-    virtual void FsmL(TVclntTestPlayEvents aEventCode);
-private:
-    RTestVclntSetScrIdAndPlayAviUrl(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError, TInt aScreenNumber);    
-    };
-    
-/**
- * Set the screen id and play video file, Stop.Again set the screen id and play.
- * Set the screen id after stop and play again.
- *
- * RTestVclntSetScrIdAndPlayStopAviFile
- * MM-MMF-VCLNTAVI-I-0204-CP, MM-MMF-VCLNTAVI-I-0206-CP
- *
- */
-class RTestVclntSetScrIdAndPlayStopAviFile : public RTestVclntSetScrIdAndPlayBase
-    {
-public:
-    static RTestVclntSetScrIdAndPlayStopAviFile* NewL(const TDesC& aTestName,const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError, TInt aScreenNumber, TInt aScreenNumber2);
-    virtual TVerdict DoTestStepL();
-    virtual void FsmL(TVclntTestPlayEvents aEventCode);
-    
-    // timer handling
-    void FinishedL();
-protected:
-    CTestVclntAviPlayTimer* iPlayTimer;
-    TBool iRestarted;
-    TInt iScreenNumber2; // Stores screen number
-    TInt iCountNumber;
-    TFileName iFilename2;
-private:
-    RTestVclntSetScrIdAndPlayStopAviFile(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError, TInt aScreenNumber, TInt aScreenNumber2);    
-    };
-    
-/**
- * Set the screen id and play video file, Pause.Again set the screen id and play.
- * Set the screen ID after Pause and play again.
- *
- * RTestVclntSetScrIdAndPlayPauseAviFile
- * MM-MMF-VCLNTAVI-I-0205-CP, MM-MMF-VCLNTAVI-I-0207-CP
- *
- */
-class RTestVclntSetScrIdAndPlayPauseAviFile : public RTestVclntSetScrIdAndPlayBase
-    {
-public:
-    static RTestVclntSetScrIdAndPlayPauseAviFile* NewL(const TDesC& aTestName,const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError, TInt aScreenNumber, TInt aScreenNumber2);
-    virtual TVerdict DoTestStepL();
-    virtual void FsmL(TVclntTestPlayEvents aEventCode);
-    
-    // timer handling
-    void FinishedL();
-protected:
-    CTestVclntAviPlayTimer* iPlayTimer;
-    TBool iRestarted;
-    TInt iScreenNumber2; // Stores screen number
-    TInt iCountNumber;
-    TFileName iFilename2;
-private:
-    RTestVclntSetScrIdAndPlayPauseAviFile(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError, TInt aScreenNumber, TInt aScreenNumber2);    
-    };
-    
-/**
- * Set screen ID after play complete first time and before open the second time.
- *
- * RTestVclntSetScrIdAfterPlayAndPlayAviFile
- * MM-MMF-VCLNTAVI-I-0208-CP
- *
- */
-class RTestVclntSetScrIdAfterPlayAndPlayAviFile : public RTestVclntSetScrIdAndPlayBase
-    {
-public:
-    static RTestVclntSetScrIdAfterPlayAndPlayAviFile* NewL(const TDesC& aTestName,const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError, TInt aScreenNumber);
-    virtual TVerdict DoTestStepL();
-    virtual void FsmL(TVclntTestPlayEvents aEventCode);
-protected:
-    TInt iCountNumber;
-private:
-    RTestVclntSetScrIdAfterPlayAndPlayAviFile(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError, TInt aScreenNumber);    
-    };
-    
-/**
- * Set screen ID after Open but before play
- *
- * RTestVclntSetScrIdAfterOpenAndPlayAviFile
- * MM-MMF-VCLNTAVI-I-0209-CP
- *
- */
-class RTestVclntSetScrIdAfterOpenAndPlayAviFile : public RTestVclntSetScrIdAndPlayBase
-    {
-public:
-    static RTestVclntSetScrIdAfterOpenAndPlayAviFile* NewL(const TDesC& aTestName,const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError, TInt aScreenNumber);
-    virtual TVerdict DoTestStepL();
-    virtual void FsmL(TVclntTestPlayEvents aEventCode);
-protected:
-    TInt iCountNumber;
-private:
-    RTestVclntSetScrIdAfterOpenAndPlayAviFile(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError, TInt aScreenNumber);    
-    };
-    
-/**
- * Set screen ID during Play
- *
- * RTestVclntSetScrIdDuringPlayAndPlayAviFile
- * MM-MMF-VCLNTAVI-I-0211-CP
- *
- */
-class RTestVclntSetScrIdDuringPlayAndPlayAviFile : public RTestVclntSetScrIdAndPlayBase
-    {
-public:
-    static RTestVclntSetScrIdDuringPlayAndPlayAviFile* NewL(const TDesC& aTestName,const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError, TInt aScreenNumber);
-    virtual TVerdict DoTestStepL();
-    virtual void FsmL(TVclntTestPlayEvents aEventCode);
-protected:
-    TInt iCountNumber;
-private:
-    RTestVclntSetScrIdDuringPlayAndPlayAviFile(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError, TInt aScreenNumber);    
-    };
-    
-/**
- * 
- * CTestVclntAviPlayTimer 
- * - Timer for those test classes requiring timed stop
- *
- */
-class CTestVclntAviPlayTimer : public CTimer
-    {
-public:
-    static CTestVclntAviPlayTimer* NewL(RTestVclntSetScrIdAndPlayBase* aParent, TTimeIntervalMicroSeconds32 aWaitTime);
-    void Start();
-protected:
-    TInt RunError(TInt aError);
-    void RunL();
-private:
-    CTestVclntAviPlayTimer(RTestVclntSetScrIdAndPlayBase* aParent, TTimeIntervalMicroSeconds32 aWaitTime);
-    RTestVclntSetScrIdAndPlayBase* iParent;
-    TTimeIntervalMicroSeconds32 iWaitTime;
-    };                                              
-
-#endif //TESTVIDEOPLAYER_SECDISP_H
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/src/testvideoplayer_subtitles.h	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,303 +0,0 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-#ifndef TESTVIDEOPLAYER_SUBTITLES_H
-#define TESTVIDEOPLAYER_SUBTITLES_H
-
-#include "tsi_mmf_vclntavi_stepbase.h"
-#include "u32hal.h"
-
-#define LOG_CALL(f) INFO_PRINTF1(_L(#f)); f
-
-class RTestVclnt2Subtitle;
-
-class CPlayTimer : public CTimer
-	{
-public:
-	static CPlayTimer* NewL(RTestVclnt2Subtitle& aTestStep);
-	
-protected:
-	void RunL();
-	TInt RunError(TInt aError);
-	
-private:
-	CPlayTimer(RTestVclnt2Subtitle& aTestStep);
-	
-private:
-	RTestVclnt2Subtitle& iTestStep;
-	};
-
-/**
- * MM-MMF-VCLNTAVI-I-0600-CP
- * MM-MMF-VCLNTAVI-I-0700-CP
- */
-class RTestVclnt2Subtitle : public RTestVclnt2AviPlayerStep
-	{
-public:
-	static RTestVclnt2Subtitle* NewL(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-	
-	virtual void DoBeforePlaybackActionsL();
-	virtual void DoDuringPlaybackActionsL();
-	
-	void FailTest(TInt aError);
-	
-protected:
-	RTestVclnt2Subtitle(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-	
-	// from RTestStep
-	TVerdict DoTestStepPreambleL();
-	TVerdict DoTestStepPostambleL();
-	virtual TInt SetCacheSize();
-	virtual TInt CheckCacheError(TInt aError);
-	virtual TInt RevertCacheSize();
-	
-	void FsmL(TVclntTestPlayEvents aEventCode);	
-protected:
-	CPlayTimer* iPlayTimer;
-	};
-
-/**
- * MM-MMF-VCLNTAVI-I-0602-CP
- */
-class RTestVclnt2SubtitleEnableDuringPlayback : public RTestVclnt2Subtitle
-	{
-public:
-	static RTestVclnt2SubtitleEnableDuringPlayback* NewL(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-	void DoBeforePlaybackActionsL();
-	void DoDuringPlaybackActionsL();
-	
-private:
-	RTestVclnt2SubtitleEnableDuringPlayback(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-	};
-
-/**
- * MM-MMF-VCLNTAVI-I-0603-CP
- */
-class RTestVclnt2SubtitleDisableDuringPlayback : public RTestVclnt2Subtitle
-	{
-public:
-	static RTestVclnt2SubtitleDisableDuringPlayback* NewL(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-	void DoDuringPlaybackActionsL();
-	
-private:
-	RTestVclnt2SubtitleDisableDuringPlayback(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-	};
-
-/**
- * MM-MMF-VCLNTAVI-I-0605-CP
- */
-class RTestVclnt2SubtitleDisableTwice : public RTestVclnt2Subtitle
-	{
-public:
-	static RTestVclnt2SubtitleDisableTwice* NewL(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-	void DoBeforePlaybackActionsL();
-	void DoDuringPlaybackActionsL();
-	
-private:
-	RTestVclnt2SubtitleDisableTwice(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-	};
-	
-/**
- * MM-MMF-VCLNTAVI-I-0606-CP
- */
-class RTestVclnt2SubtitleWindowClipBefore : public RTestVclnt2Subtitle
-	{
-public:
-	static RTestVclnt2SubtitleWindowClipBefore* NewL(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-	void DoBeforePlaybackActionsL();
-	
-private:
-	RTestVclnt2SubtitleWindowClipBefore(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-	};
-
-/**
- * MM-MMF-VCLNTAVI-I-0607-CP
- */
-class RTestVclnt2SubtitleWindowClipDuring : public RTestVclnt2Subtitle
-	{
-public:
-	static RTestVclnt2SubtitleWindowClipDuring* NewL(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-	void DoDuringPlaybackActionsL();
-	
-private:
-	RTestVclnt2SubtitleWindowClipDuring(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-	};
-
-/**
- * MM-MMF-VCLNTAVI-I-0608-CP
- */
-class RTestVclnt2SubtitleRotateBefore : public RTestVclnt2Subtitle
-	{
-public:
-	static RTestVclnt2SubtitleRotateBefore* NewL(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-	void DoBeforePlaybackActionsL();
-	
-private:
-	RTestVclnt2SubtitleRotateBefore(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-	};
-
-/**
- * MM-MMF-VCLNTAVI-I-0609-CP
- */
-class RTestVclnt2SubtitleRotateDuring : public RTestVclnt2Subtitle
-	{
-public:
-	static RTestVclnt2SubtitleRotateDuring* NewL(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-	void DoDuringPlaybackActionsL();
-	
-private:
-	RTestVclnt2SubtitleRotateDuring(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-	};
-
-/**
- * MM-MMF-VCLNTAVI-I-0613-CP
- */
-class RTestVclnt2SubtitleRemoveDisplayDuring : public RTestVclnt2Subtitle
-	{
-public:
-	static RTestVclnt2SubtitleRemoveDisplayDuring* NewL(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-	void DoDuringPlaybackActionsL();
-	
-private:
-	RTestVclnt2SubtitleRemoveDisplayDuring(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-	};
-
-/**
- * MM-MMF-VCLNTAVI-I-0701-CP
- */
-class RTestVclnt2SubtitleNotAvailable : public RTestVclnt2Subtitle
-	{
-public:
-	static RTestVclnt2SubtitleNotAvailable* NewL(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-	void DoBeforePlaybackActionsL();
-	
-private:
-	RTestVclnt2SubtitleNotAvailable(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-	};
-
-/**
- * MM-MMF-VCLNTAVI-I-0705-CP
- */
-class RTestVclnt2SubtitleLanguage : public RTestVclnt2Subtitle
-	{
-public:
-	static RTestVclnt2SubtitleLanguage* NewL(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-	void DoBeforePlaybackActionsL();
-	
-private:
-	RTestVclnt2SubtitleLanguage(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-	};
-
-/**
- * MM-MMF-VCLNTAVI-I-0610-CP
- */
-class RTestVclnt2SubtitleRedraw: public RTestVclnt2Subtitle
-	{
-public:
-	static RTestVclnt2SubtitleRedraw* NewL(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError, TBool aEnableSubtitles=ETrue);
-	void DoBeforePlaybackActionsL();
-	void DoDuringPlaybackActionsL();
-	
-private:
-	RTestVclnt2SubtitleRedraw(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError, TBool aEnableSubtitles);
-
-private:
-	TBool iEnableSubtitles;
-	};
-
-/**
- * MM-MMF-VCLNTAVI-I-0611-CP
- */
-class RTestVclnt2SubtitleRotateClipRedraw: public RTestVclnt2Subtitle
-	{
-public:
-	static RTestVclnt2SubtitleRotateClipRedraw* NewL(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-	void DoBeforePlaybackActionsL();
-	void DoDuringPlaybackActionsL();
-	
-private:
-	RTestVclnt2SubtitleRotateClipRedraw(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-	};
-
-/**
- * MM-MMF-VCLNTAVI-I-0708-CP
- */
-class RTestVclnt2SubtitleMultipleWindows: public RTestVclnt2Subtitle
-	{
-public:
-	static RTestVclnt2SubtitleMultipleWindows* NewL(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-	void DoBeforePlaybackActionsL();
-	
-protected:
-	// from RTestStep
-	TVerdict DoTestStepPreambleL();
-	TVerdict DoTestStepPostambleL();
-	
-private:
-	RTestVclnt2SubtitleMultipleWindows(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-	
-private:
-	RWindow* iSecondaryWin;
-	};
-
-/**
- * MM-MMF-VCLNTAVI-I-0707-CP
- */
-class RTestVclnt2SubtitleEnableTwice: public RTestVclnt2Subtitle
-	{
-public:
-	static RTestVclnt2SubtitleEnableTwice* NewL(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-	void DoBeforePlaybackActionsL();
-	
-private:
-	RTestVclnt2SubtitleEnableTwice(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-	};
-
-/**
- * MM-MMF-VCLNTAVI-I-0612-CP
- */
-class RTestVclnt2SubtitleEnableDisableStress: public RTestVclnt2Subtitle
-	{
-public:
-	static RTestVclnt2SubtitleEnableDisableStress* NewL(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-	void DoBeforePlaybackActionsL();
-	void DoDuringPlaybackActionsL();
-	
-private:
-	RTestVclnt2SubtitleEnableDisableStress(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-
-private:
-	TBool iDisableNext;
-	TBool iExpectAvailable;
-	};
-
-/**
- * MM-MMF-VCLNTAVI-I-0706-CP
- */
-class RTestVclnt2SubtitleAlloc: public RTestVclnt2Subtitle
-	{
-public:
-	static RTestVclnt2SubtitleAlloc* NewL(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-	
-	TVerdict DoTestStepPreambleL();
-	TVerdict DoTestStepPostambleL();
-	TVerdict DoTestStepL();
-
-private:
-	RTestVclnt2SubtitleAlloc(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-	TVerdict PerformTestL();
-	};
-
-#endif //TESTVIDEOPLAYER_SUBTITLES_H
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/src/testvideorecorder.h	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,414 +0,0 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Header file: Video Recorder Tests.
-// 
-//
-
-#ifndef __TESTVIDEORECORDER_H__
-#define __TESTVIDEORECORDER_H__
-
-#include "tsi_mmf_vclntavi_stepbase.h"
-#include "u32hal.h"
-
-
-/**
- * Load and initialise a video file for recording.
- *
- * RTestVclntVideoFile
- *
- */
- 
-class CTestVclntAviRecordTimer;
-
-class RTestVclntRecordAviFile : public RTestVclntAviRecorderStep
-    {
-public:
-    RTestVclntRecordAviFile(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError, const TBool aRec);
-    static RTestVclntRecordAviFile* NewL(const TDesC& aTestName,const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError, const TBool aRec);
-    static RTestVclntRecordAviFile* NewLC(const TDesC& aTestName,const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError, const TBool aRec);
-    virtual TVerdict DoTestStepL();
-    virtual TVerdict DoTestL(CVideoRecorderUtility* aRec);
-    virtual void FsmL(TVclntTestRecordEvents aEventCode);
-    virtual void FinishedL();    
-protected:
-    const TBool iRec;                    
-    TTimeIntervalMicroSeconds iDuration;// Stores duration of video
-    CTestVclntAviRecordTimer* 	iRecordTimer;
-    TVideoAspectRatio  iAspectRatio;
-    TVideoAspectRatio  iNewAspectRatio;
-    RArray<TVideoAspectRatio> iAspectRatios;
-    TUint iAudioChannel;
-    TUint iNewAudioChannel;
-    RArray<TUint> iAudioChannels;
-    TUint iAudioSampleRate;
-    TUint iNewAudioSampleRate;
-    RArray<TUint> iAudioSampleRates;       
-    };
-
-/**
- * Load and initialise an video descriptor for recording.
- *
- * RTestVclntRecordAviDes
- *
- */
-class RTestVclntRecordAviDes : public RTestVclntAviRecorderStep
-    {
-public:
-    RTestVclntRecordAviDes(const TDesC& aTestName,const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError,const TBool aRec);
-    static RTestVclntRecordAviDes* NewL(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError,const TBool aRec);
-    static RTestVclntRecordAviDes* NewLC(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError,const TBool aRec);
-    virtual TVerdict DoTestStepL();
-    virtual TVerdict DoTestStepPreambleL();
-    virtual TVerdict DoTestStepPostambleL();
-    virtual TVerdict DoTestL(CVideoRecorderUtility* aRec);
-    virtual void FsmL(TVclntTestRecordEvents aEventCode);
-private:
-    HBufC8* iVideo;                        // Buffer for holding video descriptor data
-    TPtr8 iBuffer;                        // Stores the descriptor data
-    TTimeIntervalMicroSeconds iDuration;// Stores duration of video
-    const TBool iRec;                    
-    };
-
-/**
- * Load and initialise a video URL for recording.
- *
- * RTestVclntVideoUrl
- *
- */
- 
-class RTestVclntRecordAviUrl : public RTestVclntAviRecorderStep
-    {
-public:
-    RTestVclntRecordAviUrl(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError,const TBool aRec);
-    static RTestVclntRecordAviUrl* NewL(const TDesC& aTestName,const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError,const TBool aRec);
-    static RTestVclntRecordAviUrl* NewLC(const TDesC& aTestName,const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError,const TBool aRec);
-    virtual TVerdict DoTestStepL();
-    virtual TVerdict DoTestL(CVideoRecorderUtility* aRec);
-    virtual void FsmL(TVclntTestRecordEvents aEventCode);
-protected:
-    const TBool iRec;                    
-    TTimeIntervalMicroSeconds iDuration;// Stores duration of video
-    };
-
-/**
- * Get the Configure the recorded file and record.
- *
- * RTestVclntRecordConfig
- *
- */
-class RTestVclntRecordConfig : public RTestVclntRecordAviFile
-    {
-public:
-    static RTestVclntRecordConfig* NewL(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    virtual TVerdict DoTestL(CVideoRecorderUtility* aRec);
-private:
-    RTestVclntRecordConfig(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    };
-
-/**
- * Open file-based clip. Close the clip and then open the clip again.
- *
- * RTestVclntRecordCloseOpen
- *
- */
-class RTestVclntRecordCloseOpen : public RTestVclntRecordAviFile
-    {
-public:
-    static RTestVclntRecordCloseOpen* NewL(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    virtual TVerdict DoTestStepL();
-    virtual void FsmL(TVclntTestRecordEvents aEventCode);
-private:
-    RTestVclntRecordCloseOpen(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-
-private:
-    TInt iFrameRate;
-    TInt iOpenCount;
-    };
-
-
-/**
- * Start recording then stop on request.
- *
- * RTestVclntRecordPause
- *
- */
- 
-
-class RTestVclntRecordPause : public RTestVclntRecordAviFile
-    {
-public:
-    static RTestVclntRecordPause* NewL(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    virtual TVerdict DoTestStepL();
-    virtual void FsmL(TVclntTestRecordEvents aEventCode);
-    virtual void FinishedL();
-private:
-    RTestVclntRecordPause(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-protected:
-    TInt 						iCountNumber;
-    TVclntTestRecordEvents 		iCurrentEvent;
-    };
-
-
-/**
- * Check duration.
- *
- * RTestVclntRecordDuration
- *
- */
-class RTestVclntRecordDuration : public RTestVclntRecordAviFile
-    {
-public:
-    static RTestVclntRecordDuration* NewL(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError, const TTimeIntervalMicroSeconds aDuration);
-    virtual TVerdict DoTestL(CVideoRecorderUtility* aRec);
-private:
-    RTestVclntRecordDuration(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError, const TTimeIntervalMicroSeconds aDuration);
-    };
-
-
-/**
- * Query record time
- *
- * RTestVclntRecordTime
- *
- */
-class RTestVclntRecordTime : public RTestVclntRecordAviFile
-    {
-public:
-    static RTestVclntRecordTime* NewL(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError, const TInt aTime);
-    virtual TVerdict DoTestL(CVideoRecorderUtility* aRec);
-private:
-    RTestVclntRecordTime(const TDesC& aTestName, const TDesC& SectName,const TDesC& aKeyName, TInt aExpectedError, const TInt aTime);
-
-private:
-    TTimeIntervalMicroSeconds iTime;
-    };
-
-
-/**
- * Set gain to maximum and enquire
- *
- * RTestVclntRecordGain
- *
- */
-class RTestVclntRecordGain : public RTestVclntRecordAviFile
-    {
-public:
-    static RTestVclntRecordGain* NewL(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError, const TInt aGain);
-    virtual TVerdict DoTestL(CVideoRecorderUtility* aRec);
-private:
-    RTestVclntRecordGain(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError, const TInt aGain);
-
-private:
-    TInt iGain;
-    };
-
-/**
- * Set meta-information.
- *
- * RTestVclntRecordMeta
- *
- */
-class RTestVclntRecordMeta : public RTestVclntRecordAviFile
-    {
-public:
-    static RTestVclntRecordMeta* NewL(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    virtual TVerdict DoTestL(CVideoRecorderUtility* aRec);
-private:
-    RTestVclntRecordMeta(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    };
-
-
-/**
- * Set priority.
- *
- * RTestVclntRecordPriority
- *
- */
-
-class RTestVclntRecordPriority : public RTestVclntRecordAviFile
-    {
-public:
-    static RTestVclntRecordPriority* NewL(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError, const TInt aPriority);
-    virtual TVerdict DoTestL(CVideoRecorderUtility* aRec);
-private:
-    RTestVclntRecordPriority(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError, const TInt aPriority);
-
-private:
-    TInt iPriority;
-    };
-
-
-/**
- * Specify maximum clip size in bytes.
- *
- * RTestVclntRecordSize
- *
- */
-class RTestVclntRecordSize : public RTestVclntRecordAviFile
-    {
-public:
-    static RTestVclntRecordSize* NewL(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    virtual TVerdict DoTestL(CVideoRecorderUtility* aRec);
-private:
-    RTestVclntRecordSize(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    };
-
-
-/**
- * Set / get audio / video types
- *
- * RTestVclntRecordTypes
- *
- */
-class RTestVclntRecordTypes : public RTestVclntRecordAviFile
-    {
-public:
-    static RTestVclntRecordTypes* NewL(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    virtual TVerdict DoTestL(CVideoRecorderUtility* aRec);
-private:
-    RTestVclntRecordTypes(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    };
-
-/**
- * Record utility - Delete object before record operation has completed.
- *
- * RTestVclntRecordDelete
- *
- */
-class RTestVclntRecordDelete : public RTestVclntRecordAviFile
-    {
-public:
-    static RTestVclntRecordDelete* NewL(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    virtual TVerdict DoTestStepL();
-    virtual void FsmL(TVclntTestRecordEvents aEventCode);
-
-private:
-    RTestVclntRecordDelete(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    };
-
-/**
- * Play Video file
- * 
- * RTestVclntRecordAviRFile
- *
- */
-class RTestVclntRecordAviRFile : public RTestVclntAviRecorderStep
-    {
-public:
-    RTestVclntRecordAviRFile(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-    static RTestVclntRecordAviRFile* NewL(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-    static RTestVclntRecordAviRFile* NewLC(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-    virtual TVerdict DoTestStepL();
-    virtual void FsmL(TVclntTestRecordEvents aEventCode);
-protected:
-    TTimeIntervalMicroSeconds iDuration;// Stores duration of video
-    RFs iFs;
-    RFile iFile;
-    };
-
-/**
- * Play Video file
- * 
- * RTestVclntRecordAviRFileAllParams
- *
- */
-class RTestVclntRecordAviRFileAllParams : public RTestVclntAviRecorderStep
-    {
-public:
-    RTestVclntRecordAviRFileAllParams(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError, TBool aAlloc, TUid aControllerUid, TUid aVideoFormat, TFourCC aAudioType);
-    static RTestVclntRecordAviRFileAllParams* NewL(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError, const TBool aAlloc, TUid aControllerUid, TUid aVideoFormat, TFourCC aAudioType);
-    static RTestVclntRecordAviRFileAllParams* NewLC(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError, const TBool aAlloc, TUid aControllerUid, TUid aVideoFormat, TFourCC aAudioType);
-    virtual TVerdict DoTestStepL();
-    virtual void FsmL(TVclntTestRecordEvents aEventCode);
-	virtual TInt SetCacheSize();
-	virtual TInt CheckCacheError(TInt aError);
-protected:
-    TVerdict PerformTestStepL();
-    TBool iAlloc;                    
-    TTimeIntervalMicroSeconds iDuration;
-    TUid iControllerUid;
-    TUid iVideoFormat;
-    TFourCC iAudioType;
-    RFs iFs;
-    RFile iFile;
-    };
-
-/**
- * 
- * CTestVclntAviRecordTimer 
- * - Timer for those test classes requiring timed stop
- *
- */
-class CTestVclntAviRecordTimer : public CTimer
-    {
-public:
-    static CTestVclntAviRecordTimer* NewL(RTestVclntRecordAviFile* aParent, TTimeIntervalMicroSeconds32 aWaitTime);
-    void Start();
-protected:
-    TInt RunError(TInt aError);
-    void RunL();
-private:
-    CTestVclntAviRecordTimer(RTestVclntRecordAviFile* aParent, TTimeIntervalMicroSeconds32 aWaitTime);
-    RTestVclntRecordAviFile* 		iParent;
-    TTimeIntervalMicroSeconds32 iWaitTime;
-    };                                              
-
-/**
-CTestVclntAviRecordSetVideoEnabled
-*/
-class CTestVclntAviRecordSetVideoEnabled : public RTestVclntAviRecorderStep
-    {
-public:
-	CTestVclntAviRecordSetVideoEnabled(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-    static CTestVclntAviRecordSetVideoEnabled* NewL(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-    virtual TVerdict DoTestStepL();
-    virtual void FsmL(TVclntTestRecordEvents aEventCode);
-protected:
-    TTimeIntervalMicroSeconds iDuration;// Stores duration of video
-    RFs iFs;
-    RFile iFile;
-    };    
-    
-/**
-CTestVclntAviRecordSetVideoQuality
-*/
-class CTestVclntAviRecordSetVideoQuality : public RTestVclntAviRecorderStep
-    {
-public:
-	CTestVclntAviRecordSetVideoQuality(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-    static CTestVclntAviRecordSetVideoQuality* NewL(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-    virtual TVerdict DoTestStepL();
-    virtual void FsmL(TVclntTestRecordEvents aEventCode);
-protected:
-    TTimeIntervalMicroSeconds iDuration;// Stores duration of video
-    RFs iFs;
-    RFile iFile;
-    };      
-    
-/**
-CTestVclntAviRecordSetVideoFrameRateFixed
-*/
-class CTestVclntAviRecordSetVideoFrameRateFixed : public RTestVclntAviRecorderStep
-    {
-public:
-	CTestVclntAviRecordSetVideoFrameRateFixed(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-    static CTestVclntAviRecordSetVideoFrameRateFixed* NewL(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-    virtual TVerdict DoTestStepL();
-    virtual void FsmL(TVclntTestRecordEvents aEventCode);
-protected:
-    TTimeIntervalMicroSeconds iDuration;// Stores duration of video
-    RFs iFs;
-    RFile iFile;
-    };
-#endif // __TESTVIDEORECORDER_H__
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/src/testvideorecorder_par_audio.h	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,405 +0,0 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Header file: Video Recorder Extra Tests.
-// 
-//
-
-#ifndef TESTVIDEORECORDER_PAR_AUDIO_H
-#define TESTVIDEORECORDER_PAR_AUDIO_H
-
-#include "tsi_mmf_vclntavi_stepbase.h"
-#include "testvideorecorder.h"
-
-
-// POSITIVE TESTS
-
-/**
- * Set and Get video pixel aspect ratio for recording and record.
- * MM-MMF-VCLNTAVI-I-0300, MM-MMF-VCLNTAVI-I-0315
- *
- * RTestVclntSetGetPARRec
- *
- */
-class RTestVclntSetGetPARRec : public RTestVclntRecordAviFile
-    {
-public:
-    static RTestVclntSetGetPARRec* NewL(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError,TInt aNumerator=1, TInt aDenominator=1);
-    virtual TVerdict DoTestStepL();
-    virtual void FsmL(TVclntTestRecordEvents aEventCode);
-    virtual void FinishedL();
-private:
-    RTestVclntSetGetPARRec(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError, TInt aNumerator, TInt aDenominator);
-    };
-
-/**
- * Get supported video pixel aspect ratioes for recording.
- * MM-MMF-VCLNTAVI-I-0301
- *
- * RTestVclntGetSuppPAR
- *
- */
-class RTestVclntGetSuppPAR : public RTestVclntRecordAviFile
-    {
-public:
-    static RTestVclntGetSuppPAR* NewL(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    virtual TVerdict DoTestStepL();
-    virtual void FsmL(TVclntTestRecordEvents aEventCode);
-    virtual void FinishedL();
-private:
-    RTestVclntGetSuppPAR(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    };
-
-/**
- * Set and Get PAR [1:1] (in invalid state) after open and prepare and then record.
- * MM-MMF-VCLNTAVI-I-0302
- *
- * RTestVclntSetGetPARAftOpenPrepThenRec
- *
- */
-class  RTestVclntSetGetPARAftOpenPrepThenRec : public RTestVclntRecordAviFile
-    {
-public:
-    static  RTestVclntSetGetPARAftOpenPrepThenRec* NewL(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    virtual TVerdict DoTestStepL();
-    virtual void FsmL(TVclntTestRecordEvents aEventCode);
-	virtual void FinishedL();
-private:
-	RTestVclntSetGetPARAftOpenPrepThenRec(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    };
-
-/**
- * Set video PAR (in invalid state) after opening the video file for recording (without setting video frame size, video codec and audio codec.
- * MM-MMF-VCLNTAVI-I-0303
- *
- * RTestVclntSetPARAftOpenWoutSetVidAudCodec
- *
- */
-class RTestVclntSetPARAftOpenWoutSetVidAudCodec : public RTestVclntRecordAviFile
-    {
-public:
-    static RTestVclntSetPARAftOpenWoutSetVidAudCodec* NewL(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    virtual TVerdict DoTestStepL();
-    virtual void FsmL(TVclntTestRecordEvents aEventCode);
-    virtual void FinishedL();
-private:
-    RTestVclntSetPARAftOpenWoutSetVidAudCodec(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    };
-
-/**
- * Set and Get the number of audio channels for recording and record.
- * RTestVclntSetGetAudChanRec
- * MM-MMF-VCLNTAVI-I-0304, MM-MMF-VCLNTAVI-I-0318
- */
-class RTestVclntSetGetAudChanRec : public RTestVclntRecordAviFile
-    {
-public:
-    static RTestVclntSetGetAudChanRec* NewL(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError, TInt aAudioChannel=2);
-    virtual TVerdict DoTestStepL();
-    virtual void FsmL(TVclntTestRecordEvents aEventCode);
-    virtual void FinishedL();
-private:
-    RTestVclntSetGetAudChanRec(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError, TInt aAudioChannel=2);
-    };
-
-/**
- * Get supported number of audio channels for recording.
- *
- * MM-MMF-VCLNTAVI-I-0305
- * RTestVclntGetSuppAudChan
- *
- */
-class RTestVclntGetSuppAudChan : public RTestVclntRecordAviFile
-    {
-public:
-    static RTestVclntGetSuppAudChan* NewL(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    virtual TVerdict DoTestStepL();
-    virtual void FsmL(TVclntTestRecordEvents aEventCode);
-    virtual void FinishedL();
-private:
-    RTestVclntGetSuppAudChan(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    };
-
-/**
- * Set and Get valid audio channel (in invalid state) after open and prepare and then record.
- * MM-MMF-VCLNTAVI-I-0306
- *
- * RTestVclntSetGetAudChanAftOpenPrepThenRec
- *
- */
-class RTestVclntSetGetAudChanAftOpenPrepThenRec : public RTestVclntRecordAviFile
-    {
-public:
-    static RTestVclntSetGetAudChanAftOpenPrepThenRec* NewL(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    virtual TVerdict DoTestStepL();
-    virtual void FsmL(TVclntTestRecordEvents aEventCode);
-	virtual void FinishedL();
-private:
-    RTestVclntSetGetAudChanAftOpenPrepThenRec(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    };
-
-/**
- * Get the list of supported channels, Set and Get the valid audio channel (in invalid state) before selecting the audio codec and start recording.
- * MM-MMF-VCLNTAVI-I-0307
- *
- * RTestVclntGetSuppAudChanSetGetAudChanBefAudCodRec
- *
- */
-class RTestVclntGetSuppAudChanSetGetAudChanBefAudCodRec : public RTestVclntRecordAviFile
-    {
-public:
-    static RTestVclntGetSuppAudChanSetGetAudChanBefAudCodRec* NewL(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    virtual TVerdict DoTestStepL();
-    virtual void FsmL(TVclntTestRecordEvents aEventCode);
-	virtual void FinishedL();
-private:
-    RTestVclntGetSuppAudChanSetGetAudChanBefAudCodRec(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    };
-
-/**
- * Set and Get the audio sample rate for recording.
- * MM-MMF-VCLNTAVI-I-0308, MM-MMF-VCLNTAVI-I-0321
- *
- * RTestVclntSetGetAudSRRec
- *
- */
-class RTestVclntSetGetAudSRRec : public RTestVclntRecordAviFile
-    {
-public:
-    static RTestVclntSetGetAudSRRec* NewL(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError, TInt aAudioSampleRate=22050);
-    virtual TVerdict DoTestStepL();
-	virtual void FsmL(TVclntTestRecordEvents aEventCode);
-    virtual void FinishedL();
-private:
-    RTestVclntSetGetAudSRRec(const TDesC& aTestName, const TDesC& SectName,const TDesC& aKeyName, TInt aExpectedError, TInt aAudioSampleRate=22050);
-    };
-
-/**
- * Set and Get the audio sample rate for recording and record.
- * MM-MMF-VCLNTAVI-I-0309
- *
- * RTestVclntGetSuppAudSR
- *
- */
-class RTestVclntGetSuppAudSR : public RTestVclntRecordAviFile
-    {
-public:
-    static RTestVclntGetSuppAudSR* NewL(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    virtual TVerdict DoTestStepL();
-	virtual void FsmL(TVclntTestRecordEvents aEventCode);
-    virtual void FinishedL();
-private:
-    RTestVclntGetSuppAudSR(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    };
-
-/**
- * Set and Get valid sample rate (in invalid state) after open and prepare and then record.
- * MM-MMF-VCLNTAVI-I-0310
- *
- * RTestVclntSetGetSRAftOpenPrepRec
- *
- */
-class RTestVclntSetGetSRAftOpenPrepRec : public RTestVclntRecordAviFile
-    {
-public:
-    static RTestVclntSetGetSRAftOpenPrepRec* NewL(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    virtual TVerdict DoTestStepL();
-    virtual void FsmL(TVclntTestRecordEvents aEventCode);
-    virtual void FinishedL();
-private:
-    RTestVclntSetGetSRAftOpenPrepRec(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    };
-
-/**
- * Get the list of supported sample rates, Set and Get the valid sample rates (in invalid state) before selecting the audio codec and then record.
- * MM-MMF-VCLNTAVI-I-0311
- *
- * RTestVclntGetSuppSRSetGetSRBefAudCodRec
- *
- */
-class RTestVclntGetSuppSRSetGetSRBefAudCodRec : public RTestVclntRecordAviFile
-    {
-public:
-    static RTestVclntGetSuppSRSetGetSRBefAudCodRec* NewL(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    virtual TVerdict DoTestStepL();
-    virtual void FsmL(TVclntTestRecordEvents aEventCode);
-	virtual void FinishedL();
-private:
-    RTestVclntGetSuppSRSetGetSRBefAudCodRec(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    };
-
-/**
- * Get default PAR,audio sample rate and audio channel after open the target but before prepare has been called.
- * MM-MMF-VCLNTAVI-I-0312
- *
- * RTestVclntGetDefPARAudSRAudChanAftOpenBefPrep
- *
- */
-class RTestVclntGetDefPARAudSRAudChanAftOpenBefPrep : public RTestVclntRecordAviFile
-    {
-public:
-    static RTestVclntGetDefPARAudSRAudChanAftOpenBefPrep* NewL(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    virtual TVerdict DoTestStepL();
-	virtual void FsmL(TVclntTestRecordEvents aEventCode);
-	virtual void FinishedL();
-private:
-    RTestVclntGetDefPARAudSRAudChanAftOpenBefPrep(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    };
-
-/**
- * Set Audio/Video Bit Rate, Audio Gain and PAR before Prepare and do recording  while calling Pause in between  the recording and Get the Audio/Video Bit Rate,  Audio Gain and PAR after Stop.
- * MM-MMF-VCLNTAVI-I-0313
- * RTestVclntSetGetPARAudVidBRAudGain
- *
- */
-class RTestVclntSetGetPARAudVidBRAudGain : public RTestVclntRecordAviFile
-    {
-public:
-    static RTestVclntSetGetPARAudVidBRAudGain* NewL(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    virtual TVerdict DoTestStepL();
-	virtual void FsmL(TVclntTestRecordEvents aEventCode);
-	virtual void FinishedL();
-private:
-    RTestVclntSetGetPARAudVidBRAudGain(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    TVclntTestRecordEvents 		iCurrentEvent;
-    TInt 						iGain;
-    };
-
-/**
- * Set and Get audio sample rate and no. of channels for video only file [audio disabled] and then record.
- * MM-MMF-VCLNTAVI-I-0314
- *
- * RTestVclntSetValidSetGetAudSRChanAudDisable
- *
- */
-class RTestVclntSetGetAudSRAudChanWithAudDisable : public RTestVclntRecordAviFile
-    {
-public:
-    static RTestVclntSetGetAudSRAudChanWithAudDisable* NewL(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    virtual TVerdict DoTestStepL();
-    virtual void FsmL(TVclntTestRecordEvents aEventCode);
-	virtual void FinishedL();
-private:
-    RTestVclntSetGetAudSRAudChanWithAudDisable(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    };
-
-// NEGATIVE TESTS
-/**
- * Get supported list of PAR,Set and Get PAR [1:1] (in invalid state) before Open File. Then Open and Record.
- * MM-MMF-VCLNTAVI-I-0316
- *
- * RTestVclntGetSuppPARSetGetPARBefOpenThenOpenRec
- *
- */
-class RTestVclntGetSuppPARSetGetPARBefOpenThenOpenRec : public RTestVclntRecordAviFile
-    {
-public:
-    static RTestVclntGetSuppPARSetGetPARBefOpenThenOpenRec* NewL(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    virtual TVerdict DoTestStepL();
-	virtual void FsmL(TVclntTestRecordEvents aEventCode);
-	virtual void FinishedL();
-private:
-    RTestVclntGetSuppPARSetGetPARBefOpenThenOpenRec(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    };
-
-/**
- * Set and Get PAR [1:1] (in invalid state) in recording state.
- * MM-MMF-VCLNTAVI-I-0317
- *
- * RTestVclntSetGetValidPARWhileRec
- *
- */
-class RTestVclntSetGetValidPARWhileRec : public RTestVclntRecordAviFile
-    {
-public:
-    static RTestVclntSetGetValidPARWhileRec* NewL(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    virtual TVerdict DoTestStepL();
-    virtual void FsmL(TVclntTestRecordEvents aEventCode);
-    virtual void FinishedL();
-private:
-    RTestVclntSetGetValidPARWhileRec(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    };
-
-/**
- * Get the list of supported channels, Set and Get valid audio channel (in invalid state) before open the target and then start recording after open the file.
- * MM-MMF-VCLNTAVI-I-0319
- *
- * RTestVclntGetSuppChanSetGetAudChanBefOpenThenOpenRec
- *
- */
-class RTestVclntGetSuppChanSetGetAudChanBefOpenThenOpenRec : public RTestVclntRecordAviFile
-    {
-public:
-    static RTestVclntGetSuppChanSetGetAudChanBefOpenThenOpenRec* NewL(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    virtual TVerdict DoTestStepL();
-    virtual void FsmL(TVclntTestRecordEvents aEventCode);
-    virtual void FinishedL();
-private:
-   RTestVclntGetSuppChanSetGetAudChanBefOpenThenOpenRec(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    };
-
-/**
- * Set and Get valid audio channel (in invalid state) in recording state.
- * MM-MMF-VCLNTAVI-I-0320
- *
- * RTestVclntSetGetValidAudChanWhileRec
- *
- */
-class RTestVclntSetGetValidAudChanWhileRec : public RTestVclntRecordAviFile
-    {
-public:
-    static RTestVclntSetGetValidAudChanWhileRec* NewL(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    virtual TVerdict DoTestStepL();
-    virtual void FsmL(TVclntTestRecordEvents aEventCode);
-	virtual void FinishedL();
-private:
-    RTestVclntSetGetValidAudChanWhileRec(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    };
-
-/**
- * Get supported list of sample rates, Set and Get valid sample rate (in invalid state) before openfile. Then open and record.
- * MM-MMF-VCLNTAVI-I-0322
- *
- * RTestVclntGetSuppSRSetGetSRBefOpenThenOpenRec
- *
- */
-class RTestVclntGetSuppSRSetGetSRBefOpenThenOpenRec : public RTestVclntRecordAviFile
-    {
-public:
-    static RTestVclntGetSuppSRSetGetSRBefOpenThenOpenRec* NewL(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    virtual TVerdict DoTestStepL();
-    virtual void FsmL(TVclntTestRecordEvents aEventCode);
-	virtual void FinishedL();
-private:
-    RTestVclntGetSuppSRSetGetSRBefOpenThenOpenRec(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    };
-
-/**
- * Set and Get valid sample rate (in invalid state) during recording.
- * MM-MMF-VCLNTAVI-I-0323
- *
- * RTestVclntSetGetValidSRWhileRec
- *
- */
-class RTestVclntSetGetValidSRWhileRec : public RTestVclntRecordAviFile
-    {
-public:
-    static RTestVclntSetGetValidSRWhileRec* NewL(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    virtual TVerdict DoTestStepL();
-    virtual void FsmL(TVclntTestRecordEvents aEventCode);
-	virtual void FinishedL();
-private:
-    RTestVclntSetGetValidSRWhileRec(const TDesC& aTestName, const TDesC& aSectName,const TDesC& aKeyName, TInt aExpectedError);
-    };
-
-#endif // TESTVIDEORECORDER_PAR_AUDIO_H
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/src/tsi_mmf_vclntavi_stepbase.h	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,267 +0,0 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Header file: Base classes for Video Client tests
-// 
-//
-
-#ifndef TSI_MMF_VCLNTAVI_STEP_H
-#define TSI_MMF_VCLNTAVI_STEP_H
-
-#include <e32base.h>
-#include <badesca.h>
-#include <e32test.h>
-#include <e32keys.h>
-#include <c32comm.h>
-#include <f32file.h>
-#include <etel.h>
-#include <etelmm.h>
-#include <testframework.h>
-
-#include <fbs.h>
-#include <w32std.h>
-#include <mmf/common/mmfstandardcustomcommands.h> 
-#include <mda/common/video.h>
-
-#include <videoplayer.h>
-#ifdef SYMBIAN_BUILD_GCE
-#include <videoplayer2.h> 
-#include <mediaclientvideodisplay.h>
-#endif
-#include <videorecorder.h>
-#include <ecam.h>
-
-// Video Controller UIDs
-const TUid KAviRecordFormatUid =    {0x102737E3};
-const TUid KVideoStubControllerUid = {0x101F88D9};
-const TUid KVideoInvalidControllerUid = {0xA0A0A0A0};
-const TUid KVideoTestSCBControllerUid = {0x101FE477};
-
-// Video Controller UIDs
-const TUid KMmfTestAviPlayControllerUid = { 0x102737A5 };
-const TUid KMmfTestAviRecordControllerUid = { 0x102737E1 };
-const TUid KMmfTestAviNonGcePlayControllerUid = { 0x10283420 };
-	
-
-const TInt KMMFVideoRecordTimeAvailable = 10000000;
-const TReal32 KDefaultFrameRate = 10.00;
-
-_LIT(KECamTestCameraPluginName, "C:\\102070cc.txt");
-_LIT(KBinaryCompatibilityKeyName, "binarycomp");
-
-_LIT(KMMCameraPluginName, "C:\\mmcameraclientplugin.txt");
-
-// Local function to get the drive name
-TAny GetDriveName(TDes& aFileName);
-
-class CTestSuite ;
-
-/**
- * Global Data used within tests
- *
- */
-const TInt KTwelfthOfSec        = 83333;
-const TInt KTenthOfSec            = 100000 ;
-const TInt KOneSecond            = 1000000;    // Used in a time out function, 1 second (in microSeconds)
-const TInt KTenSeconds            = 10000000;    // Used in a time out function, 10 seconds (in microSeconds)
-const TInt KFiveSeconds            = 5000000;    // 5 seconds (in microSeconds)
-const TInt KFifteenSeconds        = 15000000;    // 15 seconds (in microSeconds)
-const TInt KExpectedDeviation    = 1750000;    // 1.75 second tolerance for timed tests
-const TInt KSixSeconds			 = 6000000;
-const TInt KNameBufSize            = 25;
-const TInt KMaxBalance            = 100;
-const TInt KMinBalance          = -100;
-const TInt KMaxVolume           = 65535;
-
-
-// Enum to decide Agent has generated the event.
-enum TVclntTestPlayEvents
-    {
-    EVPIdle = 0,
-    EVPOpenComplete,
-    EVPPrepareComplete,
-    EVPFrameReady,
-    EVPPlayComplete,
-    EVPPlayStopped,
-    EVPPlayPaused
-    };
-
-enum TVclntTestRecordEvents
-    {
-    EVRIdle = 0,
-    EVROpenComplete,
-    EVRRecordPaused,
-    EVRRecordResumed,
-    EVRRecordStopped,
-    EVRRecordComplete,
-    EVRPrepareComplete,
-    EVRViewFinderReady,
-    EVRImageBufferReady,
-    EVRVideoBufferReady,
-    };
-
-// Global function to get the drive name
-TAny GetDriveName(TDes& aFileName);
-    
-/**
- * It's a base class for all test steps.
- *
- * RTestMmfVclntAviStep 
- * Base Test step class that enables tests.
- *
- */
-class RTestMmfVclntAviStep : public RTestStep
-    {
-public:
-    RTestMmfVclntAviStep(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-    void SetTestSuite(const CTestSuite* aTestSuite ) { iTestSuite = aTestSuite; }
-
-protected:
-    void WaitWithTimeout(TRequestStatus& aStatus, TInt aNumberOfMicroSeconds);
-    TBool TimeComparison(const TUint aActual, const TUint aExpected, const TUint aDeviation);
-    virtual TVerdict DoTestStepPreambleL();
-    virtual TVerdict DoTestStepPostambleL();
-    virtual void InitWservL();
-    virtual void DeInitWserv();
-    // Function to delete a file
-    TInt DeleteFileL(const TDesC &aFileName);
-    TUid ControllerUid() const;
-protected:
-    const CTestSuite* iTestSuite ;
-    CActiveScheduler* iActiveScheduler;
-    
-    // Window server related objects
-    RWsSession iWs;
-    CWsScreenDevice* iScreen;
-    RWindow* iWindow;
-    RWindowGroup iRootWindow;
-    
-    // Members to hold the ini file sections and the file name for each test.
-    TBuf<KNameBufSize> iSectName;            // Section name for retrieving filename
-    TBuf<KNameBufSize> iKeyName;            // Key name for retrieving filename
-    TFileName iFilename;
-    
-    TInt iTestExpectedError;
-    TInt iExpectedError;
-    TInt iError;
-    TBool iBinaryCompatibility;
-#ifdef SYMBIAN_BUILD_GCE
-    CMediaClientVideoDisplay* iMediaClientVideoDisplay;
-#endif
-    };
-
-/**
- * It's a base class for all test steps using CVideoPlayerUtility for video playback
- *
- * RTestVclntAviPlayerStep
- * Base Test step class class for Video Player tests using CVideoPlayerUtility
- *
- */
-class RTestVclntAviPlayerStep : public RTestMmfVclntAviStep, public MVideoPlayerUtilityObserver
-    {
-public:
-    RTestVclntAviPlayerStep(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-
-protected:
-    // from RTestStep
-    virtual TVerdict DoTestStepPreambleL();
-    virtual TVerdict DoTestStepPostambleL();
-    // from MVideoPlayerUtilityObserver
-    virtual void MvpuoOpenComplete(TInt aError);
-    virtual void MvpuoPrepareComplete(TInt aError);
-    virtual void MvpuoFrameReady(CFbsBitmap& aFrame,TInt aError);
-    virtual void MvpuoPlayComplete(TInt aError);
-    virtual void MvpuoEvent(const TMMFEvent& aEvent);
-    //State Machine
-    virtual void FsmL(TVclntTestPlayEvents aEventCode) = 0;
-    virtual TBool FsmCheck(TVclntTestPlayEvents aEventCode);
-    void ResetState();
-    void PrepareState(TVclntTestPlayEvents aExpectedEvent, TInt aExpectedError = KErrNone);
-protected:
-    CVideoPlayerUtility* iVideoPlayer;
-    TVclntTestPlayEvents iExpectedEvent;
-    };
-
-
-#ifdef SYMBIAN_BUILD_GCE 
-/**
- * It's a base class for all test steps using CVideoPlayerUtility2 for video playback
- *
- * RTestVclntAviPlayerStep2
- * Base Test step class class for Video Player tests using CVideoPlayerUtility2
- *
- */
-class RTestVclnt2AviPlayerStep : public RTestVclntAviPlayerStep
-    {
-public:
-    RTestVclnt2AviPlayerStep(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-    
-protected:
-    // from RTestStep
-    virtual TVerdict DoTestStepPreambleL();
-    virtual TVerdict DoTestStepPostambleL();
-    virtual TVerdict DoTestStepL();    
-    
-    // state machine
-    virtual TBool FsmCheck(TVclntTestPlayEvents aEventCode);    
-
-    // for the setup of display window 
-    virtual void InitWservL();
-    virtual void DeInitWserv();
-
-protected:
-    CVideoPlayerUtility2* iVideoPlayer2;
-    CWindowGc* iGc;    
-    };
-#endif
-
-/**
- * It's a base class for all test steps.
- *
- * RTestVclntAviRecorderStep
- * Base Test step class class for Video Recorder tests.
- *
- */
-class RTestVclntAviRecorderStep : public RTestMmfVclntAviStep, public MVideoRecorderUtilityObserver, public MCameraObserver2
-    {
-public:
-    RTestVclntAviRecorderStep(const TDesC& aTestName, const TDesC& aSectName, const TDesC& aKeyName, TInt aExpectedError);
-
-protected:
-    // from RTestStep
-    virtual TVerdict DoTestStepPreambleL();
-    virtual TVerdict DoTestStepPostambleL();
-    // MVideoRecorderUtilityObserver
-    virtual void MvruoOpenComplete(TInt aError);
-    virtual void MvruoRecordComplete(TInt aError);
-    virtual void MvruoPrepareComplete(TInt aError);
-    virtual void MvruoEvent(const TMMFEvent& aEvent);
-    // from MCameraObserver2
-    virtual void HandleEvent(const TECAMEvent &aEvent);
-    virtual void ViewFinderReady(MCameraBuffer &aCameraBuffer, TInt aError);
-    virtual void ImageBufferReady(MCameraBuffer &aCameraBuffer, TInt aError);
-    virtual void VideoBufferReady(MCameraBuffer &aCameraBuffer, TInt aError);
-    //State Machine
-    virtual void FsmL(TVclntTestRecordEvents aEventCode) = 0;
-    TBool FsmCheck(TVclntTestRecordEvents aEventCode);
-    void ResetState();
-    void PrepareState(TVclntTestRecordEvents aExpectedEvent, TInt aExpectedError = KErrNone);
-protected:
-    CVideoRecorderUtility* iVideoRecorder;
-    CCamera* iCamera;
-    TInt iCameraHandle;
-    TVclntTestRecordEvents iExpectedEvent;
-    };
-
-#endif// TSI_MMF_VCLNTAVI_STEP_H
-
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/src/tsi_mmf_vclntavi_suite.h	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// This contains CTestMmfVclntAviSuite 
-// Header file: Test Suite for Video Client tests
-// 
-//
-
-#ifndef TSI_MMF_VCLNTAVI_SUITE_H
-#define TSI_MMF_VCLNTAVI_SUITE_H
-
-class RTestMmfVclntAviStep;
-
-/**
- *
- * CTestMmfVclntAviSuite
- *
- */
-class CTestMmfVclntAviSuite : public CTestSuite
-    {
-public:
-    void InitialiseL();
-    virtual ~CTestMmfVclntAviSuite();
-    void AddTestStepL(RTestMmfVclntAviStep* ptrTestStep);
-    TPtrC GetVersion();
-
-#ifdef __WINS__
-protected:
-    // TO create the Window Server related objects
-    TBool WaitUntilWindowServerReadyL();
-    void InitWservL();
-    void DeInitWserv();
-protected:
-    CWsScreenDevice* iScreen;
-    RWindow* iWindow;
-    RWsSession iWs;
-    RWindowGroup iRootWindow;
-#endif // __WINS__
-
-    RFs iFileSession;
-    // TO use the ECam Test Plug-in
-    void CreateDependencyFileL();
-    void RemoveDependencyFile();
-    };
-
-#endif // __TSI_MMF_VCLNTAVI_SUITE_H__
-
Binary file mmlibs/mmfw/tsrc/mmfunittest/AFMT/Data/pcm8mono11khz.raw has changed
--- a/mmlibs/mmfw/tsrc/mmfunittest/AFMT/TSU_MMF_AFMT_ALLOC.script	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/AFMT/TSU_MMF_AFMT_ALLOC.script	Fri Jul 09 12:23:13 2010 +0100
@@ -26,7 +26,7 @@
 #
 //! @SYMTestCaseID MM-MMF-AFMT-U-0257-HP
 
-RUN_TEST_STEP 600000, TSU_MMF_AFMT, MM-MMF-AFMT-U-0257-HP
+RUN_TEST_STEP 6000000, TSU_MMF_AFMT, MM-MMF-AFMT-U-0257-HP
 TEST_COMPLETE
 
 #Req. under test REQ172.11.21
--- a/mmlibs/mmfw/tsrc/mmfunittest/Actrl/TSU_MMF_ACTRL_01.script	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/Actrl/TSU_MMF_ACTRL_01.script	Fri Jul 09 12:23:13 2010 +0100
@@ -157,11 +157,6 @@
 RUN_TEST_STEP -1,ACtrl, MM-MMF-ACTRL-U-0058-HP
 TEST_COMPLETE
 
-//! @SYMTestCaseID MM-MMF-ACTRL-U-0059-HP
-
-RUN_TEST_STEP -1,ACtrl, MM-MMF-ACTRL-U-0059-HP
-TEST_COMPLETE
-
 // 36)+
 // 
 //! @SYMTestCaseID MM-MMF-ACTRL-U-0036-HP
@@ -532,3 +527,9 @@
 
 RUN_TEST_STEP -1,ACtrl, MM-MMF-ACTRL-U-0065-HP
 TEST_COMPLETE 
+
+//! @SYMTestCaseID MM-MMF-ACTRL-U-0059-HP
+
+RUN_TEST_STEP -1,ACtrl, MM-MMF-ACTRL-U-0059-HP
+TEST_COMPLETE
+
--- a/mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/CIPlugins/group/BLD.INF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Build only if DevSound (not A3F version) is built.
-// 
-//
-
-PRJ_MMPFILES
-../mmpfiles/devsoundciutestdevices.mmp
-../mmpfiles/tsu_mmf_devsound_ciu.mmp
-
-
-#ifdef SYMBIAN_MULTIMEDIA_A3FDEVSOUND
-../mmpfiles/a3fcistubextn.mmp
-#endif
-
-
-PRJ_EXPORTS
-// test scripts
-../scripts/tsu_mmf_devsound_ciu.script	c:/tsu_mmf_devsound_ciu.script
-
-//iby files
-tsu_mmf_devsound_ciu.iby			/epoc32/rom/include/tsu_mmf_devsound_ciu.iby
--- a/mmlibs/mmfw/tsrc/mmfunittest/DevVideo/group/TSU_MMF_DEVVIDEO_01.iby	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/DevVideo/group/TSU_MMF_DEVVIDEO_01.iby	Fri Jul 09 12:23:13 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -15,10 +15,7 @@
 
 #ifndef __TSU_MMF_DEVVIDEO_01_IBY__
 #define __TSU_MMF_DEVVIDEO_01_IBY__
-
-#include <testframework.iby>
-
-file=ABI_DIR\DEBUG_DIR\TSU_MMF_DEVVIDEO_01.DLL 			System\Libs\TSU_MMF_DEVVIDEO_01.DLL
+#include <TSU_MMF_DEVVIDEO_01_excl_test.iby>
 
 data=EPOCROOT##epoc32\data\c\TSU_MMF_DEVVIDEO_01.script    	\TSU_MMF_DEVVIDEO_01.script
 data=EPOCROOT##epoc32\data\c\TSU_MMF_DEVVIDEO_01_Alloc.script   \TSU_MMF_DEVVIDEO_01_Alloc.script
@@ -26,7 +23,6 @@
 data=EPOCROOT##epoc32\data\c\TSU_MMF_DEVVIDEO_02_Alloc.script   \TSU_MMF_DEVVIDEO_02_Alloc.script
 data=EPOCROOT##epoc32\data\c\TSU_MMF_DEVVIDEO_01.bat   		\doTest.bat
 
-ECOM_PLUGIN(testdevvideoplugins.dll,101fb64d.rsc)
 
 #endif
 
--- a/mmlibs/mmfw/tsrc/mmfunittest/DevVideo/group/bld.inf	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/DevVideo/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -17,7 +17,7 @@
 PRJ_PLATFORMS
 DEFAULT
 
-PRJ_MMPFILES
+PRJ_TESTMMPFILES
 
 // DEVVIDEO
 ../mmpfiles/TSU_MMF_DEVVIDEO_01.mmp
@@ -26,7 +26,7 @@
 ../mmpfiles/testdevvideociuplugins.mmp
 
 
-PRJ_EXPORTS
+PRJ_TESTEXPORTS
 
 // test scripts
 ../scripts/TSU_MMF_DEVVIDEO_01.script c:/tsu_mmf_devvideo_01.script
@@ -39,6 +39,7 @@
 #endif
 
 //iby files
-../group/TSU_MMF_DEVVIDEO_01.iby	/epoc32/rom/include/tsu_mmf_devvideo_01.iby
-../group/tsu_mmf_devvideo_ciu_01.iby	/epoc32/rom/include/tsu_mmf_devvideo_ciu_01.iby
-
+../group/TSU_MMF_DEVVIDEO_01.iby		/epoc32/rom/include/tsu_mmf_devvideo_01.iby
+../group/tsu_mmf_devvideo_01_excl_test.iby	/epoc32/rom/include/tsu_mmf_devvideo_01_excl_test.iby
+../group/tsu_mmf_devvideo_ciu_01.iby		/epoc32/rom/include/tsu_mmf_devvideo_ciu_01.iby
+../group/tsu_mmf_devvideo_ciu_01_excl_test.iby	/epoc32/rom/include/tsu_mmf_devvideo_ciu_01_excl_test.iby
--- a/mmlibs/mmfw/tsrc/mmfunittest/DevVideo/group/tsu_mmf_devvideo_ciu_01.iby	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/DevVideo/group/tsu_mmf_devvideo_ciu_01.iby	Fri Jul 09 12:23:13 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -15,17 +15,10 @@
 
 #ifndef TSU_MMF_DEVVIDEO_CIU_01_IBY
 #define TSU_MMF_DEVVIDEO_CIU_01_IBY
-
-#include <testframework.iby>
-
-
-file=ABI_DIR\DEBUG_DIR\tsu_mmf_devvideo_ciu_01.dll 				System\Libs\tsu_mmf_devvideo_ciu_01.dll
-
+#include <TSU_MMF_DEVVIDEO_CIU_01_excl_test.iby>
 
 data=EPOCROOT##epoc32\data\c\tsu_mmf_devvideo_ciu_01.script    	\tsu_mmf_devvideo_ciu_01.script
 data=EPOCROOT##epoc32\data\c\tsu_mmf_devvideo_ciu_02.script    	\tsu_mmf_devvideo_ciu_02.script
 
-ECOM_PLUGIN(testdevvideociuplugins.dll,	testdevvideociuplugins.rsc)
-
 #endif
 
--- a/mmlibs/mmfw/tsrc/mmfunittest/MidiClnt/MidiTestCntrl/group/bld.inf	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/MidiClnt/MidiTestCntrl/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -18,6 +18,6 @@
 
 PRJ_PLATFORMS
 
-PRJ_MMPFILES
+PRJ_TESTMMPFILES
 //MIDI
 ../MmpFiles/miditstcntrl.mmp
--- a/mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/CustomMmfAudioController.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-target custommmfaudiocontroller.dll
-CAPABILITY ALL -TCB
-targettype plugin
-
-// Note this emulates the audio controller plugin and is not a unique id
-// Thus ensure that the audio controller plugin is removed when attempting to use
-// this plugin
-// ECom Dll recognition UID followed by the unique UID for this dll
-UID 0x10009D8D 0x101F7D29
-VENDORID 0x70000001
-
-SOURCEPATH	../../../src/Plugin/Controller/Audio
-SOURCE		 MmfAudioController.cpp
-
-SOURCEPATH	../Actrl/TestPlugins/AudioController
-SOURCE	    CustomMmfAudioController.cpp
-SOURCE	    CustomMmfAudioControllerExports.cpp
-
-
-USERINCLUDE	    ../../../src/Plugin/Controller/Audio
-USERINCLUDE		../Actrl
-USERINCLUDE	    ../Actrl/TestPlugins/AudioController
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-#ifdef __OMAP__
-
-// Delete the HwDevice once we have OMAP Server implementation
-// Interfacing with HwDevice implementation begins
-USERINCLUDE		/GenericGatewayComponent/raw/RawHwDevice
-USERINCLUDE		/GenericGatewayComponent/raw/RawGwc
-USERINCLUDE		/GenericGatewayComponent/Gwc
-USERINCLUDE		/GenericGatewayComponent/BridgeAbstractionLayer
-// Interfacing with HwDevice implementation ends
-#endif //__OMAP__
-
-
-start resource 101F7D29.rss
-target custommmfaudiocontroller.rsc
-end
-
-LIBRARY euser.lib
-LIBRARY ecom.lib
-LIBRARY mmfserverbaseclasses.lib
-LIBRARY mmfdevsound.lib
-LIBRARY mmfcontrollerframework.lib
-LIBRARY mmfstandardcustomcommands.lib
-
-SMPSAFE
--- a/mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/MmfMP3Format.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-#include		"../../../inc/mmf/common/mmfbase.hrh"	// for KSharedLibraryUidDefine
-#include		"../ctlfrm/mp3/inc/MP3Uids.hrh"				// for KUidMP3DllFormat
-
-target mmfmp3format.dll
-CAPABILITY ALL -TCB
-targettype plugin
-
-// ECom Dll recognition UID followed by the unique UID for this dll
-UID				0x10009D8D KUidMP3DllFormat
-VENDORID 0x70000001
-
-userinclude		../ctlfrm/mp3/inc
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-sourcepath		../ctlfrm/mp3/MmfMP3Format
-
-source			mmfmp3format.cpp
-source			formatUtils.cpp
- 	
-
-start resource 101F7D99.rss
-target mmfmp3format.rsc
-end
-
-library euser.lib
-library ecom.lib
-library	mmfcontrollerframework.lib
-library mmfserverbaseclasses.lib
-
-nostrictdef
-
-
-                    
-
-SMPSAFE
--- a/mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/MmfMP3NullCodec.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-#include		"../../../inc/mmf/common/mmfbase.hrh"	// for KSharedLibraryUidDefine
-#include		"../ctlfrm/mp3/inc/MP3Uids.hrh"				// for KUidMP3DllFormat
-
-target mmfmp3nullcodec.dll
-CAPABILITY ALL -TCB
-targettype plugin
-
-// ECom Dll recognition UID followed by the unique UID for this dll
-UID				0x10009D8D KUidMP3DllCodec
-VENDORID 0x70000001
-
-userinclude		../ctlfrm/mp3/MmfMP3Format
-userinclude		../ctlfrm/mp3/inc
-
-userinclude		../../../inc
-userinclude		../../../inc/mmf/common
-userinclude		../../../inc/mmf/PLUGIN
-userinclude		../../../inc/mmf/server
-userinclude		../../../../../devsound/devsoundrefplugin/src/sounddevice
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-sourcepath		../ctlfrm/mp3/MmfMP3NullCodec
-
-source	mmfmp3Codec.cpp
-
-start resource 101F7D9A.rss
-target mmfmp3nullcodec.rsc
-end
-
-library euser.lib
-library ecom.lib
-
-nostrictdef
-
-
-                    
-
-SMPSAFE
--- a/mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TSU_MMFMIDICLNT.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// using relative paths for sourcepath and user includes
-// 
-//
-
-TARGET        	tsu_mmfmidiclnt.dll
-CAPABILITY ALL -TCB
-TARGETTYPE    	dll
-UID           	0x1000008d 0x101F460E
-VENDORID 0x70000001
-
-SOURCEPATH    ../MidiClnt
-SOURCE        TSU_MMFMIDICLNT.cpp
-SOURCE        TS_MMFMIDICLNTsuite.cpp
-SOURCE        TestMidiClientUtility.cpp
-SOURCE        TestStepMidiClntAllocFailNew.cpp
-SOURCE        TestStepMidiClntAllocFailOpen.cpp
-SOURCE		  TestStepMidiDRM.cpp
-SOURCE		  TestMidiClientMultiSharedHeap.cpp
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-LIBRARY	    euser.lib  testframeworkclient.lib 
-LIBRARY     efsrv.lib
-LIBRARY     midiclient.lib
-LIBRARY	    ws32.lib
-LIBRARY		mmfcontrollerframework.lib
-LIBRARY		ecom.lib
-LIBRARY		mmcommon.lib
-LIBRARY		caf.lib
-
-START WINS
-#ifndef WINSCW
-WIN32_LIBRARY   CHKSTK.OBJ
-#endif
-END
-
-nostrictdef
-#ifdef EABI
-NOEXPORTLIBRARY
-#endif
-
-SMPSAFE
--- a/mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TSU_MMF_ACLNT_01.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,209 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// using relative paths for sourcepath and user includes
-// 
-//
-
-TARGET        	tsu_mmf_aclnt_01.dll
-CAPABILITY      ALL -TCB
-TARGETTYPE    	dll
-//UID to be renamed 
-UID           	0x1000008d 0x101F7D2B  
-VENDORID        0x70000001
-
-MACRO _TYPHOON_TEST_
-
-SOURCEPATH	  ../aclnt/TSU_MMF_ACLNT_01
-SOURCE        TestSuiteUnitMMFAudClient.cpp
-SOURCE        TestStepUnitMMFAudClient.cpp
-SOURCE        TestStepPlayerNew.cpp
-SOURCE        TestStepPlayerNewFilePlayer.cpp
-SOURCE        TestStepPlayerNewPriorPrefer.cpp
-SOURCE        TestStepPlayerNewDescPlayer.cpp
-SOURCE        TestStepPlayerPlay.cpp
-SOURCE        TestStepPlayerBitRate.cpp
-SOURCE	     TestStepRecorderBitRate.cpp
-			
-SOURCE        TestStepPlayerPlayAu.cpp
-SOURCE        TestStepCheckHeaderTag.cpp
-SOURCE        TestPlayerFileHandle.cpp
-SOURCE        TestStepAudioPlayerDRM.cpp
-SOURCE        TestStepAudioRecorderDRM.cpp
-SOURCE        TestStepPlayerStop.cpp
-SOURCE        TestStepPlayerDuration.cpp
-SOURCE        TestStepPlayerRepeats.cpp
-SOURCE        TestStepPlayerVol.cpp
-SOURCE        TestStepPlayerVolRamp.cpp
-SOURCE        TestStepPlayerVarious.cpp
-SOURCE        TestStepPlayerOpenUrl.cpp
-SOURCE        TestStepPlayerAllocFailNew.cpp
-SOURCE        TestStepPlayerAllocFailNewFilePlayer.cpp
-SOURCE        TestStepPlayerAllocFailPlay.cpp
-SOURCE        TestStepPlayerAllocFailNewDescPlayer.cpp
-SOURCE        TestStepPlayerAllocFailOpenFile.cpp
-SOURCE        TestStepPlayerAllocFailOpenDesc.cpp
-SOURCE        TestStepRecorderNew.cpp
-SOURCE        TestStepRecorderOpen.cpp
-SOURCE        TestStepRecorderOpenFile.cpp
-SOURCE        TestStepRecorderOpenDesc.cpp
-SOURCE        TestStepRecorderOpenUrl.cpp
-SOURCE        TestStepRecorderRecord.cpp
-SOURCE        TestStepRecorderRecordStop.cpp
-SOURCE        TestStepRecorderReopen.cpp
-SOURCE        TestStepRecorderPosPlay.cpp
-SOURCE        TestStepRecorderRecordPlay.cpp
-
-SOURCE        TestStepRecorderWindowPlay.cpp
-SOURCE        TestStepRecorderClearWindowPlay.cpp
-SOURCE        TestStepRecorderDuration.cpp
-SOURCE        TestStepRecorderType.cpp
-SOURCE        TestStepRecorderState.cpp
-SOURCE        TestStepRecorderRepeats.cpp
-SOURCE        TestStepRecorderVolRamp.cpp
-SOURCE        TestStepRecorderVol.cpp
-SOURCE        TestStepRecorderBalance.cpp
-SOURCE        TestStepRecorderGain.cpp
-SOURCE        TestStepRecorderCrop.cpp
-SOURCE        TestStepRecorderSetPriority.cpp
-SOURCE        TestStepRecorderRecordTimeAvail.cpp
-SOURCE        TestStepRecorderSetMaxRecLen.cpp
-SOURCE        TestStepRecorderMeta.cpp
-SOURCE        TestStepRecorderDestination.cpp
-SOURCE        TESTSTEPRecorderVARIOUS.cpp
-SOURCE        TestStepRecorderSimultaneousPlay.cpp
-
-SOURCE        TestStepRecorderAllocFailNew.cpp
-SOURCE        TestStepRecorderAllocFailOpenFile.cpp
-SOURCE        TestStepRecorderAllocFailOpenDesc.cpp
-SOURCE        TestStepRecorderAllocFailOpenUrl.cpp
-SOURCE        TestStepRecorderAllocFailOpen.cpp
-SOURCE        TestStepRecorderAllocFailPlay.cpp
-SOURCE        TestStepRecorderAllocFailRecord.cpp
-SOURCE        TestStepRecorderAllocFailCrop.cpp
-SOURCE        TestStepToneAllocFailNew.cpp
-SOURCE        TestStepToneNew.cpp
-SOURCE        TestStepToneNewPriorPref.cpp
-SOURCE        TestStepTonePrepareToPlayTone.cpp
-SOURCE        TestStepTonePrepareToPlayDTMFString.cpp
-SOURCE        TestStepTonePrepareToPlayFileSeq.cpp
-SOURCE        TestStepTonePrepareToPlayDescSeq.cpp
-SOURCE        TestStepTonePrepareToPlayFixedSeq.cpp
-SOURCE        TestStepTonePrepareToPlayTonePlay.cpp
-SOURCE        TestStepTonePrepareToPlayDualTonePlay.cpp
-SOURCE        TestStepToneCancelPlay.cpp
-SOURCE        TestStepToneCancelPrepare.cpp
-SOURCE        TestStepToneSetDTMFLengths.cpp
-SOURCE        TestStepToneSetVolume.cpp
-SOURCE        TestStepToneGetVolume.cpp
-SOURCE        TestStepToneSetPriority.cpp
-SOURCE        TestStepToneSetRepeats.cpp
-SOURCE        TestStepToneSetVolumeRamp.cpp
-SOURCE        TestStepToneGetFixedSeq.cpp
-SOURCE        TestStepToneState.cpp
-SOURCE        TestStepTonePlayDualToneInvalidFreq.cpp
-SOURCE        TestStepConvertAllocFailNew.cpp
-SOURCE        TestStepConvertAllocFailOpen.cpp
-SOURCE        TestStepConvertNew.cpp
-SOURCE        TestStepConvertOpen.cpp
-SOURCE        TestStepConvertOpenLocFormat.cpp
-SOURCE        TestStepConvertOpenLocFormat2.cpp
-SOURCE        TestStepConvertOpenLocFormat3.cpp
-SOURCE        TestStepConvertOpenLocFormat4.cpp
-SOURCE        TestStepConvertVarious.cpp
-SOURCE        TestStepAudOutStream.cpp
-SOURCE        TestStepAudInStream.cpp
-SOURCE		  TestStepTonePrepareToPlayIllegalDTMFString.cpp
-SOURCE        TestStepAudOutStreamGSM610.cpp
-SOURCE        TestStepPlaybackAfterRecording.cpp
-SOURCE		  TestStepMiscAud.cpp
-SOURCE		  TestStepResourceNotification.cpp
-SOURCE		  TestStepRecorderSetBalRecordGetBal.cpp
-SOURCE		  TestStepPlayerSharedHeap.cpp
-SOURCE		  TestStepRecorderSharedHeap.cpp
-SOURCE		  TestStepConverterSharedHeap.cpp
-SOURCE        TestStepRecorderOpenviaUriTag.cpp
-SOURCE        TestStepPlayerOpenviaUriTag.cpp
-SOURCE        TestStepPlayerOpenTryNextCtrl.cpp
-SOURCE        TestStepRecorderOpenTryNextCtrl.cpp
-Source 		  TestStepCtrlSetRepeatsCustomCommands.cpp
-
-// from Audio Clients
-SOURCEPATH		../../../src/Client/Audio
-source			mmfclientaudioplayer.cpp 
-source			mmfclientaudiorecorder.cpp 
-source			mmfclientaudioconverter.cpp
-source			mmfclienttoneplayer.cpp 
-source			MmfFifo.cpp
-source			mmfclientaudiooutputstream.cpp 
-source			mmfclientaudioinputstream.cpp 
-source			mmfclientaudiostreamutils.cpp
-source			mmfclientaudiocliputility.cpp
-SOURCEPATH		../../../src/Client/Utility
-source			mmfclientutility.cpp
-//
-
-USERINCLUDE		../aclnt/TSU_MMF_ACLNT_01
-USERINCLUDE		../../../src/Client/Audio
-USERINCLUDE		../../../../../devsound/devsoundrefplugin/src/sounddevice
-USERINCLUDE		../../../src/Client/generic // for CompatAids.h
-USERINCLUDE		../../../src/Client/Utility
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-LIBRARY	euser.lib
-LIBRARY	efsrv.lib
-LIBRARY	estor.lib 
-LIBRARY	testframeworkclient.lib 
-
-LIBRARY	mmcommon.lib
-LIBRARY caf.lib
-LIBRARY	cafutils.lib
-
-// from the audio client
-library			mmfcontrollerframework.lib
-library			mmfstandardcustomcommands.lib
-library			mediaclient.lib
-LIBRARY			mmfdevsound.lib
-LIBRARY 		mmfdrmpluginserverproxy.lib
-
-LIBRARY			ecom.lib
-// from the audio client mmp
-userinclude		../../../inc
-
-userinclude		../../../inc/mmf/common
-userinclude		../../../inc/mmf/server
-userinclude		../../../inc/mmf/PLUGIN
-userinclude     	../../../src/Plugin/Controller/Audio
-
-#ifdef __OMAP__
-
-// Delete the HwDevice once we have OMAP Server implementation
-// Interfacing with HwDevice implementation begins
-USERINCLUDE		\GenericGatewayComponent\raw\RawHwDevice
-USERINCLUDE		\GenericGatewayComponent\raw\RawGwc
-USERINCLUDE		\GenericGatewayComponent\Gwc
-USERINCLUDE		\GenericGatewayComponent\BridgeAbstractionLayer
-// Interfacing with HwDevice implementation ends
-#endif //__OMAP__
-
-DEFFILE	TSU_MMF_ACLNT_01.DEF
-
-NOSTRICTDEF
-
-#ifdef EABI
-NOEXPORTLIBRARY
-#endif
-
-
-SMPSAFE
--- a/mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TSU_MMF_ACOD.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// using relative paths for sourcepath and user includes
-// 
-//
-
-TARGET        	tsu_mmf_acod.dll
-CAPABILITY ALL -TCB
-TARGETTYPE    	dll
-UID           	0x1000008d 0x101F73E9
-VENDORID 0x70000001
-
-SOURCEPATH    ../ACOD
-SOURCE        TSU_MMF_ACOD.cpp
-SOURCE        TSU_MMF_ACODSuite.cpp
-
-USERINCLUDE   ../ACOD
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-LIBRARY		euser.lib
-LIBRARY	    	testframeworkclient.lib 
-LIBRARY		mmfserverbaseclasses.lib
-LIBRARY		efsrv.lib
-LIBRARY		estor.lib 
-LIBRARY		ecom.lib
-#ifdef EABI
-NOEXPORTLIBRARY
-#endif
-
-SMPSAFE
--- a/mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TSU_MMF_ACOD_TestCodecs.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// using relative paths for sourcepath and user includes
-// 
-//
-
-target tsu_mmf_acod_testcodecs.dll
-CAPABILITY ALL -TCB
-targettype plugin
-UID           	0x10009D8D 0x101F76AA
-VENDORID 0x70000001
-
-SOURCEPATH    ../ACOD/TestCodecs
-SOURCE		TSU_MMF_ACOD_AAAABBBBTestCodec.cpp
-SOURCE		TSU_MMF_ACOD_AAAABBBBTest2Codec.cpp
-SOURCE		TSU_MMF_ACOD_CodecImplementationProxy.cpp
-
-USERINCLUDE   ../ACOD/TestCodecs
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-start resource 101F76AA.rss
-target tsu_mmf_acod_testcodecs.rsc
-end
-
-LIBRARY euser.lib
-LIBRARY ecom.lib
-
-SMPSAFE
--- a/mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TSU_MMF_ACTRL_01.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// using relative paths for sourcepath and user includes
-//
-
-TARGET        	tsu_mmf_actrl_01.dll
-CAPABILITY ALL -TCB
-TARGETTYPE    	dll
-
-UID           	0x1000008d 0x101F7854
-VENDORID 0x70000001
-
-SOURCEPATH    ../Actrl
-SOURCE			TS_MMF_ACTRL_TestStep.cpp
-SOURCE			TS_MMF_ACTRL_TestSuite.cpp
-SOURCE          		TestStepActrlPlay.cpp
-SOURCE          		TestStepsGetSet.cpp
-SOURCE	    		TestStepActrlRecord.cpp
-SOURCE	    		TestStepController.cpp
-
-USERINCLUDE   ../Actrl
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-LIBRARY		euser.lib
-LIBRARY	    testframeworkclient.lib 
-LIBRARY		mmfcontrollerframework.lib
-LIBRARY		mmfstandardcustomcommands.lib
-LIBRARY		efsrv.lib
-LIBRARY		ecom.lib
-
-#ifdef EABI
-NOEXPORTLIBRARY
-#endif
-
-DEFFILE TSU_MMF_ACTRL_01.DEF
-
-SMPSAFE
--- a/mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TSU_MMF_AFMT.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// using relative paths for sourcepath and user includes
-// 
-//
-
-TARGET        	tsu_mmf_afmt.dll
-CAPABILITY ALL -TCB
-TARGETTYPE    	dll
-UID           	0x1000008d 0x10100000
-VENDORID 0x70000001
-
-// N.B. this macro only affects target builds - ignored on emulator (which uses C drive by default)
-MACRO			__AFMT_USE_C_DRIVE__
-
-SOURCEPATH    ../AFMT
-SOURCE        TSU_MMF_AFMT.cpp
-SOURCE        TSU_MMF_AFMTSuite.cpp
-SOURCE		  TSU_MMF_AFMT_TestSteps.cpp
-
-SOURCE		  Tsu_mmf_afmt_newl.cpp				// Base class for NewL tests
-SOURCE		  Tsu_mmf_afmt_FillBuffer.cpp		// Base class for FillBufferL tests
-SOURCE		  Tsu_mmf_afmt_Interval.cpp			// Base class for IntervalL tests
-SOURCE		  Tsu_mmf_afmt_Duration.cpp			// Base class for DurationL tests
-SOURCE		  Tsu_mmf_afmt_oom.cpp				// Base class for Out-of-Memory tests
-SOURCE		  Tsu_mmf_afmt_NumChannels.cpp		// Base class for NumChannels tests
-SOURCE		  Tsu_mmf_afmt_SampleRate.cpp		// Base class for SampleRate tests
-
-
-USERINCLUDE   ../AFMT
-
-USERINCLUDE	  ../../../../../mmplugins/mmfwplugins/src/Plugin/Format/MmfWAVFormat
-USERINCLUDE	  ../AFMT/TestDataSink
-USERINCLUDE	  ../AFMT/TestDataSource
-USERINCLUDE	  ../../../inc/Mda/Common
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-LIBRARY		euser.lib
-LIBRARY	    	testframeworkclient.lib 
-LIBRARY		mmfserverbaseclasses.lib
-#ifdef EABI
-LIBRARY		mmfcontrollerframework.lib
-#endif
-
-// Required for CMmfFile
-LIBRARY		ecom.lib
-LIBRARY		efsrv.lib
-
-#ifdef EABI
-NOEXPORTLIBRARY
-#endif
-
-
-SMPSAFE
--- a/mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TSU_MMF_AFMT_TestDataSink.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// using relative paths for sourcepath and user includes
-// 
-//
-
-target tsu_mmf_afmt_testdatasink.dll
-CAPABILITY ALL -TCB
-targettype plugin
-UID           	0x10009d8d 0x101f7d2f
-VENDORID 0x70000001
-
-SOURCEPATH      ../AFMT/TestDataSink
-SOURCE          TSU_MMF_AFMT_testdatasink.cpp
-
-USERINCLUDE     .
-USERINCLUDE		../AFMT		// For CTestStep_MMF_AFMT definition 
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-start resource 101F7D2F.rss
-target tsu_mmf_afmt_testdatasink.rsc
-end
-
-LIBRARY		euser.lib 
-LIBRARY		ecom.lib
-LIBRARY		mmfcontrollerframework.lib
-
-
-
-
-SMPSAFE
--- a/mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TSU_MMF_AFMT_TestDataSource.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// using relative paths for sourcepath and user includes
-// 
-//
-
-target tsu_mmf_afmt_testdatasource.dll
-CAPABILITY ALL -TCB
-targettype plugin
-UID           	0x10009d8d 0x101F7D33
-VENDORID 0x70000001
-
-SOURCEPATH      ../AFMT/TestDataSource
-SOURCE          TSU_MMF_AFMT_TestDataSource.cpp
-
-USERINCLUDE     .
-USERINCLUDE		../AFMT		// For CTestStep_MMF_AFMT definition 
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-start resource 101f7d33.rss
-target tsu_mmf_afmt_testdatasource.rsc
-end
-
-LIBRARY		euser.lib 
-LIBRARY		ecom.lib
-LIBRARY		mmfcontrollerframework.lib
-
-
-
-SMPSAFE
--- a/mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TSU_MMF_BASECL.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// using relative paths for sourcepath and user includes
-// 
-//
-
-TARGET        	tsu_mmf_basecl.dll
-CAPABILITY ALL -TCB
-TARGETTYPE    	dll
-UID           	0x1000008d 0x101f72AA
-VENDORID 0x70000001
-
-SOURCEPATH    ../basecl
-SOURCE	TSU_MMF_BASECL.cpp
-SOURCE	TSU_MMF_BASECL_Buffers.cpp
-
-SOURCE	TSU_MMF_BASECL_TransferBuffers_variant.cpp	//EKA2 specific CMMFTransferBuffer BC layer
-
-SOURCE	TSU_MMF_BASECL_DataPath.cpp
-SOURCE	TSU_MMF_BASECLSuite.cpp
-
-SOURCEPATH	../../../../../mmhais/refacladapt/src/tonehwdevice // ToneGenerator for testing
-SOURCE	ToneGenerator.cpp
-
-USERINCLUDE	../basecl
-USERINCLUDE	../basecl/ts_transferbuffertesterclient
-USERINCLUDE	../basecl/TSU_BASECL_TestCodec
-USERINCLUDE	../basecl/TSU_BASECL_TestSrcSink
-USERINCLUDE	../basecl/TSU_BASECL_TestFormat
-USERINCLUDE	../../../../../mmhais/refacladapt/src/tonehwdevice
-USERINCLUDE	../../../inc // required for rateconvert.h
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-LIBRARY		euser.lib  
-LIBRARY		efsrv.lib
-LIBRARY		testframeworkclient.lib 
-LIBRARY		mmfcontrollerframework.lib
-LIBRARY		mmfserverbaseclasses.lib
-LIBRARY		ecom.lib
-LIBRARY		estor.lib
-LIBRARY		audioutils.lib
-
-#ifdef EABI
-NOEXPORTLIBRARY
-#endif
-
-SMPSAFE
--- a/mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TSU_MMF_BASECL_TestCodec.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// using relative paths for sourcepath and user includes
-// 
-//
-
-target tsu_mmf_basecl_testcodec.dll
-CAPABILITY ALL -TCB
-targettype plugin
-UID           	0x10009D8D 0x101F77CC
-VENDORID 0x70000001
-
-SOURCEPATH    ../basecl/TSU_BASECL_TestCodec
-SOURCE		TSU_MMF_BASECL_TestCodec.cpp
-SOURCE		TSU_MMF_BASECL_CodecImplementationProxy.cpp
-
-USERINCLUDE   ../basecl/TSU_BASECL_TestCodec
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-start resource 101F77CC.rss
-target tsu_mmf_basecl_testcodec.rsc
-end
-
-LIBRARY euser.lib
-LIBRARY	efsrv.lib
-LIBRARY ecom.lib
-
-SMPSAFE
--- a/mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TSU_MMF_BASECL_TestFormat.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-target tsu_mmf_basecl_testformat.dll
-CAPABILITY ALL -TCB
-targettype plugin
-
-// ECom Dll recognition UID followed by the unique UID for this dll
-UID 0x10009D8D 0x101F7B20
-VENDORID 0x70000001
-
-SOURCEPATH	../basecl/TSU_BASECL_TestFormat
-SOURCE		TSU_MMF_BASECL_TestFormat.cpp
-SOURCE		TSU_MMF_BASECL_TestFormatImplementationProxy.cpp
-
-USERINCLUDE	../basecl/TSU_BASECL_TestFormat
-USERINCLUDE	../basecl/TSU_BASECL_TestSrcSink
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-start resource 101f7B20.rss
-target tsu_mmf_basecl_testformat.rsc
-end
-
-LIBRARY euser.lib
-LIBRARY ecom.lib
-LIBRARY mmfcontrollerframework.lib
-
-SMPSAFE
--- a/mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TSU_MMF_BASECL_TestSrcSink.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-target tsu_mmf_basecl_testsrcsink.dll
-CAPABILITY ALL -TCB
-targettype plugin
-
-// ECom Dll recognition UID followed by the unique UID for this dll
-UID 0x10009D8D 0x101F77CA
-VENDORID 0x70000001
-
-SOURCEPATH	../basecl/TSU_BASECL_TestSrcSink
-SOURCE		TSU_MMF_BASECL_TestSrcSink.cpp
-SOURCE		TSU_MMF_BASECL_TestSrcSinkImplementationProxy.cpp
-
-USERINCLUDE	../basecl/TSU_BASECL_TestSrcSink
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-start resource 101f77CA.rss
-target tsu_mmf_basecl_testsrcsink.rsc
-end
-
-LIBRARY euser.lib
-LIBRARY ecom.lib
-LIBRARY mmfcontrollerframework.lib
-LIBRARY mmfserverbaseclasses.lib
-
-SMPSAFE
--- a/mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TSU_MMF_CTLFRM.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// using relative paths for sourcepath and user includes
-// 
-//
-
-TARGET        	tsu_mmf_ctlfrm.dll
-CAPABILITY ALL -TCB
-TARGETTYPE    	dll
-UID           	0x1000008d 0x101f778f
-VENDORID 0x70000001
-
-SOURCEPATH    ../ctlfrm
-SOURCE        TSU_MMF_CTLFRM.cpp
-SOURCE        TSU_MMF_CTLFRMSuite.cpp
-
-USERINCLUDE 	../ctlfrm
-USERINCLUDE 	../ctlfrm/TS_CMMFTestController
-USERINCLUDE 	../ctlfrm/TS_MMFTestDataSink
-USERINCLUDE 	../ctlfrm/TS_MMFTestDataSource
-USERINCLUDE 	../ctlfrm/TS_MMFTestDataSinkB
-USERINCLUDE 	../ctlfrm/TS_MMFTestDataSourceB
-USERINCLUDE 	../ctlfrm/ts_cmmftestcustomcommands
-USERINCLUDE		../ctlfrm/ts_testterminationcontroller
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-LIBRARY		euser.lib  
-LIBRARY		testframeworkclient.lib 
-LIBRARY     mmfcontrollerframework.lib
-LIBRARY		ts_cmmftestcustomcommands.lib
-LIBRARY     mmfstandardcustomcommands.lib
-LIBRARY		ecom.lib
-#ifdef SYMBIAN_MULTIMEDIA_SUBTITLE_SUPPORT
-LIBRARY ws32.lib 
-#endif
-
-#ifdef EABI
-NOEXPORTLIBRARY
-#endif
-
-SMPSAFE
--- a/mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TSU_MMF_DEVSOUND_NOTIFICATION_SUITE.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-TARGET			tsu_mmf_devsound_notification_suite.dll
-CAPABILITY ALL -TCB
-TARGETTYPE		dll
-UID				0x1000008d 0x101F7D8E
-VENDORID 0x70000001
-
-SOURCEPATH		../DevSoundTest/src
-SOURCE			TSU_MMF_DEVSOUND_NOTIFICATION_SUITE.cpp
-SOURCE			TSU_MMF_DEVSOUND_NOTIFICATION_STEP.cpp
-
-USERINCLUDE		../DevSoundTest/inc
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-LIBRARY		euser.lib
-LIBRARY		efsrv.lib
-LIBRARY	    	testframeworkclient.lib
-LIBRARY		mmfdevsound.lib
-LIBRARY		ecom.lib
-
-NOSTRICTDEF
-#ifdef EABI
-NOEXPORTLIBRARY
-#endif
-
-SMPSAFE
--- a/mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TSU_MMF_DEVSOUND_SUITE.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-TARGET			tsu_mmf_devsound_suite.dll
-CAPABILITY ALL -TCB
-TARGETTYPE		dll
-UID				0x1000008d 0x101F7B00
-VENDORID 0x70000001
-
-SOURCEPATH		../DevSoundTest/src
-SOURCE			TSU_MMF_DEVSOUND_SUITE.cpp
-SOURCE			TSU_MMF_DEVSOUND_STEP.cpp
-
-USERINCLUDE		../DevSoundTest/inc
-USERINCLUDE		../DevSoundTest/CIPlugins/src
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-LIBRARY		euser.lib
-LIBRARY		efsrv.lib
-LIBRARY	    	testframeworkclient.lib
-LIBRARY		mmfdevsound.lib
-LIBRARY		ecom.lib
-
-NOSTRICTDEF
-#ifdef EABI
-NOEXPORTLIBRARY
-#endif
-
-SMPSAFE
--- a/mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TSU_MMF_DEVSOUND_TESTDEVICE.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-target tsu_mmf_devsound_testdevice.dll
-CAPABILITY ALL -TCB
-targettype plugin
-
-// ECom Dll recognition UID followed by the unique UID for this dll
-UID 0x10009D8D 0x101F9F50
-VENDORID 0x70000001
-
-SOURCEPATH	../DevSoundTest/TestDevice\
-
-SOURCE	TSU_MMF_DEVSOUND_TestDevice.cpp
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-#ifdef SYMBIAN_MULTIMEDIA_A3FDEVSOUND
-start resource 101F9F50_a3f.rss
-#else
-start resource 101F9F50.rss
-#endif
-target tsu_mmf_devsound_testdevice.rsc
-end
-
-LIBRARY	euser.lib
-LIBRARY ecom.lib
-LIBRARY		mmfswcodecwrapper.lib
-
-
-
-SMPSAFE
--- a/mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TSU_MMF_DEVSOUND_TESTINTERFACE.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-target tsu_mmf_devsound_testinterface.dll
-CAPABILITY ALL -TCB
-targettype plugin
-
-// ECom Dll recognition UID followed by the unique UID for this dll
-UID 0x10009D8D 0x102070af
-VENDORID 0x70000001
-
-SOURCEPATH	../DevSoundTest/TestInterface\
-
-SOURCE	TSU_MMF_DEVSOUND_TestInterface.cpp
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-start resource 102070af.rss
-target tsu_mmf_devsound_testinterface.rsc
-end
-
-LIBRARY	euser.lib
-LIBRARY ecom.lib
-
-
-
-SMPSAFE
--- a/mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TSU_MMF_DEVSOUND_TESTINTERFACE1.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-target tsu_mmf_devsound_testinterface1.dll
-CAPABILITY ALL -TCB
-targettype plugin
-
-// ECom Dll recognition UID followed by the unique UID for this dll
-UID 0x10009D8D 0x1028664d
-VENDORID 0x70000001
-
-SOURCEPATH	../DevSoundTest/TestInterface1/
-
-SOURCE	TSU_MMF_DEVSOUND_TestInterface1.cpp
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-start resource 1028664d.rss
-target tsu_mmf_devsound_testinterface1.rsc
-end
-
-LIBRARY	euser.lib
-LIBRARY ecom.lib
-
-
-
-SMPSAFE
--- a/mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TSU_MMF_SRSSNK.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// This must be used if devsound creates CMMFTransferBuffers rather than CMMFDescriptorBuffers
-// MACRO __USE_MMF_TRANSFERBUFFERS__
-// using relative paths for sourcepath and user includes
-// 
-//
-
-TARGET        	tsu_mmf_srssnk.dll
-CAPABILITY ALL -TCB
-TARGETTYPE    	dll
-UID           	0x1000008D 0x101f72AD
-VENDORID 0x70000001
-
-SOURCEPATH	../srssnk
-SOURCE		TSU_MMF_SRSSNK.cpp
-SOURCE		TSU_MMF_SRSSNKSuite.cpp
-
-USERINCLUDE	../srssnk
-USERINCLUDE	../../../src
-USERINCLUDE	../../../src/Plugin/Format/FormatUtils
-USERINCLUDE	../../../src/Client/Utility
-
-USERINCLUDE	../basecl/ts_transferbuffertesterclient
-USERINCLUDE	../ctlfrm
-USERINCLUDE	../ctlfrm/TS_CMMFTestController
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-USERINCLUDE	../../../inc/mmf/common
-USERINCLUDE	../../../../../devsound/devsoundrefplugin/src/sounddevice
-
-
-LIBRARY		ecom.lib
-LIBRARY		efsrv.lib
-LIBRARY		euser.lib  
-LIBRARY		testframeworkclient.lib 
-LIBRARY		mmfserverbaseclasses.lib
-LIBRARY		mmfcontrollerframework.lib
-LIBRARY		mediaclientutility.lib
-LIBRARY		mmfdevsound.lib
-LIBRARY		caf.lib
-
-#ifdef EABI
-NOEXPORTLIBRARY
-#endif
-
-SMPSAFE
--- a/mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TSU_MMF_SWCDWRAP.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// using relative paths for sourcepath and user includes
-// 
-//
-
-TARGET        	tsu_mmf_swcdwrap.dll
-CAPABILITY ALL -TCB
-TARGETTYPE    	dll
-UID           	0x1000008d 0x101fD032
-VENDORID 0x70000001
-
-SOURCEPATH	../swcdwrap
-SOURCE		TSU_MMF_SWCDWRAP_Suite.cpp
-SOURCE		TSU_MMF_SWCDWRAP_Step.cpp
-SOURCE		TSU_MMF_SWCDWRAP_StepStartDecode.cpp
-SOURCE		TSU_MMF_SWCDWRAP_StepStartEncode.cpp
-SOURCE		TSU_MMF_SWCDWRAP_StepStartConvert.cpp
-SOURCE		TSU_MMF_SWCDWRAP_HwDevObserver.cpp
-SOURCE		TSU_MMF_SWCDWRAP_PlayHwDevObserver.cpp
-SOURCE		TSU_MMF_SWCDWRAP_RecordHwDevObserver.cpp
-SOURCE		TSU_MMF_SWCDWRAP_ConvertHwDevObserver.cpp
-SOURCE		TSU_MMF_SWCDWRAP_AsyncTimer.cpp
-
-
-USERINCLUDE	../swcdwrap
-USERINCLUDE	../swcdwrap/TSU_SWCDWRAP_TestDevice
-USERINCLUDE   	../../../../../mmdevicefw/mdf/src/audio/mdasoundadapter
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-LIBRARY		euser.lib  
-LIBRARY		efsrv.lib
-LIBRARY		testframeworkclient.lib 
-LIBRARY		ecom.lib
-#ifdef SYMBIAN_MDF_SHAREDCHUNK_SOUNDDRIVER
-LIBRARY		mdasoundadapter.lib
-#endif
-
-#ifdef EABI
-NOEXPORTLIBRARY
-#endif
-
-SMPSAFE
--- a/mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TSU_MMF_SWCDWRAP_TestDevice.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-target tsu_mmf_swcdwrap_testdevice.dll
-CAPABILITY ALL -TCB
-targettype plugin
-
-// ECom Dll recognition UID followed by the unique UID for this dll
-UID                 0x10009D8D 0x101FD033
-VENDORID 0x70000001
-
-USERINCLUDE   		../swcdwrap/TSU_SWCDWRAP_TestDevice
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-SOURCEPATH    ../swcdwrap/TSU_SWCDWRAP_TestDevice
-SOURCE	TSU_MMF_SWCDWRAP_TestDevice.cpp
-SOURCE	TSU_MMF_SWCDWRAP_TestDeviceImplementationProxy.cpp
-
-
-start resource 101FD033.rss
-target tsu_mmf_swcdwrap_testdevice.rsc
-end
-
-LIBRARY		euser.lib
-LIBRARY		mmfswcodecwrapper.lib
-#ifdef EABI
-library			ecom.lib
-#endif
-
-SMPSAFE
--- a/mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TSU_MMF_SbcCodec.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// using relative paths for sourcepath and user includes
-// 
-//
-
-TARGET      	tsu_mmf_sbccodec.dll
-CAPABILITY ALL -TCB
-TARGETTYPE  	dll
-UID         	0x1000008d 0x10204977
-VENDORID 		0x70000001
-
-SOURCEPATH    	../SbcCodec
-SOURCE        	TSU_MMF_SbcCodec.cpp
-SOURCE        	TSU_MMF_SbcCodecSuite.cpp
-
-USERINCLUDE   	../SbcCodec
-USERINCLUDE		../../../../../devsound/devsoundrefplugin/src/Codec/SBCEncoder
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-LIBRARY	    	testframeworkclient.lib 
-LIBRARY			mmfserverbaseclasses.lib
-LIBRARY			euser.lib
-LIBRARY			efsrv.lib
-LIBRARY			ecom.lib
-
-#ifdef EABI
-NOEXPORTLIBRARY
-#endif
-
-
-SMPSAFE
--- a/mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TSU_MMF_SwCodecDevices.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// using relative paths for sourcepath and user includes
-// 
-//
-
-TARGET        	tsu_mmf_swcodecdevices.dll
-CAPABILITY ALL -TCB
-TARGETTYPE    	dll
-UID           	0x1000008d 0x101FD9F1
-VENDORID 0x70000001
-
-SOURCEPATH    ../SwCodecDevices
-SOURCE        TSU_MMF_SWCODECDEVICES.cpp
-SOURCE        TSU_MMF_DeviceSuite.cpp
-SOURCE        TSU_MMF_CodecTests.cpp
-SOURCE		  TSU_MMF_SignConversionCodecs.cpp
-SOURCE        TSU_MMF_Oom.cpp
-SOURCE        TSU_MMF_Loop.cpp
-SOURCEPATH  ../../../../../devsound/devsoundrefplugin/src/plugin/Audio/gsm610
-SOURCE       GSM610.CPP
-
-SOURCEPATH  ../../../../../devsound/devsoundrefplugin/src/plugin/Audio
-SOURCE	MMFpcm16ToPcm16HwDevice.cpp
-SOURCE	MMFpcm16ToPcmU8HwDevice.cpp
-SOURCE	MMFpcmU8ToPcm16HwDevice.cpp
-SOURCE  Mmfalawtopcm16hwdevice.cpp
-SOURCE  MmfMuLawToPcm16hwDevice.cpp
-SOURCE  Mmfimaadpcmtopcm16hwdevice.cpp
-SOURCE  mmfpcm16toAlawhwdevice.cpp
-SOURCE  mmfpcm16toMulawhwdevice.cpp
-SOURCE  mmfpcm16SwapEndianhwdevice.cpp
-SOURCE  mmfpcmS16topcmU16Codec.cpp
-SOURCE  mmfpcm16topcmU16BEHwDevice.cpp
-SOURCE  mmfpcmS16PcmS8HwDevice.cpp
-SOURCE  mmfpcmS8ToPcmS16HwDevice.cpp
-SOURCE  mmfpcmU16BeToPcmS16HwDevice.cpp
-SOURCE  mmfpcmU16TopcmS16HwDevice.cpp
-SOURCE  mmfpcm16ToImaAdpcm.cpp
-
-USERINCLUDE   ../SwCodecDevices
-USERINCLUDE   ../../../../../devsound/devsoundrefplugin/src/plugin/Audio/gsm610
-USERINCLUDE   ../../../../../devsound/devsoundrefplugin/src/plugin/Audio
-USERINCLUDE   ../../../Codecs/Inc/MMFCodecCommon
-USERINCLUDE   ../../../../../mmdevicefw/mdf/src/audio/mdasoundadapter
-USERINCLUDE   ../../../Codecs/Inc/Gsm610CodecCommon
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-LIBRARY		euser.lib
-LIBRARY		testframeworkclient.lib
-LIBRARY		mmfswcodecwrapper.lib
-LIBRARY		mmfserverbaseclasses.lib
-LIBRARY		efsrv.lib
-LIBRARY		mmfcodeccommon.lib
-LIBRARY     	gsm610codeccommon.lib
-LIBRARY		ecom.lib
-#ifdef SYMBIAN_MDF_SHAREDCHUNK_SOUNDDRIVER
-LIBRARY		mdasoundadapter.lib
-#endif
-         
-#ifdef EABI
-DEFFILE TSU_MMF_SWCODECDEVICES.DEF
-#endif
-
-#ifdef WINSCW
-DEFFILE TSU_MMF_SWCODECDEVICES.def
-#endif
-
-
-SMPSAFE
--- a/mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TSU_MMF_VCLNT_01.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TSU_MMF_VCLNT_01.mmp	Fri Jul 09 12:23:13 2010 +0100
@@ -109,6 +109,7 @@
 LIBRARY			hal.lib
 LIBRARY			bafl.lib
 LIBRARY			cone.lib
+LIBRARY			centralrepository.lib
 
 #ifdef SYMBIAN_MULTIMEDIA_SUBTITLE_SUPPORT
 DEFFILE tsu_mmf_vclnt_01_gce2.def
@@ -121,8 +122,6 @@
 #endif //SYMBIAN_BUILD_GCE
 #endif //SYMBIAN_MULTIMEDIA_SUBTITLE_SUPPORT
 
-MACRO __ENABLE_MEDIA_CLIENT_VIDEO_TRACE__
-
 NOSTRICTDEF
 
 SMPSAFE
--- a/mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TS_CMMFTestController.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// using relative paths for sourcepath and user includes
-// 
-//
-
-target ts_cmmftestcontroller.dll
-CAPABILITY ALL -TCB
-targettype plugin
-UID           	0x10009d8d 0x101f7790
-VENDORID 0x70000001
-
-SOURCEPATH      ../ctlfrm/TS_CMMFTestController
-SOURCE          Ts_cmmftestcontroller.cpp
-
-USERINCLUDE     ../ctlfrm
-USERINCLUDE   ../ctlfrm/TS_CMMFTestController
-USERINCLUDE   ../ctlfrm/ts_cmmftestcustomcommands
-USERINCLUDE   ../../../inc/mmf/ControllerFramework
-USERINCLUDE   ../../../inc/mmf
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-start resource 101f7790.rss
-target ts_cmmftestcontroller.rsc
-end
-
-LIBRARY		euser.lib 
-//LIBRARY     ecom.lib
-LIBRARY     mmfcontrollerframework.lib
-LIBRARY		ts_cmmftestcustomcommands.lib
-
-LIBRARY     mmfstandardcustomcommands.lib 
-#ifdef SYMBIAN_MULTIMEDIA_SUBTITLE_SUPPORT
-LIBRARY ws32.lib 
-#endif
-
-#ifdef EABI
-library			ecom.lib
-#endif
-
-
-
-
-SMPSAFE
--- a/mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TS_CMMFTestCustomCommands.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-target			ts_cmmftestcustomcommands.dll
-CAPABILITY ALL -TCB
-targettype		DLL
-UID			0x1000008d 0x101f78A0
-VENDORID 0x70000001
-
-SOURCEPATH		../ctlfrm/ts_cmmftestcustomcommands
-source			TS_CMMFTestCustomCommands.cpp
-
-USERINCLUDE     ../ctlfrm
-USERINCLUDE     ../ctlfrm/ts_cmmftestcustomcommands
-USERINCLUDE     ../ctlfrm/TS_CMMFTestController
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-LIBRARY			euser.lib
-LIBRARY			mmfcontrollerframework.lib
-LIBRARY			ecom.lib
-
-nostrictdef
-// exportunfrozen
-
-
-                    
-
-SMPSAFE
--- a/mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TS_MMFTestDataSink.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// using relative paths for sourcepath and user includes
-// 
-//
-
-target ts_mmftestdatasink.dll
-CAPABILITY ALL -TCB
-targettype plugin
-UID           	0x10009d8d 0x101F7792
-VENDORID 0x70000001
-
-SOURCEPATH      ../ctlfrm/TS_MMFTestDataSink
-SOURCE          TS_MMFTestDataSink.cpp
-
-USERINCLUDE	../ctlfrm
-USERINCLUDE	../ctlfrm/TS_MMFTestDataSink
-USERINCLUDE	../../../inc/mmf
-USERINCLUDE	../../../inc/mmf/ControllerFramework
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-start resource 101F7792.rss
-target ts_mmftestdatasink.rsc
-end
-
-LIBRARY		euser.lib 
-LIBRARY     	ecom.lib
-LIBRARY		mmfcontrollerframework.lib
-
-
-
-SMPSAFE
--- a/mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TS_MMFTestDataSinkB.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// using relative paths for sourcepath and user includes
-// 
-//
-
-target ts_mmftestdatasinkb.dll
-CAPABILITY ALL -TCB
-targettype plugin
-UID           	0x10009d8d 0x101F789F
-VENDORID 0x70000001
-
-SOURCEPATH      ../ctlfrm/TS_MMFTestDataSinkB
-SOURCE          TS_MMFTestDataSinkB.cpp
-
-USERINCLUDE	../ctlfrm
-USERINCLUDE	../ctlfrm/TS_MMFTestDataSinkB
-USERINCLUDE	../../../inc/mmf
-USERINCLUDE	../../../inc/mmf/ControllerFramework
-USERINCLUDE	../../../inc/mmf/common
-USERINCLUDE	../../../inc/mmf/server
-USERINCLUDE	../../../inc/mmf/PLUGIN
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-start resource 101F789F.rss
-target ts_mmftestdatasinkb.rsc
-end
-
-LIBRARY		euser.lib 
-LIBRARY     ecom.lib
-LIBRARY		mmfcontrollerframework.lib
-
-
-
-SMPSAFE
--- a/mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TS_MMFTestDataSource.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// using relative paths for sourcepath and user includes
-// 
-//
-
-target ts_mmftestdatasource.dll
-CAPABILITY ALL -TCB
-targettype plugin
-UID           	0x10009d8d 0x101f7791
-VENDORID 0x70000001
-
-SOURCEPATH      ../ctlfrm/TS_MMFTestDataSource
-SOURCE          TS_MMFTestDataSource.cpp
-
-USERINCLUDE	../ctlfrm
-USERINCLUDE	../ctlfrm/TS_MMFTestDataSource
-USERINCLUDE	../../../inc/mmf
-USERINCLUDE	../../../inc/mmf/ControllerFramework
-USERINCLUDE	../../../inc/mmf/common
-USERINCLUDE	../../../inc/mmf/server
-USERINCLUDE	../../../inc/mmf/PLUGIN
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-start resource 101f7791.rss
-target ts_mmftestdatasource.rsc
-end
-
-LIBRARY		euser.lib 
-LIBRARY     ecom.lib
-LIBRARY		mmfcontrollerframework.lib
-
-
-
-SMPSAFE
--- a/mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/TS_MMFTestDataSourceB.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// using relative paths for sourcepath and user includes
-// 
-//
-
-target ts_mmftestdatasourceb.dll
-CAPABILITY ALL -TCB
-targettype plugin
-UID           	0x10009d8d 0x101f789E
-VENDORID 0x70000001
-
-SOURCEPATH      ../ctlfrm/TS_MMFTestDataSourceB
-SOURCE          TS_MMFTestDataSourceB.cpp
-
-USERINCLUDE	../ctlfrm
-USERINCLUDE	../ctlfrm/TS_MMFTestDataSourceB
-USERINCLUDE	../../../inc/mmf
-USERINCLUDE	../../../inc/mmf/ControllerFramework
-USERINCLUDE	../../../inc/mmf/common
-USERINCLUDE	../../../inc/mmf/server
-USERINCLUDE	../../../inc/mmf/PLUGIN
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-start resource 101f789E.rss
-target ts_mmftestdatasourceb.rsc
-end
-
-LIBRARY		euser.lib 
-LIBRARY     ecom.lib
-LIBRARY		mmfcontrollerframework.lib
-
-
-SMPSAFE
--- a/mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/ts_cmmftestconstructcontroller.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// using relative paths for sourcepath and user includes
-// 
-//
-
-target ts_cmmftestconstructcontroller.dll
-CAPABILITY ALL -TCB
-targettype plugin
-UID           	0x10009d8d 0x102834be
-VENDORID 0x70000001
-
-SOURCEPATH      ../ctlfrm/sdrm/ts_testconstructcontroller
-SOURCE          ts_cmmftestconstructcontroller.cpp
-
-USERINCLUDE     ../ctlfrm/sdrm
-USERINCLUDE     ../ctlfrm/sdrm/ts_testconstructcontroller
-USERINCLUDE     ../../../inc/mmf/ControllerFramework
-USERINCLUDE     ../../../inc/mmf
-USERINCLUDE     ../../../inc/mmf/common
-USERINCLUDE     ../../../inc/mmf/server
-USERINCLUDE     ../../../inc/mmf/PLUGIN
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-
-start resource 102834be.rss
-target ts_cmmftestconstructcontroller.rsc
-end
-
-LIBRARY		euser.lib 
-LIBRARY     mmfcontrollerframework.lib
-#ifdef EABI
-library			ecom.lib
-#endif
-
-
-
-
-SMPSAFE
--- a/mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/ts_cmmftestterminationcontroller.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// using relative paths for sourcepath and user includes
-// 
-//
-
-target ts_cmmftestterminationcontroller.dll
-CAPABILITY ALL -TCB
-targettype plugin
-UID           	0x10009d8d 0x102833fd
-VENDORID 0x70000001
-
-SOURCEPATH      ../ctlfrm/ts_testterminationcontroller
-SOURCE          ts_cmmftestterminationcontroller.cpp
-
-USERINCLUDE     ../ctlfrm
-USERINCLUDE   	../ctlfrm/ts_testterminationcontroller
-USERINCLUDE     ../../../inc/mmf/ControllerFramework
-USERINCLUDE     ../../../inc/mmf
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-start resource 102833fd.rss
-target ts_cmmftestterminationcontroller.rsc
-end
-
-LIBRARY		euser.lib 
-LIBRARY     mmfcontrollerframework.lib
-#ifdef EABI
-library			ecom.lib
-#endif
-
-
-
-
-SMPSAFE
--- a/mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/tsu_mmf_ctlfrm_sdrm.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// using relative paths for sourcepath and user includes
-// 
-//
-
-TARGET        	tsu_mmf_ctlfrm_sdrm.dll
-CAPABILITY ALL -TCB
-TARGETTYPE    	dll
-UID           	0x1000008d 0x102834A8
-VENDORID 0x70000001
-
-SOURCEPATH    ../ctlfrm/sdrm
-SOURCE        TSU_MMF_CTLFRM_SDRM.cpp
-SOURCE        TSU_MMF_CTLFRMSuite_SDRM.cpp
-
-USERINCLUDE 	../ctlfrm
-USERINCLUDE 	../ctlfrm/TS_CMMFTestController
-USERINCLUDE 	../ctlfrm/TS_MMFTestDataSink
-USERINCLUDE 	../ctlfrm/TS_MMFTestDataSource
-USERINCLUDE 	../ctlfrm/TS_MMFTestDataSinkB
-USERINCLUDE 	../ctlfrm/TS_MMFTestDataSourceB
-USERINCLUDE 	../ctlfrm/ts_cmmftestcustomcommands
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-LIBRARY		euser.lib  
-LIBRARY		testframeworkclient.lib 
-LIBRARY		ts_cmmftestcustomcommands.lib
-LIBRARY     mmfstandardcustomcommands.lib
-LIBRARY		ecom.lib
-LIBRARY		fbscli.lib
-
-LIBRARY     mmfcontrollerframework.lib
-#ifdef EABI
-NOEXPORTLIBRARY
-#endif
-
-SMPSAFE
--- a/mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/tsu_mmf_devsubtitle.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// using relative paths for sourcepath and user includes
-// 
-//
-
-TARGET        	tsu_mmf_devsubtitle.dll
-TARGETTYPE    	dll
-UID           	0x1000008d 0x10285CA0
-VENDORID 	0x70000001
-CAPABILITY	ALL -tcb
-
-SOURCEPATH    	../devsubtitle/src
-SOURCE        	tsu_mmf_devsubtitle_suite.cpp
-SOURCE          tsu_mmf_devsubtitleteststep.cpp
-SOURCE		tsu_mmf_devsubtitle_pos.cpp
-SOURCE		tsu_mmf_devsubtitle_neg.cpp
-
-SOURCEPATH	../../../../../mmplugins/mmfwplugins/src/Plugin/Controller/Video/AviPlayController
-SOURCE		srtreader.cpp
-
-USERINCLUDE 	../devsubtitle/inc
-USERINCLUDE     ../../../../../mmplugins/mmfwplugins/src/Plugin/Controller/Video/AviPlayController/devsubtitle
-USERINCLUDE     ../../../../../mmplugins/mmfwplugins/src/Plugin/Controller/Video/AviPlayController
-USERINCLUDE     ../../../../../mmplugins/mmfwplugins/src/Plugin/Controller/Video/AviPlayController/srtdecoder
-
-MW_LAYER_SYSTEMINCLUDE_SYMBIAN  // Middleware Macro used to link against "msvapi.h" exported by Messaging MW
-
-LIBRARY		euser.lib  
-LIBRARY		ecom.lib
-LIBRARY		testframeworkclient.lib 
-LIBRARY 	efsrv.lib
-LIBRARY		gdi.lib
-LIBRARY		bafl.lib
-LIBRARY		devsubtitle.lib
-LIBRARY     	ws32.lib 
-LIBRARY     	fbscli.lib 
-
-#ifdef EABI
-NOEXPORTLIBRARY
-#endif
-
-SMPSAFE
--- a/mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/tsu_mmf_mmruf.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-TARGET			tsu_mmf_mmruf.dll
-CAPABILITY		ALL -TCB
-TARGETTYPE		dll
-UID				0x1000008d 0x10282632
-VENDORID		0x70000001
-
-SOURCEPATH		../Recogniser
-SOURCE			rapparc.cpp
-SOURCE			tsu_mmf_mmruf_suite.cpp
-SOURCE			tsu_mmf_mmruf_step.cpp
-SOURCE			tsu_mmf_mmruf_dir.cpp
-
-USERINCLUDE		../Recogniser
-USERINCLUDE		../../../Recogniser/src
-
-MW_LAYER_SYSTEMINCLUDE_SYMBIAN  // Middleware Macro used to link against "apgcli.h" exported by AppArc
-
-LIBRARY			testframeworkclient.lib
-LIBRARY			euser.lib
-LIBRARY			ecom.lib
-LIBRARY			apgrfx.lib
-LIBRARY			apmime.lib
-LIBRARY			efsrv.lib
-
-DEFFILE			tsu_mmf_mmruf.def
-
-
-SMPSAFE
--- a/mmlibs/mmfw/tsrc/mmfunittest/MmpFiles/tsu_mmf_subtitlegraphic.mmp	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// using relative paths for sourcepath and user includes
-// 
-//
-
-TARGET        	tsu_mmf_subtitlegraphic.dll
-TARGETTYPE    	dll
-UID           	0x1000008d 0x10285CA1
-VENDORID 		0x70000001
-CAPABILITY		ALL -tcb
-
-SOURCEPATH    	../subtitlegraphic/src/
-SOURCE        	tsu_mmf_subtitlegraphicsuite.cpp
-SOURCE        	subtitlegraphicteststep.cpp
-SOURCE		tsu_mmf_subtitlegraphicclientpos.cpp
-SOURCE		tsu_mmf_subtitlegraphicclientneg.cpp
-SOURCE		subtitlecommonutils.cpp
-
-USERINCLUDE 	../subtitlegraphic/inc
-USERINCLUDE     ../../../../../mmplugins/mmfwplugins/src/Plugin/subtitle/subtitlegraphic
-
-MW_LAYER_SYSTEMINCLUDE_SYMBIAN  // Middleware Macro used to link against "msvapi.h" exported by Messaging MW
-
-LIBRARY		euser.lib  
-LIBRARY		testframeworkclient.lib 
-LIBRARY		ecom.lib
-LIBRARY     	subtitlegraphic.lib 
-LIBRARY     	imageconversion.lib
-LIBRARY		msgs.lib
-LIBRARY     	bitmaptransforms.lib
-LIBRARY     	apgrfx.lib 
-LIBRARY 	efsrv.lib
-LIBRARY     	fbscli.lib 
-LIBRARY     	apmime.lib 
-LIBRARY     	gdi.lib
-
-LIBRARY ws32.lib 
-
-#ifdef EABI
-NOEXPORTLIBRARY
-#endif
-
-SMPSAFE
--- a/mmlibs/mmfw/tsrc/mmfunittest/Profiling/TSU_MMF_PFM_01/group/BLD.INF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-
-PRJ_PLATFORMS
-// specify the platforms your component needs to be built for here
-// may add platform for OMAP, Helen etc
-DEFAULT
-// DEFAULT MISA 
-// WINS ARMI THUMB
-// MINT
-
-PRJ_MMPFILES
-
-..\MMPFiles\TSU_MMF_PFM_01.mmp
-
-PRJ_EXPORTS
-
-// scripts
-..\scripts\TSU_MMF_PFM_01.script	C:\TSU_MMF_PFM_01.script
-
-// iby
-TSU_MMF_PFM_01.iby			\epoc32\rom\include\TSU_MMF_PFM_01.iby
-
-// test files
-..\TestFiles\adpcm16mono8khz.wav	C:\MmfProfileTest\adpcm16mono8khz.wav
-..\TestFiles\gsmMono8khz.wav		C:\MmfProfileTest\gsmMono8khz.wav
-..\TestFiles\mulaw8mono44khz.au 	C:\MmfProfileTest\mulaw8mono44khz.au
-..\TestFiles\pcm16stereo8khz.au		C:\MmfProfileTest\pcm16stereo8khz.au
-..\TestFiles\pcm8mono44khz.wav		C:\MmfProfileTest\pcm8mono44khz.wav
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mmlibs/mmfw/tsrc/mmfunittest/Profiling/TSU_MMF_PFM_01/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -0,0 +1,42 @@
+// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+
+PRJ_PLATFORMS
+// specify the platforms your component needs to be built for here
+// may add platform for OMAP, Helen etc
+DEFAULT
+// DEFAULT MISA 
+// WINS ARMI THUMB
+// MINT
+
+PRJ_MMPFILES
+
+..\MMPFiles\TSU_MMF_PFM_01.mmp
+
+PRJ_EXPORTS
+
+// scripts
+..\scripts\TSU_MMF_PFM_01.script	C:\TSU_MMF_PFM_01.script
+
+// iby
+TSU_MMF_PFM_01.iby			\epoc32\rom\include\TSU_MMF_PFM_01.iby
+
+// test files
+..\TestFiles\adpcm16mono8khz.wav	C:\MmfProfileTest\adpcm16mono8khz.wav
+..\TestFiles\gsmMono8khz.wav		C:\MmfProfileTest\gsmMono8khz.wav
+..\TestFiles\mulaw8mono44khz.au 	C:\MmfProfileTest\mulaw8mono44khz.au
+..\TestFiles\pcm16stereo8khz.au		C:\MmfProfileTest\pcm16stereo8khz.au
+..\TestFiles\pcm8mono44khz.wav		C:\MmfProfileTest\pcm8mono44khz.wav
Binary file mmlibs/mmfw/tsrc/mmfunittest/Recogniser/Data/Corrupt.snd has changed
--- a/mmlibs/mmfw/tsrc/mmfunittest/Recogniser/Data/common/badcert.cer	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/Recogniser/Data/common/badcert.cer	Fri Jul 09 12:23:13 2010 +0100
@@ -1,9 +1,9 @@
------BEGIN CERTIFICATE-----
-XXXBLDCB16ADAgECAgEAMA0GCSqGSIb3DQEBBQUAMB8xCzAJBgNVBAYTAlVLMRAw
-DgYDVQQDEwdTeW1iaWFuMB4XDTAwMDMxNTE0MjQ1NVoXDTAxMDMxNTE0MjQ1NVow
-HzELMAkGA1UEBhMCVUsxEDAOBgNVBAMTB1N5bWJpYW4wXDANBgkqhkiG9w0BAQEF
-AANLADBIAkEAyBm22QuixqJ0m9pjomO2JfA+GeFf+T76XcPe8ursa5qFrEABj4RJ
-Pv5WHzeU/e0ydSuCXwUhB3CrCZDgFVOXGwIDAQABMA0GCSqGSIb3DQEBBQUAA0EA
-sG1UUdvyzOycEuNL5TidMmDMJUHvpoWGE8In6Nmtesn1RsMdgeKKtCsQrp2XbERG
-3YA1ExdAjHqW8T3siFdeLA==
------END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+XXXBLDCB16ADAgECAgEAMA0GCSqGSIb3DQEBBQUAMB8xCzAJBgNVBAYTAlVLMRAw
+DgYDVQQDEwdTeW1iaWFuMB4XDTAwMDMxNTE0MjQ1NVoXDTAxMDMxNTE0MjQ1NVow
+HzELMAkGA1UEBhMCVUsxEDAOBgNVBAMTB1N5bWJpYW4wXDANBgkqhkiG9w0BAQEF
+AANLADBIAkEAyBm22QuixqJ0m9pjomO2JfA+GeFf+T76XcPe8ursa5qFrEABj4RJ
+Pv5WHzeU/e0ydSuCXwUhB3CrCZDgFVOXGwIDAQABMA0GCSqGSIb3DQEBBQUAA0EA
+sG1UUdvyzOycEuNL5TidMmDMJUHvpoWGE8In6Nmtesn1RsMdgeKKtCsQrp2XbERG
+3YA1ExdAjHqW8T3siFdeLA==
+-----END CERTIFICATE-----
--- a/mmlibs/mmfw/tsrc/mmfunittest/SbcCodec/BLD.INF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,92 +0,0 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-
-PRJ_MMPFILES
-
-// mmp files
-../MmpFiles/TSU_MMF_SbcCodec.mmp
-
-
-PRJ_EXPORTS
-
-// script files
-TSU_MMF_SBCCODEC.script		c:/mm/tsu_mmf_sbccodec.script
-TSU_MMF_SBCCODEC_ALLOC.script	c:/mm/tsu_mmf_sbccodec_alloc.script
-
-// test source files
-Data/sbc_test_01.wav 	c:/mm/mmf/testfiles/sbc/sbc_test_01.wav
-Data/sbc_test_02.wav 	c:/mm/mmf/testfiles/sbc/sbc_test_02.wav
-Data/sbc_test_03.wav 	c:/mm/mmf/testfiles/sbc/sbc_test_03.wav
-Data/sbc_test_04.wav 	c:/mm/mmf/testfiles/sbc/sbc_test_04.wav
-Data/sbc_test_05.wav 	c:/mm/mmf/testfiles/sbc/sbc_test_05.wav
-Data/sbc_test_06.wav 	c:/mm/mmf/testfiles/sbc/sbc_test_06.wav
-Data/sbc_test_07.wav 	c:/mm/mmf/testfiles/sbc/sbc_test_07.wav
-Data/sbc_test_08.wav 	c:/mm/mmf/testfiles/sbc/sbc_test_08.wav
-Data/sbc_test_09.wav 	c:/mm/mmf/testfiles/sbc/sbc_test_09.wav
-Data/sbc_test_10.wav 	c:/mm/mmf/testfiles/sbc/sbc_test_10.wav
-
-Data/sbc_test_11.wav 	c:/mm/mmf/testfiles/sbc/sbc_test_11.wav
-Data/sbc_test_12.wav 	c:/mm/mmf/testfiles/sbc/sbc_test_12.wav
-Data/sbc_test_13.wav 	c:/mm/mmf/testfiles/sbc/sbc_test_13.wav
-Data/sbc_test_14.wav 	c:/mm/mmf/testfiles/sbc/sbc_test_14.wav
-Data/sbc_test_15.wav 	c:/mm/mmf/testfiles/sbc/sbc_test_15.wav
-Data/sbc_test_16.wav 	c:/mm/mmf/testfiles/sbc/sbc_test_16.wav
-Data/sbc_test_17.wav 	c:/mm/mmf/testfiles/sbc/sbc_test_17.wav
-Data/sbc_test_18.wav 	c:/mm/mmf/testfiles/sbc/sbc_test_18.wav
-Data/sbc_test_19.wav 	c:/mm/mmf/testfiles/sbc/sbc_test_19.wav
-Data/sbc_test_20.wav 	c:/mm/mmf/testfiles/sbc/sbc_test_20.wav
-
-Data/sbc_test_21.wav 	c:/mm/mmf/testfiles/sbc/sbc_test_21.wav
-Data/sbc_test_22.wav 	c:/mm/mmf/testfiles/sbc/sbc_test_22.wav
-Data/sbc_test_23.wav 	c:/mm/mmf/testfiles/sbc/sbc_test_23.wav
-Data/sbc_test_24.wav 	c:/mm/mmf/testfiles/sbc/sbc_test_24.wav
-Data/sbc_test_25.wav 	c:/mm/mmf/testfiles/sbc/sbc_test_25.wav
-Data/sbc_test_26.wav 	c:/mm/mmf/testfiles/sbc/sbc_test_26.wav
-Data/sbc_test_27.wav 	c:/mm/mmf/testfiles/sbc/sbc_test_27.wav
-Data/sbc_test_28.wav 	c:/mm/mmf/testfiles/sbc/sbc_test_28.wav
-
-// test reference files
-Data/sbc_test_01.sbc	c:/mm/mmf/ref/sbc/sbc_test_01.sbc
-Data/sbc_test_02.sbc	c:/mm/mmf/ref/sbc/sbc_test_02.sbc
-Data/sbc_test_03.sbc	c:/mm/mmf/ref/sbc/sbc_test_03.sbc
-Data/sbc_test_04.sbc	c:/mm/mmf/ref/sbc/sbc_test_04.sbc
-Data/sbc_test_05.sbc	c:/mm/mmf/ref/sbc/sbc_test_05.sbc
-Data/sbc_test_06.sbc	c:/mm/mmf/ref/sbc/sbc_test_06.sbc
-Data/sbc_test_07.sbc	c:/mm/mmf/ref/sbc/sbc_test_07.sbc
-Data/sbc_test_08.sbc	c:/mm/mmf/ref/sbc/sbc_test_08.sbc
-Data/sbc_test_09.sbc	c:/mm/mmf/ref/sbc/sbc_test_09.sbc
-Data/sbc_test_10.sbc	c:/mm/mmf/ref/sbc/sbc_test_10.sbc
-
-Data/sbc_test_11.sbc	c:/mm/mmf/ref/sbc/sbc_test_11.sbc
-Data/sbc_test_12.sbc	c:/mm/mmf/ref/sbc/sbc_test_12.sbc
-Data/sbc_test_13.sbc	c:/mm/mmf/ref/sbc/sbc_test_13.sbc
-Data/sbc_test_14.sbc	c:/mm/mmf/ref/sbc/sbc_test_14.sbc
-Data/sbc_test_15.sbc	c:/mm/mmf/ref/sbc/sbc_test_15.sbc
-Data/sbc_test_16.sbc	c:/mm/mmf/ref/sbc/sbc_test_16.sbc
-Data/sbc_test_17.sbc	c:/mm/mmf/ref/sbc/sbc_test_17.sbc
-Data/sbc_test_18.sbc	c:/mm/mmf/ref/sbc/sbc_test_18.sbc
-Data/sbc_test_19.sbc	c:/mm/mmf/ref/sbc/sbc_test_19.sbc
-Data/sbc_test_20.sbc	c:/mm/mmf/ref/sbc/sbc_test_20.sbc
-
-Data/sbc_test_21.sbc	c:/mm/mmf/ref/sbc/sbc_test_21.sbc
-Data/sbc_test_22.sbc	c:/mm/mmf/ref/sbc/sbc_test_22.sbc
-Data/sbc_test_23.sbc	c:/mm/mmf/ref/sbc/sbc_test_23.sbc
-Data/sbc_test_24.sbc	c:/mm/mmf/ref/sbc/sbc_test_24.sbc
-Data/sbc_test_25.sbc	c:/mm/mmf/ref/sbc/sbc_test_25.sbc
-Data/sbc_test_26.sbc	c:/mm/mmf/ref/sbc/sbc_test_26.sbc
-Data/sbc_test_27.sbc	c:/mm/mmf/ref/sbc/sbc_test_27.sbc
-Data/sbc_test_28.sbc	c:/mm/mmf/ref/sbc/sbc_test_28.sbc
-
--- a/mmlibs/mmfw/tsrc/mmfunittest/aclnt/TSU_MMF_ACLNT_01/TestStepConvertOpen.cpp	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/aclnt/TSU_MMF_ACLNT_01/TestStepConvertOpen.cpp	Fri Jul 09 12:23:13 2010 +0100
@@ -542,7 +542,7 @@
 	//open the files
 	User::LeaveIfError(outputFile.Open(iFs, iToFileName, EFileRead|EFileShareAny));
 	CleanupClosePushL(outputFile);
-	User::LeaveIfError(refFile.Open(iFs, iReferenceFileName, EFileRead|EFileShareAny));
+	User::LeaveIfError(refFile.Open(iFs, iToFileName, EFileRead|EFileShareAny));  // this is changed because of fix for DEF145347 (TSW id : ESLM-844Q3G). As file size is changing everytime, we should compare with output file always
 	CleanupClosePushL(refFile);	
 
 	TInt err = KErrNone;
--- a/mmlibs/mmfw/tsrc/mmfunittest/aclnt/TSU_MMF_ACLNT_01/TestStepPlayerPlay.cpp	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/aclnt/TSU_MMF_ACLNT_01/TestStepPlayerPlay.cpp	Fri Jul 09 12:23:13 2010 +0100
@@ -131,7 +131,7 @@
 
     if(!GetStringFromConfig(_L("SectionOne"), _L("AudioPlayFName1"), iFileName))
       {
-       //INFO_PRINTF2(_L("file name %s not found..."), fileptr);
+       INFO_PRINTF2(_L("file name %S not found..."), &iFileName);
        return EInconclusive;
       }
 
@@ -982,7 +982,8 @@
 		TTimeIntervalMicroSeconds playDuration(curTime.MicroSecondsFrom(iPlayStartTime));
 		if(playDuration < iDuration)
 			{
-			INFO_PRINTF1(_L("Clip is not played till the end"));
+			INFO_PRINTF3(_L("Clip is not played till the end - playDuration %d iDuration %d"),
+						 TInt(playDuration.Int64()), TInt(iDuration.Int64()));
 			StopTest(EFail);
 			}
 		else
--- a/mmlibs/mmfw/tsrc/mmfunittest/bwins/TSU_MMFMIDICLNT.DEF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?NewTestSuiteL@@YAPAVCTestSuite@@XZ @ 1 NONAME ; class CTestSuite * __cdecl NewTestSuiteL(void)
-
--- a/mmlibs/mmfw/tsrc/mmfunittest/bwins/TSU_MMF_ACLNT_01.DEF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,209 +0,0 @@
-EXPORTS
-	?NewTestSuiteUnitMMFAudClientL@@YAPAVCTestSuiteUnitMMFAudClient@@XZ @ 1 NONAME ; class CTestSuiteUnitMMFAudClient * __cdecl NewTestSuiteUnitMMFAudClientL(void)
-	?SetThreadPriorityRecord@CMdaAudioRecorderUtility@@QBEHABW4TThreadPriority@@@Z @ 2 NONAME ; int CMdaAudioRecorderUtility::SetThreadPriorityRecord(enum TThreadPriority const &) const
-	?RequestStop@CMdaAudioOutputStream@@QAEHXZ @ 3 NONAME ; int CMdaAudioOutputStream::RequestStop(void)
-	?SetDestinationDataTypeL@CMdaAudioConvertUtility@@QAEXVTFourCC@@@Z @ 4 NONAME ; void CMdaAudioConvertUtility::SetDestinationDataTypeL(class TFourCC)
-	?ReOpen@CMMFFindAndOpenController@@QAEXXZ @ 5 NONAME ; void CMMFFindAndOpenController::ReOpen(void)
-	?DestinationNumberOfChannelsL@CMdaAudioConvertUtility@@QAEIXZ @ 6 NONAME ; unsigned int CMdaAudioConvertUtility::DestinationNumberOfChannelsL(void)
-	??0TSourceSink@CMMFFindAndOpenController@@QAE@VTUid@@ABVRFile@@@Z @ 7 NONAME ; CMMFFindAndOpenController::TSourceSink::TSourceSink(class TUid, class RFile const &)
-	?NewL@CMdaAudioOutputStream@@SAPAV1@AAVMMdaAudioOutputStreamCallback@@PAVCMdaServer@@@Z @ 8 NONAME ; class CMdaAudioOutputStream * CMdaAudioOutputStream::NewL(class MMdaAudioOutputStreamCallback &, class CMdaServer *)
-	?OpenDesL@CMdaAudioRecorderUtility@@QAEXAAVTDes8@@@Z @ 9 NONAME ; void CMdaAudioRecorderUtility::OpenDesL(class TDes8 &)
-	?SetPlayWindow@CMdaAudioPlayerUtility@@QAEHABVTTimeIntervalMicroSeconds@@0@Z @ 10 NONAME ; int CMdaAudioPlayerUtility::SetPlayWindow(class TTimeIntervalMicroSeconds const &, class TTimeIntervalMicroSeconds const &)
-	?DataType@CMdaAudioOutputStream@@QBE?AVTFourCC@@XZ @ 11 NONAME ; class TFourCC CMdaAudioOutputStream::DataType(void) const
-	?SetDestinationSampleRateL@CMdaAudioConvertUtility@@QAEXI@Z @ 12 NONAME ; void CMdaAudioConvertUtility::SetDestinationSampleRateL(unsigned int)
-	?EvaluateIntentL@CMMFileSourceSink@@QAEXW4TIntent@ContentAccess@@@Z @ 13 NONAME ; void CMMFileSourceSink::EvaluateIntentL(enum ContentAccess::TIntent)
-	?DestinationDataTypeL@CMdaAudioConvertUtility@@QAE?AVTFourCC@@XZ @ 14 NONAME ; class TFourCC CMdaAudioConvertUtility::DestinationDataTypeL(void)
-	?SetPriority@CMdaAudioRecorderUtility@@QAEXHH@Z @ 15 NONAME ; void CMdaAudioRecorderUtility::SetPriority(int, int)
-	?UseSharedHeap@CMdaAudioRecorderUtility@@QAEXXZ @ 16 NONAME ; void CMdaAudioRecorderUtility::UseSharedHeap(void)
-	?ConvertMdaFormatUidToECOMWrite@CMMFClientUtility@@SA?AVTUid@@V2@@Z @ 17 NONAME ; class TUid CMMFClientUtility::ConvertMdaFormatUidToECOMWrite(class TUid)
-	?NewL@CMdaAudioConvertUtility@@SAPAV1@AAVMMdaObjectStateChangeObserver@@PAVCMdaServer@@HH@Z @ 18 NONAME ; class CMdaAudioConvertUtility * CMdaAudioConvertUtility::NewL(class MMdaObjectStateChangeObserver &, class CMdaServer *, int, int)
-	?WillResumePlay@CMdaAudioRecorderUtility@@QAEHXZ @ 19 NONAME ; int CMdaAudioRecorderUtility::WillResumePlay(void)
-	?Position@CMdaAudioInputStream@@QAEABVTTimeIntervalMicroSeconds@@XZ @ 20 NONAME ; class TTimeIntervalMicroSeconds const & CMdaAudioInputStream::Position(void)
-	?NewL@CMMSourceSink@@SAPAV1@VTUid@@ABVTDesC8@@@Z @ 21 NONAME ; class CMMSourceSink * CMMSourceSink::NewL(class TUid, class TDesC8 const &)
-	?RecordControllerCustomCommandSync@CMdaAudioRecorderUtility@@QAEHABV?$TPckgBuf@VTMMFMessageDestination@@@@HABVTDesC8@@1@Z @ 22 NONAME ; int CMdaAudioRecorderUtility::RecordControllerCustomCommandSync(class TPckgBuf<class TMMFMessageDestination> const &, int, class TDesC8 const &, class TDesC8 const &)
-	?OpenFileL@CMdaAudioPlayerUtility@@QAEXABVTMMSource@@@Z @ 23 NONAME ; void CMdaAudioPlayerUtility::OpenFileL(class TMMSource const &)
-	?GetAudioLoadingProgressL@CMdaAudioPlayerUtility@@QAEXAAH@Z @ 24 NONAME ; void CMdaAudioPlayerUtility::GetAudioLoadingProgressL(int &)
-	?SetDestinationSampleRateL@CMdaAudioRecorderUtility@@QAEXI@Z @ 25 NONAME ; void CMdaAudioRecorderUtility::SetDestinationSampleRateL(unsigned int)
-	?NewL@CMMFFindAndOpenController@@SAPAV1@AAVMMMFFindAndOpenControllerObserver@@@Z @ 26 NONAME ; class CMMFFindAndOpenController * CMMFFindAndOpenController::NewL(class MMMFFindAndOpenControllerObserver &)
-	?SetDestinationBitRateL@CMdaAudioConvertUtility@@QAEXI@Z @ 27 NONAME ; void CMdaAudioConvertUtility::SetDestinationBitRateL(unsigned int)
-	?SetPriority@CMdaAudioPlayerUtility@@QAEHHH@Z @ 28 NONAME ; int CMdaAudioPlayerUtility::SetPriority(int, int)
-	?NewL@CMMFileSourceSink@@SAPAV1@VTUid@@ABVRFile@@@Z @ 29 NONAME ; class CMMFileSourceSink * CMMFileSourceSink::NewL(class TUid, class RFile const &)
-	?OpenFileL@CMdaAudioRecorderUtility@@QAEXABVRFile@@VTUid@@11VTFourCC@@@Z @ 30 NONAME ; void CMdaAudioRecorderUtility::OpenFileL(class RFile const &, class TUid, class TUid, class TUid, class TFourCC)
-	?WillResumePlay@CMdaAudioPlayerUtility@@QAEHXZ @ 31 NONAME ; int CMdaAudioPlayerUtility::WillResumePlay(void)
-	?OpenByFileSource@CMMFFindAndOpenController@@QAEXABVTMMSource@@ABVTDesC16@@@Z @ 32 NONAME ; void CMMFFindAndOpenController::OpenByFileSource(class TMMSource const &, class TDesC16 const &)
-	?Pause@CMdaAudioOutputStream@@QAEHXZ @ 33 NONAME ; int CMdaAudioOutputStream::Pause(void)
-	?NewL@CMdaAudioRecorderUtility@@SAPAV1@AAVMMdaObjectStateChangeObserver@@PAVCMdaServer@@HH@Z @ 34 NONAME ; class CMdaAudioRecorderUtility * CMdaAudioRecorderUtility::NewL(class MMdaObjectStateChangeObserver &, class CMdaServer *, int, int)
-	?GetBalanceL@CMdaAudioInputStream@@QBEHXZ @ 35 NONAME ; int CMdaAudioInputStream::GetBalanceL(void) const
-	?CustomCommandAsync@CMdaAudioConvertUtility@@QAEXABV?$TPckgBuf@VTMMFMessageDestination@@@@HABVTDesC8@@1AAVTRequestStatus@@@Z @ 36 NONAME ; void CMdaAudioConvertUtility::CustomCommandAsync(class TPckgBuf<class TMMFMessageDestination> const &, int, class TDesC8 const &, class TDesC8 const &, class TRequestStatus &)
-	?GetBitRate@CMdaAudioPlayerUtility@@QAEHAAI@Z @ 37 NONAME ; int CMdaAudioPlayerUtility::GetBitRate(unsigned int &)
-	?NewDesPlayerL@CMdaAudioPlayerUtility@@SAPAV1@ABVTDesC8@@AAVMMdaAudioPlayerCallback@@HHPAVCMdaServer@@@Z @ 38 NONAME ; class CMdaAudioPlayerUtility * CMdaAudioPlayerUtility::NewDesPlayerL(class TDesC8 const &, class MMdaAudioPlayerCallback &, int, int, class CMdaServer *)
-	?ConvertMdaCodecToFourCC@CMMFClientUtility@@SA?AVTFourCC@@AAVTMdaPackage@@@Z @ 39 NONAME ; class TFourCC CMMFClientUtility::ConvertMdaCodecToFourCC(class TMdaPackage &)
-	?SourceBitRateL@CMdaAudioRecorderUtility@@QAEIXZ @ 40 NONAME ; unsigned int CMdaAudioRecorderUtility::SourceBitRateL(void)
-	?CustomInterface@CMdaAudioOutputStream@@QAEPAXVTUid@@@Z @ 41 NONAME ; void * CMdaAudioOutputStream::CustomInterface(class TUid)
-	?OpenByDescriptor@CMMFFindAndOpenController@@QAEXABVTDesC8@@@Z @ 42 NONAME ; void CMMFFindAndOpenController::OpenByDescriptor(class TDesC8 const &)
-	?ReplaceMetaDataEntryL@CMdaAudioRecorderUtility@@QAEXHAAVCMMFMetaDataEntry@@@Z @ 43 NONAME ; void CMdaAudioRecorderUtility::ReplaceMetaDataEntryL(int, class CMMFMetaDataEntry &)
-	?RequestStop@CMdaAudioInputStream@@QAEXXZ @ 44 NONAME ; void CMdaAudioInputStream::RequestStop(void)
-	?GetNumberOfMetaDataEntries@CMdaAudioRecorderUtility@@QAEHAAH@Z @ 45 NONAME ; int CMdaAudioRecorderUtility::GetNumberOfMetaDataEntries(int &)
-	?RemoveMetaDataEntry@CMdaAudioRecorderUtility@@QAEHH@Z @ 46 NONAME ; int CMdaAudioRecorderUtility::RemoveMetaDataEntry(int)
-	?DestinationSampleRateL@CMdaAudioConvertUtility@@QAEIXZ @ 47 NONAME ; unsigned int CMdaAudioConvertUtility::DestinationSampleRateL(void)
-	?DestinationBitRateL@CMdaAudioRecorderUtility@@QAEIXZ @ 48 NONAME ; unsigned int CMdaAudioRecorderUtility::DestinationBitRateL(void)
-	?GetBalanceL@CMdaAudioOutputStream@@QBEHXZ @ 49 NONAME ; int CMdaAudioOutputStream::GetBalanceL(void) const
-	?RegisterForAudioLoadingNotification@CMdaAudioPlayerUtility@@QAEXAAVMAudioLoadingObserver@@@Z @ 50 NONAME ; void CMdaAudioPlayerUtility::RegisterForAudioLoadingNotification(class MAudioLoadingObserver &)
-	?GetSupportedSampleRatesL@CMdaAudioRecorderUtility@@QAEXAAV?$RArray@I@@@Z @ 51 NONAME ; void CMdaAudioRecorderUtility::GetSupportedSampleRatesL(class RArray<unsigned int> &)
-	??0TSourceSink@CMMFFindAndOpenController@@QAE@VTUid@@ABVTDesC8@@@Z @ 52 NONAME ; CMMFFindAndOpenController::TSourceSink::TSourceSink(class TUid, class TDesC8 const &)
-	?RegisterForAudioLoadingNotification@CMdaAudioRecorderUtility@@QAEXAAVMAudioLoadingObserver@@@Z @ 53 NONAME ; void CMdaAudioRecorderUtility::RegisterForAudioLoadingNotification(class MAudioLoadingObserver &)
-	?DestinationFormatL@CMdaAudioConvertUtility@@QAE?AVTUid@@XZ @ 54 NONAME ; class TUid CMdaAudioConvertUtility::DestinationFormatL(void)
-	?SetDestinationBitRateL@CMdaAudioRecorderUtility@@QAEXI@Z @ 55 NONAME ; void CMdaAudioRecorderUtility::SetDestinationBitRateL(unsigned int)
-	?GetBytes@CMdaAudioInputStream@@QAEHXZ @ 56 NONAME ; int CMdaAudioInputStream::GetBytes(void)
-	?SetDestinationFormatL@CMdaAudioRecorderUtility@@QAEXVTUid@@@Z @ 57 NONAME ; void CMdaAudioRecorderUtility::SetDestinationFormatL(class TUid)
-	?SetBalanceL@CMdaAudioInputStream@@QAEXH@Z @ 58 NONAME ; void CMdaAudioInputStream::SetBalanceL(int)
-	?PlayControllerCustomCommandSync@CMdaAudioRecorderUtility@@QAEHABV?$TPckgBuf@VTMMFMessageDestination@@@@HABVTDesC8@@1@Z @ 59 NONAME ; int CMdaAudioRecorderUtility::PlayControllerCustomCommandSync(class TPckgBuf<class TMMFMessageDestination> const &, int, class TDesC8 const &, class TDesC8 const &)
-	?SetRecordBalance@CMdaAudioRecorderUtility@@QAEHH@Z @ 60 NONAME ; int CMdaAudioRecorderUtility::SetRecordBalance(int)
-	?DestinationDataTypeL@CMdaAudioRecorderUtility@@QAE?AVTFourCC@@XZ @ 61 NONAME ; class TFourCC CMdaAudioRecorderUtility::DestinationDataTypeL(void)
-	?PrepareToPlayDualTone@CMdaAudioToneUtility@@QAEXHHABVTTimeIntervalMicroSeconds@@@Z @ 62 NONAME ; void CMdaAudioToneUtility::PrepareToPlayDualTone(int, int, class TTimeIntervalMicroSeconds const &)
-	??1CMdaAudioType@@UAE@XZ @ 63 NONAME ; CMdaAudioType::~CMdaAudioType(void)
-	?PlayControllerCustomCommandSync@CMdaAudioRecorderUtility@@QAEHABV?$TPckgBuf@VTMMFMessageDestination@@@@HABVTDesC8@@1AAVTDes8@@@Z @ 64 NONAME ; int CMdaAudioRecorderUtility::PlayControllerCustomCommandSync(class TPckgBuf<class TMMFMessageDestination> const &, int, class TDesC8 const &, class TDesC8 const &, class TDes8 &)
-	?ConfigureSourceSink@CMMFFindAndOpenController@@QAEXABVTMMSource@@VTSourceSink@1@@Z @ 65 NONAME ; void CMMFFindAndOpenController::ConfigureSourceSink(class TMMSource const &, class CMMFFindAndOpenController::TSourceSink)
-	?WillResumePlay@CMdaAudioOutputStream@@QAEHXZ @ 66 NONAME ; int CMdaAudioOutputStream::WillResumePlay(void)
-	?NewL@CMdaAudioOutputStream@@SAPAV1@AAVMMdaAudioOutputStreamCallback@@HH@Z @ 67 NONAME ; class CMdaAudioOutputStream * CMdaAudioOutputStream::NewL(class MMdaAudioOutputStreamCallback &, int, int)
-	?OpenUrlL@CMdaAudioRecorderUtility@@QAEXABVTDesC16@@HVTUid@@11VTFourCC@@@Z @ 68 NONAME ; void CMdaAudioRecorderUtility::OpenUrlL(class TDesC16 const &, int, class TUid, class TUid, class TUid, class TFourCC)
-	?NewL@CMdaAudioInputStream@@SAPAV1@AAVMMdaAudioInputStreamCallback@@@Z @ 69 NONAME ; class CMdaAudioInputStream * CMdaAudioInputStream::NewL(class MMdaAudioInputStreamCallback &)
-	?OpenUrlL@CMdaAudioRecorderUtility@@QAEXABVTDesC16@@HABVTDesC8@@@Z @ 70 NONAME ; void CMdaAudioRecorderUtility::OpenUrlL(class TDesC16 const &, int, class TDesC8 const &)
-	?RecordControllerCustomCommandSync@CMdaAudioRecorderUtility@@QAEHABV?$TPckgBuf@VTMMFMessageDestination@@@@HABVTDesC8@@1AAVTDes8@@@Z @ 71 NONAME ; int CMdaAudioRecorderUtility::RecordControllerCustomCommandSync(class TPckgBuf<class TMMFMessageDestination> const &, int, class TDesC8 const &, class TDesC8 const &, class TDes8 &)
-	?Duration@CMdaAudioRecorderUtility@@QAE?AW4TMMFDurationInfo@@AAVTTimeIntervalMicroSeconds@@@Z @ 72 NONAME ; enum TMMFDurationInfo CMdaAudioRecorderUtility::Duration(class TTimeIntervalMicroSeconds &)
-	?CustomCommandSync@CMdaAudioConvertUtility@@QAEHABV?$TPckgBuf@VTMMFMessageDestination@@@@HABVTDesC8@@1@Z @ 73 NONAME ; int CMdaAudioConvertUtility::CustomCommandSync(class TPckgBuf<class TMMFMessageDestination> const &, int, class TDesC8 const &, class TDesC8 const &)
-	?GetDRMCustomCommand@CMdaAudioPlayerUtility@@QAEPAVMMMFDRMCustomCommand@@XZ @ 74 NONAME ; class MMMFDRMCustomCommand * CMdaAudioPlayerUtility::GetDRMCustomCommand(void)
-	?GetRecordBalance@CMdaAudioRecorderUtility@@QAEHAAH@Z @ 75 NONAME ; int CMdaAudioRecorderUtility::GetRecordBalance(int &)
-	?ConfigureController@CMMFFindAndOpenController@@QAEXAAVRMMFController@@AAVCMMFControllerEventMonitor@@W4TControllerMode@1@@Z @ 76 NONAME ; void CMMFFindAndOpenController::ConfigureController(class RMMFController &, class CMMFControllerEventMonitor &, enum CMMFFindAndOpenController::TControllerMode)
-	?SetThreadPriority@CMdaAudioConvertUtility@@QBEHABW4TThreadPriority@@@Z @ 77 NONAME ; int CMdaAudioConvertUtility::SetThreadPriority(enum TThreadPriority const &) const
-	?OpenL@CMdaAudioConvertUtility@@QAEXPAVTMdaClipLocation@@0VTUid@@1VTFourCC@@@Z @ 78 NONAME ; void CMdaAudioConvertUtility::OpenL(class TMdaClipLocation *, class TMdaClipLocation *, class TUid, class TUid, class TFourCC)
-	?OpenFileL@CMdaAudioRecorderUtility@@QAEXABVRFile@@@Z @ 79 NONAME ; void CMdaAudioRecorderUtility::OpenFileL(class RFile const &)
-	?ConfigureSourceSink@CMMFFindAndOpenController@@QAEXVTSourceSink@1@0@Z @ 80 NONAME ; void CMMFFindAndOpenController::ConfigureSourceSink(class CMMFFindAndOpenController::TSourceSink, class CMMFFindAndOpenController::TSourceSink)
-	?SourceSampleRateL@CMdaAudioConvertUtility@@QAEIXZ @ 81 NONAME ; unsigned int CMdaAudioConvertUtility::SourceSampleRateL(void)
-	?MaxGain@CMdaAudioInputStream@@QBEHXZ @ 82 NONAME ; int CMdaAudioInputStream::MaxGain(void) const
-	?NewLC@CMMSourceSink@@SAPAV1@VTUid@@ABVTDesC8@@@Z @ 83 NONAME ; class CMMSourceSink * CMMSourceSink::NewLC(class TUid, class TDesC8 const &)
-	?CancelRegisterAudioResourceNotification@CMdaAudioRecorderUtility@@QAEHVTUid@@@Z @ 84 NONAME ; int CMdaAudioRecorderUtility::CancelRegisterAudioResourceNotification(class TUid)
-	?SourceFormatL@CMdaAudioConvertUtility@@QAE?AVTUid@@XZ @ 85 NONAME ; class TUid CMdaAudioConvertUtility::SourceFormatL(void)
-	?SetDestinationDataTypeL@CMdaAudioRecorderUtility@@QAEXVTFourCC@@@Z @ 86 NONAME ; void CMdaAudioRecorderUtility::SetDestinationDataTypeL(class TFourCC)
-	?NewL@CMMFMdaObjectStateChangeObserverCallback@@SAPAV1@AAVMMdaObjectStateChangeObserver@@@Z @ 87 NONAME ; class CMMFMdaObjectStateChangeObserverCallback * CMMFMdaObjectStateChangeObserverCallback::NewL(class MMdaObjectStateChangeObserver &)
-	?GetBytes@CMdaAudioOutputStream@@QAEHXZ @ 88 NONAME ; int CMdaAudioOutputStream::GetBytes(void)
-	?SetPosition@CMdaAudioPlayerUtility@@QAEXABVTTimeIntervalMicroSeconds@@@Z @ 89 NONAME ; void CMdaAudioPlayerUtility::SetPosition(class TTimeIntervalMicroSeconds const &)
-	?SetDataTypeL@CMdaAudioInputStream@@QAEXVTFourCC@@@Z @ 90 NONAME ; void CMdaAudioInputStream::SetDataTypeL(class TFourCC)
-	?NewL@CMdaAudioPlayerUtility@@SAPAV1@AAVMMdaAudioPlayerCallback@@HH@Z @ 91 NONAME ; class CMdaAudioPlayerUtility * CMdaAudioPlayerUtility::NewL(class MMdaAudioPlayerCallback &, int, int)
-	?SetDataTypeL@CMdaAudioOutputStream@@QAEXVTFourCC@@@Z @ 92 NONAME ; void CMdaAudioOutputStream::SetDataTypeL(class TFourCC)
-	?SetBalance@CMdaAudioPlayerUtility@@QAEHH@Z @ 93 NONAME ; int CMdaAudioPlayerUtility::SetBalance(int)
-	?GetBalanceL@CMdaAudioToneUtility@@QAEHXZ @ 94 NONAME ; int CMdaAudioToneUtility::GetBalanceL(void)
-	?Pause@CMdaAudioToneUtility@@QAEHXZ @ 95 NONAME ; int CMdaAudioToneUtility::Pause(void)
-	?CustomCommandSync@CMdaAudioPlayerUtility@@QAEHABV?$TPckgBuf@VTMMFMessageDestination@@@@HABVTDesC8@@1AAVTDes8@@@Z @ 96 NONAME ; int CMdaAudioPlayerUtility::CustomCommandSync(class TPckgBuf<class TMMFMessageDestination> const &, int, class TDesC8 const &, class TDesC8 const &, class TDes8 &)
-	?SetThreadPriority@CMdaAudioPlayerUtility@@QBEHABW4TThreadPriority@@@Z @ 97 NONAME ; int CMdaAudioPlayerUtility::SetThreadPriority(enum TThreadPriority const &) const
-	?Close@CMdaAudioPlayerUtility@@QAEXXZ @ 98 NONAME ; void CMdaAudioPlayerUtility::Close(void)
-	?OpenFileL@CMdaAudioPlayerUtility@@QAEXABVTDesC16@@@Z @ 99 NONAME ; void CMdaAudioPlayerUtility::OpenFileL(class TDesC16 const &)
-	?PrepareToPlayFileSequence@CMdaAudioToneUtility@@QAEXAAVRFile@@@Z @ 100 NONAME ; void CMdaAudioToneUtility::PrepareToPlayFileSequence(class RFile &)
-	?GetSupportedDestinationDataTypesL@CMdaAudioConvertUtility@@QAEXAAV?$RArray@VTFourCC@@@@@Z @ 101 NONAME ; void CMdaAudioConvertUtility::GetSupportedDestinationDataTypesL(class RArray<class TFourCC> &)
-	?OpenFileL@CMdaAudioRecorderUtility@@QAEXABVTMMSource@@@Z @ 102 NONAME ; void CMdaAudioRecorderUtility::OpenFileL(class TMMSource const &)
-	?CustomCommandAsync@CMdaAudioConvertUtility@@QAEXABV?$TPckgBuf@VTMMFMessageDestination@@@@HABVTDesC8@@1AAVTDes8@@AAVTRequestStatus@@@Z @ 103 NONAME ; void CMdaAudioConvertUtility::CustomCommandAsync(class TPckgBuf<class TMMFMessageDestination> const &, int, class TDesC8 const &, class TDesC8 const &, class TDes8 &, class TRequestStatus &)
-	?GetFileHeaderData@CMMFClientUtility@@SAHABVTDesC16@@AAVTDes8@@H@Z @ 104 NONAME ; int CMMFClientUtility::GetFileHeaderData(class TDesC16 const &, class TDes8 &, int)
-	?RecordControllerCustomCommandAsync@CMdaAudioRecorderUtility@@QAEXABV?$TPckgBuf@VTMMFMessageDestination@@@@HABVTDesC8@@1AAVTRequestStatus@@@Z @ 105 NONAME ; void CMdaAudioRecorderUtility::RecordControllerCustomCommandAsync(class TPckgBuf<class TMMFMessageDestination> const &, int, class TDesC8 const &, class TDesC8 const &, class TRequestStatus &)
-	?ConfigureSecondarySourceSink@CMMFFindAndOpenController@@QAEXVTSourceSink@1@0@Z @ 106 NONAME ; void CMMFFindAndOpenController::ConfigureSecondarySourceSink(class CMMFFindAndOpenController::TSourceSink, class CMMFFindAndOpenController::TSourceSink)
-	?GetConfigDescriptor@CMMFFindAndOpenController@@SA?AV?$TPckgBuf@VTMMFDescriptorParams@@@@ABVTDesC8@@@Z @ 107 NONAME ; class TPckgBuf<class TMMFDescriptorParams> CMMFFindAndOpenController::GetConfigDescriptor(class TDesC8 const &)
-	?GetMetaDataEntryL@CMdaAudioRecorderUtility@@QAEPAVCMMFMetaDataEntry@@H@Z @ 108 NONAME ; class CMMFMetaDataEntry * CMdaAudioRecorderUtility::GetMetaDataEntryL(int)
-	?AudioPlayControllerImplementationInformationL@CMdaAudioRecorderUtility@@QAEABVCMMFControllerImplementationInformation@@XZ @ 109 NONAME ; class CMMFControllerImplementationInformation const & CMdaAudioRecorderUtility::AudioPlayControllerImplementationInformationL(void)
-	?RegisterAudioResourceNotification@CMdaAudioPlayerUtility@@QAEHAAVMMMFAudioResourceNotificationCallback@@VTUid@@ABVTDesC8@@@Z @ 110 NONAME ; int CMdaAudioPlayerUtility::RegisterAudioResourceNotification(class MMMFAudioResourceNotificationCallback &, class TUid, class TDesC8 const &)
-	?ReadL@CMdaAudioInputStream@@QAEXAAVTDes8@@@Z @ 111 NONAME ; void CMdaAudioInputStream::ReadL(class TDes8 &)
-	?CustomCommandAsync@CMdaAudioPlayerUtility@@QAEXABV?$TPckgBuf@VTMMFMessageDestination@@@@HABVTDesC8@@1AAVTDes8@@AAVTRequestStatus@@@Z @ 112 NONAME ; void CMdaAudioPlayerUtility::CustomCommandAsync(class TPckgBuf<class TMMFMessageDestination> const &, int, class TDesC8 const &, class TDesC8 const &, class TDes8 &, class TRequestStatus &)
-	?OpenByControllerUid@CMMFFindAndOpenController@@QAEXVTUid@@0@Z @ 113 NONAME ; void CMMFFindAndOpenController::OpenByControllerUid(class TUid, class TUid)
-	?CustomInterface@CMdaAudioToneUtility@@QAEPAXVTUid@@@Z @ 114 NONAME ; void * CMdaAudioToneUtility::CustomInterface(class TUid)
-	?CancelRegisterAudioResourceNotification@CMdaAudioOutputStream@@QAEHVTUid@@@Z @ 115 NONAME ; int CMdaAudioOutputStream::CancelRegisterAudioResourceNotification(class TUid)
-	?Resume@CMdaAudioOutputStream@@QAEHXZ @ 116 NONAME ; int CMdaAudioOutputStream::Resume(void)
-	?Duration@CMdaAudioPlayerUtility@@QAE?AW4TMMFDurationInfo@@AAVTTimeIntervalMicroSeconds@@@Z @ 117 NONAME ; enum TMMFDurationInfo CMdaAudioPlayerUtility::Duration(class TTimeIntervalMicroSeconds &)
-	?SetBalanceL@CMdaAudioToneUtility@@QAEXH@Z @ 118 NONAME ; void CMdaAudioToneUtility::SetBalanceL(int)
-	?SourceBitRateL@CMdaAudioConvertUtility@@QAEHXZ @ 119 NONAME ; int CMdaAudioConvertUtility::SourceBitRateL(void)
-	?GetSupportedConversionNumberOfChannelsL@CMdaAudioConvertUtility@@QAEXAAV?$RArray@I@@@Z @ 120 NONAME ; void CMdaAudioConvertUtility::GetSupportedConversionNumberOfChannelsL(class RArray<unsigned int> &)
-	?Resume@CMdaAudioToneUtility@@QAEHXZ @ 121 NONAME ; int CMdaAudioToneUtility::Resume(void)
-	?GetSupportedConversionBitRatesL@CMdaAudioConvertUtility@@QAEXAAV?$RArray@I@@@Z @ 122 NONAME ; void CMdaAudioConvertUtility::GetSupportedConversionBitRatesL(class RArray<unsigned int> &)
-	?OpenDesL@CMdaAudioPlayerUtility@@QAEXABVTDesC8@@@Z @ 123 NONAME ; void CMdaAudioPlayerUtility::OpenDesL(class TDesC8 const &)
-	?OpenByFormatUid@CMMFFindAndOpenController@@QAEXVTUid@@0@Z @ 124 NONAME ; void CMMFFindAndOpenController::OpenByFormatUid(class TUid, class TUid)
-	?GetConfigFile@CMMFFindAndOpenController@@SA?AV?$TPckgBuf@VTMMFFileParams@@@@ABVTDesC16@@@Z @ 125 NONAME ; class TPckgBuf<class TMMFFileParams> CMMFFindAndOpenController::GetConfigFile(class TDesC16 const &)
-	?Gain@CMdaAudioInputStream@@QBEHXZ @ 126 NONAME ; int CMdaAudioInputStream::Gain(void) const
-	?ConvertMdaFormatUidToECOMRead@CMMFClientUtility@@SA?AVTUid@@V2@@Z @ 127 NONAME ; class TUid CMMFClientUtility::ConvertMdaFormatUidToECOMRead(class TUid)
-	?Close@CMMFFindAndOpenController@@QAEXXZ @ 128 NONAME ; void CMMFFindAndOpenController::Close(void)
-	?DestinationSampleRateL@CMdaAudioRecorderUtility@@QAEIXZ @ 129 NONAME ; unsigned int CMdaAudioRecorderUtility::DestinationSampleRateL(void)
-	?CancelRegisterAudioResourceNotification@CMdaAudioPlayerUtility@@QAEHVTUid@@@Z @ 130 NONAME ; int CMdaAudioPlayerUtility::CancelRegisterAudioResourceNotification(class TUid)
-	?GetAudioLoadingProgressL@CMdaAudioRecorderUtility@@QAEXAAH@Z @ 131 NONAME ; void CMdaAudioRecorderUtility::GetAudioLoadingProgressL(int &)
-	?NewDesPlayerReadOnlyL@CMdaAudioPlayerUtility@@SAPAV1@ABVTDesC8@@AAVMMdaAudioPlayerCallback@@HHPAVCMdaServer@@@Z @ 132 NONAME ; class CMdaAudioPlayerUtility * CMdaAudioPlayerUtility::NewDesPlayerReadOnlyL(class TDesC8 const &, class MMdaAudioPlayerCallback &, int, int, class CMdaServer *)
-	?SourceDataTypeL@CMdaAudioConvertUtility@@QAE?AVTFourCC@@XZ @ 133 NONAME ; class TFourCC CMdaAudioConvertUtility::SourceDataTypeL(void)
-	?SetAudioPropertiesL@CMdaAudioInputStream@@QAEXHH@Z @ 134 NONAME ; void CMdaAudioInputStream::SetAudioPropertiesL(int, int)
-	?GetBalance@CMdaAudioPlayerUtility@@QAEHAAH@Z @ 135 NONAME ; int CMdaAudioPlayerUtility::GetBalance(int &)
-	?RegisterAudioResourceNotification@CMdaAudioOutputStream@@QAEHAAVMMMFAudioResourceNotificationCallback@@VTUid@@ABVTDesC8@@@Z @ 136 NONAME ; int CMdaAudioOutputStream::RegisterAudioResourceNotification(class MMMFAudioResourceNotificationCallback &, class TUid, class TDesC8 const &)
-	?NewL@CMdaAudioToneUtility@@SAPAV1@AAVMMdaAudioToneObserver@@PAVCMdaServer@@@Z @ 137 NONAME ; class CMdaAudioToneUtility * CMdaAudioToneUtility::NewL(class MMdaAudioToneObserver &, class CMdaServer *)
-	?OpenUrlL@CMdaAudioPlayerUtility@@QAEXABVTDesC16@@HABVTDesC8@@@Z @ 138 NONAME ; void CMdaAudioPlayerUtility::OpenUrlL(class TDesC16 const &, int, class TDesC8 const &)
-	?OpenFileL@CMdaAudioRecorderUtility@@QAEXABVTMMSource@@VTUid@@11VTFourCC@@@Z @ 139 NONAME ; void CMdaAudioRecorderUtility::OpenFileL(class TMMSource const &, class TUid, class TUid, class TUid, class TFourCC)
-	?CustomCommandSync@CMdaAudioPlayerUtility@@QAEHABV?$TPckgBuf@VTMMFMessageDestination@@@@HABVTDesC8@@1@Z @ 140 NONAME ; int CMdaAudioPlayerUtility::CustomCommandSync(class TPckgBuf<class TMMFMessageDestination> const &, int, class TDesC8 const &, class TDesC8 const &)
-	?DestinationFormatL@CMdaAudioRecorderUtility@@QAE?AVTUid@@XZ @ 141 NONAME ; class TUid CMdaAudioRecorderUtility::DestinationFormatL(void)
-	?NewLC@CMMFileSourceSink@@SAPAV1@VTUid@@ABVTMMSource@@@Z @ 142 NONAME ; class CMMFileSourceSink * CMMFileSourceSink::NewLC(class TUid, class TMMSource const &)
-	?GetPlaybackBalance@CMdaAudioRecorderUtility@@QAEHAAH@Z @ 143 NONAME ; int CMdaAudioRecorderUtility::GetPlaybackBalance(int &)
-	?SetPriority@CMdaAudioInputStream@@QAEXHH@Z @ 144 NONAME ; void CMdaAudioInputStream::SetPriority(int, int)
-	?CustomCommandSync@CMdaAudioConvertUtility@@QAEHABV?$TPckgBuf@VTMMFMessageDestination@@@@HABVTDesC8@@1AAVTDes8@@@Z @ 145 NONAME ; int CMdaAudioConvertUtility::CustomCommandSync(class TPckgBuf<class TMMFMessageDestination> const &, int, class TDesC8 const &, class TDesC8 const &, class TDes8 &)
-	?GetSupportedBitRatesL@CMdaAudioRecorderUtility@@QAEXAAV?$RArray@I@@@Z @ 146 NONAME ; void CMdaAudioRecorderUtility::GetSupportedBitRatesL(class RArray<unsigned int> &)
-	?ConfigureSecondaryController@CMMFFindAndOpenController@@QAEXAAVRMMFController@@AAVCMMFControllerEventMonitor@@W4TControllerMode@1@@Z @ 147 NONAME ; void CMMFFindAndOpenController::ConfigureSecondaryController(class RMMFController &, class CMMFControllerEventMonitor &, enum CMMFFindAndOpenController::TControllerMode)
-	?SetInitScreenNumber@CMMFFindAndOpenController@@QAEXHPAVRMMFVideoSetInitScreenCustomCommands@@@Z @ 148 NONAME ; void CMMFFindAndOpenController::SetInitScreenNumber(int, class RMMFVideoSetInitScreenCustomCommands *)
-	?SetGain@CMdaAudioInputStream@@QAEXH@Z @ 149 NONAME ; void CMdaAudioInputStream::SetGain(int)
-	?SetBitRateL@CMdaAudioInputStream@@QAEXH@Z @ 150 NONAME ; void CMdaAudioInputStream::SetBitRateL(int)
-	?GetConfigUrlL@CMMFFindAndOpenController@@SAXAAPAVCBufFlat@@ABVTDesC16@@H@Z @ 151 NONAME ; void CMMFFindAndOpenController::GetConfigUrlL(class CBufFlat * &, class TDesC16 const &, int)
-	?UseSharedHeap@CMMFFindAndOpenController@@QAEXXZ @ 152 NONAME ; void CMMFFindAndOpenController::UseSharedHeap(void)
-	?NewL@CMdaAudioToneUtility@@SAPAV1@AAVMMdaAudioToneObserver@@PAVCMdaServer@@HH@Z @ 153 NONAME ; class CMdaAudioToneUtility * CMdaAudioToneUtility::NewL(class MMdaAudioToneObserver &, class CMdaServer *, int, int)
-	?NewL@CMMFileSourceSink@@SAPAV1@VTUid@@ABVTMMSource@@@Z @ 154 NONAME ; class CMMFileSourceSink * CMMFileSourceSink::NewL(class TUid, class TMMSource const &)
-	?NewL@CMdaAudioInputStream@@SAPAV1@AAVMMdaAudioInputStreamCallback@@HH@Z @ 155 NONAME ; class CMdaAudioInputStream * CMdaAudioInputStream::NewL(class MMdaAudioInputStreamCallback &, int, int)
-	?NewLC@CMMFileSourceSink@@SAPAV1@VTUid@@ABVRFile@@@Z @ 156 NONAME ; class CMMFileSourceSink * CMMFileSourceSink::NewLC(class TUid, class RFile const &)
-	?PlayControllerCustomCommandAsync@CMdaAudioRecorderUtility@@QAEXABV?$TPckgBuf@VTMMFMessageDestination@@@@HABVTDesC8@@1AAVTRequestStatus@@@Z @ 157 NONAME ; void CMdaAudioRecorderUtility::PlayControllerCustomCommandAsync(class TPckgBuf<class TMMFMessageDestination> const &, int, class TDesC8 const &, class TDesC8 const &, class TRequestStatus &)
-	?OpenFileL@CMdaAudioRecorderUtility@@QAEXABVTDesC16@@VTUid@@11VTFourCC@@@Z @ 158 NONAME ; void CMdaAudioRecorderUtility::OpenFileL(class TDesC16 const &, class TUid, class TUid, class TUid, class TFourCC)
-	?GetPosition@CMdaAudioPlayerUtility@@QAEHAAVTTimeIntervalMicroSeconds@@@Z @ 159 NONAME ; int CMdaAudioPlayerUtility::GetPosition(class TTimeIntervalMicroSeconds &)
-	?RegisterAudioResourceNotification@CMdaAudioRecorderUtility@@QAEHAAVMMMFAudioResourceNotificationCallback@@VTUid@@ABVTDesC8@@@Z @ 160 NONAME ; int CMdaAudioRecorderUtility::RegisterAudioResourceNotification(class MMMFAudioResourceNotificationCallback &, class TUid, class TDesC8 const &)
-	?CallBack@CMMFMdaObjectStateChangeObserverCallback@@QAEXPAVCBase@@HHH@Z @ 161 NONAME ; void CMMFMdaObjectStateChangeObserverCallback::CallBack(class CBase *, int, int, int)
-	?SetThreadPriorityPlayback@CMdaAudioRecorderUtility@@QBEHABW4TThreadPriority@@@Z @ 162 NONAME ; int CMdaAudioRecorderUtility::SetThreadPriorityPlayback(enum TThreadPriority const &) const
-	?ConvertL@CMdaAudioConvertUtility@@QAEXXZ @ 163 NONAME ; void CMdaAudioConvertUtility::ConvertL(void)
-	?GetFileExtensionL@CMMFClientUtility@@SAPAVHBufC8@@ABVTDesC16@@@Z @ 164 NONAME ; class HBufC8 * CMMFClientUtility::GetFileExtensionL(class TDesC16 const &)
-	?AddMetaDataEntryL@CMdaAudioRecorderUtility@@QAEXAAVCMMFMetaDataEntry@@@Z @ 165 NONAME ; void CMdaAudioRecorderUtility::AddMetaDataEntryL(class CMMFMetaDataEntry &)
-	?Open@CMdaAudioInputStream@@QAEXPAVTMdaPackage@@@Z @ 166 NONAME ; void CMdaAudioInputStream::Open(class TMdaPackage *)
-	?Pause@CMdaAudioPlayerUtility@@QAEHXZ @ 167 NONAME ; int CMdaAudioPlayerUtility::Pause(void)
-	?GetSupportedNumberOfChannelsL@CMdaAudioRecorderUtility@@QAEXAAV?$RArray@I@@@Z @ 168 NONAME ; void CMdaAudioRecorderUtility::GetSupportedNumberOfChannelsL(class RArray<unsigned int> &)
-	?KeepOpenAtEnd@CMdaAudioOutputStream@@QAEHXZ @ 169 NONAME ; int CMdaAudioOutputStream::KeepOpenAtEnd(void)
-	?SetSingleBufferMode@CMdaAudioInputStream@@QAEXH@Z @ 170 NONAME ; void CMdaAudioInputStream::SetSingleBufferMode(int)
-	?GetSupportedConversionSampleRatesL@CMdaAudioConvertUtility@@QAEXAAV?$RArray@I@@@Z @ 171 NONAME ; void CMdaAudioConvertUtility::GetSupportedConversionSampleRatesL(class RArray<unsigned int> &)
-	?DestinationBitRateL@CMdaAudioConvertUtility@@QAEIXZ @ 172 NONAME ; unsigned int CMdaAudioConvertUtility::DestinationBitRateL(void)
-	?SetDestinationNumberOfChannelsL@CMdaAudioConvertUtility@@QAEXI@Z @ 173 NONAME ; void CMdaAudioConvertUtility::SetDestinationNumberOfChannelsL(unsigned int)
-	?CustomInterface@CMdaAudioInputStream@@QAEPAXVTUid@@@Z @ 174 NONAME ; void * CMdaAudioInputStream::CustomInterface(class TUid)
-	?RecordControllerCustomCommandAsync@CMdaAudioRecorderUtility@@QAEXABV?$TPckgBuf@VTMMFMessageDestination@@@@HABVTDesC8@@1AAVTDes8@@AAVTRequestStatus@@@Z @ 175 NONAME ; void CMdaAudioRecorderUtility::RecordControllerCustomCommandAsync(class TPckgBuf<class TMMFMessageDestination> const &, int, class TDesC8 const &, class TDesC8 const &, class TDes8 &, class TRequestStatus &)
-	?Configure@CMMFFindAndOpenController@@QAEXVTUid@@VTMMFPrioritySettings@@W4TMediaIdMatchType@CMMFPluginSelectionParameters@@@Z @ 176 NONAME ; void CMMFFindAndOpenController::Configure(class TUid, class TMMFPrioritySettings, enum CMMFPluginSelectionParameters::TMediaIdMatchType)
-	?GetNumberOfMetaDataEntries@CMdaAudioPlayerUtility@@QAEHAAH@Z @ 177 NONAME ; int CMdaAudioPlayerUtility::GetNumberOfMetaDataEntries(int &)
-	?DataType@CMdaAudioInputStream@@QBE?AVTFourCC@@XZ @ 178 NONAME ; class TFourCC CMdaAudioInputStream::DataType(void) const
-	?SetDestinationNumberOfChannelsL@CMdaAudioRecorderUtility@@QAEXI@Z @ 179 NONAME ; void CMdaAudioRecorderUtility::SetDestinationNumberOfChannelsL(unsigned int)
-	?PlayControllerCustomCommandAsync@CMdaAudioRecorderUtility@@QAEXABV?$TPckgBuf@VTMMFMessageDestination@@@@HABVTDesC8@@1AAVTDes8@@AAVTRequestStatus@@@Z @ 180 NONAME ; void CMdaAudioRecorderUtility::PlayControllerCustomCommandAsync(class TPckgBuf<class TMMFMessageDestination> const &, int, class TDesC8 const &, class TDesC8 const &, class TDes8 &, class TRequestStatus &)
-	?UseSharedHeap@CMdaAudioConvertUtility@@QAEXXZ @ 181 NONAME ; void CMdaAudioConvertUtility::UseSharedHeap(void)
-	?GetSupportedBitRatesL@CMdaAudioInputStream@@QAEXAAV?$RArray@H@@@Z @ 182 NONAME ; void CMdaAudioInputStream::GetSupportedBitRatesL(class RArray<int> &)
-	?GetVolume@CMdaAudioRecorderUtility@@QAEHAAH@Z @ 183 NONAME ; int CMdaAudioRecorderUtility::GetVolume(int &)
-	?SetPlaybackBalance@CMdaAudioRecorderUtility@@QAEHH@Z @ 184 NONAME ; int CMdaAudioRecorderUtility::SetPlaybackBalance(int)
-	?AudioRecorderControllerImplementationInformationL@CMdaAudioRecorderUtility@@QAEABVCMMFControllerImplementationInformation@@XZ @ 185 NONAME ; class CMMFControllerImplementationInformation const & CMdaAudioRecorderUtility::AudioRecorderControllerImplementationInformationL(void)
-	?ControllerImplementationInformationL@CMdaAudioPlayerUtility@@QAEABVCMMFControllerImplementationInformation@@XZ @ 186 NONAME ; class CMMFControllerImplementationInformation const & CMdaAudioPlayerUtility::ControllerImplementationInformationL(void)
-	?CloseConfig@CMMFFindAndOpenController@@QAEXXZ @ 187 NONAME ; void CMMFFindAndOpenController::CloseConfig(void)
-	?GetVolume@CMdaAudioPlayerUtility@@QAEHAAH@Z @ 188 NONAME ; int CMdaAudioPlayerUtility::GetVolume(int &)
-	?SetDestinationFormatL@CMdaAudioConvertUtility@@QAEXVTUid@@@Z @ 189 NONAME ; void CMdaAudioConvertUtility::SetDestinationFormatL(class TUid)
-	?OpenFileL@CMdaAudioPlayerUtility@@QAEXABVRFile@@@Z @ 190 NONAME ; void CMdaAudioPlayerUtility::OpenFileL(class RFile const &)
-	?OpenByUrl@CMMFFindAndOpenController@@QAEXABVTDesC16@@HABVTDesC8@@@Z @ 191 NONAME ; void CMMFFindAndOpenController::OpenByUrl(class TDesC16 const &, int, class TDesC8 const &)
-	?DestinationNumberOfChannelsL@CMdaAudioRecorderUtility@@QAEIXZ @ 192 NONAME ; unsigned int CMdaAudioRecorderUtility::DestinationNumberOfChannelsL(void)
-	?RegisterPlayStartCallback@CMdaAudioToneUtility@@QAEXAAVMMdaAudioTonePlayStartObserver@@@Z @ 193 NONAME ; void CMdaAudioToneUtility::RegisterPlayStartCallback(class MMdaAudioTonePlayStartObserver &)
-	?GetDRMCustomCommand@CMdaAudioRecorderUtility@@QAEPAVMMMFDRMCustomCommand@@XZ @ 194 NONAME ; class MMMFDRMCustomCommand * CMdaAudioRecorderUtility::GetDRMCustomCommand(void)
-	?NewFilePlayerL@CMdaAudioPlayerUtility@@SAPAV1@ABVTDesC16@@AAVMMdaAudioPlayerCallback@@HHPAVCMdaServer@@@Z @ 195 NONAME ; class CMdaAudioPlayerUtility * CMdaAudioPlayerUtility::NewFilePlayerL(class TDesC16 const &, class MMdaAudioPlayerCallback &, int, int, class CMdaServer *)
-	?SourceNumberOfChannelsL@CMdaAudioConvertUtility@@QAEIXZ @ 196 NONAME ; unsigned int CMdaAudioConvertUtility::SourceNumberOfChannelsL(void)
-	?ClearPlayWindow@CMdaAudioPlayerUtility@@QAEHXZ @ 197 NONAME ; int CMdaAudioPlayerUtility::ClearPlayWindow(void)
-	?GetSupportedDestinationDataTypesL@CMdaAudioRecorderUtility@@QAEXAAV?$RArray@VTFourCC@@@@@Z @ 198 NONAME ; void CMdaAudioRecorderUtility::GetSupportedDestinationDataTypesL(class RArray<class TFourCC> &)
-	?SetBalanceL@CMdaAudioOutputStream@@QAEXH@Z @ 199 NONAME ; void CMdaAudioOutputStream::SetBalanceL(int)
-	?Stop@CMdaAudioInputStream@@QAEXXZ @ 200 NONAME ; void CMdaAudioInputStream::Stop(void)
-	?GetMetaDataEntryL@CMdaAudioPlayerUtility@@QAEPAVCMMFMetaDataEntry@@H@Z @ 201 NONAME ; class CMMFMetaDataEntry * CMdaAudioPlayerUtility::GetMetaDataEntryL(int)
-	?GetGain@CMdaAudioRecorderUtility@@QAEHAAH@Z @ 202 NONAME ; int CMdaAudioRecorderUtility::GetGain(int &)
-	?CustomCommandAsync@CMdaAudioPlayerUtility@@QAEXABV?$TPckgBuf@VTMMFMessageDestination@@@@HABVTDesC8@@1AAVTRequestStatus@@@Z @ 203 NONAME ; void CMdaAudioPlayerUtility::CustomCommandAsync(class TPckgBuf<class TMMFMessageDestination> const &, int, class TDesC8 const &, class TDesC8 const &, class TRequestStatus &)
-	?UseSharedHeap@CMdaAudioPlayerUtility@@QAEXXZ @ 204 NONAME ; void CMdaAudioPlayerUtility::UseSharedHeap(void)
-	?BitRateL@CMdaAudioInputStream@@QBEHXZ @ 205 NONAME ; int CMdaAudioInputStream::BitRateL(void) const
-	?ControllerImplementationInformationL@CMdaAudioConvertUtility@@QAEABVCMMFControllerImplementationInformation@@XZ @ 206 NONAME ; class CMMFControllerImplementationInformation const & CMdaAudioConvertUtility::ControllerImplementationInformationL(void)
-	?OpenDesL@CMdaAudioRecorderUtility@@QAEXAAVTDes8@@VTUid@@11VTFourCC@@@Z @ 207 NONAME ; void CMdaAudioRecorderUtility::OpenDesL(class TDes8 &, class TUid, class TUid, class TUid, class TFourCC)
-
--- a/mmlibs/mmfw/tsrc/mmfunittest/bwins/TSU_MMF_ACODU.DEF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?NewTestSuiteL@@YAPAVCTestSuite_MMF_ACOD@@XZ @ 1 NONAME ; class CTestSuite_MMF_ACOD * __cdecl NewTestSuiteL(void)
-
--- a/mmlibs/mmfw/tsrc/mmfunittest/bwins/TSU_MMF_ACOD_TESTCODECSU.DEF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?ImplementationGroupProxy@@YAPBUTImplementationProxy@@AAH@Z @ 1 NONAME ; struct TImplementationProxy const * __cdecl ImplementationGroupProxy(int &)
-
--- a/mmlibs/mmfw/tsrc/mmfunittest/bwins/TSU_MMF_ACTRL_01U.DEF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?NewTestSuiteActrlL@@YAPAVCTestSuiteActrl@@XZ @ 1 NONAME ; class CTestSuiteActrl * __cdecl NewTestSuiteActrlL(void)
-
--- a/mmlibs/mmfw/tsrc/mmfunittest/bwins/TSU_MMF_AFMTU.DEF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?NewTestSuiteL@@YAPAVCTestSuite_MMF_AFMT@@XZ @ 1 NONAME ; class CTestSuite_MMF_AFMT * __cdecl NewTestSuiteL(void)
-
--- a/mmlibs/mmfw/tsrc/mmfunittest/bwins/TSU_MMF_BASECLU.DEF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?NewTestSuiteL@@YAPAVCTestSuite_MMF_BASECL@@XZ @ 1 NONAME ; class CTestSuite_MMF_BASECL * __cdecl NewTestSuiteL(void)
-
--- a/mmlibs/mmfw/tsrc/mmfunittest/bwins/TSU_MMF_CTLFRMU.DEF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?NewTestSuiteL@@YAPAVCTestSuite_MMF_CTLFRM@@XZ @ 1 NONAME ; class CTestSuite_MMF_CTLFRM * __cdecl NewTestSuiteL(void)
-
--- a/mmlibs/mmfw/tsrc/mmfunittest/bwins/TSU_MMF_DEVSOUND_NOTIFICATION_SUITE.DEF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?NewTestSuiteL@@YAPAVCTestSuiteDevSoundNotification@@XZ @ 1 NONAME ; class CTestSuiteDevSoundNotification * NewTestSuiteL(void)
-
--- a/mmlibs/mmfw/tsrc/mmfunittest/bwins/TSU_MMF_DEVSOUND_SUITE.DEF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?NewTestSuiteL@@YAPAVCTestSuiteDevSound@@XZ @ 1 NONAME ; class CTestSuiteDevSound * __cdecl NewTestSuiteL(void)
-
--- a/mmlibs/mmfw/tsrc/mmfunittest/bwins/TSU_MMF_SRSSNKU.DEF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?NewTestSuiteL@@YAPAVCTestSuite_MMF_SRSSNK@@XZ @ 1 NONAME ; class CTestSuite_MMF_SRSSNK * __cdecl NewTestSuiteL(void)
-
--- a/mmlibs/mmfw/tsrc/mmfunittest/bwins/TSU_MMF_SWCDWRAPU.DEF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?NewTestSuiteL@@YAPAVCTestSuite_MMF_SWCDWRAP@@XZ @ 1 NONAME ; class CTestSuite_MMF_SWCDWRAP * __cdecl NewTestSuiteL(void)
-
--- a/mmlibs/mmfw/tsrc/mmfunittest/bwins/TSU_MMF_SWCODECDEVICESU.def	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-EXPORTS
-; NEW:
-	?NewTestSuiteL@@YAPAVCTestSuite_MMF_SwCodecDevices@@XZ @ 1 NONAME ; class CTestSuite_MMF_SwCodecDevices * __cdecl NewTestSuiteL(void)
-
--- a/mmlibs/mmfw/tsrc/mmfunittest/bwins/TSU_MMF_SbcCodecU.DEF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?NewTestSuiteL@@YAPAVCTestSuite_MMF_SbcCodec@@XZ @ 1 NONAME ; class CTestSuite_MMF_SbcCodec * NewTestSuiteL(void)
-
--- a/mmlibs/mmfw/tsrc/mmfunittest/bwins/TS_CMMFTESTCUSTOMCOMMANDS.DEF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-EXPORTS
-	??0RMMFTestCustomCommands@@QAE@AAVRMMFController@@VTUid@@@Z @ 1 NONAME ; public: __thiscall RMMFTestCustomCommands::RMMFTestCustomCommands(class RMMFController &,class TUid)
-	?GetAudioQuality@RMMFTestCustomCommands@@QAEHAAH@Z @ 2 NONAME ; public: int __thiscall RMMFTestCustomCommands::GetAudioQuality(int &)
-	?HandleRequest@CMMFTestCustomCommandParser@@UAEXAAVTMMFMessage@@@Z @ 3 NONAME ; public: virtual void __thiscall CMMFTestCustomCommandParser::HandleRequest(class TMMFMessage &)
-	?NewL@CMMFTestCustomCommandParser@@SAPAV1@AAVMMMFTestCustomCommandImplementor@@@Z @ 4 NONAME ; public: static class CMMFTestCustomCommandParser * __cdecl CMMFTestCustomCommandParser::NewL(class MMMFTestCustomCommandImplementor &)
-	?NewLC@CMMFTestCustomCommandParser@@SAPAV1@AAVMMMFTestCustomCommandImplementor@@@Z @ 5 NONAME ; public: static class CMMFTestCustomCommandParser * __cdecl CMMFTestCustomCommandParser::NewLC(class MMMFTestCustomCommandImplementor &)
-	?SetAudioQuality@RMMFTestCustomCommands@@QAEHH@Z @ 6 NONAME ; public: int __thiscall RMMFTestCustomCommands::SetAudioQuality(int)
-
--- a/mmlibs/mmfw/tsrc/mmfunittest/bwins/TS_TRANSFERBUFFERTESTERCLIENTU.DEF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-EXPORTS
-	??0RTransferBufferTesterClient@@QAE@XZ @ 1 NONAME ; public: __thiscall RTransferBufferTesterClient::RTransferBufferTesterClient(void)
-	?Close@RTransferBufferTesterClient@@QAEXXZ @ 2 NONAME ; public: void __thiscall RTransferBufferTesterClient::Close(void)
-	?Connect@RTransferBufferTesterClient@@QAEHXZ @ 3 NONAME ; public: int __thiscall RTransferBufferTesterClient::Connect(void)
-	?CreateTransferBuffer@RTransferBufferTesterClient@@QAEHI@Z @ 4 NONAME ; public: int __thiscall RTransferBufferTesterClient::CreateTransferBuffer(unsigned int)
-	?GetServerThreadId@RTransferBufferTesterClient@@QAEHAAVTThreadId@@@Z @ 5 NONAME ; public: int __thiscall RTransferBufferTesterClient::GetServerThreadId(class TThreadId &)
-	?MapBufferIntoClientWindowHandle@RTransferBufferTesterClient@@QAEHH@Z @ 6 NONAME ; public: int __thiscall RTransferBufferTesterClient::MapBufferIntoClientWindowHandle(int)
-	?WriteTestData@RTransferBufferTesterClient@@QAEHAAVTPtr8@@@Z @ 7 NONAME ; public: int __thiscall RTransferBufferTesterClient::WriteTestData(class TPtr8 &)
-
--- a/mmlibs/mmfw/tsrc/mmfunittest/bwins/tsu_mmf_ctlfrm_sdrmu.def	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?NewTestSuiteL@@YAPAVCTestSuite_MMF_CTLFRM_SDRM@@XZ @ 1 NONAME ; class CTestSuite_MMF_CTLFRM_SDRM * NewTestSuiteL(void)
-
--- a/mmlibs/mmfw/tsrc/mmfunittest/bwins/tsu_mmf_devsubtitleu.def	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?NewTestSuiteL@@YAPAVCTestSuite@@XZ @ 1 NONAME ; class CTestSuite * NewTestSuiteL(void)
-
--- a/mmlibs/mmfw/tsrc/mmfunittest/bwins/tsu_mmf_mmrufU.def	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?NewTestSuiteL@@YAPAVCTSU_MMF_MMRUF@@XZ @ 1 NONAME ; class CTSU_MMF_MMRUF * NewTestSuiteL(void)
-
--- a/mmlibs/mmfw/tsrc/mmfunittest/bwins/tsu_mmf_subtitlegraphicu.def	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?NewTestSuiteL@@YAPAVCTestSuite@@XZ @ 1 NONAME ; class CTestSuite * NewTestSuiteL(void)
-
--- a/mmlibs/mmfw/tsrc/mmfunittest/devsubtitle/inc/tsu_mmf_devsubtitle.iby	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-#ifndef TSU_MMF_DEVSUBTITLE_IBY
-#define TSU_MMF_DEVSUBTITLE_IBY
-
-file=ABI_DIR/BUILD_DIR/tsu_mmf_devsubtitle.dll				sys\bin\tsu_mmf_devsubtitle.dll
-data=DATAC_/mm/tsu_mmf_devsubtitle.script					\tsu_mmf_devsubtitle.script
-data=DATAC_/mm/tsu_mmf_devsubtitle_panic.script				\tsu_mmf_devsubtitle_panic.script
-
-#endif // TSU_MMF_SUBTITLE_IBY
-
--- a/mmlibs/mmfw/tsrc/mmfunittest/eabi/TSU_MMFMIDICLNT.DEF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	_Z13NewTestSuiteLv @ 1 NONAME
-
--- a/mmlibs/mmfw/tsrc/mmfunittest/eabi/TSU_MMF_ACLNT_01.DEF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,213 +0,0 @@
-EXPORTS
-	_Z29NewTestSuiteUnitMMFAudClientLv @ 1 NONAME
-	_ZN13CMMSourceSink4NewLE4TUidRK6TDesC8 @ 2 NONAME
-	_ZN13CMMSourceSink5NewLCE4TUidRK6TDesC8 @ 3 NONAME
-	_ZN13CMdaAudioTypeD0Ev @ 4 NONAME
-	_ZN13CMdaAudioTypeD1Ev @ 5 NONAME
-	_ZN13CMdaAudioTypeD2Ev @ 6 NONAME
-	_ZN17CMMFClientUtility17GetFileExtensionLERK7TDesC16 @ 7 NONAME
-	_ZN17CMMFClientUtility17GetFileHeaderDataERK7TDesC16R5TDes8i @ 8 NONAME
-	_ZN17CMMFClientUtility23ConvertMdaCodecToFourCCER11TMdaPackage @ 9 NONAME
-	_ZN17CMMFClientUtility29ConvertMdaFormatUidToECOMReadE4TUid @ 10 NONAME
-	_ZN17CMMFClientUtility30ConvertMdaFormatUidToECOMWriteE4TUid @ 11 NONAME
-	_ZN17CMMFileSourceSink15EvaluateIntentLEN13ContentAccess7TIntentE @ 12 NONAME
-	_ZN17CMMFileSourceSink4NewLE4TUidRK5RFile @ 13 NONAME
-	_ZN17CMMFileSourceSink4NewLE4TUidRK9TMMSource @ 14 NONAME
-	_ZN17CMMFileSourceSink5NewLCE4TUidRK5RFile @ 15 NONAME
-	_ZN17CMMFileSourceSink5NewLCE4TUidRK9TMMSource @ 16 NONAME
-	_ZN20CMdaAudioInputStream11RequestStopEv @ 17 NONAME
-	_ZN20CMdaAudioInputStream11SetBalanceLEi @ 18 NONAME
-	_ZN20CMdaAudioInputStream11SetBitRateLEi @ 19 NONAME
-	_ZN20CMdaAudioInputStream11SetPriorityEii @ 20 NONAME
-	_ZN20CMdaAudioInputStream12SetDataTypeLE7TFourCC @ 21 NONAME
-	_ZN20CMdaAudioInputStream15CustomInterfaceE4TUid @ 22 NONAME
-	_ZN20CMdaAudioInputStream19SetAudioPropertiesLEii @ 23 NONAME
-	_ZN20CMdaAudioInputStream19SetSingleBufferModeEi @ 24 NONAME
-	_ZN20CMdaAudioInputStream21GetSupportedBitRatesLER6RArrayIiE @ 25 NONAME
-	_ZN20CMdaAudioInputStream4NewLER28MMdaAudioInputStreamCallback @ 26 NONAME
-	_ZN20CMdaAudioInputStream4NewLER28MMdaAudioInputStreamCallbackii @ 27 NONAME
-	_ZN20CMdaAudioInputStream4OpenEP11TMdaPackage @ 28 NONAME
-	_ZN20CMdaAudioInputStream4StopEv @ 29 NONAME
-	_ZN20CMdaAudioInputStream5ReadLER5TDes8 @ 30 NONAME
-	_ZN20CMdaAudioInputStream7SetGainEi @ 31 NONAME
-	_ZN20CMdaAudioInputStream8GetBytesEv @ 32 NONAME
-	_ZN20CMdaAudioInputStream8PositionEv @ 33 NONAME
-	_ZN20CMdaAudioToneUtility11GetBalanceLEv @ 34 NONAME
-	_ZN20CMdaAudioToneUtility11SetBalanceLEi @ 35 NONAME
-	_ZN20CMdaAudioToneUtility15CustomInterfaceE4TUid @ 36 NONAME
-	_ZN20CMdaAudioToneUtility21PrepareToPlayDualToneEiiRK25TTimeIntervalMicroSeconds @ 37 NONAME
-	_ZN20CMdaAudioToneUtility25PrepareToPlayFileSequenceER5RFile @ 38 NONAME
-	_ZN20CMdaAudioToneUtility25RegisterPlayStartCallbackER30MMdaAudioTonePlayStartObserver @ 39 NONAME
-	_ZN20CMdaAudioToneUtility4NewLER21MMdaAudioToneObserverP10CMdaServer @ 40 NONAME
-	_ZN20CMdaAudioToneUtility4NewLER21MMdaAudioToneObserverP10CMdaServerii @ 41 NONAME
-	_ZN20CMdaAudioToneUtility5PauseEv @ 42 NONAME
-	_ZN20CMdaAudioToneUtility6ResumeEv @ 43 NONAME
-	_ZN21CMdaAudioOutputStream11RequestStopEv @ 44 NONAME
-	_ZN21CMdaAudioOutputStream11SetBalanceLEi @ 45 NONAME
-	_ZN21CMdaAudioOutputStream12SetDataTypeLE7TFourCC @ 46 NONAME
-	_ZN21CMdaAudioOutputStream13KeepOpenAtEndEv @ 47 NONAME
-	_ZN21CMdaAudioOutputStream14WillResumePlayEv @ 48 NONAME
-	_ZN21CMdaAudioOutputStream15CustomInterfaceE4TUid @ 49 NONAME
-	_ZN21CMdaAudioOutputStream33RegisterAudioResourceNotificationER37MMMFAudioResourceNotificationCallback4TUidRK6TDesC8 @ 50 NONAME
-	_ZN21CMdaAudioOutputStream39CancelRegisterAudioResourceNotificationE4TUid @ 51 NONAME
-	_ZN21CMdaAudioOutputStream4NewLER29MMdaAudioOutputStreamCallbackP10CMdaServer @ 52 NONAME
-	_ZN21CMdaAudioOutputStream4NewLER29MMdaAudioOutputStreamCallbackii @ 53 NONAME
-	_ZN21CMdaAudioOutputStream5PauseEv @ 54 NONAME
-	_ZN21CMdaAudioOutputStream6ResumeEv @ 55 NONAME
-	_ZN21CMdaAudioOutputStream8GetBytesEv @ 56 NONAME
-	_ZN22CMdaAudioPlayerUtility10GetBalanceERi @ 57 NONAME
-	_ZN22CMdaAudioPlayerUtility10GetBitRateERj @ 58 NONAME
-	_ZN22CMdaAudioPlayerUtility10SetBalanceEi @ 59 NONAME
-	_ZN22CMdaAudioPlayerUtility11GetPositionER25TTimeIntervalMicroSeconds @ 60 NONAME
-	_ZN22CMdaAudioPlayerUtility11SetPositionERK25TTimeIntervalMicroSeconds @ 61 NONAME
-	_ZN22CMdaAudioPlayerUtility11SetPriorityEii @ 62 NONAME
-	_ZN22CMdaAudioPlayerUtility13NewDesPlayerLERK6TDesC8R23MMdaAudioPlayerCallbackiiP10CMdaServer @ 63 NONAME
-	_ZN22CMdaAudioPlayerUtility13SetPlayWindowERK25TTimeIntervalMicroSecondsS2_ @ 64 NONAME
-	_ZN22CMdaAudioPlayerUtility13UseSharedHeapEv @ 65 NONAME
-	_ZN22CMdaAudioPlayerUtility14NewFilePlayerLERK7TDesC16R23MMdaAudioPlayerCallbackiiP10CMdaServer @ 66 NONAME
-	_ZN22CMdaAudioPlayerUtility14WillResumePlayEv @ 67 NONAME
-	_ZN22CMdaAudioPlayerUtility15ClearPlayWindowEv @ 68 NONAME
-	_ZN22CMdaAudioPlayerUtility17CustomCommandSyncERK8TPckgBufI22TMMFMessageDestinationEiRK6TDesC8S7_ @ 69 NONAME
-	_ZN22CMdaAudioPlayerUtility17CustomCommandSyncERK8TPckgBufI22TMMFMessageDestinationEiRK6TDesC8S7_R5TDes8 @ 70 NONAME
-	_ZN22CMdaAudioPlayerUtility17GetMetaDataEntryLEi @ 71 NONAME
-	_ZN22CMdaAudioPlayerUtility18CustomCommandAsyncERK8TPckgBufI22TMMFMessageDestinationEiRK6TDesC8S7_R14TRequestStatus @ 72 NONAME
-	_ZN22CMdaAudioPlayerUtility18CustomCommandAsyncERK8TPckgBufI22TMMFMessageDestinationEiRK6TDesC8S7_R5TDes8R14TRequestStatus @ 73 NONAME
-	_ZN22CMdaAudioPlayerUtility19GetDRMCustomCommandEv @ 74 NONAME
-	_ZN22CMdaAudioPlayerUtility21NewDesPlayerReadOnlyLERK6TDesC8R23MMdaAudioPlayerCallbackiiP10CMdaServer @ 75 NONAME
-	_ZN22CMdaAudioPlayerUtility24GetAudioLoadingProgressLERi @ 76 NONAME
-	_ZN22CMdaAudioPlayerUtility26GetNumberOfMetaDataEntriesERi @ 77 NONAME
-	_ZN22CMdaAudioPlayerUtility33RegisterAudioResourceNotificationER37MMMFAudioResourceNotificationCallback4TUidRK6TDesC8 @ 78 NONAME
-	_ZN22CMdaAudioPlayerUtility35RegisterForAudioLoadingNotificationER21MAudioLoadingObserver @ 79 NONAME
-	_ZN22CMdaAudioPlayerUtility36ControllerImplementationInformationLEv @ 80 NONAME
-	_ZN22CMdaAudioPlayerUtility39CancelRegisterAudioResourceNotificationE4TUid @ 81 NONAME
-	_ZN22CMdaAudioPlayerUtility4NewLER23MMdaAudioPlayerCallbackii @ 82 NONAME
-	_ZN22CMdaAudioPlayerUtility5CloseEv @ 83 NONAME
-	_ZN22CMdaAudioPlayerUtility5PauseEv @ 84 NONAME
-	_ZN22CMdaAudioPlayerUtility8DurationER25TTimeIntervalMicroSeconds @ 85 NONAME
-	_ZN22CMdaAudioPlayerUtility8OpenDesLERK6TDesC8 @ 86 NONAME
-	_ZN22CMdaAudioPlayerUtility8OpenUrlLERK7TDesC16iRK6TDesC8 @ 87 NONAME
-	_ZN22CMdaAudioPlayerUtility9GetVolumeERi @ 88 NONAME
-	_ZN22CMdaAudioPlayerUtility9OpenFileLERK5RFile @ 89 NONAME
-	_ZN22CMdaAudioPlayerUtility9OpenFileLERK7TDesC16 @ 90 NONAME
-	_ZN22CMdaAudioPlayerUtility9OpenFileLERK9TMMSource @ 91 NONAME
-	_ZN23CMdaAudioConvertUtility13SourceFormatLEv @ 92 NONAME
-	_ZN23CMdaAudioConvertUtility13UseSharedHeapEv @ 93 NONAME
-	_ZN23CMdaAudioConvertUtility14SourceBitRateLEv @ 94 NONAME
-	_ZN23CMdaAudioConvertUtility15SourceDataTypeLEv @ 95 NONAME
-	_ZN23CMdaAudioConvertUtility17CustomCommandSyncERK8TPckgBufI22TMMFMessageDestinationEiRK6TDesC8S7_ @ 96 NONAME
-	_ZN23CMdaAudioConvertUtility17CustomCommandSyncERK8TPckgBufI22TMMFMessageDestinationEiRK6TDesC8S7_R5TDes8 @ 97 NONAME
-	_ZN23CMdaAudioConvertUtility17SourceSampleRateLEv @ 98 NONAME
-	_ZN23CMdaAudioConvertUtility18CustomCommandAsyncERK8TPckgBufI22TMMFMessageDestinationEiRK6TDesC8S7_R14TRequestStatus @ 99 NONAME
-	_ZN23CMdaAudioConvertUtility18CustomCommandAsyncERK8TPckgBufI22TMMFMessageDestinationEiRK6TDesC8S7_R5TDes8R14TRequestStatus @ 100 NONAME
-	_ZN23CMdaAudioConvertUtility18DestinationFormatLEv @ 101 NONAME
-	_ZN23CMdaAudioConvertUtility19DestinationBitRateLEv @ 102 NONAME
-	_ZN23CMdaAudioConvertUtility20DestinationDataTypeLEv @ 103 NONAME
-	_ZN23CMdaAudioConvertUtility21SetDestinationFormatLE4TUid @ 104 NONAME
-	_ZN23CMdaAudioConvertUtility22DestinationSampleRateLEv @ 105 NONAME
-	_ZN23CMdaAudioConvertUtility22SetDestinationBitRateLEj @ 106 NONAME
-	_ZN23CMdaAudioConvertUtility23SetDestinationDataTypeLE7TFourCC @ 107 NONAME
-	_ZN23CMdaAudioConvertUtility23SourceNumberOfChannelsLEv @ 108 NONAME
-	_ZN23CMdaAudioConvertUtility25SetDestinationSampleRateLEj @ 109 NONAME
-	_ZN23CMdaAudioConvertUtility28DestinationNumberOfChannelsLEv @ 110 NONAME
-	_ZN23CMdaAudioConvertUtility31GetSupportedConversionBitRatesLER6RArrayIjE @ 111 NONAME
-	_ZN23CMdaAudioConvertUtility31SetDestinationNumberOfChannelsLEj @ 112 NONAME
-	_ZN23CMdaAudioConvertUtility33GetSupportedDestinationDataTypesLER6RArrayI7TFourCCE @ 113 NONAME
-	_ZN23CMdaAudioConvertUtility34GetSupportedConversionSampleRatesLER6RArrayIjE @ 114 NONAME
-	_ZN23CMdaAudioConvertUtility36ControllerImplementationInformationLEv @ 115 NONAME
-	_ZN23CMdaAudioConvertUtility39GetSupportedConversionNumberOfChannelsLER6RArrayIjE @ 116 NONAME
-	_ZN23CMdaAudioConvertUtility4NewLER29MMdaObjectStateChangeObserverP10CMdaServerii @ 117 NONAME
-	_ZN23CMdaAudioConvertUtility5OpenLEP16TMdaClipLocationS1_4TUidS2_7TFourCC @ 118 NONAME
-	_ZN23CMdaAudioConvertUtility8ConvertLEv @ 119 NONAME
-	_ZN24CMdaAudioRecorderUtility11SetPriorityEii @ 120 NONAME
-	_ZN24CMdaAudioRecorderUtility13UseSharedHeapEv @ 121 NONAME
-	_ZN24CMdaAudioRecorderUtility14SourceBitRateLEv @ 122 NONAME
-	_ZN24CMdaAudioRecorderUtility14WillResumePlayEv @ 123 NONAME
-	_ZN24CMdaAudioRecorderUtility16GetRecordBalanceERi @ 124 NONAME
-	_ZN24CMdaAudioRecorderUtility16SetRecordBalanceEi @ 125 NONAME
-	_ZN24CMdaAudioRecorderUtility17AddMetaDataEntryLER17CMMFMetaDataEntry @ 126 NONAME
-	_ZN24CMdaAudioRecorderUtility17GetMetaDataEntryLEi @ 127 NONAME
-	_ZN24CMdaAudioRecorderUtility18DestinationFormatLEv @ 128 NONAME
-	_ZN24CMdaAudioRecorderUtility18GetPlaybackBalanceERi @ 129 NONAME
-	_ZN24CMdaAudioRecorderUtility18SetPlaybackBalanceEi @ 130 NONAME
-	_ZN24CMdaAudioRecorderUtility19DestinationBitRateLEv @ 131 NONAME
-	_ZN24CMdaAudioRecorderUtility19GetDRMCustomCommandEv @ 132 NONAME
-	_ZN24CMdaAudioRecorderUtility19RemoveMetaDataEntryEi @ 133 NONAME
-	_ZN24CMdaAudioRecorderUtility20DestinationDataTypeLEv @ 134 NONAME
-	_ZN24CMdaAudioRecorderUtility21GetSupportedBitRatesLER6RArrayIjE @ 135 NONAME
-	_ZN24CMdaAudioRecorderUtility21ReplaceMetaDataEntryLEiR17CMMFMetaDataEntry @ 136 NONAME
-	_ZN24CMdaAudioRecorderUtility21SetDestinationFormatLE4TUid @ 137 NONAME
-	_ZN24CMdaAudioRecorderUtility22DestinationSampleRateLEv @ 138 NONAME
-	_ZN24CMdaAudioRecorderUtility22SetDestinationBitRateLEj @ 139 NONAME
-	_ZN24CMdaAudioRecorderUtility23SetDestinationDataTypeLE7TFourCC @ 140 NONAME
-	_ZN24CMdaAudioRecorderUtility24GetAudioLoadingProgressLERi @ 141 NONAME
-	_ZN24CMdaAudioRecorderUtility24GetSupportedSampleRatesLER6RArrayIjE @ 142 NONAME
-	_ZN24CMdaAudioRecorderUtility25SetDestinationSampleRateLEj @ 143 NONAME
-	_ZN24CMdaAudioRecorderUtility26GetNumberOfMetaDataEntriesERi @ 144 NONAME
-	_ZN24CMdaAudioRecorderUtility28DestinationNumberOfChannelsLEv @ 145 NONAME
-	_ZN24CMdaAudioRecorderUtility29GetSupportedNumberOfChannelsLER6RArrayIjE @ 146 NONAME
-	_ZN24CMdaAudioRecorderUtility31PlayControllerCustomCommandSyncERK8TPckgBufI22TMMFMessageDestinationEiRK6TDesC8S7_ @ 147 NONAME
-	_ZN24CMdaAudioRecorderUtility31PlayControllerCustomCommandSyncERK8TPckgBufI22TMMFMessageDestinationEiRK6TDesC8S7_R5TDes8 @ 148 NONAME
-	_ZN24CMdaAudioRecorderUtility31SetDestinationNumberOfChannelsLEj @ 149 NONAME
-	_ZN24CMdaAudioRecorderUtility32PlayControllerCustomCommandAsyncERK8TPckgBufI22TMMFMessageDestinationEiRK6TDesC8S7_R14TRequestStatus @ 150 NONAME
-	_ZN24CMdaAudioRecorderUtility32PlayControllerCustomCommandAsyncERK8TPckgBufI22TMMFMessageDestinationEiRK6TDesC8S7_R5TDes8R14TRequestStatus @ 151 NONAME
-	_ZN24CMdaAudioRecorderUtility33GetSupportedDestinationDataTypesLER6RArrayI7TFourCCE @ 152 NONAME
-	_ZN24CMdaAudioRecorderUtility33RecordControllerCustomCommandSyncERK8TPckgBufI22TMMFMessageDestinationEiRK6TDesC8S7_ @ 153 NONAME
-	_ZN24CMdaAudioRecorderUtility33RecordControllerCustomCommandSyncERK8TPckgBufI22TMMFMessageDestinationEiRK6TDesC8S7_R5TDes8 @ 154 NONAME
-	_ZN24CMdaAudioRecorderUtility33RegisterAudioResourceNotificationER37MMMFAudioResourceNotificationCallback4TUidRK6TDesC8 @ 155 NONAME
-	_ZN24CMdaAudioRecorderUtility34RecordControllerCustomCommandAsyncERK8TPckgBufI22TMMFMessageDestinationEiRK6TDesC8S7_R14TRequestStatus @ 156 NONAME
-	_ZN24CMdaAudioRecorderUtility34RecordControllerCustomCommandAsyncERK8TPckgBufI22TMMFMessageDestinationEiRK6TDesC8S7_R5TDes8R14TRequestStatus @ 157 NONAME
-	_ZN24CMdaAudioRecorderUtility35RegisterForAudioLoadingNotificationER21MAudioLoadingObserver @ 158 NONAME
-	_ZN24CMdaAudioRecorderUtility39CancelRegisterAudioResourceNotificationE4TUid @ 159 NONAME
-	_ZN24CMdaAudioRecorderUtility45AudioPlayControllerImplementationInformationLEv @ 160 NONAME
-	_ZN24CMdaAudioRecorderUtility49AudioRecorderControllerImplementationInformationLEv @ 161 NONAME
-	_ZN24CMdaAudioRecorderUtility4NewLER29MMdaObjectStateChangeObserverP10CMdaServerii @ 162 NONAME
-	_ZN24CMdaAudioRecorderUtility7GetGainERi @ 163 NONAME
-	_ZN24CMdaAudioRecorderUtility8DurationER25TTimeIntervalMicroSeconds @ 164 NONAME
-	_ZN24CMdaAudioRecorderUtility8OpenDesLER5TDes8 @ 165 NONAME
-	_ZN24CMdaAudioRecorderUtility8OpenDesLER5TDes84TUidS2_S2_7TFourCC @ 166 NONAME
-	_ZN24CMdaAudioRecorderUtility8OpenUrlLERK7TDesC16i4TUidS3_S3_7TFourCC @ 167 NONAME
-	_ZN24CMdaAudioRecorderUtility8OpenUrlLERK7TDesC16iRK6TDesC8 @ 168 NONAME
-	_ZN24CMdaAudioRecorderUtility9GetVolumeERi @ 169 NONAME
-	_ZN24CMdaAudioRecorderUtility9OpenFileLERK5RFile @ 170 NONAME
-	_ZN24CMdaAudioRecorderUtility9OpenFileLERK5RFile4TUidS3_S3_7TFourCC @ 171 NONAME
-	_ZN24CMdaAudioRecorderUtility9OpenFileLERK7TDesC164TUidS3_S3_7TFourCC @ 172 NONAME
-	_ZN24CMdaAudioRecorderUtility9OpenFileLERK9TMMSource @ 173 NONAME
-	_ZN24CMdaAudioRecorderUtility9OpenFileLERK9TMMSource4TUidS3_S3_7TFourCC @ 174 NONAME
-	_ZN25CMMFFindAndOpenController11CloseConfigEv @ 175 NONAME
-	_ZN25CMMFFindAndOpenController11TSourceSinkC1E4TUidRK5RFile @ 176 NONAME
-	_ZN25CMMFFindAndOpenController11TSourceSinkC1E4TUidRK6TDesC8 @ 177 NONAME
-	_ZN25CMMFFindAndOpenController11TSourceSinkC2E4TUidRK5RFile @ 178 NONAME
-	_ZN25CMMFFindAndOpenController11TSourceSinkC2E4TUidRK6TDesC8 @ 179 NONAME
-	_ZN25CMMFFindAndOpenController13GetConfigUrlLERP8CBufFlatRK7TDesC16i @ 180 NONAME
-	_ZN25CMMFFindAndOpenController13GetConfigFileERK7TDesC16 @ 181 NONAME
-	_ZN25CMMFFindAndOpenController13UseSharedHeapEv @ 182 NONAME
-	_ZN25CMMFFindAndOpenController15OpenByFormatUidE4TUidS0_ @ 183 NONAME
-	_ZN25CMMFFindAndOpenController16OpenByDescriptorERK6TDesC8 @ 184 NONAME
-	_ZN25CMMFFindAndOpenController16OpenByFileSourceERK9TMMSourceRK7TDesC16 @ 185 NONAME
-	_ZN25CMMFFindAndOpenController19ConfigureControllerER14RMMFControllerR26CMMFControllerEventMonitorNS_15TControllerModeE @ 186 NONAME
-	_ZN25CMMFFindAndOpenController19ConfigureSourceSinkENS_11TSourceSinkES0_ @ 187 NONAME
-	_ZN25CMMFFindAndOpenController19ConfigureSourceSinkERK9TMMSourceNS_11TSourceSinkE @ 188 NONAME
-	_ZN25CMMFFindAndOpenController19GetConfigDescriptorERK6TDesC8 @ 189 NONAME
-	_ZN25CMMFFindAndOpenController19OpenByControllerUidE4TUidS0_ @ 190 NONAME
-	_ZN25CMMFFindAndOpenController19SetInitScreenNumberEiP36RMMFVideoSetInitScreenCustomCommands @ 191 NONAME
-	_ZN25CMMFFindAndOpenController28ConfigureSecondaryControllerER14RMMFControllerR26CMMFControllerEventMonitorNS_15TControllerModeE @ 192 NONAME
-	_ZN25CMMFFindAndOpenController28ConfigureSecondarySourceSinkENS_11TSourceSinkES0_ @ 193 NONAME
-	_ZN25CMMFFindAndOpenController4NewLER33MMMFFindAndOpenControllerObserver @ 194 NONAME
-	_ZN25CMMFFindAndOpenController5CloseEv @ 195 NONAME
-	_ZN25CMMFFindAndOpenController6ReOpenEv @ 196 NONAME
-	_ZN25CMMFFindAndOpenController9ConfigureE4TUid20TMMFPrioritySettingsN29CMMFPluginSelectionParameters17TMediaIdMatchTypeE @ 197 NONAME
-	_ZN25CMMFFindAndOpenController9OpenByUrlERK7TDesC16iRK6TDesC8 @ 198 NONAME
-	_ZN40CMMFMdaObjectStateChangeObserverCallback4NewLER29MMdaObjectStateChangeObserver @ 199 NONAME
-	_ZN40CMMFMdaObjectStateChangeObserverCallback8CallBackEP5CBaseiii @ 200 NONAME
-	_ZNK20CMdaAudioInputStream11GetBalanceLEv @ 201 NONAME
-	_ZNK20CMdaAudioInputStream4GainEv @ 202 NONAME
-	_ZNK20CMdaAudioInputStream7MaxGainEv @ 203 NONAME
-	_ZNK20CMdaAudioInputStream8BitRateLEv @ 204 NONAME
-	_ZNK20CMdaAudioInputStream8DataTypeEv @ 205 NONAME
-	_ZNK21CMdaAudioOutputStream11GetBalanceLEv @ 206 NONAME
-	_ZNK21CMdaAudioOutputStream8DataTypeEv @ 207 NONAME
-	_ZNK22CMdaAudioPlayerUtility17SetThreadPriorityERK15TThreadPriority @ 208 NONAME
-	_ZNK23CMdaAudioConvertUtility17SetThreadPriorityERK15TThreadPriority @ 209 NONAME
-	_ZNK24CMdaAudioRecorderUtility23SetThreadPriorityRecordERK15TThreadPriority @ 210 NONAME
-	_ZNK24CMdaAudioRecorderUtility25SetThreadPriorityPlaybackERK15TThreadPriority @ 211 NONAME
-	
--- a/mmlibs/mmfw/tsrc/mmfunittest/eabi/TSU_MMF_ACODU.DEF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	_Z13NewTestSuiteLv @ 1 NONAME
-
--- a/mmlibs/mmfw/tsrc/mmfunittest/eabi/TSU_MMF_ACTRL_01U.DEF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	_Z18NewTestSuiteActrlLv @ 1 NONAME
-
--- a/mmlibs/mmfw/tsrc/mmfunittest/eabi/TSU_MMF_AFMTU.DEF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	_Z13NewTestSuiteLv @ 1 NONAME
-
--- a/mmlibs/mmfw/tsrc/mmfunittest/eabi/TSU_MMF_BASECLU.DEF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	_Z13NewTestSuiteLv @ 1 NONAME
-
--- a/mmlibs/mmfw/tsrc/mmfunittest/eabi/TSU_MMF_CTLFRMU.DEF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	_Z13NewTestSuiteLv @ 1 NONAME
-
--- a/mmlibs/mmfw/tsrc/mmfunittest/eabi/TSU_MMF_DEVSOUND_NOTIFICATION_SUITE.DEF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	_Z13NewTestSuiteLv @ 1 NONAME
-
--- a/mmlibs/mmfw/tsrc/mmfunittest/eabi/TSU_MMF_DEVSOUND_SUITE.DEF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	_Z13NewTestSuiteLv @ 1 NONAME
-
--- a/mmlibs/mmfw/tsrc/mmfunittest/eabi/TSU_MMF_SRSSNKU.DEF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	_Z13NewTestSuiteLv @ 1 NONAME
-
--- a/mmlibs/mmfw/tsrc/mmfunittest/eabi/TSU_MMF_SWCDWRAPU.DEF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	_Z13NewTestSuiteLv @ 1 NONAME
-
--- a/mmlibs/mmfw/tsrc/mmfunittest/eabi/TSU_MMF_SWCODECDEVICESU.DEF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,191 +0,0 @@
-EXPORTS
-	_Z13NewTestSuiteLv @ 1 NONAME
-	_ZTI11TComparator @ 2 NONAME ; #<TI>#
-	_ZTI13TDbComparatorILin300EE @ 3 NONAME ; #<TI>#
-	_ZTI15CTestIMaadCodec @ 4 NONAME ; #<TI>#
-	_ZTI16CTestStepOomTestI20CMMFAlawToPcm16CodecE @ 5 NONAME ; #<TI>#
-	_ZTI16CTestStepOomTestI20CMMFPcm16ToALawCodecE @ 6 NONAME ; #<TI>#
-	_ZTI16CTestStepOomTestI20CMMFPcm8ToPcm16CodecE @ 7 NONAME ; #<TI>#
-	_ZTI16CTestStepOomTestI21CMMFMulawToPcm16CodecE @ 8 NONAME ; #<TI>#
-	_ZTI16CTestStepOomTestI21CMMFPcm16ToMuLawCodecE @ 9 NONAME ; #<TI>#
-	_ZTI16CTestStepOomTestI21CMMFPcm16ToPcmU8CodecE @ 10 NONAME ; #<TI>#
-	_ZTI16CTestStepOomTestI22CMMFGsm610ToPcm16CodecE @ 11 NONAME ; #<TI>#
-	_ZTI16CTestStepOomTestI22CMMFPcmS16ToPcmS8CodecE @ 12 NONAME ; #<TI>#
-	_ZTI16CTestStepOomTestI24CMMFImaAdpcmToPcm16CodecE @ 13 NONAME ; #<TI>#
-	_ZTI16CTestStepOomTestI24CMMFPcm16SwapEndianCodecE @ 14 NONAME ; #<TI>#
-	_ZTI16CTestStepOomTestI24CMMFPcm16ToImaAdpcmCodecE @ 15 NONAME ; #<TI>#
-	_ZTI16CTestStepOomTestI24CMMFPcm16ToPcmU16BECodecE @ 16 NONAME ; #<TI>#
-	_ZTI16CTestStepOomTestI25CMMFPcmU16BeToPcmS16CodecE @ 17 NONAME ; #<TI>#
-	_ZTI16CTestStepOomTestI27CMMFPcm16ToPcmU16CodecCodecE @ 18 NONAME ; #<TI>#
-	_ZTI16CTest_MMF_Gsm610 @ 19 NONAME ; #<TI>#
-	_ZTI17CMMFDataGenerator @ 20 NONAME ; #<TI>#
-	_ZTI17CTestStepLoopTestI20CMMFAlawToPcm16CodecE @ 21 NONAME ; #<TI>#
-	_ZTI17CTestStepLoopTestI20CMMFPcm16ToALawCodecE @ 22 NONAME ; #<TI>#
-	_ZTI17CTestStepLoopTestI20CMMFPcm8ToPcm16CodecE @ 23 NONAME ; #<TI>#
-	_ZTI17CTestStepLoopTestI21CMMFMulawToPcm16CodecE @ 24 NONAME ; #<TI>#
-	_ZTI17CTestStepLoopTestI21CMMFPcm16ToMuLawCodecE @ 25 NONAME ; #<TI>#
-	_ZTI17CTestStepLoopTestI21CMMFPcm16ToPcmU8CodecE @ 26 NONAME ; #<TI>#
-	_ZTI17CTestStepLoopTestI22CMMFGsm610ToPcm16CodecE @ 27 NONAME ; #<TI>#
-	_ZTI17CTestStepLoopTestI22CMMFPcm16ToGsm610CodecE @ 28 NONAME ; #<TI>#
-	_ZTI17CTestStepLoopTestI22CMMFPcmS16ToPcmS8CodecE @ 29 NONAME ; #<TI>#
-	_ZTI17CTestStepLoopTestI24CMMFImaAdpcmToPcm16CodecE @ 30 NONAME ; #<TI>#
-	_ZTI17CTestStepLoopTestI24CMMFPcm16SwapEndianCodecE @ 31 NONAME ; #<TI>#
-	_ZTI17CTestStepLoopTestI24CMMFPcm16ToImaAdpcmCodecE @ 32 NONAME ; #<TI>#
-	_ZTI17CTestStepLoopTestI24CMMFPcm16ToPcmU16BECodecE @ 33 NONAME ; #<TI>#
-	_ZTI17CTestStepLoopTestI25CMMFPcmU16BeToPcmS16CodecE @ 34 NONAME ; #<TI>#
-	_ZTI17CTestStepLoopTestI27CMMFPcm16ToPcmU16CodecCodecE @ 35 NONAME ; #<TI>#
-	_ZTI20CMMFAlawToPcm16Codec @ 36 NONAME ; #<TI>#
-	_ZTI20CMMFPcm16ToALawCodec @ 37 NONAME ; #<TI>#
-	_ZTI20CMMFPcm8ToPcm16Codec @ 38 NONAME ; #<TI>#
-	_ZTI21CMMFMulawToPcm16Codec @ 39 NONAME ; #<TI>#
-	_ZTI21CMMFPcm16ToMuLawCodec @ 40 NONAME ; #<TI>#
-	_ZTI21CMMFPcm16ToPcm16Codec @ 41 NONAME ; #<TI>#
-	_ZTI21CMMFPcm16ToPcmU8Codec @ 42 NONAME ; #<TI>#
-	_ZTI21CMMFPcmU8ToPcm16Codec @ 43 NONAME ; #<TI>#
-	_ZTI21CTestALawCodec_U_0004 @ 44 NONAME ; #<TI>#
-	_ZTI22CMMFGsm610ToPcm16Codec @ 45 NONAME ; #<TI>#
-	_ZTI22CMMFPcm16ToGsm610Codec @ 46 NONAME ; #<TI>#
-	_ZTI22CMMFPcmS16ToPcmS8Codec @ 47 NONAME ; #<TI>#
-	_ZTI22CMMFPcmU16ToPcm16Codec @ 48 NONAME ; #<TI>#
-	_ZTI22CTestMuLawCodec_U_0006 @ 49 NONAME ; #<TI>#
-	_ZTI22CTestStepCodecUnitTestI21CMMFPcm16ToPcmU8Codec11TComparatorLi0ELi0ELi0EE @ 50 NONAME ; #<TI>#
-	_ZTI22CTestStepCodecUnitTestI21CMMFPcmU8ToPcm16Codec13TDbComparatorILin300EELi0ELi0ELi1EE @ 51 NONAME ; #<TI>#
-	_ZTI22CTestStepCodecUnitTestI24CMMFImaAdpcmToPcm16Codec13TDbComparatorILin300EELi0ELi0ELi1EE @ 52 NONAME ; #<TI>#
-	_ZTI22CTestStepCodecUnitTestI24CMMFPcm16SwapEndianCodec11TComparatorLi0ELi1ELi1EE @ 53 NONAME ; #<TI>#
-	_ZTI22CTestStepCodecUnitTestI24CMMFPcm16ToImaAdpcmCodec11TComparatorLi0ELi0ELi0EE @ 54 NONAME ; #<TI>#
-	_ZTI23CMMFPcm16ToAlawHwDevice @ 55 NONAME ; #<TI>#
-	_ZTI23CMMFPcm8ToPcm16HwDevice @ 56 NONAME ; #<TI>#
-	_ZTI24CMMFImaAdpcmToPcm16Codec @ 57 NONAME ; #<TI>#
-	_ZTI24CMMFPcm16SwapEndianCodec @ 58 NONAME ; #<TI>#
-	_ZTI24CMMFPcm16ToImaAdpcmCodec @ 59 NONAME ; #<TI>#
-	_ZTI24CMMFPcm16ToMulawHwDevice @ 60 NONAME ; #<TI>#
-	_ZTI24CMMFPcm16ToPcm16HwDevice @ 61 NONAME ; #<TI>#
-	_ZTI24CMMFPcm16ToPcmU16BECodec @ 62 NONAME ; #<TI>#
-	_ZTI24CMMFPcm16ToPcmU8HwDevice @ 63 NONAME ; #<TI>#
-	_ZTI24CMMFPcm8ToPcm16Generator @ 64 NONAME ; #<TI>#
-	_ZTI24CMMFPcmU8ToPcm16HwDevice @ 65 NONAME ; #<TI>#
-	_ZTI25CMMFPcm16ToPcmU16HwDevice @ 66 NONAME ; #<TI>#
-	_ZTI25CMMFPcm16ToPcmU8Generator @ 67 NONAME ; #<TI>#
-	_ZTI25CMMFPcmS16ToPcmS8HwDevice @ 68 NONAME ; #<TI>#
-	_ZTI25CMMFPcmU16BeToPcmS16Codec @ 69 NONAME ; #<TI>#
-	_ZTI25CMMFPcmU16ToPcm16HwDevice @ 70 NONAME ; #<TI>#
-	_ZTI25CMMFPcmU8ToPcm16Generator @ 71 NONAME ; #<TI>#
-	_ZTI25CMmfGsm610ToPcm16HwDevice @ 72 NONAME ; #<TI>#
-	_ZTI25CMmfPcm16ToGsm610HwDevice @ 73 NONAME ; #<TI>#
-	_ZTI27CMMFPcm16SwapEndianHwDevice @ 74 NONAME ; #<TI>#
-	_ZTI27CMMFPcm16ToImaAdpcmHwDevice @ 75 NONAME ; #<TI>#
-	_ZTI27CMMFPcm16ToPcmU16BEHwDevice @ 76 NONAME ; #<TI>#
-	_ZTI27CMMFPcm16ToPcmU16CodecCodec @ 77 NONAME ; #<TI>#
-	_ZTI27CTestStepSignConversionTestI20CMMFPcm8ToPcm16Codec24CMMFPcm8ToPcm16GeneratorLi1EE @ 78 NONAME ; #<TI>#
-	_ZTI27CTestStepSignConversionTestI21CMMFPcm16ToPcmU8Codec25CMMFPcm16ToPcmU8GeneratorLi0EE @ 79 NONAME ; #<TI>#
-	_ZTI27CTestStepSignConversionTestI21CMMFPcmU8ToPcm16Codec25CMMFPcmU8ToPcm16GeneratorLi4EE @ 80 NONAME ; #<TI>#
-	_ZTI27CTestStepSignConversionTestI24CMMFPcm16SwapEndianCodec28CMMFPcmU16BtoPcmU16GeneratorLi3EE @ 81 NONAME ; #<TI>#
-	_ZTI27CTestStepSignConversionTestI24CMMFPcm16SwapEndianCodec28CMMFPcmU16toPcmU16BGeneratorLi2EE @ 82 NONAME ; #<TI>#
-	_ZTI28CMMFAlawToPcm16CodecHwDevice @ 83 NONAME ; #<TI>#
-	_ZTI28CMMFPcmU16BeToPcmS16HwDevice @ 84 NONAME ; #<TI>#
-	_ZTI28CMMFPcmU16BtoPcmU16Generator @ 85 NONAME ; #<TI>#
-	_ZTI28CMMFPcmU16toPcmU16BGenerator @ 86 NONAME ; #<TI>#
-	_ZTI28CTestStep_MMF_SwCodecDevices @ 87 NONAME ; #<TI>#
-	_ZTI29CMMFMulawToPcm16CodecHwDevice @ 88 NONAME ; #<TI>#
-	_ZTI29CTestStepGsm610ToPcm16OomTest @ 89 NONAME ; #<TI>#
-	_ZTI29CTestStepPcm16ToGsm610OomTest @ 90 NONAME ; #<TI>#
-	_ZTI29CTestSuite_MMF_SwCodecDevices @ 91 NONAME ; #<TI>#
-	_ZTI31CTest_MMF_SwCodecDevices_U_0001 @ 92 NONAME ; #<TI>#
-	_ZTI31CTest_MMF_SwCodecDevices_U_0002 @ 93 NONAME ; #<TI>#
-	_ZTI31CTest_MMF_SwCodecDevices_U_0003 @ 94 NONAME ; #<TI>#
-	_ZTI32CMMFImaAdpcmToPcm16CodecHwDevice @ 95 NONAME ; #<TI>#
-	_ZTV11TComparator @ 96 NONAME ; #<VT>#
-	_ZTV13TDbComparatorILin300EE @ 97 NONAME ; #<VT>#
-	_ZTV15CTestIMaadCodec @ 98 NONAME ; #<VT>#
-	_ZTV16CTestStepOomTestI20CMMFAlawToPcm16CodecE @ 99 NONAME ; #<VT>#
-	_ZTV16CTestStepOomTestI20CMMFPcm16ToALawCodecE @ 100 NONAME ; #<VT>#
-	_ZTV16CTestStepOomTestI20CMMFPcm8ToPcm16CodecE @ 101 NONAME ; #<VT>#
-	_ZTV16CTestStepOomTestI21CMMFMulawToPcm16CodecE @ 102 NONAME ; #<VT>#
-	_ZTV16CTestStepOomTestI21CMMFPcm16ToMuLawCodecE @ 103 NONAME ; #<VT>#
-	_ZTV16CTestStepOomTestI21CMMFPcm16ToPcmU8CodecE @ 104 NONAME ; #<VT>#
-	_ZTV16CTestStepOomTestI22CMMFGsm610ToPcm16CodecE @ 105 NONAME ; #<VT>#
-	_ZTV16CTestStepOomTestI22CMMFPcmS16ToPcmS8CodecE @ 106 NONAME ; #<VT>#
-	_ZTV16CTestStepOomTestI24CMMFImaAdpcmToPcm16CodecE @ 107 NONAME ; #<VT>#
-	_ZTV16CTestStepOomTestI24CMMFPcm16SwapEndianCodecE @ 108 NONAME ; #<VT>#
-	_ZTV16CTestStepOomTestI24CMMFPcm16ToImaAdpcmCodecE @ 109 NONAME ; #<VT>#
-	_ZTV16CTestStepOomTestI24CMMFPcm16ToPcmU16BECodecE @ 110 NONAME ; #<VT>#
-	_ZTV16CTestStepOomTestI25CMMFPcmU16BeToPcmS16CodecE @ 111 NONAME ; #<VT>#
-	_ZTV16CTestStepOomTestI27CMMFPcm16ToPcmU16CodecCodecE @ 112 NONAME ; #<VT>#
-	_ZTV16CTest_MMF_Gsm610 @ 113 NONAME ; #<VT>#
-	_ZTV17CMMFDataGenerator @ 114 NONAME ; #<VT>#
-	_ZTV17CTestStepLoopTestI20CMMFAlawToPcm16CodecE @ 115 NONAME ; #<VT>#
-	_ZTV17CTestStepLoopTestI20CMMFPcm16ToALawCodecE @ 116 NONAME ; #<VT>#
-	_ZTV17CTestStepLoopTestI20CMMFPcm8ToPcm16CodecE @ 117 NONAME ; #<VT>#
-	_ZTV17CTestStepLoopTestI21CMMFMulawToPcm16CodecE @ 118 NONAME ; #<VT>#
-	_ZTV17CTestStepLoopTestI21CMMFPcm16ToMuLawCodecE @ 119 NONAME ; #<VT>#
-	_ZTV17CTestStepLoopTestI21CMMFPcm16ToPcmU8CodecE @ 120 NONAME ; #<VT>#
-	_ZTV17CTestStepLoopTestI22CMMFGsm610ToPcm16CodecE @ 121 NONAME ; #<VT>#
-	_ZTV17CTestStepLoopTestI22CMMFPcm16ToGsm610CodecE @ 122 NONAME ; #<VT>#
-	_ZTV17CTestStepLoopTestI22CMMFPcmS16ToPcmS8CodecE @ 123 NONAME ; #<VT>#
-	_ZTV17CTestStepLoopTestI24CMMFImaAdpcmToPcm16CodecE @ 124 NONAME ; #<VT>#
-	_ZTV17CTestStepLoopTestI24CMMFPcm16SwapEndianCodecE @ 125 NONAME ; #<VT>#
-	_ZTV17CTestStepLoopTestI24CMMFPcm16ToImaAdpcmCodecE @ 126 NONAME ; #<VT>#
-	_ZTV17CTestStepLoopTestI24CMMFPcm16ToPcmU16BECodecE @ 127 NONAME ; #<VT>#
-	_ZTV17CTestStepLoopTestI25CMMFPcmU16BeToPcmS16CodecE @ 128 NONAME ; #<VT>#
-	_ZTV17CTestStepLoopTestI27CMMFPcm16ToPcmU16CodecCodecE @ 129 NONAME ; #<VT>#
-	_ZTV20CMMFAlawToPcm16Codec @ 130 NONAME ; #<VT>#
-	_ZTV20CMMFPcm16ToALawCodec @ 131 NONAME ; #<VT>#
-	_ZTV20CMMFPcm8ToPcm16Codec @ 132 NONAME ; #<VT>#
-	_ZTV21CMMFMulawToPcm16Codec @ 133 NONAME ; #<VT>#
-	_ZTV21CMMFPcm16ToMuLawCodec @ 134 NONAME ; #<VT>#
-	_ZTV21CMMFPcm16ToPcm16Codec @ 135 NONAME ; #<VT>#
-	_ZTV21CMMFPcm16ToPcmU8Codec @ 136 NONAME ; #<VT>#
-	_ZTV21CMMFPcmU8ToPcm16Codec @ 137 NONAME ; #<VT>#
-	_ZTV21CTestALawCodec_U_0004 @ 138 NONAME ; #<VT>#
-	_ZTV22CMMFGsm610ToPcm16Codec @ 139 NONAME ; #<VT>#
-	_ZTV22CMMFPcm16ToGsm610Codec @ 140 NONAME ; #<VT>#
-	_ZTV22CMMFPcmS16ToPcmS8Codec @ 141 NONAME ; #<VT>#
-	_ZTV22CMMFPcmU16ToPcm16Codec @ 142 NONAME ; #<VT>#
-	_ZTV22CTestMuLawCodec_U_0006 @ 143 NONAME ; #<VT>#
-	_ZTV22CTestStepCodecUnitTestI21CMMFPcm16ToPcmU8Codec11TComparatorLi0ELi0ELi0EE @ 144 NONAME ; #<VT>#
-	_ZTV22CTestStepCodecUnitTestI21CMMFPcmU8ToPcm16Codec13TDbComparatorILin300EELi0ELi0ELi1EE @ 145 NONAME ; #<VT>#
-	_ZTV22CTestStepCodecUnitTestI24CMMFImaAdpcmToPcm16Codec13TDbComparatorILin300EELi0ELi0ELi1EE @ 146 NONAME ; #<VT>#
-	_ZTV22CTestStepCodecUnitTestI24CMMFPcm16SwapEndianCodec11TComparatorLi0ELi1ELi1EE @ 147 NONAME ; #<VT>#
-	_ZTV22CTestStepCodecUnitTestI24CMMFPcm16ToImaAdpcmCodec11TComparatorLi0ELi0ELi0EE @ 148 NONAME ; #<VT>#
-	_ZTV23CMMFPcm16ToAlawHwDevice @ 149 NONAME ; #<VT>#
-	_ZTV23CMMFPcm8ToPcm16HwDevice @ 150 NONAME ; #<VT>#
-	_ZTV24CMMFImaAdpcmToPcm16Codec @ 151 NONAME ; #<VT>#
-	_ZTV24CMMFPcm16SwapEndianCodec @ 152 NONAME ; #<VT>#
-	_ZTV24CMMFPcm16ToImaAdpcmCodec @ 153 NONAME ; #<VT>#
-	_ZTV24CMMFPcm16ToMulawHwDevice @ 154 NONAME ; #<VT>#
-	_ZTV24CMMFPcm16ToPcm16HwDevice @ 155 NONAME ; #<VT>#
-	_ZTV24CMMFPcm16ToPcmU16BECodec @ 156 NONAME ; #<VT>#
-	_ZTV24CMMFPcm16ToPcmU8HwDevice @ 157 NONAME ; #<VT>#
-	_ZTV24CMMFPcm8ToPcm16Generator @ 158 NONAME ; #<VT>#
-	_ZTV24CMMFPcmU8ToPcm16HwDevice @ 159 NONAME ; #<VT>#
-	_ZTV25CMMFPcm16ToPcmU16HwDevice @ 160 NONAME ; #<VT>#
-	_ZTV25CMMFPcm16ToPcmU8Generator @ 161 NONAME ; #<VT>#
-	_ZTV25CMMFPcmS16ToPcmS8HwDevice @ 162 NONAME ; #<VT>#
-	_ZTV25CMMFPcmU16BeToPcmS16Codec @ 163 NONAME ; #<VT>#
-	_ZTV25CMMFPcmU16ToPcm16HwDevice @ 164 NONAME ; #<VT>#
-	_ZTV25CMMFPcmU8ToPcm16Generator @ 165 NONAME ; #<VT>#
-	_ZTV25CMmfGsm610ToPcm16HwDevice @ 166 NONAME ; #<VT>#
-	_ZTV25CMmfPcm16ToGsm610HwDevice @ 167 NONAME ; #<VT>#
-	_ZTV27CMMFPcm16SwapEndianHwDevice @ 168 NONAME ; #<VT>#
-	_ZTV27CMMFPcm16ToImaAdpcmHwDevice @ 169 NONAME ; #<VT>#
-	_ZTV27CMMFPcm16ToPcmU16BEHwDevice @ 170 NONAME ; #<VT>#
-	_ZTV27CMMFPcm16ToPcmU16CodecCodec @ 171 NONAME ; #<VT>#
-	_ZTV27CTestStepSignConversionTestI20CMMFPcm8ToPcm16Codec24CMMFPcm8ToPcm16GeneratorLi1EE @ 172 NONAME ; #<VT>#
-	_ZTV27CTestStepSignConversionTestI21CMMFPcm16ToPcmU8Codec25CMMFPcm16ToPcmU8GeneratorLi0EE @ 173 NONAME ; #<VT>#
-	_ZTV27CTestStepSignConversionTestI21CMMFPcmU8ToPcm16Codec25CMMFPcmU8ToPcm16GeneratorLi4EE @ 174 NONAME ; #<VT>#
-	_ZTV27CTestStepSignConversionTestI24CMMFPcm16SwapEndianCodec28CMMFPcmU16BtoPcmU16GeneratorLi3EE @ 175 NONAME ; #<VT>#
-	_ZTV27CTestStepSignConversionTestI24CMMFPcm16SwapEndianCodec28CMMFPcmU16toPcmU16BGeneratorLi2EE @ 176 NONAME ; #<VT>#
-	_ZTV28CMMFAlawToPcm16CodecHwDevice @ 177 NONAME ; #<VT>#
-	_ZTV28CMMFPcmU16BeToPcmS16HwDevice @ 178 NONAME ; #<VT>#
-	_ZTV28CMMFPcmU16BtoPcmU16Generator @ 179 NONAME ; #<VT>#
-	_ZTV28CMMFPcmU16toPcmU16BGenerator @ 180 NONAME ; #<VT>#
-	_ZTV28CTestStep_MMF_SwCodecDevices @ 181 NONAME ; #<VT>#
-	_ZTV29CMMFMulawToPcm16CodecHwDevice @ 182 NONAME ; #<VT>#
-	_ZTV29CTestStepGsm610ToPcm16OomTest @ 183 NONAME ; #<VT>#
-	_ZTV29CTestStepPcm16ToGsm610OomTest @ 184 NONAME ; #<VT>#
-	_ZTV29CTestSuite_MMF_SwCodecDevices @ 185 NONAME ; #<VT>#
-	_ZTV31CTest_MMF_SwCodecDevices_U_0001 @ 186 NONAME ; #<VT>#
-	_ZTV31CTest_MMF_SwCodecDevices_U_0002 @ 187 NONAME ; #<VT>#
-	_ZTV31CTest_MMF_SwCodecDevices_U_0003 @ 188 NONAME ; #<VT>#
-	_ZTV32CMMFImaAdpcmToPcm16CodecHwDevice @ 189 NONAME ; #<VT>#
-
--- a/mmlibs/mmfw/tsrc/mmfunittest/eabi/TSU_MMF_SbcCodecU.DEF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	_Z13NewTestSuiteLv @ 1 NONAME
-
--- a/mmlibs/mmfw/tsrc/mmfunittest/eabi/TS_CmmfTestCustomCommands.DEF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-EXPORTS
-	_ZN22RMMFTestCustomCommands15GetAudioQualityERi @ 1 NONAME
-	_ZN22RMMFTestCustomCommands15SetAudioQualityEi @ 2 NONAME
-	_ZN22RMMFTestCustomCommandsC1ER14RMMFController4TUid @ 3 NONAME
-	_ZN22RMMFTestCustomCommandsC2ER14RMMFController4TUid @ 4 NONAME
-	_ZN27CMMFTestCustomCommandParser13HandleRequestER11TMMFMessage @ 5 NONAME
-	_ZN27CMMFTestCustomCommandParser4NewLER32MMMFTestCustomCommandImplementor @ 6 NONAME
-	_ZN27CMMFTestCustomCommandParser5NewLCER32MMMFTestCustomCommandImplementor @ 7 NONAME
-	_ZTI27CMMFTestCustomCommandParser @ 8 NONAME ; #<TI>#
-	_ZTV27CMMFTestCustomCommandParser @ 9 NONAME ; #<VT>#
-
--- a/mmlibs/mmfw/tsrc/mmfunittest/eabi/TS_TransferBufferTesterClientU.DEF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-EXPORTS
-	_ZN27RTransferBufferTesterClient13WriteTestDataER5TPtr8 @ 1 NONAME
-	_ZN27RTransferBufferTesterClient17GetServerThreadIdER9TThreadId @ 2 NONAME
-	_ZN27RTransferBufferTesterClient20CreateTransferBufferEj @ 3 NONAME
-	_ZN27RTransferBufferTesterClient31MapBufferIntoClientWindowHandleEi @ 4 NONAME
-	_ZN27RTransferBufferTesterClient5CloseEv @ 5 NONAME
-	_ZN27RTransferBufferTesterClient7ConnectEv @ 6 NONAME
-	_ZN27RTransferBufferTesterClientC1Ev @ 7 NONAME
-	_ZN27RTransferBufferTesterClientC2Ev @ 8 NONAME
-
--- a/mmlibs/mmfw/tsrc/mmfunittest/eabi/tsu_mmf_ctlfrm_sdrmu.def	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-EXPORTS
-	_Z13NewTestSuiteLv @ 1 NONAME
--- a/mmlibs/mmfw/tsrc/mmfunittest/eabi/tsu_mmf_devsubtitleu.def	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	_Z13NewTestSuiteLv @ 1 NONAME
-
--- a/mmlibs/mmfw/tsrc/mmfunittest/eabi/tsu_mmf_mmrufU.def	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-EXPORTS
-	_Z13NewTestSuiteLv @ 1 NONAME
-	_ZTI14CTSU_MMF_MMRUF @ 2 NONAME ; #<TI>#
-	_ZTI14RMMRUFTestStep @ 3 NONAME ; #<TI>#
-	_ZTI17RMMRUFDirTestStep @ 4 NONAME ; #<TI>#
-	_ZTI17RTestStepMMRUFOOM @ 5 NONAME ; #<TI>#
-	_ZTV14CTSU_MMF_MMRUF @ 6 NONAME ; #<VT>#
-	_ZTV14RMMRUFTestStep @ 7 NONAME ; #<VT>#
-	_ZTV17RMMRUFDirTestStep @ 8 NONAME ; #<VT>#
-	_ZTV17RTestStepMMRUFOOM @ 9 NONAME ; #<VT>#
-
--- a/mmlibs/mmfw/tsrc/mmfunittest/eabi/tsu_mmf_subtitlegraphicu.def	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	_Z13NewTestSuiteLv @ 1 NONAME
-
--- a/mmlibs/mmfw/tsrc/mmfunittest/group/BLD.INF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,792 +0,0 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-#include "../SbcCodec/BLD.INF"
-#include "../DevSoundTest/CIPlugins/group/BLD.INF"
-
-
-#ifdef SYMBIAN_VARIABLE_BITRATE_CODEC // use system wide flag to trigger model controller build
-#define SYMBIAN_MMF_MODEL_CONTROLLERS
-#endif
-
-PRJ_MMPFILES
-//SWCodecDevices
-../MmpFiles/TSU_MMF_SwCodecDevices.mmp
-
-//ACOD
-../MmpFiles/TSU_MMF_ACOD.mmp
-../MmpFiles/TSU_MMF_ACOD_TestCodecs.mmp
-
-//actrl (mmf audio controller tests and custom plugins)
-../MmpFiles/CustomMmfAudioController.mmp
-../MmpFiles/TSU_MMF_ACTRL_01.mmp
-
-#ifdef SYMBIAN_MMF_MODEL_CONTROLLERS
-../MmpFiles/tsu_mmf_oggctrl_01.mmp
-#endif
-
-//AFMT 
-../MmpFiles/TSU_MMF_AFMT.mmp
-../MmpFiles/TSU_MMF_AFMT_TestDataSource.mmp
-../MmpFiles/TSU_MMF_AFMT_TestDataSink.mmp
-
-//BASECL - Note TS_TransferBufferTesterServer/client do not have BASECL in their names as these may be used in other tests
-../MmpFiles/TSU_MMF_BASECL.mmp
-../MmpFiles/TSU_MMF_BASECL_TestCodec.mmp
-../MmpFiles/TSU_MMF_BASECL_TestSrcSink.mmp
-../MmpFiles/TSU_MMF_BASECL_TestFormat.mmp
-
-// Audio and Video Clients
-../MmpFiles/TSU_MMF_ACLNT_01.mmp
-../MmpFiles/TSU_MMF_VCLNT_01.mmp
-../MmpFiles/TS_CMMFVideoTestCustomCommands.mmp
-../MmpFiles/TS_CMMFVideoTestController.mmp
-
-#ifdef SYMBIAN_BUILD_GCE
-#ifdef EABI
-../MmpFiles/ts_cmmfvideotestcontroller_gce.mmp
-#endif // EABI
-#endif // SYMBIAN_BUILD_GCE
-../MmpFiles/TS_VideoInput.mmp
-../MmpFiles/TS_VideoOutput.mmp
-../MmpFiles/TSU_MMF_VCLNT_APP.mmp
-
-//CTLFRM
-../MmpFiles/TS_CMMFTestCustomCommands.mmp
-../MmpFiles/TS_CMMFTestController.mmp
-../MmpFiles/TS_MMFTestDataSink.mmp
-../MmpFiles/TS_MMFTestDataSource.mmp
-../MmpFiles/TS_MMFTestDataSinkB.mmp
-../MmpFiles/TS_MMFTestDataSourceB.mmp
-../MmpFiles/TSU_MMF_CTLFRM.mmp
-../MmpFiles/tsu_mmf_ctlfrm_sdrm.mmp
-../MmpFiles/MmfMP3Format.mmp
-../MmpFiles/MmfMP3NullCodec.mmp
-../MmpFiles/TS_CMMFDummyTestController.mmp
-../MmpFiles/TS_CMMFDummyVideoTestController.mmp
-../MmpFiles/ts_cmmftestterminationcontroller.mmp
-../MmpFiles/ts_cmmftestconstructcontroller.mmp
-
-// DEVSOUND
-../MmpFiles/TSU_MMF_DEVSOUND_SUITE.mmp
-../MmpFiles/TSU_MMF_DEVSOUND_TESTDEVICE.mmp
-../MmpFiles/TSU_MMF_DEVSOUND_NOTIFICATION_SUITE.mmp
-../MmpFiles/TSU_MMF_DEVSOUND_TESTINTERFACE.mmp
-../MmpFiles/TSU_MMF_DEVSOUND_TESTINTERFACE1.mmp
-
-// SRSSNK
-../MmpFiles/TSU_MMF_SRSSNK.mmp
-
-//MIDI
-//../mmpfiles/TS_CMMFMidiTestController.mmp - moved to separate ../MidiClnt/group/bld.inf
-../MmpFiles/TSU_MMFMIDICLNT.mmp
-//../mmpfiles/TSU_MMF_MCLNT_01.mmp
-
-//SWCDWRAP
-../MmpFiles/TSU_MMF_SWCDWRAP.mmp
-../MmpFiles/TSU_MMF_SWCDWRAP_TestDevice.mmp
-
-//A2DPBLUETOOTH
-//../mmpfiles/TSU_MMF_A2DPBLUETOOTH.mmp
-
-
-#ifdef SYMBIAN_MMF_MODEL_CONTROLLERS
-//.avi controller
-../MmpFiles/customaviplayercontroller.mmp
-../MmpFiles/tsu_mmf_avictrl_01.mmp
-#endif
-
-#ifdef SYMBIAN_USE_MMF_RUF_RECOGNIZER
-// Unsupported Formats Recogniser
-../MmpFiles/tsu_mmf_mmruf.mmp
-#endif
-
-// DRMPlugin Server
-../MmpFiles/TSU_MMF_DRMPlugin_U.mmp
-PRJ_EXPORTS
-//C:/
-// test scripts
-../basecl/TSU_MMF_BASECL.script	c:/mm/tsu_mmf_basecl.script
-../basecl/tsu_mmf_basecl.ini	c:/tsu_mmf_basecl.ini
-../basecl/TSU_MMF_BASECL_Alloc.script	c:/mm/tsu_mmf_basecl_alloc.script
-../ctlfrm/TSU_MMF_CTLFRM.script	c:/mm/tsu_mmf_ctlfrm.script
-../scripts/TSU_MMF_CTLFRM_SDRM.script	c:/mm/tsu_mmf_ctlfrm_sdrm.script
-../scripts/TSU_MMF_CTLFRM_SDRM_ALLOC.script	c:/mm/tsu_mmf_ctlfrm_sdrm_alloc.script
-
-#ifdef SYMBIAN_BUILD_GCE
-../ctlfrm/tsu_mmf_ctlfrm_videosurface.script c:/mm/tsu_mmf_ctlfrm_videosurface.script
-#endif
-#ifdef SYMBIAN_MULTIMEDIA_SUBTITLE_SUPPORT
-../ctlfrm/tsu_mmf_ctlfrm_subtitles.script c:/mm/tsu_mmf_ctlfrm_subtitles.script
-#endif
-../ACOD/TSU_MMF_ACOD.script	c:/mm/tsu_mmf_acod.script
-../ACOD/TSU_MMF_ACOD_Alloc.script	c:/mm/tsu_mmf_acod_alloc.script
-../swcdwrap/TSU_MMF_SWCDWRAP.script	c:/mm/tsu_mmf_swcdwrap.script
-../swcdwrap/TSU_MMF_SWCDWRAP_WINSCW.script	c:/mm/tsu_mmf_swcdwrap_winscw.script
-../SwCodecDevices/TSU_MMF_SWCODECDEVICES.script	c:/mm/tsu_mmf_swcodecdevices.script
-../SwCodecDevices/TSU_MMF_SWCODECDEVICES_Alloc.script	c:/mm/tsu_mmf_swcodecdevices_alloc.script
-../SwCodecDevices/TSU_MMF_SWCODECDEVICES.ini	c:/mm/tsu_mmf_swcodecdevices.ini
-//../A2DPBLUETOOTH/TSU_MMF_A2DPBLUETOOTH.script	c:/mm/TSU_MMF_A2DPBLUETOOTH.script
-
-
-// ----> src & sink unit test scripts <----
-../srssnk/TSU_MMF_SRSSNK_ALLOC.script	c:/mm/tsu_mmf_srssnk_alloc.script
-../srssnk/TSU_MMF_SRSSNK_FH_ALLOC.script	c:/mm/tsu_mmf_srssnk_fh_alloc.script
-../srssnk/TSU_MMF_SRSSNK_Panic.script	c:/mm/tsu_mmf_srssnk_panic.script
-
-../AFMT/TSU_MMF_AFMT.script	c:/mm/tsu_mmf_afmt.script
-../AFMT/TSU_MMF_AFMT_ALLOC.script	c:/mm/tsu_mmf_afmt_alloc.script
-
-#ifdef SYMBIAN_MULTIMEDIA_A3FDEVSOUND
-../DevSoundTest/scripts/TSU_MMF_DEVSOUND_SUITE_MUXDEMUX.script	c:/mm/tsu_mmf_devsound_suite_muxdemux.script
-#endif
-
-#ifdef SYMBIAN_MULTIMEDIA_A3FDEVSOUND
-../DevSoundTest/scripts/tsu_mmf_devsound_suite_truepause.script	c:/mm/tsu_mmf_devsound_suite_truepause.script
-#else
-../devsoundtest/scripts/tsu_mmf_devsound_suite_nona3f.script	c:/mm/tsu_mmf_devsound_suite_nona3f.script
-#endif
-../DevSoundTest/scripts/tsu_mmf_devsound_suite_manual.script	c:/mm/tsu_mmf_devsound_suite_manual.script
-../DevSoundTest/scripts/tsu_mmf_devsound_play_tone.ini			c:/tsu_mmf_devsound_play_tone.ini
-../DevSoundTest/scripts/tsu_mmf_devsound_record.ini			c:/tsu_mmf_devsound_record.ini
-../DevSoundTest/scripts/tsu_mmf_truepause_devsound.ini			c:/tsu_mmf_truepause_devsound.ini
-
-../DevSoundTest/scripts/TSU_MMF_DEVSOUND_SUITE_debug.script		c:/mm/tsu_mmf_devsound_suite_debug.script
-../DevSoundTest/scripts/TSU_MMF_DEVSOUND_SUITE_Alloc.script		c:/mm/tsu_mmf_devsound_suite_alloc.script
-../DevSoundTest/scripts/TSU_MMF_DEVSOUND_NOTIFICATION_SUITE.script	c:/mm/tsu_mmf_devsound_notification_suite.script
-../DevSoundTest/scripts/TSU_MMF_DEVSOUND_SUITE_PREEMPTION.script	c:/mm/tsu_mmf_devsound_suite_preemption.script
-
-../DevSoundTest/scripts/TSU_MMF_SDEVSOUND_SUITE.script	c:/mm/tsu_mmf_sdevsound_suite.script
-../DevSoundTest/scripts/TSU_MMF_DEVSOUND_SUITE_NOCAP.script	c:/mm/tsu_mmf_devsound_suite_nocap.script
-../DevSoundTest/scripts/TSU_MMF_DEVSOUND_SUITE_MMDDCAP.script	c:/mm/tsu_mmf_devsound_suite_mmddcap.script
-../DevSoundTest/scripts/TSU_MMF_DEVSOUND_SUITE_UECAP.script	c:/mm/tsu_mmf_devsound_suite_uecap.script
-
-// --------------->> actrl script <<-----------------------------------
-../Actrl/TSU_MMF_ACTRL_01.script c:/tsu_mmf_actrl_01.script
-../Actrl/TSU_MMF_ACTRL_01_Alloc.script c:/tsu_mmf_actrl_01_alloc.script
-
-#ifdef SYMBIAN_MMF_MODEL_CONTROLLERS
-// --------------->> Oggctrl script <<-----------------------------------
-../scripts/tsu_mmf_oggctrl_play.script c:/tsu_mmf_oggctrl_play.script
-../scripts/tsu_mmf_oggctrl_record.script c:/tsu_mmf_oggctrl_record.script
-../scripts/tsu_mmf_oggctrl_01.ini c:/tsu_mmf_oggctrl_01.ini
-
-// --------------->> avictrl script <<-----------------------------------
-../scripts/tsu_mmf_avictrl_play.script  c:/tsu_mmf_avictrl_play.script
-../scripts/tsu_mmf_avictrl_play_alloc.script  c:/tsu_mmf_avictrl_play_alloc.script
-../scripts/tsu_mmf_avictrl_record.script c:/tsu_mmf_avictrl_record.script
-../scripts/tsu_mmf_avictrl_secdisp.script c:/tsu_mmf_avictrl_secdisp.script
-../scripts/tsu_mmf_avictrl_secdisp_winscw.script c:/tsu_mmf_avictrl_secdisp_winscw.script
-../scripts/tsu_mmf_avictrl_01.ini c:/tsu_mmf_avictrl_01.ini
-#ifdef SYMBIAN_BUILD_GCE
-../scripts/tsu_mmf_avictrl_gce_enable.script  c:/tsu_mmf_avictrl_gce_enable.script
-../scripts/tsu_mmf_avictrl_gce_disable.script  c:/tsu_mmf_avictrl_gce_disable.script
-../scripts/tsu_mmf_avictrl_gce_enable.ini c:/tsu_mmf_avictrl_gce_enable.ini
-../scripts/tsu_mmf_avictrl_gce_disable.ini c:/tsu_mmf_avictrl_gce_disable.ini
-#endif //SYMBIAN_BUILD_GCE
-#ifdef SYMBIAN_MULTIMEDIA_SUBTITLE_SUPPORT
-../scripts/tsu_mmf_avictrl_subtitle.ini c:/tsu_mmf_avictrl_subtitle.ini
-../scripts/tsu_mmf_avictrl_subtitle.script c:/tsu_mmf_avictrl_subtitle.script
-#endif //SYMBIAN_MULTIMEDIA_SUBTITLE_SUPPORT
-#endif //SYMBIAN_MMF_MODEL_CONTROLLERS
-
-../scripts/TSU_MMF_ACLNT_01.script		c:/mm/tsu_mmf_aclnt_01.script
-../scripts/TSU_MMF_ACLNT_01_PREEMPTION.script		c:/mm/tsu_mmf_aclnt_01_preemption.script
-../scripts/TSU_MMF_ACLNT_01_NOTIFICATION.script		c:/mm/tsu_mmf_aclnt_01_notification.script
-../scripts/TSU_MMF_ACLNT_01_Alloc.script	c:/mm/tsu_mmf_aclnt_01_alloc.script
-../scripts/TSU_MMF_ACLNT_02_Alloc.script	c:/mm/tsu_mmf_aclnt_02_alloc.script
-../scripts/TSU_MMF_ACLNT_03_Alloc.script	c:/mm/tsu_mmf_aclnt_03_alloc.script
-../scripts/TSU_MMF_ACLNT_04_Alloc.script	c:/mm/tsu_mmf_aclnt_04_alloc.script
-../scripts/TSU_MMF_ACLNT_05_Alloc.script	c:/mm/tsu_mmf_aclnt_05_alloc.script
-../scripts/TSU_MMF_ACLNT_01.ini			c:/mm/tsu_mmf_aclnt_01.ini
-../scripts/TSU_MMF_VCLNT_01_WM_CAF_V2.script	c:/mm/tsu_mmf_vclnt_01_wm_caf_v2.script
-../scripts/TSU_MMF_VCLNT_01_ALLOC_WM.script	c:/mm/tsu_mmf_vclnt_01_alloc_wm.script
-../scripts/TSU_MMF_ACLNT_RF_ALLOC.script	c:/mm/tsu_mmf_aclnt_rf_alloc.script
-../scripts/TSU_MMF_VCLNT_RF_WM.script		c:/mm/tsu_mmf_vclnt_rf_wm.script
-../scripts/TSU_MMF_VCLNT_RF_ALLOC_WM.script	c:/mm/tsu_mmf_vclnt_rf_alloc_wm.script
-../scripts/TSU_MMF_VCLNT_DRM.script		c:/mm/tsu_mmf_vclnt_drm.script
-../scripts/TSU_MMF_VCLNT_DRM_ALLOC.script	c:/mm/tsu_mmf_vclnt_drm_alloc.script
-../scripts/TSU_MMF_VCLNT_01.ini			c:/mm/tsu_mmf_vclnt_01.ini
-../scripts/TSU_MMF_ACLNT_DRM.script			c:/mm/tsu_mmf_aclnt_drm.script
-../scripts/TSU_MMF_ACLNT_DRM_ALLOC.script		c:/mm/tsu_mmf_aclnt_drm_alloc.script
-../scripts/tsu_mmf_aclnt_securedrmtestdata.ini		c:/mm/tsu_mmf_aclnt_securedrmtestdata.ini
-../scripts/tsu_mmf_aclnt_securedrmtestdata.script	c:/mm/tsu_mmf_aclnt_securedrmtestdata.script
-../scripts/tsu_mmf_aclnt_securedrm.ini		c:/mm/tsu_mmf_aclnt_securedrm.ini
-../scripts/tsu_mmf_aclnt_securedrm.script	c:/mm/tsu_mmf_aclnt_securedrm.script
-../scripts/TSU_MMF_VCLNT_RF_WM_NOTIFICATION.script		c:/mm/tsu_mmf_vclnt_rf_wm_notification.script
-../scripts/TSU_MMF_VCLNT_01_WM_CAF_V2_priority.script	c:/mm/tsu_mmf_vclnt_01_wm_caf_v2_priority.script
-
-
-
-// --------------->> graphics support script <<-----------------------------------
-#ifdef SYMBIAN_BUILD_GCE
-../scripts/tsu_mmf_vclnt_u_01_gce_available.script		c:/mm/tsu_mmf_vclnt_u_01_gce_available.script
-../scripts/tsu_mmf_vclnt_u_01_gce_unavailable.script		c:/mm/tsu_mmf_vclnt_u_01_gce_unavailable.script
-../scripts/tsu_mmf_vclnt_u_01_gce_alloc.script			c:/mm/tsu_mmf_vclnt_u_01_gce_alloc.script
-../scripts/tsu_mmf_vclnt_u_01_gce_avail_secscreen.script	c:/mm/tsu_mmf_vclnt_u_01_gce_avail_secscreen.script	
-../scripts/TSU_MMF_VCLNT_01_gce_unavailable.ini	c:/mm/tsu_mmf_vclnt_01_gce_unavailable.ini
-#else
-// remove compile error and avoid test cases failed when CVideoPlayerUtility2 is not available
-../scripts/empty.script		c:/mm/tsu_mmf_vclnt_u_01_gce_unavailable.script
-#endif
-#ifdef SYMBIAN_MULTIMEDIA_SUBTITLE_SUPPORT
-../scripts/tsu_mmf_vclnt_u_01_subtitle_gce_on.script		c:/mm/tsu_mmf_vclnt_u_01_subtitle_gce_on.script
-../scripts/tsu_mmf_vclnt_u_01_subtitle_gce_on_secscreen.script		c:/mm/tsu_mmf_vclnt_u_01_subtitle_gce_on_secscreen.script
-../scripts/tsu_mmf_vclnt_u_01_subtitle_gce_on_udeb.script		c:/mm/tsu_mmf_vclnt_u_01_subtitle_gce_on_udeb.script
-../scripts/tsu_mmf_vclnt_u_01_subtitle_gce_on_urel.script		c:/mm/tsu_mmf_vclnt_u_01_subtitle_gce_on_urel.script
-#endif
-
-#ifdef SYMBIAN_USE_MMF_RUF_RECOGNIZER
-// Unsupported Formats Recogniser
-../scripts/tsu_mmf_mmruf.script				c:/tsu_mmf_mmruf.script
-../scripts/tsu_mmf_mmruf_badext.script		c:/tsu_mmf_mmruf_badext.script
-../scripts/tsu_mmf_mmruf_corrupt.script		c:/tsu_mmf_mmruf_corrupt.script
-../scripts/TSU_MMF_MMRUF_ALLOC.script		c:/tsu_mmf_mmruf_alloc.script
-
-#endif
-
-../group/TSU_MMF_ACLNT_01.bat			c:/mm/tsu_mmf_aclnt_01.bat
-
-//BaseCl reference files
-../basecl/data/Reference100HzTone8000_1_8000_2.refsnd	c:/reference100hztone8000_1_8000_2.refsnd
-../basecl/data/Reference100HzTone8000_2_8000_1.refsnd	c:/reference100hztone8000_2_8000_1.refsnd
-../basecl/data/Reference100HzTone8000_1_11025_1.refsnd	c:/reference100hztone8000_1_11025_1.refsnd
-../basecl/data/Reference100HzTone8000_1_11025_2.refsnd	c:/reference100hztone8000_1_11025_2.refsnd
-../basecl/data/Reference100HzTone8000_1_6500_1.refsnd	c:/reference100hztone8000_1_6500_1.refsnd
-../basecl/data/Reference100HzTone8000_1_6500_2.refsnd	c:/reference100hztone8000_1_6500_2.refsnd
-../basecl/data/Reference100HzTone8000_2_11025_1.refsnd	c:/reference100hztone8000_2_11025_1.refsnd
-../basecl/data/Reference100HzTone8000_2_11025_2.refsnd	c:/reference100hztone8000_2_11025_2.refsnd
-../basecl/data/Reference100HzTone8000_2_6500_1.refsnd	c:/reference100hztone8000_2_6500_1.refsnd
-../basecl/data/Reference100HzTone8000_2_6500_2.refsnd	c:/reference100hztone8000_2_6500_2.refsnd
-
-//MM Video Clients Unit Testing
-../VCLNT/TSU_MMF_VCLNT_01/Data/small2.wav		c:/mm/mmf/testfiles/vclnt/small2.wav
-../VCLNT/TSU_MMF_VCLNT_01/Data/smallv.wav		c:/mm/mmf/testfiles/vclnt/smallv.wav
-../VCLNT/TSU_MMF_VCLNT_01/Data/clock.dummy		c:/mm/mmf/testfiles/vclnt/clock.dummy
-../VCLNT/TSU_MMF_VCLNT_01/Data/Video.content	c:/mm/mmf/testfiles/vclnt/video.content
-../VCLNT/TSU_MMF_VCLNT_01/Data/VideoContentNoRights.content	c:/mm/mmf/testfiles/vclnt/videocontentnorights.content
-../VCLNT/TSU_MMF_VCLNT_01/Data/LongVideo.dummy	c:/mm/mmf/testfiles/vclnt/longvideo.dummy
-../VCLNT/TSU_MMF_VCLNT_01/Data/ShortVideo.dummy	c:/mm/mmf/testfiles/vclnt/shortvideo.dummy
-../VCLNT/TSU_MMF_VCLNT_01/Data/AudVid.avi		c:/mm/mmf/testfiles/vclnt/audvid.avi
-../VCLNT/TSU_MMF_VCLNT_01/Data/Vid.avi			c:/mm/mmf/testfiles/vclnt/vid.avi
-../VCLNT/TSU_MMF_VCLNT_01/Data/xvidonly.avi		c:/mm/mmf/testfiles/vclnt/xvidonly.avi
-#ifdef SYMBIAN_MULTIMEDIA_SUBTITLE_SUPPORT
-../VCLNT/TSU_MMF_VCLNT_01/Data/clock2.dummy		c:/mm/mmf/testfiles/vclnt/clock2.dummy
-#endif //SYMBIAN_MULTIMEDIA_SUBTITLE_SUPPORT
-//MM Audio Clients Unit Testing
-../aclnt/TSU_MMF_ACLNT_01/data/small.wav		c:/mm/mmf/testfiles/aclnt/small.wav
-../aclnt/TSU_MMF_ACLNT_01/data/small.wav		z:/resource/small.wav
-../aclnt/TSU_MMF_ACLNT_01/data/small.wav		c:/mm/mmf/testfiles/aclnt/small1.wav
-../aclnt/TSU_MMF_ACLNT_01/data/small2.wav		c:/mm/mmf/testfiles/aclnt/small2.wav
-../aclnt/TSU_MMF_ACLNT_01/data/expectedsmall2.au	c:/mm/mmf/testfiles/aclnt/expectedsmall2.au
-../aclnt/TSU_MMF_ACLNT_01/data/mainTest.wav		c:/mm/mmf/testfiles/aclnt/maintest.wav
-../aclnt/TSU_MMF_ACLNT_01/data/test16m2.au		c:/mm/mmf/testfiles/aclnt/test16m2.au
-../aclnt/TSU_MMF_ACLNT_01/data/8bitUPCM.raw		c:/mm/mmf/testfiles/aclnt/8bitupcm.raw
-../aclnt/TSU_MMF_ACLNT_01/data/8bitmUPCM.raw	c:/mm/mmf/testfiles/aclnt/8bitmupcm.raw
-../aclnt/TSU_MMF_ACLNT_01/data/ALawMono.au		c:/mm/mmf/testfiles/aclnt/alawmono.au
-../aclnt/TSU_MMF_ACLNT_01/data/ALawStereo.au	c:/mm/mmf/testfiles/aclnt/alawstereo.au
-../aclnt/TSU_MMF_ACLNT_01/data/uLawMono.au		c:/mm/mmf/testfiles/aclnt/ulawmono.au
-../aclnt/TSU_MMF_ACLNT_01/data/uLawStereo.au	c:/mm/mmf/testfiles/aclnt/ulawstereo.au
-../aclnt/TSU_MMF_ACLNT_01/data/PCM8bitMono.au	c:/mm/mmf/testfiles/aclnt/pcm8bitmono.au
-../aclnt/TSU_MMF_ACLNT_01/data/PCM8bitStereo.au	c:/mm/mmf/testfiles/aclnt/pcm8bitstereo.au
-../aclnt/TSU_MMF_ACLNT_01/data/PCM16bitMono.au	c:/mm/mmf/testfiles/aclnt/pcm16bitmono.au
-../aclnt/TSU_MMF_ACLNT_01/data/PCM16bitStereo.au	c:/mm/mmf/testfiles/aclnt/pcm16bitstereo.au
-../aclnt/TSU_MMF_ACLNT_01/data/alawMono.wav		c:/mm/mmf/testfiles/aclnt/alawmono.wav
-../aclnt/TSU_MMF_ACLNT_01/data/ALawStereo.wav	c:/mm/mmf/testfiles/aclnt/alawstereo.wav
-../aclnt/TSU_MMF_ACLNT_01/data/uLawMono.wav		c:/mm/mmf/testfiles/aclnt/ulawmono.wav
-../aclnt/TSU_MMF_ACLNT_01/data/uLawStereo.wav	c:/mm/mmf/testfiles/aclnt/ulawstereo.wav
-../aclnt/TSU_MMF_ACLNT_01/data/PCM8BitMono.wav	c:/mm/mmf/testfiles/aclnt/pcm8bitmono.wav
-../aclnt/TSU_MMF_ACLNT_01/data/PCM8BitStereo.wav	c:/mm/mmf/testfiles/aclnt/pcm8bitstereo.wav
-../aclnt/TSU_MMF_ACLNT_01/data/Pcm16bitMono.wav		c:/mm/mmf/testfiles/aclnt/pcm16bitmono.wav
-../aclnt/TSU_MMF_ACLNT_01/data/PCM16bitStereo.wav	c:/mm/mmf/testfiles/aclnt/pcm16bitstereo.wav
-../aclnt/TSU_MMF_ACLNT_01/data/4sec_wav.wav		c:/mm/mmf/testfiles/aclnt/4sec_wav.wav
-../aclnt/TSU_MMF_ACLNT_01/data/sample.wav		c:/mm/mmf/testfiles/aclnt/sample.wav
-../aclnt/TSU_MMF_ACLNT_01/data/sequence2.sqn		c:/mm/mmf/testfiles/aclnt/sequence2.sqn
-../aclnt/TSU_MMF_ACLNT_01/data/testheaderTag.au		c:/mm/mmf/testfiles/aclnt/testheadertag.au
-../aclnt/TSU_MMF_ACLNT_01/data/cdec_ff_wav_fr.wav	c:/mm/mmf/testfiles/aclnt/cdec_ff_wav_fr.wav
-../aclnt/TSU_MMF_ACLNT_01/data/CorruptSampleRate.wav	c:/mm/mmf/testfiles/aclnt/corruptsamplerate.wav
-// SYMBIAN_CAF_V2
-../aclnt/TSU_MMF_ACLNT_01/data/mainTst.wav		c:/mm/mmf/testfiles/aclnt/maintst.wav
-../aclnt/TSU_MMF_ACLNT_01/data/mainTst2.wav		c:/mm/mmf/testfiles/aclnt/maintst2.wav
-../aclnt/TSU_MMF_ACLNT_01/data/mainTst3.wav		c:/mm/mmf/testfiles/aclnt/maintst3.wav
-../aclnt/TSU_MMF_ACLNT_01/data/Audio.content		c:/aclntitestdata/audio.content
-../aclnt/TSU_MMF_ACLNT_01/data/Audio.contentrights		c:/aclntitestdata/audio.contentrights
-../aclnt/TSU_MMF_ACLNT_01/data/AudioContentNoRights.content		c:/aclntitestdata/audiocontentnorights.content
-../aclnt/TSU_MMF_ACLNT_01/data/SingleTone.content		c:/mm/mmf/testfiles/aclnt/singletone.content
-../aclnt/TSU_MMF_ACLNT_01/data/SingleTone.contentrights		c:/mm/mmf/testfiles/aclnt/singletone.contentrights
-// SecureDrm Model
-../aclnt/TSU_MMF_ACLNT_01/data/smallwav_audiocontent.xml	c:/mm/mmf/testfiles/aclnt/smallwav_audiocontent.xml
-../aclnt/TSU_MMF_ACLNT_01/data/smallwav_audiorights.xml		c:/mm/mmf/testfiles/aclnt/smallwav_audiorights.xml
-
-//Test data Add to test DEF140670 
-../aclnt/TSU_MMF_ACLNT_01/data/recordtest.wav		c:/mm/mmf/testfiles/aclnt/recordtest.wav
-
-// remove recorded.wav, as it causes problems
-//../ACLNT/TSU_MMF_ACLNT_01/Data/recorded.wav	c:/mm/mmf/testfiles/aclnt/recorded.wav
-../aclnt/TSU_MMF_ACLNT_01/data/recorded.au		c:/mm/mmf/testfiles/aclnt/recorded.au
-../aclnt/TSU_MMF_ACLNT_01/data/recorded.raw		c:/mm/mmf/testfiles/aclnt/recorded.raw
-../aclnt/TSU_MMF_ACLNT_01/data/Cropped.wav		c:/mm/mmf/testfiles/aclnt/cropped.wav
-../aclnt/TSU_MMF_ACLNT_01/data/Cropped.au			c:/mm/mmf/testfiles/aclnt/cropped.au
-../aclnt/TSU_MMF_ACLNT_01/data/dtmfsample1.txt	c:/mm/mmf/testfiles/aclnt/dtmfsample1.txt
-../aclnt/TSU_MMF_ACLNT_01/data/main_meta.wav	c:/mm/mmf/testfiles/aclnt/main_meta.wav
-../aclnt/TSU_MMF_ACLNT_01/data/test.raw			c:/mm/mmf/testfiles/aclnt/test.raw
-../aclnt/TSU_MMF_ACLNT_01/data/test.pav			c:/mm/mmf/testfiles/aclnt/test.pav
-../aclnt/TSU_MMF_ACLNT_01/data/16BitSPCM.wav		c:/mm/mmf/testfiles/aclnt/16bitspcm.wav
-../aclnt/TSU_MMF_ACLNT_01/data/Gsm610Mono8khz.wav		c:/mm/mmf/testfiles/aclnt/gsm610mono8khz.wav
-../aclnt/TSU_MMF_ACLNT_01/data/corruptedGsm610Mono8khz.wav	c:/mm/mmf/testfiles/aclnt/corruptedgsm610mono8khz.wav
-
-../aclnt/TSU_MMF_ACLNT_01/data/MP3RAW.mp3			c:/mm/mmf/testfiles/aclnt/mp3raw.mp3
-../aclnt/TSU_MMF_ACLNT_01/data/MP3ID3.mp3			c:/mm/mmf/testfiles/aclnt/mp3id3.mp3
-../aclnt/TSU_MMF_ACLNT_01/data/MP3WAV.wav			c:/mm/mmf/testfiles/aclnt/mp3wav.wav
-../aclnt/TSU_MMF_ACLNT_01/data/MP3DUMMY.exe			c:/mm/mmf/testfiles/aclnt/mp3dummy.exe
-
-../aclnt/TSU_MMF_ACLNT_01/data/IMAADPCM4Bit8KHzMono.wav			c:/mm/mmf/testfiles/aclnt/imaadpcm4bit8khzmono.wav
-../aclnt/TSU_MMF_ACLNT_01/data/IMAADPCM4Bit8KhzMono512Block.wav			c:/mm/mmf/testfiles/aclnt/imaadpcm4bit8khzmono512block.wav
-../aclnt/TSU_MMF_ACLNT_01/data/IMAADPCM4Bit11KHzMono.wav			c:/mm/mmf/testfiles/aclnt/imaadpcm4bit11khzmono.wav
-../aclnt/TSU_MMF_ACLNT_01/data/IMAADPCM4Bit22KHzMono.wav			c:/mm/mmf/testfiles/aclnt/imaadpcm4bit22khzmono.wav
-../aclnt/TSU_MMF_ACLNT_01/data/IMAADPCM4Bit44KHzMono.wav			c:/mm/mmf/testfiles/aclnt/imaadpcm4bit44khzmono.wav
-../aclnt/TSU_MMF_ACLNT_01/data/Refimaadpcmwith512block2pcm16.wav	c:/mm/mmf/testfiles/aclnt/refimaadpcmwith512block2pcm16.wav
-
-// additional wav file for testing recording with modified audio input
-../aclnt/TSU_MMF_ACLNT_01/data/r3.wav		c:/r3.wav
-
-../aclnt/TSU_MMF_ACLNT_01/data/PU8Mono1KhzTone.wav	    c:/mm/mmf/testfiles/aclnt/pu8mono1khztone.wav
-../aclnt/TSU_MMF_ACLNT_01/data/PU8Stereo1KhzTone.wav	    c:/mm/mmf/testfiles/aclnt/pu8stereo1khztone.wav
-../aclnt/TSU_MMF_ACLNT_01/data/PCMExp500hzMono8Khz.wav	    c:/mm/mmf/testfiles/aclnt/pcmexp500hzmono8khz.wav
-../aclnt/TSU_MMF_ACLNT_01/data/PCMExp500hzStereo8Khz.wav    c:/mm/mmf/testfiles/aclnt/pcmexp500hzstereo8khz.wav
-../aclnt/TSU_MMF_ACLNT_01/data/Mono500hzALw.wav		    c:/mm/mmf/testfiles/aclnt/mono500hzalw.wav
-../aclnt/TSU_MMF_ACLNT_01/data/Stereo500hzALw.wav	    c:/mm/mmf/testfiles/aclnt/stereo500hzalw.wav
-../aclnt/TSU_MMF_ACLNT_01/data/Mono500hzMuLaw.wav	    c:/mm/mmf/testfiles/aclnt/mono500hzmulaw.wav
-../aclnt/TSU_MMF_ACLNT_01/data/Stereo500hzMuLaw.wav	    c:/mm/mmf/testfiles/aclnt/stereo500hzmulaw.wav
-../aclnt/TSU_MMF_ACLNT_01/data/ImaAdpcmMono8khz.wav	    c:/mm/mmf/testfiles/aclnt/imaadpcmmono8khz.wav
-../aclnt/TSU_MMF_ACLNT_01/data/Au16Be8khz500hzMono.au	    c:/mm/mmf/testfiles/aclnt/au16be8khz500hzmono.au
-../aclnt/TSU_MMF_ACLNT_01/data/AuStereo8khz500hz.au	    c:/mm/mmf/testfiles/aclnt/austereo8khz500hz.au
-../aclnt/TSU_MMF_ACLNT_01/data/playtest.pnc	    	    c:/mm/mmf/testfiles/aclnt/playtest.pnc
-
-//MMF_ACOD codec unit test source files
-../ACOD/Data/PCM16Source.raw					c:/mm/mmf/testfiles/acod/pcm16source.raw
-../ACOD/Data/PCM16BSource.raw					c:/mm/mmf/testfiles/acod/pcm16bsource.raw
-../ACOD/Data/PCMU16Source.raw					c:/mm/mmf/testfiles/acod/pcmu16source.raw
-../ACOD/Data/PCMU16BSource.raw					c:/mm/mmf/testfiles/acod/pcmu16bsource.raw
-../ACOD/Data/StereoPCM16Source.raw				c:/mm/mmf/testfiles/acod/stereopcm16source.raw
-../ACOD/Data/PCM8Source.raw					c:/mm/mmf/testfiles/acod/pcm8source.raw
-../ACOD/Data/PCMU8Source.raw					c:/mm/mmf/testfiles/acod/pcmu8source.raw
-../ACOD/Data/AlawSource.raw						c:/mm/mmf/testfiles/acod/alawsource.raw
-../ACOD/Data/MulawSource.raw					c:/mm/mmf/testfiles/acod/mulawsource.raw
-../ACOD/Data/AdpcmSource.raw					c:/mm/mmf/testfiles/acod/adpcmsource.raw
-../ACOD/Data/StereoAdpcmSource.raw				c:/mm/mmf/testfiles/acod/stereoadpcmsource.raw
-../ACOD/Data/GSM610Source.raw					c:/mm/mmf/testfiles/acod/gsm610source.raw
-../ACOD/Data/AAAASource.raw						c:/mm/mmf/testfiles/acod/aaaasource.raw
-
-//ACOD codec unit test comparison files
-../ACOD/Data/AlawToPCM16Comparison.raw			c:/mm/mmf/ref/acod/alawtopcm16comparison.raw
-../ACOD/Data/PCM16ToAlawComparison.raw			c:/mm/mmf/ref/acod/pcm16toalawcomparison.raw
-../ACOD/Data/PCM8ToPCM16Comparison.raw			c:/mm/mmf/ref/acod/pcm8topcm16comparison.raw
-../ACOD/Data/PCM16ToPCM8Comparison.raw			c:/mm/mmf/ref/acod/pcm16topcm8comparison.raw
-../ACOD/Data/PCM16ToPCM16BComparison.raw		c:/mm/mmf/ref/acod/pcm16topcm16bcomparison.raw
-../ACOD/Data/PCM16BToPCM16Comparison.raw		c:/mm/mmf/ref/acod/pcm16btopcm16comparison.raw
-../ACOD/Data/PCMU16ToPCMU16BComparison.raw		c:/mm/mmf/ref/acod/pcmu16topcmu16bcomparison.raw
-../ACOD/Data/PCMU16BToPCMU16Comparison.raw		c:/mm/mmf/ref/acod/pcmu16btopcmu16comparison.raw
-../ACOD/Data/PCM16ToPCMU16BComparison.raw		c:/mm/mmf/ref/acod/pcm16topcmu16bcomparison.raw
-../ACOD/Data/PCMU16BToPCM16Comparison.raw		c:/mm/mmf/ref/acod/pcmu16btopcm16comparison.raw
-../ACOD/Data/PCM16ToPCMU16Comparison.raw		c:/mm/mmf/ref/acod/pcm16topcmu16comparison.raw
-../ACOD/Data/PCMU16ToPCM16Comparison.raw		c:/mm/mmf/ref/acod/pcmu16topcm16comparison.raw
-../ACOD/Data/PCM16ToPCMU8Comparison.raw			c:/mm/mmf/ref/acod/pcm16topcmu8comparison.raw
-../ACOD/Data/PCMU8ToPCM16Comparison.raw			c:/mm/mmf/ref/acod/pcmu8topcm16comparison.raw
-../ACOD/Data/AdpcmToPCM16Comparison.raw			c:/mm/mmf/ref/acod/adpcmtopcm16comparison.raw
-../ACOD/Data/PCM16ToAdpcmComparison.raw			c:/mm/mmf/ref/acod/pcm16toadpcmcomparison.raw
-../ACOD/Data/MulawToPCM16Comparison.raw			c:/mm/mmf/ref/acod/mulawtopcm16comparison.raw
-../ACOD/Data/PCM16ToMulawComparison.raw			c:/mm/mmf/ref/acod/pcm16tomulawcomparison.raw
-../ACOD/Data/StereoAdpcmToPCM16Comparison.raw	c:/mm/mmf/ref/acod/stereoadpcmtopcm16comparison.raw
-../ACOD/Data/PCM16ToStereoAdpcmComparison.raw	c:/mm/mmf/ref/acod/pcm16tostereoadpcmcomparison.raw
-../ACOD/Data/GSM610ToPCM16Comparison.raw		c:/mm/mmf/ref/acod/gsm610topcm16comparison.raw
-../ACOD/Data/PCM16ToGSM610Comparison.raw		c:/mm/mmf/ref/acod/pcm16togsm610comparison.raw
-../ACOD/Data/AAAABBBBPrefSuppComparison.raw		c:/mm/mmf/ref/acod/aaaabbbbprefsuppcomparison.raw
-
-//ACTRL ----> audio controller unit test audio files <---------
-../Actrl/data/newmail.wav					c:/mm/mmf/testfiles/actrl/newmail.wav
-../Actrl/data/newmail.au					c:/mm/mmf/testfiles/actrl/newmail.au
-../Actrl/data/Five11khz.au					c:/mm/mmf/testfiles/actrl/five11khz.au
-../Actrl/data/Five.wav					        c:/mm/mmf/testfiles/actrl/five.wav
-../Actrl/data/16bitmPcm.wav					c:/mm/mmf/testfiles/actrl/16bitmpcm.wav
-../Actrl/data/Reference/11KHzADPCMMonoWAVTo8KHzPCM16Mono.raw		c:/mm/mmf/testfiles/actrl/11khzadpcmmonowavto8khzpcm16mono.raw	
-../Actrl/data/Reference/11KHzPCM16MonoRAWTo8KHzGSM610Mono.wav		c:/mm/mmf/testfiles/actrl/11khzpcm16monorawto8khzgsm610mono.wav	
-../Actrl/data/Reference/11KHzPCM16StereoWAVTo8KHzMuLAWMono.wav		c:/mm/mmf/testfiles/actrl/11khzpcm16stereowavto8khzmulawmono.wav	
-../Actrl/data/Reference/22KHzALAWMonoWAVTo8KHzPCM16Mono.wav			c:/mm/mmf/testfiles/actrl/22khzalawmonowavto8khzpcm16mono.wav		
-../Actrl/data/Reference/22KHzALAWStereoRAWTo11KHzPCM16Mono.raw		c:/mm/mmf/testfiles/actrl/22khzalawstereorawto11khzpcm16mono.raw	
-../Actrl/data/Reference/22KHzPCM16MonoAUTo8KhzPCM16Mono.wav			c:/mm/mmf/testfiles/actrl/22khzpcm16monoauto8khzpcm16mono.wav		
-../Actrl/data/Reference/22KHzPCM8MonoWAVTo11KHzPCM16Stereo.wav		c:/mm/mmf/testfiles/actrl/22khzpcm8monowavto11khzpcm16stereo.wav	
-../Actrl/data/Reference/44KHzPCM16StereoAUTo22KHzPCM16Mono.raw		c:/mm/mmf/testfiles/actrl/44khzpcm16stereoauto22khzpcm16mono.raw	
-../Actrl/data/Reference/44KHzPCM16StereoRAWTo8KHzPCM16Stereo.au		c:/mm/mmf/testfiles/actrl/44khzpcm16stereorawto8khzpcm16stereo.au	
-../Actrl/data/Reference/44KHzPCM16StereoWAVTo8KHzPCM16Mono.au		c:/mm/mmf/testfiles/actrl/44khzpcm16stereowavto8khzpcm16mono.au	
-../Actrl/data/Reference/8KHzGSM610MonoRAWTo8KHzPCM16Mono.wav		c:/mm/mmf/testfiles/actrl/8khzgsm610monorawto8khzpcm16mono.wav	
-../Actrl/data/Reference/8KHzPCM16MonoAUTo8KHzPCM16Mono.au			c:/mm/mmf/testfiles/actrl/8khzpcm16monoauto8khzpcm16mono.au		
-../Actrl/data/Reference/8KHzPCM16StereoWAVTo8KHzGSM610Mono.wav		c:/mm/mmf/testfiles/actrl/8khzpcm16stereowavto8khzgsm610mono.wav	
-../Actrl/data/Reference/11KHzPCMU8MonoAUTo8KHzPCM16Mono.wav		c:/mm/mmf/testfiles/actrl/11khzpcmu8monoauto8khzpcm16mono.wav
-../Actrl/data/Reference/11KHzPCM16StereoWAVTo11KHzADPCMMono.wav 	c:/mm/mmf/testfiles/actrl/11khzpcm16stereowavto11khzadpcmmono.wav
-../Actrl/data/Reference/11KHzPCM16StereoWAVTo11KHzADPCMMono.raw 	c:/mm/mmf/testfiles/actrl/11khzpcm16stereowavto11khzadpcmmono.raw
-../Actrl/data/Reference/NoReferenceFile					c:/mm/mmf/testfiles/actrl/noreferencefile							
-../Actrl/data/11KHzADPCMMono1KHzTone.wav			c:/mm/mmf/testfiles/actrl/11khzadpcmmono1khztone.wav	
-../Actrl/data/11KHzPCM16Mono1KHzTone.raw			c:/mm/mmf/testfiles/actrl/11khzpcm16mono1khztone.raw	
-../Actrl/data/11KHzPCM16Stereo1KHzTone.wav			c:/mm/mmf/testfiles/actrl/11khzpcm16stereo1khztone.wav	
-../Actrl/data/22KHzALawMono1KHzTone.wav				c:/mm/mmf/testfiles/actrl/22khzalawmono1khztone.wav		
-../Actrl/data/22KHzALAWStereo1KHzTone.raw			c:/mm/mmf/testfiles/actrl/22khzalawstereo1khztone.raw	
-../Actrl/data/22KHzPCM16Mono1KHzTone.au				c:/mm/mmf/testfiles/actrl/22khzpcm16mono1khztone.au		
-../Actrl/data/22KHzPCM16Stereo1KHzTone.wav			c:/mm/mmf/testfiles/actrl/22khzpcm16stereo1khztone.wav	
-../Actrl/data/22KHzPCM8Mono1KHzTone.wav				c:/mm/mmf/testfiles/actrl/22khzpcm8mono1khztone.wav		
-../Actrl/data/44KHzPCM16Stereo1KHzTone.au			c:/mm/mmf/testfiles/actrl/44khzpcm16stereo1khztone.au	
-../Actrl/data/44KHzPCM16Stereo1KHzTone.raw			c:/mm/mmf/testfiles/actrl/44khzpcm16stereo1khztone.raw	
-../Actrl/data/44KHzPCM16Stereo1KHzTone.wav			c:/mm/mmf/testfiles/actrl/44khzpcm16stereo1khztone.wav	
-../Actrl/data/8KHzGSM610Mono1KHzTone.raw			c:/mm/mmf/testfiles/actrl/8khzgsm610mono1khztone.raw	
-../Actrl/data/8KHzGSM610Mono1KHzTone.wav			c:/mm/mmf/testfiles/actrl/8khzgsm610mono1khztone.wav	
-../Actrl/data/8KHzPCM16Mono1KHzTone.au				c:/mm/mmf/testfiles/actrl/8khzpcm16mono1khztone.au		
-../Actrl/data/8KHzPCM16Stereo1KHzTone.wav			c:/mm/mmf/testfiles/actrl/8khzpcm16stereo1khztone.wav	
-../Actrl/data/mainTst.wav					c:/mm/mmf/testfiles/actrl/maintst.wav
-
-// added for ramp volume test
-../Actrl/data/RampVolume.wav					c:/mm/mmf/testfiles/actrl/rampvolume.wav	
-
-#ifdef SYMBIAN_MMF_MODEL_CONTROLLERS
-//OggCtrl test files
-../oggctrl/data/6Sec48KHz224KbsStereo.ogg c:/mm/mmf/testfiles/oggctrl/6sec48khz224kbsstereo.ogg
-../oggctrl/data/6sec32khz120kbsstereo.ogg c:/mm/mmf/testfiles/oggctrl/6sec32khz120kbsstereo.ogg
-../oggctrl/data/6sec44khz128kbsstereo.ogg c:/mm/mmf/testfiles/oggctrl/6sec44khz128kbsstereo.ogg
-../oggctrl/data/invalid.ogg c:/mm/mmf/testfiles/oggctrl/invalid.ogg
-#endif
-
-#ifdef SYMBIAN_USE_MMF_RUF_RECOGNIZER
-// Unsupported formats recogniser
-../Recogniser/Data/valid_Budweiser_Streaker.divx	c:/recog/valid_budweiser_streaker.divx
-../Recogniser/Data/valid_MPEG2.mpg					c:/recog/valid_mpeg2.mpg
-../Recogniser/Data/MPEG2WidWrngExt.wxt				c:/recog/mpeg2widwrngext.wxt
-../Recogniser/Data/valid_angry_bone.3gp				c:/recog/valid_angry_bone.3gp
-../Recogniser/Data/valid_casadual.ra				c:/recog/valid_casadual.ra
-../Recogniser/Data/Corrupt.rmf						c:/recog/corrupt.rmf
-../Recogniser/Data/valid_eyck1.snd					c:/recog/valid_eyck1.snd
-../Recogniser/Data/valid_greenday.amr				c:/recog/valid_greenday.amr
-../Recogniser/Data/valid_realaudio.ram				c:/recog/valid_realaudio.ram
-../Recogniser/Data/RMFWidWrngExt.wxt				c:/recog/rmfwidwrngext.wxt
-../Recogniser/Data/valid_rondobasi.mld				c:/recog/valid_rondobasi.mld
-../Recogniser/Data/valid_rondobasi.mmf				c:/recog/valid_rondobasi.mmf
-../Recogniser/Data/valid_ModernPiano.rmf			c:/recog/valid_modernpiano.rmf
-../Recogniser/Data/valid_ModernPiano.MID			c:/recog/valid_modernpiano.mid
-../Recogniser/Data/valid_mewmew.mkv					c:/recog/valid_mewmew.mkv
-../Recogniser/Data/3gpWidWrngExt.wxt				c:/recog/3gpwidwrngext.wxt
-../Recogniser/Data/corrupt_vid.3gp					c:/recog/corrupt_vid.3gp
-../Recogniser/Data/valid_chand_sifarish.aiff		c:/recog/valid_chand_sifarish.aiff
-../Recogniser/Data/AIFFWidWrngExt.wxt				c:/recog/aiffwidwrngext.wxt
-../Recogniser/Data/Corrupt.aiff						c:/recog/corrupt.aiff
-../Recogniser/Data/AMRWidWrngExt.wxt				c:/recog/amrwidwrngext.wxt
-../Recogniser/Data/corrupt.amr						c:/recog/corrupt.amr
-../Recogniser/Data/valid_flinstones.awb				c:/recog/valid_flinstones.awb
-../Recogniser/Data/AWBWidWrngExt.wxt				c:/recog/awbwidwrngext.wxt
-../Recogniser/Data/Corrupt.awb						c:/recog/corrupt.awb
-../Recogniser/Data/valid_chand_sifarish.au			c:/recog/valid_chand_sifarish.au
-../Recogniser/Data/AUWAVWidWrngExt.wxt				c:/recog/auwavwidwrngext.wxt
-../Recogniser/Data/Corrupt.au						c:/recog/corrupt.au
-../Recogniser/Data/DivxWidWrngExt.wxt				c:/recog/divxwidwrngext.wxt
-../Recogniser/Data/corrupt.divx						c:/recog/corrupt.divx
-../Recogniser/Data/valid_ESSSWT1M.DLS				c:/recog/valid_essswt1m.dls
-../Recogniser/Data/DLSWidWrngExt.wxt				c:/recog/dlswidwrngext.wxt
-../Recogniser/Data/Corrupt.DLS						c:/recog/corrupt.dls
-../Recogniser/Data/valid_chand_sifarish.flac		c:/recog/valid_chand_sifarish.flac
-../Recogniser/Data/FLACWidWrngExt.wxt				c:/recog/flacwidwrngext.wxt
-../Recogniser/Data/Corrupt.flac						c:/recog/corrupt.flac
-../Recogniser/Data/GSMWidWrngExt.wxt				c:/recog/gsmwidwrngext.wxt
-../Recogniser/Data/Corrupt.gsm						c:/recog/corrupt.gsm
-../Recogniser/Data/valid_baby.m3u					c:/recog/valid_baby.m3u
-../Recogniser/Data/M3UWidWrngExt.wxt				c:/recog/m3uwidwrngext.wxt
-../Recogniser/Data/Corrupt.m3u						c:/recog/corrupt.m3u
-../Recogniser/Data/valid_audio_only.m4a				c:/recog/valid_audio_only.m4a
-../Recogniser/Data/M4aWidWrngExt.wxt				c:/recog/m4awidwrngext.wxt
-../Recogniser/Data/corrupt_aud.m4a					c:/recog/corrupt_aud.m4a
-../Recogniser/Data/MIDIWidWrngExt.wxt				c:/recog/midiwidwrngext.wxt
-../Recogniser/Data/corrupt.mid						c:/recog/corrupt.mid
-../Recogniser/Data/MldWidWrngExt.wxt				c:/recog/mldwidwrngext.wxt
-../Recogniser/Data/corrupt.mld						c:/recog/corrupt.mld
-../Recogniser/Data/MMFWidWrngExt.wxt				c:/recog/mmfwidwrngext.wxt
-../Recogniser/Data/corrupt.mmf						c:/recog/corrupt.mmf
-../Recogniser/Data/valid_muse_aud_mp4.mp4			c:/recog/valid_muse_aud_mp4.mp4
-../Recogniser/Data/AUDMP4WidWrngExt.wxt				c:/recog/audmp4widwrngext.wxt
-../Recogniser/Data/Corrupt_AUD_MP4.mp4				c:/recog/corrupt_aud_mp4.mp4
-../Recogniser/Data/valid_Streetwise.mxmf			c:/recog/valid_streetwise.mxmf
-../Recogniser/Data/MXMFWidWrngExt.wxt				c:/recog/mxmfwidwrngext.wxt
-../Recogniser/Data/Corrupt.mxmf						c:/recog/corrupt.mxmf
-../Recogniser/Data/valid_small.ogg					c:/recog/valid_small.ogg
-../Recogniser/Data/OGGWidWrngExt.wxt				c:/recog/oggwidwrngext.wxt
-../Recogniser/Data/corrupt.ogg						c:/recog/corrupt.ogg
-../Recogniser/Data/RAMWidWrngExt.wxt				c:/recog/ramwidwrngext.wxt
-../Recogniser/Data/Corrupt.ram						c:/recog/corrupt.ram
-../Recogniser/Data/valid_SMF_pb.smf					c:/recog/valid_smf_pb.smf
-../Recogniser/Data/SMFWidWrngExt.wxt				c:/recog/smfwidwrngext.wxt
-../Recogniser/Data/Corrupt_SMF.smf					c:/recog/corrupt_smf.smf
-../Recogniser/Data/SNDWidWrngExt.wxt				c:/recog/sndwidwrngext.wxt
-../Recogniser/Data/Corrupt.snd						c:/recog/corrupt.snd
-../Recogniser/Data/valid_chand_sifarish.wav			c:/recog/valid_chand_sifarish.wav
-../Recogniser/Data/AUDWAVWidWrngExt.wxt				c:/recog/audwavwidwrngext.wxt
-../Recogniser/Data/Corrupt.wav						c:/recog/corrupt.wav
-../Recogniser/Data/valid_Be_With_You.wma			c:/recog/valid_be_with_you.wma
-../Recogniser/Data/WMAWidWrngExt.wxt				c:/recog/wmawidwrngext.wxt
-../Recogniser/Data/Corrupt.wma						c:/recog/corrupt.wma
-../Recogniser/Data/valid_Apertura.mp4				c:/recog/valid_apertura.mp4
-../Recogniser/Data/VIDMP4WidWrngExt.wxt				c:/recog/vidmp4widwrngext.wxt
-../Recogniser/Data/Corrupt_vid.mp4					c:/recog/corrupt_vid.mp4
-../Recogniser/Data/Corrupt_Mpeg2.mpg				c:/recog/corrupt_mpeg2.mpg
-../Recogniser/Data/valid_Goodneighbour.wmv			c:/recog/valid_goodneighbour.wmv
-../Recogniser/Data/WMVWidWrngExt.wxt				c:/recog/wmvwidwrngext.wxt
-../Recogniser/Data/Corrupt.wmv						c:/recog/corrupt.wmv
-../Recogniser/Data/valid_Aud_sample.3gp				c:/recog/valid_aud_sample.3gp
-../Recogniser/Data/A3gpWidWrngExt.wxt				c:/recog/a3gpwidwrngext.wxt
-../Recogniser/Data/corrupt_aud.3gp					c:/recog/corrupt_aud.3gp
-../Recogniser/Data/valid_sample.aac					c:/recog/valid_sample.aac
-../Recogniser/Data/AACWidWrngExt.wxt				c:/recog/aacwidwrngext.wxt
-../Recogniser/Data/corrupt.aac						c:/recog/corrupt.aac
-../Recogniser/Data/valid_test.mp3					c:/recog/valid_test.mp3
-../Recogniser/Data/MP3WidWrngExt.wxt				c:/recog/mp3widwrngext.wxt
-../Recogniser/Data/corrupt.mp3						c:/recog/corrupt.mp3
-../Recogniser/Data/MKVWidWrngExt.wxt				c:/recog/mkvwidwrngext.wxt
-../Recogniser/Data/Corrupt.mkv						c:/recog/corrupt.mkv
-../Recogniser/Data/ASFWidWrngExt.wxt				c:/recog/asfwidwrngext.wxt
-../Recogniser/Data/Corrupt.asf						c:/recog/corrupt.asf
-../Recogniser/Data/corrupt.wxt						c:/recog/corrupt.wxt
-../Recogniser/Data/valid_3gpWidOutExt				c:/recog/valid_3gpwidoutext
-../Recogniser/Data/valid_MP3WidOutExt				c:/recog/valid_mp3widoutext
-../Recogniser/Data/valid_CrptOGGWidOutExt			c:/recog/valid_crptoggwidoutext
-../Recogniser/Data/valid_chand_sifarish.rm			c:/recog/valid_chand_sifarish.rm
-../Recogniser/Data/RMWidWrngExt.wxt					c:/recog/rmwidwrngext.wxt
-../Recogniser/Data/Corrupt.rm						c:/recog/corrupt.rm
-../Recogniser/Data/RAWidWrngExt.wxt					c:/recog/rawidwrngext.wxt
-../Recogniser/Data/corrupt.ra						c:/recog/corrupt.ra
-../Recogniser/Data/valid_niceday.asf				c:/recog/valid_niceday.asf
-../Recogniser/Data/valid_aacid3.aac					c:/recog/valid_aacid3.aac
-../Recogniser/Data/valid_rmvideo.rm					c:/recog/valid_rmvideo.rm
-../Recogniser/Data/valid_80X140.RM					c:/recog/valid_80x140.rm
-../Recogniser/Data/valid_sdp1.sdp					c:/recog/valid_sdp1.sdp
-../Recogniser/Data/valid_sdp2.sdp					c:/recog/valid_sdp2.sdp
-../Recogniser/Data/valid_sdp3.SDP					c:/recog/valid_sdp3.sdp
-../Recogniser/Data/valid_sdp4.sdp					c:/recog/valid_sdp4.sdp
-../Recogniser/Data/valid_sdp5.sdp					c:/recog/valid_sdp5.sdp
-../Recogniser/Data/valid_sdp6.sdp					c:/recog/valid_sdp6.sdp
-../Recogniser/Data/valid_sdp7.sdp					c:/recog/valid_sdp7.sdp
-../Recogniser/Data/valid_sdp8.sdp					c:/recog/valid_sdp8.sdp
-../Recogniser/Data/Valid_3GPP2.3g2					c:/recog/valid_3gpp2.3g2
-../Recogniser/Data/Valid_3GPP2.wxt					c:/recog/valid_3gpp2.wxt
-../Recogniser/Data/Corrupt_3GPP2.3g2				c:/recog/corrupt_3gpp2.3g2
-../Recogniser/Data/Valid_3GPP2_BadBrand.3g2			c:/recog/valid_3gpp2_badbrand.3g2
-../Recogniser/Data/valid_unicode.txt				c:/recog/valid_unicode.txt
-
-../Recogniser/Data/common/_lmnand_miniboot.bin			c:/recog/common/_lmnand_miniboot.bin
-../Recogniser/Data/common/HATCSS.msi					c:/recog/common/hatcss.msi
-../Recogniser/Data/common/Image.JPG					 	c:/recog/common/image.jpg
-../Recogniser/Data/common/pdf.pdf						c:/recog/common/pdf.pdf
-../Recogniser/Data/common/readme.rtf					c:/recog/common/readme.rtf
-../Recogniser/Data/common/whois.exe						c:/recog/common/whois.exe
-../Recogniser/Data/common/3.ebm							c:/recog/common/3.ebm
-../Recogniser/Data/common/4.notebm						c:/recog/common/4.notebm
-../Recogniser/Data/common/a.dtd							c:/recog/common/a.dtd
-../Recogniser/Data/common/a.wbxml						c:/recog/common/a.wbxml
-../Recogniser/Data/common/a.wml							c:/recog/common/a.wml	
-../Recogniser/Data/common/a.wmlc						c:/recog/common/a.wmlc
-../Recogniser/Data/common/a.wmls						c:/recog/common/a.wmls
-../Recogniser/Data/common/a.wmlsc						c:/recog/common/a.wmlsc
-../Recogniser/Data/common/agenda						c:/recog/common/agenda
-../Recogniser/Data/common/agenda-emb					c:/recog/common/agenda-emb
-../Recogniser/Data/common/badcert.cer					c:/recog/common/badcert.cer
-../Recogniser/Data/common/Base64.VCF					c:/recog/common/base64.vcf
-../Recogniser/Data/common/Begin3.VCS					c:/recog/common/begin3.vcs
-../Recogniser/Data/common/CALLMANAGER.APP				c:/recog/common/callmanager.app
-../Recogniser/Data/common/copyfile.txt					c:/recog/common/copyfile.txt
-../Recogniser/Data/common/dsaprivate1.key				c:/recog/common/dsaprivate1.key
-../Recogniser/Data/common/FullVersionTest.jad			c:/recog/common/fullversiontest.jad
-../Recogniser/Data/common/FullVersionTest.jar			c:/recog/common/fullversiontest.jar
-../Recogniser/Data/common/InstTest.jad					c:/recog/common/insttest.jad	
-../Recogniser/Data/common/legacy.sis					c:/recog/common/legacy.sis
-../Recogniser/Data/common/roudedkeybag.der				c:/recog/common/roudedkeybag.der
-../Recogniser/Data/common/pkcs12.p12					c:/recog/common/pkcs12.p12
-../Recogniser/Data/common/sample1.html					c:/recog/common/sample1.html
-../Recogniser/Data/common/sample2.htm					c:/recog/common/sample2.htm
-../Recogniser/Data/common/sample3.xhtml					c:/recog/common/sample3.xhtml
-../Recogniser/Data/common/sample4.xml					c:/recog/common/sample4.xml
-../Recogniser/Data/common/symbian_key.pk8				c:/recog/common/symbian_key.pk8
-../Recogniser/Data/common/tcaf.ini						c:/recog/common/tcaf.ini
-../Recogniser/Data/common/test.drm						c:/recog/common/test.drm
-../Recogniser/Data/common/test.drm.bin					c:/recog/common/test.drm.bin
-../Recogniser/Data/common/testdoc.tsym					c:/recog/common/testdoc.tsym
-#endif
-
-
-//AFMT test files
-../AFMT/Data/adpcm16mono8khz.Raw			c:/mm/mmf/testfiles/afmt/adpcm16mono8khz.raw
-../AFMT/Data/adpcm16mono8khz.wav			c:/mm/mmf/testfiles/afmt/adpcm16mono8khz.wav
-../AFMT/Data/adpcm16mono8khzcompare.raw		c:/mm/mmf/testfiles/afmt/adpcm16mono8khzcompare.raw
-../AFMT/Data/adpcm16mono8khzCompare.wav		c:/mm/mmf/testfiles/afmt/adpcm16mono8khzcompare.wav
-../AFMT/Data/adpcm16stereo8khz.raw			c:/mm/mmf/testfiles/afmt/adpcm16stereo8khz.raw
-../AFMT/Data/adpcm16stereo8khz.wav			c:/mm/mmf/testfiles/afmt/adpcm16stereo8khz.wav
-../AFMT/Data/adpcm16stereo8khzCompare.raw	c:/mm/mmf/testfiles/afmt/adpcm16stereo8khzcompare.raw
-../AFMT/Data/adpcm16stereo8khzCompare.wav	c:/mm/mmf/testfiles/afmt/adpcm16stereo8khzcompare.wav
-../AFMT/Data/gsmMono8khz.raw				c:/mm/mmf/testfiles/afmt/gsmmono8khz.raw
-../AFMT/Data/gsmMono8khz.wav				c:/mm/mmf/testfiles/afmt/gsmmono8khz.wav
-../AFMT/Data/gsmMono8khzCompare.raw			c:/mm/mmf/testfiles/afmt/gsmmono8khzcompare.raw
-../AFMT/Data/gsmMono8khzCompare.wav			c:/mm/mmf/testfiles/afmt/gsmmono8khzcompare.wav
-../AFMT/Data/mulaw8mono44khz.au				c:/mm/mmf/testfiles/afmt/mulaw8mono44khz.au
-../AFMT/Data/pcm16mono22khz.au				c:/mm/mmf/testfiles/afmt/pcm16mono22khz.au
-../AFMT/Data/pcm16mono22khz.raw				c:/mm/mmf/testfiles/afmt/pcm16mono22khz.raw
-../AFMT/Data/pcm16mono22khz.wav				c:/mm/mmf/testfiles/afmt/pcm16mono22khz.wav
-../AFMT/Data/pcm16mono8khz.au				c:/mm/mmf/testfiles/afmt/pcm16mono8khz.au
-../AFMT/Data/pcm16mono8khz.raw				c:/mm/mmf/testfiles/afmt/pcm16mono8khz.raw
-../AFMT/Data/pcm16mono8khz.wav				c:/mm/mmf/testfiles/afmt/pcm16mono8khz.wav
-../AFMT/Data/pcm16stereo8khz.au				c:/mm/mmf/testfiles/afmt/pcm16stereo8khz.au
-../AFMT/Data/pcm16stereo8khz.raw			c:/mm/mmf/testfiles/afmt/pcm16stereo8khz.raw
-../AFMT/Data/pcm16stereo8khz.wav			c:/mm/mmf/testfiles/afmt/pcm16stereo8khz.wav
-../AFMT/Data/pcm16stereo8khzCompare.au		c:/mm/mmf/testfiles/afmt/pcm16stereo8khzcompare.au
-../AFMT/Data/pcm16stereo8khzCompare.raw		c:/mm/mmf/testfiles/afmt/pcm16stereo8khzcompare.raw
-../AFMT/Data/pcm16stereo8khzCompare.wav		c:/mm/mmf/testfiles/afmt/pcm16stereo8khzcompare.wav
-../AFMT/Data/pcm8mono11khz.au				c:/mm/mmf/testfiles/afmt/pcm8mono11khz.au
-../AFMT/Data/pcm8mono11khz.raw				c:/mm/mmf/testfiles/afmt/pcm8mono11khz.raw
-../AFMT/Data/pcm8mono11khz.wav				c:/mm/mmf/testfiles/afmt/pcm8mono11khz.wav
-../AFMT/Data/pcm8mono44khz.au				c:/mm/mmf/testfiles/afmt/pcm8mono44khz.au
-../AFMT/Data/pcm8mono44khz.raw				c:/mm/mmf/testfiles/afmt/pcm8mono44khz.raw
-../AFMT/Data/pcm8mono44khz.wav				c:/mm/mmf/testfiles/afmt/pcm8mono44khz.wav
-../AFMT/Data/pcm4mono11khz.wav				c:/mm/mmf/testfiles/afmt/pcm4mono11khz.wav
-
-// DEVSOUND data files
-../DevSoundTest/TestFiles/PCM_08_16_m.raw		c:/tsu_mmf_devsound_suite/input/pcm_08_16_m.raw
-../DevSoundTest/TestFiles/PCM_08_08_m.raw		c:/tsu_mmf_devsound_suite/input/pcm_08_08_m.raw
-../DevSoundTest/TestFiles/garbage.raw			c:/tsu_mmf_devsound_suite/input/garbage.raw
-../DevSoundTest/TestFiles/PCMU8Source.raw		c:/tsu_mmf_devsound_suite/input/pcmu8source.raw
-../DevSoundTest/TestFiles/PCM_08_16_s.raw		c:/tsu_mmf_devsound_suite/input/pcm_08_16_s.raw
-../DevSoundTest/TestFiles/PCM_16_16_m.raw		c:/tsu_mmf_devsound_suite/input/pcm_16_16_m.raw
-
-// SRSSNK data files
-../srssnk/data/MMFTestFile1.dat				c:/mm/mmf/testfiles/srssnk/mmftestfile1.dat
-../srssnk/data/MMFTestFile2.dat				c:/mm/mmf/testfiles/srssnk/mmftestfile2.dat
-../srssnk/data/MMFTestFile3.dat				c:/mm/mmf/testfiles/srssnk/mmftestfile3.dat
-../srssnk/data/MMFTestFile1.wav				c:/mm/mmf/testfiles/srssnk/mmftestfile1.wav
-../srssnk/data/MMFTestFile2.wav				c:/mm/mmf/testfiles/srssnk/mmftestfile2.wav
-
-//
-// SWCodecDevices data files
-// These files are part of an appendix of the ETSI gsm610 standard
-// inp is an put file, cod the coded output and out the decoded result
-//
-../SwCodecDevices/Data/Seq01.inp			c:/mm/mmf/testfiles/swcodecdevices/seq01.inp
-../SwCodecDevices/Data/Seq01.cod			c:/mm/mmf/testfiles/swcodecdevices/seq01.cod
-../SwCodecDevices/Data/Seq01.out			c:/mm/mmf/testfiles/swcodecdevices/seq01.out
-//SwCodecDevices sound files
-../SwCodecDevices/Data/ALawMono8khz400hzTone.wav	c:/mm/mmf/testfiles/swcodecdevices/alawmono8khz400hztone.wav
-../SwCodecDevices/Data/Imaad4BitMono8Khz400hzTone.wav	c:/mm/mmf/testfiles/swcodecdevices/imaad4bitmono8khz400hztone.wav
-../SwCodecDevices/Data/MuLawMono8khz400hzTone.wav	c:/mm/mmf/testfiles/swcodecdevices/mulawmono8khz400hztone.wav
-../SwCodecDevices/Data/Pcm16BMono8khz400hzTone.au	c:/mm/mmf/testfiles/swcodecdevices/pcm16bmono8khz400hztone.au
-../SwCodecDevices/Data/Pcm16FromALawMono8khz400hzTone.wav	c:/mm/mmf/testfiles/swcodecdevices/pcm16fromalawmono8khz400hztone.wav
-../SwCodecDevices/Data/Pcm16FromMuLawMono8khz400hzTone.wav	c:/mm/mmf/testfiles/swcodecdevices/pcm16frommulawmono8khz400hztone.wav
-../SwCodecDevices/Data/Pcm16Mono8khz400hzTone.wav	c:/mm/mmf/testfiles/swcodecdevices/pcm16mono8khz400hztone.wav
-../SwCodecDevices/Data/Pcm16Stereo8khz400hzTone.wav	c:/mm/mmf/testfiles/swcodecdevices/pcm16stereo8khz400hztone.wav
-../SwCodecDevices/Data/PcmU8Mono8khz400hzTone.wav	c:/mm/mmf/testfiles/swcodecdevices/pcmu8mono8khz400hztone.wav
-../SwCodecDevices/Data/PcmU8Stereo8khz400hzTone.wav	c:/mm/mmf/testfiles/swcodecdevices/pcmu8stereo8khz400hztone.wav
-
-//SWCDWRAP data files
-../swcdwrap/Data/TSU_MMF_SWCDWRAPpcm16_8m.raw		c:/mm/mmf/testfiles/swcdwrap/tsu_mmf_swcdwrappcm16_8m.raw
-../swcdwrap/Data/TSU_MMF_SWCDWRAPpcm16_16s.raw		c:/mm/mmf/testfiles/swcdwrap/tsu_mmf_swcdwrappcm16_16s.raw
-
-//MIDI
-//../scripts/TSU_MMF_MCLNT_01.script		c:/mm/TSU_MMF_MCLNT_01.script
-//../MCLNT/TSU_MMF_MCLNT_01/Data/midi.mid		c:/mm/mmf/testfiles/mclnt/midi.mid
-../scripts/TSU_MMF_MIDICLNT_00.script		c:/mm/tsu_mmf_midiclnt_00.script
-../scripts/TSU_MMF_MIDICLNT_00_Alloc.script	c:/mm/tsu_mmf_midiclnt_00_alloc.script
-../scripts/TSU_MMF_MIDICLNT_RF.script		c:/mm/tsu_mmf_midiclnt_rf.script
-../scripts/TSU_MMF_MIDICLNT_RF_Alloc.script	c:/mm/tsu_mmf_midiclnt_rf_alloc.script
-../scripts/midi.ini				c:/mm/midi.ini
-
-// MIDI test files
-../MidiClnt/data/midi.mid			c:/midiclntitestdata/midi.mid
-../MidiClnt/data/textmidi.mid			c:/midiclntitestdata/textmidi.mid
-// SYMBIAN_CAF_V2
-../MidiClnt/data/Midi.contentrights		c:/midiclntitestdata/midi.contentrights
-../MidiClnt/data/Midi.content			c:/midiclntitestdata/midi.content
-
-#ifdef SYMBIAN_MMF_MODEL_CONTROLLERS
-//.avi controller test files
-../avictrl/data/video_only.avi				c:/mm/mmf/testfiles/avictrl/video_only.avi
-../avictrl/data/aud_vid.avi				c:/mm/mmf/testfiles/avictrl/aud_vid.avi
-../avictrl/data/invalid.avi				c:/mm/mmf/testfiles/avictrl/invalid.avi
-//#ifndef SYMBIAN_MMF_NO_COPYRIGHTED_FILES
-// We should put this file in a seperate copyrighted files directory
-// Also the files storage place need to be put in a seperate branch of its own.
-../avictrl/data/low_mem_vdo_test.avi c:/mm/mmf/testfiles/avictrl/low_mem_vdo_test.avi
-//#endif
-../avictrl/data/aud_vid_vprp.avi			c:/mm/mmf/testfiles/avictrl/aud_vid_vprp.avi
-#ifdef SYMBIAN_MULTIMEDIA_SUBTITLE_SUPPORT
-../avictrl/data/srt_available.avi c:/mm/mmf/testfiles/avictrl/srt_available.avi
-../avictrl/data/srt_available.srt c:/mm/mmf/testfiles/avictrl/srt_available.srt
-#endif //SYMBIAN_MULTIMEDIA_SUBTITLE_SUPPORT
-#endif //SYMBIAN_MMF_MODEL_CONTROLLERS
-
-// TruePause DevSound Test data
-../DevSoundTest/data/cerrodelasilla.raw						c:/mm/mmf/testfiles/truepause_devsound_test_data/cerrodelasilla.raw
-../DevSoundTest/data/testing123.raw						c:/mm/mmf/testfiles/truepause_devsound_test_data/testing123.raw
-../DevSoundTest/data/sample.aud							c:/mm/mmf/testfiles/truepause_devsound_test_data/sample.aud
-../DevSoundTest/data/recordC.raw						c:/mm/mmf/testfiles/truepause_devsound_test_data/recordc.raw
-../DevSoundTest/data/maintst3.ogg						c:/mm/mmf/testfiles/truepause_devsound_test_data/maintst3.ogg
-../DevSoundTest/data/record_1.raw						c:/mm/mmf/testfiles/truepause_devsound_test_data/record_1.raw
-../DevSoundTest/data/record_2.raw						c:/mm/mmf/testfiles/truepause_devsound_test_data/record_2.raw
-../DevSoundTest/data/record_3.ogg						c:/mm/mmf/testfiles/truepause_devsound_test_data/record_3.ogg
-../DevSoundTest/data/record_4.raw						c:/mm/mmf/testfiles/truepause_devsound_test_data/record_4.raw
-../DevSoundTest/data/record_5.raw						c:/mm/mmf/testfiles/truepause_devsound_test_data/record_5.raw
-
-//iby files
-../group/TSU_MMF_ACLNT.iby		/epoc32/rom/include/tsu_mmf_aclnt.iby
-../group/TSU_MMF_ACOD.iby		/epoc32/rom/include/tsu_mmf_acod.iby
-../group/TSU_MMF_SWCODECDEVICES.iby	/epoc32/rom/include/tsu_mmf_swcodecdevices.iby
-../group/TSU_MMF_AFMT.iby		/epoc32/rom/include/tsu_mmf_afmt.iby
-../group/TSU_MMF_BASECL.iby		/epoc32/rom/include/tsu_mmf_basecl.iby
-../group/TSU_MMF_CTLFRM.iby		/epoc32/rom/include/tsu_mmf_ctlfrm.iby
-../group/TSU_MMF_SRSSNK.iby		/epoc32/rom/include/tsu_mmf_srssnk.iby
-../group/TSU_MMF_VCLNT.iby		/epoc32/rom/include/tsu_mmf_vclnt.iby
-../group/TSU_MMFMIDICLNT.iby		/epoc32/rom/include/tsu_mmfmidiclnt.iby
-../group/TSU_MMF_DEVSOUND_SUITE.iby	/epoc32/rom/include/tsu_mmf_devsound_suite.iby
-../group/TSU_MMF_SWCDWRAP.iby		/epoc32/rom/include/tsu_mmf_swcdwrap.iby
-
-//DRMPlugin Server unit test exports
-../SecureDRM/tsu_mmf_drmplugin_alloc.script		c:/tsu_mmf_drmplugin_alloc.script
-../SecureDRM/tsu_mmf_drmplugin_alloc.ini		c:/tsu_mmf_drmplugin_alloc.ini
-../SecureDRM/data/small.wav			c:/securedrm/small.wav
-
-#include "../GEF/group/GEF.INF"
-
-#ifdef SYMBIAN_MULTIMEDIA_SUBTITLE_SUPPORT 
-// Subtitles
-PRJ_EXPORTS
-// Subtitle client test script
-../subtitlegraphic/scripts/tsu_mmf_subtitlegraphic.script  c:/mm/tsu_mmf_subtitlegraphic.script 
-../subtitlegraphic/testdata/subtitletestdata.png c:/mm/mmf/testfiles/subtitlegraphic/subtitletestdata.png
-../subtitlegraphic/testdata/subtitletestdata2.png c:/mm/mmf/testfiles/subtitlegraphic/subtitletestdata2.png
-../subtitlegraphic/testdata/subtitletestdata3.png c:/mm/mmf/testfiles/subtitlegraphic/subtitletestdata3.png
-../subtitlegraphic/inc/tsu_mmf_subtitlegraphic.iby /epoc32/rom/include/tsu_mmf_subtitlegraphic.iby
-
-// DevSubtitle Unit test components
-../devsubtitle/scripts/tsu_mmf_devsubtitle_panic.script c:/mm/tsu_mmf_devsubtitle_panic.script
-../devsubtitle/scripts/tsu_mmf_devsubtitle.script c:/mm/tsu_mmf_devsubtitle.script
-../devsubtitle/testdata/devsubtitle.srt c:/mm/mmf/testfiles/devsubtitle/devsubtitle.srt
-../devsubtitle/testdata/subtitletestdata.png c:/mm/mmf/testfiles/devsubtitle/subtitletestdata.png
-../devsubtitle/testdata/subtitletestdata2.png c:/mm/mmf/testfiles/devsubtitle/subtitletestdata2.png
-../devsubtitle/inc/tsu_mmf_devsubtitle.iby /epoc32/rom/include/tsu_mmf_devsubtitle.iby
-
-PRJ_MMPFILES
-../MmpFiles/tsu_mmf_subtitlegraphic.mmp 
-../MmpFiles/tsu_mmf_devsubtitle.mmp
-// SRT decoder
-#include "../srtdecoder/group/bld.inf"
-#endif
-
--- a/mmlibs/mmfw/tsrc/mmfunittest/group/TSU_MMF_ACOD.bat	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-rem Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
-rem All rights reserved.
-rem This component and the accompanying materials are made available
-rem under the terms of "Eclipse Public License v1.0"
-rem which accompanies this distribution, and is available
-rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
-rem
-rem Initial Contributors:
-rem Nokia Corporation - initial contribution.
-rem
-rem Contributors:
-rem
-rem Description:
-rem
-
-testframework tsu_mmf_acod.script
-testframework tsu_mmf_acod_alloc.script
--- a/mmlibs/mmfw/tsrc/mmfunittest/group/TSU_MMF_ACOD.iby	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-#ifndef __TSU_MMF_ACOD_IBY__
-#define __TSU_MMF_ACOD_IBY__
-
-#include <testframework.iby>
-
-REM Audio codecs unit test
-
-REM ******************************************************************************
-REM **** Data files from EPOCROOT##epoc32\data\c\system\data\ref\ should be present on ****
-REM **** the CF card (D: Drive). These files are too big to fit on ROM image  ****
-REM ******************************************************************************
-
-
-file=ABI_DIR\DEBUG_DIR\TSU_MMF_ACOD.DLL 			System\Libs\TSU_MMF_ACOD.DLL
-data=EPOCROOT##epoc32\data\c\mm\TSU_MMF_ACOD.script    		\TSU_MMF_ACOD.script
-data=EPOCROOT##epoc32\data\c\mm\TSU_MMF_ACOD_Alloc.script   	\TSU_MMF_ACOD_Alloc.script
-data=EPOCROOT##epoc32\data\c\mm\TSU_MMF_ACOD.bat		\TSU_MMF_ACOD.bat
-ECOM_PLUGIN(tsu_mmf_acod_testcodecs.dll,101f76aa.rsc)
-
-
-#endif
-
--- a/mmlibs/mmfw/tsrc/mmfunittest/group/TSU_MMF_DEVSOUND_SUITE.iby	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-#ifndef __TSU_MMF_DEVSOUND_SUITE_IBY__
-#define __TSU_MMF_DEVSOUND_SUITE_IBY__
-
-#include <testframework.iby>
-#include <cinidata.iby>
-
-REM Base classes unit test
-
-file=ABI_DIR\BUILD_DIR\TSU_MMF_DEVSOUND_SUITE.DLL 						System\Libs\TSU_MMF_DEVSOUND_SUITE.DLL
-file=ABI_DIR\DEBUG_DIR\TSU_MMF_DEVSOUND_NOTIFICATION_SUITE.DLL			System\Libs\TSU_MMF_DEVSOUND_NOTIFICATION_SUITE.DLL
-
-#ifdef SYMBIAN_MULTIMEDIA_A3FDEVSOUND
-data=EPOCROOT##epoc32\data\c\mm\TSU_MMF_DEVSOUND_SUITE_MUXDEMUX.script	\TSU_MMF_DEVSOUND_SUITE_MUXDEMUX.script
-#endif
-
-#ifndef SYMBIAN_MULTIMEDIA_A3FDEVSOUND
-data=EPOCROOT##epoc32\data\c\mm\tsu_mmf_devsound_suite_nona3f.script		\tsu_mmf_devsound_suite_nona3f.script
-#else
-data=EPOCROOT##epoc32\data\c\mm\tsu_mmf_devsound_suite_truepause.script		\tsu_mmf_devsound_suite_truepause.script
-#endif
-data=EPOCROOT##epoc32\data\c\mm\tsu_mmf_devsound_suite_manual.script	\tsu_mmf_devsound_suite_manual.script
-data=EPOCROOT##epoc32\data\c\tsu_mmf_devsound_play_tone.ini				\tsu_mmf_devsound_play_tone.ini
-data=EPOCROOT##epoc32\data\c\tsu_mmf_devsound_record.ini				\tsu_mmf_devsound_record.ini
-data=EPOCROOT##epoc32\data\c\tsu_mmf_truepause_devsound.ini					\tsu_mmf_truepause_devsound.ini
-
-data=EPOCROOT##epoc32\data\c\mm\TSU_MMF_DEVSOUND_SUITE_debug.script		\TSU_MMF_DEVSOUND_SUITE_debug.script
-data=EPOCROOT##epoc32\data\c\mm\TSU_MMF_DEVSOUND_SUITE_Alloc.script		\TSU_MMF_DEVSOUND_SUITE_Alloc.script
-data=EPOCROOT##epoc32\data\c\mm\TSU_MMF_DEVSOUND_NOTIFICATION_SUITE.script	\TSU_MMF_DEVSOUND_NOTIFICATION_SUITE.script
-
-#ifndef SYMBIAN_MULTIMEDIA_A3FDEVSOUND
-data=EPOCROOT##epoc32\data\c\mm\TSU_MMF_DEVSOUND_SUITE_PREEMPTION.script	\TSU_MMF_DEVSOUND_SUITE_PREEMPTION.script
-#endif // SYMBIAN_MULTIMEDIA_A3FDEVSOUND
-
-//REM Test files for DEVSOUND_SUITE tests
-ECOM_PLUGIN(tsu_mmf_devsound_testdevice.dll,101f9f50.rsc)
-data=EPOCROOT##epoc32\data\c\TSU_MMF_DEVSOUND_SUITE\Input\garbage.raw		\TSU_MMF_DEVSOUND_SUITE\Input\garbage.raw	
-data=EPOCROOT##epoc32\data\c\TSU_MMF_DEVSOUND_SUITE\Input\PCM_08_08_m.raw	\TSU_MMF_DEVSOUND_SUITE\Input\PCM_08_08_m.raw	
-data=EPOCROOT##epoc32\data\c\TSU_MMF_DEVSOUND_SUITE\Input\PCM_08_16_m.raw	\TSU_MMF_DEVSOUND_SUITE\Input\PCM_08_16_m.raw	
-data=EPOCROOT##epoc32\data\c\TSU_MMF_DEVSOUND_SUITE\Input\PCM_08_16_s.raw	\TSU_MMF_DEVSOUND_SUITE\Input\PCM_08_16_s.raw	
-data=EPOCROOT##epoc32\data\c\TSU_MMF_DEVSOUND_SUITE\Input\PCM_16_16_m.raw	\TSU_MMF_DEVSOUND_SUITE\Input\PCM_16_16_m.raw	
-data=EPOCROOT##epoc32\data\c\TSU_MMF_DEVSOUND_SUITE\Input\PCMU8Source.raw	\TSU_MMF_DEVSOUND_SUITE\Input\PCMU8Source.raw	
-
-ECOM_PLUGIN(tsu_mmf_devsound_testinterface.dll, 102070af.rsc)
-ECOM_PLUGIN(tsu_mmf_devsound_testinterface1.dll, 1028664D.rsc)
-
-#endif
-
--- a/mmlibs/mmfw/tsrc/mmfunittest/group/TSU_MMF_SWCDWRAP.iby	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-#ifndef __TSU_MMF_SWCDWRAP_IBY__
-#define __TSU_MMF_SWCDWRAP_IBY__
-
-#include <testframework.iby>
-#include <cinidata.iby>
-
-REM Base classes unit test
-
-file=ABI_DIR\DEBUG_DIR\TSU_MMF_SWCDWRAP.DLL 		System\Libs\TSU_MMF_SWCDWRAP.DLL
-data=EPOCROOT##epoc32\data\c\mm\TSU_MMF_SWCDWRAP.script \TSU_MMF_SWCDWRAP.script
-
-//REM Test files for DEVSOUND_SUITE tests
-data=EPOCROOT##epoc32\data\c\mm\mmf\testfiles\swcdwrap\TSU_MMF_SWCDWRAPpcm16_8m.raw	\mm\mmf\testfiles\swcdwrap\TSU_MMF_SWCDWRAPpcm16_8m.raw
-data=EPOCROOT##epoc32\data\c\mm\mmf\testfiles\swcdwrap\TSU_MMF_SWCDWRAPpcm16_16s.raw	\mm\mmf\testfiles\swcdwrap\TSU_MMF_SWCDWRAPpcm16_16s.raw
-
-//test HwDevice plugin resource
-ECOM_PLUGIN(tsu_mmf_swcdwrap_testdevice.dll,101fd033.rsc)
-
-#endif
-
--- a/mmlibs/mmfw/tsrc/mmfunittest/group/TSU_MMF_SWCODECDEVICES.iby	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-#ifndef __TSU_MMF_SWCODECDEVICES_IBY__
-#define __TSU_MMF_SWCODECDEVICES_IBY__
-
-#include <testframework.iby>
-
-REM Audio codecs unit test
-
-REM ******************************************************************************
-REM **** Data files from EPOCROOT##epoc32\data\c\mm\mmf\ref\ should be present on ****
-REM **** the CF card (D: Drive). These files are too big to fit on ROM image  ****
-REM ******************************************************************************
-
-file=ABI_DIR\DEBUG_DIR\TSU_MMF_SWCODECDEVICES.DLL 			System\Libs\TSU_MMF_SWCODECDEVICES.DLL
-data=EPOCROOT##epoc32\data\c\mm\TSU_MMF_SWCODECDEVICES.script   	\TSU_MMF_SWCODECDEVICES.script
-data=EPOCROOT##epoc32\data\c\mm\TSU_MMF_SWCODECDEVICES_ALLOC.script	\TSU_MMF_SWCODECDEVICES_ALLOC.script
-data=EPOCROOT##epoc32\data\c\mm\TSU_MMF_SWCODECDEVICES.bat		\TSU_MMF_SWCODECDEVICES.bat
-data=EPOCROOT##epoc32\data\c\mm\TSU_MMF_SWCODECDEVICES.ini		\TSU_MMF_SWCODECDEVICES.ini
-REM data=MULTI_LINGUIFY(rsc ZSYSTEM\LIBS\PLUGINS\101Fd9f0   		System\Libs\Plugins\101Fd9f0)
-REM data=MULTI_LINGUIFY(rsc ZSYSTEM\LIBS\PLUGINS\101fd9ef   		System\Libs\Plugins\101Fd9ef)
-
-REM Test files for swcodectests tests
-data=EPOCROOT##epoc32\data\c\mm\mmf\testfiles\Swcodecdevices\Seq01.inp 	\system\mm\mmf\testfiles\SwCodecDevices\Seq01.inp
-data=EPOCROOT##epoc32\data\c\mm\mmf\testfiles\Swcodecdevices\Seq01.cod 	\system\mm\mmf\testfiles\SwCodecDevices\Seq01.cod
-data=EPOCROOT##epoc32\data\c\mm\mmf\testfiles\Swcodecdevices\Seq01.out 	\system\mm\mmf\testfiles\SwCodecDevices\Seq01.out
-
-data=EPOCROOT##epoc32\data\c\mm\mmf\testfiles\Swcodecdevices\ALawMono8khz400hzTone.wav 		\system\mm\mmf\testfiles\SwCodecDevices\ALawMono8khz400hzTone.wav
-data=EPOCROOT##epoc32\data\c\mm\mmf\testfiles\Swcodecdevices\Imaad4BitMono8Khz400hzTone.wav 	\system\mm\mmf\testfiles\SwCodecDevices\Imaad4BitMono8Khz400hzTone.wav
-data=EPOCROOT##epoc32\data\c\mm\mmf\testfiles\Swcodecdevices\MuLawMono8khz400hzTone.wav 	\system\mm\mmf\testfiles\SwCodecDevices\MuLawMono8khz400hzTone.wav
-data=EPOCROOT##epoc32\data\c\mm\mmf\testfiles\Swcodecdevices\Pcm16BMono8khz400hzTone.au 	\system\mm\mmf\testfiles\SwCodecDevices\Pcm16BMono8khz400hzTone.au
-data=EPOCROOT##epoc32\data\c\mm\mmf\testfiles\Swcodecdevices\Pcm16FromALawMono8khz400hzTone.wav \system\mm\mmf\testfiles\SwCodecDevices\Pcm16FromALawMono8khz400hzTone.wav
-data=EPOCROOT##epoc32\data\c\mm\mmf\testfiles\Swcodecdevices\Pcm16FromMuLawMono8khz400hzTone.wav \system\mm\mmf\testfiles\SwCodecDevices\Pcm16FromMuLawMono8khz400hzTone.wav
-data=EPOCROOT##epoc32\data\c\mm\mmf\testfiles\Swcodecdevices\Pcm16Mono8khz400hzTone.wav 	\system\mm\mmf\testfiles\SwCodecDevices\Pcm16Mono8khz400hzTone.wav
-data=EPOCROOT##epoc32\data\c\mm\mmf\testfiles\Swcodecdevices\Pcm16Stereo8khz400hzTone.wav 	\system\mm\mmf\testfiles\SwCodecDevices\Pcm16Stereo8khz400hzTone.wav
-data=EPOCROOT##epoc32\data\c\mm\mmf\testfiles\Swcodecdevices\PcmU8Mono8khz400hzTone.wav 	\system\mm\mmf\testfiles\SwCodecDevices\PcmU8Mono8khz400hzTone.wav
-data=EPOCROOT##epoc32\data\c\mm\mmf\testfiles\Swcodecdevices\PcmU8Stereo8khz400hzTone.wav 	\system\mm\mmf\testfiles\SwCodecDevices\PcmU8Stereo8khz400hzTone.wav
-
-#endif
-
--- a/mmlibs/mmfw/tsrc/mmfunittest/group/TSU_MMF_VCLNT.iby	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/group/TSU_MMF_VCLNT.iby	Fri Jul 09 12:23:13 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -16,12 +16,7 @@
 #ifndef TSU_MMF_VCLNT_IBY
 #define TSU_MMF_VCLNT_IBY
 
-#include <testframework.iby>
-#include <cinidata.iby>
-
-file=ABI_DIR\DEBUG_DIR\TSU_MMF_VCLNT_01.DLL 			System\Libs\TSU_MMF_VCLNT_01.DLL
-
-file=ABI_DIR\BUILD_DIR\TS_CmmfVideoTestCustomCommands.dll 	System\Libs\TS_CmmfVideoTestCustomCommands.dll
+#include <TSU_MMF_VCLNT_excl_test.iby>
 
 data=EPOCROOT##epoc32\data\c\mm\TSU_MMF_VCLNT_01_WM_CAF_V2.script    	\TSU_MMF_VCLNT_01_WM_CAF_V2.script
 data=EPOCROOT##epoc32\data\c\mm\TSU_MMF_VCLNT_01_WM_CAF_V2_priority.script    	\TSU_MMF_VCLNT_01_WM_CAF_V2_priority.script
@@ -56,19 +51,5 @@
 #endif
 #endif
 
-#ifdef SYMBIAN_GRAPHICS_USE_GCE
-ECOM_PLUGIN(ts_cmmfvideotestcontroller_gce.dll,101f7d2d_gce.rsc)
-#else
-ECOM_PLUGIN(ts_cmmfvideotestcontroller.dll,101f7d2d.rsc)
 #endif
 
-ECOM_PLUGIN(ts_videoinput.dll,101f7f8c.rsc)
-ECOM_PLUGIN(ts_videooutput.dll,101f7f8d.rsc)
-ECOM_PLUGIN(TS_VideoTestFormat.dll,101f7f89.rsc)
-
-file=ABI_DIR\BUILD_DIR\VclntAppTest.exe	Sys\bin\VclntAppTest.exe
-data=EPOCROOT##epoc32\data\Z\resource\Apps\VclntAppTest.rsc		resource\Apps\VclntAppTest.rsc
-data=EPOCROOT##epoc32\data\Z\private\10003a3f\apps\VclntAppTest_reg.rsc  	private\10003a3f\apps\VclntAppTest_reg.rsc
-
-#endif
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mmlibs/mmfw/tsrc/mmfunittest/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -0,0 +1,191 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+#include "../aclnt/group/bld.inf"
+#include "../actrl/group/bld.inf"
+#include "../AFMT/group/bld.inf"
+#include "../basecl/group/bld.inf"
+#include "../ctlfrm/group/bld.inf"
+#include "../GEF/group/bld.inf"
+#include "../MidiClnt/group/bld.inf"
+#include "../Recogniser/group/bld.inf"
+#include "../srssnk/group/bld.inf"
+#include "../SbcCodec/group/bld.INF"
+#include "../ACOD/group/bld.inf"
+#include "../DevSoundTest/group/bld.INF"
+#include "../DevSoundTest/CIPlugins/group/bld.INF"
+#include "../swcdwrap/group/bld.inf"
+#include "../SwCodecDevices/group/bld.inf"
+#include "videogroup/bld.inf"
+
+#ifdef SYMBIAN_VARIABLE_BITRATE_CODEC // use system wide flag to trigger model controller build
+#define SYMBIAN_MMF_MODEL_CONTROLLERS
+#endif
+
+PRJ_TESTMMPFILES
+
+#ifdef SYMBIAN_MMF_MODEL_CONTROLLERS
+../MmpFiles/tsu_mmf_oggctrl_01.mmp
+#endif
+
+// Video Clients
+../MmpFiles/TSU_MMF_VCLNT_01.mmp
+../MmpFiles/TS_CMMFVideoTestCustomCommands.mmp
+../MmpFiles/TS_CMMFVideoTestController.mmp
+
+#ifdef SYMBIAN_BUILD_GCE
+#ifdef EABI
+../MmpFiles/ts_cmmfvideotestcontroller_gce.mmp
+#endif // EABI
+#endif // SYMBIAN_BUILD_GCE
+../MmpFiles/TS_VideoInput.mmp
+../MmpFiles/TS_VideoOutput.mmp
+../MmpFiles/TSU_MMF_VCLNT_APP.mmp
+
+//CTLFRM
+../MmpFiles/TS_CMMFDummyVideoTestController.mmp
+
+//A2DPBLUETOOTH
+//../mmpfiles/TSU_MMF_A2DPBLUETOOTH.mmp
+
+
+#ifdef SYMBIAN_MMF_MODEL_CONTROLLERS
+//.avi controller
+../MmpFiles/customaviplayercontroller.mmp
+../MmpFiles/tsu_mmf_avictrl_01.mmp
+#endif
+
+// DRMPlugin Server
+../MmpFiles/TSU_MMF_DRMPlugin_U.mmp
+PRJ_TESTEXPORTS
+//C:/
+// test scripts
+
+#ifdef SYMBIAN_BUILD_GCE
+../ctlfrm/tsu_mmf_ctlfrm_videosurface.script c:/mm/tsu_mmf_ctlfrm_videosurface.script
+#endif
+
+//../A2DPBLUETOOTH/TSU_MMF_A2DPBLUETOOTH.script	c:/mm/TSU_MMF_A2DPBLUETOOTH.script
+
+
+#ifdef SYMBIAN_MMF_MODEL_CONTROLLERS
+// --------------->> Oggctrl script <<-----------------------------------
+../scripts/tsu_mmf_oggctrl_play.script c:/tsu_mmf_oggctrl_play.script
+../scripts/tsu_mmf_oggctrl_record.script c:/tsu_mmf_oggctrl_record.script
+../scripts/tsu_mmf_oggctrl_01.ini c:/tsu_mmf_oggctrl_01.ini
+
+// --------------->> avictrl script <<-----------------------------------
+../scripts/tsu_mmf_avictrl_play.script  c:/tsu_mmf_avictrl_play.script
+../scripts/tsu_mmf_avictrl_play_alloc.script  c:/tsu_mmf_avictrl_play_alloc.script
+../scripts/tsu_mmf_avictrl_record.script c:/tsu_mmf_avictrl_record.script
+../scripts/tsu_mmf_avictrl_secdisp.script c:/tsu_mmf_avictrl_secdisp.script
+../scripts/tsu_mmf_avictrl_secdisp_winscw.script c:/tsu_mmf_avictrl_secdisp_winscw.script
+../scripts/tsu_mmf_avictrl_01.ini c:/tsu_mmf_avictrl_01.ini
+#ifdef SYMBIAN_BUILD_GCE
+../scripts/tsu_mmf_avictrl_gce_enable.script  c:/tsu_mmf_avictrl_gce_enable.script
+../scripts/tsu_mmf_avictrl_gce_disable.script  c:/tsu_mmf_avictrl_gce_disable.script
+../scripts/tsu_mmf_avictrl_gce_enable.ini c:/tsu_mmf_avictrl_gce_enable.ini
+../scripts/tsu_mmf_avictrl_gce_disable.ini c:/tsu_mmf_avictrl_gce_disable.ini
+#endif //SYMBIAN_BUILD_GCE
+#ifdef SYMBIAN_MULTIMEDIA_SUBTITLE_SUPPORT
+../scripts/tsu_mmf_avictrl_subtitle.ini c:/tsu_mmf_avictrl_subtitle.ini
+../scripts/tsu_mmf_avictrl_subtitle.script c:/tsu_mmf_avictrl_subtitle.script
+#endif //SYMBIAN_MULTIMEDIA_SUBTITLE_SUPPORT
+#endif //SYMBIAN_MMF_MODEL_CONTROLLERS
+
+../scripts/TSU_MMF_VCLNT_01_WM_CAF_V2.script	c:/mm/tsu_mmf_vclnt_01_wm_caf_v2.script
+../scripts/TSU_MMF_VCLNT_01_ALLOC_WM.script	c:/mm/tsu_mmf_vclnt_01_alloc_wm.script
+../scripts/TSU_MMF_VCLNT_RF_WM.script		c:/mm/tsu_mmf_vclnt_rf_wm.script
+../scripts/TSU_MMF_VCLNT_RF_ALLOC_WM.script	c:/mm/tsu_mmf_vclnt_rf_alloc_wm.script
+../scripts/TSU_MMF_VCLNT_DRM.script		c:/mm/tsu_mmf_vclnt_drm.script
+../scripts/TSU_MMF_VCLNT_DRM_ALLOC.script	c:/mm/tsu_mmf_vclnt_drm_alloc.script
+../scripts/TSU_MMF_VCLNT_01.ini			c:/mm/tsu_mmf_vclnt_01.ini
+../scripts/TSU_MMF_VCLNT_RF_WM_NOTIFICATION.script		c:/mm/tsu_mmf_vclnt_rf_wm_notification.script
+../scripts/TSU_MMF_VCLNT_01_WM_CAF_V2_priority.script	c:/mm/tsu_mmf_vclnt_01_wm_caf_v2_priority.script
+
+
+
+// --------------->> graphics support script <<-----------------------------------
+#ifdef SYMBIAN_BUILD_GCE
+../scripts/tsu_mmf_vclnt_u_01_gce_available.script		c:/mm/tsu_mmf_vclnt_u_01_gce_available.script
+../scripts/tsu_mmf_vclnt_u_01_gce_unavailable.script		c:/mm/tsu_mmf_vclnt_u_01_gce_unavailable.script
+../scripts/tsu_mmf_vclnt_u_01_gce_alloc.script			c:/mm/tsu_mmf_vclnt_u_01_gce_alloc.script
+../scripts/tsu_mmf_vclnt_u_01_gce_avail_secscreen.script	c:/mm/tsu_mmf_vclnt_u_01_gce_avail_secscreen.script	
+../scripts/TSU_MMF_VCLNT_01_gce_unavailable.ini	c:/mm/tsu_mmf_vclnt_01_gce_unavailable.ini
+#else
+// remove compile error and avoid test cases failed when CVideoPlayerUtility2 is not available
+../scripts/empty.script		c:/mm/tsu_mmf_vclnt_u_01_gce_unavailable.script
+#endif
+#ifdef SYMBIAN_MULTIMEDIA_SUBTITLE_SUPPORT
+../scripts/tsu_mmf_vclnt_u_01_subtitle_gce_on.script		c:/mm/tsu_mmf_vclnt_u_01_subtitle_gce_on.script
+../scripts/tsu_mmf_vclnt_u_01_subtitle_gce_on_secscreen.script		c:/mm/tsu_mmf_vclnt_u_01_subtitle_gce_on_secscreen.script
+../scripts/tsu_mmf_vclnt_u_01_subtitle_gce_on_udeb.script		c:/mm/tsu_mmf_vclnt_u_01_subtitle_gce_on_udeb.script
+../scripts/tsu_mmf_vclnt_u_01_subtitle_gce_on_urel.script		c:/mm/tsu_mmf_vclnt_u_01_subtitle_gce_on_urel.script
+#endif
+
+../group/TSU_MMF_ACLNT_01.bat			c:/mm/tsu_mmf_aclnt_01.bat
+
+//MM Video Clients Unit Testing
+../VCLNT/TSU_MMF_VCLNT_01/Data/small2.wav		c:/mm/mmf/testfiles/vclnt/small2.wav
+../VCLNT/TSU_MMF_VCLNT_01/Data/smallv.wav		c:/mm/mmf/testfiles/vclnt/smallv.wav
+../VCLNT/TSU_MMF_VCLNT_01/Data/clock.dummy		c:/mm/mmf/testfiles/vclnt/clock.dummy
+../VCLNT/TSU_MMF_VCLNT_01/Data/Video.content	c:/mm/mmf/testfiles/vclnt/video.content
+../VCLNT/TSU_MMF_VCLNT_01/Data/VideoContentNoRights.content	c:/mm/mmf/testfiles/vclnt/videocontentnorights.content
+../VCLNT/TSU_MMF_VCLNT_01/Data/LongVideo.dummy	c:/mm/mmf/testfiles/vclnt/longvideo.dummy
+../VCLNT/TSU_MMF_VCLNT_01/Data/ShortVideo.dummy	c:/mm/mmf/testfiles/vclnt/shortvideo.dummy
+../VCLNT/TSU_MMF_VCLNT_01/Data/AudVid.avi		c:/mm/mmf/testfiles/vclnt/audvid.avi
+../VCLNT/TSU_MMF_VCLNT_01/Data/Vid.avi			c:/mm/mmf/testfiles/vclnt/vid.avi
+../VCLNT/TSU_MMF_VCLNT_01/Data/xvidonly.avi		c:/mm/mmf/testfiles/vclnt/xvidonly.avi
+#ifdef SYMBIAN_MULTIMEDIA_SUBTITLE_SUPPORT
+../VCLNT/TSU_MMF_VCLNT_01/Data/clock2.dummy		c:/mm/mmf/testfiles/vclnt/clock2.dummy
+#endif //SYMBIAN_MULTIMEDIA_SUBTITLE_SUPPORT
+
+
+#ifdef SYMBIAN_MMF_MODEL_CONTROLLERS
+//OggCtrl test files
+../oggctrl/data/6Sec48KHz224KbsStereo.ogg c:/mm/mmf/testfiles/oggctrl/6sec48khz224kbsstereo.ogg
+../oggctrl/data/6sec32khz120kbsstereo.ogg c:/mm/mmf/testfiles/oggctrl/6sec32khz120kbsstereo.ogg
+../oggctrl/data/6sec44khz128kbsstereo.ogg c:/mm/mmf/testfiles/oggctrl/6sec44khz128kbsstereo.ogg
+../oggctrl/data/invalid.ogg c:/mm/mmf/testfiles/oggctrl/invalid.ogg
+#endif
+
+#ifdef SYMBIAN_MMF_MODEL_CONTROLLERS
+//.avi controller test files
+../avictrl/data/video_only.avi				c:/mm/mmf/testfiles/avictrl/video_only.avi
+../avictrl/data/aud_vid.avi				c:/mm/mmf/testfiles/avictrl/aud_vid.avi
+../avictrl/data/invalid.avi				c:/mm/mmf/testfiles/avictrl/invalid.avi
+//#ifndef SYMBIAN_MMF_NO_COPYRIGHTED_FILES
+// We should put this file in a seperate copyrighted files directory
+// Also the files storage place need to be put in a seperate branch of its own.
+../avictrl/data/low_mem_vdo_test.avi c:/mm/mmf/testfiles/avictrl/low_mem_vdo_test.avi
+//#endif
+../avictrl/data/aud_vid_vprp.avi			c:/mm/mmf/testfiles/avictrl/aud_vid_vprp.avi
+#ifdef SYMBIAN_MULTIMEDIA_SUBTITLE_SUPPORT
+../avictrl/data/srt_available.avi c:/mm/mmf/testfiles/avictrl/srt_available.avi
+../avictrl/data/srt_available.srt c:/mm/mmf/testfiles/avictrl/srt_available.srt
+#endif //SYMBIAN_MULTIMEDIA_SUBTITLE_SUPPORT
+#endif //SYMBIAN_MMF_MODEL_CONTROLLERS
+
+//iby files
+../group/TSU_MMF_ACLNT.iby		/epoc32/rom/include/tsu_mmf_aclnt.iby
+../group/TSU_MMF_VCLNT.iby		/epoc32/rom/include/tsu_mmf_vclnt.iby
+../group/TSU_MMF_VCLNT_excl_test.iby		/epoc32/rom/include/tsu_mmf_vclnt_excl_test.iby
+
+//DRMPlugin Server unit test exports
+../SecureDRM/tsu_mmf_drmplugin_alloc.script		c:/tsu_mmf_drmplugin_alloc.script
+../SecureDRM/tsu_mmf_drmplugin_alloc.ini		c:/tsu_mmf_drmplugin_alloc.ini
+../SecureDRM/data/small.wav			c:/securedrm/small.wav
+
+
--- a/mmlibs/mmfw/tsrc/mmfunittest/scripts/TSU_MMF_ACLNT_01.ini	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
-[SectionOne]
-sectionNum= 1
-KeyOne= FromSectionOne
-Keybool= true
-Keybool2 = false
-KeyTInt = 27
-KeyStr = helloWorld
-TestControllerPAVMimeType = audio/PAV
-AudioRecord1     =c:\r1.wav
-AudioRecord2     =c:\r2.wav
-AudioPlayFName1  = c:\mm\mmf\testfiles\aclnt\small.wav
-AudioPlayFName2  = c:\mm\mmf\testfiles\aclnt\mainTest.wav
-AudioPlayFName3  = c:\mm\mmf\testfiles\aclnt\test16m2.au
-AudioPlayFName4  = c:\mm\mmf\testfiles\aclnt\PCM16Source.raw
-AudioPlayFName5  = c:\mm\mmf\testfiles\aclnt\8bitmUPCM.raw
-AudioPlayFName6  = c:\mm\mmf\testfiles\aclnt\small1.wav
-AudioPlayFName7  = c:\mm\mmf\testfiles\aclnt\small2.wav
-AudioPlayFName8  = c:\mm\mmf\testfiles\aclnt\16BitSPCM.wav
-AudioPlayFName9  = c:\mm\mmf\testfiles\aclnt\4sec_wav.wav
-AudioPlayFName10  = c:\mm\mmf\testfiles\aclnt\sample.wav
-AudioPlayFName11  = c:\mm\mmf\testfiles\aclnt\testheaderTag.au
-AudioPlayFName12  = c:\mm\mmf\testfiles\aclnt\sequence2.sqn
-AudioFNameToConvert  = c:\mm\mmf\testfiles\aclnt\small2.au
-AudioFNameToConvert2  = c:\mm\mmf\testfiles\aclnt\test16m2.wav
-AudioFNameToConvert3   = c:\mm\mmf\testfiles\aclnt\16bitmUPCM.raw
-AudioFNameToConvert4   = c:\mm\mmf\testfiles\aclnt\16bitulaw.wav
-AudioPlayRecName  = c:\mm\mmf\testfiles\aclnt\PCM16bitStereo.wav
-
-AudioExpectedConvertFile = c:\MM\mmf\testfiles\aclnt\expectedsmall2.au
-AudioFNameToRecord  	= c:\mm\mmf\testfiles\aclnt\recorded.wav
-AudioFNameToRecord1	= c:\mm\mmf\testfiles\aclnt\recordtest.wav
-AudioFNameToRecord2  	= c:\mm\mmf\testfiles\aclnt\recorded.au
-AudioFNameToRecord3  	= c:\mm\mmf\testfiles\aclnt\recorded.raw
-AudioFNameToRecord4  	= c:\mm\mmf\testfiles\aclnt\record_n_delete_after.wav
-AudioFNameToRecord5  	= c:\mm\mmf\testfiles\aclnt\record_n_delete_after.au
-AudioFNameToCrop	= c:\mm\mmf\testfiles\aclnt\cropped.wav
-AudioFNameToConvertAndCrop	= c:\mm\mmf\testfiles\aclnt\cropped.au
-AudioFNameMeta	 	= c:\mm\mmf\testfiles\aclnt\main_meta.wav
-AudioLongURLTestController = http://www.symbian.com/stream/clip/urls/aaaaaaaaa50-aaaaaaa60-aaaaaaa70-aaaaaaa80-aaaaaaa90-aaaaaa99/aaaaaaa110-aaaaaa120-aaaaaa130-aaaaaa140-aaaaaa150-aaaaaa160-aaaaaa170-aaaaaa180-aaaaaa190-aaaaa199/aaaaaaa210-aaaaaa220-aaaaaa230-aaaaaa240-aaaaaa250-aaaaaa260-aaaaaa270-aaaaaa280-aaaaaa290-aaaaa299/aaaaaaa310-aaaaaa320-aaaaaa330-aaaaaa340-aaaaaa350-aaaaaa360-aaaaaa370-aaaaaa380-aaaaaa390-aaaaa399/aaaaaaa410-aaaaaa420-aaaaaa430-aaaaaa440-aaaaaa450-aaaaaa460-aaaaaa470-aaaaaa480-aaaaaa490-aaaaa499/test.pav
-AudioURLTestController = http://www.symbian.com/test.pav
-AudioURLTagTestController = rtsp://www.symbian.com/test
-AudioURLTestNextController = rtsp://www.symbian.com/test.pav
-AudioFNameTestController = c:\mm\mmf\testfiles\aclnt\test.pav
-DTMFStringFName1	= c:\mm\mmf\testfiles\aclnt\dtmfsample1.txt
-
-AudioPlayMp3FName1  = c:\mm\mmf\testfiles\aclnt\mp3raw.mp3
-AudioPlayMp3FName2  = c:\mm\mmf\testfiles\aclnt\mp3id3.mp3
-AudioPlayMp3FName3  = c:\mm\mmf\testfiles\aclnt\mp3wav.wav
-AudioPlayMp3FName4  = c:\mm\mmf\testfiles\aclnt\mp3dummy.exe
-
-PlayWindowStart = -10
-PlayWindowEnd = 3
-
-[SectionDRM]
-AudioContent = c:\AclntITestData\Audio.content
-Audiocontentrights = c:\AclntITestData\Audio.contentrights
-AudioContentNoRights = c:\AclntITestData\AudioContentNoRights.content
-SingleToneContent = c:\mm\mmf\testfiles\aclnt\SingleTone.content
-SingleToneContentRights = c:\mm\mmf\testfiles\aclnt\SingleTone.contentrights
-
-[MM-MMF-ACLNT-U-2500-CP]
-BusyPercent = 99
-BusyDelay = 0
-BusyLength = 0
-ToneLength = 5000000
-
-[MM-MMF-ACLNT-U-2501-CP]
-BusyPercent = 100
-BusyDelay = 500000
-BusyLength = 3000000
-ToneLength = 5000000
-
-[MM-MMF-ACLNT-U-0981-CP]
-Frequency1 = -1
-Frequency2 = 1
-Duration = 1
-
-[MM-MMF-ACLNT-U-0982-CP]
-Frequency1 = 1
-Frequency2 = -1
-Duration = 1
-
-[MM-MMF-ACLNT-U-0983-CP]
-Frequency1 = 1
-Frequency2 = 1
-Duration = -1
--- a/mmlibs/mmfw/tsrc/mmfunittest/scripts/TSU_MMF_ACLNT_01.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1029 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Creation Date 29/07/2002
-// MMF 'Deprecated Audio Clients' Unit Testing script 13/08/2002
-// 
-//
-
-PRINT Run all the MMF 'Deprecated Audio Clients' unit tests, excluding memory Alloc failure tests
-PRINT 
-# wait for ring.wav to finish playing
-delay 1000
-
-//PAUSE_AT_END
-
-// 
-MULTITHREAD
-
-
-//
-LOAD_SUITE TSU_MMF_ACLNT_01.dll
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0001-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0001-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0002-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0002-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0003-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0003-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0004-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0004-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0010-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0010-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0011-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0011-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0012-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0012-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0013-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0013-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0015-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0015-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0020-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0020-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0025-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0025-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0032-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0032-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0034-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0034-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0035-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0035-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0036-CP
-RUN_TEST_STEP 400000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0036-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0037-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0037-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0039-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0039-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0044-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0044-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0045-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0045-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0050-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0050-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0052-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0052-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0053-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0053-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0054-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0054-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0061-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0061-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0062-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0062-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0063-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0063-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0064-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0064-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0065-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0065-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-// Test for Clientutility layer. Tests CMmfFindAndOpenController
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0066-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0066-HP
-TEST_COMPLETE
-
-//test for CR 1424
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0067-HP
-RUN_TEST_STEP 1800000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0067-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0068-HP
-RUN_TEST_STEP 1200000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0068-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0200-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0200-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0202-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0202-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0203-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0203-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0204-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0204-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0205-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0205-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0207-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0207-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0209-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0209-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0210-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0210-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//Test added for DEF140670
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0211-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0230-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0230-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0232-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0232-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0235-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0235-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0240-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0240-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0241-CP
-RUN_TEST_STEP -1, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0241-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0242-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0242-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0244-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0244-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0246-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0246-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0247-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0247-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0249-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0249-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0250-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0250-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0251-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0251-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0252-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0252-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0254-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0254-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0257-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0257-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0258-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0258-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0259-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0259-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0260-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0260-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0261-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0261-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0262-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0262-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0263-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0263-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0264-HP
-RUN_TEST_STEP -1, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0264-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0265-HP
-RUN_TEST_STEP -1, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0265-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0266-HP
-RUN_TEST_STEP -1, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0266-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0267-HP
-RUN_TEST_STEP -1, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0267-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0268-HP
-RUN_TEST_STEP -1, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0268-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0271-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0271-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0272-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0272-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0273-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0273-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0274-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0274-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-// DEF074869 - Not possible to append recording to audio file with WAV format and GSM610 codec.
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0275-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0275-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-// Detection and rejection of corrupted wave Gsm610 file for record but can be played
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0276-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0276-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0277-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0277-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0281-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0281-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0290-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0290-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0450-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0450-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0451-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0451-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0452-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0452-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0453-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0453-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0454-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0454-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0455-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0455-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0456-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0456-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0457-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0457-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0458-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0458-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0459-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0459-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0460-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0460-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0462-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0462-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0463-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0463-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0464-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0464-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0465-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0465-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-// play a dual tone
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0467-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0467-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0470-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0470-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0472-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0472-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0480-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0480-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-// DevCR - Implement BitRate custom interface for AudioInputStream
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0511-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0511-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0550-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0550-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0551-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0551-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0552-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0552-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-///////// new converter tests
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0553-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0553-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0554-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0554-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0557-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0557-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0558-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0558-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0559-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0559-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0560-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0560-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0561-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0561-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0562-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0562-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0564-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0564-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0565-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0565-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0566-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0566-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0568-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0568-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0569-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0569-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0571-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0571-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0572-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0572-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0573-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0573-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0574-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0574-HP
-TEST_COMPLETE
-
-//////////////////////////////
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0600-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0600-CP
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0601-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0601-CP
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0602-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0602-CP
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0603-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0603-CP
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0606-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0606-HP
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0608-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0608-HP
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0609-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0609-CP
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0610-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0610-CP
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0611-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0611-CP
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0612-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0612-CP
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0615-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0615-CP
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0620-LP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0620-LP
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0630-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0630-CP
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0631-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0631-CP
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0632-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0632-CP
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0633-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0633-CP
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0634-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0634-CP
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0635-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0635-CP
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0636-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0636-CP
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0637-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0637-CP
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0638-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0638-CP
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0639-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0639-CP
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0640-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0640-CP
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0641-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0641-CP
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0642-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0642-CP
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0700-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0700-CP
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0701-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0701-CP
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0702-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0702-CP
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0703-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0703-CP
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0706-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0706-HP
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0708-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0708-HP
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0710-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0710-CP
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0711-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0711-CP
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0712-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0712-CP
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0730-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0730-CP
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0740-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0740-CP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0741-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0741-CP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0742-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0742-CP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0743-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0743-CP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0744-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0744-CP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0745-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0745-CP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0746-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0746-CP
-TEST_COMPLETE
-
-// CR - Test entire Bitrate custom interface in DevSound through AudioInputStream
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0747-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0747-CP
-TEST_COMPLETE 
-
-// DEF095804 CMdaAudioInputStream loses incomplete buffers from DevSound 
-// Tests the Stopping procedures of the input stream
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0749-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0749-CP
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0750-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0750-CP
-TEST_COMPLETE 
-
-// Negative testing
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0800-CP
-RUN_TEST_STEP 45000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0800-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0801-CP
-RUN_TEST_STEP 45000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0801-CP
-TEST_COMPLETE 
-
-// Test Playing once, getting the position after two seconds
-// waiting for play to complete and then playing again
-// Verify that the time take to play both times is roughly the same
-// i.e. that getting the position doesn't affect the second play's 
-// starting point (DEF037064)
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0820-HP
-RUN_TEST_STEP 45000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0820-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-// SetRepeats & test state during trailing silence (DEF037433)
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0821-LP
-RUN_TEST_STEP 600000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0821-LP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-// DEF038345 - MMF Audio - fast forward and rewind buttons not working correctly 
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0822-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0822-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-// DEF039325 - open an MP3 file with using the test MP3 format plugin
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0823-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0823-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-// INC038974 - SetPlayWindow,play,pause,ClearPlayWindow,pause,stop,play
-// make sure second play starts from start of file
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0824-HP
-RUN_TEST_STEP 45000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0824-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-// INC042196 - test responsiveness of SetPosition while playing
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0825-HP
-RUN_TEST_STEP 45000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0825-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-// DEF042395 - Audio recording tck failure
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0826-HP
-RUN_TEST_STEP 200000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0826-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-// INC042545 - Phone freezes when playing *.wav audio with FF and Stop.
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0827-HP
-RUN_TEST_STEP 45000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0827-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-// DEF044042 - Test playing zero length tone on CMdaAudioToneUtility
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0829-CP
-RUN_TEST_STEP 5000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0829-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-// DEF103004: KErrArgument when playing wave file CMMFMdaAudioRecorderUtility::SetPlayWindow()
-// make sure setting negative value for start of window twice does not return KErrorArgument
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0830-HP
-RUN_TEST_STEP 600000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0830-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-// Read the bit rate of the wav files - audio player utility.
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0850-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0850-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-// Read the bit rate of the au files - audio player utility.
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0851-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0851-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-// Read the bit rate of the wav files - audio recorder utility.
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0852-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0852-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-// Read the bit rate of the au files - audio recorder utility.
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0853-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0853-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-// INC045926 - NTT - Charlie Launch - Charlie doesn't play WAV, IMA ADPCM file formats.
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0854-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0854-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-// INC047838: Voice Recorder: sound is played on the newly recorded clip while mute was
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0855-HP
-RUN_TEST_STEP 320000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0855-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-//INC048184 - setplaywindow,play,stop,fast farward,close,play
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0856-HP
-RUN_TEST_STEP 320000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0856-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-//INC048184(RecorderUtility) - Setplaywindow,Play,Stop,SetPosition,Stop
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0857-HP
-RUN_TEST_STEP 320000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0857-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-// INC060658  CMdaAudioRecorderUtility::OpenDesL fails with KErrNotFound 
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0950-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0950-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-// DEF056298 To check for Header tag properly
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0955-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0955-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-// INC063833: CMdaAudioPlayerUtility->OpenFile(FileName) Panic 
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0956-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0956-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-//DEF067052: The emulator-winscw crashes after paused the WAV and AU audio formats from console
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0957-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0957-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//DEF070060: Paused WAV can't always be resumed - Java TCK test setloopcount2 fails
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0958-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0958-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-// CustomInterface CR - Add CustomInterface() to CMdaAudioOutputStream
-//! @SYMTestCaseID MM-MMF-ACLNT-U-1000-HP
-RUN_TEST_STEP 320000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-1000-HP
-TEST_COMPLETE
-
-// CustomInterface CR - Add CustomInterface() to CMdaAudioInputStream
-//! @SYMTestCaseID MM-MMF-ACLNT-U-1001-HP
-RUN_TEST_STEP 320000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-1001-HP
-TEST_COMPLETE
-
-// CustomInterface CR - Add CustomInterface() to CMdaAudioOutputStream
-//! @SYMTestCaseID MM-MMF-ACLNT-U-1002-HP
-RUN_TEST_STEP 320000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-1002-HP
-TEST_COMPLETE
-
-// DEF068366  Using record utility, callback of PlaybackBalance APIs fail.
-//! @SYMTestCaseID MM-MMF-ACLNT-U-1003-HP
-RUN_TEST_STEP 200000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-1003-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-// temporarly moved here as causes problem with the other tests.
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0014-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0014-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-// DEF078081: TCK fail: CMMFMdaAudioPlayerUtility::Duration can't handle infinite sounds
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0960-HP
-RUN_TEST_STEP 200000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0960-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-// DEF078081: TCK fail: CMMFMdaAudioPlayerUtility::Duration can't handle infinite sounds
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0961-HP
-RUN_TEST_STEP 200000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0961-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-//CR0632 uri scheme
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0957-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0957-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-//CR0632 uri scheme
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0958-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0958-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-//CR0632 uri scheme
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0959-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0959-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-//CR0632 uri scheme
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0960-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0960-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-// DEF083334  Checking for ControllerImplementation info
-//! @SYMTestCaseID MM-MMF-ACLNT-U-1004-HP
-RUN_TEST_STEP 200000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-1004-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-// DEF083334  Checking for ControllerImplementation info
-//! @SYMTestCaseID MM-MMF-ACLNT-U-1005-HP
-RUN_TEST_STEP 200000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-1005-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-// DEF083334  Checking for ControllerImplementation info
-//! @SYMTestCaseID MM-MMF-ACLNT-U-1006-HP
-RUN_TEST_STEP 200000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-1006-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-// DEF083334  Checking for ControllerImplementation info
-//! @SYMTestCaseID MM-MMF-ACLNT-U-1007-HP
-RUN_TEST_STEP 200000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-1007-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-// DEF085172: Incorrect documentation of CMdaAudioRecorderUtility::SetVolume( )
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0965-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0965-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-// DEF087609: APIREG CMdaAudioPlayerUtility Panic tests fail with wrong panic
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0967-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0967-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-// PDEF092098: DevSound fails to update policy if error occurs in StartPlayDataL
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0858-CP
-RUN_TEST_STEP 320000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0858-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-// PDEF090287: CMdaAudioOutputStream resumes incorrectly after an error
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0859-CP
-RUN_TEST_STEP 320000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0859-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-// DEF090666 : T:Aclnt - Pausing during repeat causes the file to close itself
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0968-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0968-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-// DEF093014: T: CMdaAudioRecorderUtility::SetDestinationFormatL causes panic
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0969-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0969-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-// INC107513: Startup tone is played before tone initialization is completed.
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0970-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0970-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-// PDEF121312:CMMFMdaAudioInputStream::BufferToBeEmptied() might delete an invalid pointer  
-// Tests the calling Stop on AudioInputStream from BufferCopied callback
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0751-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0751-CP
-
-//DEF120980:Creating two audiooutputstreams concurrently makes policyserver panic 
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0971-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-//DEF121928: Concurrently calling RecordL by audiorecorder in 3 threads make server panics
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0972-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0972-CP
-TEST_COMPLETE
-
-//DEF121928: Concurrently calling RecordL by audiorecorder in 3 threads make server panics
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0973-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0973-CP
-TEST_COMPLETE
-
-//DEF121928: Concurrently calling RecordL by audiorecorder in 3 threads make server panics
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0974-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0974-CP
-TEST_COMPLETE
-
-//DEF126403 PlayTone with 99% cpu time taken up elsewhere
-//! @SYMTestCaseID MM-MMF-ACLNT-U-2500-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-2500-CP C:\MM\TSU_MMF_ACLNT_01.ini MM-MMF-ACLNT-U-2500-CP
-TEST_COMPLETE
-
-DELAY 500 // wait 0.5s for clarify
-
-//DEF126403 PlayTone with 100% cpu time from 0.5s to 3.5
-//! @SYMTestCaseID MM-MMF-ACLNT-U-2501-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-2500-CP C:\MM\TSU_MMF_ACLNT_01.ini MM-MMF-ACLNT-U-2501-CP
-TEST_COMPLETE
-
-//DEF120897 In KeepOpenAtEnd Mode, call RequestStop before outputstream completes playing all the supplied buffers
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0975-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0975-CP
-TEST_COMPLETE
-
-//DEF120897 In KeepOpenAtEnd Mode, call RequestStop after outputstream completes playing all the supplied buffers
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0976-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0976-CP
-TEST_COMPLETE
-
-//DEF120897 In KeepOpenAtEnd Mode, call WriteL after RequestStop(Negative Step)
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0977-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0977-CP
-TEST_COMPLETE
-
-//DEF120897 Non KeepOpenAtEnd Mode 
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0978-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0978-CP
-TEST_COMPLETE
-
-//DEF120897 In KeepOpenAtEnd Mode, stop output stream after play is started and then restart the play
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0979-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0979-CP
-TEST_COMPLETE
-
-//DEF120897 Non KeepOpenAtEnd Mode, stop output stream after play is started and then restart the play
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0980-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0980-CP
-TEST_COMPLETE
-
-//DEF125377 - Test negative frequency and duration values passed to CMdaAudioToneUtility
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0981-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0981-CP C:\MM\TSU_MMF_ACLNT_01.ini 
-TEST_COMPLETE
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0982-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0982-CP C:\MM\TSU_MMF_ACLNT_01.ini 
-TEST_COMPLETE
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0983-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0983-CP C:\MM\TSU_MMF_ACLNT_01.ini 
-TEST_COMPLETE
-
-//PDEF131534 SPPR_PERF: Music player crashes when opening corrupted wav file
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0984-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0984-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0985-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0985-CP
-TEST_COMPLETE 
-
-//DEF127630: Fix for INC108007 appears to close client
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0986-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0986-CP
-TEST_COMPLETE
-
-//DEF127630: Fix for INC108007 appears to close client
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0987-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0987-CP
-TEST_COMPLETE
-
-//DEF127630: Fix for INC108007 appears to close client
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0988-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0988-CP
-TEST_COMPLETE
-
-//DEF127468 - Pause->Flush->Resume not supported properly by RMdaDevSound adapter
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0989-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0989-CP C:\MM\TSU_MMF_ACLNT_01.ini 
-
--- a/mmlibs/mmfw/tsrc/mmfunittest/scripts/TSU_MMF_ACLNT_01_Alloc.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Creation Date 29/07/2002
-// MMF 'Deprecated Audio Clients' Unit Testing script 13/08/2002
-// 
-//
-
-PRINT Run all the MMF 'Deprecated Audio Clients' OOM unit tests 
-PRINT 
-//PAUSE_AT_END
-
-// 
-MULTITHREAD
-
-
-//
-LOAD_SUITE TSU_MMF_ACLNT_01.dll
-
-
-// 2 secs
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0100-CP
-
-RUN_TEST_STEP 360000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0100-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-// ?
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0101-CP
-
-RUN_TEST_STEP 360000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0101-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-// 4 secs
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0102-CP
-
-RUN_TEST_STEP 360000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0102-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-// 2 secs
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0103-CP
-
-RUN_TEST_STEP 360000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0103-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-// Shared Heap Tests
-// Standard play test
-//! @SYMTestCaseID MM-MMF-ACLNT-U-2000-HP
-
-RUN_TEST_STEP 360000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-2000-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-// Standard play test (one of the controllers has its own heap)
-//! @SYMTestCaseID MM-MMF-ACLNT-U-2001-HP
-
-RUN_TEST_STEP 360000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-2001-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-// Repeated create and delete test
-//! @SYMTestCaseID MM-MMF-ACLNT-U-2002-HP
-
-RUN_TEST_STEP 720000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-2002-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-// Repeated create and delete test (one of the controllers has its own heap)
-//! @SYMTestCaseID MM-MMF-ACLNT-U-2003-HP
-
-RUN_TEST_STEP 720000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-2003-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//======== Excluded until debug panic is removed from RMMFControllerProxy::Close() ======
-// Panic test on shared heap players
-//! @SYMTestCaseID MM-MMF-ACLNT-U-2004-HP
-
-//RUN_TEST_STEP 360000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-2004-HP C:\MM\TSU_MMF_ACLNT_01.ini
-//TEST_COMPLETE 
-
-// Panic test on shared heap players (one of the controllers has its own heap)
-//! @SYMTestCaseID MM-MMF-ACLNT-U-2005-HP
-
-//RUN_TEST_STEP 360000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-2005-HP C:\MM\TSU_MMF_ACLNT_01.ini
-//TEST_COMPLETE 
-
-// Shared Heap Tests for CMdaRecorderUtility
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-2006-HP
-
-RUN_TEST_STEP 360000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-2006-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-// Shared Heap Tests for CMdaConvertUtility
-//! @SYMTestCaseID MM-MMF-ACLNT-U-2007-HP
-
-RUN_TEST_STEP 360000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-2007-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-//========================================================================================
--- a/mmlibs/mmfw/tsrc/mmfunittest/scripts/TSU_MMF_ACLNT_01_NOTIFICATION.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// MMF 'Deprecated Audio Clients' Unit Testing script 13/08/2002
-// 
-//
-
-# wait for ring.wav to finish playing
-delay 1000
-
-//PAUSE_AT_END
-
-// 
-MULTITHREAD
-
-
-//
-LOAD_SUITE TSU_MMF_ACLNT_01.dll
-
-// DEF061942  KERN-EXEC:15 in the AudioPolicy server
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0951-HP
-
-RUN_TEST_STEP 1000000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0951-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-// DEF061821  CMdaAudioRecorderUtility::PlayL() fail case when registered for notification 
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0952-HP
-
-RUN_TEST_STEP 1000000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0952-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-// DEF061822  aNotificationData in the MarncResourceAvailable() callback contains wrong data
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0953-HP
-
-RUN_TEST_STEP 200000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0953-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
\ No newline at end of file
--- a/mmlibs/mmfw/tsrc/mmfunittest/scripts/TSU_MMF_ACLNT_01_PREEMPTION.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// MMF 'Deprecated Audio Clients' Unit Testing script 13/08/2002
-// 
-//
-
-# wait for ring.wav to finish playing
-delay 1000
-
-//PAUSE_AT_END
-
-// 
-MULTITHREAD
-
-
-//
-LOAD_SUITE TSU_MMF_ACLNT_01.dll
-
-// play a tone & a sound file with the same priority at the same time
-// DEF036477
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0810-HP
-
-RUN_TEST_STEP 45000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0810-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-// Interrupt a low priority sound file with a high priority tone.
-// INC037165
-// This test added mainly for manual verification that fix
-// for the above defect causes no regressions. Requires debugger.
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0811-HP
-
-RUN_TEST_STEP 45000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0811-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-// Interrupt a low priority sound file with a high priority sound file.
-// INC037165
-// This test added mainly for manual verification that fix
-// for the above defect causes no regressions. Requires debugger.
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0812-HP
-
-RUN_TEST_STEP 45000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0812-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-// Interrupt a low priority recorder with a higher priority recorder
-// playing the same file
-// DEF038640
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0813-HP
-
-RUN_TEST_STEP 45000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0813-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-// Open a low priority recorder and a higher priority recorder
-// with the same file & get the duration in each case
-// DEF038653
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0814-HP
-
-RUN_TEST_STEP 45000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0814-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-
--- a/mmlibs/mmfw/tsrc/mmfunittest/scripts/TSU_MMF_ACLNT_02_Alloc.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Creation Date 20/11/2003
-// MMF 'Deprecated Audio Clients' Unit Testing script 13/08/2002
-// 
-//
-
-PRINT Run all the MMF 'Deprecated Audio Clients' OOM unit tests
-PRINT
-//PAUSE_AT_END
-
-//
-MULTITHREAD
-
-
-//
-LOAD_SUITE TSU_MMF_ACLNT_01.dll
-
-// 2 secs
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0104-CP
-
-RUN_TEST_STEP 360000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0104-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-// 2 secs
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0105-CP
-
-RUN_TEST_STEP 360000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0105-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-// failed
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0400-CP
-
-RUN_TEST_STEP 360000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0400-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-// 2 secs
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0300-CP
-
-RUN_TEST_STEP 360000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0300-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-
-
-
--- a/mmlibs/mmfw/tsrc/mmfunittest/scripts/TSU_MMF_ACLNT_03_Alloc.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Creation Date 20/11/2003
-// MMF 'Deprecated Audio Clients' Unit Testing script 13/08/2002
-// 
-//
-
-PRINT Run all the MMF 'Deprecated Audio Clients' OOM unit tests
-PRINT
-//PAUSE_AT_END
-
-//
-MULTITHREAD
-
-
-//
-LOAD_SUITE TSU_MMF_ACLNT_01.dll
-
-// 5 secs
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0301-CP
-
-RUN_TEST_STEP 1600000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0301-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-// 5 secs
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0302-CP
-
-RUN_TEST_STEP 800000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0302-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
--- a/mmlibs/mmfw/tsrc/mmfunittest/scripts/TSU_MMF_ACLNT_04_Alloc.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Creation Date 20/11/2003
-// MMF 'Deprecated Audio Clients' Unit Testing script 13/08/2002
-// 
-//
-
-PRINT Run all the MMF 'Deprecated Audio Clients' OOM unit tests
-PRINT
-//PAUSE_AT_END
-
-//
-MULTITHREAD
-
-
-//
-LOAD_SUITE TSU_MMF_ACLNT_01.dll
-
-// 
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0303-CP
-
-RUN_TEST_STEP 360000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0303-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-// 2 secs
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0304-CP
-
-RUN_TEST_STEP 360000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0304-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
--- a/mmlibs/mmfw/tsrc/mmfunittest/scripts/TSU_MMF_ACLNT_05_Alloc.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Creation Date 20/11/2003
-// MMF 'Deprecated Audio Clients' Unit Testing script 13/08/2002
-// 
-//
-
-PRINT Run all the MMF 'Deprecated Audio Clients' OOM unit tests
-PRINT
-//PAUSE_AT_END
-
-//
-MULTITHREAD
-
-
-//
-LOAD_SUITE TSU_MMF_ACLNT_01.dll
-
-DELAY 5000
-
-// 3 secs
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0305-CP
-
-RUN_TEST_STEP 360000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0305-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-// 4 secs
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0306-CP
-
-RUN_TEST_STEP 360000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0306-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-// failed
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0307-CP
-
-RUN_TEST_STEP 360000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0307-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-// 2 secs
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0500-CP
-
-RUN_TEST_STEP 360000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0500-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-// 3 secs
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0501-CP
-
-RUN_TEST_STEP 360000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0501-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-// DEF040281 - Audio input streaming crashes on completion on hardware device
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0510-HP
-
-RUN_TEST_STEP 180000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0510-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-// CR - Implement BitRate Custom Interface
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0748-CP
-
-RUN_TEST_STEP 360000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0748-CP
-TEST_COMPLETE
--- a/mmlibs/mmfw/tsrc/mmfunittest/scripts/TSU_MMF_ACLNT_DRM.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +0,0 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Unit tests for PREQ777.
-// 
-//
-
-LOAD_SUITE TSU_MMF_ACLNT_01.dll
-
-delay 5000
-
-### Positive Testing ###
-# CMdaAudioPlayerUtility
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0901-HP
-
-RUN_TEST_STEP 600000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0901-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0902-HP
-
-RUN_TEST_STEP 600000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0902-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0903-HP
-
-RUN_TEST_STEP 600000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0903-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0905-HP
-
-RUN_TEST_STEP 600000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0905-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0908-HP
-
-RUN_TEST_STEP 600000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0908-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-# CMdaAudioRecorderUtility
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0911-HP
-
-RUN_TEST_STEP 600000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0911-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0912-HP
-
-RUN_TEST_STEP 600000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0912-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0913-HP
-
-RUN_TEST_STEP 600000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0913-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0915-HP
-
-RUN_TEST_STEP 600000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0915-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-### Negative Testing ###
-# CMdaAudioPlayerUtility
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0921-HP
-
-RUN_TEST_STEP 600000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0921-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0922-HP
-
-RUN_TEST_STEP 600000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0922-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0924-HP
-
-RUN_TEST_STEP 600000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0924-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-# CMdaAudioRecorderUtility
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0931-HP
-
-RUN_TEST_STEP 600000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0931-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0932-HP
-
-RUN_TEST_STEP 600000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0932-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0933-HP
-
-RUN_TEST_STEP 600000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0933-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0907-HP
-
-RUN_TEST_STEP 600000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0907-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
--- a/mmlibs/mmfw/tsrc/mmfunittest/scripts/TSU_MMF_ACLNT_DRM_ALLOC.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Alloc unit tests for PREQ777.
-// 
-//
-
-LOAD_SUITE TSU_MMF_ACLNT_01.dll
-
-delay 1000
-
-### Positive Testing ###
-# CMdaAudioPlayerUtility
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0904-HP
-
-RUN_TEST_STEP 2000000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0904-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0906-HP
-
-RUN_TEST_STEP 2000000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0906-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-// This is not a alloc test, it's for PDEF117405
-// Open a protected audio clip, switch the state between play and pause
-// very quickly (0.05 second each), the original __ASSERT_DEBUG((iState == EPlaying || iState 
-// == EConverting || iState == ERecording), Panic(EMMFDataPathPanicBadState,__LINE__)) in 
-// CMMFDataPath::BufferFilledLwill panic. The new test case here is to test the fix of this 
-// problem, that's why it need to be run in UDEB.
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0909-HP
-
-RUN_TEST_STEP 600000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0909-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-
-# CMdaAudioRecorderUtility
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0914-HP
-
-RUN_TEST_STEP 2000000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0914-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0916-HP
-
-RUN_TEST_STEP 2000000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0916-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
--- a/mmlibs/mmfw/tsrc/mmfunittest/scripts/TSU_MMF_ACLNT_RF_ALLOC.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Creation Date 29/07/2002
-// MMF 'Deprecated Audio Clients' Unit Testing script 13/08/2002
-// 
-//
-
-PRINT Run all the MMF 'Deprecated Audio Clients' OOM unit tests 
-PRINT 
-//PAUSE_AT_END
-
-// 
-MULTITHREAD
-
-
-//
-LOAD_SUITE TSU_MMF_ACLNT_01.dll
-
-
-// 2 secs
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0110-CP
-
-RUN_TEST_STEP 360000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0110-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0120-CP
-
-RUN_TEST_STEP 1600000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0120-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
--- a/mmlibs/mmfw/tsrc/mmfunittest/scripts/TSU_MMF_CTLFRM_SDRM.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-//
-// Copyright (c) 2007-2008 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-LOAD_SUITE TSU_MMF_CTLFRM_SDRM.dll
-#PAUSE_AT_END
-
-#Req. 
-# 
-
-//MULTITHREAD
-
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0210
-
-RUN_TEST_STEP 10000 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0210
-TEST_COMPLETE
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0211
-
-RUN_TEST_STEP 10000 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0211
-TEST_COMPLETE
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0212
-
-RUN_TEST_STEP 10000 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0212
-TEST_COMPLETE
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0213
-
-RUN_TEST_STEP 10000 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0213
-TEST_COMPLETE
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0214
-
-RUN_TEST_STEP 10000 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0214
-TEST_COMPLETE
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0215
-
-RUN_TEST_STEP 10000 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0215
-TEST_COMPLETE
-
-//CR1655 -  MMF support for configurable controller stack size
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0300
-
-RUN_TEST_STEP 10000 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0300
-TEST_COMPLETE
--- a/mmlibs/mmfw/tsrc/mmfunittest/scripts/TSU_MMF_CTLFRM_SDRM_ALLOC.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,730 +0,0 @@
-//
-// Copyright (c) 2007-2008 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-LOAD_SUITE TSU_MMF_CTLFRM_SDRM.dll
-#PAUSE_AT_END
-
-#Req. 
-# 
-
-//MULTITHREAD
-
-//-------------------------------------//
-// Framework Controller                //
-//-------------------------------------//
-
-// Open Custom Framework Controller
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0001
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0001
-//HANDLES_CHECK
-TEST_COMPLETE
-
-// Add Data Source
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0007
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0007
-//HANDLES_CHECK
-TEST_COMPLETE
-
-// Framework Controller
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0008
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0008
-//HANDLES_CHECK
-TEST_COMPLETE
-
-// Framework Controller
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0009
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0009
-//HANDLES_CHECK
-TEST_COMPLETE
-
-// Framework Controller
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0010
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0010
-//HANDLES_CHECK
-TEST_COMPLETE
-
-// Framework Controller
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0011
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0011
-//HANDLES_CHECK
-TEST_COMPLETE
-
-// Framework Controller
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0012
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0012
-//HANDLES_CHECK
-TEST_COMPLETE
-
-// Framework Controller
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0013
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0013
-//HANDLES_CHECK
-TEST_COMPLETE
-
-// Framework Controller
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0014
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0014
-//HANDLES_CHECK
-TEST_COMPLETE
-
-// Framework Controller
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0015
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0015
-//HANDLES_CHECK
-TEST_COMPLETE
-
-// Framework Controller
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0016
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0016
-//HANDLES_CHECK
-TEST_COMPLETE
-
-// Framework Controller
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0017
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0017
-//HANDLES_CHECK
-TEST_COMPLETE
-
-// Framework Controller
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0018
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0018
-//HANDLES_CHECK
-TEST_COMPLETE
-
-// Framework Controller
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0019
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0019
-//HANDLES_CHECK
-TEST_COMPLETE
-
-// Framework Controller
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0020
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0020
-//HANDLES_CHECK
-TEST_COMPLETE
-
-// Framework Controller
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0021
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0021
-//HANDLES_CHECK
-TEST_COMPLETE
-
-// Framework Controller
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0022
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0022
-//HANDLES_CHECK
-TEST_COMPLETE
-
-// Framework Controller
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0023
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0023
-//HANDLES_CHECK
-TEST_COMPLETE
-
-// Framework Controller
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0024
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0024
-//HANDLES_CHECK
-TEST_COMPLETE
-
-// Framework Controller
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0025
-
-//RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0025
-//HANDLES_CHECK
-//TEST_COMPLETE
-
-// Framework Controller
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0026
-
-//RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0026
-//HANDLES_CHECK
-//TEST_COMPLETE
-
-// Framework Controller
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0027
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0027
-//HANDLES_CHECK
-TEST_COMPLETE
-
-// Framework Controller
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0028
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0028
-//HANDLES_CHECK
-TEST_COMPLETE
-
-// Framework Controller
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0029
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0029
-//HANDLES_CHECK
-TEST_COMPLETE
-
-// Framework Controller
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0030
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0030
-//HANDLES_CHECK
-TEST_COMPLETE
-
-// Framework Controller
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0031
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0031
-//HANDLES_CHECK
-TEST_COMPLETE
-
-// Framework Controller
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0032
-
-//RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0032
-//HANDLES_CHECK
-//TEST_COMPLETE
-
-// Framework Controller
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0033
-
-//RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0033
-//HANDLES_CHECK
-//TEST_COMPLETE
-
-// Framework Controller
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0034
-
-//RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0034
-//HANDLES_CHECK
-//TEST_COMPLETE
-
-// Framework Controller
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0035
-
-//RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0035
-//HANDLES_CHECK
-//TEST_COMPLETE
-
-// Test the accessibility of DRM command on normal controller
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0038
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0038
-//HANDLES_CHECK
-TEST_COMPLETE
-
-// Test the accessibility of DRM command on controller running in SecureDRM mode
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0039
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0039
-//HANDLES_CHECK
-TEST_COMPLETE
-
-//-------------------------------------//
-// RMMFAudioPlayDeviceCustomCommands //
-//-------------------------------------//
-
-// Open Custom Framework Controller
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0040
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0040
-//HANDLES_CHECK
-TEST_COMPLETE
-
-// Get Max Volume
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0041
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0041
-//HANDLES_CHECK
-TEST_COMPLETE
-
-// Get Volume
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0042
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0042
-//HANDLES_CHECK
-TEST_COMPLETE
-
-// Set Volume Ramp
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0043
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0043
-//HANDLES_CHECK
-TEST_COMPLETE
-
-// Set Balance 
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0044
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0044
-//HANDLES_CHECK
-TEST_COMPLETE
-
-// Get Balance
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0045
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0045
-//HANDLES_CHECK
-TEST_COMPLETE
-
-
-//-------------------------------------//
-// RMMFAudioRecordDeviceCustomCommands //
-//-------------------------------------//
-
-// Set Gain
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0050
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0050
-//HANDLES_CHECK
-TEST_COMPLETE
-
-// Get Max Gain
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0051
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0051
-//HANDLES_CHECK
-TEST_COMPLETE
-
-// Get Gain
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0052
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0052
-//HANDLES_CHECK
-TEST_COMPLETE
-
-// Set Balance
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0053
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0053
-//HANDLES_CHECK
-TEST_COMPLETE
-
-// Get Balance
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0054
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0054
-//HANDLES_CHECK
-TEST_COMPLETE
-
-//---------------------------------------//
-// RMMFAudioPlayControllerCustomCommands //
-//---------------------------------------//
-
-// Set SetPlaybackWindow
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0060
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0060
-//HANDLES_CHECK
-TEST_COMPLETE
-
-// Delete Playback Window
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0061
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0061
-//HANDLES_CHECK
-TEST_COMPLETE
-
-//-----------------------------------------//
-// RMMFAudioRecordControllerCustomCommands //
-//-----------------------------------------//
-
-// Set SetPlaybackWindow
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0070
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0070
-//HANDLES_CHECK
-TEST_COMPLETE
-
-// Set SetPlaybackWindow
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0071
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0071
-//HANDLES_CHECK
-TEST_COMPLETE
-
-// Set SetPlaybackWindow
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0072
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0072
-//HANDLES_CHECK
-TEST_COMPLETE
-
-// Set SetPlaybackWindow
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0073
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0073
-//HANDLES_CHECK
-TEST_COMPLETE
-
-// Set SetPlaybackWindow
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0074
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0074
-//HANDLES_CHECK
-TEST_COMPLETE
-
-// Set SetPlaybackWindow
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0075
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0075
-//HANDLES_CHECK
-TEST_COMPLETE
-
-// Set SetPlaybackWindow
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0076
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0076
-//HANDLES_CHECK
-TEST_COMPLETE
-
-//---------------------------------------------//
-// RMMFAudioControllerControllerCustomCommands //
-//---------------------------------------------//
-
-// Set SetPlaybackWindow
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0080
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0080
-//HANDLES_CHECK
-TEST_COMPLETE
-
-// Set SetPlaybackWindow
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0081
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0081
-//HANDLES_CHECK
-TEST_COMPLETE
-
-// Set SetPlaybackWindow
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0082
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0082
-//HANDLES_CHECK
-TEST_COMPLETE
-
-// Set SetPlaybackWindow
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0083
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0083
-//HANDLES_CHECK
-TEST_COMPLETE
-
-// Set SetPlaybackWindow
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0084
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0084
-//HANDLES_CHECK
-TEST_COMPLETE
-
-// Set SetPlaybackWindow
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0085
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0085
-//HANDLES_CHECK
-TEST_COMPLETE
-
-// Set SetPlaybackWindow
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0086
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0086
-//HANDLES_CHECK
-TEST_COMPLETE
-
-// Adding Multiple Sources and Sinks
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0100
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0100
-//HANDLES_CHECK
-TEST_COMPLETE
-
-//-------------------------------------//
-// CMMFFormatSelectionParameters       //
-//-------------------------------------//
-
-// Open Custom Framework Controller
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0120
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0120
-//HANDLES_CHECK
-TEST_COMPLETE
-
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0121
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0121
-//HANDLES_CHECK
-TEST_COMPLETE
-
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0122
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0122
-//HANDLES_CHECK
-TEST_COMPLETE
-
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0123
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0123
-//HANDLES_CHECK
-TEST_COMPLETE
-
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0124
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0124
-//HANDLES_CHECK
-TEST_COMPLETE
-
-//------------------------------------------//
-// CMMFControllerPluginSelectionParameters  //
-//------------------------------------------//
-
-// Open Custom Framework Controller
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0130
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0130
-//HANDLES_CHECK
-TEST_COMPLETE
-
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0131
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0131
-//HANDLES_CHECK
-TEST_COMPLETE
-
-//-------------------------------------//
-// CMMFPluginImplementationInformation //
-//-------------------------------------//
-
-// Open Custom Framework Controller
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0140
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0140
-//HANDLES_CHECK
-TEST_COMPLETE
-
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0141
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0141
-//HANDLES_CHECK
-TEST_COMPLETE
-
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0142
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0142
-//HANDLES_CHECK
-TEST_COMPLETE
-
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0143
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0143
-//HANDLES_CHECK
-TEST_COMPLETE
-
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0144
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0144
-//HANDLES_CHECK
-TEST_COMPLETE
-
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0145
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0145
-//HANDLES_CHECK
-TEST_COMPLETE
-
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0146
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0146
-//HANDLES_CHECK
-TEST_COMPLETE
-
-//--------------------------------------//
-// CMMFPluginPluginSelectionParameters  //
-//--------------------------------------//
-
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0150
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0150
-//HANDLES_CHECK
-TEST_COMPLETE
-
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0151
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0151
-//HANDLES_CHECK
-TEST_COMPLETE
-
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0152
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0152
-//HANDLES_CHECK
-TEST_COMPLETE
-
-//--------------------------------------//
-// CMMFPluginPluginSelectionParameters  //
-//--------------------------------------//
-
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0160
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0160
-//HANDLES_CHECK
-TEST_COMPLETE
-
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0161
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0161
-//HANDLES_CHECK
-TEST_COMPLETE
-
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0162
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0162
-//HANDLES_CHECK
-TEST_COMPLETE
-
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0163
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0163
-//HANDLES_CHECK
-TEST_COMPLETE
-
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0164
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0164
-//HANDLES_CHECK
-TEST_COMPLETE
-
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0165
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0165
-//HANDLES_CHECK
-TEST_COMPLETE
-
-//CR0632
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0197
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0197
-//HANDLES_CHECK
-TEST_COMPLETE
-
-//--------------------------------------//
-// CMMFPluginPluginSelectionParameters  //
-//--------------------------------------//
-
-//HANDLES_MARK
-//! @SYMTestCaseID MM-MMF-CTLFRM-SDRM-U-0200
-
-RUN_TEST_STEP -1 TSU_MMF_CTLFRM_SDRM MM-MMF-CTLFRM-SDRM-U-0200
-//HANDLES_CHECK
-TEST_COMPLETE
--- a/mmlibs/mmfw/tsrc/mmfunittest/scripts/TSU_MMF_MIDICLNT_00.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1485 +0,0 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// TSI_MMF_MIDICLNT_00.script
-// 
-//
-
-LOAD_SUITE TSU_MMFMIDICLNT.DLL
-#PAUSE_AT_END
-
-
-###################### POSITIVE TEST ###############
-#Req. under test 
-# Current state of the midi client utility with regard to midi resources
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0016
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0016 c:\mm\midi.ini
-TEST_COMPLETE
-
-#Req. under test 
-# Open a file containing midi data and perform initialisation ready for playback
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0018
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0018 c:\mm\midi.ini
-TEST_COMPLETE
-
-#Req. under test 
-# open a descriptor containing midi data and perform initialisation ready for playback
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0020
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0020 c:\mm\midi.ini
-TEST_COMPLETE
-
-#Req. under test 
-# open a URL containing midi data and perform initialisation ready for playback.
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0023
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0023 c:\mm\midi.ini
-TEST_COMPLETE
-
-// NB under stub controller/plugin, only OpenFile/Des/URL and GetState require the config file
-
-#Req. under test 
-# Closes any currently open resources, such as files, descriptors or URLs, and deletes any plugins in use
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0027
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0027
-TEST_COMPLETE
-
-#Req. under test 
-# Initiate or resume playback of a previously opened resource
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0029
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0029
-TEST_COMPLETE
-
-#Req. under test 
-# Stops playback of a resource and releases any sound device handles or other such items currently in use
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0035
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0035
-TEST_COMPLETE
-
-#Req. under test 
-# Play a single note
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0038
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0038
-TEST_COMPLETE
-
-#Req. under test 
-# Stops the playback of all notes on the given channel
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0047
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0047
-TEST_COMPLETE
-
-#Req. under test 
-# Commence playback of a note
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0050
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0050
-TEST_COMPLETE
-
-#Req. under test 
-# Terminate playback of a note
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0056
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0056
-TEST_COMPLETE
-
-#Req. under test 
-# Returns the current tempo of the currently open midi resource
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0060
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0060
-TEST_COMPLETE
-
-#Req. under test 
-# Sets the tempo at which the current midi resource should be played
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0062
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0062
-TEST_COMPLETE
-
-#Req. under test 
-# Returns the pitch shift in use for the currently open midi resource
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0066
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0066
-TEST_COMPLETE
-
-#Req. under test 
-# Set Pitch shift to apply to the currently open midi resource
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0072
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0072
-TEST_COMPLETE
-
-#Req. under test 
-# Returns the length of the currently open midi resource
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0076
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0076
-TEST_COMPLETE
-
-#Req. under test 
-# Length of the currently open midi resource
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0078
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0078
-TEST_COMPLETE
-
-#Req. under test 
-# Number of tracks present in the currently open midi resource.
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0080
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0080
-TEST_COMPLETE
-
-#Req. under test 
-# Mutes a particular track
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0082
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0082
-TEST_COMPLETE
-
-#Req. under test 
-# Number of channels used by the currently open midi resource
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0085
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0085
-TEST_COMPLETE
-
-#Req. under test 
-# Queries the type of midi resource currently open.
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0087
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0087
-TEST_COMPLETE
-
-#Req. under test 
-# Current temporal position of the midi resource being played
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0092
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0092
-TEST_COMPLETE
-
-#Req. under test 
-# Change the position of the currently playing midi resource to the given position
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0095
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0095
-TEST_COMPLETE
-
-#Req. under test 
-# Current metrical position of the midi resource being played
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0099
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0099
-TEST_COMPLETE
-
-#Req. under test 
-# Change the position of the currently playing midi resource to the given position
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0102
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0102
-TEST_COMPLETE
-
-#Req. under test 
-# Sets the frequency at which MMidiClientUtilityObserver::MmcuoPositionUpdateL() 
-# is called to allow other components to synchronise with playback of this midi resource
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0106
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0106
-TEST_COMPLETE
-
-#Req. under test 
-# Sends a midi message to the midi engine
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0111
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0111
-TEST_COMPLETE
-
-#Req. under test 
-# Sends a mip message to the midi engine
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0115
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0115
-TEST_COMPLETE
-
-#Req. under test 
-# Sends a mip message to the midi engine
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0121
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0121
-TEST_COMPLETE
-
-#Req. under test 
-# Gets the identifier of a sound bank
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0124
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0124
-TEST_COMPLETE
-
-#Req. under test 
-# Loads a custom sound bank from file into memory for use
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0129
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0129
-TEST_COMPLETE
-
-#Req. under test 
-# Removes a custom sound bank from memory
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0133
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0133
-#TEST_COMPLETE
-
-#Req. under test 
-# Gets information about the program currently in use on the given channel
-# DEFERED (No suitable Midi Controller)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0135
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0135
-#TEST_COMPLETE
-
-#Req. under test 
-# Gets the number of programs available in a given sound bank
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0137
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0137
-TEST_COMPLETE
-
-#Req. under test 
-# Gets the identifier of a program
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0141
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0141
-TEST_COMPLETE
-
-#Req. under test 
-# Gets the name of the given prog
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0146
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0146
-TEST_COMPLETE
-
-#Req. under test 
-# Sets a channel to use the given program.
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0148
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0148
-TEST_COMPLETE
-
-#Req. under test 
-# Loads a custom sound bank from file into memory for use
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0151
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0151
-TEST_COMPLETE
-
-#Req. under test 
-# Removes a program from memory
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0155
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0155
-TEST_COMPLETE
-
-#Req. under test 
-# Queries the name of a particular percussion key corresponding to a given note
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0159
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0159
-TEST_COMPLETE
-
-#Req. under test 
-# Get the play window currently set for the midi resource
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0161
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0161
-TEST_COMPLETE
-
-#Req. under test 
-# Sets the play window to use for the currently open midi resource.
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0163
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0163
-TEST_COMPLETE
-
-#Req. under test 
-# Set the number of times to repeat the current midi resource
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0168
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0168
-TEST_COMPLETE
-
-#Req. under test 
-# Gets the polyphony of the midi engine
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0173
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0173
-TEST_COMPLETE
-
-#Req. under test 
-# Get the current volume setting of a channel
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0174
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0174
-TEST_COMPLETE
-
-#Req. under test 
-# Set the volume of a channel
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0177
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0177
-TEST_COMPLETE
-
-#Req. under test 
-# Set the muting state of a channel without changing its volume setting
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0181
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0181
-TEST_COMPLETE
-
-#Req. under test 
-# Get the overall volume of the midi client.
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0183
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0183
-TEST_COMPLETE
-
-#Req. under test 
-# Maximum volume setting that may be applied overall.
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0184
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0184
-TEST_COMPLETE
-
-#Req. under test 
-# Set the overall volume of the midi client. 
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0185
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0185
-TEST_COMPLETE
-
-#Req. under test 
-# Length of time over which the volume is faded up from zero to the current settings when playback is started
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0188
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0188
-TEST_COMPLETE
-
-#Req. under test 
-# Get the current stereo balance value.
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0191
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0191
-TEST_COMPLETE
-
-#Req. under test 
-# Set the current stereo balance value.
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0193
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0193
-TEST_COMPLETE
-
-#Req. under test 
-# Set the priority with which this client plays midi data.
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0197
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0197
-TEST_COMPLETE
-
-#Req. under test 
-# Get the number of meta data entries currently known about in the currently open midi resource
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0199
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0199
-TEST_COMPLETE
-
-#Req. under test 
-# Retrieve the specified meta data entry
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0201
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0201
-#TEST_COMPLETE
-
-#Req. under test 
-# Returns the current playback rate
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0210
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0210
-TEST_COMPLETE
-
-#Req. under test 
-# Sets the playback rate
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0211
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0211
-TEST_COMPLETE
-
-#Req. under test 
-# Query the maximum playback rate
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0213
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0213
-TEST_COMPLETE
-
-#Req. under test 
-# Query the minimum playback rate
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0214
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0214
-TEST_COMPLETE
-
-#Req. under test 
-# Query the instrument
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0215
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0215
-TEST_COMPLETE
-
-#Req. under test 
-# Loads an individual instrument from descriptor
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0219
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0219
-TEST_COMPLETE
-
-#Req. under test 
-# Return the maximum volume setting
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0225
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0225
-TEST_COMPLETE
-
-#Req. under test 
-# Open a file more than once using a FileHandle 
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0306
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0306 c:\mm\midi.ini
-TEST_COMPLETE
-
-###################### NEGATIVE TEST ###############
-#Req. under test 
-# Current state of the midi client utility with regard to midi resources 
-# (Call before any initialisation has been done)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0017
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0017 c:\mm\midi.ini
-#TEST_COMPLETE
-
-#Req. under test 
-# Open a file containing midi data and perform initialisation ready for playback (Invalid Filename)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0019
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0019 c:\mm\midi.ini
-TEST_COMPLETE
-
-#Req. under test 
-# open a descriptor containing midi data and perform initialisation ready for playback (Null Descriptor)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0021
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0021 c:\mm\midi.ini
-TEST_COMPLETE
-
-#Req. under test 
-# open a descriptor containing midi data and perform initialisation ready for playback (Invalid Descriptor Data)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0022
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0022 c:\mm\midi.ini
-TEST_COMPLETE
-
-#Req. under test 
-# open a URL containing midi data and perform initialisation ready for playback. (Invalid URL)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0024
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0024 c:\mm\midi.ini
-TEST_COMPLETE
-
-#Req. under test 
-# open a URL containing midi data and perform initialisation ready for playback. (Invalid IAP)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0025
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0025 c:\mm\midi.ini
-TEST_COMPLETE
-
-#Req. under test 
-# open a URL containing midi data and perform initialisation ready for playback. (Invalid MIME Type)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0026
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0026 c:\mm\midi.ini
-TEST_COMPLETE
-
-#Req. under test 
-# Closes any currently open resources, such as files, descriptors or URLs, and deletes any plugins in use
-# (No Plugin Available)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0028
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0028
-TEST_COMPLETE
-
-#Req. under test 
-# Initiate or resume playback of a previously opened resource (No Plugin Available)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0030
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0030
-#TEST_COMPLETE
-
-#Req. under test 
-# Initiate or resume playback of a previously opened resource (Invalid System State)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0031
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0031
-#TEST_COMPLETE
-
-#Req. under test 
-# Stops playback of a resource and releases any sound device handles or other such items currently in use 
-# (No Resource Is Playing)
-# Disabled until MIDI controller available
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0036
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0036
-#TEST_COMPLETE
-
-#Req. under test 
-# Stops playback of a resource and releases any sound device handles or other such items currently in use 
-# (No Plugin Available)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0037
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0037
-TEST_COMPLETE
-
-#Req. under test 
-# Play a single note (Zero Duration)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0039
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0039
-#TEST_COMPLETE
-
-#Req. under test 
-# Play a single note (Invalid Channel)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0040
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0040
-TEST_COMPLETE
-
-#Req. under test 
-# Play a single note (Note out of range high)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0041
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0041
-TEST_COMPLETE
-
-#Req. under test 
-# Play a single note (Note out of range low)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0042
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0042
-TEST_COMPLETE
-
-#Req. under test 
-# Play a single note (Attack out of range high)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0043
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0043
-TEST_COMPLETE
-
-#Req. under test 
-# Play a single note (Attack out of range low)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0044
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0044
-TEST_COMPLETE
-
-#Req. under test 
-# Play a single note (Release out of range high)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0045
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0045
-TEST_COMPLETE
-
-#Req. under test 
-# Play a single note (Release out of range Low)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0046
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0046
-TEST_COMPLETE
-
-#Req. under test 
-# Stops the playback of all notes on the given channel (Invalid Channel Number)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0048
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0048
-TEST_COMPLETE
-
-#Req. under test 
-# Stops the playback of all notes on the given channel (No Note Available)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0049
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0049
-TEST_COMPLETE
-
-#Req. under test 
-# Commence playback of a note (Invalid Channel Number)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0051
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0051
-TEST_COMPLETE
-
-#Req. under test 
-# Commence playback of a note (Out of Range Low Note)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0052
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0052
-TEST_COMPLETE
-
-#Req. under test 
-# Commence playback of a note (Out of Range High Note)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0053
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0053
-TEST_COMPLETE
-
-#Req. under test 
-# Commence playback of a note (Out of Range Low Velocity)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0054
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0054
-TEST_COMPLETE
-
-#Req. under test 
-# Commence playback of a note (Out of Range High Velocity)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0055
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0055
-TEST_COMPLETE
-
-#Req. under test 
-# Terminate playback of a note (Invalid Channel Number)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0057
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0057
-TEST_COMPLETE
-
-#Req. under test 
-# Terminate playback of a note (No Note Currently Playing)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0058
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0058
-TEST_COMPLETE
-
-#Req. under test 
-# Terminate playback of a note (Selected Note / Velocity Set is Different to Those Palying)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0059
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0059
-#TEST_COMPLETE
-
-#Req. under test 
-# Returns the current tempo of the currently open midi resource (No Resource is Open)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0061
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0061
-#TEST_COMPLETE
-
-#Req. under test 
-# Sets the tempo at which the current midi resource should be played (Beats Out of Range Low)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0063
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0063
-TEST_COMPLETE
-
-#Does not calculate errors on out of range values, all values above 0 are a pass
-#Req. under test 
-# Sets the tempo at which the current midi resource should be played (Beats Out of:bRange High)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0064
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0064
-#TEST_COMPLETE
-
-#Req. under test 
-# Sets the tempo at which the current midi resource should be played (No Resource is Open)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0065
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0065
-#TEST_COMPLETE
-
-#Req. under test 
-# Returns the pitch shift in use for the currently open midi resource (No Resource is Open)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0067
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0067
-#TEST_COMPLETE
-
-#Req. under test 
-# Set Pitch shift to apply to the currently open midi resource (No Resource is Open)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0073
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0073
-#TEST_COMPLETE
-
-#Req. under test 
-# Set Pitch shift to apply to the currently open midi resource (Out of Range Value High)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0074
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0074
-TEST_COMPLETE
-
-#Req. under test 
-# Returns the length of the currently open midi resource (No Resource is Open)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0077
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0077
-#TEST_COMPLETE
-
-#Req. under test 
-# Length of the currently open midi resource (No Resource is Open)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0079
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0079
-#TEST_COMPLETE
-
-#Req. under test 
-# Number of tracks present in the currently open midi resource. (No Resource is Open)
-# Disabled until MIDI controller available
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0081
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0081
-#TEST_COMPLETE
-
-#Req. under test 
-# Mutes a particular track (Invalid Track)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0083
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0083
-TEST_COMPLETE
-
-#Req. under test 
-# Mutes a particular track (No Resource is Open)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0084
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0084
-#TEST_COMPLETE
-
-#Req. under test 
-# Number of channels used by the currently open midi resource (No Resource is Open)
-# Disabled until MIDI controller available
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0086
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0086
-#TEST_COMPLETE
-
-#Req. under test 
-# Queries the type of midi resource currently open. (No Resource is Open)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0088
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0088
-#TEST_COMPLETE
-
-#Req. under test 
-# Current temporal position of the midi resource being played (No Resource is Open)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0093
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0093
-#TEST_COMPLETE
-
-#Req. under test 
-# Current temporal position of the midi resource being played (Resource is not Playing)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0094
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0094
-#TEST_COMPLETE
-
-#Req. under test 
-# Change the position of the currently playing midi resource to the given position (No Resource is Open)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0096
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0096
-#TEST_COMPLETE
-
-#Req. under test 
-# Change the position of the currently playing midi resource to the given position (Out of Range Value Low)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0097
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0097
-#TEST_COMPLETE
-
-#Req. under test 
-# Change the position of the currently playing midi resource to the given position (Out of Range Value High)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0098
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0098
-#TEST_COMPLETE
-
-#Req. under test 
-# Current metrical position of the midi resource being played (No Resource is Open)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0100
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0100
-#TEST_COMPLETE
-
-#Req. under test 
-# Current metrical position of the midi resource being played (Resource is not Playing)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0101
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0101
-#TEST_COMPLETE
-
-#Req. under test 
-# Change the position of the currently playing midi resource to the given position (No Resource is Open)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0103
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0103
-#TEST_COMPLETE
-
-#Req. under test 
-# Change the position of the currently playing midi resource to the given position (Out of Range Value Low)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0104
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0104
-#TEST_COMPLETE
-
-#Req. under test 
-# Change the position of the currently playing midi resource to the given position (Out of Range Value High)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0105
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0105
-#TEST_COMPLETE
-
-#Req. under test 
-# Sets the frequency at which MMidiClientUtilityObserver::MmcuoPositionUpdateL() 
-# is called to allow other components to synchronise with playback of this midi resource (Both Arguments are Set to Zero)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0107
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0107
-#TEST_COMPLETE
-
-#Req. under test 
-# Sets the frequency at which MMidiClientUtilityObserver::MmcuoPositionUpdateL() 
-# is called to allow other components to synchronise with playback of this midi resource 
-# (Microseconds Value is Out of Range)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0108
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0108
-TEST_COMPLETE
-
-#Req. under test 
-# Sets the frequency at which MMidiClientUtilityObserver::MmcuoPositionUpdateL() 
-# is called to allow other components to synchronise with playback of this midi resource (Out of Range Interval Low)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0109
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0109
-TEST_COMPLETE
-
-#Req. under test 
-# Sets the frequency at which MMidiClientUtilityObserver::MmcuoPositionUpdateL() 
-#is called to allow other components to synchronise with playback of this midi 
-#resource (Out of Range Interval High)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0110
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0110
-#TEST_COMPLETE
-
-#Req. under test 
-# Sends a midi message to the midi engine (Call With NULL Message)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0112
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0112
-#TEST_COMPLETE
-
-#Req. under test 
-# Sends a midi message to the midi engine (Call With Unsupported Message)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0113
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0113
-#TEST_COMPLETE
-
-#Req. under test 
-# Sends a midi message to the midi engine (Call With Corrupt Message)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0114
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0114
-#TEST_COMPLETE
-
-#Req. under test 
-# Sends a mip message to the midi engine (Invalid Device ID)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0116
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0116
-#TEST_COMPLETE
-
-#Req. under test 
-# Sends a mip message to the midi engine (INULL Message)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0117
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0117
-#TEST_COMPLETE
-
-#Req. under test 
-# Sends a mip message to the midi engine (Unsupported Message)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0118
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0118
-#TEST_COMPLETE
-
-#Req. under test 
-# Sends a mip message to the midi engine (Unsupported Message)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0119
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0119
-#TEST_COMPLETE
-
-#Req. under test 
-# Sends a mip message to the midi engine (Corrupt Message)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0120
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0120
-#TEST_COMPLETE
-
-#Req. under test 
-# Sends a mip message to the midi engine (No Custom banks Exist)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0122
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0122
-#TEST_COMPLETE
-
-#Req. under test 
-# Sends a mip message to the midi engine (No Standard bank Exist)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0123
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0123
-#TEST_COMPLETE
-
-#Req. under test 
-# Gets the identifier of a sound bank (Invalid Bank Index)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0125
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0125
-#TEST_COMPLETE
-
-#Req. under test 
-# Gets the identifier of a sound bank (No Custome Banks Exist)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0126
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0126
-#TEST_COMPLETE
-
-#Req. under test 
-# Gets the identifier of a sound bank (No Standard Banks Exist)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0127
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0127
-#TEST_COMPLETE
-
-#Req. under test 
-# Loads a custom sound bank from file into memory for use (Null Filename)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0130
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0130
-#TEST_COMPLETE
-
-#Req. under test 
-# Loads a custom sound bank from file into memory for use (lnvalid Filename)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0131
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0131
-#TEST_COMPLETE
-
-#Req. under test 
-# Loads a custom sound bank from file into memory for use (lUnsupported File)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0132
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0132
-#TEST_COMPLETE
-
-#Req. under test 
-# Removes a custom sound bank from memory (ID of Bank Not Loaded)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0134
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0134
-#TEST_COMPLETE
-
-#Req. under test 
-# Gets the number of programs available in a given sound bank (Invalid Bank Index)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0138
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0138
-#TEST_COMPLETE
-
-#Req. under test 
-# Gets the number of programs available in a given sound bank (No Custome Banks Exist)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0139
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0139
-#TEST_COMPLETE
-
-#Req. under test 
-# Gets the number of programs available in a given sound bank (No Standard Banks Exist)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0140
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0140
-#TEST_COMPLETE
-
-#Req. under test 
-# Gets the identifier of a program (Invalid Bank ID)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0142
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0142
-#TEST_COMPLETE
-
-#Req. under test 
-# Gets the identifier of a program (No Custome Banks Exist)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0143
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0143
-#TEST_COMPLETE
-
-#Req. under test 
-# Gets the identifier of a program (No Standard Banks Exist)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0144
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0144
-#TEST_COMPLETE
-
-#Req. under test 
-# Gets the identifier of a program (Invalid Program Index)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0145
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0145
-#TEST_COMPLETE
-
-#Req. under test 
-# Gets the name of the given prog (Invalid Program Information)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0147
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0147
-TEST_COMPLETE
-
-#Req. under test 
-# Sets a channel to use the given program. (Invalid Channel)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0149
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0149
-#TEST_COMPLETE
-
-#Req. under test 
-# Sets a channel to use the given program. (Invalid Program ID)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0150
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0150
-#TEST_COMPLETE
-
-#Req. under test 
-# Loads a custom sound bank from file into memory for use (Invalid Bank ID)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0152
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0152
-#TEST_COMPLETE
-
-#Req. under test 
-# Loads a custom sound bank from file into memory for use (Load Program Already Loaded)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0153
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0153
-#TEST_COMPLETE
-
-#Req. under test 
-# Loads a custom sound bank from file into memory for use (Load Unsupported Program)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0154
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0154
-#TEST_COMPLETE
-
-#Req. under test 
-# Removes a program from memory (Invalid Bank ID)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0156
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0156
-#TEST_COMPLETE
-
-#Req. under test 
-# Removes a program from memory (ID of Program not Loaded)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0157
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0157
-#TEST_COMPLETE
-
-#Req. under test 
-# Removes a program from memory (Non-unloadable Program)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0158
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0158
-#TEST_COMPLETE
-
-#Req. under test 
-# Queries the name of a particular percussion key corresponding to a given note (Invalid Note)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0160
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0160
-#TEST_COMPLETE
-
-#Req. under test 
-# Get the play window currently set for the midi resource (No Midi Resource is Open)
-# Disabled until MIDI controller available
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0162
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0162
-#TEST_COMPLETE
-
-#Req. under test 
-# Sets the play window to use for the currently open midi resource. (Start / Stop time out of range)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0164
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0164
-#TEST_COMPLETE
-
-#Req. under test 
-# Sets the play window to use for the currently open midi resource. (Start / Stop time out of range)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0165
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0165
-TEST_COMPLETE
-
-#Req. under test 
-# Set the number of times to repeat the current midi resource (Repeat / Trailing Silence out of Range
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0169
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0169
-TEST_COMPLETE
-
-#Req. under test 
-# Set the number of times to repeat the current midi resource (Repeat / Trailing Silence out of Range
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0170
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0170
-#TEST_COMPLETE
-
-#Req. under test 
-# Set the number of times to repeat the current midi resource (Repeat / Trailing Silence out of Range
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0171
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0171
-#TEST_COMPLETE
-
-#Req. under test 
-# Set the number of times to repeat the current midi resource (Repeat / Trailing Silence out of Range
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0172
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0172
-#TEST_COMPLETE
-
-#Req. under test 
-# Get the current volume setting of a channel (Invalid Channel) -- DEFERED (No suitable Midi Controller)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0175
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0175
-TEST_COMPLETE
-
-
-#Req. under test 
-# Set the volume of a channel (Invalid Channel Number)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0178
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0178
-TEST_COMPLETE
-
-#Req. under test 
-# Set the volume of a channel (Volume out of Range High)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0179
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0179
-TEST_COMPLETE
-
-#Req. under test 
-# Set the volume of a channel (Volume out of Range Low)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0180
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0180
-TEST_COMPLETE
-
-#Req. under test 
-# Set the muting state of a channel without changing its volume setting (Invalid Channel)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0182
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0182
-TEST_COMPLETE
-
-
-#Req. under test 
-# Set the overall volume of the midi client. (Out of Range Volume Low) 
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0186
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0186
-#TEST_COMPLETE
-
-#Req. under test 
-# Set the overall volume of the midi client. (Out of Range Volume High) 
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0187
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0187
-#TEST_COMPLETE
-
-#Req. under test 
-# Length of time over which the volume is faded up from zero to the current settings 
-# when playback is started (Out of Range Volume Low)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0189
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0189
-#TEST_COMPLETE
-
-#Req. under test 
-# Length of time over which the volume is faded up from zero to the current settings 
-# when playback is started (Out of Range Volume High)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0190
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0190
-#TEST_COMPLETE
-
-#Req. under test 
-# Get the current stereo balance value. (Plugin Does Not Support Balance)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0192
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0192
-#TEST_COMPLETE
-
-#Req. under test 
-# Set the current stereo balance value. (Plugin Does Not Support Balance)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0194
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0194
-#TEST_COMPLETE
-
-#Req. under test 
-# Set the current stereo balance value. (Out of Range Balance Low)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0195
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0195
-#TEST_COMPLETE
-
-#Req. under test 
-# Set the current stereo balance value. (Out of Range Balance High)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0196
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0196
-#TEST_COMPLETE
-
-#Req. under test 
-# Set the priority with which this client plays midi data. (Preference Conflicts Cannot be Resolved)
-#DEFERED (Need another Midi Client)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0198
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0198
-#TEST_COMPLETE
-
-#Req. under test 
-# Get the number of meta data entries currently known about in the currently open midi resource 
-# (Plugin Does Not Support Metadata)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0200
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0200
-#TEST_COMPLETE
-
-#Req. under test 
-# Retrieve the specified meta data entry (Invalid Index)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0202
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0202
-#TEST_COMPLETE
-
-#Req. under test 
-# Retrieve the specified meta data entry (Plugin Does Not Support Metadata)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0203
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0203
-#TEST_COMPLETE
-
-
-###### TO DO - PlayBackRate Tests ########
-#Req. under test 
-# Set Playback rate (xxxx)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0212
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0212
-#TEST_COMPLETE
-##########
-
-
-###### What Negative Tests for GetInstrument ########
-#Req. under test 
-# Query the instrument (xxxxx)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0216
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0216
-#TEST_COMPLETE
-
-#Req. under test 
-# Query the instrument (xxxxx)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0217
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0217
-#TEST_COMPLETE
-
-#Req. under test 
-# Query the instrument (xxxxx)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0218
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0218
-#TEST_COMPLETE
-#########
-
-
-###### What Negative Tests for LoadInstrumentData ########
-#Req. under test 
-# Loads an individual instrument from descriptor (xxxxx)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0220
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0220
-#TEST_COMPLETE
-
-#Req. under test 
-# Loads an individual instrument from descriptor (xxxxx)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0221
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0221
-#TEST_COMPLETE
-
-#Req. under test 
-# Loads an individual instrument from descriptor (xxxxx)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0222
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0222
-#TEST_COMPLETE
-
-#Req. under test 
-# Loads an individual instrument from descriptor (xxxxx)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0223
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0223
-#TEST_COMPLETE
-
-#Req. under test 
-# Loads an individual instrument from descriptor (xxxxx)
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0224
-
-#RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0224
-#TEST_COMPLETE
-
-#Req. under test 
-# Check interface is call properly
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0300
-
-RUN_TEST_STEP -1 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0300 c:\mm\midi.ini
-TEST_COMPLETE
-
-#Req. under test 
-# Check that we can have more than 10 events in the queue.
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0301
-
-RUN_TEST_STEP 360000 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0301 c:\mm\midi.ini
-TEST_COMPLETE
-
-#Req. under test 
-# Checks that the transtion from EClosed to EClosedEngaged is made without any problems.
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0302
-
-RUN_TEST_STEP 360000 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0302 c:\mm\midi.ini
-TEST_COMPLETE
-
-#Req. under test 
-# Checks that the transtion from EClosed to ECOpenEngaged is made without any problems.
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0303
-
-RUN_TEST_STEP 360000 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0303 c:\mm\midi.ini
-TEST_COMPLETE
-
-#Req. under test 
-# Checks that the transtion from EOpenEngaged to EClosedEngaged is made without any problems.
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0304
-
-RUN_TEST_STEP 360000 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0304 c:\mm\midi.ini
-TEST_COMPLETE
-
-#Req. under test 
-# Checks that the transtion from EClosedEngaged to EClosed is made without any problems.
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0305
-
-RUN_TEST_STEP 360000 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0305 c:\mm\midi.ini
-TEST_COMPLETE
-
-####### DRM Negative Tests #######
-
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0321-HP
-
-RUN_TEST_STEP 360000 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0321-HP c:\mm\midi.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0322-HP
-
-RUN_TEST_STEP 360000 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0322-HP c:\mm\midi.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0323-HP
-
-RUN_TEST_STEP 360000 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0323-HP c:\mm\midi.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0324-HP
-
-RUN_TEST_STEP 360000 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0324-HP c:\mm\midi.ini
-TEST_COMPLETE
-
-####### DRM Positive Tests #######
-
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-1011-HP
-
-RUN_TEST_STEP 360000 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-1011-HP c:\mm\midi.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-1012-HP
-
-RUN_TEST_STEP 360000 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-1012-HP c:\mm\midi.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-1013-HP
-
-RUN_TEST_STEP 360000 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-1013-HP c:\mm\midi.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-1014-HP
-
-RUN_TEST_STEP 360000 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-1014-HP c:\mm\midi.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-1015-HP
-
-RUN_TEST_STEP 360000 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-1015-HP c:\mm\midi.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-1016-HP
-
-RUN_TEST_STEP 360000 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-1016-HP c:\mm\midi.ini
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-1020-HP
-
-RUN_TEST_STEP 360000 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-1020-HP c:\mm\midi.ini
-TEST_COMPLETE
-
-#Req. under test 
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-1021-HP
-
-RUN_TEST_STEP 360000 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-1021-HP c:\mm\midi.ini
-TEST_COMPLETE
--- a/mmlibs/mmfw/tsrc/mmfunittest/scripts/TSU_MMF_MIDICLNT_00_Alloc.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-// TSI_MMF_MIDICLNT_00_Alloc.script
-
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Creation Date 06/05/2003
-// 
-//
-
-PRINT Run all the MMF MIDI client OOM unit tests 
-PRINT 
-//PAUSE_AT_END
-
-
-//
-LOAD_SUITE TSU_MMFMIDICLNT.DLL
-
-
-// 2 secs
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0100-CP
-
-RUN_TEST_STEP 60000, TSU_MMFMIDICLNT, MM-MMF-MIDICLNT-U-0100-CP C:\mm\midi.ini
-TEST_COMPLETE 
-
-// 2 secs
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0200-CP
-
-RUN_TEST_STEP 60000, TSU_MMFMIDICLNT, MM-MMF-MIDICLNT-U-0200-CP C:\mm\midi.ini
-TEST_COMPLETE 
-
-// 2 secs
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0201-CP
-
-RUN_TEST_STEP 60000, TSU_MMFMIDICLNT, MM-MMF-MIDICLNT-U-0201-CP C:\mm\midi.ini
-TEST_COMPLETE 
-
-// 2 secs
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0202-CP
-
-RUN_TEST_STEP 60000, TSU_MMFMIDICLNT, MM-MMF-MIDICLNT-U-0202-CP C:\mm\midi.ini
-TEST_COMPLETE 
-
-
-# Check can create lots of clients, without heap limit
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-2000-HP
-
-RUN_TEST_STEP 360000 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-2000-HP c:\mm\midi.ini
-TEST_COMPLETE
-
-# ditto but include one client that has it's own heap
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-2001-HP
-
-RUN_TEST_STEP 360000 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-2001-HP c:\mm\midi.ini
-TEST_COMPLETE
-
-# Check can create lots of clients and delete them repeatedly withoutleaking chunks
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-2002-HP
-
-RUN_TEST_STEP 360000 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-2002-HP c:\mm\midi.ini
-TEST_COMPLETE
-
-# ditto but include one client that has it's own heap
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-2003-HP
-
-RUN_TEST_STEP 360000 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-2003-HP c:\mm\midi.ini
-TEST_COMPLETE
--- a/mmlibs/mmfw/tsrc/mmfunittest/scripts/TSU_MMF_MIDICLNT_RF.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-LOAD_SUITE TSU_MMFMIDICLNT.DLL
-#PAUSE_AT_END
-
-#################Tests for MS 3.4 File Handles API.################
-#Positive tests
-#Open a file containing midi data and perform initialisation ready for playback.
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-1001
-
-RUN_TEST_STEP 360000 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-1001 c:\mm\midi.ini
-TEST_COMPLETE
-
-#Initiate or resume playback of a previously opened resource.
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-1002
-
-RUN_TEST_STEP 360000 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-1002 c:\mm\midi.ini
-TEST_COMPLETE
-
-#Negative tests
-#Open a MIDI File containing text data and try to perform initialisation ready for playback - (Invalid File).
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-0223
-
-RUN_TEST_STEP 360000 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0223 c:\mm\midi.ini
-TEST_COMPLETE
--- a/mmlibs/mmfw/tsrc/mmfunittest/scripts/TSU_MMF_MIDICLNT_RF_Alloc.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-// TSI_MMF_MIDICLNT_RF_Alloc.script
-
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Creation Date 21/10/2004
-// 
-//
-
-PRINT Run all the MMF MIDI client OOM unit tests 
-PRINT 
-//PAUSE_AT_END
-
-
-//
-LOAD_SUITE TSU_MMFMIDICLNT.DLL
-
-// MS 3.4 File Handles Alloc test.
-//! @SYMTestCaseID MM-MMF-MIDICLNT-U-1003
-
-RUN_TEST_STEP 60000, TSU_MMFMIDICLNT, MM-MMF-MIDICLNT-U-1003 C:\mm\midi.ini
-TEST_COMPLETE 
--- a/mmlibs/mmfw/tsrc/mmfunittest/scripts/TSU_MMF_MMRUF_ALLOC.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-LOAD_SUITE TSU_MMF_MMRUF.dll
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0001-CP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0001-CP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0002-CP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0002-CP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0003-CP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0003-CP
-TEST_COMPLETE
\ No newline at end of file
--- a/mmlibs/mmfw/tsrc/mmfunittest/scripts/TSU_MMF_SWCODECDEVICES.ini	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-[SectionOne]
-sectionNum= 1
-CodedData01   = c:\mm\mmf\testfiles\SwCodecDevices\Seq01.cod
-SourceData01  = c:\mm\mmf\testfiles\SwCodecDevices\Seq01.inp
-DecodedData01 = c:\mm\mmf\testfiles\SwCodecDevices\Seq01.out
-
-
-
-
-
-
--- a/mmlibs/mmfw/tsrc/mmfunittest/scripts/midi.ini	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-[SectionOne]
-sectionNum = 1
-filename = c:\MidiClntITestData\midi.mid
-
-[SectionTwo]
-sectionNum = 2
-filename = c:\MidiClntITestData\textmidi.mid
-
-[SectionDRM]
-MidiContentRights = c:\MidiClntITestData\Midi.contentrights
-MidiDrmContent = c:\MidiClntITestData\Midi.content
--- a/mmlibs/mmfw/tsrc/mmfunittest/scripts/tsu_mmf_aclnt_securedrm.ini	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-[SectionOne]
-AudioPlayFName1  = c:\mm\mmf\testfiles\aclnt\smallwav_audio.content
--- a/mmlibs/mmfw/tsrc/mmfunittest/scripts/tsu_mmf_aclnt_securedrm.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Creation Date 20/12/2007
-// 
-//
-
-# wait for ring.wav to finish playing
-delay 1000
-
-//PAUSE_AT_END
-
-// 
-MULTITHREAD
-
-//
-LOAD_SUITE TSU_MMF_ACLNT_01.dll
-
-//! @SYMTestCaseID MM-MMF-ACLNT-SECUREDRM-U-0001-CP
-
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0010-CP c:\mm\tsu_mmf_aclnt_securedrm.ini MM-MMF-ACLNT-SECUREDRM-U-0001-CP
-TEST_COMPLETE 
--- a/mmlibs/mmfw/tsrc/mmfunittest/scripts/tsu_mmf_aclnt_securedrmtestdata.ini	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-[CreateSmallWavDrmArchiveAudio]
-; Create a self-contained DRM protected content file, which comprises content and rights.
-ContentDescription = c:\mm\mmf\testfiles\aclnt\smallwav_audiocontent.xml
-RightsDescription = c:\mm\mmf\testfiles\aclnt\smallwav_audiorights.xml
-OutputFile = c:\mm\mmf\testfiles\aclnt\smallwav_audio.contentrights
-
-[ImportSmallWavDrmArchiveAudio]
-; Create a DRM protected content file, without rights.  The rights are stripped
-; from the input file and stored separately (in the Rights database).
-source = c:\mm\mmf\testfiles\aclnt\smallwav_audio.contentrights
-target = c:\mm\mmf\testfiles\aclnt\smallwav_audio.content
\ No newline at end of file
--- a/mmlibs/mmfw/tsrc/mmfunittest/scripts/tsu_mmf_aclnt_securedrmtestdata.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// tsu_mmf_aclnt_drmtestdata.script
-// <<UNUSED>>
-// 
-//
-
-# Run using TestExecute as a non-automated utility to create
-# DRM protected content data files:
-#
-# %EPOCROOT%Epoc32\RELEASE\WINSCW\UDEB\testexecute \mm\tsu_mmf_aclnt_drmtestdata.script
-#
-# The output data files are then used as input by the automated TestFramework scripts.
-#
-# Results can be found in %EPOCROOT%Epoc32\winscw\c\Logs\TestExecute
-
-LOAD_SUITE RTAUtils
-
-RUN_TEST_STEP 1000 RTAUtils ClearRightsDb 
-
-# Delete output data files before running these test steps, .content and .contentrights
-RUN_UTILS DeleteFile c:\mm\mmf\testfiles\aclnt\smallwav_audio.contentrights
-RUN_UTILS DeleteFile c:\mm\mmf\testfiles\aclnt\smallwav_audio.content
-RUN_TEST_STEP 1000 RTAUtils CreateDrmArchive c:\mm\tsu_mmf_aclnt_securedrmtestdata.ini CreateSmallWavDrmArchiveAudio
-RUN_TEST_STEP 1000 RTAUtils ImportDrmArchive c:\mm\tsu_mmf_aclnt_securedrmtestdata.ini ImportSmallWavDrmArchiveAudio
-
--- a/mmlibs/mmfw/tsrc/mmfunittest/scripts/tsu_mmf_mmruf.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,293 +0,0 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-LOAD_SUITE TSU_MMF_MMRUF.dll
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0001-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0001-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0004-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0004-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0007-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0007-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0010-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0010-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0013-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0013-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0016-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0016-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0019-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0019-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0022-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0022-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0025-HP
-
-//RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0025-HP
-//TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0028-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0028-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0031-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0031-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0034-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0034-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0037-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0037-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0040-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0040-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0043-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0043-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0046-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0046-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0049-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0049-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0052-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0052-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0055-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0055-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0058-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0058-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0061-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0061-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0064-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0064-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0067-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0067-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0070-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0070-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0073-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0073-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0076-HP
-
-//RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0076-HP
-//TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0077-HP
-
-//RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0077-HP
-//TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0078-HP
-
-//RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0078-HP
-//TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0079-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0079-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0082-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0082-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0085-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0085-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0088-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0088-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0091-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0091-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0094-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0094-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0097-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0097-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0100-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0100-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0104-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0104-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0107-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0107-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0109-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0109-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0112-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0112-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0116-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0116-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0119-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0119-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0122-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0122-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0125-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0125-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0128-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0128-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0131-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0131-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0134-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0134-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0137-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0137-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0140-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0140-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0142-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0142-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0145-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0145-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0148-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0148-HP
-TEST_COMPLETE
-
-// Directory listing test (non-MM files)
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0400-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0400-HP
-TEST_COMPLETE
-
-// DEF129505 - MMRuf incorrectly recognises unicode text files as MP3 files
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0500-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0500-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0601-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0601-HP
-TEST_COMPLETE
--- a/mmlibs/mmfw/tsrc/mmfunittest/scripts/tsu_mmf_mmruf_badext.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,200 +0,0 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-LOAD_SUITE TSU_MMF_MMRUF.dll
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0002-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0002-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0005-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0005-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0008-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0008-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0011-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0011-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0014-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0014-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0017-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0017-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0020-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0020-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0023-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0023-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0026-HP
-
-//RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0026-HP
-//TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0029-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0029-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0032-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0032-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0035-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0035-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0038-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0038-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0041-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0041-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0044-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0044-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0047-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0047-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0050-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0050-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0053-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0053-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0056-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0056-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0059-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0059-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0062-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0062-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0065-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0065-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0068-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0068-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0071-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0071-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0074-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0074-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0080-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0080-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0083-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0083-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0086-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0086-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0089-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0089-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0092-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0092-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0095-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0095-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0098-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0098-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0101-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0101-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0146-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0146-HP
-TEST_COMPLETE
-
-
-
-
-
-
-
-
-
-
-
-
-
-
--- a/mmlibs/mmfw/tsrc/mmfunittest/scripts/tsu_mmf_mmruf_corrupt.script	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,194 +0,0 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-LOAD_SUITE TSU_MMF_MMRUF.dll
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0003-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0003-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0006-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0006-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0009-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0009-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0012-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0012-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0015-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0015-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0018-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0018-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0021-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0021-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0024-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0024-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0027-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0027-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0030-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0030-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0033-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0033-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0036-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0036-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0039-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0039-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0042-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0042-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0045-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0045-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0048-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0048-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0051-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0051-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0054-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0054-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0057-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0057-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0060-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0060-HP
-TEST_COMPLETE
-
-// Corrupt Beatnik RMF - Clashes with Corrupt RealAudio RMF
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0063-HP
-
-//RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0063-HP
-//TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0066-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0066-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0069-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0069-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0072-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0072-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0075-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0075-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0081-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0081-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0084-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0084-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0087-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0087-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0090-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0090-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0093-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0093-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0096-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0096-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0099-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0099-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0102-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0102-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0147-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0147-HP
-TEST_COMPLETE
-
-//! @SYMTestCaseID MM-MMF-MMRUF-U-0600-HP
-
-RUN_TEST_STEP -1, TSU_MMF_MMRUF, MM-MMF-MMRUF-U-0600-HP
-TEST_COMPLETE
-
-
--- a/mmlibs/mmfw/tsrc/mmfunittest/srtdecoder/group/bld.inf	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/srtdecoder/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -16,9 +16,15 @@
 PRJ_PLATFORMS
 DEFAULT
 
-PRJ_EXPORTS
-../scripts/tsu_mmf_subtitledecoder.script c:/mm/tsu_mmf_subtitledecoder.script
-../inc/tsu_mmf_subtitledecoder.iby /epoc32/rom/include/tsu_mmf_subtitledecoder.iby
+PRJ_TESTMMPFILES
+../mmpfiles/tsu_mmf_subtitledecoder.mmp
+
+PRJ_TESTEXPORTS
+
+// test scripts
+../scripts/tsu_mmf_subtitledecoder.script 	c:/mm/tsu_mmf_subtitledecoder.script
+
+// test data files
 ../data/subtitle1.srt	    c:/mm/subtitle1.srt
 ../data/subtitle2.srt	    c:/mm/subtitle2.srt
 ../data/subtitlebmp0.mbm     c:/mm/subtitlebmp0.mbm
@@ -32,6 +38,8 @@
 ../data/subtitlebmp8.mbm     c:/mm/subtitlebmp8.mbm
 ../data/subtitlebmp9.mbm     c:/mm/subtitlebmp9.mbm
 
-PRJ_MMPFILES
-../mmpfiles/tsu_mmf_subtitledecoder.mmp
+//iby files
+../group/tsu_mmf_subtitledecoder.iby 			/epoc32/rom/include/tsu_mmf_subtitledecoder.iby
+../group/tsu_mmf_subtitledecoder_excl_test.iby 		/epoc32/rom/include/tsu_mmf_subtitledecoder_excl_test.iby
 
+
--- a/mmlibs/mmfw/tsrc/mmfunittest/srtdecoder/inc/tsu_mmf_subtitledecoder.iby	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-#ifndef TSU_MMF_SUBTITLEDECODER_IBY
-#define TSU_MMF_SUBTITLEDECODER_IBY
-
-file=ABI_DIR/DEBUG_DIR/tsu_mmf_subtitledecoder.dll              sys\bin\tsu_mmf_subtitledecoder.dll
-data=DATAC_/mm/tsu_mmf_subtitledecoder.script                   \mm\tsu_mmf_subtitledecoder.script
-
-#endif // TSU_MMF_SUBTITLEDECODER_IBY
-
--- a/mmlibs/mmfw/tsrc/mmfunittest/subtitlegraphic/inc/tsu_mmf_subtitlegraphic.iby	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-#ifndef TSU_MMF_SUBTITLEGRAPHIC_IBY
-#define TSU_MMF_SUBTITLEGRAPHIC_IBY
-
-file=ABI_DIR/DEBUG_DIR/tsu_mmf_subtitlegraphic.dll			sys\bin\tsu_mmf_subtitlegraphic.dll
-
-data=DATAC_/mm/tsu_mmf_subtitlegraphic.script				\tsu_mmf_subtitlegraphic.script
-data=DATAC_/mm/mmf/testfiles/subtitlegraphic/subtitletestdata.png	\mm\mmf\testfiles\subtitlegraphic\subtitletestdata.png
-data=DATAC_/mm/mmf/testfiles/subtitlegraphic/subtitletestdata2.png	\mm\mmf\testfiles\subtitlegraphic\subtitletestdata2.png
-
-#endif // TSU_MMF_SUBTITLEGRAPHIC_IBY
-
--- a/mmlibs/mmfw/tsrc/mmfunittest/videorenderer/group/bld.inf	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/videorenderer/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -16,11 +16,12 @@
 PRJ_PLATFORMS
 DEFAULT
 
-PRJ_EXPORTS
+PRJ_TESTEXPORTS
 ../scripts/tsu_mmf_videorenderer.script			c:/mm/tsu_mmf_videorenderer.script
 ../scripts/tsu_mmf_videorenderer_debug.script	c:/mm/tsu_mmf_videorenderer_debug.script
 
 ../inc/tsu_mmf_videorenderer.iby /epoc32/rom/include/tsu_mmf_videorenderer.iby
+../inc/tsu_mmf_videorenderer_excl_test.iby /epoc32/rom/include/tsu_mmf_videorenderer_excl_test.iby
 
-PRJ_MMPFILES
+PRJ_TESTMMPFILES
 ../mmpfiles/tsu_mmf_videorenderer.mmp
--- a/mmlibs/mmfw/tsrc/mmfunittest/videorenderer/inc/tsu_mmf_videorenderer.iby	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/videorenderer/inc/tsu_mmf_videorenderer.iby	Fri Jul 09 12:23:13 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -16,14 +16,10 @@
 #ifndef TSU_MMF_VIDEORENDERER_IBY
 #define TSU_MMF_VIDEORENDERER_IBY
 
-file=ABI_DIR/BUILD_DIR/tsu_mmf_videorenderer.dll		sys\bin\tsu_mmf_videorenderer.dll
-data=DATAZ_/resource/videorenderer/tsu_videorenderer1.rsc	resource\videorenderer\tsu_videorenderer1.rsc
-data=DATAZ_/resource/videorenderer/tsu_videorenderer2.rsc	resource\videorenderer\tsu_videorenderer2.rsc
-data=DATAZ_/resource/videorenderer/tsu_videorenderer3.rsc	resource\videorenderer\tsu_videorenderer3.rsc
-data=DATAZ_/resource/videorenderer/tsu_videorenderer4.rsc	resource\videorenderer\tsu_videorenderer4.rsc
+#include <tsu_mmf_videorenderer_excl_test.iby>
 
-data=DATAC_/mm/tsu_mmf_videorenderer.script				\tsu_mmf_videorenderer.script
-data=DATAC_/mm/tsu_mmf_videorenderer_debug.script		\tsu_mmf_videorenderer_debug.script
+data=DATAC_\mm\tsu_mmf_videorenderer.script				\tsu_mmf_videorenderer.script
+data=DATAC_\mm\tsu_mmf_videorenderer_debug.script		\tsu_mmf_videorenderer_debug.script
 
 #endif // TSU_MMF_VIDEORENDERER_IBY
 
--- a/mmlibs/mmfw/tsrc/mmvalidationsuite/mvsintegrationtest/group/bld.inf	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmvalidationsuite/mvsintegrationtest/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -27,6 +27,7 @@
 PRJ_TESTEXPORTS
 // iby
 ../group/tsi_mvs_agents.iby         /epoc32/rom/include/tsi_mvs_agents.iby
+../group/tsi_mvs_agents_excl_test.iby         /epoc32/rom/include/tsi_mvs_agents_excl_test.iby
 
 // ini
 ../scripts/tsi_mvs_agents.ini       c:/mvs/tsi_mvs_agents.ini
--- a/mmlibs/mmfw/tsrc/mmvalidationsuite/mvsintegrationtest/group/tsi_mvs_agents.iby	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmvalidationsuite/mvsintegrationtest/group/tsi_mvs_agents.iby	Fri Jul 09 12:23:13 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -16,8 +16,7 @@
 #ifndef TSI_MVS_AGENTS_IBY
 #define TSI_MVS_AGENTS_IBY
 
-// debug build
-file=ABI_DIR\DEBUG_DIR\tsi_mvs_agents.dll 	System\Libs\tsi_mvs_agents.dll
+#include <tsi_mvs_agents_excl_test.iby>
 
 //ini
 data=EPOCROOT##epoc32\data\c\mvs\tsi_mvs_agents.ini	\mvs\tsi_mvs_agents.ini
@@ -38,7 +37,4 @@
 data=EPOCROOT##epoc32\data\c\mvs\tsi_mvs_agents_bc.ini	\mvs\tsi_mvs_agents_bc.ini
 #endif // SYMBIAN_GRAPHICS_USE_GCE
 
-//data files
-//exported using copydatatocf.bat and usbldr.pm, so removed from iby file
-
 #endif
--- a/mmlibs/mmutilitylib/group/BLD.INF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Multimedia Common
-// 
-//
-
-/**
- @file
-*/
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-../inc/mm/mmcaf.h		  SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mm/mmcaf.h)          
-../inc/mm/MmCleanup.h		  SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mm/mmcleanup.h)
-../inc/mm/MmPluginUtils.h	  SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mm/mmpluginutils.h)
-../inc/mm/conversioncoefficient.h	  SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mm/conversioncoefficient.h)          
-
-../bwins/MMCommon.def 		def/win32/mmcommon.def
-../eabi/MMCommon.def       	def/eabi/mmcommon.def
-
-// Romkit include files 
-../inc/mmcommon.iby       /epoc32/rom/include/mmcommon.iby
-
-PRJ_MMPFILES
-../mmpfiles/MMCommon.mmp
-../mmpfiles/MMCommonUtils.mmp
-
-PRJ_TESTMMPFILES
-// None
-
-PRJ_TESTEXPORTS
-// None
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mmlibs/mmutilitylib/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -0,0 +1,46 @@
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// Multimedia Common
+// 
+//
+
+/**
+ @file
+*/
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_EXPORTS
+../inc/mm/mmcaf.h		  SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mm/mmcaf.h)          
+../inc/mm/MmCleanup.h		  SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mm/mmcleanup.h)
+../inc/mm/MmPluginUtils.h	  SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mm/mmpluginutils.h)
+../inc/mm/conversioncoefficient.h	  SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mm/conversioncoefficient.h)          
+
+../bwins/MMCommon.def 		def/win32/mmcommon.def
+../eabi/MMCommon.def       	def/eabi/mmcommon.def
+
+// Romkit include files 
+../inc/mmcommon.iby       /epoc32/rom/include/mmcommon.iby
+
+PRJ_MMPFILES
+../mmpfiles/MMCommon.mmp
+../mmpfiles/MMCommonUtils.mmp
+
+PRJ_TESTMMPFILES
+// None
+
+PRJ_TESTEXPORTS
+// None
+
--- a/mmlibs/mmutilitylib/group/multimedia_common.mrp	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmlibs/mmutilitylib/group/multimedia_common.mrp	Fri Jul 09 12:23:13 2010 +0100
@@ -1,17 +1,6 @@
+#multimedia_common.mrp
 #
-# Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description: 
+#Copyright (c) 2005-2009 Symbian Ltd.  All rights reserved.
 #
 
 component	multimedia_common
--- a/mmplugins/cameraplugins/group/BLD.INF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// On board camera API
-// 
-//
-
-/**
- @file
-*/
-
-#ifdef SYMBIAN_MULTIMEDIA_THREEPLANEARCH
-//Include the mmcameraclientplugin
-#include "../source/mmcameraclientplugin/group/bld.inf"
-#endif //SYMBIAN_MULTIMEDIA_THREEPLANEARCH
-
-PRJ_EXPORTS
-// ROM  buildsupport
-../inc/ecam_stubplugin.iby  /epoc32/rom/include/ecam_stubplugin.iby
-
-PRJ_MMPFILES
-../mmpfiles/ECamStubPlugin.mmp
-
-PRJ_TESTMMPFILES
-../mmpfiles/TestCamera.mmp
-
-PRJ_TESTEXPORTS
-../inc/ecam_test.iby	/epoc32/rom/include/ecam_test.iby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mmplugins/cameraplugins/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -0,0 +1,38 @@
+// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// On board camera API
+// 
+//
+
+/**
+ @file
+*/
+
+#ifdef SYMBIAN_MULTIMEDIA_THREEPLANEARCH
+//Include the mmcameraclientplugin
+#include "../source/mmcameraclientplugin/group/bld.inf"
+#endif //SYMBIAN_MULTIMEDIA_THREEPLANEARCH
+
+PRJ_EXPORTS
+// ROM  buildsupport
+../inc/ecam_stubplugin.iby  /epoc32/rom/include/ecam_stubplugin.iby
+
+PRJ_MMPFILES
+../mmpfiles/ECamStubPlugin.mmp
+
+PRJ_TESTMMPFILES
+../mmpfiles/TestCamera.mmp
+
+PRJ_TESTEXPORTS
+../inc/ecam_test.iby	/epoc32/rom/include/ecam_test.iby
--- a/mmplugins/lib3gp/group/multimedia_3gplibrary.mrp	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmplugins/lib3gp/group/multimedia_3gplibrary.mrp	Fri Jul 09 12:23:13 2010 +0100
@@ -1,17 +1,6 @@
+#multimedia_3gplibrary.mrp
 #
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description: 
+#Copyright (c) Symbian Software Ltd 2009.  All rights reserved.
 #
 
 component	multimedia_3gplibrary
--- a/mmplugins/lib3gp/impl/inc/filewriter.h	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmplugins/lib3gp/impl/inc/filewriter.h	Fri Jul 09 12:23:13 2010 +0100
@@ -149,9 +149,6 @@
         TInt iMaxOutputBufSoftLimit;
         // Current output file size
 		TInt64 iOutputFileSize;
-		// Output file setsize cooldown 
-		//(setsize is done only after previously added size has been written to)
-		TInt64 iOutputFileSetSizeCooldown;
 
         // Output file for writes.
         RFile64* iOutputFile;
--- a/mmplugins/lib3gp/impl/src/file.cpp	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmplugins/lib3gp/impl/src/file.cpp	Fri Jul 09 12:23:13 2010 +0100
@@ -180,7 +180,7 @@
   if (error != KErrNone && error != KErrAlreadyExists)
     return -1;
 
-  if (file->Replace(*fs, TPtrC((const TUint16 *)filename), EFileWrite|EFileShareExclusive ) != KErrNone)
+  if (file->Replace(*fs, TPtrC((const TUint16 *)filename), EFileWrite|EFileShareExclusive|EFileWriteDirectIO ) != KErrNone)
   {
     return -1;
   }
@@ -226,7 +226,7 @@
   RFile64 * file = new RFile64;
   TBuf16<KMaxFileName> name(reinterpret_cast<const TUint16*>(filename));
   ASSERT(handle->fs != NULL);
-  err = file->Replace(*(RFs*)(handle->fs), name, EFileStream | EFileRead | EFileWrite);
+  err = file->Replace(*(RFs*)(handle->fs), name, EFileStream | EFileRead | EFileWrite | EFileWriteDirectIO);
   if (err != KErrNone)
   {
 	delete file;
--- a/mmplugins/lib3gp/impl/src/filewriter.cpp	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmplugins/lib3gp/impl/src/filewriter.cpp	Fri Jul 09 12:23:13 2010 +0100
@@ -57,7 +57,6 @@
     iOutputBufferSize = KFileWriterBufferSizeSmall;
     iMaxOutputBufHardLimit = KFileWriterHardBufLimit;
     iMaxOutputBufSoftLimit = KFileWriterSoftBufLimit;
-    iOutputFileSetSizeCooldown = 0;
 
     iMemReadyForWriting = EFalse;
     iInputBuf = NULL;
@@ -496,25 +495,7 @@
         PRINT((_L("e_cfilewriter_runl 0")));  
         return;
         }
-        
-	// SetSize - reserve room for file writes in output file for all full buffers.
-	// This is done for performance reasons. Reserving space beforehand reduce FS overhead per write.
-	// Don't do new setsize until previously increased filesize has been filled.
-	if ( iOutputFileSetSizeCooldown ) 
-		{
-		iOutputFileSetSizeCooldown--;
-		PRINT((_L("CFileWriter::RunL() Setsize, buffer was written to reserved space, cooldown: %d"), iOutputFileSetSizeCooldown));		
-		}
-		
-	// if we have cumulated over iMaxOutputBufSoftLimit/2 full output buffers and setsize not in cooldown then set new size.
-	if ( !iOutputFileSetSizeCooldown && (iFullBufferQueue.Count() > iMaxOutputBufSoftLimit/2) )
-		{
-		PRINT(_L("CFileWriter::RunL() Setsize, start new size set"));
-		iOutputFile->SetSize(iOutputFileSize + (iFullBufferQueue.Count()*iOutputBufferSize) );
-		iOutputFileSetSizeCooldown = iFullBufferQueue.Count();
-		PRINT((_L("CFileWriter::RunL() Setsize, New size set to: %d, cooldown set: %d"), iOutputFileSize + (iFullBufferQueue.Count()*iOutputBufferSize), iOutputFileSetSizeCooldown));		
-		}
-	
+
     if ( iFullBufferQueue.Count() >= iMaxOutputBufHardLimit )
         {
         while ( iFullBufferQueue.Count() > iMaxOutputBufSoftLimit )
--- a/mmplugins/lib3gpunittest/group/bld.inf	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmplugins/lib3gpunittest/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -17,10 +17,15 @@
 DEFAULT
 
 PRJ_MMPFILES
+
+PRJ_EXPORTS
+
+PRJ_TESTMMPFILES
 ../mmpfiles/tsu_3gplibrary.mmp
 
-PRJ_EXPORTS
+PRJ_TESTEXPORTS
 ../group/tsu_3gplibrary.iby 					/epoc32/rom/include/tsu_3gplibrary.iby
+../group/tsu_3gplibrary_excl_test.iby 			/epoc32/rom/include/tsu_3gplibrary_excl_test.iby
 
 ../scripts/tsu_3gp_compose_oom_te.script		c:/mm/tsu_3gp_compose_oom_te.script
 ../scripts/tsu_3gp_compose_api_te.script		c:/mm/tsu_3gp_compose_api_te.script
@@ -46,6 +51,3 @@
 #include "interopfiles.inf"
 #include "performancefiles.inf"
 
-PRJ_TESTMMPFILES
-
-PRJ_TESTEXPORTS
--- a/mmplugins/lib3gpunittest/group/interopfiles.inf	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmplugins/lib3gpunittest/group/interopfiles.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -13,7 +13,7 @@
 // Description:
 //
 
-PRJ_EXPORTS
+PRJ_TESTEXPORTS
 
 // interop scripts
 ../scripts/tsu_3gp_interop_te.ini		c:/mm/tsu_3gp_interop_te.ini
--- a/mmplugins/lib3gpunittest/group/performancefiles.inf	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmplugins/lib3gpunittest/group/performancefiles.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -13,7 +13,7 @@
 // Description:
 //
 
-PRJ_EXPORTS
+PRJ_TESTEXPORTS
 
 // interop scripts
 ../scripts/tsu_3gp_performance_te.ini		c:/mm/tsu_3gp_performance_te.ini
--- a/mmplugins/lib3gpunittest/group/tsu_3gplibrary.iby	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmplugins/lib3gpunittest/group/tsu_3gplibrary.iby	Fri Jul 09 12:23:13 2010 +0100
@@ -16,10 +16,8 @@
 #ifndef TSU_3GPLIBRARY_IBY
 #define TSU_3GPLIBRARY_IBY
 
-#include <testexecute.iby>
-
-// 3GP\MP4 File Format Library unit tests
-file=ABI_DIR\BUILD_DIR\tsu_3gplibrary.exe				System\Libs\tsu_3gplibrary.exe
+// test binary
+#include <tsu_3gplibrary_excl_test.iby>
 
 // script files
 data=EPOCROOT##epoc32\data\c\mm\tsu_3gp_parse_api_te.script	\mm\tsu_3gp_parse_api_te.script	
--- a/mmplugins/mmfwplugins/group/BLD.INF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-#ifdef SYMBIAN_VARIABLE_BITRATE_CODEC // use system wide flag to trigger model controller build
-#define SYMBIAN_MMF_MODEL_CONTROLLERS
-#endif
-
-#ifdef SYMBIAN_MMF_MODEL_CONTROLLERS
-// Exports ogg header + lib file for ogg utility library
-#include "../src/Plugin/Controller/Audio/OggVorbis/oggutils/group/bld_include.inf"
-#endif
-
-PRJ_PLATFORMS
-// specify the platforms your component needs to be built for here
-// may add platform for OMAP, Helen etc
-DEFAULT
-
-
-PRJ_EXPORTS
-//romkit
-mmf_plugin.iby				 	  /epoc32/rom/include/
-#ifdef SYMBIAN_MMF_MODEL_CONTROLLERS
-../inc/controllers/oggvorbis.iby /epoc32/rom/include/oggvorbis.iby
-../inc/controllers/avi.iby       /epoc32/rom/include/avi.iby
-#endif
-
-#ifdef SYMBIAN_MULTIMEDIA_SUBTITLE_SUPPORT 
-//subtitle
-../src/Plugin/Controller/Video/AviPlayController/srtdecoder/subtitledecoder.iby	/epoc32/rom/include/subtitledecoder.iby
-../inc/controllers/subtitle.iby	/epoc32/rom/include/subtitle.iby
-
-// subtitle client CRP header
-../src/Plugin/subtitle/subtitlegraphic/mmfsubtitlegraphic.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmf/plugin/mmfsubtitlegraphic.h)
-#endif
-
-
-PRJ_MMPFILES
-
-//plugin
-
-../MMPFiles/Plugin/MmfWAVFormat.mmp
-../MMPFiles/Plugin/MmfRAWFormat.mmp  
-../MMPFiles/Plugin/MmfAUFormat.mmp 
-
-#ifdef SYMBIAN_MMF_MODEL_CONTROLLERS
-../MMPFiles/Plugin/OggPlayController.mmp
-../MMPFiles/Plugin/OggRecordController.mmp
-../MMPFiles/Plugin/MmfaviplayController.mmp
-../MMPFiles/Plugin/MmfaviRecordController.mmp
-#endif
-
-#ifdef SYMBIAN_MULTIMEDIA_SUBTITLE_SUPPORT 
-../MMPFiles/Plugin/srtdecoder.mmp
-../MMPFiles/Plugin/mmfdevsubtitle.mmp
-../MMPFiles/Plugin/mmfsubtitlegraphic.mmp 
-../MMPFiles/Plugin/mmfsubtitlegraphicdrawer.mmp
-#endif
-
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mmplugins/mmfwplugins/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -0,0 +1,71 @@
+// Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+#ifdef SYMBIAN_VARIABLE_BITRATE_CODEC // use system wide flag to trigger model controller build
+#define SYMBIAN_MMF_MODEL_CONTROLLERS
+#endif
+
+#ifdef SYMBIAN_MMF_MODEL_CONTROLLERS
+// Exports ogg header + lib file for ogg utility library
+#include "../src/Plugin/Controller/Audio/OggVorbis/oggutils/group/bld_include.inf"
+#endif
+
+PRJ_PLATFORMS
+// specify the platforms your component needs to be built for here
+// may add platform for OMAP, Helen etc
+DEFAULT
+
+
+PRJ_EXPORTS
+//romkit
+mmf_plugin.iby				 	  /epoc32/rom/include/
+#ifdef SYMBIAN_MMF_MODEL_CONTROLLERS
+../inc/controllers/oggvorbis.iby /epoc32/rom/include/oggvorbis.iby
+../inc/controllers/avi.iby       /epoc32/rom/include/avi.iby
+#endif
+
+#ifdef SYMBIAN_MULTIMEDIA_SUBTITLE_SUPPORT 
+//subtitle
+../src/Plugin/Controller/Video/AviPlayController/srtdecoder/subtitledecoder.iby	/epoc32/rom/include/subtitledecoder.iby
+../inc/controllers/subtitle.iby	/epoc32/rom/include/subtitle.iby
+
+// subtitle client CRP header
+../src/Plugin/subtitle/subtitlegraphic/mmfsubtitlegraphic.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmf/plugin/mmfsubtitlegraphic.h)
+#endif
+
+
+PRJ_MMPFILES
+
+//plugin
+
+../MMPFiles/Plugin/MmfWAVFormat.mmp
+../MMPFiles/Plugin/MmfRAWFormat.mmp  
+../MMPFiles/Plugin/MmfAUFormat.mmp 
+
+#ifdef SYMBIAN_MMF_MODEL_CONTROLLERS
+../MMPFiles/Plugin/OggPlayController.mmp
+../MMPFiles/Plugin/OggRecordController.mmp
+../MMPFiles/Plugin/MmfaviplayController.mmp
+../MMPFiles/Plugin/MmfaviRecordController.mmp
+#endif
+
+#ifdef SYMBIAN_MULTIMEDIA_SUBTITLE_SUPPORT 
+../MMPFiles/Plugin/srtdecoder.mmp
+../MMPFiles/Plugin/mmfdevsubtitle.mmp
+../MMPFiles/Plugin/mmfsubtitlegraphic.mmp 
+../MMPFiles/Plugin/mmfsubtitlegraphicdrawer.mmp
+#endif
+
+
--- a/mmresourcemgmt/mmresctrl/group/multimedia_a3f_refmmrc.mrp	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmresourcemgmt/mmresctrl/group/multimedia_a3f_refmmrc.mrp	Fri Jul 09 12:23:13 2010 +0100
@@ -1,17 +1,6 @@
+#multimedia_a3f_refmmrc.mrp
 #
-# Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description: 
+#Copyright (c) Symbian Software Ltd 2007.  All rights reserved.
 #
 
 component	multimedia_a3f_refmmrc
--- a/mmtestenv/mmtestagent/group/bld.inf	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmtestenv/mmtestagent/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -19,8 +19,8 @@
 // If CAF_LITE is defined the cut down "lite" version is built
 // otherwise by default the complete version of CAF is built 
 
-PRJ_EXPORTS
+PRJ_TESTEXPORTS
 ../group/multimediatestagent.iby /epoc32/rom/include/multimediatestagent.iby
 
-PRJ_MMPFILES
+PRJ_TESTMMPFILES
 multimediatestagent.mmp
--- a/mmtestenv/mmtestfw/gceavailable/group/bld.inf	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmtestenv/mmtestfw/gceavailable/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -13,7 +13,7 @@
 // Description:
 //
 
-PRJ_MMPFILES
+PRJ_TESTMMPFILES
 
 #ifdef WINS
 gceavailable_winscw.mmp
@@ -21,7 +21,7 @@
 gceavailable_eabi.mmp
 #endif // WINS
 
-PRJ_EXPORTS
+PRJ_TESTEXPORTS
 gceavailable.iby	/epoc32/rom/include/gceavailable.iby
 
 ../inc/gceavailable.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(gceavailable.h)
--- a/mmtestenv/mmtestfw/group/BLD.INF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-PRJ_EXPORTS
-../include/TestFramework.h		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(testframework.h)
-../include/TestFrameworkIpc.h		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(testframeworkipc.h) 
-../include/TestFrameworkIpc.inl		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(testframeworkipc.inl)
-../include/SimulProcClient.h		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(simulprocclient.h)
-../include/SimulProcServer.h		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(simulprocserver.h)
-
-
-// ROM  buildsupport
-../group/TestFramework.iby  /epoc32/rom/include/testframework.iby
-
-// Tests that run via recognizer [not required on EKA2]
-../recog/data/AutorunTests.cfg	c:/mm/autoruntests.cfg
-
-PRJ_MMPFILES
-
-// TestFramework files
-../MMPFiles/TestFrameworkServer.mmp
-../MMPFiles/TestFrameworkClient.mmp
-../MMPFiles/TestFramework.mmp
-../MMPFiles/TestFrameworkRecognizer.mmp
-
-
-../MMPFiles/TestFrameworkNone.mmp
-../MMPFiles/TestFrameworkUECap.mmp
-../MMPFiles/TestFrameworkMMDDCap.mmp
-
-#ifdef SYMBIAN_BUILD_GCE
-#include "../gceavailable/group/bld.inf"
-#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mmtestenv/mmtestfw/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -0,0 +1,45 @@
+// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRJ_TESTEXPORTS
+../include/TestFramework.h		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(testframework.h)
+../include/TestFrameworkIpc.h		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(testframeworkipc.h) 
+../include/TestFrameworkIpc.inl		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(testframeworkipc.inl)
+../include/SimulProcClient.h		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(simulprocclient.h)
+../include/SimulProcServer.h		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(simulprocserver.h)
+
+
+// ROM  buildsupport
+../group/TestFramework.iby  /epoc32/rom/include/testframework.iby
+
+// Tests that run via recognizer [not required on EKA2]
+../recog/data/AutorunTests.cfg	c:/mm/autoruntests.cfg
+
+PRJ_TESTMMPFILES
+
+// TestFramework files
+../MMPFiles/TestFrameworkServer.mmp
+../MMPFiles/TestFrameworkClient.mmp
+../MMPFiles/TestFramework.mmp
+../MMPFiles/TestFrameworkRecognizer.mmp
+
+
+../MMPFiles/TestFrameworkNone.mmp
+../MMPFiles/TestFrameworkUECap.mmp
+../MMPFiles/TestFrameworkMMDDCap.mmp
+
+#ifdef SYMBIAN_BUILD_GCE
+#include "../gceavailable/group/bld.inf"
+#endif
--- a/mmtestenv/mmtestfwunittest/group/BLD.INF	Thu Jun 24 10:37:45 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-PRJ_PLATFORMS
-// specify the platforms your component needs to be built for here
-// may add platform for OMAP, Helen etc
-DEFAULT
-
-
-PRJ_MMPFILES
-
-../MMPFiles/TSU_MmTsth00.mmp
-../MMPFiles/TSU_MmTsth01.mmp
-../MMPFiles/TSU_MmTsth02.mmp
-../MMPFiles/TSU_MmTsth03.mmp
-../MMPFiles/TSU_MmTsth10.mmp
-../MMPFiles/TSU_MmTsth11.mmp
-../MMPFiles/TSU_MmTsth12.mmp
-../MMPFiles/TSU_MmTsth13.mmp
-../MMPFiles/TSU_MmTsth20.mmp
-../MMPFiles/TSU_MmTsth21.mmp
-../MMPFiles/TSU_MmTsth22.mmp
-
-PRJ_EXPORTS
-
-// ROM build support
-
-../group/TSU_TestFramework.iby  /epoc32/rom/include/tsu_testframework.iby
-
-// scripts
-
-../scriptFiles/TestFramework.script		c:/testframework.script
-../scriptFiles/TestFramework_Panic.script	c:/testframework_panic.script
-
-../scriptFiles/TSU_MmTsth00.script		c:/tsu_mmtsth00.script
-../scriptFiles/TSU_MmTsth01.script		c:/tsu_mmtsth01.script
-../scriptFiles/TSU_MmTsth01_Panic.script	c:/tsu_mmtsth01_panic.script
-../scriptFiles/TSU_MmTsth02.script		c:/tsu_mmtsth02.script
-../scriptFiles/TSU_MmTsth03.script		c:/tsu_mmtsth03.script
-../scriptFiles/TSU_MmTsth10.script		c:/tsu_mmtsth10.script
-../scriptFiles/TSU_MmTsth11.script		c:/tsu_mmtsth11.script
-../scriptFiles/TSU_MmTsth12.script		c:/tsu_mmtsth12.script
-../scriptFiles/TSU_MmTsth13.script		c:/tsu_mmtsth13.script
-../scriptFiles/TSU_MmTsth20.script		c:/tsu_mmtsth20.script
-../scriptFiles/TSU_MmTsth21.script		c:/tsu_mmtsth21.script
-../scriptFiles/TSU_MmTsth22.script		c:/tsu_mmtsth22.script
-
-// extra files
-../scriptFiles/TSU_MmTsth02_dummy.script	c:/tsu_mmtsth02_dummy.script
-../scriptFiles/TSU_MmTsth11_config.ini	c:/tsu_mmtsth11_config.ini
-
-
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mmtestenv/mmtestfwunittest/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -0,0 +1,65 @@
+// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRJ_PLATFORMS
+// specify the platforms your component needs to be built for here
+// may add platform for OMAP, Helen etc
+DEFAULT
+
+
+PRJ_TESTMMPFILES
+
+../MMPFiles/TSU_MmTsth00.mmp
+../MMPFiles/TSU_MmTsth01.mmp
+../MMPFiles/TSU_MmTsth02.mmp
+../MMPFiles/TSU_MmTsth03.mmp
+../MMPFiles/TSU_MmTsth10.mmp
+../MMPFiles/TSU_MmTsth11.mmp
+../MMPFiles/TSU_MmTsth12.mmp
+../MMPFiles/TSU_MmTsth13.mmp
+../MMPFiles/TSU_MmTsth20.mmp
+../MMPFiles/TSU_MmTsth21.mmp
+../MMPFiles/TSU_MmTsth22.mmp
+
+PRJ_TESTEXPORTS
+
+// ROM build support
+
+../group/TSU_TestFramework.iby  /epoc32/rom/include/tsu_testframework.iby
+
+// scripts
+
+../scriptFiles/TestFramework.script		c:/testframework.script
+../scriptFiles/TestFramework_Panic.script	c:/testframework_panic.script
+
+../scriptFiles/TSU_MmTsth00.script		c:/tsu_mmtsth00.script
+../scriptFiles/TSU_MmTsth01.script		c:/tsu_mmtsth01.script
+../scriptFiles/TSU_MmTsth01_Panic.script	c:/tsu_mmtsth01_panic.script
+../scriptFiles/TSU_MmTsth02.script		c:/tsu_mmtsth02.script
+../scriptFiles/TSU_MmTsth03.script		c:/tsu_mmtsth03.script
+../scriptFiles/TSU_MmTsth10.script		c:/tsu_mmtsth10.script
+../scriptFiles/TSU_MmTsth11.script		c:/tsu_mmtsth11.script
+../scriptFiles/TSU_MmTsth12.script		c:/tsu_mmtsth12.script
+../scriptFiles/TSU_MmTsth13.script		c:/tsu_mmtsth13.script
+../scriptFiles/TSU_MmTsth20.script		c:/tsu_mmtsth20.script
+../scriptFiles/TSU_MmTsth21.script		c:/tsu_mmtsth21.script
+../scriptFiles/TSU_MmTsth22.script		c:/tsu_mmtsth22.script
+
+// extra files
+../scriptFiles/TSU_MmTsth02_dummy.script	c:/tsu_mmtsth02_dummy.script
+../scriptFiles/TSU_MmTsth11_config.ini	c:/tsu_mmtsth11_config.ini
+
+
+
--- a/mmtestenv/mmtesttools/Group/bld.inf	Thu Jun 24 10:37:45 2010 +0100
+++ b/mmtestenv/mmtesttools/Group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -18,7 +18,7 @@
 #endif
 
 
-PRJ_EXPORTS
+PRJ_TESTEXPORTS
 
 // .iby files
 ../Rom/mmfIntTests.iby			/epoc32/rom/include/mmfinttests.iby
@@ -51,6 +51,8 @@
 ../Rom/miscOpt.iby	/epoc32/rom/include/miscopt.iby
 ../Rom/miscOptTests.iby /epoc32/rom/include/miscopttests.iby
 
+../Rom/mmmwunittests.iby /epoc32/rom/include/mmmwunittests.iby
+
 // .bat files
 ../Scripts/run3gplibrarytests.bat	c:/run3gplibrarytests.bat
 ../Scripts/runICLPREQ1920Tests.bat		c:/runiclpreq1920tests.bat
--- a/omxil/omxilunittest/components/group/bld.inf	Thu Jun 24 10:37:45 2010 +0100
+++ b/omxil/omxilunittest/components/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -13,7 +13,7 @@
 // Description:
 //
 
-PRJ_EXPORTS
+PRJ_TESTEXPORTS
 ../scripts/tsu_omxil_pcmrenderer_01.script		c:/omxil/tsu_omxil_pcmrenderer_01.script
 
 // Export test files
@@ -23,6 +23,6 @@
 // .iby
 tsu_omxil_components.iby                        	/epoc32/rom/include/tsu_omxil_components.iby
 
-PRJ_MMPFILES
+PRJ_TESTMMPFILES
 ../mmpfiles/tsu_omxil_pcmrenderer_01.mmp
 
--- a/omxil/omxilunittest/components/src/tsu_omxil_pcmrenderer_step.cpp	Thu Jun 24 10:37:45 2010 +0100
+++ b/omxil/omxilunittest/components/src/tsu_omxil_pcmrenderer_step.cpp	Fri Jul 09 12:23:13 2010 +0100
@@ -3848,9 +3848,8 @@
 	//check the number of bytes played by the device corresponds
 	//to the number of bytes readed from file
 	//allow an extra margin of one buffer.
-	TUint minAllowedBytesPlayed = ipTestFile->GetPos() - aBuffer->nAllocLen;
 	TUint maxAllowedBytesPlayed =ipTestFile->GetPos();
-	if ((bytesPlayedStruct.nBytesPlayed < minAllowedBytesPlayed)||(bytesPlayedStruct.nBytesPlayed > maxAllowedBytesPlayed))
+	if ((bytesPlayedStruct.nBytesPlayed < 0)||(bytesPlayedStruct.nBytesPlayed > maxAllowedBytesPlayed))
 		{
 		StopTest(KErrGeneral, EFail);
 		}
--- a/omxil/omxilunittest/contentpipe/group/bld.inf	Thu Jun 24 10:37:45 2010 +0100
+++ b/omxil/omxilunittest/contentpipe/group/bld.inf	Fri Jul 09 12:23:13 2010 +0100
@@ -13,11 +13,11 @@
 // Description:
 //
 
-PRJ_MMPFILES
+PRJ_TESTMMPFILES
 //Dummy Content Pipe Unit Tests
 ../mmpfiles/tsu_omxil_dummycontentpipe.mmp
 
-PRJ_EXPORTS
+PRJ_TESTEXPORTS
 // test scripts
 ../scripts/tsu_omxil_dummycontentpipe.script	c:/omxil/tsu_omxil_dummycontentpipe.script