mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 16:01:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

draw glcd icons only, if x-pos > 0

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8d87c42ae7
Author: TangoCash <eric@loxat.de>
Date: 2022-10-31 (Mon, 31 Oct 2022)


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

------------------
This commit was generated by Migit
This commit is contained in:
TangoCash
2022-10-31 07:42:55 +01:00
committed by vanhofen
parent f3b6a71909
commit 7a79137467
2 changed files with 117 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

192
src/driver/glcd/glcd.cpp
View File

@@ -467,96 +467,120 @@ void cGLCD::Exec()
ecmLocked = false; ecmLocked = false;
} }
if (recLocked) { if (t.glcd_icon_rec_x_position)
drawText(t.glcd_icon_rec_x_position, t.glcd_icons_y_position, {
bitmap->Width() - 1, SmalltextWidth, "rec", &font_smalltext, GLCD::cColor::Red, if (recLocked) {
GLCD::cColor::Transparent, true, 0, 0); drawText(t.glcd_icon_rec_x_position, t.glcd_icons_y_position,
} else { bitmap->Width() - 1, SmalltextWidth, "rec", &font_smalltext, GLCD::cColor::Red,
drawText(t.glcd_icon_rec_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "rec", &font_smalltext, GLCD::cColor::Gray,
GLCD::cColor::Transparent, true, 0, 0);
}
if (muteLocked) {
drawText(t.glcd_icon_mute_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "mute", &font_smalltext, GLCD::cColor::Green,
GLCD::cColor::Transparent, true, 0, 0);
} else {
drawText(t.glcd_icon_mute_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "mute", &font_smalltext, GLCD::cColor::Gray,
GLCD::cColor::Transparent, true, 0, 0);
}
if (tsLocked) {
drawText(t.glcd_icon_ts_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "ts", &font_smalltext, GLCD::cColor::Red,
GLCD::cColor::Transparent, true, 0, 0);
} else {
drawText(t.glcd_icon_ts_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "ts", &font_smalltext, GLCD::cColor::Gray,
GLCD::cColor::Transparent, true, 0, 0);
}
if (ecmLocked) {
drawText(t.glcd_icon_ecm_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "ecm", &font_smalltext, GLCD::cColor::Green,
GLCD::cColor::Transparent, true, 0, 0);
} else {
drawText(t.glcd_icon_ecm_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "ecm", &font_smalltext, GLCD::cColor::Gray,
GLCD::cColor::Transparent, true, 0, 0);
}
if (timerLocked) {
drawText(t.glcd_icon_timer_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "timer", &font_smalltext, GLCD::cColor::Green,
GLCD::cColor::Transparent, true, 0, 0);
} else {
drawText(t.glcd_icon_timer_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "timer", &font_smalltext, GLCD::cColor::Gray,
GLCD::cColor::Transparent, true, 0, 0);
}
if (ddLocked) {
drawText(t.glcd_icon_dd_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "dd", &font_smalltext, GLCD::cColor::Green,
GLCD::cColor::Transparent, true, 0, 0);
} else {
drawText(t.glcd_icon_dd_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "dd", &font_smalltext, GLCD::cColor::Gray,
GLCD::cColor::Transparent, true, 0, 0);
}
if (ismediaplayer) {
if (subLocked) {
drawText(t.glcd_icon_txt_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "sub", &font_smalltext, GLCD::cColor::Green,
GLCD::cColor::Transparent, true, 0, 0); GLCD::cColor::Transparent, true, 0, 0);
} else { } else {
drawText(t.glcd_icon_txt_x_position, t.glcd_icons_y_position, drawText(t.glcd_icon_rec_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "sub", &font_smalltext, GLCD::cColor::Gray, bitmap->Width() - 1, SmalltextWidth, "rec", &font_smalltext, GLCD::cColor::Gray,
GLCD::cColor::Transparent, true, 0, 0);
}
} else {
if (txtLocked) {
drawText(t.glcd_icon_txt_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "rt", &font_smalltext, GLCD::cColor::Green,
GLCD::cColor::Transparent, true, 0, 0);
} else {
drawText(t.glcd_icon_txt_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "rt", &font_smalltext, GLCD::cColor::Gray,
GLCD::cColor::Transparent, true, 0, 0); GLCD::cColor::Transparent, true, 0, 0);
} }
} }
if (camLocked) { if (t.glcd_icon_mute_x_position)
drawText(t.glcd_icon_cam_x_position, t.glcd_icons_y_position, {
bitmap->Width() - 1, SmalltextWidth, "cam", &font_smalltext, GLCD::cColor::Green, if (muteLocked) {
GLCD::cColor::Transparent, true, 0, 0); drawText(t.glcd_icon_mute_x_position, t.glcd_icons_y_position,
} else { bitmap->Width() - 1, SmalltextWidth, "mute", &font_smalltext, GLCD::cColor::Green,
drawText(t.glcd_icon_cam_x_position, t.glcd_icons_y_position, GLCD::cColor::Transparent, true, 0, 0);
bitmap->Width() - 1, SmalltextWidth, "cam", &font_smalltext, GLCD::cColor::Gray, } else {
GLCD::cColor::Transparent, true, 0, 0); drawText(t.glcd_icon_mute_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "mute", &font_smalltext, GLCD::cColor::Gray,
GLCD::cColor::Transparent, true, 0, 0);
}
}
if (t.glcd_icon_ts_x_position)
{
if (tsLocked) {
drawText(t.glcd_icon_ts_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "ts", &font_smalltext, GLCD::cColor::Red,
GLCD::cColor::Transparent, true, 0, 0);
} else {
drawText(t.glcd_icon_ts_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "ts", &font_smalltext, GLCD::cColor::Gray,
GLCD::cColor::Transparent, true, 0, 0);
}
}
if (t.glcd_icon_ecm_x_position)
{
if (ecmLocked) {
drawText(t.glcd_icon_ecm_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "ecm", &font_smalltext, GLCD::cColor::Green,
GLCD::cColor::Transparent, true, 0, 0);
} else {
drawText(t.glcd_icon_ecm_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "ecm", &font_smalltext, GLCD::cColor::Gray,
GLCD::cColor::Transparent, true, 0, 0);
}
}
if (t.glcd_icon_timer_x_position)
{
if (timerLocked) {
drawText(t.glcd_icon_timer_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "timer", &font_smalltext, GLCD::cColor::Yellow,
GLCD::cColor::Transparent, true, 0, 0);
} else {
drawText(t.glcd_icon_timer_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "timer", &font_smalltext, GLCD::cColor::Gray,
GLCD::cColor::Transparent, true, 0, 0);
}
}
if (t.glcd_icon_dd_x_position)
{
if (ddLocked) {
drawText(t.glcd_icon_dd_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "dd", &font_smalltext, GLCD::cColor::Green,
GLCD::cColor::Transparent, true, 0, 0);
} else {
drawText(t.glcd_icon_dd_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "dd", &font_smalltext, GLCD::cColor::Gray,
GLCD::cColor::Transparent, true, 0, 0);
}
}
if (t.glcd_icon_txt_x_position)
{
if (ismediaplayer) {
if (subLocked) {
drawText(t.glcd_icon_txt_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "sub", &font_smalltext, GLCD::cColor::Green,
GLCD::cColor::Transparent, true, 0, 0);
} else {
drawText(t.glcd_icon_txt_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "sub", &font_smalltext, GLCD::cColor::Gray,
GLCD::cColor::Transparent, true, 0, 0);
}
} else {
if (txtLocked) {
drawText(t.glcd_icon_txt_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "txt", &font_smalltext, GLCD::cColor::Green,
GLCD::cColor::Transparent, true, 0, 0);
} else {
drawText(t.glcd_icon_txt_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "txt", &font_smalltext, GLCD::cColor::Gray,
GLCD::cColor::Transparent, true, 0, 0);
}
}
}
if (t.glcd_icon_cam_x_position)
{
if (camLocked) {
drawText(t.glcd_icon_cam_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "cam", &font_smalltext, GLCD::cColor::Green,
GLCD::cColor::Transparent, true, 0, 0);
} else {
drawText(t.glcd_icon_cam_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "cam", &font_smalltext, GLCD::cColor::Gray,
GLCD::cColor::Transparent, true, 0, 0);
}
} }
} }

