mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 08:51:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

InfoClock: Fix display clock in movie browser, file browser etc.

Browse Source
This commit is contained in:
M. Liebmann
2013-11-22 08:52:08 +01:00
parent 6a5d335430
commit 7466d6f19c
10 changed files with 57 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/movieplayer.cpp
View File

@@ -203,6 +203,7 @@ int CMoviePlayerGui::exec(CMenuTarget * parent, const std::string & actionKey)
}
else if (actionKey == "ytplayback") {
CAudioMute::getInstance()->enableMuteIcon(false);
InfoClock->enableInfoClock(false);
isMovieBrowser = true;
moviebrowser->setMode(MB_SHOW_YT);
}
@@ -245,8 +246,10 @@ int CMoviePlayerGui::exec(CMenuTarget * parent, const std::string & actionKey)
CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO);
if (moviebrowser->getMode() == MB_SHOW_YT)
if (moviebrowser->getMode() == MB_SHOW_YT) {
CAudioMute::getInstance()->enableMuteIcon(true);
InfoClock->enableInfoClock(true);
}
if (timeshift){
timeshift = 0;
@@ -399,6 +402,7 @@ bool CMoviePlayerGui::SelectFile()
}
else { // filebrowser
CAudioMute::getInstance()->enableMuteIcon(false);
InfoClock->enableInfoClock(false);
if (filebrowser->exec(Path_local.c_str()) == true) {
Path_local = filebrowser->getCurrentDir();
CFile *file;
@@ -437,6 +441,7 @@ bool CMoviePlayerGui::SelectFile()
} else
menu_ret = filebrowser->getMenuRet();
CAudioMute::getInstance()->enableMuteIcon(true);
InfoClock->enableInfoClock(true);
}
if(ret && file_name.empty()) {
std::string::size_type pos = full_name.find_last_of('/');
@@ -573,6 +578,7 @@ void CMoviePlayerGui::PlayFile(void)
}
CAudioMute::getInstance()->enableMuteIcon(true);
InfoClock->enableInfoClock(true);
while (playstate >= CMoviePlayerGui::PLAY)
{
@@ -835,9 +841,7 @@ void CMoviePlayerGui::PlayFile(void)
restoreNeutrino();
CAudioMute::getInstance()->enableMuteIcon(false);
if (g_settings.mode_clock)
InfoClock->StartClock();
InfoClock->enableInfoClock(false);
}
void CMoviePlayerGui::callInfoViewer(/*const int duration, const int curr_pos*/)