Changeset 25548

Timestamp:

01/09/14 16:36:54 (9 years ago)

Author:

obi

Message:

[atemio520] enable new rc if selected

Location:

titan/titan

Files:

• adjust.h (modified) (3 diffs)
• infobar.h (modified) (2 diffs)

titan/titan/adjust.h

@@ -50 +50 @@
         struct skin* playerbufferseektime = getscreennode(adjust, "playerbufferseektime");
         struct skin* sataswitch = getscreennode(adjust, "sataswitch");
+        struct skin* rcswitch = getscreennode(adjust, "rcswitch");
 
         struct skin* tmp = NULL;
@@ -247 +248 @@
         else
                 sataswitch->hidden = YES;
+
+        if(checkbox("ATEMIO520") == 1 || checkbox("ATEMIO530") == 1)
+        {
+                sataswitch->hidden = NO;
+                addchoicebox(rcswitch, "0", _("old"));
+                addchoicebox(rcswitch, "1", _("new"));
+                setchoiceboxselection(rcswitch, getconfig("rcswitch", NULL));
+        }
+        else
+                rcswitch->hidden = YES;
         
         addchoicebox(playerbuffersize, "0", _("no"));
@@ -358 +369 @@
                                 addconfigscreencheck("usecec", usecec, "0");
 
+                        if(checkbox("ATEMIO520") == 1 || checkbox("ATEMIO530") == 1)
+                                addconfigscreencheck("rcswitch", rcswitch, "0");
+
                         if(checkbox("ATEMIO7600") == 1)
                         {

titan/titan/infobar.h

@@ -132 +132 @@
                 }
 
-                if(rcret == getrcconfigint("rcpause", NULL) || ((checkbox("ATEMIO520") == 1 || checkbox("ATEMIO530") == 1) && rcret == getrcconfigint("rcplay", NULL) && status.pause == 0 && status.slowspeed == 0 && status.playspeed == 0))
+                if(rcret == getrcconfigint("rcpause", NULL) || (((checkbox("ATEMIO520") == 1 || checkbox("ATEMIO530") == 1) && ostrcmp(getconfig("rcswitch", NULL), "0") == 0) && rcret == getrcconfigint("rcplay", NULL) && status.pause == 0 && status.slowspeed == 0 && status.playspeed == 0))
                 {
                         //timeshift
@@ -163 +163 @@
                         if(rcret == getrcconfigint("rcplay", NULL))
                         {
-                                if(checkbox("ATEMIO520") != 1 && checkbox("ATEMIO530") != 1 && status.timeshifttype == 1) 
+                                if((checkbox("ATEMIO520") != 1 && checkbox("ATEMIO530") != 1 && status.timeshifttype == 1) || (ostrcmp(getconfig("rcswitch", NULL), "1") == 1 && (checkbox("ATEMIO520") == 1 || checkbox("ATEMIO530") == 1)))
                                 {
                                         if(status.playing == 0 || (status.playspeed == 0 && status.slowspeed == 0 && status.pause == 0))