Changeset 30804

Timestamp:

11/01/14 19:04:00 (9 years ago)

Author:

gost

Message:

[titan] mipsel.. cec settings only in the System Menu

Location:

titan/titan

Files:

• adjust.h (modified) (2 diffs)
• global.h (modified) (2 diffs)

titan/titan/adjust.h

@@ -258 +258 @@
         else
                 emucontrol->hidden = NO;
-#ifndef MIPSEL
         if(checkbox("ATEMIO510") == 1 || checkbox("UFS912") == 1 || checkbox("UFS913") == 1 || checkbox("ATEMIO7600") == 1 || checkbox("ATEMIO520") == 1 || checkbox("ATEMIO530") == 1)
                 usecec->hidden = NO;
         else
                 usecec->hidden = YES;
-#else
-        usecec->hidden = NO; 
-#endif
 
         if(checkbox("ATEMIO7600") == 1)
@@ -385 +381 @@
                         if(ostrcmp(minitv->ret, "1") == 0) resettvpic();
                         addconfigscreencheck("minitv", minitv, "0");
-#ifndef MIPSEL
+
                         if(checkbox("ATEMIO510") == 1 || checkbox("ATEMIO520") == 1 || checkbox("ATEMIO530") == 1 || checkbox("ATEMIO7600") == 1 || checkbox("UFS912") == 1 || checkbox("UFS913") == 1)
                                 addconfigscreencheck("usecec", usecec, "0");
-#else
-                        addconfigscreencheck("usecec", usecec, "0");
-#endif
+
                         if(checkbox("ATEMIO7600") == 1)
                         {

titan/titan/global.h

@@ -234 +234 @@
 int setcecstandby(int flag)
 {
-        if(getconfigint("usecec", NULL) == 1)
+        if(getconfigint("usecec", NULL) == 1 || getconfigint("cec_on", NULL) == 1)
         {
 #ifndef MIPSEL          
@@ -250 +250 @@
                         free(tmpstr1); tmpstr1 = NULL;
                 }
-        }
 #else
-                unsigned char data[3];
-                int hdmiFd = open("/dev/hdmi_cec", O_RDWR | O_NONBLOCK);
-                
-                data[0] = 0x0f; 
-                data[1] = 0x01;
-
                 if(flag == 0)
-                        data[2] = 0x04;
+                        cecwakeup();
                 else
-                        data[2] = 0x36;
-                if(hdmiFd > 0)
-                {
-                        write(hdmiFd, &data, 3);
-                        close(hdmiFd);
-                }
-        }
-        else
-        {
-                if(getconfigint("cec_on", NULL) == 1)
-                {
-                        if(flag == 0)
-                                cecwakeup();
-                        else
-                                cecstandby();
-                }
+                        cecstandby();
         }
 #endif