Changeset 30893

Timestamp:

11/08/14 20:28:15 (9 years ago)

Author:

obi

Message:

fix #81

File:

• titan/titan/infobar.h (modified) (4 diffs)

titan/titan/infobar.h

@@ -220 +220 @@
                         if(status.timeshifttype == 1 && status.playing == 0)
                         {
-                                if(rcret == getrcconfigint("rcff", NULL) || (getconfig("timeshiftnumkeys", NULL) == 0 && (rcret == getrcconfigint("rc3", NULL) || rcret == getrcconfigint("rc6", NULL) || rcret == getrcconfigint("rc9", NULL))))
+                                if(rcret == getrcconfigint("rcff", NULL) || (getconfig("timeshiftnumkeys", NULL) == 0 && (rcret == getrcconfigint("rc3", NULL) || rcret == getrcconfigint("rc6", NULL) || rcret == getrcconfigint("rc9", NULL) || rcret == getrcconfigint("rcright", NULL) || rcret == getrcconfigint("rcup", NULL) || rcret == getrcconfigint("rc2", NULL))))
                                 {
                                         struct service* snode = getservice(RECORDTIMESHIFT, 0);
@@ -241 +241 @@
                                 if(getconfig("timeshiftnumkeys", NULL) == 0)
                                 {
+                                        if(rcret == getrcconfigint("rcleft", NULL))
+                                        {
+                                                timeshiftposplay(&playinfobarstatus, &playinfobarcount);
+                                                if(status.playing == 1)
+                                                        playrcjumpr(status.playfile, NULL, 60, &playinfobarstatus, &playinfobarcount, 1, 4);
+                                                continue;
+                                        }
+                                        if(rcret == getrcconfigint("rcdown", NULL))
+                                        {
+                                                timeshiftposplay(&playinfobarstatus, &playinfobarcount);
+                                                if(status.playing == 1)
+                                                        playrcjumpr(status.playfile, NULL, 300, &playinfobarstatus, &playinfobarcount, 1, 4);
+                                                continue;
+                                        }
                                         if(rcret == getrcconfigint("rc1", NULL))
                                         {
@@ -276 +290 @@
                                         continue;
                                 }
+                                if(rcret == getrcconfigint("rcleft", NULL))
+                                {
+                                        playrcjumpf(status.playfile, NULL, 60, &playinfobarstatus, &playinfobarcount, 1, 4);
+                                        continue;
+                                }
                                 if(rcret == getrcconfigint("rc3", NULL))
                                 {
@@ -290 +309 @@
                                         playrcjumpf(status.playfile, NULL, getconfigint("skip79", NULL), &playinfobarstatus, &playinfobarcount, 1, 4);
                                         continue;
+                                }
+                                if(rcret == getrcconfigint("rcdown", NULL))
+                                {
+                                        playrcjumpr(status.playfile, NULL, 300, &playinfobarstatus, &playinfobarcount, 1, 4);
+                                        continue;
+                                }
+                                if(rcret == getrcconfigint("rcup", NULL))
+                                {
+                                        playrcjumpf(status.playfile, NULL, 60, &playinfobarstatus, &playinfobarcount, 1, 4);
+                                        continue;
+                                }
+                                if(rcret == getrcconfigint("rcleft", NULL))
+                                {
+                                        playrcjumpr(status.playfile, NULL, 60, &playinfobarstatus, &playinfobarcount, 1, 4);
+                                        continue;
+                                }
+                                if(rcret == getrcconfigint("rc1", NULL))
+                                {
+                                        playrcjumpr(status.playfile, NULL, getconfigint("skip13", NULL), &playinfobarstatus, &playinfobarcount, 1, 4);
+                                        continue;
+                                }
+                                if(rcret == getrcconfigint("rc4", NULL))
+                                {
+                                        playrcjumpr(status.playfile, NULL, getconfigint("skip46", NULL), &playinfobarstatus, &playinfobarcount, 1, 4);
+                                        continue;
+                                }
+                                if(rcret == getrcconfigint("rc7", NULL))
+                                {
+                                        playrcjumpr(status.playfile, NULL, getconfigint("skip79", NULL), &playinfobarstatus, &playinfobarcount, 1, 4);
+                                        continue;
+                                }
+                                if(rcret == getrcconfigint("rc2", NULL))
+                                {
+                                        playrcjumpto(status.playfile, NULL, &playinfobarstatus, &playinfobarcount, 1, 4);
+                                        continue;
+                                }
+                                if(rcret == getrcconfigint("rc0", NULL))
+                                {
+                                        setmarker();
+                                        continue;
+                                }
+                                if(rcret == getrcconfigint("rc5", NULL))
+                                {
+                                        screenmarker(status.playfile, NULL, &playinfobarstatus, &playinfobarcount, 1, 4);
+                                        continue;
                                 }       
-                                if(rcret == getrcconfigint("rc1", NULL))
-                                {
-                                        playrcjumpr(status.playfile, NULL, getconfigint("skip13", NULL), &playinfobarstatus, &playinfobarcount, 1, 4);
-                                        continue;
-                                }
-                                if(rcret == getrcconfigint("rc4", NULL))
-                                {
-                                        playrcjumpr(status.playfile, NULL, getconfigint("skip46", NULL), &playinfobarstatus, &playinfobarcount, 1, 4);
-                                        continue;
-                                }
-                                if(rcret == getrcconfigint("rc7", NULL))
-                                {
-                                        playrcjumpr(status.playfile, NULL, getconfigint("skip79", NULL), &playinfobarstatus, &playinfobarcount, 1, 4);
-                                        continue;
-                                }
+
                                 if(status.timeshifttype == 0 && rcret == getrcconfigint("rcinfo", NULL))
                                 {