MCL/sf/app/camera: comparison camerauis/cameraapp/generic/src/CamAppui.cpp

equal deleted inserted replaced

-:8f559c47d7fd
+:e32fcfe0045f
 // otherwise stay with the current capture mode
 if ( iMode == ECamControllerVideo )
 {
 iTargetMode = ECamControllerImage;
 }
+SubmergeToolbar(); //Fix flickering when switching modes.
 TrySwitchViewL();
 }
 break;
 // Switch to video pre capture view
 iTargetViewState = ECamViewStatePreCapture;
 iTargetMode = ECamControllerVideo;
 SetSuppressUIRiseOnViewfinderStart( EFalse );
 PRINT( _L("Camera => CCamAppUi::HandleCommandL Try switch to video mode"));
+SubmergeToolbar();
 TrySwitchViewL();
 }
 break;
 // -----------------------------------------------------
 case ECamCmdSelfTimer1: // 10-sec self-timer
 iView->HandleCommandL(ECamCmdRedrawScreen);
 iProcessingScreenRedraw = EFalse;
 }
 }
 break;
+// -----------------------------------------------------
+case ECamCmdRedrawVideoTime:
+{
+if( !iProcessingScreenRedraw && iView )
+{
+iProcessingScreenRedraw = ETrue;
+iView->HandleCommandL(ECamCmdRedrawVideoTime);
+iProcessingScreenRedraw = EFalse;
+}
+}
+break;
+// -----------------------------------------------------
+case ECamCmdRedrawZoom:
+{
+if( !iProcessingScreenRedraw && iView )
+{
+iProcessingScreenRedraw = ETrue;
+iView->HandleCommandL(ECamCmdRedrawZoom);
+iProcessingScreenRedraw = EFalse;
+}
+}
+break;
 // -----------------------------------------------------
 case ECamCmdShootSetup: // fall through
 case ECamCmdFlash:      // fall through
 case ECamCmdAddAudio:   // fall through
 case ECamCmdEdit:       // fall through
 // -----------------------------------------------------
 // the camera app has regained the focus
 case EEventFocusGained:
 {
 PRINT( _L("Camera <> CCamAppUi::HandleWsEventL: case EEventFocusGained") );
+RAknUiServer* capServ = CAknSgcClient::AknSrv();
+CleanupStack::PushL( TCleanupItem( CleanupBlankScreen, this ) );
+if ( iPretendExit )
+{
+capServ->BlankScreen();
+}
 iReturningFromPretendExit = iPretendExit;
 TBool uiOverride = iController.UiConfigManagerPtr() && iController.UiConfigManagerPtr()->IsUIOrientationOverrideSupported();
 if ( !iSendAsInProgress )
 {
 if ( ECamViewStateStandby == iViewState &&
 StandbyStatus() == KErrInUse )
 {
 // We call the base class and return
+capServ->UnblankScreen();
+CleanupStack::Pop();
 CAknAppUi::HandleWsEventL( aEvent, aDestination );
 return;
 }
 else if ( iViewState != ECamViewStateSettings &&
 iViewState != ECamViewStateViaPlayer &&
 {
 HideTaskL( EFalse );
 }
 iPretendExit = EFalse;
 // Go to standby with error
+capServ->UnblankScreen();
+CleanupStack::Pop();
 HandleStandbyEventL( KErrInUse );
 // We call the base class and return
 CAknAppUi::HandleWsEventL( aEvent, aDestination );
 return;
 }
 */
 if ( iViewState == ECamViewStateViaPlayer )
 {
 ActivateLocalViewL ( iViaPlayerUid );
 // We call the base class and return
+capServ->UnblankScreen();
+CleanupStack::Pop();
 CAknAppUi::HandleWsEventL( aEvent, aDestination );
 return;
 }
 else if ( iTargetViewState == ECamViewStatePostCapture  )
 {
 #endif
 // iPretendExit flag needs to be reset before returning, otherwise
 // views think we are still in exit state and will not reserve camera
 iPretendExit = EFalse;
+capServ->UnblankScreen();
+CleanupStack::Pop();
 CAknAppUi::HandleWsEventL( aEvent, aDestination );
 return;
 }
 else if ( SettingsLaunchedFromCamera() )
 {
 	  iView->HandleCommandL( ECamCmdExitStandby );
 	  }
 iTargetViewState = ECamViewStateSettings;
 }
 TrySwitchViewL();
+capServ->UnblankScreen();
+CleanupStack::Pop();
 CAknAppUi::HandleWsEventL( aEvent, aDestination );
 return;
 }
 else
 {
 }
 if ( memError && freeMemory < iController.UiConfigManagerPtr()->CriticalLevelRamMemoryFocusGained() )
 {
 PRINT( _L("Camera <> CCamAppUi::HandleWsEvent ECamEventFocusGained memory too low. Exiting") );
+capServ->UnblankScreen();
+CleanupStack::Pop();
 CloseAppL();
 PRINT( _L("Camera <= CCamAppUi::HandleWsEvent ECamEventFocusGained memory too low. Exiting") );
 return;
 }
 {
 PRINT( _L("Camera <> CCamAppUi::HandleWsEventL EEventFocusGained checking exit status") )
 // check if exit is required
 if ( iController.CheckExitStatus() )
 {
+capServ->UnblankScreen();
+CleanupStack::Pop();
 InternalExitL();
 PRINT( _L("Camera <= CCamAppUi::HandleWsEventL, internal exit") )
 return;
 }
 }
 //We hiden toolbar when keylock was set to on in pre-capture view and camera lost focus,
 //so we need to display toolbar when keylock is set to off and camera gain focus again.
 if ( ECamViewStatePreCapture == iViewState &&
 ECamPreCapViewfinder == iPreCaptureMode &&
 ( !( iSelfTimer && iSelfTimer->IsActive() ) ) &&
-iController.CurrentOperation() != ECamCapturing )
+iController.CurrentOperation() != ECamCapturing &&
+iController.CurrentOperation() != ECamPaused )
 {
 SetToolbarVisibility();
 }
 // If keylock is set on when recording is starting up but not yet
 }
 }
 }
 }
