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

neutrino: more infoviewer fixes in movieplayer mode

Browse Source 
The last "fix" was a bit too optimistic. Every internal event, including
timer messages etc. was now canceling the infobar display. Fix by:
* handling key events as before, by pushing them into rcinput and
  canceling the infobar
* handling all other events by pushing them into the neutrino handler
Some events trigger EPG data display. Prevent that in movieplayer mode.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1510 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
seife
2011-06-05 10:03:07 +00:00
parent ac18822737
commit 8e8ca41ea9
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/gui/infoviewer.cpp
View File

@@ -877,8 +877,16 @@ void CInfoViewer::loop(int fadeValue, bool show_dot ,bool fadeIn)
} }
} }
} else if (fileplay && !CMoviePlayerGui::getInstance().timeshift /* && ( (msg == (neutrino_msg_t) g_settings.mpkey_pause) || (msg == (neutrino_msg_t) g_settings.mpkey_rewind) || (msg == (neutrino_msg_t) g_settings.mpkey_play) || (msg == (neutrino_msg_t) g_settings.mpkey_forward) || (msg == (neutrino_msg_t) g_settings.mpkey_stop)) */ ) { } else if (fileplay && !CMoviePlayerGui::getInstance().timeshift /* && ( (msg == (neutrino_msg_t) g_settings.mpkey_pause) || (msg == (neutrino_msg_t) g_settings.mpkey_rewind) || (msg == (neutrino_msg_t) g_settings.mpkey_play) || (msg == (neutrino_msg_t) g_settings.mpkey_forward) || (msg == (neutrino_msg_t) g_settings.mpkey_stop)) */ ) {
g_RCInput->postMsg (msg, data); /* this debug message will only hit in movieplayer mode, where console is
res = messages_return::cancel_info; * spammed to death anyway... */
printf("%s:%d msg:%08lx, data: %08lx\n", __func__, __LINE__, (long)msg, (long)data);
if (msg < CRCInput::RC_Events) /* RC / Keyboard event */
{
g_RCInput->postMsg (msg, data);
res = messages_return::cancel_info;
}
else
res = CNeutrinoApp::getInstance()->handleMsg(msg, data);
} }
} }
@@ -1651,11 +1659,13 @@ printf("paintProgressBar(%d, %d, %d, %d)\n", BoxEndX - pb_w - SHADOW_OFFSET, Cha
void CInfoViewer::show_Data (bool calledFromEvent) void CInfoViewer::show_Data (bool calledFromEvent)
{ {
if (! is_visible) if (! is_visible)
return; return;
/* EPG data is not useful in movieplayer mode ;) */
if (fileplay && !CMoviePlayerGui::getInstance().timeshift)
return;
char runningStart[10]; char runningStart[10];
char runningRest[20]; char runningRest[20];
char runningPercent = 0; char runningPercent = 0;