From bf1412a5c512f65b902227c6a929fa0a124e46dc Mon Sep 17 00:00:00 2001 From: vanhofen Date: Mon, 9 Dec 2019 21:55:47 +0100 Subject: [PATCH] neutrino: use RC_tv/radio to toggle infoviewer/epg; ARM/MIPS_HARDWARE only Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/5e8a1d0233781d1b4a7494e5be8107ef4094ba85 Author: vanhofen Date: 2019-12-09 (Mon, 09 Dec 2019) Origin message was: ------------------ - neutrino: use RC_tv/radio to toggle infoviewer/epg; ARM/MIPS_HARDWARE only ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/epgview.cpp | 4 ++++ src/gui/infoviewer.cpp | 7 ++++++- src/neutrino.cpp | 6 +++++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp index dede033e0..778cea090 100644 --- a/src/gui/epgview.cpp +++ b/src/gui/epgview.cpp @@ -1349,6 +1349,10 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start show(channel_id, id, &startzeit, false, call_fromfollowlist); showPos=0; break; +#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE + case CRCInput::CRCInput::RC_tv: + case CRCInput::CRCInput::RC_radio: +#endif case CRCInput::RC_info: case CRCInput::RC_ok: case CRCInput::RC_timeout: diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp index b6cd4db3b..ed442ac91 100644 --- a/src/gui/infoviewer.cpp +++ b/src/gui/infoviewer.cpp @@ -1184,9 +1184,14 @@ void CInfoViewer::loop(bool show_dot) } else if (CNeutrinoApp::getInstance()->listModeKey(msg)) { g_RCInput->postMsg (msg, 0); res = messages_return::cancel_info; - } else if (msg == CRCInput::RC_info) { //NI + } else if (msg == CRCInput::RC_info) { g_RCInput->postMsg(NeutrinoMessages::SHOW_EPG, 0); res = messages_return::cancel_info; +#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE + } else if (msg == CRCInput::RC_tv || msg == CRCInput::RC_radio) { + g_RCInput->postMsg(NeutrinoMessages::SHOW_EPG, 0); + res = messages_return::cancel_info; +#endif } else if ((msg == NeutrinoMessages::EVT_TIMER) && (data == fader.GetFadeTimer())) { if(fader.FadeDone()) res = messages_return::cancel_info; diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 9635ce9c8..bf13e3e90 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -3269,16 +3269,20 @@ void CNeutrinoApp::RealRun() StartSubtitles(); } else if (((msg == CRCInput::RC_tv) || (msg == CRCInput::RC_radio)) && (g_settings.key_tvradio_mode == (int)CRCInput::RC_nokey)) { -#if HAVE_ARM_HARDWARE +#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE if (msg == CRCInput::RC_tv) { if (mode == NeutrinoModes::mode_radio || mode == NeutrinoModes::mode_webradio) tvMode(); + else if (!g_InfoViewer->is_visible) + g_RCInput->postMsg(NeutrinoMessages::SHOW_INFOBAR, 0); } else if (msg == CRCInput::RC_radio) { if (mode == NeutrinoModes::mode_tv || mode == NeutrinoModes::mode_webtv) radioMode(); + else if (!g_InfoViewer->is_visible) + g_RCInput->postMsg(NeutrinoMessages::SHOW_INFOBAR, 0); } else #endif