Changeset 25567

Timestamp:

01/10/14 10:32:08 (9 years ago)

Author:

obi

Message:

next test

Location:

titan/titan

Files:

• infobar.h (modified) (2 diffs)
• titan.c (modified) (1 diff)

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) && rcret == getrcconfigint("rcplay", NULL) && status.pause == 0 && status.slowspeed == 0 && status.playspeed == 0 && ostrcmp(getconfig("remotecontrol", NULL), "0") == 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("remotecontrol", NULL), "1") == 1)
                                 {
                                         if(status.playing == 0 || (status.playspeed == 0 && status.slowspeed == 0 && status.pause == 0))

titan/titan/titan.c

@@ -866 +866 @@
 //                      if(screenlanguage(2) == 2) return 100;
 //                      resettvpic();
+
+
+                        struct menulist* mlist = NULL, *mbox = NULL;
+                        addmenulist(&mlist, "RemoteControl Long Version", "0", NULL, 0, 0);
+                        addmenulist(&mlist, "RemoteControl Old Version", "1", NULL, 0, 0);
+                        
+//                      mbox = menulistbox(mlist, "playlistmenu", NULL, "%pluginpath%/mc/skin", NULL, 1, 0);
+                        mbox = menulistbox(mlist, NULL, NULL, NULL, NULL, 1, 0);
+                        if(mbox != NULL)
+                        {
+                                free(title), title = NULL;
+                                free(tmpstr), tmpstr = NULL;
+
+                                debug(10, "mbox->name %s", mbox->name);
+                                debug(10, "mbox->text %s", mbox->text);
+
+                                title = ostrcat(mbox->text, NULL, 0, 0);
+                                flag = 1;
+                                goto start;
+                        }
+                        
                         screentunerconfig();
                         resettvpic();