Merge branch 'temp2'

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)

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

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);