FCL/sf/app/camera: comparison camerauis/cameraxui/cxengine/src/cxeenginesymbian.cpp

equal deleted inserted replaced

-:67457b2ffb33
+:feebad15db8c
 {
 CX_DEBUG_ENTER_FUNCTION();
 // Check we do this only once.
 if (!mSettingsModel) {
-OstTrace0(camerax_performance, CXEENGINESYMBIAN_CREATECONTROLS_IN, "e_CX_ENGINE_CREATE_CONTROLS 1");
+OstTrace0(camerax_performance, CXEENGINESYMBIAN_CREATECONTROLS_IN, "msg: e_CX_ENGINE_CREATE_CONTROLS 1");
 CxeCameraDeviceControlSymbian *deviceControl = new CxeCameraDeviceControlSymbian();
 mCameraDeviceControl = deviceControl;
 mCameraDevice = deviceControl->cameraDevice();
 // assert if settings model fails to intialize
 CX_DEBUG_ASSERT(mSettingsModel);
 mSettings = new CxeSettingsImp(*mSettingsModel);
 // Loading current camera mode value from settings store and updating
 		// devicecontrol
 Cxe::CameraMode cameraMode = Cxe::ImageMode;
 int value;
 CxeError::Id err = mSettings->get(CxeSettingIds::CAMERA_MODE, value);
 if (!err) {
 cameraMode = static_cast<Cxe::CameraMode>(value);
 }
 // set current camera mode to devicecontrol.
 mCameraDeviceControl->setMode(cameraMode);
 //! @todo a temporary hack to change the startup sequence to avoid GOOM problems
 static_cast<CxeSettingsImp*>(mSettings)->loadSettings(mode());
 // Connect P&S key updates to settings signal.
 mViewfinderControl = new CxeViewfinderControlSymbian(*mCameraDevice,
 *mCameraDeviceControl);
 mSnapshotControl = new CxeSnapshotControl(*mCameraDevice);
 mAutoFocusControl = new CxeAutoFocusControlSymbian(*mCameraDevice,
 		                            *mSettings);
 mFileSaveThread = CxeFileSaveThreadFactory::createFileSaveThread();
 mStillCaptureControl = new CxeStillCaptureControlSymbian(
 mGeoTaggingTrail = new CxeGeoTaggingTrail(*mStillCaptureControl,
 *mVideoCaptureControl,
 *mSettings);
-OstTrace0(camerax_performance, CXEENGINESYMBIAN_CREATECONTROLS_OUT, "e_CX_ENGINE_CREATE_CONTROLS 0");
+OstTrace0(camerax_performance, CXEENGINESYMBIAN_CREATECONTROLS_OUT, "msg: e_CX_ENGINE_CREATE_CONTROLS 0");
 }
 CX_DEBUG_EXIT_FUNCTION();
 }
 Connect internal signals for control classes
 */
 void CxeEngineSymbian::connectSignals()
 {
 CX_DEBUG_ENTER_FUNCTION();
-OstTrace0(camerax_performance, CXEENGINESYMBIAN_CONNECTSIGNALS_IN, "e_CX_ENGINE_CONNECT_SIGNALS 1");
+OstTrace0(camerax_performance, CXEENGINESYMBIAN_CONNECTSIGNALS_IN, "msg: e_CX_ENGINE_CONNECT_SIGNALS 1");
 // enabling scene setting change callbacks to Autofocus control
 connect(mSettings,
 SIGNAL(sceneChanged(CxeScene&)),
 mAutoFocusControl,
 SIGNAL(prepareForRelease()),
 mGeoTaggingTrail,
 SLOT(stop()),
 Qt::UniqueConnection);
-OstTrace0(camerax_performance, CXEENGINESYMBIAN_CONNECTSIGNALS_OUT, "e_CX_ENGINE_CONNECT_SIGNALS 0");
+OstTrace0(camerax_performance, CXEENGINESYMBIAN_CONNECTSIGNALS_OUT, "msg: e_CX_ENGINE_CONNECT_SIGNALS 0");
 CX_DEBUG_EXIT_FUNCTION();
 }
 CxeEngineSymbian::~CxeEngineSymbian()
 {
 CX_DEBUG_ENTER_FUNCTION();
 // Saving current camera mode to cenrep
 saveMode();
 delete mGeoTaggingTrail;
 delete mAutoFocusControl;
 delete mZoomControl;
 delete mSettingsControl;
 delete mStillCaptureControl;
 CxeSettings &CxeEngineSymbian::settings()
 {
 return *mSettings;
 }
 /*!
 Returns the sensor event  handle
 */
 CxeSensorEventHandler &CxeEngineSymbian::sensorEventHandler()
 {
 return *mSensorEventHandler;
 CxeStillCaptureControl in still image mode).
 */
 void CxeEngineSymbian::doInit()
 {
 CX_DEBUG_ENTER_FUNCTION();
-OstTrace0(camerax_performance, CXEENGINESYMBIAN_DOINIT_IN, "e_CX_ENGINE_DO_INIT 1");
+OstTrace0(camerax_performance, CXEENGINESYMBIAN_DOINIT_IN, "msg: e_CX_ENGINE_DO_INIT 1");
 mFilenameGenerator->init(mode());
 // load settings whenever we change mode or start camera or switch camera
 CxeSettingsImp *settingsImp = qobject_cast<CxeSettingsImp*>(mSettings);
 if (settingsImp) {
 mGeoTaggingTrail->stop();
 }
 mVideoCaptureControl->init();
 }
-OstTrace0(camerax_performance, CXEENGINESYMBIAN_DOINIT_OUT, "e_CX_ENGINE_DO_INIT 0");
+OstTrace0(camerax_performance, CXEENGINESYMBIAN_DOINIT_OUT, "msg: e_CX_ENGINE_DO_INIT 0");
 CX_DEBUG_EXIT_FUNCTION();
 }
 /*!
 }
 void CxeEngineSymbian::initMode(Cxe::CameraMode cameraMode)
 {
 CX_DEBUG_ENTER_FUNCTION();
+OstTrace0(camerax_performance, CXEENGINE_INITMODE_IN, "msg: e_CX_ENGINE_INIT_MODE 1");
 if (mode() == cameraMode) {
 CX_DEBUG(("initMode() called for current mode"));
 // We're already in the requested mode. However, it is possible
 // Camera device control is in Initializing state. Initialization will continue
 // when we get the deviceReady() callback.
 }
 }
+OstTrace0(camerax_performance, CXEENGINE_INITMODE_OUT, "msg: e_CX_ENGINE_INIT_MODE 0");
 CX_DEBUG_EXIT_FUNCTION();
 }
 void CxeEngineSymbian::reserve()
 {
 * Start geotagging trail.
 */
 void CxeEngineSymbian::startGeotaggingTrail()
 {
 CX_DEBUG_ENTER_FUNCTION();
+OstTrace0(camerax_performance, CXEENGINE_START_GEO_IN, "msg: e_CX_ENGINE_START_GEOTAGGING 1");
 if (mGeoTaggingTrail && mSettings) {
 // location trail is limited to image mode only for now.
 int value = Cxe::GeoTaggingDisclaimerDisabled;
 mSettings->get(CxeSettingIds::GEOTAGGING_DISCLAIMER, value);
 // we start location trail only when Geotagging First-time-use note is accepted by user.
 if (value == Cxe::GeoTaggingDisclaimerDisabled) {
 mGeoTaggingTrail->start();
 }
 }
+OstTrace0(camerax_performance, CXEENGINE_START_GEO_OUT, "msg: e_CX_ENGINE_START_GEOTAGGING 0");
 CX_DEBUG_EXIT_FUNCTION();
 }
 // End of file

changeset 42	feebad15db8c
parent 41	67457b2ffb33
child 46	c826656d6714