equal
deleted
inserted
replaced
18 #include <ecamfacetrackingcustomapi.h> |
18 #include <ecamfacetrackingcustomapi.h> |
19 |
19 |
20 #include "cxecameradevice.h" |
20 #include "cxecameradevice.h" |
21 #include "cxeerrormappingsymbian.h" |
21 #include "cxeerrormappingsymbian.h" |
22 #include "cxutils.h" |
22 #include "cxutils.h" |
23 |
|
24 #include "cxedummycamera.h" |
23 #include "cxedummycamera.h" |
|
24 |
|
25 #include "OstTraceDefinitions.h" |
|
26 #ifdef OST_TRACE_COMPILER_IN_USE |
|
27 #include "cxecameradeviceTraces.h" |
|
28 #endif |
|
29 |
|
30 |
25 |
31 |
26 CxeCameraDevice::CxeCameraDevice() : |
32 CxeCameraDevice::CxeCameraDevice() : |
27 mCamera(NULL), |
33 mCamera(NULL), |
28 mAdvancedSettings(NULL), |
34 mAdvancedSettings(NULL), |
29 mImageProcessor(NULL), |
35 mImageProcessor(NULL), |
182 } |
188 } |
183 |
189 |
184 CxeError::Id CxeCameraDevice::newCamera( Cxe::CameraIndex cameraIndex, MCameraObserver2 *observer ) |
190 CxeError::Id CxeCameraDevice::newCamera( Cxe::CameraIndex cameraIndex, MCameraObserver2 *observer ) |
185 { |
191 { |
186 CX_DEBUG_ENTER_FUNCTION(); |
192 CX_DEBUG_ENTER_FUNCTION(); |
|
193 OstTrace0(camerax_performance, CXECAMERADEVICE_NEWCAMERA_IN, "msg: e_CX_CAMERADEVICE_CREATE_CCAMERA 1"); |
|
194 |
187 CX_DEBUG(("Cxe: using camera index %d", cameraIndex)); |
195 CX_DEBUG(("Cxe: using camera index %d", cameraIndex)); |
188 |
196 |
189 CX_DEBUG_ASSERT(cameraIndex == Cxe::PrimaryCameraIndex || cameraIndex == Cxe::SecondaryCameraIndex); |
197 CX_DEBUG_ASSERT(cameraIndex == Cxe::PrimaryCameraIndex || cameraIndex == Cxe::SecondaryCameraIndex); |
190 |
198 |
191 CCamera* camera = NULL; |
199 CCamera* camera = NULL; |
200 |
208 |
201 if (!err) { |
209 if (!err) { |
202 setCamera(camera); |
210 setCamera(camera); |
203 } |
211 } |
204 |
212 |
|
213 OstTrace0(camerax_performance, CXECAMERADEVICE_NEWCAMERA_OUT, "msg: e_CX_CAMERADEVICE_CREATE_CCAMERA 0"); |
205 CX_DEBUG_EXIT_FUNCTION(); |
214 CX_DEBUG_EXIT_FUNCTION(); |
206 return CxeErrorHandlingSymbian::map(err); |
215 return CxeErrorHandlingSymbian::map(err); |
207 } |
216 } |
208 |
217 |
209 // end of file |
218 // end of file |