26 #include "OstTraceDefinitions.h" |
26 #include "OstTraceDefinitions.h" |
27 #ifdef OST_TRACE_COMPILER_IN_USE |
27 #ifdef OST_TRACE_COMPILER_IN_USE |
28 #include "cxecameradeviceTraces.h" |
28 #include "cxecameradeviceTraces.h" |
29 #endif |
29 #endif |
30 |
30 |
|
31 const int KCameraPriority = -1; |
31 |
32 |
32 |
33 |
33 CxeCameraDevice::CxeCameraDevice() : |
34 CxeCameraDevice::CxeCameraDevice() : |
34 mCamera(NULL), |
35 mCamera(NULL), |
35 mAdvancedSettings(NULL), |
36 mAdvancedSettings(NULL), |
225 CX_DEBUG_ASSERT(cameraIndex == Cxe::PrimaryCameraIndex || cameraIndex == Cxe::SecondaryCameraIndex); |
226 CX_DEBUG_ASSERT(cameraIndex == Cxe::PrimaryCameraIndex || cameraIndex == Cxe::SecondaryCameraIndex); |
226 |
227 |
227 CCamera* camera = NULL; |
228 CCamera* camera = NULL; |
228 |
229 |
229 #if defined(CXE_USE_DUMMY_CAMERA) || defined(__WINSCW__) |
230 #if defined(CXE_USE_DUMMY_CAMERA) || defined(__WINSCW__) |
230 TRAPD(err, camera = CxeDummyCamera::NewL(*observer, cameraIndex, 100, 2)); |
231 TRAPD(err, camera = CxeDummyCamera::NewL(*observer, cameraIndex, |
|
232 KCameraPriority, 2)); |
231 CX_DEBUG(("CxeCameraDevice::newCamera <> new CxeDummyCamera")); |
233 CX_DEBUG(("CxeCameraDevice::newCamera <> new CxeDummyCamera")); |
232 #else |
234 #else |
233 TRAPD(err, camera = CCamera::New2L(*observer, cameraIndex, 100 /*KCameraClientPriority*/)); |
235 TRAPD(err, camera = CCamera::New2L(*observer, |
|
236 cameraIndex, KCameraPriority)); |
234 CX_DEBUG(("CxeCameraDevice::newCamera <> new CCamera")); |
237 CX_DEBUG(("CxeCameraDevice::newCamera <> new CCamera")); |
235 #endif |
238 #endif |
236 |
239 |
237 OstTrace0(camerax_performance, CXECAMERADEVICE_NEWCAMERA_OUT, "msg: e_CX_CREATE_CCAMERA 0"); |
240 OstTrace0(camerax_performance, CXECAMERADEVICE_NEWCAMERA_OUT, "msg: e_CX_CREATE_CCAMERA 0"); |
238 |
241 |