equal
deleted
inserted
replaced
159 delete iBatteryPaneController; |
159 delete iBatteryPaneController; |
160 |
160 |
161 delete iViewFinderBackup; |
161 delete iViewFinderBackup; |
162 iViewFinderBackup = NULL; |
162 iViewFinderBackup = NULL; |
163 iReceivedVfFrame = EFalse; |
163 iReceivedVfFrame = EFalse; |
164 |
164 if( iIndBlinkTimer ) |
|
165 { |
|
166 if( iIndBlinkTimer->IsActive() ) |
|
167 { |
|
168 iIndBlinkTimer->Cancel(); |
|
169 } |
|
170 delete iIndBlinkTimer; |
|
171 iIndBlinkTimer = NULL; |
|
172 } |
165 PRINT( _L("Camera <= ~CCamPreCaptureContainerBase" )) |
173 PRINT( _L("Camera <= ~CCamPreCaptureContainerBase" )) |
166 } |
174 } |
167 |
175 |
168 // --------------------------------------------------------- |
176 // --------------------------------------------------------- |
169 // CCamPreCaptureContainerBase::BaseConstructL |
177 // CCamPreCaptureContainerBase::BaseConstructL |
671 } |
679 } |
672 } |
680 } |
673 |
681 |
674 PRINT( _L("Camera <= CCamPreCaptureContainerBase::OfferKeyEventL .. capture key up handled") ) |
682 PRINT( _L("Camera <= CCamPreCaptureContainerBase::OfferKeyEventL .. capture key up handled") ) |
675 return EKeyWasConsumed; |
683 return EKeyWasConsumed; |
|
684 } |
|
685 else |
|
686 { |
|
687 UpdateCaptureButton(); |
676 } |
688 } |
677 iController.HandlePendingHdmiEvent(); |
689 iController.HandlePendingHdmiEvent(); |
678 } |
690 } |
679 else |
691 else |
680 { |
692 { |
2887 { |
2899 { |
2888 TCamCameraMode mode = iController.CurrentMode(); |
2900 TCamCameraMode mode = iController.CurrentMode(); |
2889 |
2901 |
2890 buttonActive = ( IsFocused() || iCaptureButtonContainer->IsFocused() ) |
2902 buttonActive = ( IsFocused() || iCaptureButtonContainer->IsFocused() ) |
2891 && ECamNoOperation == iController.CurrentOperation() |
2903 && ECamNoOperation == iController.CurrentOperation() |
|
2904 && iController.IsViewFinding() |
2892 && ( ECamControllerImage == mode || ECamControllerVideo == mode ); |
2905 && ( ECamControllerImage == mode || ECamControllerVideo == mode ); |
2893 |
2906 |
2894 PRINT1( _L("Camera <> capture button shown:%d"), buttonActive ); |
2907 PRINT1( _L("Camera <> capture button shown:%d"), buttonActive ); |
2895 iCaptureButtonContainer->SetCaptureButtonShown( buttonActive ); |
2908 iCaptureButtonContainer->SetCaptureButtonShown( buttonActive ); |
2896 } |
2909 } |