return early if info panel already the same info

updateInfoPanel() is an expensive function due to access to file system for reading screenshots, videos, etc. Record what is already up there and if another request comes in for the same thing, then return early.
RetroPie · May 26, 2021 · 083547c · 083547c
1 parent 584f741
commit 083547c
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 13 deletions.
diff --git a/es-app/src/views/gamelist/DetailedGameListView.cpp b/es-app/src/views/gamelist/DetailedGameListView.cpp
@@ -215,12 +215,23 @@ void DetailedGameListView::updateInfoPanel()
 	FileData* file = (mList.size() == 0 || mList.isScrolling()) ? NULL : mList.getSelected();
 
 	bool fadingOut;
-	if(file == NULL)
+	if(mFile == file)
 	{
+		// Info is already on the panel, don't waste time reloading
+		return;
+	}
+	else if(file == NULL)
+	{
+		LOG(LogDebug) << "DetailedGameListView::updateInfoPanel() : Clearing!";
+
 		//mImage.setImage("");
 		//mDescription.setText("");
 		fadingOut = true;
-	}else{
+	}
+	else
+	{
+		LOG(LogDebug) << "DetailedGameListView::updateInfoPanel() : Drawing!";
+
 		mThumbnail.setImage(file->getThumbnailPath());
 		mMarquee.setImage(file->getMarqueePath());
 		mImage.setImage(file->getImagePath());
@@ -244,6 +255,8 @@ void DetailedGameListView::updateInfoPanel()
 		fadingOut = false;
 	}
 
+	mFile = file;
+
 	std::vector<GuiComponent*> comps = getMDValues();
 	comps.push_back(&mThumbnail);
 	comps.push_back(&mMarquee);

diff --git a/es-app/src/views/gamelist/DetailedGameListView.h b/es-app/src/views/gamelist/DetailedGameListView.h
@@ -26,6 +26,8 @@ class DetailedGameListView : public BasicGameListView
 	void initMDLabels();
 	void initMDValues();
 
+	FileData* mFile;
+
 	ImageComponent mThumbnail;
 	ImageComponent mMarquee;
 	ImageComponent mImage;

diff --git a/es-app/src/views/gamelist/GridGameListView.cpp b/es-app/src/views/gamelist/GridGameListView.cpp
@@ -310,13 +310,17 @@ void GridGameListView::updateInfoPanel()
 	bool fadingOut;
 	if(file == NULL)
 	{
+		LOG(LogDebug) << "GridGameListView::updateInfoPanel() : Clearing!";
+
 		mVideo->setVideo("");
 		mVideo->setImage("");
 		mVideoPlaying = false;
 
 		//mDescription.setText("");
 		fadingOut = true;
 	}else{
+		LOG(LogDebug) << "GridGameListView::updateInfoPanel() : Drawing!";
+
 		if (!mVideo->setVideo(file->getVideoPath()))
 		{
 			mVideo->setDefaultVideo();

diff --git a/es-app/src/views/gamelist/VideoGameListView.cpp b/es-app/src/views/gamelist/VideoGameListView.cpp
@@ -249,16 +249,26 @@ void VideoGameListView::updateInfoPanel()
 	FileData* file = (mList.size() == 0 || mList.isScrolling()) ? NULL : mList.getSelected();
 
 	bool fadingOut;
-	if(file == NULL)
+	if(mFile == file)
 	{
+		// Info is already on the panel, don't waste time reloading
+		return;
+	}
+	else if(file == NULL)
+	{
+		LOG(LogDebug) << "VideoGameListView::updateInfoPanel() : Clearing!";
+
 		mVideo->setVideo("");
 		mVideo->setImage("");
 		mVideoPlaying = false;
 		//mMarquee.setImage("");
 		//mDescription.setText("");
 		fadingOut = true;
+	}
+	else
+	{
+		LOG(LogDebug) << "VideoGameListView::updateInfoPanel() : Drawing!";
 
-	}else{
 		if (!mVideo->setVideo(file->getVideoPath()))
 		{
 			mVideo->setDefaultVideo();
@@ -290,6 +300,8 @@ void VideoGameListView::updateInfoPanel()
 		fadingOut = false;
 	}
 
+	mFile = file;
+
 	std::vector<GuiComponent*> comps = getMDValues();
 	comps.push_back(&mThumbnail);
 	comps.push_back(&mMarquee);

diff --git a/es-app/src/views/gamelist/VideoGameListView.h b/es-app/src/views/gamelist/VideoGameListView.h
@@ -33,6 +33,8 @@ class VideoGameListView : public BasicGameListView
 	void initMDLabels();
 	void initMDValues();
 
+	FileData* mFile;
+
 	ImageComponent mThumbnail;
 	ImageComponent mMarquee;
 	VideoComponent* mVideo;

diff --git a/es-core/src/components/IList.h b/es-core/src/components/IList.h
@@ -58,12 +58,12 @@ class IList : public GuiComponent
 	};
 
 protected:
-	int mCursor;
+	int mCursor; //This is the current position in the list
 
-	int mScrollTier;
-	int mScrollVelocity;
+	int mScrollTier; //This lists the the scrolling "speed gear"
+	int mScrollVelocity; //This is the the steps/interval and direction (-/+)
 
-	int mScrollTierAccumulator;
+	int mScrollTierAccumulator; //This counts until it needs to switch to higher gear
 	int mScrollCursorAccumulator;
 
 	unsigned char mTitleOverlayOpacity;
@@ -191,10 +191,6 @@ class IList : public GuiComponent
 	{
 		PowerSaver::setState(velocity == 0);
 
-		// generate an onCursorChanged event in the stopped state when the user lets go of the key
-		if(velocity == 0 && mScrollVelocity != 0)
-			onCursorChanged(CURSOR_STOPPED);
-
 		mScrollVelocity = velocity;
 		mScrollTier = 0;
 		mScrollTierAccumulator = 0;
@@ -302,7 +298,7 @@ class IList : public GuiComponent
 			onScroll(absAmt);
 
 		mCursor = cursor;
-		onCursorChanged((mScrollTier > 0) ? CURSOR_SCROLLING : CURSOR_STOPPED);
+		onCursorChanged((amt != 0) ? CURSOR_SCROLLING : CURSOR_STOPPED);
 	}
 
 	virtual void onCursorChanged(const CursorState& /*state*/) {}