mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 07:23:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

- glcd: uppercase status markers

Browse Source 
Conflicts:
	src/driver/glcd/glcd.cpp
This commit is contained in:
vanhofen
2022-11-26 21:03:56 +01:00
committed by Thilo Graf
parent 6099c396c7
commit cd9af1f2f4
1 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -467,66 +467,73 @@ void cGLCD::Exec()
ecmLocked = false; ecmLocked = false;
} }
std::string smalltext;
if (t.glcd_icon_rec_x_position) if (t.glcd_icon_rec_x_position)
{ {
smalltext = "REC";
if (recLocked) { if (recLocked) {
drawText(t.glcd_icon_rec_x_position, t.glcd_icons_y_position, drawText(t.glcd_icon_rec_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "rec", &font_smalltext, GLCD::cColor::Red, bitmap->Width() - 1, SmalltextWidth, smalltext, &font_smalltext, GLCD::cColor::Red,
GLCD::cColor::Transparent, true, 0, 0); GLCD::cColor::Transparent, true, 0, 0);
} else { } else {
drawText(t.glcd_icon_rec_x_position, t.glcd_icons_y_position, drawText(t.glcd_icon_rec_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "rec", &font_smalltext, GLCD::cColor::Gray, bitmap->Width() - 1, SmalltextWidth, smalltext, &font_smalltext, GLCD::cColor::Gray,
GLCD::cColor::Transparent, true, 0, 0); GLCD::cColor::Transparent, true, 0, 0);
} }
} }
if (t.glcd_icon_mute_x_position) if (t.glcd_icon_mute_x_position)
{ {
smalltext = "MUTE";
if (muteLocked) { if (muteLocked) {
drawText(t.glcd_icon_mute_x_position, t.glcd_icons_y_position, drawText(t.glcd_icon_mute_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "mute", &font_smalltext, GLCD::cColor::Green, bitmap->Width() - 1, SmalltextWidth, smalltext, &font_smalltext, GLCD::cColor::Red,
GLCD::cColor::Transparent, true, 0, 0); GLCD::cColor::Transparent, true, 0, 0);
} else { } else {
drawText(t.glcd_icon_mute_x_position, t.glcd_icons_y_position, drawText(t.glcd_icon_mute_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "mute", &font_smalltext, GLCD::cColor::Gray, bitmap->Width() - 1, SmalltextWidth, smalltext, &font_smalltext, GLCD::cColor::Gray,
GLCD::cColor::Transparent, true, 0, 0); GLCD::cColor::Transparent, true, 0, 0);
} }
} }
if (t.glcd_icon_ts_x_position) if (t.glcd_icon_ts_x_position)
{ {
smalltext = "TS";
if (tsLocked) { if (tsLocked) {
drawText(t.glcd_icon_ts_x_position, t.glcd_icons_y_position, drawText(t.glcd_icon_ts_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "ts", &font_smalltext, GLCD::cColor::Red, bitmap->Width() - 1, SmalltextWidth, smalltext, &font_smalltext, GLCD::cColor::Yellow,
GLCD::cColor::Transparent, true, 0, 0); GLCD::cColor::Transparent, true, 0, 0);
} else { } else {
drawText(t.glcd_icon_ts_x_position, t.glcd_icons_y_position, drawText(t.glcd_icon_ts_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "ts", &font_smalltext, GLCD::cColor::Gray, bitmap->Width() - 1, SmalltextWidth, smalltext, &font_smalltext, GLCD::cColor::Gray,
GLCD::cColor::Transparent, true, 0, 0); GLCD::cColor::Transparent, true, 0, 0);
} }
} }
if (t.glcd_icon_timer_x_position) if (t.glcd_icon_timer_x_position)
{ {
smalltext = "TIMER";
if (timerLocked) { if (timerLocked) {
drawText(t.glcd_icon_timer_x_position, t.glcd_icons_y_position, drawText(t.glcd_icon_timer_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "timer", &font_smalltext, GLCD::cColor::Yellow, bitmap->Width() - 1, SmalltextWidth, smalltext, &font_smalltext, GLCD::cColor::Yellow,
GLCD::cColor::Transparent, true, 0, 0); GLCD::cColor::Transparent, true, 0, 0);
} else { } else {
drawText(t.glcd_icon_timer_x_position, t.glcd_icons_y_position, drawText(t.glcd_icon_timer_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "timer", &font_smalltext, GLCD::cColor::Gray, bitmap->Width() - 1, SmalltextWidth, smalltext, &font_smalltext, GLCD::cColor::Gray,
GLCD::cColor::Transparent, true, 0, 0); GLCD::cColor::Transparent, true, 0, 0);
} }
} }
if (t.glcd_icon_dd_x_position) if (t.glcd_icon_dd_x_position)
{ {
smalltext = "DD";
if (ddLocked) { if (ddLocked) {
drawText(t.glcd_icon_dd_x_position, t.glcd_icons_y_position, drawText(t.glcd_icon_dd_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "dd", &font_smalltext, GLCD::cColor::Green, bitmap->Width() - 1, SmalltextWidth, smalltext, &font_smalltext, GLCD::cColor::Green,
GLCD::cColor::Transparent, true, 0, 0); GLCD::cColor::Transparent, true, 0, 0);
} else { } else {
drawText(t.glcd_icon_dd_x_position, t.glcd_icons_y_position, drawText(t.glcd_icon_dd_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "dd", &font_smalltext, GLCD::cColor::Gray, bitmap->Width() - 1, SmalltextWidth, smalltext, &font_smalltext, GLCD::cColor::Gray,
GLCD::cColor::Transparent, true, 0, 0); GLCD::cColor::Transparent, true, 0, 0);
} }
} }
@@ -534,23 +541,25 @@ void cGLCD::Exec()
if (t.glcd_icon_txt_x_position) if (t.glcd_icon_txt_x_position)
{ {
if (ismediaplayer) { if (ismediaplayer) {
smalltext = "SUB";
if (subLocked) { if (subLocked) {
drawText(t.glcd_icon_txt_x_position, t.glcd_icons_y_position, drawText(t.glcd_icon_txt_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "sub", &font_smalltext, GLCD::cColor::Green, bitmap->Width() - 1, SmalltextWidth, smalltext, &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_txt_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "sub", &font_smalltext, GLCD::cColor::Gray, bitmap->Width() - 1, SmalltextWidth, smalltext, &font_smalltext, GLCD::cColor::Gray,
GLCD::cColor::Transparent, true, 0, 0); GLCD::cColor::Transparent, true, 0, 0);
} }
} else { } else {
smalltext = "TXT";
if (txtLocked) { if (txtLocked) {
drawText(t.glcd_icon_txt_x_position, t.glcd_icons_y_position, drawText(t.glcd_icon_txt_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "txt", &font_smalltext, GLCD::cColor::Green, bitmap->Width() - 1, SmalltextWidth, smalltext, &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_txt_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "txt", &font_smalltext, GLCD::cColor::Gray, bitmap->Width() - 1, SmalltextWidth, smalltext, &font_smalltext, GLCD::cColor::Gray,
GLCD::cColor::Transparent, true, 0, 0); GLCD::cColor::Transparent, true, 0, 0);
} }
} }
@@ -558,13 +567,14 @@ void cGLCD::Exec()
if (t.glcd_icon_cam_x_position) if (t.glcd_icon_cam_x_position)
{ {
smalltext = "CAM";
if (camLocked) { if (camLocked) {
drawText(t.glcd_icon_cam_x_position, t.glcd_icons_y_position, drawText(t.glcd_icon_cam_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "cam", &font_smalltext, GLCD::cColor::Green, bitmap->Width() - 1, SmalltextWidth, smalltext, &font_smalltext, GLCD::cColor::Green,
GLCD::cColor::Transparent, true, 0, 0); GLCD::cColor::Transparent, true, 0, 0);
} else { } else {
drawText(t.glcd_icon_cam_x_position, t.glcd_icons_y_position, drawText(t.glcd_icon_cam_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "cam", &font_smalltext, GLCD::cColor::Gray, bitmap->Width() - 1, SmalltextWidth, smalltext, &font_smalltext, GLCD::cColor::Gray,
GLCD::cColor::Transparent, true, 0, 0); GLCD::cColor::Transparent, true, 0, 0);
} }
} }