From da3b79ea704a8c329a2ee9ec97fe27f68e81c6a7 Mon Sep 17 00:00:00 2001 From: defans Date: Thu, 10 Mar 2016 22:15:04 +0100 Subject: [PATCH] infoviewer: don't handle volume keys in movieplayer Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/de490421e3a2e25edb9f62aa9c3fdd2d7f909d6f Author: defans Date: 2016-03-10 (Thu, 10 Mar 2016) Origin message was: ------------------ - infoviewer: don't handle volume keys in movieplayer ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/infoviewer.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp index 0636a5eba..6b57dae19 100644 --- a/src/gui/infoviewer.cpp +++ b/src/gui/infoviewer.cpp @@ -1117,7 +1117,14 @@ void CInfoViewer::loop(bool show_dot) /* this debug message will only hit in movieplayer mode, where console is * spammed to death anyway... */ printf("%s:%d msg->MP: %08lx, data: %08lx\n", __func__, __LINE__, (long)msg, (long)data); - if (msg < CRCInput::RC_Events) /* RC / Keyboard event */ + + bool volume_keys = ( + msg == CRCInput::RC_spkr + || msg == (neutrino_msg_t) g_settings.key_volumeup + || msg == (neutrino_msg_t) g_settings.key_volumedown + ); + + if (msg < CRCInput::RC_Events && !volume_keys) { g_RCInput->postMsg (msg, data); res = messages_return::cancel_info;