MCL/sf/app/photos: comparison photosgallery/slideshow/view/src/shwslideshowview.cpp

equal deleted inserted replaced

-:71da52165949
+:ce1c7ad1f18b
 //
 CShwSlideshowView::~CShwSlideshowView()
 {
 TRACER("CShwSlideshowView::~CShwSlideshowView");
 	GLX_LOG_INFO( "CShwSlideshowView::~CShwSlideshowView()" );
+	iHarvesterClient.Close();
 // delete media list population call back
 delete iPopulateListCallBack;
 // delete engine async starter
 delete iAsyncCallBack;
 BaseConstructL( R_SHW_SLIDESHOW_PLAY_VIEW );
 	// Glx view base construction
 ViewBaseConstructL();
+	TInt err = iHarvesterClient.Connect();
+	GLX_LOG_INFO1("iHarvesterClient.Connect() err = %d",err);
+	if(err == KErrNone)
+		{
+iHarvesterClient.AddHarvesterEventObserver(*this, EHEObserverTypeMMC, 1000);
+		}
 // Create async engine starter with standard priority
 	iAsyncCallBack = new( ELeave ) CAsyncCallBack( CActive::EPriorityStandard );
 // Create the back light timer
 iBackLightTimer = CShwSlideshowBackLightTimer::NewL();
 // set the callback for the media list population
 iPopulateListCallBack->Set(
 TShwCallBack< CShwSlideshowView, PopulateListL >( this ) );
 iMSKPressed = EFalse;
 iLSKPressed = EFalse;
-//Get the HgContextUtility instance
-//    iContextUtility = iUiUtility->ContextUtility();
 }
 // ---------------------------------------------------------------------------
 // From CAknView
 // Returns views id.
 		}
 	iHdmiActive = EFalse;
 // reset failure flag
 iEngineStartFailed = EFalse;
-iHdmiController = CGlxHdmiController::NewL();
+	if(!iHdmiController)
+		{
+	    iHdmiController = CGlxHdmiController::NewL();
+		}
 // Engine related construction
 // Instantiate the slideshow engine, with this class as its observer
 __ASSERT_DEBUG( !iEngine, Panic( EGlxPanicAlreadyInitialised ) );
 iEngine = CShwSlideshowEngine::NewL( *this );
 {
 if(iFilteredList->Count() > KSlideShowTextureOffset)
 {
 RemoveTexture();
 }
-SetImageL();
+SetItemToHDMIL();
 }
 	    }
 }
 // ---------------------------------------------------------------------------
 {
 // cancel the progress bar
 iWaitDialog->ProcessFinishedL();
 }
 iShwState = EShwPlay;
-SetImageL();
+SetItemToHDMIL();
 	iHdmiActive = ETrue;
 ReplaceCommandSetL(R_SHW_SOFTKEYS_END_PAUSE,R_SHW_SOFTKEYS_END_PAUSE);
 ShowShwFurnitureL();
 }
 TRACER("CShwSlideshowView::SetupScreenFurnitureL");
 	GLX_LOG_INFO( "CShwSlideshowView::SetupScreenFurnitureL" );
 // Create the soft keys
 // Left (bottom in landscape orientation)
 HBufC* softKeyTextLeft = StringLoader::LoadLC( R_SHW_SOFTKEY_LEFT );
-// SetSoftKeyL takes ownership of softKeyText
-//SetSoftkeyL( EGlxLeftSoftkey,  EShwSlideshowCmdContinue, softKeyTextLeft );
 CleanupStack::Pop( softKeyTextLeft );
 // Right (top in landscape orientation)
 HBufC* softKeyTextRight = StringLoader::LoadLC( R_SHW_SOFTKEY_RIGHT );
-// SetSoftKeyL takes ownership of softKeyText
-//SetSoftkeyL( EGlxRightSoftkey,  EAknSoftkeyBack, softKeyTextRight );
 CleanupStack::Pop( softKeyTextRight );
 }
 // -----------------------------------------------------------------------------
 // it's been filtered out so just use the first item
 focusIndex = 0;
 }
 }
 iFilteredList->SetFocusL( NGlxListDefs::EAbsolute, focusIndex );
