# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1277124201 -10800 # Node ID b95d12697049a6a6169087aecb276f59192309de # Parent e1a893011facdf77a7c146fca4cb627831da16db Revision: 201023 Kit: 2010125 diff -r e1a893011fac -r b95d12697049 vtengines/videoteleng/Src/Base/CVtEngEventManager.cpp --- a/vtengines/videoteleng/Src/Base/CVtEngEventManager.cpp Wed Jun 09 09:44:39 2010 +0300 +++ b/vtengines/videoteleng/Src/Base/CVtEngEventManager.cpp Mon Jun 21 15:43:21 2010 +0300 @@ -71,7 +71,7 @@ { iEventQueue = new ( ELeave ) CArrayFixFlat< TInt >( KMaxEventsInQueue ); iEventQueue->SetReserveL( KMaxEventsInQueue ); - iObservers.Append( &aEventObserver ); + User::LeaveIfError( iObservers.Append( &aEventObserver ) ); } // Destructor diff -r e1a893011fac -r b95d12697049 vtengines/videoteleng/Src/Media/CVtEngMediaHandler.cpp --- a/vtengines/videoteleng/Src/Media/CVtEngMediaHandler.cpp Wed Jun 09 09:44:39 2010 +0300 +++ b/vtengines/videoteleng/Src/Media/CVtEngMediaHandler.cpp Mon Jun 21 15:43:21 2010 +0300 @@ -4226,7 +4226,7 @@ TInt aId, const TVideoQuality aValue, TBool aSetPeer ) { __VTPRINTENTER( "MH.VQ.SettingVideoQuality" ) - iParamList.Append( TVQSParams( aId, aValue, aSetPeer ) ); + User::LeaveIfError( iParamList.Append( TVQSParams( aId, aValue, aSetPeer ) ) ); __VTPRINTEXIT( "MH.VQ.SettingVideoQuality" ) } diff -r e1a893011fac -r b95d12697049 vtprotocolplugins/VideoSource/src/cmultiframeprovider.cpp --- a/vtprotocolplugins/VideoSource/src/cmultiframeprovider.cpp Wed Jun 09 09:44:39 2010 +0300 +++ b/vtprotocolplugins/VideoSource/src/cmultiframeprovider.cpp Mon Jun 21 15:43:21 2010 +0300 @@ -630,15 +630,15 @@ { __IF_DEBUG(Print(_L("VideoSource[%d]: CMultiframeProvider::AddBitmapToFreeQueue() >>"), RThread().Id().operator TUint())); if ( iOldBM ) - { - __IF_DEBUG(Print(_L("VideoSource[%d]: CMultiframeProvider::AddBitmapToFreeQueue() OLD BM"), RThread().Id().operator TUint())); - iOldBM = EFalse; - iFreeQueue.Append( iOldBitmap ); - } + { + __IF_DEBUG(Print(_L("VideoSource[%d]: CMultiframeProvider::AddBitmapToFreeQueue() OLD BM"), RThread().Id().operator TUint())); + iOldBM = EFalse; + User::LeaveIfError( iFreeQueue.Append( iOldBitmap ) ); + } else - { - iFreeQueue.Append( iScaled ); - } + { + User::LeaveIfError( iFreeQueue.Append( iScaled ) ); + } iLoopAo->SetFreeBitmaps( 1 ); __IF_DEBUG(Print(_L("VideoSource[%d]: CMultiframeProvider::AddBitmapToFreeQueue() <<"), RThread().Id().operator TUint())); } diff -r e1a893011fac -r b95d12697049 vtuis/videotelui/src/CVtUiAppUi.cpp --- a/vtuis/videotelui/src/CVtUiAppUi.cpp Wed Jun 09 09:44:39 2010 +0300 +++ b/vtuis/videotelui/src/CVtUiAppUi.cpp Mon Jun 21 15:43:21 2010 +0300 @@ -1764,28 +1764,40 @@ - if ( wb && iUiStates->IsWhiteBalanceSettingAvailable() ) - { - __VTPRINT( DEBUG_GEN,"VtUi.UpdateVBSettingL WB update" ) - wb->UpdateSettingL(); - } - - if ( ct && iUiStates->IsColorToneSettingAvailable() ) - { - __VTPRINT( DEBUG_GEN,"VtUi.UpdateVBSettingL CT update" ) - ct->UpdateSettingL(); + if ( wb && wb->State() == MVtUiFeature::EActive ) + { + if ( iUiStates->IsWhiteBalanceSettingAvailable() ) + { + __VTPRINT( DEBUG_GEN,"VtUi.UpdateVBSettingL WB update" ) + wb->UpdateSettingL(); + } + } + + if ( ct && ct->State() == MVtUiFeature::EActive ) + { + if ( iUiStates->IsColorToneSettingAvailable() ) + { + __VTPRINT( DEBUG_GEN,"VtUi.UpdateVBSettingL CT update" ) + ct->UpdateSettingL(); + } } - if ( br && iUiStates->IsBrightnessSettingAvailable() ) - { - __VTPRINT( DEBUG_GEN,"VtUi.UpdateVBSettingL br update" ) - br->UpdateSlider(); + if ( br && br->State() == MVtUiFeature::EActive ) + { + if ( iUiStates->IsBrightnessSettingAvailable() ) + { + __VTPRINT( DEBUG_GEN,"VtUi.UpdateVBSettingL br update" ) + br->UpdateSlider(); + } } - if ( contr && iUiStates->IsContrastSettingAvailable() ) - { - __VTPRINT( DEBUG_GEN,"VtUi.UpdateVBSettingL contract update" ) - contr->UpdateSlider(); + if ( contr && contr->State() == MVtUiFeature::EActive ) + { + if ( iUiStates->IsContrastSettingAvailable() ) + { + __VTPRINT( DEBUG_GEN,"VtUi.UpdateVBSettingL contract update" ) + contr->UpdateSlider(); + } } } diff -r e1a893011fac -r b95d12697049 vtuis/videotelui/src/features/prefs/cvtuiprefsettinglistbase.cpp --- a/vtuis/videotelui/src/features/prefs/cvtuiprefsettinglistbase.cpp Wed Jun 09 09:44:39 2010 +0300 +++ b/vtuis/videotelui/src/features/prefs/cvtuiprefsettinglistbase.cpp Mon Jun 21 15:43:21 2010 +0300 @@ -205,9 +205,12 @@ __VTPRINTENTER( "CVtUiPrefSettingListBase.SizeChanged" ) ResizeBackroundBitmapRect(); // Set new coordinates and size - iSettingPage->SetBitmapPositionAndClipRect( iBitmapTopLeftCorner, - iBitmapClippingRect ); - iSettingPage->HandleLayoutChangeL(); + if( iSettingPage ) + { + iSettingPage->SetBitmapPositionAndClipRect( iBitmapTopLeftCorner, + iBitmapClippingRect ); + iSettingPage->HandleLayoutChangeL(); + } __VTPRINTEXIT( "CVtUiPrefSettingListBase.SizeChanged" ) } diff -r e1a893011fac -r b95d12697049 vtuis/videotelui/src/features/toolbar/cvtuihidetoolbaritemaction.cpp --- a/vtuis/videotelui/src/features/toolbar/cvtuihidetoolbaritemaction.cpp Wed Jun 09 09:44:39 2010 +0300 +++ b/vtuis/videotelui/src/features/toolbar/cvtuihidetoolbaritemaction.cpp Mon Jun 21 15:43:21 2010 +0300 @@ -104,134 +104,132 @@ // --------------------------------------------------------------------------- // void CVtUiHideToolbarItemAction::HideOrShowToolbarControlL - ( TInt aCommandId ) - { - __VTPRINTENTER( "HideTbAct.HideOrShowToolbarControlL" ) - TBool isZoomModeOn = iUiStates.IsZoomModeOn(); - TBool isVolumeModeOn = iUiStates.IsVolumeModeOn(); - TBool isBrightnessModeOn = iUiStates.IsBrightnessModeOn(); - TBool isContrastModeOn = iUiStates.IsContrastModeOn(); - TBool dimmed = EFalse; - const TVtUiMediaState& mediaState( iUiStates.MediaState() ); - const TVtUiAudioState& audioState( iUiStates.AudioState() ); + ( TInt aCommandId ) + { + __VTPRINTENTER( "HideTbAct.HideOrShowToolbarControlL" ) + TBool isZoomModeOn = iUiStates.IsZoomModeOn(); + TBool isVolumeModeOn = iUiStates.IsVolumeModeOn(); + TBool isBrightnessModeOn = iUiStates.IsBrightnessModeOn(); + TBool isContrastModeOn = iUiStates.IsContrastModeOn(); + TBool isDialerOpen = iUiStates.IsDialerOpen(); + TBool isDialerActivating = iUiStates.IsDialerActivating(); + TBool isWhiteBalanceModeOn = iUiStates.IsWhiteBalanceModeOn(); + TBool isColorToneModeOn = iUiStates.IsColorToneModeOn(); + TBool isCaptureModeOn = iUiStates.IsCaptureModeOn(); + TBool isSomeElseZoomOn = isBrightnessModeOn || isContrastModeOn || isDialerOpen || isVolumeModeOn + || isDialerActivating || isWhiteBalanceModeOn || isColorToneModeOn || isCaptureModeOn; + TBool isSomeoneOn = isZoomModeOn || isSomeElseZoomOn; + TBool dimmed = EFalse; + const TVtUiMediaState& mediaState( iUiStates.MediaState() ); + const TVtUiAudioState& audioState( iUiStates.AudioState() ); + + switch ( aCommandId ) + { + case EVtUiCmdDisableVideo: + case EVtUiCmdSwapImagesPlaces: + case EVtUiCmdDisableAudio: + case EVtUiCmdEnableAudio: + case EVtUiCmdEnableVideo: + if ( isSomeoneOn ) + { + dimmed = ETrue; + } + break; - switch ( aCommandId ) - { - case EVtUiCmdDisableVideo: - case EVtUiCmdSwapImagesPlaces: - case EVtUiCmdDisableAudio: - case EVtUiCmdEnableAudio: - if ( isContrastModeOn || - isBrightnessModeOn - || isZoomModeOn || isVolumeModeOn ) - { - dimmed = ETrue; - } - break; - case EVtUiCmdEnableVideo: - if ( isZoomModeOn || isVolumeModeOn ) - { - dimmed = ETrue; - } - break; - - case EVtUiCmdUsePrimaryCamera: - case EVtUiCmdUseSecondaryCamera: - if ( isContrastModeOn || - isBrightnessModeOn - || iUiStates.IsCaptureModeOn() || - mediaState.IsSharing() - || isZoomModeOn || isVolumeModeOn ) - { - dimmed = ETrue; - } - break; - case EVtUiCmdZoom: - if ( isContrastModeOn || - isBrightnessModeOn|| - !mediaState.IsVideo() || - mediaState.IsFrozen() || - mediaState.IsSharing() || - isVolumeModeOn ) - { - dimmed = ETrue; - } - break; - - case EVtUiCmdShareObjectImage: - if ( isContrastModeOn || - isBrightnessModeOn || - isZoomModeOn || mediaState.IsFrozen() || - mediaState.IsVideoPermanentlyStopped() || - isVolumeModeOn ) - { - dimmed = ETrue; - } - break; - - case EVtUiCmdActivateBT: - dimmed = !audioState.CanActivateBtHf() || - audioState.IsAudioPermanentlyStopped() || - isZoomModeOn || isContrastModeOn || - isBrightnessModeOn || - isVolumeModeOn ; - break; - - case EVtUiCmdDeactivateLoudspeaker: - dimmed = !audioState.CanDeactivateLoudspeaker() || - audioState.IsAudioPermanentlyStopped() || - isZoomModeOn || isContrastModeOn || - isBrightnessModeOn || - isVolumeModeOn; - break; - - case EVtUiCmdSwitchFromBTToIHF: - dimmed = !audioState.CanDeactivateBtHf() || - !audioState.CanActivateLoudspeaker() || - audioState.IsAudioPermanentlyStopped() || - isZoomModeOn || isContrastModeOn || - isBrightnessModeOn || - isVolumeModeOn; - break; - - case EVtUiCmdActivateLoudspeaker: - dimmed = !audioState.CanActivateLoudspeaker() || - audioState.IsAudioPermanentlyStopped() || - isZoomModeOn || isContrastModeOn || - isBrightnessModeOn || - isVolumeModeOn; - break; - + case EVtUiCmdUsePrimaryCamera: + case EVtUiCmdUseSecondaryCamera: + if ( mediaState.IsSharing() + || isSomeoneOn ) + { + dimmed = ETrue; + } + break; + case EVtUiCmdZoom: + if ( !mediaState.IsVideo() || + mediaState.IsFrozen() || + mediaState.IsSharing() || + isSomeElseZoomOn ) + { + dimmed = ETrue; + } + break; + + case EVtUiCmdShareObjectImage: + if ( mediaState.IsFrozen() || + mediaState.IsVideoPermanentlyStopped() || + isSomeoneOn ) + { + dimmed = ETrue; + } + break; + + case EVtUiCmdActivateBT: + if ( !audioState.CanActivateBtHf() || + audioState.IsAudioPermanentlyStopped() || + isSomeoneOn ) + { + dimmed = ETrue; + } + break; + + case EVtUiCmdDeactivateLoudspeaker: + if ( !audioState.CanDeactivateLoudspeaker() || + audioState.IsAudioPermanentlyStopped() || + isSomeoneOn ) + { + dimmed = ETrue; + } + break; + + case EVtUiCmdSwitchFromBTToIHF: + if ( !audioState.CanDeactivateBtHf() || + !audioState.CanActivateLoudspeaker() || + audioState.IsAudioPermanentlyStopped() || + isSomeoneOn ) + { + dimmed = ETrue; + } + break; + + case EVtUiCmdActivateLoudspeaker: + if ( !audioState.CanActivateLoudspeaker() || + audioState.IsAudioPermanentlyStopped() || + isSomeoneOn ) + { + dimmed = ETrue; + } + break; + /* case EVtUiCmdSnapshot: - if ( iUiStates.IsContrastModeOn() || iUiStates.IsBrightnessModeOn () - || isZoomModeOn || ( !iUiStates.MediaState().IsVideo() && - !iUiStates.MediaState().IsFrozen() ) || - !iUiStates.MediaState().IsFreezeSupported() || iUiStates.IsContrastModeOn() || - iUiStates.IsBrightnessModeOn() || isVolumeModeOn ) - { - dimmed = ETrue; - } - break; + if ( iUiStates.IsContrastModeOn() || iUiStates.IsBrightnessModeOn () + || isZoomModeOn || ( !iUiStates.MediaState().IsVideo() && + !iUiStates.MediaState().IsFrozen() ) || + !iUiStates.MediaState().IsFreezeSupported() || iUiStates.IsContrastModeOn() || + iUiStates.IsBrightnessModeOn() || isVolumeModeOn ) + { + dimmed = ETrue; + } + break; */ - default: - dimmed = EFalse; - break; - } - - // update toolbar's commands visibility values - if ( dimmed ) + default: + dimmed = EFalse; + break; + } + + // update toolbar's commands visibility values + if ( dimmed ) { iToolbar->SetCmdIdVisibilityStateL( aCommandId, - CVtUiToolbarBase::EDimmed ); + CVtUiToolbarBase::EDimmed ); } - else + else { iToolbar->SetCmdIdVisibilityStateL( aCommandId, - CVtUiToolbarBase::EShown ); + CVtUiToolbarBase::EShown ); } - __VTPRINTEXIT( "HideTbAct.HideOrShowToolbarControlL" ) - } + __VTPRINTEXIT( "HideTbAct.HideOrShowToolbarControlL" ) + } // --------------------------------------------------------------------------- // CVtUiHideToolbarItemAction::EndProcess diff -r e1a893011fac -r b95d12697049 vtuis/videotelui/src/features/toolbar/cvtuitoolbarbase.cpp --- a/vtuis/videotelui/src/features/toolbar/cvtuitoolbarbase.cpp Wed Jun 09 09:44:39 2010 +0300 +++ b/vtuis/videotelui/src/features/toolbar/cvtuitoolbarbase.cpp Mon Jun 21 15:43:21 2010 +0300 @@ -1230,6 +1230,10 @@ __VTPRINT( DEBUG_GEN, "ToolbarBase::HandleLayoutChangeL Color Tone." ) SetToolbarVisibilityAfterLayoutChangeL( EFalse ); } + else if ( !isLandscape && iFeatureManager.UiStates().IsVolumeModeOn() ) + { + SetToolbarVisibilityAfterLayoutChangeL( EFalse ); + } else if ( !isLandscape && menuBar && menuBar->IsDisplayed() ) { __VTPRINT( DEBUG_GEN, "ToolbarBase::HandleLayoutChangeL Menu Displayed." ) @@ -1243,6 +1247,7 @@ iFeatureManager.UiStates().IsVideoQualityModeOn() || iFeatureManager.UiStates().IsWhiteBalanceModeOn() || iFeatureManager.UiStates().IsColorToneModeOn() || + iFeatureManager.UiStates().IsVolumeModeOn() || menuBar && menuBar->IsDisplayed() ) ) { __VTPRINT(DEBUG_GEN, "CVtUiToolbarBase.LayoutChangeL.StartL" )