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

tuxtxt: remove unused 16:9 menu setting

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@987 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
seife
2011-01-01 14:02:24 +00:00
parent 7303c1c4dd
commit f7ad0e3d2c
2 changed files with 4 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/libtuxtxt/tuxtxt.cpp
View File

@@ -1918,7 +1918,6 @@ int Init()
/* config defaults */ /* config defaults */
screenmode = 0; screenmode = 0;
screen_mode1 = 0; screen_mode1 = 0;
screen_mode2 = 0;
color_mode = 10; color_mode = 10;
trans_mode = 10; trans_mode = 10;
menulanguage = 1; /* english */ menulanguage = 1; /* english */
@@ -1953,8 +1952,6 @@ int Init()
if (1 == sscanf(line, "ScreenMode16x9Normal %i", &ival)) if (1 == sscanf(line, "ScreenMode16x9Normal %i", &ival))
screen_mode1 = ival & 1; screen_mode1 = ival & 1;
else if (1 == sscanf(line, "ScreenMode16x9Divided %i", &ival))
screen_mode2 = ival & 1;
else if (1 == sscanf(line, "Brightness %i", &ival)) else if (1 == sscanf(line, "Brightness %i", &ival))
color_mode = ival; color_mode = ival;
else if (1 == sscanf(line, "AutoNational %i", &ival)) else if (1 == sscanf(line, "AutoNational %i", &ival))
@@ -2252,7 +2249,6 @@ void CleanUp()
{ {
printf("TuxTxt <saving config>\n"); printf("TuxTxt <saving config>\n");
fprintf(conf, "ScreenMode16x9Normal %d\n", screen_mode1); fprintf(conf, "ScreenMode16x9Normal %d\n", screen_mode1);
fprintf(conf, "ScreenMode16x9Divided %d\n", screen_mode2);
fprintf(conf, "Brightness %d\n", color_mode); fprintf(conf, "Brightness %d\n", color_mode);
fprintf(conf, "MenuLanguage %d\n", menulanguage); fprintf(conf, "MenuLanguage %d\n", menulanguage);
fprintf(conf, "AutoNational %d\n", auto_national); fprintf(conf, "AutoNational %d\n", auto_national);
@@ -2737,7 +2733,6 @@ void Menu_Init(char *menu, int current_pid, int menuitem, int hotindex)
/* set 16:9 modi, colors & national subset */ /* set 16:9 modi, colors & national subset */
memcpy(&menu[Menu_Width*MenuLine[M_SC1] + Menu_Width - 5], &configonoff[menulanguage][screen_mode1 ? 3 : 0], 3); memcpy(&menu[Menu_Width*MenuLine[M_SC1] + Menu_Width - 5], &configonoff[menulanguage][screen_mode1 ? 3 : 0], 3);
memcpy(&menu[Menu_Width*MenuLine[M_SC2] + Menu_Width - 5], &configonoff[menulanguage][screen_mode2 ? 3 : 0], 3);
menu[MenuLine[M_COL]*Menu_Width + 1] = (color_mode == 1 ? ' ' : '<EFBFBD>'); menu[MenuLine[M_COL]*Menu_Width + 1] = (color_mode == 1 ? ' ' : '<EFBFBD>');
menu[MenuLine[M_COL]*Menu_Width + 28] = (color_mode == 24 ? ' ' : '<EFBFBD>'); menu[MenuLine[M_COL]*Menu_Width + 28] = (color_mode == 24 ? ' ' : '<EFBFBD>');
@@ -3335,16 +3330,6 @@ void ConfigMenu(int Init)
break; break;
case M_SC2:
saveconfig = 1;
screen_mode2++;
screen_mode2 &= 1;
memcpy(&menu[Menu_Width*MenuLine[M_SC2] + Menu_Width - 5], &configonoff[menulanguage][screen_mode2 ? 3 : 0], 3);
Menu_HighlightLine(menu, MenuLine[menuitem], 1);
break;
case M_AUN: case M_AUN:
saveconfig = 1; saveconfig = 1;
auto_national++; auto_national++;

21
lib/libtuxtxt/tuxtxt.h
View File

@@ -557,7 +557,7 @@ int zoommode, screenmode, transpmode, hintmode, boxed, nofirst, savedscreenmode,
char dumpl25; char dumpl25;
int catch_row, catch_col, catched_page, pagecatching; int catch_row, catch_col, catched_page, pagecatching;
int prev_100, prev_10, next_10, next_100; int prev_100, prev_10, next_10, next_100;
int screen_mode1, screen_mode2, color_mode, trans_mode, national_subset, national_subset_secondary, auto_national, swapupdown, showhex, menulanguage; int screen_mode1, color_mode, trans_mode, national_subset, national_subset_secondary, auto_national, swapupdown, showhex, menulanguage;
int pids_found, current_service, getpidsdone; int pids_found, current_service, getpidsdone;
int SDT_ready; int SDT_ready;
int pc_old_row, pc_old_col; /* for page catching */ int pc_old_row, pc_old_col; /* for page catching */
@@ -600,13 +600,13 @@ unsigned char restoreaudio = 0;
const int menusubset[] = { NAT_DE , NAT_UK , NAT_FR , NAT_UK , NAT_GR , NAT_IT , NAT_PL , NAT_SW , NAT_SW , NAT_SP, NAT_RB};//FIXME const int menusubset[] = { NAT_DE , NAT_UK , NAT_FR , NAT_UK , NAT_GR , NAT_IT , NAT_PL , NAT_SW , NAT_SW , NAT_SP, NAT_RB};//FIXME
#define Menu_StartX (StartX + fontwidth*9/2) #define Menu_StartX (StartX + fontwidth*9/2)
#define Menu_StartY (StartY + fontheight) #define Menu_StartY (StartY + (25 - Menu_Height) * fontheight / 2)
#define Menu_Height 24 #define Menu_Height 23
#define Menu_Width 31 #define Menu_Width 31
const char MenuLine[] = const char MenuLine[] =
{ {
3,8,11,12,15,17,19,20,21 3,8,11,14,16,18,19,20
}; };
enum enum
@@ -614,7 +614,6 @@ enum
M_HOT=0, M_HOT=0,
M_PID, M_PID,
M_SC1, M_SC1,
M_SC2,
M_COL, M_COL,
M_TRA, M_TRA,
M_AUN, M_AUN,
@@ -677,7 +676,6 @@ const char menuatr[Menu_Height*(Menu_Width+1)] =
"3333333333333333333333333333332" "3333333333333333333333333333332"
"3444444444444444444444444444432" "3444444444444444444444444444432"
"3155555555555555555555555555532" "3155555555555555555555555555532"
"3155555555555555555555555555532"
"3333333333333333333333333333332" "3333333333333333333333333333332"
"3144444444444444444444444444432" "3144444444444444444444444444432"
"3555555555555555555555555555532" "3555555555555555555555555555532"
@@ -706,7 +704,6 @@ const char configmenu[][Menu_Height*(Menu_Width+1)] =
"<EFBFBD> <20><>" "<EFBFBD> <20><>"
"<EFBFBD> Bildschirmformat <20><>" "<EFBFBD> Bildschirmformat <20><>"
"<EFBFBD>3 Standard-Modus 16:9 <20><>" "<EFBFBD>3 Standard-Modus 16:9 <20><>"
"<EFBFBD>4 TextBild-Modus 16:9 <20><>"
"<EFBFBD> <20><>" "<EFBFBD> <20><>"
"<EFBFBD>5 Helligkeit <20><>" "<EFBFBD>5 Helligkeit <20><>"
"<EFBFBD><EFBFBD> <20><><EFBFBD>" "<EFBFBD><EFBFBD> <20><><EFBFBD>"
@@ -734,7 +731,6 @@ const char configmenu[][Menu_Height*(Menu_Width+1)] =
"<EFBFBD> <20><>" "<EFBFBD> <20><>"
"<EFBFBD> Screen format <20><>" "<EFBFBD> Screen format <20><>"
"<EFBFBD>3 Standard mode 16:9 <20><>" "<EFBFBD>3 Standard mode 16:9 <20><>"
"<EFBFBD>4 Text/TV mode 16:9 <20><>"
"<EFBFBD> <20><>" "<EFBFBD> <20><>"
"<EFBFBD>5 Brightness <20><>" "<EFBFBD>5 Brightness <20><>"
"<EFBFBD><EFBFBD> <20><><EFBFBD>" "<EFBFBD><EFBFBD> <20><><EFBFBD>"
@@ -762,7 +758,6 @@ const char configmenu[][Menu_Height*(Menu_Width+1)] =
"<EFBFBD> <20><>" "<EFBFBD> <20><>"
"<EFBFBD> Format de l'#cran <20><>" "<EFBFBD> Format de l'#cran <20><>"
"<EFBFBD>3 Mode standard 16:9 <20><>" "<EFBFBD>3 Mode standard 16:9 <20><>"
"<EFBFBD>4 Texte/TV 16:9 <20><>"
"<EFBFBD> <20><>" "<EFBFBD> <20><>"
"<EFBFBD>5 Clarte <20><>" "<EFBFBD>5 Clarte <20><>"
"<EFBFBD><EFBFBD> <20><><EFBFBD>" "<EFBFBD><EFBFBD> <20><><EFBFBD>"
@@ -790,7 +785,6 @@ const char configmenu[][Menu_Height*(Menu_Width+1)] =
"<EFBFBD> <20><>" "<EFBFBD> <20><>"
"<EFBFBD> Beeldschermformaat <20><>" "<EFBFBD> Beeldschermformaat <20><>"
"<EFBFBD>3 Standaardmode 16:9 <20><>" "<EFBFBD>3 Standaardmode 16:9 <20><>"
"<EFBFBD>4 Tekst/TV mode 16:9 <20><>"
"<EFBFBD> <20><>" "<EFBFBD> <20><>"
"<EFBFBD>5 Helderheid <20><>" "<EFBFBD>5 Helderheid <20><>"
"<EFBFBD><EFBFBD> <20><><EFBFBD>" "<EFBFBD><EFBFBD> <20><><EFBFBD>"
@@ -818,7 +812,6 @@ const char configmenu[][Menu_Height*(Menu_Width+1)] =
"<EFBFBD> <20><>" "<EFBFBD> <20><>"
"<EFBFBD> Loqv^ oh|mgr <20><>" "<EFBFBD> Loqv^ oh|mgr <20><>"
"<EFBFBD>3 Tq|por pq|tupor 16:9 <20><>" "<EFBFBD>3 Tq|por pq|tupor 16:9 <20><>"
"<EFBFBD>4 Tq|por eij. jeil. 16:9 <20><>"
"<EFBFBD> <20><>" "<EFBFBD> <20><>"
"<EFBFBD>5 Kalpq|tgta <20><>" "<EFBFBD>5 Kalpq|tgta <20><>"
"<EFBFBD><EFBFBD> <20><><EFBFBD>" "<EFBFBD><EFBFBD> <20><><EFBFBD>"
@@ -846,7 +839,6 @@ const char configmenu[][Menu_Height*(Menu_Width+1)] =
"<EFBFBD> <20><>" "<EFBFBD> <20><>"
"<EFBFBD> Formato schermo <20><>" "<EFBFBD> Formato schermo <20><>"
"<EFBFBD>3 Modo standard 16:9 <20><>" "<EFBFBD>3 Modo standard 16:9 <20><>"
"<EFBFBD>4 Text/Mod.TV 16:9 <20><>"
"<EFBFBD> <20><>" "<EFBFBD> <20><>"
"<EFBFBD>5 Luminosit{ <20><>" "<EFBFBD>5 Luminosit{ <20><>"
"<EFBFBD><EFBFBD> <20><><EFBFBD>" "<EFBFBD><EFBFBD> <20><><EFBFBD>"
@@ -874,7 +866,6 @@ const char configmenu[][Menu_Height*(Menu_Width+1)] =
"<EFBFBD> <20><>" "<EFBFBD> <20><>"
"<EFBFBD> Format obrazu <20><>" "<EFBFBD> Format obrazu <20><>"
"<EFBFBD>3 Tryb standard 16:9 <20><>" "<EFBFBD>3 Tryb standard 16:9 <20><>"
"<EFBFBD>4 Telegazeta/TV 16:9 <20><>"
"<EFBFBD> <20><>" "<EFBFBD> <20><>"
"<EFBFBD>5 Jasno|^ <20><>" "<EFBFBD>5 Jasno|^ <20><>"
"<EFBFBD><EFBFBD> <20><><EFBFBD>" "<EFBFBD><EFBFBD> <20><><EFBFBD>"
@@ -902,7 +893,6 @@ const char configmenu[][Menu_Height*(Menu_Width+1)] =
"<EFBFBD> <20><>" "<EFBFBD> <20><>"
"<EFBFBD> TV- format <20><>" "<EFBFBD> TV- format <20><>"
"<EFBFBD>3 Standard l{ge 16:9 <20><>" "<EFBFBD>3 Standard l{ge 16:9 <20><>"
"<EFBFBD>4 Text/Bild l{ge 16:9 <20><>"
"<EFBFBD> <20><>" "<EFBFBD> <20><>"
"<EFBFBD>5 Ljusstyrka <20><>" "<EFBFBD>5 Ljusstyrka <20><>"
"<EFBFBD><EFBFBD> <20><><EFBFBD>" "<EFBFBD><EFBFBD> <20><><EFBFBD>"
@@ -930,7 +920,6 @@ const char configmenu[][Menu_Height*(Menu_Width+1)] =
"<EFBFBD> <20><>" "<EFBFBD> <20><>"
"<EFBFBD> N{ytt|tila <20><>" "<EFBFBD> N{ytt|tila <20><>"
"<EFBFBD>3 Vakiotila 16:9 <20><>" "<EFBFBD>3 Vakiotila 16:9 <20><>"
"<EFBFBD>4 Teksti/TV 16:9 <20><>"
"<EFBFBD> <20><>" "<EFBFBD> <20><>"
"<EFBFBD>5 Kirkkaus <20><>" "<EFBFBD>5 Kirkkaus <20><>"
"<EFBFBD><EFBFBD> <20><><EFBFBD>" "<EFBFBD><EFBFBD> <20><><EFBFBD>"
@@ -958,7 +947,6 @@ const char configmenu[][Menu_Height*(Menu_Width+1)] =
"<EFBFBD> <20><>" "<EFBFBD> <20><>"
"<EFBFBD> formato ecran <20><>" "<EFBFBD> formato ecran <20><>"
"<EFBFBD>3 Standard mode 16:9 <20><>" "<EFBFBD>3 Standard mode 16:9 <20><>"
"<EFBFBD>4 Text/TV mode 16:9 <20><>"
"<EFBFBD> <20><>" "<EFBFBD> <20><>"
"<EFBFBD>5 Brilho <20><>" "<EFBFBD>5 Brilho <20><>"
"<EFBFBD><EFBFBD> <20><><EFBFBD>" "<EFBFBD><EFBFBD> <20><><EFBFBD>"
@@ -986,7 +974,6 @@ const char configmenu[][Menu_Height*(Menu_Width+1)] =
"<EFBFBD> <20><>" "<EFBFBD> <20><>"
"<EFBFBD> Format kartinki <20><>" "<EFBFBD> Format kartinki <20><>"
"<EFBFBD>3 Stand. revim 16:9 <20><>" "<EFBFBD>3 Stand. revim 16:9 <20><>"
"<EFBFBD>4 Tekst/TW rev. 16:9 <20><>"
"<EFBFBD> <20><>" "<EFBFBD> <20><>"
"<EFBFBD>5 Qrkostx <20><>" "<EFBFBD>5 Qrkostx <20><>"
"<EFBFBD><EFBFBD> <20><><EFBFBD>" "<EFBFBD><EFBFBD> <20><><EFBFBD>"