Ticket #391: togglestretch_toggles.diff

libs/libmythtv/tv_play.cpp

@@ -195 +195 @@
       // Fast forward state
       doing_ff_rew(0), ff_rew_index(0), speed_index(0),
       // Time Stretch state
-      normal_speed(1.0f),
+      normal_speed(1.0f), prev_speed(1.5f),
       // Estimated framerate from recorder
       frameRate(30.0f),
       // Channel changing state variables
@@ -1776 +1776 @@
             else if (action == "UP")
                 ChangeTimeStretch(5);
             else if (action == "TOGGLESTRETCH")
+            {
+                if (normal_speed != 1.0)
+                    prev_speed = normal_speed;
+                normal_speed = 1.0;
+                ChangeTimeStretch(0,FALSE);
                 ClearOSD();
+            }
             else
                 handled = false;
         }
@@ -1855 +1861 @@
             ChangeSpeed(-1);
         else if (action == "TOGGLESTRETCH")
         {
-            ChangeTimeStretch(0);   // just display
+            normal_speed = prev_speed;
+            ChangeTimeStretch(0);
         }
         else if (action == "TOGGLEAUDIOSYNC")
             ChangeAudioSync(0);   // just display

libs/libmythtv/tv_play.h

@@ -333 +333 @@
      *  or decreased to speedup or slowdown playback.
      *  Ignored when doing Fast Forward or Rewind.
      */
-    float normal_speed; 
+    float normal_speed;
+    float prev_speed; 
 
     float frameRate;     ///< Estimated framerate from recorder