--- a/videoplayback/videoplaybackview/viewsrc/mpxvideoplaybackdisplayhandler.cpp Fri Jul 23 11:10:06 2010 +0300
+++ b/videoplayback/videoplaybackview/viewsrc/mpxvideoplaybackdisplayhandler.cpp Fri Aug 06 09:43:48 2010 +0300
@@ -15,7 +15,7 @@
*
*/
-// Version : %version: ou1cpsw#27 %
+// Version : %version: 28 %
#include <sysutil.h>
#include <s32file.h>
@@ -24,7 +24,7 @@
#include <mpxplaybackutility.h>
#include <mpxvideoplaybackdefs.h>
-#include "mpxvideocontainer.h"
+#include "videocontainer.h"
#include "mpxvideoviewwrapper.h"
#include "mpxvideoplaybackdisplayhandler.h"
#include "mpxvideoregion.h"
@@ -119,13 +119,11 @@
if ( ! iVideoContainer )
{
- iVideoContainer = new ( ELeave ) CMPXVideoContainer();
+ iVideoContainer = new ( ELeave ) CVideoContainer();
iVideoContainer->ConstructL();
iVideoContainer->SetRect( aDisplayRect );
}
- aWin.SetSurfaceTransparency( ETrue );
-
RWindowBase *videoWindow = iVideoContainer->DrawableWindow();
videoWindow->SetOrdinalPosition( -1 );
(&aWin)->SetOrdinalPosition( 0 );
@@ -551,6 +549,11 @@
iVideoDisplay->SurfaceCreated( iSurfaceId, iCropRect, iAspectRatio, iCropRect );
iSurfaceCached = EFalse;
+
+ //
+ // Let ControlsController know that we get the surface.
+ //
+ iViewWrapper->SurfacedAttached( true );
}
}
@@ -585,6 +588,11 @@
// Add new surface
//
iVideoDisplay->SurfaceCreated( iSurfaceId, iCropRect, iAspectRatio, iCropRect );
+
+ //
+ // Let ControlsController know that we get the surface.
+ //
+ iViewWrapper->SurfacedAttached( true );
}
else
{
@@ -630,6 +638,11 @@
{
MPX_ENTER_EXIT(_L("CMPXVideoPlaybackDisplayHandler::SurfaceRemoved()"));
+ //
+ // Let ControlsController know that we get the surface.
+ //
+ iViewWrapper->SurfacedAttached( false );
+
if ( iVideoDisplay )
{
iVideoDisplay->RemoveSurface();