mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Imageinfo/Streaminfo: Use CComponentsPIP for PIP

Browse Source
This commit is contained in:
micha-bbg
2012-08-11 17:59:54 +02:00
committed by Thilo Graf
parent 413e224128
commit d5a00cb260
4 changed files with 21 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/gui/streaminfo2.cpp
View File

@@ -56,7 +56,7 @@ extern CRemoteControl *g_RemoteControl; /* neutrino.cpp */
CStreamInfo2::CStreamInfo2 ()
{
frameBuffer = CFrameBuffer::getInstance ();
pip = NULL;
font_head = SNeutrinoSettings::FONT_TYPE_MENU_TITLE;
font_info = SNeutrinoSettings::FONT_TYPE_MENU;
font_small = SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL;
@@ -98,7 +98,7 @@ CStreamInfo2::CStreamInfo2 ()
CStreamInfo2::~CStreamInfo2 ()
{
videoDecoder->Pig(-1, -1, -1, -1);
delete pip;
ts_close();
}
@@ -252,17 +252,10 @@ int CStreamInfo2::doSignalStrengthLoop ()
void CStreamInfo2::hide ()
{
videoDecoder->Pig(-1, -1, -1, -1);
pip->hide(true);
frameBuffer->paintBackgroundBoxRel (0, 0, max_width, max_height);
}
void CStreamInfo2::paint_pig (int px, int py, int w, int h)
{
frameBuffer->paintBackgroundBoxRel (px,py, w, h);
printf("CStreamInfo2::paint_pig x %d y %d w %d h %d\n", px, py, w, h);
videoDecoder->Pig(px, py, w, h, frameBuffer->getScreenWidth(true), frameBuffer->getScreenHeight(true));
}
void CStreamInfo2::paint_signal_fe_box(int _x, int _y, int w, int h)
{
int y1;
@@ -425,7 +418,10 @@ void CStreamInfo2::paint (int /*mode*/)
g_Font[font_head]->RenderString (xpos, ypos + hheight + 1, width, head_string, COL_MENUHEAD, 0, true); // UTF-8
ypos += hheight;
paint_pig (width - width/3 - 10, y + 10, width/3, height/3);
if (pip == NULL)
pip = new CComponentsPIP(width-width/3-10, y+10, 30);
pip->paint();
paint_techinfo (xpos, ypos);
paint_signal_fe_box (width - width/3 - 10, (y + 10 + height/3 + hheight), width/3, height/3 + hheight);
} else {