# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1286970244 -10800 # Node ID e3d67ce66f28b27d283ea40ee6555f566c23deb7 # Parent 0fec7bf38d65b07cac294d211e734ac4c767cbbc Revision: 201039 Kit: 201041 diff -r 0fec7bf38d65 -r e3d67ce66f28 camappengine/Engine/Group/CaeEngine.mmp --- a/camappengine/Engine/Group/CaeEngine.mmp Wed Sep 15 12:24:08 2010 +0300 +++ b/camappengine/Engine/Group/CaeEngine.mmp Wed Oct 13 14:44:04 2010 +0300 @@ -89,10 +89,10 @@ LIBRARY euser.lib LIBRARY fbscli.lib -LIBRARY hal.lib -LIBRARY ecom.lib -LIBRARY ecam.lib -LIBRARY mmfcontrollerframework.lib +LIBRARY hal.lib +LIBRARY ECom.lib +LIBRARY ECAM.lib +LIBRARY MMFControllerFramework.lib LIBRARY mediaclientvideo.lib LIBRARY CaeStillConverter.lib LIBRARY ExifLib.lib diff -r 0fec7bf38d65 -r e3d67ce66f28 camappengine/Engine/Group/CaeEngineTestVersion.mmp --- a/camappengine/Engine/Group/CaeEngineTestVersion.mmp Wed Sep 15 12:24:08 2010 +0300 +++ b/camappengine/Engine/Group/CaeEngineTestVersion.mmp Wed Oct 13 14:44:04 2010 +0300 @@ -94,8 +94,8 @@ LIBRARY euser.lib LIBRARY fbscli.lib LIBRARY hal.lib -LIBRARY ecam.lib -LIBRARY mmfcontrollerframework.lib +LIBRARY ECAM.lib +LIBRARY MMFControllerFramework.lib LIBRARY mediaclientvideo.lib LIBRARY CaeStillConverter.lib LIBRARY ExifLib.lib @@ -103,7 +103,7 @@ LIBRARY imageconversion.lib #ifdef EABI -library ecom.lib +library ECOM.LIB #endif // LIBRARY flogger.lib // Enable if USE_FILE_LOGGER is defined diff -r 0fec7bf38d65 -r e3d67ce66f28 camappengine/asynchfilesavequeue/tsrc/public/basic/group/StifAFSQTest.mmp --- a/camappengine/asynchfilesavequeue/tsrc/public/basic/group/StifAFSQTest.mmp Wed Sep 15 12:24:08 2010 +0300 +++ b/camappengine/asynchfilesavequeue/tsrc/public/basic/group/StifAFSQTest.mmp Wed Oct 13 14:44:04 2010 +0300 @@ -65,7 +65,7 @@ LIBRARY bafl.lib LIBRARY sysutil.lib LIBRARY fbscli.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY AsynchFSQ.lib EXPORTUNFROZEN diff -r 0fec7bf38d65 -r e3d67ce66f28 camcordermmfplugin/controller/Group/CamCController.mmp --- a/camcordermmfplugin/controller/Group/CamCController.mmp Wed Sep 15 12:24:08 2010 +0300 +++ b/camcordermmfplugin/controller/Group/CamCController.mmp Wed Oct 13 14:44:04 2010 +0300 @@ -44,11 +44,11 @@ LIBRARY euser.lib LIBRARY mmfcontrollerframework.lib LIBRARY mmfstandardcustomcommands.lib -LIBRARY CamcMediaRecorder.lib +LIBRARY camcmediarecorder.lib LIBRARY camc3gpsink.lib LIBRARY bafl.lib LIBRARY efsrv.lib //TParse #ifdef EABI -library ecom.lib +library ECOM.LIB #endif \ No newline at end of file diff -r 0fec7bf38d65 -r e3d67ce66f28 camcordermmfplugin/filecomposer/Group/camc3GPDataSink.mmp --- a/camcordermmfplugin/filecomposer/Group/camc3GPDataSink.mmp Wed Sep 15 12:24:08 2010 +0300 +++ b/camcordermmfplugin/filecomposer/Group/camc3GPDataSink.mmp Wed Oct 13 14:44:04 2010 +0300 @@ -42,7 +42,7 @@ LIBRARY euser.lib LIBRARY efsrv.lib LIBRARY estlib.lib -LIBRARY 3gpmp4lib.lib +LIBRARY 3GPMP4Lib.lib LIBRARY centralrepository.lib LIBRARY mmfcontrollerframework.lib LIBRARY ecom.lib \ No newline at end of file diff -r 0fec7bf38d65 -r e3d67ce66f28 camcordermmfplugin/mediarecorder/Inc/CCMRAudioCodecData.h --- a/camcordermmfplugin/mediarecorder/Inc/CCMRAudioCodecData.h Wed Sep 15 12:24:08 2010 +0300 +++ b/camcordermmfplugin/mediarecorder/Inc/CCMRAudioCodecData.h Wed Oct 13 14:44:04 2010 +0300 @@ -20,7 +20,7 @@ #define CCMRAUDIOCODECDATA_H // INCLUDES -#include +#include "CCMRMediaSink.h" #include #include diff -r 0fec7bf38d65 -r e3d67ce66f28 camcordermmfplugin/tsrc/public/basic/Group/StifCamcTest.mmp --- a/camcordermmfplugin/tsrc/public/basic/Group/StifCamcTest.mmp Wed Sep 15 12:24:08 2010 +0300 +++ b/camcordermmfplugin/tsrc/public/basic/Group/StifCamcTest.mmp Wed Oct 13 14:44:04 2010 +0300 @@ -71,9 +71,9 @@ LIBRARY euser.lib LIBRARY efsrv.lib -LIBRARY StifTestInterface.lib -LIBRARY mediaclientvideo.lib -LIBRARY mmfcontrollerframework.lib +LIBRARY stiftestinterface.lib +LIBRARY mediaclientvideo.lib +LIBRARY MMFControllerFramework.lib LIBRARY bafl.lib LIBRARY ecam.lib -LIBRARY ecom.lib +LIBRARY ecom.lib diff -r 0fec7bf38d65 -r e3d67ce66f28 camerasrv_plat/asynchronous_file_saving_queue_api/tsrc/group/StifAFSQTest.mmp --- a/camerasrv_plat/asynchronous_file_saving_queue_api/tsrc/group/StifAFSQTest.mmp Wed Sep 15 12:24:08 2010 +0300 +++ b/camerasrv_plat/asynchronous_file_saving_queue_api/tsrc/group/StifAFSQTest.mmp Wed Oct 13 14:44:04 2010 +0300 @@ -65,7 +65,7 @@ LIBRARY bafl.lib LIBRARY sysutil.lib LIBRARY fbscli.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY AsynchFSQ.lib EXPORTUNFROZEN diff -r 0fec7bf38d65 -r e3d67ce66f28 camerasrv_plat/camera_application_engine_api/tsrc/group/StifCaeTest.mmp --- a/camerasrv_plat/camera_application_engine_api/tsrc/group/StifCaeTest.mmp Wed Sep 15 12:24:08 2010 +0300 +++ b/camerasrv_plat/camera_application_engine_api/tsrc/group/StifCaeTest.mmp Wed Oct 13 14:44:04 2010 +0300 @@ -76,8 +76,8 @@ LIBRARY euser.lib LIBRARY efsrv.lib LIBRARY fbscli.lib -LIBRARY ecam.lib -LIBRARY CaeEngine.lib -LIBRARY StifTestInterface.lib +LIBRARY ECAM.lib +LIBRARY caeengine.lib +LIBRARY stiftestinterface.lib EXPORTUNFROZEN diff -r 0fec7bf38d65 -r e3d67ce66f28 camerasrv_plat/imaging_configuration_manager_api/tsrc/group/ICMSTIF.mmp --- a/camerasrv_plat/imaging_configuration_manager_api/tsrc/group/ICMSTIF.mmp Wed Sep 15 12:24:08 2010 +0300 +++ b/camerasrv_plat/imaging_configuration_manager_api/tsrc/group/ICMSTIF.mmp Wed Oct 13 14:44:04 2010 +0300 @@ -35,7 +35,7 @@ MW_LAYER_SYSTEMINCLUDE LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY imagingconfigmanager.lib LANG SC diff -r 0fec7bf38d65 -r e3d67ce66f28 camerasrv_plat/media_recorder_api/tsrc/group/StifCamcTest.mmp --- a/camerasrv_plat/media_recorder_api/tsrc/group/StifCamcTest.mmp Wed Sep 15 12:24:08 2010 +0300 +++ b/camerasrv_plat/media_recorder_api/tsrc/group/StifCamcTest.mmp Wed Oct 13 14:44:04 2010 +0300 @@ -71,9 +71,9 @@ LIBRARY euser.lib LIBRARY efsrv.lib -LIBRARY StifTestInterface.lib -LIBRARY mediaclientvideo.lib -LIBRARY mmfcontrollerframework.lib +LIBRARY stiftestinterface.lib +LIBRARY mediaclientvideo.lib +LIBRARY MMFControllerFramework.lib LIBRARY bafl.lib LIBRARY ecam.lib -LIBRARY ecom.lib +LIBRARY ecom.lib diff -r 0fec7bf38d65 -r e3d67ce66f28 configmanagers/imagingconfigmanager/tsrc/public/basic/group/ICMSTIF.mmp --- a/configmanagers/imagingconfigmanager/tsrc/public/basic/group/ICMSTIF.mmp Wed Sep 15 12:24:08 2010 +0300 +++ b/configmanagers/imagingconfigmanager/tsrc/public/basic/group/ICMSTIF.mmp Wed Oct 13 14:44:04 2010 +0300 @@ -35,7 +35,7 @@ MW_LAYER_SYSTEMINCLUDE LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY imagingconfigmanager.lib LANG SC