+capServ->UnblankScreen();
+CleanupStack::Pop();
 if (iStartupLogoController && iReturningFromPretendExit)
 {
 iStartupLogoController->ShowLogo();
 }
 break;
 }
 // -----------------------------------------------------
 case EEventFocusLost:
 {
 PRINT( _L("Camera <> CCamAppUi::HandleWsEventL: case EEventFocusLost") );
+// Stop VF early to reduce load
+if( AppInBackground( EFalse )
+&& iViewState == ECamViewStatePreCapture
+&& iMode == ECamControllerVideo )
+{
+iController.StopViewFinder();
+}
 //When go to background from video post caputure view, we need to hide the toolbar to avoid icons overlap
 if( AppInBackground( EFalse )
 && iViewState == ECamViewStatePostCapture
 && iMode == ECamControllerVideo )
 {
 if ( iStartupLogoController )
 {
 iStartupLogoController->ShowLogo();
 }
+SubmergeToolbar(); //For preventing toolbar to show up when starting camera again.
 PRINT( _L("Camera <= CCamAppUi::InternalExitL") );
 OstTrace0( CAMERAAPP_PERFORMANCE_DETAIL, DUP_CCAMAPPUI_INTERNALEXITL, "e_CCamAppUi_InternalExitL 0" );
 }
 PRINT( _L("Camera => CCamAppUi::ShowZoomPane" ))
 iZoomPaneShown = ETrue;
 if ( aRedraw && IsDirectViewfinderActive() )
 {
-TRAP_IGNORE(HandleCommandL(ECamCmdRedrawScreen));
+TRAP_IGNORE(HandleCommandL(ECamCmdRedrawZoom));
 }
 PRINT( _L("Camera <= CCamAppUi::ShowZoomPane" ))
 }
 // ---------------------------------------------------------------------------
 }
 }
 if ( aRedraw && IsDirectViewfinderActive() )
 {
-TRAP_IGNORE( HandleCommandL(ECamCmdRedrawScreen ) );
+TRAP_IGNORE( HandleCommandL(ECamCmdRedrawZoom ) );
 }
 PRINT( _L("Camera <= CCamAppUi::HideZoomPane" ))
 }
 // ---------------------------------------------------------------------------
 iUiConstructionComplete = ETrue;
 // Load the settings model static settings
 PRINT( _L("Camera <> call CCamAppController::LoadStaticSettingsL..") )
 iController.LoadStaticSettingsL( IsEmbedded() );
-iInternalStorage = static_cast<TCamMediaStorage>(iController.IntegerSettingValue( ECamSettingItemPhotoMediaStorage ));
+iInternalStorage = static_cast<TCamMediaStorage>(iController.IntegerSettingValueUnfiltered( ECamSettingItemPhotoMediaStorage ));
 // store the userscene settings
 iController.StoreUserSceneSettingsL();
 /*#ifndef __WINSCW__
 if ( !iSFIUtils )
 break;
 }
 }
+// -----------------------------------------------------------------------------
+// CCamAppUi::NaviProgressBarModel
+// -----------------------------------------------------------------------------
+//
+CCamNaviProgressBarModel* CCamAppUi::NaviProgressBarModel()
+{
+return iNaviProgressBarModel;
+}
+void CCamAppUi::CleanupBlankScreen( TAny* aAny )
+{
+PRINT(_L("Camera => CCamAppUi::CleanupBlankScreen."));
+CCamAppUi* appui = static_cast<CCamAppUi*>( aAny );
+RAknUiServer* capServ = CAknSgcClient::AknSrv();
+if( capServ )
+{
+capServ->UnblankScreen();
+appui->Exit();
+}
+PRINT(_L("Camera <= CCamAppUi::CleanupBlankScreen."));
+}
 //  End of File

branch	RCL_3
changeset 19	e32fcfe0045f
parent 17	8f559c47d7fd
child 21	289bbfdb6627