From 680b4459377b2e7ea89a22a536b6a450e33e31c6 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Fri, 31 May 2013 11:33:04 +0200 Subject: [PATCH] infoviewer: simplify show_current_next() Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/a579bd092be553d5d78e2274f809fce5b86a4dfa Author: Stefan Seyfried Date: 2013-05-31 (Fri, 31 May 2013) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/infoviewer.cpp | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp index 147b55deb..054ce36d7 100644 --- a/src/gui/infoviewer.cpp +++ b/src/gui/infoviewer.cpp @@ -466,25 +466,6 @@ void CInfoViewer::show_current_next(bool new_chan, int epgpos) } if (!(info_CurrentNext.flags & (CSectionsdClient::epgflags::has_later | CSectionsdClient::epgflags::has_current | CSectionsdClient::epgflags::not_broadcast))) { - // nicht gefunden / noch nicht geladen - /* see the comment in display_Info() for a reasoning for this calculation */ - int CurrInfoY = (BoxEndY + ChanNameY + time_height) / 2; // lower end of current info box - if(g_settings.infobar_progressbar){ - int pb_h = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight() - 4; - switch(g_settings.infobar_progressbar) - { - case 1: - case 2: - CurrInfoY += (pb_h/3); - break; - case 3: - CurrInfoY -= (pb_h/3); - break; - default: - break; - } - } - neutrino_locale_t loc; if (! gotTime) loc = LOCALE_INFOVIEWER_WAITTIME; @@ -492,7 +473,7 @@ void CInfoViewer::show_current_next(bool new_chan, int epgpos) loc = LOCALE_INFOVIEWER_EPGWAIT; else loc = LOCALE_INFOVIEWER_EPGNOTLOAD; - g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO]->RenderString(ChanNameX+ 10, CurrInfoY, BoxEndX- (ChanNameX+ 20), g_Locale->getText(loc), COL_INFOBAR, 0, true); // UTF-8 + display_Info(g_Locale->getText(loc), NULL); } else { show_Data (); }