infoviewer: kill segments from top to bottom, from left to right

Origin commit data
------------------
Branch: ni/coolstream
Commit: 68aa08e2e1
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-12-27 (Fri, 27 Dec 2019)

Origin message was:
------------------
- infoviewer: kill segments from top to bottom, from left to right

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2019-12-27 23:27:20 +01:00
parent 98b0862d77
commit c91a809baa

View File

@@ -2203,15 +2203,23 @@ void CInfoViewer::killTitle()
{
is_visible = false;
infoViewerBB->is_visible = false;
if (infoViewerBB->getFooter())
infoViewerBB->getFooter()->kill();
if (infoViewerBB->getCABar())
infoViewerBB->getCABar()->kill();
if (rec)
rec->kill();
//printf("killTitle(%d, %d, %d, %d)\n", BoxStartX, BoxStartY, BoxEndX+ OFFSET_SHADOW-BoxStartX, bottom-BoxStartY);
//frameBuffer->paintBackgroundBox(BoxStartX, BoxStartY, BoxEndX+ OFFSET_SHADOW, bottom);
if (!(zap_mode & IV_MODE_VIRTUAL_ZAP)){
if (g_settings.radiotext_enable && g_Radiotext)
{
g_Radiotext->S_RtOsd = g_Radiotext->haveRadiotext() ? 1 : 0;
killRadiotext();
}
//NI InfoIcons
if (!g_settings.mode_icons && g_settings.mode_icons_skin == INFOICONS_INFOVIEWER)
CInfoIcons::getInstance()->hideIcons();
//NI hide ecm.info
if (g_settings.show_ecm)
ecmInfoBox_hide();
if (!(zap_mode & IV_MODE_VIRTUAL_ZAP))
{
if (infobar_txt)
infobar_txt->kill();
numbox->kill();
@@ -2222,6 +2230,11 @@ void CInfoViewer::killTitle()
if (sigbox)
sigbox->kill();
#endif
if (rec)
rec->kill();
if (timescale && (g_settings.infobar_progressbar == SNeutrinoSettings::INFOBAR_PROGRESSBAR_ARRANGEMENT_DEFAULT))
timescale->kill();
if (clock)
{
@@ -2232,8 +2245,6 @@ void CInfoViewer::killTitle()
header->kill();
body->kill();
if (txt_curr_start)
txt_curr_start->kill();
if (txt_curr_event)
@@ -2247,21 +2258,16 @@ void CInfoViewer::killTitle()
if (txt_next_in)
txt_next_in->kill();
if (timescale)
if (g_settings.infobar_progressbar == SNeutrinoSettings::INFOBAR_PROGRESSBAR_ARRANGEMENT_DEFAULT)
timescale->kill();
if (g_settings.radiotext_enable && g_Radiotext) {
g_Radiotext->S_RtOsd = g_Radiotext->haveRadiotext() ? 1 : 0;
killRadiotext();
}
body->kill();
//NI show ecm.info
if (g_settings.show_ecm)
ecmInfoBox_hide();
if (infoViewerBB->getCABar())
infoViewerBB->getCABar()->kill();
//NI InfoIcons
if (!g_settings.mode_icons && g_settings.mode_icons_skin == INFOICONS_INFOVIEWER)
CInfoIcons::getInstance()->hideIcons();
if (infoViewerBB->getFooter())
infoViewerBB->getFooter()->kill();
//printf("killTitle(%d, %d, %d, %d)\n", BoxStartX, BoxStartY, BoxEndX + OFFSET_SHADOW, BoxEndY);
//frameBuffer->paintBackgroundBox(BoxStartX, BoxStartY, BoxEndX + OFFSET_SHADOW, BoxEndY);
}
showButtonBar = false;
CInfoClock::getInstance()->enableInfoClock();