--- a/camerauis/cameraxui/cxengine/inc/cxevideocapturecontrolsymbian.h	Fri Apr 16 14:51:30 2010 +0300
+++ b/camerauis/cameraxui/cxengine/inc/cxevideocapturecontrolsymbian.h	Thu May 13 21:30:19 2010 +0300
@@ -22,7 +22,6 @@
 #include <QString>
 #include <driveinfo.h>
 #include <videorecorder.h>
-#include <ecam/camerasnapshot.h>
 
 #include "cxesettings.h"
 #include "cxequalitypresets.h"
@@ -33,26 +32,6 @@
 #include "cxenamespace.h"
 
 
-// constants
-const TInt KOneSecond = 1000000;
-
-//CamCControllerCustomCommands.h.
-
-// Controller UId, can be used by the client to identify the controller, e.g. if the custom command can be used
-const TUid KCamCControllerImplementationUid = {0x101F8503};
-const int KMaintainAspectRatio = false;
-// TMMFEvent UIDs for Async stop
-const TUid KCamCControllerCCVideoRecordStopped = {0x2000E546};
-const TUid KCamCControllerCCVideoFileComposed = {0x2000E547};
-
-// Custom command for setting a new filename without closing & reopening the controller
-enum TCamCControllerCustomCommands
-    {
-    ECamCControllerCCNewFilename = 0,
-    ECamCControllerCCVideoStopAsync
-    };
-
-
 // forward declarations
 class CxeSettings;
 class CxeCameraDevice;
@@ -63,6 +42,7 @@
 class CxeSoundPlayerSymbian;
 class CxeCameraDeviceControl;
 class CxeVideoRecorderUtility;
+class CxeDiskMonitor;
 
 
 class CxeVideoCaptureControlSymbian : public CxeVideoCaptureControl,
@@ -73,12 +53,13 @@
 
 public:  // constructors
 
-    CxeVideoCaptureControlSymbian( CxeCameraDevice &cameraDevice,
-                                   CxeViewfinderControl &viewfinderControl,
-                                   CxeCameraDeviceControl &cameraDeviceControl,
-                                   CxeFilenameGenerator &nameGenerator,
-                                   CxeSettings &settings,
-                                   CxeQualityPresets &qualityPresets);
+    CxeVideoCaptureControlSymbian(CxeCameraDevice &cameraDevice,
+                                  CxeViewfinderControl &viewfinderControl,
+                                  CxeCameraDeviceControl &cameraDeviceControl,
+                                  CxeFilenameGenerator &nameGenerator,
+                                  CxeSettings &settings,
+                                  CxeQualityPresets &qualityPresets,
+                                  CxeDiskMonitor &diskMonitor);
 
     virtual ~CxeVideoCaptureControlSymbian();
 
@@ -127,6 +108,10 @@
     void handleCameraEvent(int eventUid, int error);
     // settings call back
     void handleSettingValueChanged(const QString& settingId,QVariant newValue);
+    // scene mode change
+    void handleSceneChanged(CxeScene& scene);
+    // Disk space change
+    void handleDiskSpaceChanged();
 
 private: // helper methods
     CxeError::Id findVideoController(const TDesC8& aMimeType, const TDesC&  aPreferredSupplier);
@@ -136,7 +121,7 @@
     int prepareVideoSnapshot();
     void initVideoRecorder();
     void open();
-	void prepare();
+    void prepare();
     TSize getSnapshotSize() const;
     virtual void createVideoRecorder();
     void calculateRemainingTime(CxeVideoDetails videoDetails, int &time);
@@ -159,6 +144,7 @@
     CxeFilenameGenerator &mFilenameGenerator;
     CxeSettings &mSettings;
     CxeQualityPresets &mQualityPresets;
+    CxeDiskMonitor &mDiskMonitor;
     //! Snapshot image.
     QPixmap mSnapshot;
     //! Soundplayers, own