Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-09-18 17:10:55 +02:00
Code Issues Releases Wiki Activity

Part fixes for compilation of EXPERIMENTAL_SCOREALIGN

Browse Source
This commit is contained in:
Paul Licameli 2018-09-05 13:13:59 -04:00
parent 544c3b9770
commit f61989e922
2 changed files with 40 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Menus.cpp
View File

@ -8231,7 +8231,7 @@ class ASAProgress final : public SAProgress {
work = (is_audio[0] ? AUDIO_WORK_UNIT : MIDI_WORK_UNIT) * mFrames[0] + work = (is_audio[0] ? AUDIO_WORK_UNIT : MIDI_WORK_UNIT) * mFrames[0] +
(is_audio[1] ? AUDIO_WORK_UNIT : MIDI_WORK_UNIT) * f; (is_audio[1] ? AUDIO_WORK_UNIT : MIDI_WORK_UNIT) * f;
} }
int updateResult = mProgress->Update((int)(work), (int)(mTotalWork)); auto updateResult = mProgress->Update((int)(work), (int)(mTotalWork));
return (updateResult == ProgressResult::Success); return (updateResult == ProgressResult::Success);
} }
bool set_matrix_progress(int cells) override { bool set_matrix_progress(int cells) override {
@ -8240,7 +8240,7 @@ class ASAProgress final : public SAProgress {
(is_audio[0] ? AUDIO_WORK_UNIT : MIDI_WORK_UNIT) * mFrames[0] + (is_audio[0] ? AUDIO_WORK_UNIT : MIDI_WORK_UNIT) * mFrames[0] +
(is_audio[1] ? AUDIO_WORK_UNIT : MIDI_WORK_UNIT) * mFrames[1]; (is_audio[1] ? AUDIO_WORK_UNIT : MIDI_WORK_UNIT) * mFrames[1];
work += mCellCount * MATRIX_WORK_UNIT; work += mCellCount * MATRIX_WORK_UNIT;
int updateResult = mProgress->Update((int)(work), (int)(mTotalWork)); auto updateResult = mProgress->Update((int)(work), (int)(mTotalWork));
return (updateResult == ProgressResult::Success); return (updateResult == ProgressResult::Success);
} }
bool set_smoothing_progress(int i) override { bool set_smoothing_progress(int i) override {
@ -8250,7 +8250,7 @@ class ASAProgress final : public SAProgress {
(is_audio[1] ? AUDIO_WORK_UNIT : MIDI_WORK_UNIT) * mFrames[1] + (is_audio[1] ? AUDIO_WORK_UNIT : MIDI_WORK_UNIT) * mFrames[1] +
MATRIX_WORK_UNIT * mFrames[0] * mFrames[1]; MATRIX_WORK_UNIT * mFrames[0] * mFrames[1];
work += i * wxMax(mFrames[0], mFrames[1]) * SMOOTHING_WORK_UNIT; work += i * wxMax(mFrames[0], mFrames[1]) * SMOOTHING_WORK_UNIT;
int updateResult = mProgress->Update((int)(work), (int)(mTotalWork)); auto updateResult = mProgress->Update((int)(work), (int)(mTotalWork));
return (updateResult == ProgressResult::Success); return (updateResult == ProgressResult::Success);
} }
}; };
@ -8332,6 +8332,7 @@ void AudacityProject::OnScoreAlign()
{ {
Mixer mix( Mixer mix(
waveTracks, // const WaveTrackConstArray &inputTracks waveTracks, // const WaveTrackConstArray &inputTracks
false, // mayThrow -- is this right?
Mixer::WarpOptions{ mTracks->GetTimeTrack() }, // const WarpOptions &warpOptions Mixer::WarpOptions{ mTracks->GetTimeTrack() }, // const WarpOptions &warpOptions
0.0, // double startTime 0.0, // double startTime
endTime, // double stopTime endTime, // double stopTime

36
src/effects/ScoreAlignDialog.h
View File

@ -12,8 +12,44 @@
#include <wx/dialog.h> #include <wx/dialog.h>
#include <wx/slider.h> #include <wx/slider.h>
#include <wx/checkbox.h> #include <wx/checkbox.h>
#if 1
#include "ScoreAlignParams.h" #include "ScoreAlignParams.h"
#else
// Stub definitions
struct ScoreAlignParams
{
int mStatus;
double mMidiStart, mMidiEnd;
double mAudioStart, mAudioEnd;
float mFramePeriod;
float mWindowSize;
float mSilenceThreshold;
float mForceFinalAlignment;
float mIgnoreSilence;
float mPresmoothTime;
float mLineTime;
float mSmoothTime;
};
class SAProgress;
class Alg_seq;
extern int scorealign(
void *data,
long (*process)(void *data, float **buffer, long n),
unsigned channels,
double rate,
double endTime,
Alg_seq *seq,
SAProgress *progress,
ScoreAlignParams params
);
#endif
class wxButton; class wxButton;
class wxSizer; class wxSizer;
class wxString; class wxString;