mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 15:32:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

- infoviewer: better integration of 58858b0391

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>

commit was: - infoviewer: show corresponding icon in webtv/webradio mode
This commit is contained in:
svenhoefer
2021-09-18 01:23:45 +02:00
committed by Thilo Graf
parent 58858b0391
commit 7b304aa04f
1 changed files with 70 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/gui/infoviewer.cpp
View File

@@ -1613,22 +1613,26 @@ void CInfoViewer::getEPG(const t_channel_id for_channel_id, CSectionsdClient::Cu
} }
} }
void CInfoViewer::showSNR () void CInfoViewer::showSNR()
{ {
if (! is_visible) if (!is_visible)
return; return;
int renderFlag = ((g_settings.theme.infobar_gradient_top) ? Font::FULLBG : 0) | Font::IS_UTF8; int renderFlag = ((g_settings.theme.infobar_gradient_top) ? Font::FULLBG : 0) | Font::IS_UTF8;
/* right now, infobar_show_channellogo == 3 is the trigger for signal bars etc. /* right now, infobar_show_channellogo == 3 is the trigger for signal bars etc.
TODO: decouple this */ TODO: decouple this */
if (!fileplay && !IS_WEBCHAN(current_channel_id) && ( g_settings.infobar_show_channellogo == 3 || g_settings.infobar_show_channellogo == 5 || g_settings.infobar_show_channellogo == 6 )) { if (g_settings.infobar_show_channellogo == 3 || g_settings.infobar_show_channellogo == 5 || g_settings.infobar_show_channellogo == 6)
int y_freq = 2*g_SignalFont->getHeight(); {
if (!IS_WEBCHAN(current_channel_id) && !fileplay)
{
int y_freq = 2 * g_SignalFont->getHeight();
if (!g_settings.infobar_sat_display) if (!g_settings.infobar_sat_display)
y_freq -= g_SignalFont->getHeight()/2; //half line up to center freq vertically y_freq -= g_SignalFont->getHeight() / 2; //half line up to center freq vertically
int y_numbox = numbox->getYPos(); int y_numbox = numbox->getYPos();
if ((newfreq && chanready) || SDT_freq_update) { if ((newfreq && chanready) || SDT_freq_update)
{
char freq[22]; char freq[22];
newfreq = false; newfreq = false;
std::string polarisation = ""; std::string polarisation = "";
if (CFrontend::isSat(CFEManager::getInstance()->getLiveFE()->getCurrentDeliverySystem())) if (CFrontend::isSat(CFEManager::getInstance()->getLiveFE()->getCurrentDeliverySystem()))
@@ -1638,17 +1642,18 @@ void CInfoViewer::showSNR ()
int freqfactor = 1000; int freqfactor = 1000;
if (CFrontend::isTerr(CFEManager::getInstance()->getLiveFE()->getCurrentDeliverySystem())) if (CFrontend::isTerr(CFEManager::getInstance()->getLiveFE()->getCurrentDeliverySystem()))
freqfactor = 1000000; freqfactor = 1000000;
snprintf (freq, sizeof(freq), "%d.%d MHz %s", frequency / freqfactor, frequency % freqfactor, polarisation.c_str()); snprintf(freq, sizeof(freq), "%d.%d MHz %s", frequency / freqfactor, frequency % freqfactor, polarisation.c_str());
int freqWidth = g_SignalFont->getRenderWidth(freq); int freqWidth = g_SignalFont->getRenderWidth(freq);
if (freqWidth > numbox_maxtxtwidth) if (freqWidth > numbox_maxtxtwidth)
freqWidth = numbox_maxtxtwidth; freqWidth = numbox_maxtxtwidth;
g_SignalFont->RenderString(BoxStartX + numbox_offset + ((numbox_maxtxtwidth - freqWidth) / 2), y_numbox + y_freq - 3, freqWidth, freq, SDT_freq_update ? COL_COLORED_EVENTS_TEXT:COL_INFOBAR_TEXT, 0, renderFlag); g_SignalFont->RenderString(BoxStartX + numbox_offset + ((numbox_maxtxtwidth - freqWidth) / 2), y_numbox + y_freq - 3, freqWidth, freq, SDT_freq_update ? COL_COLORED_EVENTS_TEXT : COL_INFOBAR_TEXT, 0, renderFlag);
SDT_freq_update = false; SDT_freq_update = false;
} }
if (sigbox == NULL){ if (sigbox == NULL)
{
int sigbox_offset = OFFSET_INNER_MID; int sigbox_offset = OFFSET_INNER_MID;
sigbox = new CSignalBox(BoxStartX + sigbox_offset, y_numbox+ChanHeight/2, ChanWidth - 2*sigbox_offset, ChanHeight/2, NULL, true, NULL, "S", "Q"); sigbox = new CSignalBox(BoxStartX + sigbox_offset, y_numbox + ChanHeight / 2, ChanWidth - 2 * sigbox_offset, ChanHeight / 2, NULL, true, NULL, "S", "Q");
sigbox->setItemName("SIGBOX"); sigbox->setItemName("SIGBOX");
sigbox->setTextColor(COL_INFOBAR_TEXT); sigbox->setTextColor(COL_INFOBAR_TEXT);
sigbox->setActiveColor(COL_PROGRESSBAR_ACTIVE_PLUS_0); sigbox->setActiveColor(COL_PROGRESSBAR_ACTIVE_PLUS_0);
@@ -1660,8 +1665,7 @@ void CInfoViewer::showSNR ()
sigbox->setFrontEnd(CFEManager::getInstance()->getLiveFE()); sigbox->setFrontEnd(CFEManager::getInstance()->getLiveFE());
sigbox->paint(CC_SAVE_SCREEN_NO); sigbox->paint(CC_SAVE_SCREEN_NO);
} }
// TODO: better integration else if (IS_WEBCHAN(current_channel_id))
else if (IS_WEBCHAN(current_channel_id) && ( g_settings.infobar_show_channellogo == 3 || g_settings.infobar_show_channellogo == 5 || g_settings.infobar_show_channellogo == 6 ))
{ {
const char *icon = NULL; const char *icon = NULL;
int mode = CNeutrinoApp::getInstance()->getMode(); int mode = CNeutrinoApp::getInstance()->getMode();
@@ -1674,16 +1678,20 @@ void CInfoViewer::showSNR ()
icon = NEUTRINO_ICON_HINT_WEBRADIO; icon = NEUTRINO_ICON_HINT_WEBRADIO;
break; break;
default: // NeutrinoMode not set yet default: // NeutrinoMode not set yet
icon = NEUTRINO_ICON_PLAY; //icon = NEUTRINO_ICON_PLAY;
break; break;
} }
int icon_w = 0,icon_h = 0; if (icon)
{
int icon_w = 0, icon_h = 0;
frameBuffer->getIconSize(icon, &icon_w, &icon_h); frameBuffer->getIconSize(icon, &icon_w, &icon_h);
int icon_x = BoxStartX + ChanWidth / 2 - icon_w / 2; int icon_x = BoxStartX + ChanWidth / 2 - icon_w / 2;
int icon_y = BoxStartY + g_SignalFont->getHeight() + (ChanHeight - g_SignalFont->getHeight()) / 2 - icon_h / 2; int icon_y = BoxStartY + g_SignalFont->getHeight() + (ChanHeight - g_SignalFont->getHeight()) / 2 - icon_h / 2;
frameBuffer->paintIcon(icon, icon_x, icon_y); frameBuffer->paintIcon(icon, icon_x, icon_y);
} }
if(showButtonBar) }
}
if (showButtonBar)
infoViewerBB->showSysfsHdd(); infoViewerBB->showSysfsHdd();
} }