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

glcd: use global font setting as fallback

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: d7027230ce
Author: vanhofen <vanhofen@gmx.de>
Date: 2020-06-21 (Sun, 21 Jun 2020)

Origin message was:
------------------
- glcd: use global font setting as fallback

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2020-06-21 22:04:47 +02:00
parent 4f4cc1656d
commit 255b1ec2e0
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -575,21 +575,21 @@ void cGLCD::updateFonts()
if (!fonts_initialized || (fontsize_channel_new != fontsize_channel)) { if (!fonts_initialized || (fontsize_channel_new != fontsize_channel)) {
fontsize_channel = fontsize_channel_new; fontsize_channel = fontsize_channel_new;
if (!font_channel.LoadFT2(t.glcd_font, "UTF-8", fontsize_channel)) { if (!font_channel.LoadFT2(t.glcd_font, "UTF-8", fontsize_channel)) {
t.glcd_font = FONTDIR "/neutrino.ttf"; t.glcd_font = g_settings.font_file;
font_channel.LoadFT2(t.glcd_font, "UTF-8", fontsize_channel); font_channel.LoadFT2(t.glcd_font, "UTF-8", fontsize_channel);
} }
} }
if (!fonts_initialized || (fontsize_epg_new != fontsize_epg)) { if (!fonts_initialized || (fontsize_epg_new != fontsize_epg)) {
fontsize_epg = fontsize_epg_new; fontsize_epg = fontsize_epg_new;
if (!font_epg.LoadFT2(t.glcd_font, "UTF-8", fontsize_epg)) { if (!font_epg.LoadFT2(t.glcd_font, "UTF-8", fontsize_epg)) {
t.glcd_font = FONTDIR "/neutrino.ttf"; t.glcd_font = g_settings.font_file;
font_epg.LoadFT2(t.glcd_font, "UTF-8", fontsize_epg); font_epg.LoadFT2(t.glcd_font, "UTF-8", fontsize_epg);
} }
} }
if (!fonts_initialized || (fontsize_time_new != fontsize_time)) { if (!fonts_initialized || (fontsize_time_new != fontsize_time)) {
fontsize_time = fontsize_time_new; fontsize_time = fontsize_time_new;
if (!font_time.LoadFT2(t.glcd_font, "UTF-8", fontsize_time)) { if (!font_time.LoadFT2(t.glcd_font, "UTF-8", fontsize_time)) {
t.glcd_font = FONTDIR "/neutrino.ttf"; t.glcd_font = g_settings.font_file;
font_time.LoadFT2(t.glcd_font, "UTF-8", fontsize_time); font_time.LoadFT2(t.glcd_font, "UTF-8", fontsize_time);
} }
} }
@@ -597,7 +597,7 @@ void cGLCD::updateFonts()
if (!fonts_initialized || (fontsize_duration_new != fontsize_duration)) { if (!fonts_initialized || (fontsize_duration_new != fontsize_duration)) {
fontsize_duration = fontsize_duration_new; fontsize_duration = fontsize_duration_new;
if (!font_duration.LoadFT2(t.glcd_font, "UTF-8", fontsize_duration)) { if (!font_duration.LoadFT2(t.glcd_font, "UTF-8", fontsize_duration)) {
t.glcd_font = FONTDIR "/neutrino.ttf"; t.glcd_font = g_settings.font_file;
font_duration.LoadFT2(t.glcd_font, "UTF-8", fontsize_duration); font_duration.LoadFT2(t.glcd_font, "UTF-8", fontsize_duration);
} }
} }
@@ -605,7 +605,7 @@ void cGLCD::updateFonts()
if (!fonts_initialized || (fontsize_start_new != fontsize_start)) { if (!fonts_initialized || (fontsize_start_new != fontsize_start)) {
fontsize_start = fontsize_start_new; fontsize_start = fontsize_start_new;
if (!font_start.LoadFT2(t.glcd_font, "UTF-8", fontsize_start)) { if (!font_start.LoadFT2(t.glcd_font, "UTF-8", fontsize_start)) {
t.glcd_font = FONTDIR "/neutrino.ttf"; t.glcd_font = g_settings.font_file;
font_start.LoadFT2(t.glcd_font, "UTF-8", fontsize_start); font_start.LoadFT2(t.glcd_font, "UTF-8", fontsize_start);
} }
} }
@@ -613,7 +613,7 @@ void cGLCD::updateFonts()
if (!fonts_initialized || (fontsize_end_new != fontsize_end)) { if (!fonts_initialized || (fontsize_end_new != fontsize_end)) {
fontsize_end = fontsize_end_new; fontsize_end = fontsize_end_new;
if (!font_end.LoadFT2(t.glcd_font, "UTF-8", fontsize_end)) { if (!font_end.LoadFT2(t.glcd_font, "UTF-8", fontsize_end)) {
t.glcd_font = FONTDIR "/neutrino.ttf"; t.glcd_font = g_settings.font_file;
font_end.LoadFT2(t.glcd_font, "UTF-8", fontsize_end); font_end.LoadFT2(t.glcd_font, "UTF-8", fontsize_end);
} }
} }
@@ -621,7 +621,7 @@ void cGLCD::updateFonts()
if (!fonts_initialized || (fontsize_smalltext_new != fontsize_smalltext)) { if (!fonts_initialized || (fontsize_smalltext_new != fontsize_smalltext)) {
fontsize_smalltext = fontsize_smalltext_new; fontsize_smalltext = fontsize_smalltext_new;
if (!font_smalltext.LoadFT2(FONTDIR "/oled/terminator.ttf", "UTF-8", fontsize_smalltext)) { if (!font_smalltext.LoadFT2(FONTDIR "/oled/terminator.ttf", "UTF-8", fontsize_smalltext)) {
t.glcd_font = FONTDIR "/neutrino.ttf"; t.glcd_font = g_settings.font_file;
font_smalltext.LoadFT2(t.glcd_font, "UTF-8", fontsize_smalltext); font_smalltext.LoadFT2(t.glcd_font, "UTF-8", fontsize_smalltext);
} }
} }