1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-19 17:11:12 +02:00

Some compilation fixes for EXPERIMENTAL_SCOREALIGN

This commit is contained in:
Paul Licameli
2019-12-21 00:31:22 -05:00
parent 287f9689f2
commit 99c3c29158
3 changed files with 8 additions and 5 deletions

View File

@@ -58,7 +58,7 @@ static std::unique_ptr<ScoreAlignDialog> gScoreAlignDialog{};
//IMPLEMENT_CLASS(ScoreAlignDialog, wxDialogWrapper)
ScoreAlignDialog::ScoreAlignDialog(ScoreAlignParams &params)
: wxDialogWrapper(NULL, -1, _("Align MIDI to Audio"),
: wxDialogWrapper(NULL, -1, XO("Align MIDI to Audio"),
wxDefaultPosition, wxDefaultSize,
wxDEFAULT_DIALOG_STYLE)
{

View File

@@ -13,6 +13,9 @@
#ifdef EXPERIMENTAL_SCOREALIGN
#include <wx/event.h>
#include "../widgets/wxPanelWrapper.h"
#if 1
#include "ScoreAlignParams.h"

View File

@@ -888,8 +888,8 @@ void OnMoveSelectionWithTracks(const CommandContext &WXUNUSED(context) )
void OnScoreAlign(const CommandContext &context)
{
auto &project = context.project;
auto tracks = project.GetTracks();
const auto rate = project.GetRate();
auto &tracks = TrackList::Get( project );
const auto rate = ProjectSettings::Get( project ).GetRate();
int numWaveTracksSelected = 0;
int numNoteTracksSelected = 0;
@@ -898,7 +898,7 @@ void OnScoreAlign(const CommandContext &context)
// Iterate through once to make sure that there is exactly
// one WaveTrack and one NoteTrack selected.
GetTracks()->Selected().Visit(
tracks.Selected().Visit(
[&](WaveTrack *wt) {
numWaveTracksSelected++;
endTime = endTime > wt->GetEndTime() ? endTime : wt->GetEndTime();
@@ -993,7 +993,7 @@ void OnScoreAlign(const CommandContext &context)
params.mMidiStart, params.mMidiEnd,
params.mAudioStart, params.mAudioEnd) );
ProjectHistory::Get( project )
.PushState(_("Sync MIDI with Audio"), _("Sync MIDI with Audio"));
.PushState(XO("Sync MIDI with Audio"), XO("Sync MIDI with Audio"));
} else if (result == SA_TOOSHORT) {
AudacityMessageBox(
XO(