equal
deleted
inserted
replaced
161 * Start the viewfinder |
161 * Start the viewfinder |
162 */ |
162 */ |
163 CxeError::Id CxeViewfinderControlSymbian::start() |
163 CxeError::Id CxeViewfinderControlSymbian::start() |
164 { |
164 { |
165 CX_DEBUG_ENTER_FUNCTION(); |
165 CX_DEBUG_ENTER_FUNCTION(); |
|
166 OstTrace0(camerax_performance, CXEVIEWFINDERCONTROL_START_1, "msg: e_CX_VIEWFINDER_START 1"); |
|
167 |
166 TInt err = KErrNone; |
168 TInt err = KErrNone; |
167 |
169 |
168 if ( state() == Running ) { |
170 if ( state() == Running ) { |
169 CX_DEBUG( ( "Viewfinder already running - ignored start()" ) ); |
171 CX_DEBUG( ( "Viewfinder already running - ignored start()" ) ); |
170 CX_DEBUG_EXIT_FUNCTION(); |
172 CX_DEBUG_EXIT_FUNCTION(); |
209 |
211 |
210 TRAP(err, mCameraDevice.camera()->StartViewFinderDirectL( |
212 TRAP(err, mCameraDevice.camera()->StartViewFinderDirectL( |
211 CCoeEnv::Static()->WsSession(), |
213 CCoeEnv::Static()->WsSession(), |
212 *CCoeEnv::Static()->ScreenDevice(), |
214 *CCoeEnv::Static()->ScreenDevice(), |
213 *mVideoWindow, activeViewfinderRect)); |
215 *mVideoWindow, activeViewfinderRect)); |
214 OstTrace0(camerax_performance, CXEVIEWFINDERCONTROLSYMBIAN_START, "msg: e_CX_STARTUP 0"); |
216 OstTrace0(camerax_performance, CXEVIEWFINDERCONTROL_STARTUP, "msg: e_CX_STARTUP 0"); |
215 setState(Running); |
217 setState(Running); |
216 break; |
218 break; |
217 } |
219 } |
218 case CCamera::CCameraDirectViewFinder::EViewFinderPause: |
220 case CCamera::CCameraDirectViewFinder::EViewFinderPause: |
219 TRAP( err, mDirectViewfinder->ResumeViewFinderDirectL() ); |
221 TRAP( err, mDirectViewfinder->ResumeViewFinderDirectL() ); |
246 } |
248 } |
247 else { |
249 else { |
248 // vf already running. nothing to do |
250 // vf already running. nothing to do |
249 } |
251 } |
250 |
252 |
251 CX_DEBUG( ("CxeViewfinderControlSymbian::start symbian error code : %d", err ) ); |
253 OstTrace0(camerax_performance, CXEVIEWFINDERCONTROL_START_2, "msg: e_CX_VIEWFINDER_START 0"); |
252 CX_DEBUG_EXIT_FUNCTION(); |
254 CX_DEBUG_EXIT_FUNCTION(); |
253 return CxeErrorHandlingSymbian::map(err); |
255 return CxeErrorHandlingSymbian::map(err); |
254 } |
256 } |
255 |
257 |
256 |
258 |
258 * Intialize the viewfinder based on the VF mode |
260 * Intialize the viewfinder based on the VF mode |
259 */ |
261 */ |
260 int CxeViewfinderControlSymbian::initViewfinder() |
262 int CxeViewfinderControlSymbian::initViewfinder() |
261 { |
263 { |
262 CX_DEBUG_ENTER_FUNCTION(); |
264 CX_DEBUG_ENTER_FUNCTION(); |
|
265 OstTrace0(camerax_performance, CXEVIEWFINDERCONTROL_INIT_1, "msg: e_CX_VIEWFINDER_INIT 1"); |
263 |
266 |
264 TInt err = KErrNone; |
267 TInt err = KErrNone; |
265 if (state() != Uninitialized) { |
268 if (state() != Uninitialized) { |
266 return err; |
269 return err; |
267 } |
270 } |
296 #if defined(CXE_USE_DUMMY_CAMERA) || defined(__WINSCW__) |
299 #if defined(CXE_USE_DUMMY_CAMERA) || defined(__WINSCW__) |
297 //! @todo Temporary code for WINSCW, because CCamera::CCameraDirectViewFinder is not yet supported by dummy engine |
300 //! @todo Temporary code for WINSCW, because CCamera::CCameraDirectViewFinder is not yet supported by dummy engine |
298 setState( Ready ); |
301 setState( Ready ); |
299 #endif |
302 #endif |
300 |
303 |
|
304 OstTrace0(camerax_performance, CXEVIEWFINDERCONTROL_INIT_2, "msg: e_CX_VIEWFINDER_INIT 0"); |
301 CX_DEBUG_EXIT_FUNCTION(); |
305 CX_DEBUG_EXIT_FUNCTION(); |
302 return err; |
306 return err; |
303 } |
307 } |
304 |
308 |
305 |
309 |
307 * Create the window for viewfinder to render into. |
311 * Create the window for viewfinder to render into. |
308 */ |
312 */ |
309 void CxeViewfinderControlSymbian::createViewfinderWindowL() |
313 void CxeViewfinderControlSymbian::createViewfinderWindowL() |
310 { |
314 { |
311 CX_DEBUG_ENTER_FUNCTION(); |
315 CX_DEBUG_ENTER_FUNCTION(); |
|
316 OstTrace0(camerax_performance, CXEVIEWFINDERCONTROL_CREATE_WINDOW_1, "msg: e_CX_VIEWFINDER_CREATE_WINDOW 1"); |
312 |
317 |
313 if (!mUiWindow) { |
318 if (!mUiWindow) { |
314 CX_DEBUG( ( "mUiWindow not set - cannot create VF window!" ) ); |
319 CX_DEBUG( ( "mUiWindow not set - cannot create VF window!" ) ); |
315 User::Leave(KErrNotReady); |
320 User::Leave(KErrNotReady); |
316 } |
321 } |
337 mUiWindow->SetOrdinalPosition(0); |
342 mUiWindow->SetOrdinalPosition(0); |
338 |
343 |
339 CX_DEBUG(("mVideoWindow ordinal position is: %d", mVideoWindow->OrdinalPosition())); |
344 CX_DEBUG(("mVideoWindow ordinal position is: %d", mVideoWindow->OrdinalPosition())); |
340 CX_DEBUG(("mUiWindow ordinal position is: %d", mUiWindow->OrdinalPosition())); |
345 CX_DEBUG(("mUiWindow ordinal position is: %d", mUiWindow->OrdinalPosition())); |
341 |
346 |
|
347 OstTrace0(camerax_performance, CXEVIEWFINDERCONTROL_CREATE_WINDOW_2, "msg: e_CX_VIEWFINDER_CREATE_WINDOW 0"); |
342 CX_DEBUG_EXIT_FUNCTION(); |
348 CX_DEBUG_EXIT_FUNCTION(); |
343 } |
349 } |
344 |
350 |
345 |
351 |
346 void CxeViewfinderControlSymbian::prepareForRelease() |
352 void CxeViewfinderControlSymbian::prepareForRelease() |