equal
deleted
inserted
replaced
3092 iPendingAFRequest=0; |
3092 iPendingAFRequest=0; |
3093 iCurrentAFRequest=0; |
3093 iCurrentAFRequest=0; |
3094 iNoBurstCancel = EFalse; |
3094 iNoBurstCancel = EFalse; |
3095 iKeyUP = EFalse; |
3095 iKeyUP = EFalse; |
3096 iAFCancelInProgress = EFalse; |
3096 iAFCancelInProgress = EFalse; |
|
3097 iTouchCapture = EFalse; |
3097 |
3098 |
3098 // ------------------------------------------------------- |
3099 // ------------------------------------------------------- |
3099 if( ECamTriIdle != iCameraController->ViewfinderState() ) |
3100 if( ECamTriIdle != iCameraController->ViewfinderState() ) |
3100 { |
3101 { |
3101 // If VF is not stopped, frames might come when we are not |
3102 // If VF is not stopped, frames might come when we are not |
9033 iSettingsRestoreNeeded = EFalse; |
9034 iSettingsRestoreNeeded = EFalse; |
9034 TRAP_IGNORE( iCameraController->DirectSettingsChangeL( ECameraSettingFacetracking ) ); |
9035 TRAP_IGNORE( iCameraController->DirectSettingsChangeL( ECameraSettingFacetracking ) ); |
9035 TRAP( aStatus, RestoreSettingsToCameraL() ); |
9036 TRAP( aStatus, RestoreSettingsToCameraL() ); |
9036 } |
9037 } |
9037 // fixed toolbar is used only with touch devices |
9038 // fixed toolbar is used only with touch devices |
9038 if ( IsTouchScreenSupported() ) |
9039 if ( IsTouchScreenSupported() && appUi ) |
9039 { |
9040 { |
9040 appUi->SetToolbarVisibility();// avoid flickering in settings view |
9041 CAknToolbar* toolbar = appUi->CurrentFixedToolbar(); |
|
9042 if ( toolbar ) |
|
9043 { |
|
9044 CAknToolbarExtension* toolbarextension = toolbar->ToolbarExtension(); |
|
9045 if ( toolbarextension && toolbarextension->IsShown() ) |
|
9046 { |
|
9047 appUi->SetToolbarVisibility();// avoid flickering in settings view |
|
9048 } |
|
9049 else |
|
9050 { |
|
9051 appUi->SubmergeToolbar(); |
|
9052 } |
|
9053 } |
9041 PRINT( _L( "Camera <> SetToolbarVisibility done ") ); |
9054 PRINT( _L( "Camera <> SetToolbarVisibility done ") ); |
9042 } |
9055 } |
9043 // else use AP |
9056 // else use AP |
9044 else |
9057 else |
9045 { |
9058 { |
9135 OstTrace0( CAMERAAPP_PERFORMANCE, DUP3_CCAMAPPCONTROLLER_HANDLECAMERAEVENTL, "e_CAM_PRI_SHOT_TO_SHOT 1" ); |
9148 OstTrace0( CAMERAAPP_PERFORMANCE, DUP3_CCAMAPPCONTROLLER_HANDLECAMERAEVENTL, "e_CAM_PRI_SHOT_TO_SHOT 1" ); |
9136 OstTrace0( CAMERAAPP_PERFORMANCE, DUP4_CCAMAPPCONTROLLER_HANDLECAMERAEVENTL, "e_CAM_APP_SHOT_TO_STILL 1" ); |
9149 OstTrace0( CAMERAAPP_PERFORMANCE, DUP4_CCAMAPPCONTROLLER_HANDLECAMERAEVENTL, "e_CAM_APP_SHOT_TO_STILL 1" ); |
9137 OstTrace0( CAMERAAPP_PERFORMANCE, DUP5_CCAMAPPCONTROLLER_HANDLECAMERAEVENTL, "e_CAM_APP_CAPTURE_START 1" ); |
9150 OstTrace0( CAMERAAPP_PERFORMANCE, DUP5_CCAMAPPCONTROLLER_HANDLECAMERAEVENTL, "e_CAM_APP_CAPTURE_START 1" ); |
9138 OstTrace0( CAMERAAPP_PERFORMANCE, DUP6_CCAMAPPCONTROLLER_HANDLECAMERAEVENTL, "e_CAM_PRI_SERIAL_SHOOTING 1" ); |
9151 OstTrace0( CAMERAAPP_PERFORMANCE, DUP6_CCAMAPPCONTROLLER_HANDLECAMERAEVENTL, "e_CAM_PRI_SERIAL_SHOOTING 1" ); |
9139 |
9152 |
|
9153 // When image capture is started with touch capture button, a short |
|
9154 // delay is added after AF completes, but before capturing starts to |
|
9155 // avoid blurry screen sometimes when VF is frozen and before the |
|
9156 // snapshot is drawn. Delay also helps to see focus reticule. |
|
9157 if( iTouchCapture ) |
|
9158 { |
|
9159 User::After( 50000 ); |
|
9160 iTouchCapture = EFalse; |
|
9161 } |
9140 Capture(); |
9162 Capture(); |
9141 } |
9163 } |
9142 break; |
9164 break; |
9143 } |
9165 } |
9144 |
9166 |
11578 // |
11600 // |
11579 TBool CCamAppController::SceneModeForcedBySecondaryCamera() |
11601 TBool CCamAppController::SceneModeForcedBySecondaryCamera() |
11580 { |
11602 { |
11581 return iSceneModeForcedBySecondaryCamera; |
11603 return iSceneModeForcedBySecondaryCamera; |
11582 } |
11604 } |
11583 |
11605 |
|
11606 // --------------------------------------------------------------------------- |
|
11607 // CCamAppController::SetTouchCapture |
|
11608 // |
|
11609 // --------------------------------------------------------------------------- |
|
11610 // |
|
11611 void CCamAppController::SetTouchCapture( TBool aTouchCapture ) |
|
11612 { |
|
11613 iTouchCapture = aTouchCapture; |
|
11614 } |
11584 // End of File |
11615 // End of File |
11585 |
11616 |