mirror of
https://github.com/cookiengineer/audacity
synced 2026-01-12 07:35:51 +01:00
Some compilation fixes for EXPERIMENTAL_SCOREALIGN
This commit is contained in:
@@ -58,7 +58,7 @@ static std::unique_ptr<ScoreAlignDialog> gScoreAlignDialog{};
|
|||||||
//IMPLEMENT_CLASS(ScoreAlignDialog, wxDialogWrapper)
|
//IMPLEMENT_CLASS(ScoreAlignDialog, wxDialogWrapper)
|
||||||
|
|
||||||
ScoreAlignDialog::ScoreAlignDialog(ScoreAlignParams ¶ms)
|
ScoreAlignDialog::ScoreAlignDialog(ScoreAlignParams ¶ms)
|
||||||
: wxDialogWrapper(NULL, -1, _("Align MIDI to Audio"),
|
: wxDialogWrapper(NULL, -1, XO("Align MIDI to Audio"),
|
||||||
wxDefaultPosition, wxDefaultSize,
|
wxDefaultPosition, wxDefaultSize,
|
||||||
wxDEFAULT_DIALOG_STYLE)
|
wxDEFAULT_DIALOG_STYLE)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -13,6 +13,9 @@
|
|||||||
|
|
||||||
#ifdef EXPERIMENTAL_SCOREALIGN
|
#ifdef EXPERIMENTAL_SCOREALIGN
|
||||||
|
|
||||||
|
#include <wx/event.h>
|
||||||
|
#include "../widgets/wxPanelWrapper.h"
|
||||||
|
|
||||||
#if 1
|
#if 1
|
||||||
|
|
||||||
#include "ScoreAlignParams.h"
|
#include "ScoreAlignParams.h"
|
||||||
|
|||||||
@@ -888,8 +888,8 @@ void OnMoveSelectionWithTracks(const CommandContext &WXUNUSED(context) )
|
|||||||
void OnScoreAlign(const CommandContext &context)
|
void OnScoreAlign(const CommandContext &context)
|
||||||
{
|
{
|
||||||
auto &project = context.project;
|
auto &project = context.project;
|
||||||
auto tracks = project.GetTracks();
|
auto &tracks = TrackList::Get( project );
|
||||||
const auto rate = project.GetRate();
|
const auto rate = ProjectSettings::Get( project ).GetRate();
|
||||||
|
|
||||||
int numWaveTracksSelected = 0;
|
int numWaveTracksSelected = 0;
|
||||||
int numNoteTracksSelected = 0;
|
int numNoteTracksSelected = 0;
|
||||||
@@ -898,7 +898,7 @@ void OnScoreAlign(const CommandContext &context)
|
|||||||
|
|
||||||
// Iterate through once to make sure that there is exactly
|
// Iterate through once to make sure that there is exactly
|
||||||
// one WaveTrack and one NoteTrack selected.
|
// one WaveTrack and one NoteTrack selected.
|
||||||
GetTracks()->Selected().Visit(
|
tracks.Selected().Visit(
|
||||||
[&](WaveTrack *wt) {
|
[&](WaveTrack *wt) {
|
||||||
numWaveTracksSelected++;
|
numWaveTracksSelected++;
|
||||||
endTime = endTime > wt->GetEndTime() ? endTime : wt->GetEndTime();
|
endTime = endTime > wt->GetEndTime() ? endTime : wt->GetEndTime();
|
||||||
@@ -993,7 +993,7 @@ void OnScoreAlign(const CommandContext &context)
|
|||||||
params.mMidiStart, params.mMidiEnd,
|
params.mMidiStart, params.mMidiEnd,
|
||||||
params.mAudioStart, params.mAudioEnd) );
|
params.mAudioStart, params.mAudioEnd) );
|
||||||
ProjectHistory::Get( project )
|
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) {
|
} else if (result == SA_TOOSHORT) {
|
||||||
AudacityMessageBox(
|
AudacityMessageBox(
|
||||||
XO(
|
XO(
|
||||||
|
|||||||
Reference in New Issue
Block a user