MCL/sf/app/photos: comparison photosgallery/viewframework/tvout/src/glxhdmicontroller.cpp

equal deleted inserted replaced

-:ce1c7ad1f18b
+:bcb43dc84c44
 #include "glxhdmicontroller.h"
 // -----------------------------------------------------------------------------
 // NewLC
 // -----------------------------------------------------------------------------
-EXPORT_C CGlxHdmiController* CGlxHdmiController::NewL(const TDesC& aImageFile)
+EXPORT_C CGlxHdmiController* CGlxHdmiController::NewL()
 {
 TRACER("CGlxHdmiController* CGlxHdmiController::NewL()");
-CGlxHdmiController* self = new (ELeave) CGlxHdmiController(aImageFile);
+CGlxHdmiController* self = new (ELeave) CGlxHdmiController();
 CleanupStack::PushL(self);
 self->ConstructL();
 CleanupStack::Pop(self);
 return self;
 }
 // -----------------------------------------------------------------------------
 // Setting an Image Path
 // -----------------------------------------------------------------------------
 EXPORT_C void CGlxHdmiController::SetImageL(const TDesC& aImageFile,
-TSize aImageDimensions, TInt aFrameCount, TBool aStore)
+TBool aStore)
 {
 TRACER("CGlxHdmiController::SetImageL()");
 if (aStore)
 {
-iImageSupported = ETrue;
+iIsImageSupported = ETrue;
-StoreImageInfoL(aImageFile, aImageDimensions, aFrameCount);
+StoreImageInfoL(aImageFile);
 }
 if (iGlxTvOut->IsHDMIConnected())
 {
+		iIsPostingMode = ETrue;
 GLX_LOG_INFO("CGlxHdmiController::SetImageL() - 2");
 // do not close the surface , use the same surface instead.
-// Call a function to pass imagefile, imagedimension, framecount
+// Call a function to pass imagefile
 if (!iHdmiContainer)
 {
 CreateHdmiContainerL();
 }
 if (!iSurfaceUpdater)
 {
 // This case would come when surface updater is not created at the first instance and also
 // it satisfies the 720p condition
-CreateSurfaceUpdaterL(aImageFile, aImageDimensions, aFrameCount);
+CreateSurfaceUpdaterL(aImageFile);
 }
 else
 {
 GLX_LOG_INFO("CGlxHdmiController::SetImageL() - 3");
-iSurfaceUpdater->UpdateNewImageL(aImageFile, aFrameCount,aImageDimensions);
+iSurfaceUpdater->UpdateNewImageL(aImageFile);
 }
 iHdmiContainer->DrawNow();
 }
 }
 // IsVideo
 // -----------------------------------------------------------------------------
 EXPORT_C void CGlxHdmiController::ItemNotSupported()
 {
 TRACER("CGlxHdmiController::IsVideo()");
-iImageSupported = EFalse;
+iIsImageSupported = EFalse;
 if (iGlxTvOut->IsHDMIConnected())
 {
 DestroySurfaceUpdater();
 }
 }
 // ShiftToCloningMode
 // -----------------------------------------------------------------------------
 EXPORT_C void CGlxHdmiController::ShiftToCloningMode()
 {
 TRACER("CGlxHdmiController::ShiftToCloningMode()");
+iIsPostingMode = EFalse;
 if (iGlxTvOut->IsHDMIConnected() && iSurfaceUpdater)
 {
 iSurfaceUpdater->ShiftToCloningMode();
 }
 }
 // ShiftToPostingMode
 // -----------------------------------------------------------------------------
 EXPORT_C void CGlxHdmiController::ShiftToPostingMode()
 {
 TRACER("CGlxHdmiController::ShiftToPostingMode()");
+iIsPostingMode = ETrue;
 if (iGlxTvOut->IsHDMIConnected() && iSurfaceUpdater)
 {
 iSurfaceUpdater->ShiftToPostingMode();
 }
 }
 // -----------------------------------------------------------------------------
 // Constructor
 // -----------------------------------------------------------------------------
-CGlxHdmiController::CGlxHdmiController(const TDesC& aImageFile):
+CGlxHdmiController::CGlxHdmiController():
-iImagePath(aImageFile)
+iIsPostingMode(EFalse)
 {
 TRACER("CGlxHdmiController::CGlxHdmiController()");
 // Implement nothing here
 }
 }
 // -----------------------------------------------------------------------------
 // CreateSurfaceUpdaterL
 // -----------------------------------------------------------------------------
-void CGlxHdmiController::CreateSurfaceUpdaterL(const TDesC& aImageFile,
+void CGlxHdmiController::CreateSurfaceUpdaterL(const TDesC& aImageFile)
-TSize aImageDimensions, TInt aFrameCount)
 {
 TRACER("CGlxHdmiController::CreateSurfaceUpdater()");
 RWindow* window = iHdmiContainer->GetWindow();
-iSurfaceUpdater = CGlxHdmiSurfaceUpdater::NewL(window, aImageFile, aImageDimensions,
+iSurfaceUpdater = CGlxHdmiSurfaceUpdater::NewL(window, aImageFile,
-aFrameCount, iHdmiContainer);
+iHdmiContainer);
 iHdmiContainer->DrawNow();
 }
 // -----------------------------------------------------------------------------
 // StoreImageInfoL
 // -----------------------------------------------------------------------------
-void CGlxHdmiController::StoreImageInfoL(const TDesC& aImageFile,
+void CGlxHdmiController::StoreImageInfoL(const TDesC& aImageFile)
-TSize aImageDimensions, TInt aFrameCount)
 {
 TRACER("CGlxHdmiController::StoreImageInfoL()");
 if(iStoredImagePath)
 {
 delete iStoredImagePath;
 iStoredImagePath = NULL;
 }
 iStoredImagePath = aImageFile.AllocL();
-iImageDimensions = aImageDimensions;
-iFrameCount = aFrameCount;
 }
 // -----------------------------------------------------------------------------
 // HandleTvStatusChangedL
 // -----------------------------------------------------------------------------
 void CGlxHdmiController::HandleTvStatusChangedL( TTvChangeType aChangeType )
 {
 TRACER("CGlxHdmiController::HandleTvStatusChangedL()");
 if ( aChangeType == ETvConnectionChanged )
 {
-if ( iGlxTvOut->IsHDMIConnected() && iImageSupported)
+if ( iGlxTvOut->IsHDMIConnected() && iIsImageSupported && iIsPostingMode)
 {
 GLX_LOG_INFO("CGlxHdmiController::HandleTvStatusChangedL() - HDMI Connected");
 // Calling SetImageL() with appropriate parameters
-SetImageL(iStoredImagePath->Des(), iImageDimensions, iFrameCount, EFalse);
+SetImageL(iStoredImagePath->Des(), EFalse);
 }
 else
 {
 // if it gets disconnected, destroy the surface
 GLX_LOG_INFO("CGlxHdmiController::HandleTvStatusChangedL() - HDMI Not Connected");

branch	RCL_3
changeset 13	bcb43dc84c44
parent 12	ce1c7ad1f18b
child 15	191387a8b767