equal
deleted
inserted
replaced
164 { |
164 { |
165 CX_DEBUG_ENTER_FUNCTION(); |
165 CX_DEBUG_ENTER_FUNCTION(); |
166 TInt err = KErrNone; |
166 TInt err = KErrNone; |
167 |
167 |
168 if ( state() == Running ) { |
168 if ( state() == Running ) { |
169 OstTrace0( camerax_performance, CXEVIEWFINDERCONTROLSYMBIAN_START, "msg: e_CX_GO_TO_VIDEO_MODE 0" ); |
|
170 CX_DEBUG( ( "Viewfinder already running - ignored start()" ) ); |
169 CX_DEBUG( ( "Viewfinder already running - ignored start()" ) ); |
171 CX_DEBUG_EXIT_FUNCTION(); |
170 CX_DEBUG_EXIT_FUNCTION(); |
172 return CxeError::None; |
171 return CxeError::None; |
173 } |
172 } |
174 |
173 |
210 |
209 |
211 TRAP(err, mCameraDevice.camera()->StartViewFinderDirectL( |
210 TRAP(err, mCameraDevice.camera()->StartViewFinderDirectL( |
212 CCoeEnv::Static()->WsSession(), |
211 CCoeEnv::Static()->WsSession(), |
213 *CCoeEnv::Static()->ScreenDevice(), |
212 *CCoeEnv::Static()->ScreenDevice(), |
214 *mVideoWindow, activeViewfinderRect)); |
213 *mVideoWindow, activeViewfinderRect)); |
215 OstTrace0(camerax_performance, DUP1_CXEVIEWFINDERCONTROLSYMBIAN_START, "msg: e_CX_STARTUP 0"); |
214 OstTrace0(camerax_performance, CXEVIEWFINDERCONTROLSYMBIAN_START, "msg: e_CX_STARTUP 0"); |
216 setState(Running); |
215 setState(Running); |
217 break; |
216 break; |
218 } |
217 } |
219 case CCamera::CCameraDirectViewFinder::EViewFinderPause: |
218 case CCamera::CCameraDirectViewFinder::EViewFinderPause: |
220 TRAP( err, mDirectViewfinder->ResumeViewFinderDirectL() ); |
219 TRAP( err, mDirectViewfinder->ResumeViewFinderDirectL() ); |