From 8e8ca41ea9ab7dc82384a29b9fceb2a9916498d2 Mon Sep 17 00:00:00 2001 From: seife Date: Sun, 5 Jun 2011 10:03:07 +0000 Subject: [PATCH] neutrino: more infoviewer fixes in movieplayer mode 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 --- src/gui/infoviewer.cpp | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp index 9ef66b7a8..93790be78 100644 --- a/src/gui/infoviewer.cpp +++ b/src/gui/infoviewer.cpp @@ -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)) */ ) { - g_RCInput->postMsg (msg, data); - res = messages_return::cancel_info; + /* this debug message will only hit in movieplayer mode, where console is + * 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) { - - if (! is_visible) return; + /* EPG data is not useful in movieplayer mode ;) */ + if (fileplay && !CMoviePlayerGui::getInstance().timeshift) + return; + char runningStart[10]; char runningRest[20]; char runningPercent = 0;