# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1284701458 -10800
# Node ID e93740a77a065e9a405b28694f36c098373f9164
# Parent  48bd1f172d69cc77b95c3ddba122f02ed66ba1cd
Revision: 201035
Kit: 201037

diff -r 48bd1f172d69 -r e93740a77a06 camcordermmfplugin/controller/Group/CamCController.mmp
--- a/camcordermmfplugin/controller/Group/CamCController.mmp	Wed Aug 18 09:59:15 2010 +0300
+++ b/camcordermmfplugin/controller/Group/CamCController.mmp	Fri Sep 17 08:30:58 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 48bd1f172d69 -r e93740a77a06 camcordermmfplugin/filecomposer/Group/camc3GPDataSink.mmp
--- a/camcordermmfplugin/filecomposer/Group/camc3GPDataSink.mmp	Wed Aug 18 09:59:15 2010 +0300
+++ b/camcordermmfplugin/filecomposer/Group/camc3GPDataSink.mmp	Fri Sep 17 08:30:58 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 48bd1f172d69 -r e93740a77a06 camcordermmfplugin/mediarecorder/Inc/CCMRAudioCodecData.h
--- a/camcordermmfplugin/mediarecorder/Inc/CCMRAudioCodecData.h	Wed Aug 18 09:59:15 2010 +0300
+++ b/camcordermmfplugin/mediarecorder/Inc/CCMRAudioCodecData.h	Fri Sep 17 08:30:58 2010 +0300
@@ -20,7 +20,7 @@
 #define CCMRAUDIOCODECDATA_H
 
 // INCLUDES
-#include "CCMRMediaSink.h"
+#include <CCMRMediaSink.h>
 
 #include <e32base.h>
 #include <mmf/common/mmffourcc.h>
diff -r 48bd1f172d69 -r e93740a77a06 camcordermmfplugin/tsrc/public/basic/Group/StifCamcTest.mmp
--- a/camcordermmfplugin/tsrc/public/basic/Group/StifCamcTest.mmp	Wed Aug 18 09:59:15 2010 +0300
+++ b/camcordermmfplugin/tsrc/public/basic/Group/StifCamcTest.mmp	Fri Sep 17 08:30:58 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 48bd1f172d69 -r e93740a77a06 camerasrv_plat/imaging_configuration_manager_api/tsrc/group/ICMSTIF.mmp
--- a/camerasrv_plat/imaging_configuration_manager_api/tsrc/group/ICMSTIF.mmp	Wed Aug 18 09:59:15 2010 +0300
+++ b/camerasrv_plat/imaging_configuration_manager_api/tsrc/group/ICMSTIF.mmp	Fri Sep 17 08:30:58 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 48bd1f172d69 -r e93740a77a06 camerasrv_plat/media_recorder_api/tsrc/group/StifCamcTest.mmp
--- a/camerasrv_plat/media_recorder_api/tsrc/group/StifCamcTest.mmp	Wed Aug 18 09:59:15 2010 +0300
+++ b/camerasrv_plat/media_recorder_api/tsrc/group/StifCamcTest.mmp	Fri Sep 17 08:30:58 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 48bd1f172d69 -r e93740a77a06 configmanagers/imagingconfigmanager/tsrc/public/basic/group/ICMSTIF.mmp
--- a/configmanagers/imagingconfigmanager/tsrc/public/basic/group/ICMSTIF.mmp	Wed Aug 18 09:59:15 2010 +0300
+++ b/configmanagers/imagingconfigmanager/tsrc/public/basic/group/ICMSTIF.mmp	Fri Sep 17 08:30:58 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 48bd1f172d69 -r e93740a77a06 package_definition.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/package_definition.xml	Fri Sep 17 08:30:58 2010 +0300
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+ <package id="camerasrv" name="Camera Services" levels="plugin fw api">
+  <collection id="camerasrv_plat" name="Camera Services Platform Interfaces" level="api">
+   <component id="media_recorder_sink_api" name="Media Recorder Sink API" class="api" filter="s60">
+    <meta rel="Api" href="camerasrv_plat/media_recorder_sink_api/media_recorder_sink_api.metaxml"/>
+    <unit bldFile="camerasrv_plat/media_recorder_sink_api/group"/>
+   </component>
+   <component id="custom_onboard_camera_api" name="Custom Onboard Camera API" class="api" filter="s60">
+    <meta rel="Api" href="camerasrv_plat/custom_onboard_camera_api/custom_onboard_camera_api.metaxml"/>
+    <unit bldFile="camerasrv_plat/custom_onboard_camera_api/group"/>
+   </component>
+   <component id="imaging_configuration_manager_api" name="Imaging Configuration Manager API" class="api" filter="s60">
+    <meta rel="Api" href="camerasrv_plat/imaging_configuration_manager_api/imaging_configuration_manager_api.metaxml"/>
+    <unit bldFile="camerasrv_plat/imaging_configuration_manager_api/group" filter="!test"/>
+    <unit bldFile="camerasrv_plat/imaging_configuration_manager_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="media_recorder_api" name="Media Recorder API" class="api" filter="s60">
+    <meta rel="Api" href="camerasrv_plat/media_recorder_api/media_recorder_api.metaxml"/>
+    <unit bldFile="camerasrv_plat/media_recorder_api/group" filter="!test"/>
+    <unit bldFile="camerasrv_plat/media_recorder_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="3gp_file_composer_api" name="3GP File Composer API" class="api" filter="s60">
+    <meta rel="Api" href="camerasrv_plat/3gp_file_composer_api/3gp_file_composer_api.metaxml"/>
+    <unit bldFile="camerasrv_plat/3gp_file_composer_api/group"/>
+   </component>
+  </collection>
+  <collection id="camcordermmfplugin" name="Camcorder MMF Plugin" level="plugin">
+   <!-- collection is really a component. Should move down a directory -->
+   <component id="camcordermmfplugin_build" filter="s60" name="Camcorder MMF Plugin Build" class="plugin">
+    <unit bldFile="camcordermmfplugin/build"/>
+   </component>
+  </collection>
+  <collection id="configmanagers" name="Config Managers" level="api">
+   <component id="imagingconfigmanager" filter="s60" name="Imaging Config Manager">
+    <unit bldFile="configmanagers/imagingconfigmanager/group"/>
+   </component>
+  </collection>
+ </package>
+</SystemDefinition>
diff -r 48bd1f172d69 -r e93740a77a06 package_map.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/package_map.xml	Fri Sep 17 08:30:58 2010 +0300
@@ -0,0 +1,1 @@
+<PackageMap root="sf" layer="mw"/>