From a200d57ccfadb3313a06f9cbafb540b4dbef6088 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Thu, 21 Jan 2016 08:25:18 +0100 Subject: [PATCH] infoviewer: fix display of DolbyDigital icon Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/2694b87d0806d8120562673dd246a89c81694aa9 Author: vanhofen Date: 2016-01-21 (Thu, 21 Jan 2016) Origin message was: ------------------ - infoviewer: fix display of DolbyDigital icon ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/infoviewer.cpp | 16 ++++++---------- src/gui/infoviewer_bb.cpp | 3 --- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp index f28909a5f..f1eeddc74 100644 --- a/src/gui/infoviewer.cpp +++ b/src/gui/infoviewer.cpp @@ -1366,20 +1366,18 @@ int CInfoViewer::handleMsg (const neutrino_msg_t msg, neutrino_msg_data_t data) if (is_visible) showRecordIcon(true); } else if (msg == NeutrinoMessages::EVT_ZAP_GOTAPIDS) { if ((*(t_channel_id *) data) == current_channel_id) { -#if 0 - if (is_visible && showButtonBar) - infoViewerBB->showBBButtons(CInfoViewerBB::BUTTON_GREEN); -#endif + if (is_visible && showButtonBar) { + infoViewerBB->showIcon_DD(); + infoViewerBB->showBBButtons(); // in case button text has changed + } if (g_settings.radiotext_enable && g_Radiotext && !g_RemoteControl->current_PIDs.APIDs.empty() && ((CNeutrinoApp::getInstance()->getMode()) == NeutrinoMessages::mode_radio)) g_Radiotext->setPid(g_RemoteControl->current_PIDs.APIDs[g_RemoteControl->current_PIDs.PIDs.selected_apid].pid); } return messages_return::handled; } else if (msg == NeutrinoMessages::EVT_ZAP_GOT_SUBSERVICES) { if ((*(t_channel_id *) data) == current_channel_id) { -#if 0 if (is_visible && showButtonBar) - infoViewerBB->showBBButtons(CInfoViewerBB::BUTTON_YELLOW); -#endif + infoViewerBB->showBBButtons(); // in case button text has changed } return messages_return::handled; } else if (msg == NeutrinoMessages::EVT_ZAP_SUB_COMPLETE) { @@ -1784,9 +1782,7 @@ void CInfoViewer::show_Data (bool calledFromEvent) frameBuffer->paintBackgroundBoxRel (BoxEndX - 108, posy, 112, height2); } #endif - infoViewerBB->showBBButtons(CInfoViewerBB::BUTTON_RED); - infoViewerBB->showBBButtons(CInfoViewerBB::BUTTON_GREEN); - infoViewerBB->showBBButtons(CInfoViewerBB::BUTTON_YELLOW); + infoViewerBB->showBBButtons(); } if ((info_CurrentNext.flags & CSectionsdClient::epgflags::not_broadcast) || diff --git a/src/gui/infoviewer_bb.cpp b/src/gui/infoviewer_bb.cpp index 33d1f669a..b6c766264 100644 --- a/src/gui/infoviewer_bb.cpp +++ b/src/gui/infoviewer_bb.cpp @@ -439,9 +439,6 @@ void CInfoViewerBB::showBBButtons(const int modus) } } - if (modus == CInfoViewerBB::BUTTON_GREEN) - showIcon_DD(); - for (i = 0; i < CInfoViewerBB::BUTTON_MAX; i++) { tmp_bbButtonInfoText[i] = bbButtonInfo[i].text; }