FCL/sf/app/camera: comparison camerauis/cameraapp/generic/src/CamAppController.cpp

equal deleted inserted replaced

-:2c87b2808fd7
+:f0c0788c4de2
 PRINT( _L("Camera <> delete Configuration Manager..") );
 delete iConfiguration;
 iConfiguration = NULL;
 RProperty::Delete( KPSUidCamcorderNotifier, KCCorFocused );
-if( iPlugin )
+if( TUid::Null() != iPlugin )
 {
 // Destroy Ecom plugin
-iPlugin->DestroyPlugin();
+REComSession::DestroyedImplementation( iPlugin );
-}
+REComSession::FinalClose();
-iPlugin = NULL;
+}
 delete iDriveChangeNotifier;
 iFs.Close();
 if( iRotatorAo )
 {
 {
 // IssueDirectRequestL( ECamRequestVfStop );
 StopViewFinder();
 IssueRequestL( ECamRequestVideoStop ); // Rest handled when event comes.
 });
+iIdleTimer->SetTimeout( KIdleTimeout ); //Set normal idle timeout value
 StartIdleTimer();
 }
 else
 {
 // otherwise there is no current recording operation
 iSoundPlayer->EnableAllKeySounds();
 }
 // Keep track of the fact we are now leaving saving state
 iSaving = EFalse;
-// try closing video record to free up resources
+//create thumbnail before harvesting
-// Test - <eo> commented out, no such direct request supported
+if( iConfigManager && iConfigManager->IsThumbnailManagerAPISupported() )
-// TRAP_IGNORE( IssueDirectRequestL( ECamRequestVideoRelease ) );
+{
+TRAP_IGNORE( iImageSaveActive->CreateThumbnailsL( *BurstCaptureArray() ) ;
-// if video post capture is off then force re-prepare so
+iImageSaveActive->DoCreateThumbnailL() );
-// that remaining record time is updated
+}
-// REMOVED
-// if using direct viewfinding pause viewfinder
-// REMOVED
 // report to LifeBlog
 RProperty::Set( KPSUidCamcorderNotifier, KCamLatestFilePath, iSuggestedVideoPath );
 // Add to album if this is enabled for videos
 TUint32 defaultAlbumId = static_cast<TUint32>(
 IntegerSettingValue( ECamSettingItemDefaultAlbumId ));
 }
 else // Harvest the file but dont add to the default album
 {
 iImageSaveActive->AddToAlbum( iSuggestedVideoPath, EFalse, defaultAlbumId );
 }
-//create thumbnail
-if( iConfigManager && iConfigManager->IsThumbnailManagerAPISupported() )
-{
-TRAP_IGNORE( iImageSaveActive->CreateThumbnailsL( *BurstCaptureArray() ) );
-}
 NotifyControllerObservers( ECamEventRecordComplete,   aStatus );
 SetOperation( ECamNoOperation );
 PRINT( _L( "Camera <> calling HandleCaptureCompletion.." ) )
 HandleCaptureCompletion();
 NotifyControllerObservers( ECamEventMediaFileChanged, aStatus );
 PRINT( _L("Camera <> PAUSING FAILED!!") );
 }
 else
 {
 // start video pause timeout
+iIdleTimer->SetTimeout( iLongIdleTimeout );
 StartIdleTimer();
 }
 }
 PRINT( _L("Camera <= CCamAppController::PauseVideoRecording") );
 }
 void CCamAppController::ContinueVideoRecording()
 {
 PRINT( _L("Camera => CCamAppController::ContinueVideoRecording") );
 if ( ECamPaused == CurrentVideoOperation() )
 {
+iIdleTimer->SetTimeout( KIdleTimeout ); //Set normal idle timeout value
 SetOperation( ECamResuming );
 // Restart video when sound played
 PlaySound( ECamVideoResumeSoundId, ETrue );
 }
 PRINT( _L("Camera <= CCamAppController::ContinueVideoRecording") );
 if ( scene != ECamSceneMacro &&
 scene != ECamSceneScenery &&
 scene != ECamSceneSports &&
 !iSceneModeForcedBySecondaryCamera )
 {
-PRINT1( _L("Camera MK: Changing face tracking state -> update iPreviousFaceTrack to %d"), aSettingValue );
+PRINT1( _L("Camera <> Changing face tracking state -> update iPreviousFaceTrack to %d"), aSettingValue );
 iSettingsModel->SetPreviousFaceTrack( static_cast<TCamSettingsOnOff>( aSettingValue ) );
 }
 break;
 }
 : iBusyFlags( EBusyNone )
 , iDiskCriticalLevel   ( KErrNotFound )
 , iRamDiskCriticalLevel( KErrNotFound )
 , iImageOrientation( ECamOrientation0 )
 , iLastImageOrientation( ECamOrientation0 )
