diff -r d9aefe59d544 -r fa6d9f75d6a6 camerauis/cameraxui/cxengine/inc/cxeenginesymbian.h --- a/camerauis/cameraxui/cxengine/inc/cxeenginesymbian.h Fri Apr 16 14:51:30 2010 +0300 +++ b/camerauis/cameraxui/cxengine/inc/cxeenginesymbian.h Mon May 03 12:22:55 2010 +0300 @@ -21,6 +21,7 @@ #include "cxeengine.h" #include "cxefilenamegenerator.h" +class CxeCameraDevice; class CxeCameraDeviceControl; class CxeViewfinderControl; class CxeStillCaptureControl; @@ -36,7 +37,8 @@ class CxeFilenameGenerator; class CxeQualityPresets; class CxeFileSaveThread; - +class CxeDiskMonitor; +class CxeMemoryMonitor; class CxeEngineSymbian : public CxeEngine @@ -46,8 +48,6 @@ CxeEngineSymbian(); virtual ~CxeEngineSymbian(); - void construct(); - CxeCameraDeviceControl &cameraDeviceControl(); CxeViewfinderControl &viewfinderControl(); CxeStillCaptureControl &stillCaptureControl(); @@ -57,14 +57,19 @@ CxeSettings &settings(); CxeSensorEventHandler &sensorEventHandler(); CxeFeatureManager &featureManager(); + CxeMemoryMonitor &memoryMonitor(); Cxe::CameraMode mode() const; void initMode(Cxe::CameraMode cameraMode); bool isEngineReady(); +signals: + void reserveStarted(); + protected: virtual void createControls(); private slots: + void construct(); void doInit(); private: @@ -72,9 +77,11 @@ bool reserveNeeded(); bool initNeeded(); bool startViewfinderNeeded(); + void reserve(); protected: CxeCameraDeviceControl *mCameraDeviceControl; + CxeCameraDevice *mCameraDevice; // not own CxeViewfinderControl *mViewfinderControl; CxeStillCaptureControl *mStillCaptureControl; CxeVideoCaptureControl *mVideoCaptureControl; @@ -88,8 +95,11 @@ CxeSensorEventHandler* mSensorEventHandler; CxeQualityPresets *mQualityPresets; CxeFileSaveThread *mFileSaveThread; + CxeDiskMonitor *mDiskMonitor; + CxeMemoryMonitor *mMemoryMonitor; }; #endif // CXEENGINESYMBIAN_H +