diff -r 4707a0db12f6 -r adb51f74b890 videoplayback/videoplaybackview/tsrc/testmpxvideoviewwrapper/stub/inc/videoplaybackdisplayhandler.h --- a/videoplayback/videoplaybackview/tsrc/testmpxvideoviewwrapper/stub/inc/videoplaybackdisplayhandler.h Mon Sep 20 18:25:37 2010 +0300 +++ b/videoplayback/videoplaybackview/tsrc/testmpxvideoviewwrapper/stub/inc/videoplaybackdisplayhandler.h Tue Oct 05 09:26:49 2010 +0300 @@ -15,7 +15,7 @@ * */ -// Version : %version: 8 % +// Version : %version: 10 % #ifndef __CVIDEOPLAYBACKDISPLAYHANDLER_H__ @@ -29,10 +29,9 @@ #include -// +// // CLASS DECLARATION // -class MMPXPlaybackUtility; class CMPXVideoViewWrapper; class VideoPlaybackViewFileDetails; @@ -46,34 +45,29 @@ ~CVideoPlaybackDisplayHandler(); - static CVideoPlaybackDisplayHandler* NewL( MMPXPlaybackUtility* aPlayUtil, - CMPXVideoViewWrapper* aViewWrapper ); + static CVideoPlaybackDisplayHandler* NewL( CMPXVideoViewWrapper* aViewWrapper ); void CreateDisplayWindowL( RWsSession& aWs, CWsScreenDevice& aScreenDevice, RWindow& aWin, - TRect aDisplayRect ); + TRect aDisplayRect, + VideoPlaybackViewFileDetails* fileDetails ); void RemoveDisplayWindow(); void HandleVideoDisplayMessageL( CMPXMessage* aMessage ); TInt SetAspectRatioL( TMPXVideoPlaybackCommand aCmd ); - - TInt SetDefaultAspectRatioL( VideoPlaybackViewFileDetails* aFileDetails, - TReal32 aDisplayAspectRatio ); void UpdateVideoRectL( TRect aRect, TBool transitionEffect ); private: - CVideoPlaybackDisplayHandler( MMPXPlaybackUtility* aPlayUtil, - CMPXVideoViewWrapper* aViewWrapper ); + CVideoPlaybackDisplayHandler( CMPXVideoViewWrapper* aViewWrapper ); void ConstructL(); public: - MMPXPlaybackUtility* iPlaybackUtility; CMPXVideoViewWrapper* iViewWrapper; CMediaClientVideoDisplay* iVideoDisplay;