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

*Fix LED/VFD indication in time shift (r1828)

Browse Source 
- Changes resulted to sometimes crash neutrino, this patch fixes it.


git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1846 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
micha-bbg
2011-11-14 21:59:48 +00:00
parent d90b967328
commit 8b8b89a129
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/driver/vfd.cpp
View File

@@ -295,7 +295,8 @@ void CVFD::showTime(bool force)
} }
} }
if (CRecordManager::getInstance()->RecordingStatus()) { int tmp_recstatus = CNeutrinoApp::getInstance()->recordingstatus;
if (tmp_recstatus) {
if(clearClock) { if(clearClock) {
clearClock = 0; clearClock = 0;
if(has_lcd) if(has_lcd)
@@ -307,13 +308,13 @@ void CVFD::showTime(bool force)
ShowIcon(VFD_ICON_CAM1, true); ShowIcon(VFD_ICON_CAM1, true);
setled(true);//on setled(true);//on
} }
} else if(clearClock || (recstatus != CRecordManager::getInstance()->RecordingStatus())) { // in case icon ON after record stopped } else if(clearClock || (recstatus != tmp_recstatus)) { // in case icon ON after record stopped
clearClock = 0; clearClock = 0;
if(has_lcd) if(has_lcd)
ShowIcon(VFD_ICON_CAM1, false); ShowIcon(VFD_ICON_CAM1, false);
setled(); setled();
} }
recstatus = CRecordManager::getInstance()->RecordingStatus(); recstatus = tmp_recstatus;
} }
void CVFD::showRCLock(int /*duration*/) void CVFD::showRCLock(int /*duration*/)

3
src/gui/infoviewer.cpp
View File

@@ -909,6 +909,9 @@ void CInfoViewer::loop(int fadeValue, bool show_dot ,bool fadeIn)
virtual_zap_mode = true; virtual_zap_mode = true;
res = messages_return::cancel_all; res = messages_return::cancel_all;
hideIt = true; hideIt = true;
} else if ((msg == NeutrinoMessages::EVT_RECORDMODE) &&
(CMoviePlayerGui::getInstance().timeshift) && (CRecordManager::getInstance()->GetRecordCount() == 1)) {
res = CNeutrinoApp::getInstance()->handleMsg(msg, data);
} else if (!fileplay && !CMoviePlayerGui::getInstance().timeshift) { } else if (!fileplay && !CMoviePlayerGui::getInstance().timeshift) {
CNeutrinoApp *neutrino = CNeutrinoApp::getInstance (); CNeutrinoApp *neutrino = CNeutrinoApp::getInstance ();
if ((msg == (neutrino_msg_t) g_settings.key_quickzap_up) || (msg == (neutrino_msg_t) g_settings.key_quickzap_down) || (msg == CRCInput::RC_0) || (msg == NeutrinoMessages::SHOW_INFOBAR)) { if ((msg == (neutrino_msg_t) g_settings.key_quickzap_up) || (msg == (neutrino_msg_t) g_settings.key_quickzap_down) || (msg == CRCInput::RC_0) || (msg == NeutrinoMessages::SHOW_INFOBAR)) {