Changeset 25589 for titan

Timestamp:

01/10/14 12:53:34 (9 years ago)

Author:

obi

Message:

atemio520 fix player stuff

Location:

titan

Files:

• plugins/mc/mc_audioplayer.h (modified) (1 diff)
• plugins/mc/mc_pictureplayer.h (modified) (1 diff)
• plugins/mc/mc_videoplayer.h (modified) (1 diff)
• titan/play.h (modified) (1 diff)

titan/plugins/mc/mc_audioplayer.h

@@ -368 +368 @@
                                 playrcfr(filename, NULL, &playinfobarstatus, &playinfobarcount, playertype, 2);
                 }
-                else if(rcret == getrcconfigint("rcpause", NULL) || ((checkbox("ATEMIO520") == 1 || checkbox("ATEMIO530") == 1) && rcret == getrcconfigint("rcplay", NULL) && status.pause == 0 && status.slowspeed == 0 && status.playspeed == 0))
+                else 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))
                 {
                         if(status.pause == 1)

titan/plugins/mc/mc_pictureplayer.h

@@ -119 +119 @@
                         textbox(_("Message"), _("Shooting Background done !\nSave Screenshoot Path: /tmp/screenshot.jpg"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 800, 200, 0, 0);
                 }
-                else if(rcret == getrcconfigint("rcpause", NULL) || ((checkbox("ATEMIO520") == 1 || checkbox("ATEMIO530") == 1) && rcret == getrcconfigint("rcplay", NULL) && status.pause == 0 && status.slowspeed == 0 && status.playspeed == 0))
+                else 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))
                 {
                         if((status.play == 1) || (status.pause == 1))

titan/plugins/mc/mc_videoplayer.h

@@ -391 +391 @@
                                 playrcfr(filename, NULL, &playinfobarstatus, &playinfobarcount, playertype, flag);
                 }
-                else if(rcret == getrcconfigint("rcpause", NULL) || ((checkbox("ATEMIO520") == 1 || checkbox("ATEMIO530") == 1) && rcret == getrcconfigint("rcplay", NULL) && status.pause == 0 && status.slowspeed == 0 && status.playspeed == 0))
+                else 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))
                 {
                         if((status.play == 1) || (status.pause == 1) || (status.playspeed != 0))

titan/titan/play.h

@@ -1552 +1552 @@
                                         playrcfr(file, showname, &playinfobarstatus, &playinfobarcount, playertype, flag);
 
-                                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))
                                 {       
                                         playrcpause(file, showname, &playinfobarstatus, &playinfobarcount, playertype, flag);