mirror of
https://github.com/cookiengineer/audacity
synced 2025-07-11 14:17:43 +02:00
Another compilation fix in EXPERIMENTAL_SCOREALIGN, and one less delete
This commit is contained in:
parent
42fcfdab98
commit
0ebc23e3a9
@ -5998,7 +5998,7 @@ class ASAProgress final : public SAProgress {
|
|||||||
long mTotalCells; // how many matrix cells?
|
long mTotalCells; // how many matrix cells?
|
||||||
long mCellCount; // how many cells so far?
|
long mCellCount; // how many cells so far?
|
||||||
long mPrevCellCount; // cell_count last reported with Update()
|
long mPrevCellCount; // cell_count last reported with Update()
|
||||||
ProgressDialog *mProgress;
|
Maybe<ProgressDialog> mProgress;
|
||||||
#ifdef COLLECT_TIMING_DATA
|
#ifdef COLLECT_TIMING_DATA
|
||||||
FILE *mTimeFile;
|
FILE *mTimeFile;
|
||||||
wxDateTime mStartTime;
|
wxDateTime mStartTime;
|
||||||
@ -6008,13 +6008,11 @@ class ASAProgress final : public SAProgress {
|
|||||||
public:
|
public:
|
||||||
ASAProgress() {
|
ASAProgress() {
|
||||||
smoothing = false;
|
smoothing = false;
|
||||||
mProgress = NULL;
|
|
||||||
#ifdef COLLECT_TIMING_DATA
|
#ifdef COLLECT_TIMING_DATA
|
||||||
mTimeFile = fopen("timing-data.txt", "w");
|
mTimeFile = fopen("timing-data.txt", "w");
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
~ASAProgress() {
|
~ASAProgress() {
|
||||||
delete mProgress;
|
|
||||||
#ifdef COLLECT_TIMING_DATA
|
#ifdef COLLECT_TIMING_DATA
|
||||||
fclose(mTimeFile);
|
fclose(mTimeFile);
|
||||||
#endif
|
#endif
|
||||||
@ -6061,7 +6059,7 @@ class ASAProgress final : public SAProgress {
|
|||||||
work[1], mFrames[1], is_audio[1]);
|
work[1], mFrames[1], is_audio[1]);
|
||||||
fprintf(mTimeFile, "work2 = %g, work3 = %g\n", work2, work3);
|
fprintf(mTimeFile, "work2 = %g, work3 = %g\n", work2, work3);
|
||||||
#endif
|
#endif
|
||||||
mProgress = new ProgressDialog(_("Synchronize MIDI with Audio"),
|
mProgress.create(_("Synchronize MIDI with Audio"),
|
||||||
_("Synchronizing MIDI and Audio Tracks"));
|
_("Synchronizing MIDI and Audio Tracks"));
|
||||||
} else if (i < 3) {
|
} else if (i < 3) {
|
||||||
fprintf(mTimeFile,
|
fprintf(mTimeFile,
|
||||||
@ -6122,7 +6120,7 @@ long mixer_process(void *mixer, float **buffer, long n)
|
|||||||
|
|
||||||
void AudacityProject::OnScoreAlign()
|
void AudacityProject::OnScoreAlign()
|
||||||
{
|
{
|
||||||
TrackListIterator iter(mTracks);
|
TrackListIterator iter(GetTracks());
|
||||||
Track *t = iter.First();
|
Track *t = iter.First();
|
||||||
int numWaveTracksSelected = 0;
|
int numWaveTracksSelected = 0;
|
||||||
int numNoteTracksSelected = 0;
|
int numNoteTracksSelected = 0;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user