Changeset 32106

Timestamp:

01/05/15 16:32:53 (8 years ago)

Author:

Stephan

Message:

revert oled change

Location:

titan/titan

Files:

• skin.h (modified) (1 diff)
• skinfunc.h (modified) (1 diff)

titan/titan/skin.h

@@ -36 +36 @@
 
 #ifdef MIPSEL
-        if(checkrealbox("INI-8000AM") == 1)
-        {       
-                if(ostrcmp("getoledmute", value) == 0)
-                {
-                        *rettype = FUNCPIC;
-                        return &getoledmute;
-                }
-
-                if(ostrcmp("getoledtimeshift", value) == 0)
-                {
-                        *rettype = FUNCPIC;
-                        return &getoledtimeshift;
-                }
-
-                if(ostrcmp("getoledrec", value) == 0)
-                {
-                        *rettype = FUNCPIC;
-                        return &getoledrec;
-                }
-
-                if(ostrcmp("getoledstreaming", value) == 0)
-                {
-                        *rettype = FUNCPIC;
-                        return &getoledstreaming;
-                }
-        }
+        if(ostrcmp("getoledmute", value) == 0)
+        {
+                *rettype = FUNCPIC;
+                return &getoledmute;
+        }
+
+        if(ostrcmp("getoledtimeshift", value) == 0)
+        {
+                *rettype = FUNCPIC;
+                return &getoledtimeshift;
+        }
+
+        if(ostrcmp("getoledrec", value) == 0)
+        {
+                *rettype = FUNCPIC;
+                return &getoledrec;
+        }
+
+        if(ostrcmp("getoledstreaming", value) == 0)
+        {
+                *rettype = FUNCPIC;
+                return &getoledstreaming;
+        }
+
 #endif
 

titan/titan/skinfunc.h

@@ -144 +144 @@
 
 #ifdef MIPSEL
-        if(checkrealbox("INI-8000AM") == 1)
-        {
-        //rec png
-                char* getoledrec(struct skin* node, char* path)
-                {
-                        char* tmpstr = NULL;
-
-                        if(status.recording > 0)
-                        {
-                                tmpstr = ostrcat("oled_rec.png", NULL, 0, 0);
-
-                                if(path != NULL) tmpstr = ostrcat("/", tmpstr, 0, 1);
-                                tmpstr = ostrcat(path, tmpstr, 0, 1);
-                        }
-        
-                        return tmpstr;
-                }
-        //mute png
-                char* getoledmute(struct skin* node, char* path)
-                {
-                        char* tmpstr = NULL;
-
-                        if(status.mute > 0)
-                        {
-                                tmpstr = ostrcat("oled_mute.png", NULL, 0, 0);
-
-                                if(path != NULL) tmpstr = ostrcat("/", tmpstr, 0, 1);
-                                tmpstr = ostrcat(path, tmpstr, 0, 1);
-                        }
+//rec png
+        char* getoledrec(struct skin* node, char* path)
+        {
+                char* tmpstr = NULL;
+
+                if(status.recording > 0)
+                {
+                        tmpstr = ostrcat("oled_rec.png", NULL, 0, 0);
+
+                        if(path != NULL) tmpstr = ostrcat("/", tmpstr, 0, 1);
+                        tmpstr = ostrcat(path, tmpstr, 0, 1);
+                }
+        
+                return tmpstr;
+        }
+//mute png
+        char* getoledmute(struct skin* node, char* path)
+        {
+                char* tmpstr = NULL;
+
+                if(status.mute > 0)
+                {
+                        tmpstr = ostrcat("oled_mute.png", NULL, 0, 0);
+
+                        if(path != NULL) tmpstr = ostrcat("/", tmpstr, 0, 1);
+                        tmpstr = ostrcat(path, tmpstr, 0, 1);
+                }
                 
-                        return tmpstr;
-                }
-
-        //timeshift png
-                char* getoledtimeshift(struct skin* node, char* path)
-                {
-                        char* tmpstr = NULL;
-
-                        if(status.timeshift > 0)
-                        {
-                                tmpstr = ostrcat("oled_timeshift.png", NULL, 0, 0);
-
-                                if(path != NULL) tmpstr = ostrcat("/", tmpstr, 0, 1);
-                                tmpstr = ostrcat(path, tmpstr, 0, 1);
-                        }
+                return tmpstr;
+        }
+
+//timeshift png
+        char* getoledtimeshift(struct skin* node, char* path)
+        {
+                char* tmpstr = NULL;
+
+                if(status.timeshift > 0)
+                {
+                        tmpstr = ostrcat("oled_timeshift.png", NULL, 0, 0);
+
+                        if(path != NULL) tmpstr = ostrcat("/", tmpstr, 0, 1);
+                        tmpstr = ostrcat(path, tmpstr, 0, 1);
+                }
                 
-                        return tmpstr;
-                }
-
-        //streaming png
-                char* getoledstreaming(struct skin* node, char* path)
-                {
-                        char* tmpstr = NULL;
-
-                        if(status.streaming > 0)
-                        {
-                                tmpstr = ostrcat("oled_streaming.png", NULL, 0, 0);
-
-                                if(path != NULL) tmpstr = ostrcat("/", tmpstr, 0, 1);
-                                tmpstr = ostrcat(path, tmpstr, 0, 1);
-                        }
+                return tmpstr;
+        }
+
+//streaming png
+        char* getoledstreaming(struct skin* node, char* path)
+        {
+                char* tmpstr = NULL;
+
+                if(status.streaming > 0)
+                {
+                        tmpstr = ostrcat("oled_streaming.png", NULL, 0, 0);
+
+                        if(path != NULL) tmpstr = ostrcat("/", tmpstr, 0, 1);
+                        tmpstr = ostrcat(path, tmpstr, 0, 1);
+                }
                 
-                        return tmpstr;
-                }
-        }
+                return tmpstr;
+        }
+        
 #endif