Changeset 12389

Timestamp:

12/17/11 17:22:33 (12 years ago)

Author:

gost

Message:

[titan] fix some errors in fast forward TS

Location:

titan/titan

Files:

• infobar.h (modified) (1 diff)
• timeshift.h (modified) (1 diff)

titan/titan/infobar.h

@@ -91 +91 @@
                         if(rcret == getrcconfigint("rcff", NULL))
                         {
-                                if(status.timeshiftseek > 100) {
-                                        timeshiftseek((status.timeshiftseek - 100) * 2 + 100);
-                                }
-                                else
+                                if(status.playing == 1) { 
+                                        if(status.timeshiftseek > 100) {
+                                                timeshiftseek((status.timeshiftseek - 100) * 2 + 100);
+                                        }
+                                        else
                                         timeshiftseek(102);
+                                }
                                 continue;
                         }
                         if(rcret == getrcconfigint("rcfr", NULL))
                         {
-                                if(status.timeshiftseek > 102) {
-                                        timeshiftseek((status.timeshiftseek - 100) / 2 + 100);
-                                }
-                                else if(status.timeshiftseek == 102) {
-                                        timeshiftplay();
-                                }
-                                else
-                                        timeshiftseek(-10);
+                                if(status.playing == 1) {
+                                        if(status.timeshiftseek > 102) {
+                                                timeshiftseek((status.timeshiftseek - 100) / 2 + 100);
+                                        }
+                                        else if(status.timeshiftseek == 102) {
+                                                timeshiftplay();
+                                        }
+                                        else
+                                                timeshiftseek(-10);
+                                }
                                 continue;
                         }

titan/titan/timeshift.h

@@ -35 +35 @@
         struct service* snode = getservice(RECORDTIMESHIFT, flag);
 
+        if(status.timeshiftseek != 0) { 
+                status.timeshiftseek = 0;
+                playerpausets();
+                playercontinuets();
+        }
+        
         playerstopts(1, flag);