Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-05-04 17:49:45 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into deletes

Browse Source
This commit is contained in:
Paul Licameli 2016-08-13 12:22:47 -04:00
commit 13e5788a6b
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Snap.cpp
View File

@ -33,6 +33,12 @@ TrackClip::TrackClip(Track *t, WaveClip *c)
clip = c;
}
#ifndef __AUDACITY_OLD_STD__
TrackClip::TrackClip(TrackClip&& tc)
: track{tc.track}, origTrack{tc.origTrack}, dstTrack{tc.dstTrack},
clip{tc.clip}, holder{std::move(tc.holder)} {}
#endif
TrackClip::~TrackClip()
{

3
src/Snap.h
View File

@ -34,7 +34,8 @@ public:
TrackClip(Track *t, WaveClip *c);
#ifndef __AUDACITY_OLD_STD__
TrackClip(TrackClip&&) = default;
// TrackClip(TrackClip&&) = default; is not supported by vs2013/5 so explicit version needed
TrackClip(TrackClip&&);
#endif
~TrackClip();

1
src/effects/StereoToMono.cpp
View File

@ -124,6 +124,7 @@ bool EffectStereoToMono::Process()
count++;
}
mOutTrack.reset();
this->ReplaceProcessedTracks(bGoodResult);
return bGoodResult;
}