mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 01:11:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

movieplayer: Fix display filetime

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7d5cbea37d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-05 (Sun, 05 Feb 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2017-02-05 17:31:24 +01:00
parent cd2b0ed839
commit a6e0fdbcca
4 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/gui/infoclock.cpp
View File

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

12
src/gui/movieplayer.cpp
View File

@@ -282,6 +282,7 @@ int CMoviePlayerGui::exec(CMenuTarget * parent, const std::string & actionKey)
FileTimeOSD->kill(); FileTimeOSD->kill();
FileTimeOSD->setMode(CTimeOSD::MODE_HIDE); FileTimeOSD->setMode(CTimeOSD::MODE_HIDE);
FileTimeOSD->setMpTimeForced(false);
time_forced = false; time_forced = false;
if (actionKey == "tsmoviebrowser") { if (actionKey == "tsmoviebrowser") {
@@ -1100,6 +1101,7 @@ bool CMoviePlayerGui::PlayFileStart(void)
{ {
menu_ret = menu_return::RETURN_REPAINT; menu_ret = menu_return::RETURN_REPAINT;
FileTimeOSD->setMpTimeForced(false);
time_forced = false; time_forced = false;
position = 0, duration = 0; position = 0, duration = 0;
@@ -1201,6 +1203,7 @@ bool CMoviePlayerGui::PlayFileStart(void)
FileTimeOSD->switchMode(position, duration); FileTimeOSD->switchMode(position, duration);
time_forced = true; time_forced = true;
} }
FileTimeOSD->setMpTimeForced(true);
} else if (timeshift == TSHIFT_MODE_OFF || !g_settings.timeshift_pause) { } else if (timeshift == TSHIFT_MODE_OFF || !g_settings.timeshift_pause) {
playback->SetSpeed(1); playback->SetSpeed(1);
} }
@@ -1402,6 +1405,7 @@ void CMoviePlayerGui::PlayFileLoop(void)
time_forced = false; time_forced = false;
FileTimeOSD->kill(); FileTimeOSD->kill();
} }
FileTimeOSD->setMpTimeForced(false);
if (playstate > CMoviePlayerGui::PLAY) { if (playstate > CMoviePlayerGui::PLAY) {
playstate = CMoviePlayerGui::PLAY; playstate = CMoviePlayerGui::PLAY;
speed = 1; speed = 1;
@@ -1436,6 +1440,11 @@ void CMoviePlayerGui::PlayFileLoop(void)
enableOsdElements(MUTE); enableOsdElements(MUTE);
} }
} else if (msg == (neutrino_msg_t) g_settings.mpkey_pause) { } 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) { if (playstate == CMoviePlayerGui::PAUSE) {
playstate = CMoviePlayerGui::PLAY; playstate = CMoviePlayerGui::PLAY;
//CVFD::getInstance()->ShowIcon(VFD_ICON_PAUSE, false); //CVFD::getInstance()->ShowIcon(VFD_ICON_PAUSE, false);
@@ -1467,6 +1476,8 @@ void CMoviePlayerGui::PlayFileLoop(void)
update_lcd = true; update_lcd = true;
} else if (msg == (neutrino_msg_t) g_settings.mpkey_time) { } else if (msg == (neutrino_msg_t) g_settings.mpkey_time) {
FileTimeOSD->switchMode(position, duration); FileTimeOSD->switchMode(position, duration);
time_forced = false;
FileTimeOSD->setMpTimeForced(false);
} else if (msg == (neutrino_msg_t) g_settings.mbkey_cover) { } else if (msg == (neutrino_msg_t) g_settings.mbkey_cover) {
makeScreenShot(false, true); makeScreenShot(false, true);
} else if (msg == (neutrino_msg_t) g_settings.key_screenshot) { } else if (msg == (neutrino_msg_t) g_settings.key_screenshot) {
@@ -1492,6 +1503,7 @@ void CMoviePlayerGui::PlayFileLoop(void)
FileTimeOSD->switchMode(position, duration); FileTimeOSD->switchMode(position, duration);
time_forced = true; time_forced = true;
} }
FileTimeOSD->setMpTimeForced(true);
if (timeshift == TSHIFT_MODE_OFF) if (timeshift == TSHIFT_MODE_OFF)
callInfoViewer(); callInfoViewer();
} else if (msg == CRCInput::RC_1) { // Jump Backwards 1 minute } else if (msg == CRCInput::RC_1) { // Jump Backwards 1 minute

1
src/gui/timeosd.cpp
View File

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

5
src/gui/timeosd.h
View File

@@ -44,6 +44,7 @@ class CTimeOSD : public CComponentsFrmClock
CProgressBar timescale; CProgressBar timescale;
mode m_mode, tmp_mode; mode m_mode, tmp_mode;
bool m_restore; bool m_restore;
bool mp_time_forced;
time_t m_time_show; time_t m_time_show;
void initTimeString(); void initTimeString();
@@ -65,7 +66,9 @@ class CTimeOSD : public CComponentsFrmClock
mode getTmpMode() { return tmp_mode; }; mode getTmpMode() { return tmp_mode; };
void setTmpMode () { tmp_mode = m_mode; }; void setTmpMode () { tmp_mode = m_mode; };
bool getRestore() { return m_restore; }; 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 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 #endif