equal
deleted
inserted
replaced
729 // ----------------------------------------------------------------------------- |
729 // ----------------------------------------------------------------------------- |
730 // |
730 // |
731 void CMccCameraHandler::DoPowerOnComplete( TInt aError ) |
731 void CMccCameraHandler::DoPowerOnComplete( TInt aError ) |
732 { |
732 { |
733 __CONTROLLER_INT1( "CMccCameraHandler::DoPowerOnComplete, with value", aError ) |
733 __CONTROLLER_INT1( "CMccCameraHandler::DoPowerOnComplete, with value", aError ) |
|
734 |
734 if ( aError == KErrNone ) |
735 if ( aError == KErrNone ) |
735 { |
736 { |
736 iState = EPowered; |
737 iState = EPowered; |
|
738 |
|
739 // Notify observers about success, important to do before VF handling |
|
740 // as VF behaves more nicely at enabling when it sees that media recorder |
|
741 // is already using camera. |
|
742 NotifyObservers( aError ); |
737 |
743 |
738 // Viewfinder was enabled before resource release, enable again. |
744 // Viewfinder was enabled before resource release, enable again. |
739 // Also set old camera settings. |
745 // Also set old camera settings. |
740 if ( iViewFinderEnabled ) |
746 if ( iViewFinderEnabled ) |
741 { |
747 { |
755 } |
761 } |
756 else |
762 else |
757 { |
763 { |
758 __CONTROLLER_INT1( "CMccCameraHandler::DoPowerOnComplete, powering failed", aError ) |
764 __CONTROLLER_INT1( "CMccCameraHandler::DoPowerOnComplete, powering failed", aError ) |
759 iState = EFailed; |
765 iState = EFailed; |
760 } |
766 |
761 |
767 // Notify observers about failure |
762 // Notify observers about success or failure |
768 NotifyObservers( aError ); |
763 NotifyObservers( aError ); |
769 } |
764 |
770 |
765 __CONTROLLER( "CMccCameraHandler::DoPowerOnComplete, exit" ) |
771 __CONTROLLER( "CMccCameraHandler::DoPowerOnComplete, exit" ) |
766 } |
772 } |
767 |
773 |
768 // ----------------------------------------------------------------------------- |
774 // ----------------------------------------------------------------------------- |