Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Origin commit data
------------------
Branch: ni/coolstream
Commit: 582013faf2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit

configure.ac

@@ -93,7 +93,14 @@ TUXBOX_APPS_LIB_PKGCONFIG(CURL,libcurl)
 
 ## For the check you must use the corresponding libtool number as version number,
 ## see freetype source code docs/VERSIONS.TXT
-PKG_CHECK_MODULES([FREETYPE], [freetype2 >= 16.2.10], echo "freetype2 >= 2.5.0 found", [echo "freetype2 >= 2.5.0 not found"; exit 1])
+PKG_CHECK_MODULES([FREETYPE], [freetype2 >= 16.2.10],
+	[echo "freetype2 >= 2.5.0 found"], [
+	## If freetype is not found:
+	## Activate this line if you want to search with freetype-config instead
+	[echo "freetype2 >= 2.5.0 not found, use alternative search method with freetype-config"]
+	## Activate this line if you want to abort
+#	AC_MSG_ERROR([freetype2 >= 2.5.0 not found])
+	])
 
 # fallback to curl-config (which is ugly for cross-compilation)
 if test -z "$CURL_LIBS" -a -z "$CURL_CFLAGS"; then
@@ -102,7 +109,7 @@ fi
 # fallback to freetype-config (which is ugly for cross-compilation)
 if test -z "$FREETYPE_LIBS" -a -z "$FREETYPE_CFLAGS"; then
 	TUXBOX_APPS_LIB_CONFIG(FREETYPE,freetype-config)
-	CPPFLAGS+="$FREETYPE_CFLAGS"
+	CPPFLAGS+=" $FREETYPE_CFLAGS"
 	AC_MSG_CHECKING([whether FreeType version is 2.5.0 or higher])
 		AC_TRY_CPP([
 			#include <ft2build.h>

src/gui/infoclock.cpp

@@ -126,19 +126,22 @@ bool CInfoClock::enableInfoClock(bool enable)
 		}
 	}
 
