diff -r 4707a0db12f6 -r adb51f74b890 videoplayback/videoplaybackview/tsrc/testmpxvideoviewwrapper/stub/src/videoplaybackdisplayhandler.cpp --- a/videoplayback/videoplaybackview/tsrc/testmpxvideoviewwrapper/stub/src/videoplaybackdisplayhandler.cpp Mon Sep 20 18:25:37 2010 +0300 +++ b/videoplayback/videoplaybackview/tsrc/testmpxvideoviewwrapper/stub/src/videoplaybackdisplayhandler.cpp Tue Oct 05 09:26:49 2010 +0300 @@ -15,13 +15,12 @@ * */ -// Version : %version: 9 % +// Version : %version: 11 % #include #include #include #include -#include #include #include "mpxvideoviewwrapper.h" @@ -30,10 +29,8 @@ #include "videoplaybackviewfiledetails.h" -CVideoPlaybackDisplayHandler::CVideoPlaybackDisplayHandler( MMPXPlaybackUtility* aPlayUtil, - CMPXVideoViewWrapper* aViewWrapper ) - : iPlaybackUtility( aPlayUtil ) - , iViewWrapper( aViewWrapper ) +CVideoPlaybackDisplayHandler::CVideoPlaybackDisplayHandler( CMPXVideoViewWrapper* aViewWrapper ) + : iViewWrapper( aViewWrapper ) { } @@ -42,13 +39,12 @@ } CVideoPlaybackDisplayHandler* -CVideoPlaybackDisplayHandler::NewL( MMPXPlaybackUtility* aPlayUtil, - CMPXVideoViewWrapper* aViewWrapper ) +CVideoPlaybackDisplayHandler::NewL( CMPXVideoViewWrapper* aViewWrapper ) { MPX_ENTER_EXIT(_L("CVideoPlaybackDisplayHandler::NewL()")); CVideoPlaybackDisplayHandler* self = - new(ELeave) CVideoPlaybackDisplayHandler( aPlayUtil, aViewWrapper ); + new(ELeave) CVideoPlaybackDisplayHandler( aViewWrapper ); CleanupStack::PushL( self ); self->ConstructL(); @@ -72,12 +68,14 @@ RWsSession& aWs, CWsScreenDevice& aScreenDevice, RWindow& aWin, - TRect aDisplayRect ) + TRect aDisplayRect, + VideoPlaybackViewFileDetails* fileDetails ) { Q_UNUSED( aWs ); Q_UNUSED( aScreenDevice ); Q_UNUSED( aWin ); Q_UNUSED( aDisplayRect ); + Q_UNUSED( fileDetails ); } // ------------------------------------------------------------------------------------------------- @@ -108,7 +106,7 @@ TInt CVideoPlaybackDisplayHandler::SetAspectRatioL( TMPXVideoPlaybackCommand aCmd ) { iCommand = aCmd; - + switch ( aCmd ) { case EPbCmdNaturalAspectRatio: @@ -132,20 +130,6 @@ } // ------------------------------------------------------------------------------------------------- -// CVideoPlaybackDisplayHandler::SetDefaultAspectRatioL -// ------------------------------------------------------------------------------------------------- -// -TInt CVideoPlaybackDisplayHandler::SetDefaultAspectRatioL( - VideoPlaybackViewFileDetails* aFileDetails, - TReal32 aDisplayAspectRatio ) -{ - Q_UNUSED( aFileDetails ); - Q_UNUSED( aDisplayAspectRatio ); - - return iAspectRatio; -} - -// ------------------------------------------------------------------------------------------------- // CVideoPlaybackDisplayHandler::UpdateVideoRectL() // ------------------------------------------------------------------------------------------------- //