Changeset 15145

Timestamp:

04/05/12 01:49:43 (12 years ago)

Author:

nit

Message:

[titan] fix comp warnings

Location:

titan

Files:

• plugins/makesh4.sh (modified) (1 diff)
• plugins/scriptexec/scriptexec.h (modified) (2 diffs)
• titan/fb.h (modified) (1 diff)
• titan/header.h (modified) (3 diffs)
• titan/skin.h (modified) (2 diffs)

titan/plugins/makesh4.sh

@@ -88 +88 @@
 compile "dvdplayer" "dvdplay" ""
 compile "scriptexec" "scriptexec" ""
+compile "optimize" "optimize" ""
 
 #rm -r networkbrowser/networkbrowser

titan/plugins/scriptexec/scriptexec.h

@@ -4 +4 @@
 void screenscriptexec()
 {
-        int rcret = 0, dirrcret = 0;
+        int dirrcret = 0;
         char* tmpstr = NULL, *startdir = NULL;
         char* file = NULL, *ret = NULL;
@@ -27 +27 @@
                 {
                         tmpstr = ostrcat(file, " &", 0, 0);
-                        ret = system(tmpstr);
+                        system(tmpstr);
                         free(tmpstr); tmpstr = NULL;
                 }

titan/titan/fb.h

@@ -347 +347 @@
         }
 
-        int mode3d = 0, leftoffset = 0, rightoffset = 0, topoffset = 0, bottomoffset = 0;
+        int mode3d = 0;
         char* mode3dstr = NULL;
 

titan/titan/header.h

@@ -195 +195 @@
 void recordffrwts(struct service* servicenode, int speed);
 
+//dvdplayer.h
+int dvdstart(char* filename);
+int dvdisplaying();
+void dvdgotmessage();
+int dvdkeypress(int key);
+int dvdmenuopen();
+void dvdchangevideo();
+void dvdafterend();
+
 // play.h
 void playerffts(int speed);
 void screenplay(char* startfile, int startfolder, int flag);
 void playrcstop(int playertype, int flag);
+void playwritevfd(char* file);
+void playstartservice();
+void screenplayinfobar(char* file, int mode, int playertype, int flag);
+void playrcgreen(char* file, int playinfobarstatus, int playertype, int flag);
+void playrcred(char* file, int playinfobarstatus, int playertype, int flag);
+void playrcinfo(char* file, int* playinfobarstatus, int* playinfobarcount, int playertype, int flag);
+void playrcff(char* file, int* playinfobarstatus, int* playinfobarcount, int playertype, int flag);
+void playrcfr(char* file, int* playinfobarstatus, int* playinfobarcount, int playertype, int flag);
+void playrcpause(char* file, int* playinfobarstatus, int* playinfobarcount, int playertype, int flag);
+void playrcplay(char* file, int* playinfobarstatus, int* playinfobarcount, int playertype, int flag);
+void playrcjumpr(char* file, int sec, int* playinfobarstatus, int* playinfobarcount, int playertype, int flag);
+void playrcjumpf(char* file, int sec, int* playinfobarstatus, int* playinfobarcount, int playertype, int flag);
 
 //inetwork.h
@@ -218 +239 @@
 struct epgscanlist* getepgscanlist(int serviceid, unsigned long transponderid);
 int writeepgscanlist(const char *filename);
+int delepgscanlist(int serviceid, unsigned long transponderid);
 
 //rectimer.h
@@ -455 +477 @@
 //rcconfig.h
 int getrcconfigint(char *key, char* ext);
+char* getrcconfig(char *key, char *ext);
 
 //service.h

titan/titan/skin.h

@@ -1836 +1836 @@
         debug(1000, "in");
         unsigned char *buf = NULL, *scalebuf = NULL;
-        int memfd = -1, py = 0, pyh = 0, px = 0, pxw = 0, diff = 0;
+        int memfd = -1, py = 0, pyh = 0, pxw = 0, diff = 0; //px = 0
         unsigned long width, height, rowbytes;
         int channels, length;
-        unsigned char *src, red, green, blue, alpha;
-        unsigned long color;
+        unsigned char *src; // red, green, blue, alpha;
+        //unsigned long color;
         png_uint_32 y, x;
         struct pic* picnode = NULL;
@@ -1929 +1929 @@
                                 pxw = y + width;
                                 for(x = y; x < pxw; x++)
-                                        skinfb->fblong[x] = (255 << 24) | (*src++ << 16) | (*src++ << 8) | *src++;
+                                        skinfb->fblong[x] = (255 << 24) | (src[0] << 16) | (src[1] << 8) | src[2];
 
                                 src += diff;