Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-26 00:03:52 +02:00
Code Issues Releases Wiki Activity

Fix mac build

Browse Source
This commit is contained in:
Paul Licameli
2016-03-30 23:24:39 -04:00
parent 7e83d70350
commit 13595620cf
4 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Mix.cpp
View File

@@ -43,11 +43,13 @@
#include "float_cast.h"
//TODO-MB: wouldn't it make more sense to DELETE the time track after 'mix and render'?
std::pair<WaveTrack::Holder, WaveTrack::Holder>
MixAndRender(TrackList *tracks, TrackFactory *trackFactory,
void MixAndRender(TrackList *tracks, TrackFactory *trackFactory,
double rate, sampleFormat format,
double startTime, double endTime)
double startTime, double endTime,
WaveTrack::Holder &uLeft, WaveTrack::Holder &uRight)
{
uLeft.reset(), uRight.reset();
// This function was formerly known as "Quick Mix".
Track *t;
bool mono = false; /* flag if output can be mono without loosing anything*/
@@ -197,13 +199,11 @@ MixAndRender(TrackList *tracks, TrackFactory *trackFactory,
mixRight->Flush();
if (updateResult == eProgressCancelled || updateResult == eProgressFailed)
{
return{};
return;
}
else {
return std::make_pair(
std::move(mixLeft),
std::move(mixRight)
);
uLeft = std::move(mixLeft),
uRight = std::move(mixRight);
#if 0
int elapsedMS = wxGetElapsedTime();
double elapsedTime = elapsedMS * 0.001;