# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1272375655 -10800 # Node ID 856ae1b15d984a81bba70aa92626e4ae3babbc9d # Parent 392fdfb57a7851e5c1e9c73c8b345684666d41fa Revision: 201015 Kit: 201017 diff -r 392fdfb57a78 -r 856ae1b15d98 vtengines/videoteleng/Src/Media/CVtEngDtmfHandler.cpp --- a/vtengines/videoteleng/Src/Media/CVtEngDtmfHandler.cpp Wed Apr 14 16:00:08 2010 +0300 +++ b/vtengines/videoteleng/Src/Media/CVtEngDtmfHandler.cpp Tue Apr 27 16:40:55 2010 +0300 @@ -195,11 +195,11 @@ case EIA5String: case EGeneralString: __VTPRINT( DEBUG_MEDIA , "DTMF. Proto USERINPUT alphanumeric" ) - iProtoDtmf = VTProtocolFactory::CreateUserInputIndication( EVtUiiDTFM, val ); + iProtoDtmf = VTProtocolFactory::CreateUserInputIndication( EVtUiiAlphaNumeric, val ); break; case EDTMFString: __VTPRINT( DEBUG_MEDIA , "DTMF. Proto USERINPUT iDTMFString" ) - iProtoDtmf = VTProtocolFactory::CreateUserInputIndication( EVtUiiAlphaNumeric, val); + iProtoDtmf = VTProtocolFactory::CreateUserInputIndication( EVtUiiDTMF, val); break; default: __VTPRINT( DEBUG_MEDIA , "DTMF. Proto USERINPUT unsupported" ) diff -r 392fdfb57a78 -r 856ae1b15d98 vtprotocolplugins/VideoSource/src/CVSDataProvider.cpp --- a/vtprotocolplugins/VideoSource/src/CVSDataProvider.cpp Wed Apr 14 16:00:08 2010 +0300 +++ b/vtprotocolplugins/VideoSource/src/CVSDataProvider.cpp Tue Apr 27 16:40:55 2010 +0300 @@ -408,6 +408,7 @@ const TDesC8& aFormat ) { __IF_DEBUG(Print(_L("VideoSource[%d]: CVSDataProvider::EnumerateVideoFrameSizes() >>"), RThread().Id().operator TUint())); + CleanupClosePushL( aSupportedSizes ); RArray sizeCountArray; CleanupClosePushL( sizeCountArray ); TInt providerCount = ProvidersAvailable(); @@ -463,7 +464,8 @@ aSupportedSizes.Append( sizeCountArray[k].iSize ) ); } } - CleanupStack::PopAndDestroy( ); // sizeCountArray + CleanupStack::PopAndDestroy(); // sizeCountArray + CleanupStack::Pop(); // aSupportedSizes __IF_DEBUG(Print(_L("VideoSource[%d]: CVSDataProvider::EnumerateVideoFrameSizes() <<"), RThread().Id().operator TUint())); } @@ -477,6 +479,7 @@ const TSize& aSize ) { __IF_DEBUG(Print(_L("VideoSource[%d]: CVSDataProvider::EnumerateVideoFrameRates() >>"), RThread().Id().operator TUint())); + CleanupClosePushL( aSupportedRates ); RArray rateCountArray; CleanupClosePushL( rateCountArray ); TInt providerCount = ProvidersAvailable(); @@ -537,6 +540,7 @@ } } CleanupStack::PopAndDestroy( ); // rateCountArray + CleanupStack::Pop(); // aSupportedRates __IF_DEBUG(Print(_L("VideoSource[%d]: CVSDataProvider::EnumerateVideoFrameRates() <<"), RThread().Id().operator TUint())); } diff -r 392fdfb57a78 -r 856ae1b15d98 vtprotocols/inc/mvtprotocolhandler.h --- a/vtprotocols/inc/mvtprotocolhandler.h Wed Apr 14 16:00:08 2010 +0300 +++ b/vtprotocols/inc/mvtprotocolhandler.h Tue Apr 27 16:40:55 2010 +0300 @@ -109,7 +109,7 @@ enum TUserInputType { - EVtUiiDTFM, + EVtUiiDTMF, EVtUiiAlphaNumeric }; diff -r 392fdfb57a78 -r 856ae1b15d98 vtprotocols/src/ch324confighandler.cpp --- a/vtprotocols/src/ch324confighandler.cpp Wed Apr 14 16:00:08 2010 +0300 +++ b/vtprotocols/src/ch324confighandler.cpp Tue Apr 27 16:40:55 2010 +0300 @@ -168,7 +168,7 @@ TInt CH324ConfigCommand::SendUserInputMessageL(MVTUserInput& user_input) { __IF_DEBUG(Print(_L("VTProto: CH324ConfigCommand::SendUserInputMessageL<"))); - if (user_input.GetType() == EVtUiiDTFM) + if (user_input.GetType() == EVtUiiDTMF ) { CVTUserInputDtmf* dtmf = static_cast(&user_input); return iH324Config->SendUserInputL(*dtmf->iUII); diff -r 392fdfb57a78 -r 856ae1b15d98 vtprotocols/src/cvtuserinput.cpp --- a/vtprotocols/src/cvtuserinput.cpp Wed Apr 14 16:00:08 2010 +0300 +++ b/vtprotocols/src/cvtuserinput.cpp Tue Apr 27 16:40:55 2010 +0300 @@ -35,7 +35,7 @@ void CVTUserInputDtmf::ConstructL(TUint8 aTone) { __IF_DEBUG(Print(_L("VTProto: CVTUserInputDtmf::ConstructL<"))); - iUII = CPVUserInputDtmfSymbian::NewL( aTone, 0 ); + iUII = CPVUserInputDtmfSymbian::NewL( aTone, EFalse, 0 ); __IF_DEBUG(Print(_L("VTProto: CVTUserInputDtmf::ConstructL>"))); } @@ -74,7 +74,7 @@ // TUserInputType CVTUserInputDtmf::GetType() { - return EVtUiiDTFM; + return EVtUiiDTMF; } // ----------------------------------------------------------------------------- diff -r 392fdfb57a78 -r 856ae1b15d98 vtprotocols/src/vtprotocolfactory.cpp --- a/vtprotocols/src/vtprotocolfactory.cpp Wed Apr 14 16:00:08 2010 +0300 +++ b/vtprotocols/src/vtprotocolfactory.cpp Tue Apr 27 16:40:55 2010 +0300 @@ -177,7 +177,7 @@ EXPORT_C MVTUserInput* VTProtocolFactory::CreateUserInputIndication(TUserInputType aUIIType, TUint8 aTone) { __IF_DEBUG(Print(_L("VTProto: VTProtocolFactory::CreateUserInputIndication"))); - if (aUIIType == EVtUiiDTFM) + if (aUIIType == EVtUiiDTMF ) { CVTUserInputDtmf* uii = CVTUserInputDtmf::NewL(aTone); return uii; diff -r 392fdfb57a78 -r 856ae1b15d98 vtprotocolsstub/inc/mvtprotocolhandler.h --- a/vtprotocolsstub/inc/mvtprotocolhandler.h Wed Apr 14 16:00:08 2010 +0300 +++ b/vtprotocolsstub/inc/mvtprotocolhandler.h Tue Apr 27 16:40:55 2010 +0300 @@ -103,7 +103,7 @@ enum TUserInputType { - EVtUiiDTFM, + EVtUiiDTMF, EVtUiiAlphaNumeric }; diff -r 392fdfb57a78 -r 856ae1b15d98 vtprotocolsstub/src/cvtuserinput.cpp --- a/vtprotocolsstub/src/cvtuserinput.cpp Wed Apr 14 16:00:08 2010 +0300 +++ b/vtprotocolsstub/src/cvtuserinput.cpp Tue Apr 27 16:40:55 2010 +0300 @@ -69,7 +69,7 @@ // TUserInputType CVTUserInputDtmf::GetType() { - return EVtUiiDTFM; + return EVtUiiDTMF; } // ----------------------------------------------------------------------------- diff -r 392fdfb57a78 -r 856ae1b15d98 vtprotocolsstub/src/vtprotocolfactory.cpp --- a/vtprotocolsstub/src/vtprotocolfactory.cpp Wed Apr 14 16:00:08 2010 +0300 +++ b/vtprotocolsstub/src/vtprotocolfactory.cpp Tue Apr 27 16:40:55 2010 +0300 @@ -164,7 +164,7 @@ EXPORT_C MVTUserInput* VTProtocolFactory::CreateUserInputIndication(TUserInputType aUIIType, TUint8 aTone) { __IF_DEBUG(Print(_L("VTProto: VTProtocolFactory::CreateUserInputIndication"))); - if (aUIIType == EVtUiiDTFM) + if (aUIIType == EVtUiiDTMF) { CVTUserInputDtmf* uii = CVTUserInputDtmf::NewL(aTone); return uii; diff -r 392fdfb57a78 -r 856ae1b15d98 vtuis/videotelui/inc/CVtUiMainControl.h --- a/vtuis/videotelui/inc/CVtUiMainControl.h Wed Apr 14 16:00:08 2010 +0300 +++ b/vtuis/videotelui/inc/CVtUiMainControl.h Tue Apr 27 16:40:55 2010 +0300 @@ -65,6 +65,12 @@ */ void LayoutRemoteVideo(); + /** + * Get main control pointer event flag + * @return pointer event is from main control + */ + TBool IsMainControlPointerEvent(); + public: // from CCoeControl /** @@ -160,6 +166,8 @@ // reference to uistates TVtUiStates& iUiStates; + // Main control pointer event flag + TBool iMCPointerEvent; }; #endif // CVTUIMAINCONTROL_H diff -r 392fdfb57a78 -r 856ae1b15d98 vtuis/videotelui/src/CVtUiAppUi.cpp --- a/vtuis/videotelui/src/CVtUiAppUi.cpp Wed Apr 14 16:00:08 2010 +0300 +++ b/vtuis/videotelui/src/CVtUiAppUi.cpp Tue Apr 27 16:40:55 2010 +0300 @@ -1840,18 +1840,6 @@ TInt pos = iInstance->iRemoteVideoControl->DrawableWindow()->OrdinalPosition(); - if ( aMode == ERenderingModeDialer ) - { - // Remote video control has the highest priority in dialer - iInstance->iRemoteVideoControl->DrawableWindow()->SetOrdinalPosition( - pos, KVtUiRemoteVideoControlOrdinalPriHigh ); - } - else - { - // Set remote video control priority back to normal - iInstance->iRemoteVideoControl->DrawableWindow()->SetOrdinalPosition( - pos, KVtUiRemoteVideoControlOrdinalPriNormal ); - } if ( aNewDownlink ) { @@ -1866,6 +1854,20 @@ } RefreshBlind(); UpdateRenderingParametersL(); + + if ( aMode == ERenderingModeDialer ) + { + // Remote video control has the highest priority in dialer + iInstance->iRemoteVideoControl->DrawableWindow()->SetOrdinalPosition( + pos, KVtUiRemoteVideoControlOrdinalPriHigh ); + } + else + { + // Set remote video control priority back to normal + iInstance->iRemoteVideoControl->DrawableWindow()->SetOrdinalPosition( + pos, KVtUiRemoteVideoControlOrdinalPriNormal ); + } + __VTPRINTEXIT( "VtUi.SetRenderingModeL" ) } @@ -2280,6 +2282,7 @@ break; case EVtUiCmdSwapImagesPlaces: + { refresh = ETrue; CleanupPushEnableBlindL(); iUiStates->SetDisableBlindSetting( ETrue ); @@ -2293,6 +2296,7 @@ } CleanupStack::PopAndDestroy(); // CleanupPushEnableBlindL + } break; case EVtUiCmdZoom: @@ -2671,12 +2675,12 @@ if ( wb && wb->State() == MVtUiFeature::EActive ) { __VTPRINT( DEBUG_GEN, "CVtUiWhiteBalance::DoDeactivateL" ); - wb->DoDeactivateL (); + wb->Stop(); } if ( ct && ct->State() == MVtUiFeature::EActive ) { __VTPRINT( DEBUG_GEN, "CVtUiColorTone::DoDeactivateL" ); - ct->DoDeactivateL( ); + ct->Stop( ); } // close volume slider @@ -2887,13 +2891,16 @@ { ExecuteCmdL( KVtEngUnfreeze ); } - if ( !IsViewFinderInMainPane() ) - { - SwitchViewFinderToMainPaneL( !isFrozen ); - } - else if ( !isFrozen ) - { - iUiStates->SetViewFindersInitialPlaceContextPane( EFalse ); + if ( iUiStates->IsCaptureModeOn() ) + { + if ( !IsViewFinderInMainPane() ) + { + SwitchViewFinderToMainPaneL( !isFrozen ); + } + else if ( !isFrozen ) + { + iUiStates->SetViewFindersInitialPlaceContextPane( EFalse ); + } } RefreshStatesL(); diff -r 392fdfb57a78 -r 856ae1b15d98 vtuis/videotelui/src/CVtUiContextControl.cpp --- a/vtuis/videotelui/src/CVtUiContextControl.cpp Wed Apr 14 16:00:08 2010 +0300 +++ b/vtuis/videotelui/src/CVtUiContextControl.cpp Tue Apr 27 16:40:55 2010 +0300 @@ -26,7 +26,8 @@ #include #include "CVtUiAppUi.h" #include "tvtuistates.h" -#include "tVtuifeaturevariation.h" +#include "tVtuifeaturevariation.h" +#include "CVtUiMainControl.h" // ----------------------------------------------------------------------------- @@ -82,7 +83,8 @@ if ( aPointerEvent.iType == TPointerEvent::EButton1Down ) { TRect window( Size() ); - if ( !window.Contains( aPointerEvent.iPosition ) ) + if ( !window.Contains( aPointerEvent.iPosition ) || + iAppUi.MainControl().IsMainControlPointerEvent() ) { __VTPRINT( DEBUG_GEN, "CtxCtrl.HandlePtr.Button1Down outside" ) // Down outside of Ctx ctrl, set inside false @@ -98,7 +100,8 @@ else if ( aPointerEvent.iType == TPointerEvent::EButton1Up ) { TRect window( Size() ); - if ( !window.Contains( aPointerEvent.iPosition ) ) + if ( !window.Contains( aPointerEvent.iPosition ) || + iAppUi.MainControl().IsMainControlPointerEvent() ) { __VTPRINT( DEBUG_GEN, "CtxCtrl.HandlePtr.Button1Up outside" ) diff -r 392fdfb57a78 -r 856ae1b15d98 vtuis/videotelui/src/CVtUiEndCallButtonPane.cpp --- a/vtuis/videotelui/src/CVtUiEndCallButtonPane.cpp Wed Apr 14 16:00:08 2010 +0300 +++ b/vtuis/videotelui/src/CVtUiEndCallButtonPane.cpp Tue Apr 27 16:40:55 2010 +0300 @@ -186,7 +186,7 @@ return; } CVtUiAppUi* appUi = STATIC_CAST( CVtUiAppUi*, CCoeEnv::Static()->AppUi() ); - appUi->CmdSimulateKeyEvent( EStdKeyNo ); + appUi->HandleCommandL( EVtUiCmdEndActiveCall ); __VTPRINTEXIT( "CVtUiEndCallButtonPane.HandleControlEventL" ) } diff -r 392fdfb57a78 -r 856ae1b15d98 vtuis/videotelui/src/CVtUiMainControl.cpp --- a/vtuis/videotelui/src/CVtUiMainControl.cpp Wed Apr 14 16:00:08 2010 +0300 +++ b/vtuis/videotelui/src/CVtUiMainControl.cpp Tue Apr 27 16:40:55 2010 +0300 @@ -57,7 +57,7 @@ CVtUiMainControl::CVtUiMainControl( CVtUiBitmapManager& aBitmapManager, CVtUiAppUi& aAppUi, TVtUiStates& aUiStates ) : CVtUiVideoControlBase( aBitmapManager ), iAppUi( aAppUi ), - iUiStates ( aUiStates ) + iUiStates ( aUiStates ), iMCPointerEvent( EFalse ) { __VTPRINTENTER( "MainCtrl.Ctor" ) SetRenderingHint( ESkinnedBackground ); @@ -106,9 +106,10 @@ void CVtUiMainControl::HandlePointerEventL( const TPointerEvent& aPointerEvent ) { __VTPRINTENTER( "MainCtrl.HandlePointerEventL" ) - // Let context control handle this first + // Let context control handle this + iMCPointerEvent = ETrue; iAppUi.ContextControl().HandlePointerEventL( aPointerEvent ); - CCoeControl::HandlePointerEventL( aPointerEvent ); + iMCPointerEvent = EFalse; __VTPRINTEXIT( "MainCtrl.HandlePointerEventL" ) } @@ -259,4 +260,14 @@ } __VTPRINTEXIT( "MainCtrl.LayoutRemoteVideo" ) } + +// ----------------------------------------------------------------------------- +// CVtUiMainControl::IsMainControlPointerEvent +// ----------------------------------------------------------------------------- +// +TBool CVtUiMainControl::IsMainControlPointerEvent() + { + return iMCPointerEvent; + } + // End of File diff -r 392fdfb57a78 -r 856ae1b15d98 vtuis/videotelui/src/features/dialer/cvtuidialer.cpp --- a/vtuis/videotelui/src/features/dialer/cvtuidialer.cpp Wed Apr 14 16:00:08 2010 +0300 +++ b/vtuis/videotelui/src/features/dialer/cvtuidialer.cpp Tue Apr 27 16:40:55 2010 +0300 @@ -34,8 +34,12 @@ #include "CVtUiContextControl.h" #include "CVtUiEndCallButtonPane.h" #include "CVtUiMainControl.h" +#include "CVtUiRemoteVideoControl.h" #include "VtUiLayout.h" +// Index of white color. +const TInt KVtDialerRVCPriLow = -1; + // ======== LOCAL FUNCTIONS ======== // Implementation of CVtUiDialer @@ -101,6 +105,11 @@ __VTPRINTENTER( "Dial.StartL" ) if ( State() == MVtUiFeature::EUnprepared ) { + // Lower remote video control window priority + TInt pos = + iFeatureManager.AppUi().RemoteVideoControl().DrawableWindow()->OrdinalPosition(); + iFeatureManager.AppUi().RemoteVideoControl().DrawableWindow()-> + SetOrdinalPosition( pos, KVtDialerRVCPriLow ); // Make context control and end call button invisible iFeatureManager.AppUi().ContextControl().MakeVisible( EFalse ); iFeatureManager.AppUi().EndCallButtonPane().MakeVisible( EFalse ); @@ -130,6 +139,12 @@ __VTPRINTENTER( "Dial.Stop" ) if ( State() == MVtUiFeature::EActive ) { + // Lower remote video control window priority + TInt pos = + iFeatureManager.AppUi().RemoteVideoControl().DrawableWindow()->OrdinalPosition(); + iFeatureManager.AppUi().RemoteVideoControl().DrawableWindow()-> + SetOrdinalPosition( pos, KVtDialerRVCPriLow ); + TInt error; TRAP( error, { diff -r 392fdfb57a78 -r 856ae1b15d98 vtuis/videotelui/src/features/prefs/cvtuiprefsettinglistbase.cpp --- a/vtuis/videotelui/src/features/prefs/cvtuiprefsettinglistbase.cpp Wed Apr 14 16:00:08 2010 +0300 +++ b/vtuis/videotelui/src/features/prefs/cvtuiprefsettinglistbase.cpp Tue Apr 27 16:40:55 2010 +0300 @@ -312,7 +312,8 @@ CVtUiPrefSettingListBase::CVtUiPrefSettingListBase( CVtUiFeatureManager& aFeatureManager, TVtUiFeatureId aFeatureId ) : CVtUiFeatureBase( aFeatureId, aFeatureManager ), iActiveItems( KMaxNumberOfActiveItems ), - iBitmapTopLeftCorner( 0, 0 ), iAppUi( aFeatureManager.AppUi() ),iPendingSettingChangeCmd( EFalse ) + iPendingSettingChangeCmd( EFalse ), iBitmapTopLeftCorner( 0, 0 ), + iAppUi( aFeatureManager.AppUi() ) { __VTPRINTENTER( "CVtUiPrefSettingListBase.CVtUiPrefSettingListBase" ) __VTPRINTEXIT( "CVtUiPrefSettingListBase.CVtUiPrefSettingListBase" ) diff -r 392fdfb57a78 -r 856ae1b15d98 vtuis/videotelui/src/features/toolbar/cvtuifixedtoolbar.cpp --- a/vtuis/videotelui/src/features/toolbar/cvtuifixedtoolbar.cpp Wed Apr 14 16:00:08 2010 +0300 +++ b/vtuis/videotelui/src/features/toolbar/cvtuifixedtoolbar.cpp Tue Apr 27 16:40:55 2010 +0300 @@ -149,21 +149,22 @@ if( aVisible ) { __VTPRINT(DEBUG_GEN, "FixedToolbar.SetToolbarVisibilityAfterLayoutChangeL.1" ) + DimToolbarbuttons( ETrue ); // Set flag iFeatureManager.UiStates().SetIsFixedToolbarVisible( ETrue ); // set visible iFeatureManager.AppUi().CurrentFixedToolbar() ->SetToolbarVisibility( ETrue ); // Set callback to dim toolbarbuttons - if ( !iIdle ) - { - iIdle = CIdle::NewL( CActive::EPriorityIdle ); - } - - if ( !iIdle->IsActive() ) - { - iIdle->Start( TCallBack( &DoDimToolbarButtons, this ) ); - } +// if ( !iIdle ) +// { +// iIdle = CIdle::NewL( CActive::EPriorityIdle ); +// } +// +// if ( !iIdle->IsActive() ) +// { +// iIdle->Start( TCallBack( &DoDimToolbarButtons, this ) ); +// } } // Landsacpe to portrait hide tb else