1
0
mirror of https://github.com/cookiengineer/audacity synced 2026-02-17 00:07:54 +01:00

Revert unintended changes. Should have changed Ruler.cpp only.

This (partially) reverts commit 79b7caac07.
This commit is contained in:
Paul-Licameli
2015-04-21 19:35:49 -04:00
parent 79b7caac07
commit a3fcf5a265
3 changed files with 0 additions and 18 deletions

View File

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

View File

@@ -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

View File

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