Merge remote-tracking branch 'n/cst-next-fixed'

Origin commit data
------------------
Branch: ni/coolstream
Commit: f5c72d35c8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-24 (Sun, 24 Jan 2016)


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

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2016-01-24 13:15:43 +01:00
58 changed files with 627 additions and 171 deletions

View File

@@ -377,7 +377,7 @@ void CInfoViewerBB::getBBButtonInfo()
}
}
void CInfoViewerBB::showBBButtons(const int modus)
void CInfoViewerBB::showBBButtons(bool paintFooter)
{
if (!is_visible)
return;
@@ -406,7 +406,7 @@ void CInfoViewerBB::showBBButtons(const int modus)
int buf_y = BBarY;
int buf_w = g_InfoViewer->BoxEndX-buf_x;
int buf_h = InfoHeightY_Info;
if (modus != -1) {
if (paintFooter) {
pixbuf = new fb_pixel_t[buf_w * buf_h];
//printf("\nbuf_x: %d, buf_y: %d, buf_w: %d, buf_h: %d, pixbuf: %p\n \n", buf_x, buf_y, buf_w, buf_h, pixbuf);
frameBuffer->SaveScreen(buf_x, buf_y, buf_w, buf_h, pixbuf);
@@ -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++) {
tmp_bbButtonInfoText[i] = bbButtonInfo[i].text;
}