From fd49c36a7b59a1ffe5910d4a37dfd1d1b039f90b Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Mon, 21 Apr 2014 13:57:41 +0400
Subject: [PATCH] gui/moviebrowser.cpp: prevent title and movie info frame
 refresh after play stop; remove movie thumbnail on RC_favorites key; align
 thumbnail width on apollo for hw blit

---
 src/gui/moviebrowser.cpp | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/gui/moviebrowser.cpp b/src/gui/moviebrowser.cpp
index 013d750fc..a2207e958 100644
--- a/src/gui/moviebrowser.cpp
+++ b/src/gui/moviebrowser.cpp
@@ -1027,6 +1027,8 @@ int CMovieBrowser::exec(const char* path)
 	//refreshMovieInfo();
 
 	refreshTitle();
+	refreshFoot();
+	refreshLCD();
 	onSetGUIWindow(m_settings.gui);
 
 	bool loop = true;
@@ -1143,11 +1145,7 @@ void CMovieBrowser::hide(void)
 		m_pcLastRecord = NULL;
 	}
 	if (m_pcInfo != NULL) delete m_pcInfo;
-	//if (m_pcWindow != NULL) delete m_pcWindow;
-
-	//m_pcWindow = NULL;
 	m_pcInfo = NULL;
-
 }
 
 int CMovieBrowser::paint(void)
@@ -1194,7 +1192,7 @@ int CMovieBrowser::paint(void)
 	//refreshTitle();
 	//refreshFoot();
 	//refreshLCD();
-	refresh();
+	//refresh();
 	return (true);
 }
 
@@ -1271,12 +1269,8 @@ void CMovieBrowser::refreshMovieInfo(void)
 		m_pcInfo->setText(&emptytext);
 	}
 	else {
-		bool logo_ok = false;
-		int picw = (int)(((float)16 / (float)9) * (float)m_cBoxFrameInfo.iHeight);
-		int pich = m_cBoxFrameInfo.iHeight;
-
+		printf("CMovieBrowser::refreshMovieInfo\n");
 		std::string fname;
-printf("CMovieBrowser::refreshMovieInfo\n");
 		if (show_mode == MB_SHOW_YT) {
 			fname = m_movieSelectionHandler->tfile;
 		} else {
@@ -1287,11 +1281,17 @@ printf("CMovieBrowser::refreshMovieInfo\n");
 				fname = getScreenshotName(cover);
 			}
 		}
-		logo_ok = (!fname.empty());
+		bool logo_ok = (!fname.empty());
 		int flogo_w = 0, flogo_h = 0;
 		if(logo_ok) {
+			int picw = (int)(((float)16 / (float)9) * (float)m_cBoxFrameInfo.iHeight);
+			int pich = m_cBoxFrameInfo.iHeight;
 			g_PicViewer->getSize(fname.c_str(), &flogo_w, &flogo_h);
 			g_PicViewer->rescaleImageDimensions(&flogo_w, &flogo_h, picw-2, pich-2);
+#ifdef BOXMODEL_APOLLO
+			/* align for hw blit */
+			flogo_w = ((flogo_w + 3) / 4) * 4;
+#endif
 		}
 		m_pcInfo->setText(&m_movieSelectionHandler->epgInfo2, logo_ok ? m_cBoxFrameInfo.iWidth-flogo_w-20 : 0);
 
@@ -1937,15 +1937,15 @@ bool CMovieBrowser::onButtonPressMainFrame(neutrino_msg_t msg)
 				}
 			}
 		}
-        } else if (msg == CRCInput::RC_topleft) {
-          if (m_movieSelectionHandler != NULL) {
-                if(ShowMsg (LOCALE_MESSAGEBOX_INFO, "Remove screenshot ?", CMessageBox::mbrNo, CMessageBox:: mbYes | CMessageBox::mbNo) == CMessageBox::mbrYes) {
-			std::string fname = getScreenshotName(m_movieSelectionHandler->file.Name);
-			if (fname != "")
-	                        unlink(fname.c_str());
-			refresh();
+	} else if (msg == CRCInput::RC_favorites) {
+		if (m_movieSelectionHandler != NULL) {
+			if(ShowMsg (LOCALE_MESSAGEBOX_INFO, "Remove screenshot ?", CMessageBox::mbrNo, CMessageBox:: mbYes | CMessageBox::mbNo) == CMessageBox::mbrYes) {
+				std::string fname = getScreenshotName(m_movieSelectionHandler->file.Name);
+				if (fname != "")
+					unlink(fname.c_str());
+				refresh();
+			}
 		}
-          }
 	}
 	else
 	{
@@ -2718,7 +2718,7 @@ bool CMovieBrowser::delFile_std(CFile& file)
 
 void CMovieBrowser::updateMovieSelection(void)
 {
-    //TRACE("[mb]->updateMovieSelection %d\r\n",m_windowFocus);
+	//TRACE("[mb]->updateMovieSelection %d\r\n",m_windowFocus);
 	if (m_vMovieInfo.empty()) return;
 	bool new_selection = false;