Changeset 20669


Ignore:
Timestamp:
03/24/13 21:42:06 (11 years ago)
Author:
nit
Message:

[titan] add crosscontrol to virtual zap

Location:
titan/titan
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • titan/titan/adjust.h

    r20659 r20669  
    338338                        status.infobarprogram = getconfigint("infobarprogram", NULL);
    339339                        addconfigscreencheck("crosscontrol", crosscontrol, "0");
     340                        status.crosscontrol = getconfigint("crosscontrol", NULL);
    340341                        addconfigscreencheck("emucontrol", emucontrol, "0");
    341342
  • titan/titan/defaults.h

    r20505 r20669  
    113113        status.autosubtitle = getconfigint("autosubtitle", NULL);
    114114        status.asktimeshift = getconfigint("asktimeshift", NULL);
     115        status.crosscontrol = getconfigint("crosscontrol", NULL);
    115116
    116117        if(status.filelistselectcol == 0) status.filelistselectcol = status.listboxselectcol;
  • titan/titan/infobar.h

    r20542 r20669  
    3131                mark = 0;
    3232
    33                 if(getconfigint("crosscontrol", NULL) == 1 && status.play == 0 && status.pause == 0 && rcret == getrcconfigint("rcright", NULL))
     33                if(status.crosscontrol == 1 && status.play == 0 && status.pause == 0 && rcret == getrcconfigint("rcright", NULL))
    3434                        writerc(getrcconfigint("rcvolup", NULL));
    35                 if(getconfigint("crosscontrol", NULL) == 1 && status.play == 0 && status.pause == 0 && rcret == getrcconfigint("rcleft", NULL))
     35                if(status.crosscontrol == 1 && status.play == 0 && status.pause == 0 && rcret == getrcconfigint("rcleft", NULL))
    3636                        writerc(getrcconfigint("rcvoldown", NULL));
    3737
     
    256256                if(rcret == getrcconfigint("rcblue", NULL) && getconfig("bluekey", NULL) == NULL)
    257257                        rcret = getrcconfigint("rctvradio", NULL);
    258                 if(rcret == getrcconfigint("rcok", NULL) || rcret == getrcconfigint("rctvradio", NULL) || rcret == getrcconfigint("rcfav", NULL) || (getconfigint("crosscontrol", NULL) == 0 && status.play == 0 && status.pause == 0 && (rcret == getrcconfigint("rcup", NULL) || rcret == getrcconfigint("rcdown", NULL) || rcret == getrcconfigint("rcleft", NULL) || rcret == getrcconfigint("rcright", NULL))))
     258                if(rcret == getrcconfigint("rcok", NULL) || rcret == getrcconfigint("rctvradio", NULL) || rcret == getrcconfigint("rcfav", NULL) || (status.crosscontrol == 0 && status.play == 0 && status.pause == 0 && (rcret == getrcconfigint("rcup", NULL) || rcret == getrcconfigint("rcdown", NULL) || rcret == getrcconfigint("rcleft", NULL) || rcret == getrcconfigint("rcright", NULL))))
    259259                {
    260260                        int tmpservicetype = status.servicetype;
     
    600600                        continue;
    601601                }
    602                 if(rcret == getrcconfigint("rcchup", NULL) || (getconfigint("crosscontrol", NULL) == 1 && status.play == 0 && status.pause == 0 && rcret == getrcconfigint("rcdown", NULL)))
     602                if(rcret == getrcconfigint("rcchup", NULL) || (status.crosscontrol == 1 && status.play == 0 && status.pause == 0 && rcret == getrcconfigint("rcdown", NULL)))
    603603                {
    604604                        subtitlepause(1);
     
    610610                        continue;
    611611                }
    612                 if(rcret == getrcconfigint("rcchdown", NULL) || (getconfigint("crosscontrol", NULL) == 1 && status.play == 0 && status.pause == 0 && rcret == getrcconfigint("rcup", NULL)))
     612                if(rcret == getrcconfigint("rcchdown", NULL) || (status.crosscontrol == 1 && status.play == 0 && status.pause == 0 && rcret == getrcconfigint("rcup", NULL)))
    613613                {
    614614                        subtitlepause(1);
  • titan/titan/struct.h

    r20654 r20669  
    14181418        //save timeshift start time
    14191419        time_t timeshiftstart;
     1420        int crosscontrol;
    14201421} status;
    14211422
Note: See TracChangeset for help on using the changeset viewer.