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

show position in pipsetup

Browse Source
This commit is contained in:
TangoCash
2022-11-19 11:23:17 +01:00
committed by Thilo Graf
parent 2d700ecf0a
commit f8ef87bcca
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/gui/pipsetup.cpp
View File

@@ -40,11 +40,13 @@ CPipSetup::CPipSetup()
gw = &g_settings.pip_width; gw = &g_settings.pip_width;
gh = &g_settings.pip_height; gh = &g_settings.pip_height;
} }
gp = &g_settings.pip_rotate_lastpos;
x_coord = *gx; x_coord = *gx;
y_coord = *gy; y_coord = *gy;
width = *gw; width = *gw;
height = *gh; height = *gh;
pos = *gp;
maxw = frameBuffer->getScreenWidth(true); maxw = frameBuffer->getScreenWidth(true);
maxh = frameBuffer->getScreenHeight(true); maxh = frameBuffer->getScreenHeight(true);
@@ -87,11 +89,13 @@ void CPipSetup::move(int x, int y, bool abs)
void CPipSetup::rotate(int cw) void CPipSetup::rotate(int cw)
{ {
g_settings.pip_rotate_lastpos += cw; pos += cw;
if (g_settings.pip_rotate_lastpos < PIP_UP_LEFT) if (pos < PIP_UP_LEFT)
g_settings.pip_rotate_lastpos = PIP_DOWN_LEFT; pos = PIP_DOWN_LEFT;
if (g_settings.pip_rotate_lastpos > PIP_DOWN_LEFT) if (pos > PIP_DOWN_LEFT)
g_settings.pip_rotate_lastpos = PIP_UP_LEFT; pos = PIP_UP_LEFT;
*gp = pos;
printf("CPipSetup::rotate: x %d y %d\n", CNeutrinoApp::getInstance()->pip_recalc_pos_x(x_coord), CNeutrinoApp::getInstance()->pip_recalc_pos_y(y_coord)); printf("CPipSetup::rotate: x %d y %d\n", CNeutrinoApp::getInstance()->pip_recalc_pos_x(x_coord), CNeutrinoApp::getInstance()->pip_recalc_pos_y(y_coord));
if (pipVideoDecoder[0] != NULL) if (pipVideoDecoder[0] != NULL)
@@ -245,17 +249,19 @@ void CPipSetup::paint()
char ypos[30]; char ypos[30];
char wpos[30]; char wpos[30];
char hpos[30]; char hpos[30];
char ppos[30];
sprintf(xpos, "X: %d", x_coord); sprintf(xpos, "X: %d", x_coord);
sprintf(ypos, "Y: %d", y_coord); sprintf(ypos, "Y: %d", y_coord);
sprintf(wpos, "W: %d", width); sprintf(wpos, "W: %d", width);
sprintf(hpos, "H: %d", height); sprintf(hpos, "H: %d", height);
sprintf(ppos, "P: %d", pos);
int mheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight(); int mheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight();
int mwidth = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getRenderWidth("W: 9999"); int mwidth = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getRenderWidth("W: 9999");
int w = mwidth + 2 * OFFSET_INNER_MID; int w = mwidth + 2 * OFFSET_INNER_MID;
int h = mheight * 4; int h = mheight * 5;
int x = (frameBuffer->getScreenWidth() - w) / 2; int x = (frameBuffer->getScreenWidth() - w) / 2;
int y = (frameBuffer->getScreenHeight() - h) / 2; int y = (frameBuffer->getScreenHeight() - h) / 2;
@@ -271,6 +277,7 @@ void CPipSetup::paint()
g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x + OFFSET_INNER_MID, y + mheight * 2, mwidth, ypos, COL_MENUCONTENT_TEXT); g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x + OFFSET_INNER_MID, y + mheight * 2, mwidth, ypos, COL_MENUCONTENT_TEXT);
g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x + OFFSET_INNER_MID, y + mheight * 3, mwidth, wpos, COL_MENUCONTENT_TEXT); g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x + OFFSET_INNER_MID, y + mheight * 3, mwidth, wpos, COL_MENUCONTENT_TEXT);
g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x + OFFSET_INNER_MID, y + mheight * 4, mwidth, hpos, COL_MENUCONTENT_TEXT); g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x + OFFSET_INNER_MID, y + mheight * 4, mwidth, hpos, COL_MENUCONTENT_TEXT);
g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x + OFFSET_INNER_MID, y + mheight * 5, mwidth, ppos, COL_MENUCONTENT_TEXT);
} }
#endif //#if ENABLE_PIP #endif //#if ENABLE_PIP

3
src/gui/pipsetup.h
View File

@@ -13,12 +13,13 @@ class CPipSetup : public CMenuTarget
int y_coord; int y_coord;
int width; int width;
int height; int height;
int pos;
int maxw; int maxw;
int maxh; int maxh;
int minw; int minw;
int minh; int minh;
int *gx, *gy, *gw, *gh; int *gx, *gy, *gw, *gh, *gp;
void paint(); void paint();
void hide(); void hide();
void clear(); void clear();