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

equal deleted inserted replaced

-:ce1c7ad1f18b
+:bcb43dc84c44
 #include <alf/alfenv.h>
 #include <alf/alfdisplay.h>
 #include <alf/alfutil.h>
 #include <alf/alfroster.h>
-//Hg
-//#include <hg/hgcontextutility.h>
 #include <glxhdmicontroller.h>
 #include <glxresourceutilities.h>               // for CGlxResourceUtilities
 #include <glxresolutionutility.h>               // for CGlxResolutionUtility
 #include <shwslideshowview.rsg> // view's resource
 #include <data_caging_path_literals.hrh>	// for resource directory path
 const TInt KViewId = 0x20007199;
 //gontrol goup id has to be locally unique
 const TInt KShwGestureControlGroupId = 2;
 const TInt KGestureControlGroupId = 44;
 //This constant is used to calculate the index of the item for which texture has to removed.
-//6 = 5(iterator value in forward or backward direction for fullscreen) + 1(focus index);
+//6 = 5(iterator value in forward or backward direction for fullscreen) + 1(focus index)
 const TInt KSlideShowIterator = 2;
 //Constant which says maximum number of fullscreen textures that we have have at a time.
 //11 = (5(5 fullscreen texture backwards)+1(fucus index texture)+5(5 fullscreen texture forwards))
 const TInt KSlideShowTextureOffset = 3;
 }
 //
 CShwSlideshowView::~CShwSlideshowView()
 {
 TRACER("CShwSlideshowView::~CShwSlideshowView");
 	GLX_LOG_INFO( "CShwSlideshowView::~CShwSlideshowView()" );
-	iHarvesterClient.Close();
-// delete media list population call back
+	delete iMMCNotifier;
+	iMMCNotifier = NULL;
+	// 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();
+iMMCNotifier = CGlxMMCNotifier::NewL(*this);
-	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();
 NewL( *iEnv,
 	  *iUiUtility,
 	  KShwDefaultDelayMicroSeconds );
 // Create a control group for the volume control
 iVolumeControlGroup = &iEnv->NewControlGroupL( KVolumeControlGroupId );
-// doc says the following takes ownership, but reality is different!
+// doc says the following takes ownership, but reality is different
 	iVolumeControlGroup->AppendL( iVolumeControl );
 iGestureControlGroup = &iEnv->NewControlGroupL( KShwGestureControlGroupId );
 	// construct the gesture control group
 	iGestureControlGroup->AppendL( iShwGestureControl );
 	GestureHelper::CGestureControl* gestureControl = GestureHelper::CGestureControl::NewLC(
 *iShwGestureControl, *iEnv, *iDisplay, KGestureControlGroupId );
 iGestureControl = gestureControl;
-CleanupStack::Pop( gestureControl ); // doc says the following takes ownership, but reality is different!
+CleanupStack::Pop( gestureControl ); // doc says the following takes ownership, but reality is different
 	iGestureControlGroup->AppendL( iGestureControl );
 	// Need a mechanism to distinguish when we receive the MusicVolume
 	// callback for the first time
 	iCurrentVolume = -1;
 //
 void CShwSlideshowView::HandleForegroundEventL(TBool aForeground)
 {
 TRACER("CShwSlideshowView::HandleForegroundEventL");
 	GLX_LOG_INFO( "CShwSlideshowView::HandleForegroundEventL()" );
+	iIsForegrnd = aForeground;
 if( aForeground )
 {
 // we gained the foreground
-iPauseHandler->SwitchToForegroundL();
+if(iMMCState && iPrevNotInBackground)
+{
+ProcessCommandL(EAknSoftkeyClose);
+}
+else
+{
+iPauseHandler->SwitchToForegroundL();
+}
 }
 else
 {
 // Something else has gained the foreground
 iPauseHandler->SwitchToBackgroundL();
 	//Cancel the back light timer
 iBackLightTimer->Cancel();
-//Stop the slideshow!
+//Stop the slideshow
-//NOTE! this needs to be done before the list is closed as the
+//NOTE: this needs to be done before the list is closed as the
 //destructor removes the engine as medialist observer and also
 //removes the contexts from the list
 delete iEngine;
 iEngine = NULL;
 if ( selectionCount == 0 )
 {
 // nothing selected, so determine which item has focus in the original list
 focusIndex = iMediaList->FocusIndex();
 const TGlxMedia& mediaItem = iMediaList->Item( focusIndex );
-// is this item in the filtered list?
+// Check if this item is in the filtered list
 TGlxIdSpaceId spaceId = iMediaList->IdSpaceId( focusIndex );
 focusIndex = iFilteredList->Index( spaceId, mediaItem.Id() );
 if ( focusIndex == KErrNotFound )
 {
 // it's been filtered out so just use the first item
 // 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)
+|| (NULL == iHdmiController))
-|| (!iHdmiController->IsHDMIConnected()))
 {
 GLX_LOG_INFO("CShwSlideshowView::SetImageToHDMIL - Cant Set Image To HDMI");
 return;
 }
 // and it has no attribute error
 if ( (item.Category() != EMPXVideo)
 && (error == KErrNone) )
 {
 GLX_LOG_INFO("CShwSlideshowView::SetImageToHDMIL - CGlxHdmi - Setting the Image");
-TInt frameCount(0);
+iHdmiController->SetImageL(item.Uri());
-TSize orignalSize;
-item.GetFrameCount(frameCount);
-item.GetDimensions(orignalSize);
-iHdmiController->SetImageL(item.Uri(), orignalSize, frameCount);
 }
 else
 {
 GLX_LOG_INFO("CShwSlideshowView::SetImageToHDMIL - Unsupported Item");
 //Set the external display to cloning mode if
-//the current item is something we wont support (e.g. video, corrupted item);
+//the current item is something we wont support (e.g. video, corrupted item)
 iHdmiController->ItemNotSupported();
 }
 }
 // ---------------------------------------------------------------------------
 //
 const TGlxMedia& item = iFilteredList->Item(GetIndexToBeRemoved());
 iUiUtility->GlxTextureManager().RemoveTexture(item.Id(),EFalse);
 }
 // ---------------------------------------------------------------------------
-// HarvestingUpdated
 //
-// ---------------------------------------------------------------------------
+// HandleMMCInsertionL
-//
+// ---------------------------------------------------------------------------
-void CShwSlideshowView::HarvestingUpdated(
+//
-HarvesterEventObserverType HarvestingUpdated,
+void CShwSlideshowView::HandleMMCInsertionL()
-HarvesterEventState aHarvesterEventState,
+{
-TInt aItemsLeft )
+TRACER("CShwSlideshowView::HandleMMCInsertionL()");
-{
+iMMCState = ETrue;
-TRACER("CShwSlideshowView::HarvestingUpdated()");
+iPrevNotInBackground = iIsForegrnd;
-if(HarvestingUpdated == EHEObserverTypeMMC)
+if(iIsForegrnd)
 {
 ProcessCommandL(EAknSoftkeyClose);
 }
 }
+// ---------------------------------------------------------------------------
+//
+// HandleMMCRemovalL
+// ---------------------------------------------------------------------------
+//
+void CShwSlideshowView::HandleMMCRemovalL()
+{
+TRACER("CShwSlideshowView::HandleMMCRemovalL()");
+ProcessCommandL(EAknSoftkeyExit);
+}

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