Merge remote-tracking branch 'uncool/cst-next'

This commit is contained in:
Stefan Seyfried
2015-12-15 17:29:18 +01:00
35 changed files with 268 additions and 108 deletions

View File

@@ -1350,16 +1350,20 @@ 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_AUDIO);
infoViewerBB->showBBButtons(CInfoViewerBB::BUTTON_GREEN);
#endif
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_SUBS);
infoViewerBB->showBBButtons(CInfoViewerBB::BUTTON_YELLOW);
#endif
}
return messages_return::handled;
} else if (msg == NeutrinoMessages::EVT_ZAP_SUB_COMPLETE) {
@@ -1764,7 +1768,9 @@ void CInfoViewer::show_Data (bool calledFromEvent)
frameBuffer->paintBackgroundBoxRel (BoxEndX - 108, posy, 112, height2);
}
#endif
infoViewerBB->showBBButtons(CInfoViewerBB::BUTTON_EPG);
infoViewerBB->showBBButtons(CInfoViewerBB::BUTTON_RED);
infoViewerBB->showBBButtons(CInfoViewerBB::BUTTON_GREEN);
infoViewerBB->showBBButtons(CInfoViewerBB::BUTTON_YELLOW);
}
if ((info_CurrentNext.flags & CSectionsdClient::epgflags::not_broadcast) ||