-	if (enable) {
-		if (FileTimeOSD->getRestore()) {
-			FileTimeOSD->setMode(FileTimeOSD->getTmpMode());
-			FileTimeOSD->update(CMoviePlayerGui::getInstance().GetPosition(),
-					      CMoviePlayerGui::getInstance().GetDuration());
+	if (!FileTimeOSD->getMpTimeForced()) {
+		if (enable) {
+			if (FileTimeOSD->getRestore()) {
+				FileTimeOSD->setRestore(false);
+				FileTimeOSD->setMode(FileTimeOSD->getTmpMode());
+				FileTimeOSD->update(CMoviePlayerGui::getInstance().GetPosition(),
+						      CMoviePlayerGui::getInstance().GetDuration());
+			}
 		}
-	}
-	else {
-		if (FileTimeOSD->getMode() != CTimeOSD::MODE_HIDE) {
-			FileTimeOSD->setTmpMode();
-			FileTimeOSD->setRestore();
-			if (FileTimeOSD->getRestore())
-				FileTimeOSD->kill();
+		else {
+			if (FileTimeOSD->getMode() != CTimeOSD::MODE_HIDE) {
+				FileTimeOSD->setTmpMode();
+				FileTimeOSD->setRestore(true);
+				if (FileTimeOSD->getRestore())
+					FileTimeOSD->kill();
+			}
 		}
 	}
 

src/gui/movieplayer.cpp

@@ -301,6 +301,7 @@ int CMoviePlayerGui::exec(CMenuTarget * parent, const std::string & actionKey)
 
 	FileTimeOSD->kill();
 	FileTimeOSD->setMode(CTimeOSD::MODE_HIDE);
+	FileTimeOSD->setMpTimeForced(false);
 	time_forced = false;
 
 	if (actionKey == "tsmoviebrowser") {
@@ -1136,6 +1137,7 @@ bool CMoviePlayerGui::PlayFileStart(void)
 {
 	menu_ret = menu_return::RETURN_REPAINT;
 
+	FileTimeOSD->setMpTimeForced(false);
 	time_forced = false;
 
 	position = 0, duration = 0;
@@ -1237,6 +1239,7 @@ bool CMoviePlayerGui::PlayFileStart(void)
 				FileTimeOSD->switchMode(position, duration);
 				time_forced = true;
 			}
+			FileTimeOSD->setMpTimeForced(true);
 		} else if (timeshift == TSHIFT_MODE_OFF || !g_settings.timeshift_pause) {
 			playback->SetSpeed(1);
 		}
@@ -1438,6 +1441,7 @@ void CMoviePlayerGui::PlayFileLoop(void)
 				time_forced = false;
 				FileTimeOSD->kill();
 			}
+			FileTimeOSD->setMpTimeForced(false);
 			if (playstate > CMoviePlayerGui::PLAY) {
 				playstate = CMoviePlayerGui::PLAY;
 				speed = 1;
@@ -1472,6 +1476,11 @@ void CMoviePlayerGui::PlayFileLoop(void)
 				enableOsdElements(MUTE);
 			}
 		} else if (msg == (neutrino_msg_t) g_settings.mpkey_pause) {
+			if (time_forced) {
+				time_forced = false;
+				FileTimeOSD->kill();
+			}
+			FileTimeOSD->setMpTimeForced(false);
 			if (playstate == CMoviePlayerGui::PAUSE) {
 				playstate = CMoviePlayerGui::PLAY;
 				//CVFD::getInstance()->ShowIcon(VFD_ICON_PAUSE, false);
@@ -1503,6 +1512,8 @@ void CMoviePlayerGui::PlayFileLoop(void)
 			update_lcd = true;
 		} else if (msg == (neutrino_msg_t) g_settings.mpkey_time) {
 			FileTimeOSD->switchMode(position, duration);
+			time_forced = false;
+			FileTimeOSD->setMpTimeForced(false);
 		} else if (msg == (neutrino_msg_t) g_settings.mbkey_cover) {
 			makeScreenShot(false, true);
 		} else if (msg == (neutrino_msg_t) g_settings.key_screenshot) {
@@ -1528,6 +1539,7 @@ void CMoviePlayerGui::PlayFileLoop(void)
 				FileTimeOSD->switchMode(position, duration);
 				time_forced = true;
 			}
+			FileTimeOSD->setMpTimeForced(true);
 			if (timeshift == TSHIFT_MODE_OFF)
 				callInfoViewer();
 		} else if (msg == CRCInput::RC_1) {	// Jump Backwards 1 minute

src/gui/timeosd.cpp

@@ -46,6 +46,7 @@ CTimeOSD::CTimeOSD():CComponentsFrmClock( 1, 1, NULL, "%H:%M:%S", NULL, false, 1
 	m_mode    = MODE_HIDE;
 	tmp_mode  = MODE_HIDE;
 	m_restore = false;
+	mp_time_forced = false;
 	Init();
 }
 

src/gui/timeosd.h

@@ -44,6 +44,7 @@ class CTimeOSD : public CComponentsFrmClock
 		CProgressBar		timescale;
 		mode m_mode, tmp_mode;
 		bool m_restore;
+		bool mp_time_forced;
 		time_t m_time_show;
 
 		void initTimeString();
@@ -65,7 +66,9 @@ class CTimeOSD : public CComponentsFrmClock
 		mode getTmpMode() { return tmp_mode; };
 		void setTmpMode () { tmp_mode = m_mode; };
 		bool getRestore() { return m_restore; };
-		void setRestore() { m_restore = (m_mode != MODE_HIDE); };
+		void setRestore(bool m) { m_restore = m; };
 		void setHeight(const int){}//NOTE: dummy member, height is strictly bound to settings
+		bool getMpTimeForced() { return mp_time_forced; };
+		void setMpTimeForced(bool m) { mp_time_forced = m; };
 };
 #endif