- upgrade to v1.12 (thx to snowhead)

diff --git a/msgbox.c b/msgbox.c
index a9370e7894606adcde1cbac7fe4dac2d5b30763b..1b3c52cc6aea83674a00d974625ea6f61fe7d31a 100644 (file)
--- a/msgbox.c
+++ b/msgbox.c
@@ -8,7 +8,7 @@
 #include "gfx.h"
 #include "txtform.h" 
 
-#define M_VERSION 1.11
+#define M_VERSION 1.12
 
 #define NCF_FILE       "/var/tuxbox/config/neutrino.conf"
 #define HDF_FILE       "/tmp/.msgbox_hidden"
@@ -21,19 +21,21 @@
 //                                        CMCST,   CMCS,  CMCT,    CMC,    CMCIT,  CMCI,   CMHT,   CMH
 //                                        WHITE,   BLUE0, TRANSP,  CMS,    ORANGE, GREEN,  YELLOW, RED
 
-unsigned char bl[] = {0x00,    0x00,   0xFF,   0x80,   0xFF,   0x80,   0x00,   0x80,
-                                         0xFF,         0xFF,   0x00,   0xFF,   0x00,   0x00,   0x00,   0x00};
-unsigned char gn[] = {0x00,    0x00,   0xFF,   0x00,   0xFF,   0x00,   0xC0,   0x00,
-                                         0xFF,         0x80,   0x00,   0x80,   0xC0,   0xFF,   0xFF,   0x00};
-unsigned char rd[] = {0x00,    0x00,   0xFF,   0x00,   0xFF,   0x00,   0xFF,   0x00,
-                                         0xFF,         0x00,   0x00,   0x00,   0xFF,   0x00,   0xFF,   0xFF};
-unsigned char tr[] = {0xFF,    0xFF,   0xFF,   0xA0,   0xFF,   0xA0,   0xFF,   0xFF,
-                                         0xFF,         0xFF,   0x00,   0xFF,   0xFF,   0xFF,   0xFF,   0xFF };
+unsigned char bl[] = { 0x00,   0x00,   0xFF,   0x80,   0xFF,   0x80,   0x00,   0x80,
+                                               0xFF,   0xFF,   0x00,   0xFF,   0x00,   0x00,   0x00,   0x00};
+unsigned char gn[] = { 0x00,   0x00,   0xFF,   0x00,   0xFF,   0x00,   0xC0,   0x00,
+                                               0xFF,   0x80,   0x00,   0x80,   0xC0,   0xFF,   0xFF,   0x00};
+unsigned char rd[] = { 0x00,   0x00,   0xFF,   0x00,   0xFF,   0x00,   0xFF,   0x00,
+                                               0xFF,   0x00,   0x00,   0x00,   0xFF,   0x00,   0xFF,   0xFF};
+unsigned char tr[] = { 0xFF,   0xFF,   0xFF,   0xA0,   0xFF,   0xA0,   0xFF,   0xFF,
+                                               0xFF,   0xFF,   0x00,   0xFF,   0xFF,   0xFF,   0xFF,   0xFF};
 
 void TrimString(char *strg);
 
-// Color table stuff
+// OSD stuff
 static char menucoltxt[][25]={"Content_Selected_Text","Content_Selected","Content_Text","Content","Content_inactive_Text","Content_inactive","Head_Text","Head"};
+static char spres[][5]={"","_crt","_lcd"};
+
 char *line_buffer=NULL, *title=NULL;
 int size=24, type=0, timeout=0, refresh=3, flash=0, selection=0, tbuttons=0, buttons=0, bpline=3, echo=0, absolute=0, mute=1, header=1, cyclic=1;
 char *butmsg[16];
@@ -388,7 +390,7 @@ int main (int argc, char **argv)
 {
 int index,index2,tv,found=0, spr;
 int dloop=1, rcc=-1, cupd=0;
-char rstr[BUFSIZE], *rptr, *aptr, spres[3][5]={"","_crt","_lcd"};;
+char rstr[BUFSIZE], *rptr, *aptr;
 time_t tm1,tm2;
 unsigned int alpha;
 //clock_t tk1=0;