11
src/gui/infoviewer_bb.cpp
View File

@@ -519,7 +519,7 @@ void CInfoViewerBB::showIcon_SubT()
showBBIcons(CInfoViewerBB::ICON_SUBT, (have_sub) ? NEUTRINO_ICON_SUBT : NEUTRINO_ICON_SUBT_GREY); showBBIcons(CInfoViewerBB::ICON_SUBT, (have_sub) ? NEUTRINO_ICON_SUBT : NEUTRINO_ICON_SUBT_GREY);
#ifdef ENABLE_GRAPHLCD #ifdef ENABLE_GRAPHLCD
if (cc && cc->getSubtitleCount()) if (have_sub)
cGLCD::lockIcon(cGLCD::SUB); cGLCD::lockIcon(cGLCD::SUB);
else else
cGLCD::unlockIcon(cGLCD::SUB); cGLCD::unlockIcon(cGLCD::SUB);
@@ -532,7 +532,7 @@ void CInfoViewerBB::showIcon_VTXT()
return; return;
showBBIcons(CInfoViewerBB::ICON_VTXT, (g_RemoteControl->current_PIDs.PIDs.vtxtpid != 0) ? NEUTRINO_ICON_VTXT : NEUTRINO_ICON_VTXT_GREY); showBBIcons(CInfoViewerBB::ICON_VTXT, (g_RemoteControl->current_PIDs.PIDs.vtxtpid != 0) ? NEUTRINO_ICON_VTXT : NEUTRINO_ICON_VTXT_GREY);
#ifdef ENABLE_GRAPHLCD #ifdef ENABLE_GRAPHLCD
if (g_RemoteControl->current_PIDs.PIDs.vtxtpid) if (g_RemoteControl->current_PIDs.PIDs.vtxtpid != 0)
cGLCD::lockIcon(cGLCD::TXT); cGLCD::lockIcon(cGLCD::TXT);
else else
cGLCD::unlockIcon(cGLCD::TXT); cGLCD::unlockIcon(cGLCD::TXT);
@@ -878,6 +878,13 @@ void CInfoViewerBB::paint_ca_icons(int notfirst)
return; return;
} }
#ifdef ENABLE_GRAPHLCD
if (fta)
cGLCD::unlockIcon(cGLCD::CAM);
else
cGLCD::lockIcon(cGLCD::CAM);
#endif
if(!notfirst) { if(!notfirst) {
//NI - check ecm.info //NI - check ecm.info
acaid = check_ecmInfo(); acaid = check_ecmInfo();