-//    iContextUtility->PublishPhotoContextL(item.Uri());
 }
 // -----------------------------------------------------------------------------
 // HandleTickL.
 	}
 // -----------------------------------------------------------------------------
 // Set the image to external display - HDMI
 // -----------------------------------------------------------------------------
 //
-void CShwSlideshowView::SetImageL()
+void CShwSlideshowView::SetItemToHDMIL()
 {
-TRACER("CShwSlideshowView::SetImageL() - CGlxHDMI");
+TRACER("CShwSlideshowView::SetImageToHDMIL() ");
-TGlxMedia item = iFilteredList->Item(iFilteredList->FocusIndex());
-TInt frameCount(0);
+TInt focusIndex = iFilteredList->FocusIndex();
-TSize orignalSize;
-TBool aFramesPresent = item.GetFrameCount(frameCount);
+// If we dont know what item we are focussing on
-TBool adimension = item.GetDimensions(orignalSize);
+// or if our filtered list is empty
+// or if HDMI is not connected
+// or if there is no HDMI Controller at all
+// then dont SetImageToHDMI :)
+if( ( KErrNotFound == focusIndex)
+|| (0 == iFilteredList->Count())
+|| (NULL == iHdmiController)
+|| (!iHdmiController->IsHDMIConnected()))
+{
+GLX_LOG_INFO("CShwSlideshowView::SetImageToHDMIL - Cant Set Image To HDMI");
+return;
+}
+TGlxMedia item = iFilteredList->Item(focusIndex);
 TInt error = GlxErrorManager::HasAttributeErrorL(item.Properties(),
 KGlxMediaIdThumbnail);
-if (error == KErrNone)
-{
+// Item will be supported by HDMI ONLY if
-GLX_LOG_INFO("CShwSlideshowView::SetImageL() - CGlxHDMI call SetImageL");
+// it is not a video
+// and it has no attribute error
+if ( (item.Category() != EMPXVideo)
+&& (error == KErrNone) )
+{
+GLX_LOG_INFO("CShwSlideshowView::SetImageToHDMIL - CGlxHdmi - Setting the Image");
+TInt frameCount(0);
+TSize orignalSize;
+item.GetFrameCount(frameCount);
+item.GetDimensions(orignalSize);
 iHdmiController->SetImageL(item.Uri(), orignalSize, frameCount);
 }
 else
 {
-GLX_LOG_INFO1("CShwSlideshowView::SetImageL() - CGlxHDMI IsVideo , err=%d",error);
+GLX_LOG_INFO("CShwSlideshowView::SetImageToHDMIL - Unsupported Item");
-//Set the external display to cloning mode.
+//Set the external display to cloning mode if
-//If the current item is a video, corruted thumbnail
+//the current item is something we wont support (e.g. video, corrupted item);
-iHdmiController->IsVideo();
+iHdmiController->ItemNotSupported();
 }
 }
 // ---------------------------------------------------------------------------
 //
 // Gets the index of the item for which the texture has to be removed
 {
 TRACER("CShwSlideshowView::RemoveTexture");
 const TGlxMedia& item = iFilteredList->Item(GetIndexToBeRemoved());
 iUiUtility->GlxTextureManager().RemoveTexture(item.Id(),EFalse);
 }
+// ---------------------------------------------------------------------------
+// HarvestingUpdated
+//
+// ---------------------------------------------------------------------------
+//
+void CShwSlideshowView::HarvestingUpdated(
+HarvesterEventObserverType HarvestingUpdated,
+HarvesterEventState aHarvesterEventState,
+TInt aItemsLeft )
+{
+TRACER("CShwSlideshowView::HarvestingUpdated()");
+if(HarvestingUpdated == EHEObserverTypeMMC)
+{
+ProcessCommandL(EAknSoftkeyClose);
+}
+}

branch	RCL_3
changeset 12	ce1c7ad1f18b
parent 11	71da52165949
child 13	bcb43dc84c44