From a3fcf5a265b68fb3e09614579b654d3b0a112a41 Mon Sep 17 00:00:00 2001
From: Paul-Licameli <paul.licameli@gmail.com>
Date: Tue, 21 Apr 2015 19:35:49 -0400
Subject: [PATCH] Revert unintended changes.  Should have changed Ruler.cpp
 only.

This (partially) reverts commit 79b7caac07e92e73848b60135e1b31b08ab48724.
---
 src/AudioIO.cpp                 | 14 --------------
 src/AudioIO.h                   |  2 --
 src/toolbars/ControlToolBar.cpp |  2 --
 3 files changed, 18 deletions(-)

diff --git a/src/AudioIO.cpp b/src/AudioIO.cpp
index ac998f062..be6e704a7 100644
--- a/src/AudioIO.cpp
+++ b/src/AudioIO.cpp
@@ -1767,20 +1767,6 @@ int AudioIO::StartStream(WaveTrackArray playbackTracks,
    AILASetStartTime();
 #endif
 
-   if (options.pStartTime)
-   {
-      // Calculate the new time position
-      mTime = std::max(mT0, std::min(mT1, *options.pStartTime));
-      // Reset mixer positions for all playback tracks
-      unsigned numMixers = mPlaybackTracks.GetCount();
-      for (unsigned ii = 0; ii < numMixers; ++ii)
-         mPlaybackMixers[ii]->Reposition(mTime);
-      if(mTimeTrack)
-         mWarpedTime = mTimeTrack->ComputeWarpedLength(mT0, mTime);
-      else
-         mWarpedTime = mTime - mT0;
-   }
-
 #ifdef EXPERIMENTAL_SCRUBBING_SUPPORT
    delete mScrubQueue;
    if (scrubbing)
diff --git a/src/AudioIO.h b/src/AudioIO.h
index 5f27aecc6..7c99038b9 100644
--- a/src/AudioIO.h
+++ b/src/AudioIO.h
@@ -84,7 +84,6 @@ struct AudioIOStartStreamOptions
       , playLooped(false)
       , cutPreviewGapStart(0.0)
       , cutPreviewGapLen(0.0)
-      , pStartTime(NULL)
 #ifdef EXPERIMENTAL_SCRUBBING_SUPPORT
       , scrubDelay(0.0)
       , maxScrubSpeed(1.0)
@@ -98,7 +97,6 @@ struct AudioIOStartStreamOptions
    bool playLooped;
    double cutPreviewGapStart;
    double cutPreviewGapLen;
-   double * pStartTime;
 
 #ifdef EXPERIMENTAL_SCRUBBING_SUPPORT
    // Positive value indicates that scrubbing will happen
diff --git a/src/toolbars/ControlToolBar.cpp b/src/toolbars/ControlToolBar.cpp
index b105e9bed..af9f27d77 100644
--- a/src/toolbars/ControlToolBar.cpp
+++ b/src/toolbars/ControlToolBar.cpp
@@ -482,8 +482,6 @@ int ControlToolBar::PlayPlayRegion(const SelectedRegion &selectedRegion,
    // to indicate backwards play.
    const bool looped = options.playLooped;
 
-   double startTime = *options.pStartTime;
-
    if (backwards)
       std::swap(t0, t1);