diff -r 890b5dd735f8 -r f15ac8e65a02 vtprotocolplugins/VideoSource/src/CVSStillImageDataProvider.cpp --- a/vtprotocolplugins/VideoSource/src/CVSStillImageDataProvider.cpp Thu Aug 19 09:57:36 2010 +0300 +++ b/vtprotocolplugins/VideoSource/src/CVSStillImageDataProvider.cpp Tue Aug 31 15:16:10 2010 +0300 @@ -22,8 +22,8 @@ #include #include #include -#include -#include +#include +#include #include #include "CVSStillImageDataProvider.h" @@ -327,7 +327,7 @@ iActiveWait = new (ELeave) CVSActiveWait< CVSStillImageDataProvider > ( this ); //Create viewer - iViewer = CMultiframeProvider::NewL( this , EColor16MU/*iDisplayMode*/ ); + iViewer = CMultiframeProvider::NewL( this , iDisplayMode ); User::LeaveIfError( iFreezeCS.CreateLocal() ); __IF_DEBUG(Print(_L("VideoSource [%d]: CVSStillImageDataProvider::CommonInitializeL() <<"), RThread().Id().operator TUint())); @@ -805,7 +805,7 @@ // SourceThreadLogoff() if a switch is pending if( iProtoTimer && ( iPSState == EPSPlaying ) ) { - iProtoTimer->After( iProtoUpdateRate, &ProtoTimer ); + iProtoTimer->After( iProtoUpdateRate, &CVSStillImageDataProvider::ProtoTimer ); } __IF_DEBUG(Print(_L("VideoSource[%d]: CVSStillImageDataProvider::ProtoTimer() this %x <<"), RThread().Id().operator TUint(), this)); } @@ -894,7 +894,8 @@ CWsScreenDevice* wsScreenDevice = new ( ELeave ) CWsScreenDevice( wsSession ); CleanupStack::PushL( wsScreenDevice ); User::LeaveIfError( wsScreenDevice->Construct() ); - iDisplayMode = wsScreenDevice->DisplayMode();/* = EColor16MU;*/ + //iDisplayMode = wsScreenDevice->DisplayMode();/* = EColor16MU;*/ + iDisplayMode = EColor16MU; CleanupStack::PopAndDestroy( 2 ); // wsSession, wsScreenDevice __IF_DEBUG(Print(_L("VideoSource [%d]: CVSStillImageDataProvider::ConstructL() this %x <<"), RThread().Id().operator TUint(), this)); } @@ -1096,7 +1097,7 @@ // has beed aquired and play state is on if ( ( iTargetSize == iVFBitmap->Size() ) && ( iVFState == EVFPlaying ) ) { - iVFTimer->After( 1, &VFTimer ); + iVFTimer->After( 1, &CVSStillImageDataProvider::VFTimer ); } else {