Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-07-26 01:18:06 +02:00
Code Issues Releases Wiki Activity

Omit Note tracks from scrubbing and seeking

Browse Source
This commit is contained in:
Paul Licameli 2017-07-16 21:09:28 -04:00
parent 03f9592f58
commit a5e2854b73
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/toolbars/ControlToolBar.cpp
View File

@ -537,6 +537,12 @@ int ControlToolBar::PlayPlayRegion(const SelectedRegion &selectedRegion,
if (!CanStopAudioStream()) if (!CanStopAudioStream())
return -1; return -1;
bool useMidi = true;
// Remove these lines to experiment with scrubbing/seeking of note tracks
if (options.pScrubbingOptions)
useMidi = false;
// Uncomment this for laughs! // Uncomment this for laughs!
// backwards = true; // backwards = true;
@ -582,7 +588,7 @@ int ControlToolBar::PlayPlayRegion(const SelectedRegion &selectedRegion,
for (Track *trk = iter.First(); trk; trk = iter.Next()) { for (Track *trk = iter.First(); trk; trk = iter.Next()) {
if (trk->GetKind() == Track::Wave if (trk->GetKind() == Track::Wave
#ifdef EXPERIMENTAL_MIDI_OUT #ifdef EXPERIMENTAL_MIDI_OUT
|| trk->GetKind() == Track::Note || (trk->GetKind() == Track::Note && useMidi)
#endif #endif
) { ) {
hasaudio = true; hasaudio = true;
@ -667,7 +673,9 @@ int ControlToolBar::PlayPlayRegion(const SelectedRegion &selectedRegion,
mCutPreviewTracks->GetWaveTrackConstArray(false), mCutPreviewTracks->GetWaveTrackConstArray(false),
WaveTrackArray(), WaveTrackArray(),
#ifdef EXPERIMENTAL_MIDI_OUT #ifdef EXPERIMENTAL_MIDI_OUT
mCutPreviewTracks->GetNoteTrackArray(false), useMidi
? mCutPreviewTracks->GetNoteTrackArray(false)
: NoteTrackArray(),
#endif #endif
tcp0, tcp1, myOptions); tcp0, tcp1, myOptions);
} }
@ -685,7 +693,9 @@ int ControlToolBar::PlayPlayRegion(const SelectedRegion &selectedRegion,
token = gAudioIO->StartStream(t->GetWaveTrackConstArray(false), token = gAudioIO->StartStream(t->GetWaveTrackConstArray(false),
WaveTrackArray(), WaveTrackArray(),
#ifdef EXPERIMENTAL_MIDI_OUT #ifdef EXPERIMENTAL_MIDI_OUT
t->GetNoteTrackArray(false), useMidi
? t->GetNoteTrackArray(false)
: NoteTrackArray(),
#endif #endif
t0, t1, options); t0, t1, options);
} }