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

- infoviewer: fix display of DolbyDigital icon

Browse Source
This commit is contained in:
svenhoefer
2016-01-21 08:25:18 +01:00
parent 1a290fb0cc
commit 2694b87d08
2 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gui/infoviewer.cpp
View File

@@ -1366,20 +1366,18 @@ int CInfoViewer::handleMsg (const neutrino_msg_t msg, neutrino_msg_data_t data)
if (is_visible) showRecordIcon(true); if (is_visible) showRecordIcon(true);
} else if (msg == NeutrinoMessages::EVT_ZAP_GOTAPIDS) { } else if (msg == NeutrinoMessages::EVT_ZAP_GOTAPIDS) {
if ((*(t_channel_id *) data) == current_channel_id) { if ((*(t_channel_id *) data) == current_channel_id) {
#if 0 if (is_visible && showButtonBar) {
if (is_visible && showButtonBar) infoViewerBB->showIcon_DD();
infoViewerBB->showBBButtons(CInfoViewerBB::BUTTON_GREEN); infoViewerBB->showBBButtons(); // in case button text has changed
#endif }
if (g_settings.radiotext_enable && g_Radiotext && !g_RemoteControl->current_PIDs.APIDs.empty() && ((CNeutrinoApp::getInstance()->getMode()) == NeutrinoMessages::mode_radio)) 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); g_Radiotext->setPid(g_RemoteControl->current_PIDs.APIDs[g_RemoteControl->current_PIDs.PIDs.selected_apid].pid);
} }
return messages_return::handled; return messages_return::handled;
} else if (msg == NeutrinoMessages::EVT_ZAP_GOT_SUBSERVICES) { } else if (msg == NeutrinoMessages::EVT_ZAP_GOT_SUBSERVICES) {
if ((*(t_channel_id *) data) == current_channel_id) { if ((*(t_channel_id *) data) == current_channel_id) {
#if 0
if (is_visible && showButtonBar) if (is_visible && showButtonBar)
infoViewerBB->showBBButtons(CInfoViewerBB::BUTTON_YELLOW); infoViewerBB->showBBButtons(); // in case button text has changed
#endif
} }
return messages_return::handled; return messages_return::handled;
} else if (msg == NeutrinoMessages::EVT_ZAP_SUB_COMPLETE) { } 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); frameBuffer->paintBackgroundBoxRel (BoxEndX - 108, posy, 112, height2);
} }
#endif #endif
infoViewerBB->showBBButtons(CInfoViewerBB::BUTTON_RED); infoViewerBB->showBBButtons();
infoViewerBB->showBBButtons(CInfoViewerBB::BUTTON_GREEN);
infoViewerBB->showBBButtons(CInfoViewerBB::BUTTON_YELLOW);
} }
if ((info_CurrentNext.flags & CSectionsdClient::epgflags::not_broadcast) || if ((info_CurrentNext.flags & CSectionsdClient::epgflags::not_broadcast) ||

3
src/gui/infoviewer_bb.cpp
View File

@@ -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++) { for (i = 0; i < CInfoViewerBB::BUTTON_MAX; i++) {
tmp_bbButtonInfoText[i] = bbButtonInfo[i].text; tmp_bbButtonInfoText[i] = bbButtonInfo[i].text;
} }