equal
deleted
inserted
replaced
21 #include "cxesettings.h" |
21 #include "cxesettings.h" |
22 #include "cxutils.h" |
22 #include "cxutils.h" |
23 #include "cxenamespace.h" |
23 #include "cxenamespace.h" |
24 #include "cxestate.h" |
24 #include "cxestate.h" |
25 |
25 |
26 const int NOT_DEFINED = -1; |
26 #include "OstTraceDefinitions.h" |
|
27 #ifdef OST_TRACE_COMPILER_IN_USE |
|
28 #include "cxezoomcontrolsymbianTraces.h" |
|
29 #endif |
|
30 |
|
31 namespace |
|
32 { |
|
33 const int NOT_DEFINED = -1; |
|
34 } |
27 |
35 |
28 // --------------------------------------------------------------------------- |
36 // --------------------------------------------------------------------------- |
29 // CxeZoomControlSymbian::CxeZoomControlSymbian |
37 // CxeZoomControlSymbian::CxeZoomControlSymbian |
30 // |
38 // |
31 // --------------------------------------------------------------------------- |
39 // --------------------------------------------------------------------------- |
154 * slot to prepare zoom control for still mode |
162 * slot to prepare zoom control for still mode |
155 */ |
163 */ |
156 void CxeZoomControlSymbian::prepareZoomForStill(int ecamStillResolutionIndex) |
164 void CxeZoomControlSymbian::prepareZoomForStill(int ecamStillResolutionIndex) |
157 { |
165 { |
158 CX_DEBUG_ENTER_FUNCTION(); |
166 CX_DEBUG_ENTER_FUNCTION(); |
|
167 OstTrace0(camerax_performance, CXEZOOMCONTROLSYMBIAN_PREPARESTILL_IN, "msg: e_CX_PREPARE_ZOOM 1"); |
159 |
168 |
160 if (mCameraDeviceControl.state() == CxeCameraDeviceControl::Ready) { |
169 if (mCameraDeviceControl.state() == CxeCameraDeviceControl::Ready) { |
161 init(); |
170 init(); |
162 // For image mode |
171 // For image mode |
163 CCamera::TFormat format = CCamera::EFormatExif; |
172 CCamera::TFormat format = CCamera::EFormatExif; |
182 } |
191 } |
183 |
192 |
184 finalizeZoomPreparation(error); |
193 finalizeZoomPreparation(error); |
185 } |
194 } |
186 |
195 |
|
196 OstTrace0(camerax_performance, CXEZOOMCONTROLSYMBIAN_PREPARESTILL_OUT, "msg: e_CX_PREPARE_ZOOM 0"); |
187 CX_DEBUG_EXIT_FUNCTION(); |
197 CX_DEBUG_EXIT_FUNCTION(); |
188 } |
198 } |
189 |
199 |
190 |
200 |
191 /*! |
201 /*! |
192 * slot to prepare zoom control for video mode |
202 * slot to prepare zoom control for video mode |
193 */ |
203 */ |
194 void CxeZoomControlSymbian::prepareZoomForVideo() |
204 void CxeZoomControlSymbian::prepareZoomForVideo() |
195 { |
205 { |
196 CX_DEBUG_ENTER_FUNCTION(); |
206 CX_DEBUG_ENTER_FUNCTION(); |
|
207 OstTrace0(camerax_performance, CXEZOOMCONTROLSYMBIAN_PREPAREVIDEO_IN, "msg: e_CX_PREPARE_ZOOM 1"); |
197 |
208 |
198 if (mCameraDeviceControl.state() == CxeCameraDeviceControl::Ready) { |
209 if (mCameraDeviceControl.state() == CxeCameraDeviceControl::Ready) { |
199 init(); |
210 init(); |
200 // if CxeCameraDeviceControl is ready, this pointer is valid |
211 // if CxeCameraDeviceControl is ready, this pointer is valid |
201 CX_ASSERT_ALWAYS(mCameraDevice.advancedSettings()) |
212 CX_ASSERT_ALWAYS(mCameraDevice.advancedSettings()) |
212 } |
223 } |
213 |
224 |
214 finalizeZoomPreparation(error); |
225 finalizeZoomPreparation(error); |
215 } |
226 } |
216 |
227 |
217 |
228 OstTrace0(camerax_performance, CXEZOOMCONTROLSYMBIAN_PREPAREVIDEO_OUT, "msg: e_CX_PREPARE_ZOOM 0"); |
218 CX_DEBUG_EXIT_FUNCTION(); |
229 CX_DEBUG_EXIT_FUNCTION(); |
219 } |
230 } |
220 |
231 |
221 |
232 |
222 |
233 |