+, iLongIdleTimeout( KIdleTimeout * 5 )
+, iPlugin( TUid::Null() )
 , iPendingHdmiEvent( ECamHdmiNoEvent )
 {
 }
 // ---------------------------------------------------------------------------
 PRINT( _L( "Camera <= CCamAppController::HandleImageStopEventL" ) );
 }
 // ---------------------------------------------------------------------------
+// CCamAppController::SetIdleTimerTimeout
+// ---------------------------------------------------------------------------
+//
+void CCamAppController::SetIdleTimerTimeout( TBool aLong )
+{
+PRINT1( _L( "Camera => CCamAppController::SetIdleTimerTimeout aLong=%d" ),aLong );
+TBool changed = EFalse;
+if( aLong )
+{
+if( iLongIdleTimeout < ( KIdleTimeout * 5 ) )
+{
+iLongIdleTimeout = KIdleTimeout * 5;
+changed = ETrue;
+}
+}
+else
+{
+if( iLongIdleTimeout > KIdleTimeout )
+{
+iLongIdleTimeout = KIdleTimeout; //Low power. Set normal idle timeout value
+changed = ETrue;
+}
+}
+if( changed && ECamPaused == CurrentVideoOperation() )
+{
+iIdleTimer->SetTimeout( iLongIdleTimeout );
+}
+PRINT1( _L( "Camera <= CCamAppController::SetIdleTimerTimeout changed=%d" ),changed );
+}
+// ---------------------------------------------------------------------------
 // CCamAppController::IdleTimeoutL
 // ---------------------------------------------------------------------------
 //
 TInt CCamAppController::IdleTimeoutL( TAny* aPtr )
 {
 // CCamAppController::DoIdleTimeoutL
 // ---------------------------------------------------------------------------
 //
 TInt CCamAppController::DoIdleTimeoutL()
 {
-// if a video recording has been paused for 60 seconds without key presses
+// if a video recording has been paused for 5 minutes without key presses
 if ( ECamPaused == CurrentVideoOperation() )
 {
+iIdleTimer->SetTimeout( KIdleTimeout ); //Set normal idle timeout value
 NotifyControllerObservers( ECamEventVideoPauseTimeout, KErrNone );
 }
 // notify switch to standby mode and stop timer
 else if( ECamStandby != iInfo.iOperation && ECamTriActive == iCameraController->ViewfinderState())
 {
 PRINT( _L( "Camera <> CCamAppController::StartIdleTimer no restart" ) );
 // don't restart if recording operation in progress
 return;
 }
-// if recording is paused, use the idle timer to stop recording after 60 secs
+// if recording is paused, use the idle timer to stop recording after 5 mins
 else
 {
 PRINT( _L( "Camera <> CCamAppController::StartIdleTimer else part" ) );
 // empty else statement to remove LINT error
 }
 if( iVideoRequested )
 {
 PRINT( _L("Camera <> starting recording..") );
 iVideoRequested = EFalse;
-IssueRequestL( ECamRequestVideoStart );
+// Make sure the MMC have enough free memory to record video.
+if( appUi->CheckMemoryL() )
+{
+IssueRequestL( ECamRequestVideoStart );
+	}
 PRINT( _L("Camera <> ..done") );
 }
 NotifyControllerObservers( ECamEventEngineStateChanged, KErrNone );
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
 //
-void CCamAppController::SetSettingsPlugin( CCamGSInterface* aPlugin )
+void CCamAppController::SetSettingsPlugin( TUid aPlugin )
 	{
 	iPlugin = aPlugin;
 	}
 // ---------------------------------------------------------------------------
 SwitchToStandbyL( KErrNone );
 }
 else if( aType == EDriveDismount &&
 appUi->IsRecoverableStatus() )
 {
-TInt mmcInserted = 0;
 TInt usbPersonality = 0;
-User::LeaveIfError( RProperty::Get( KPSUidUikon, KUikMMCInserted, mmcInserted ) );
 User::LeaveIfError(RProperty::Get(KPSUidUsbWatcher,
 KUsbWatcherSelectedPersonality,
 usbPersonality) );
 if( !IsMemoryAvailable(ECamMediaStorageMassStorage) &&
 !IsMemoryAvailable(ECamMediaStorageCard) )
 {
 if( KUsbPersonalityIdMS == usbPersonality )
 {
 SwitchToStandbyL( ECamErrMassStorageMode );
 }
-else if ( !mmcInserted )
+else if ( aType == EDriveDismount )
 {
 SwitchToStandbyL( ECamErrMemoryCardNotInserted );
 }
 }
 }

branch	RCL_3
changeset 62	f0c0788c4de2
parent 57	2c87b2808fd7
child 67	756ad29ed18e