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

Modified to allow compile with USE_MIDI turned off (no NoteTrack). Tested with USE_MIDI both defined and undefined when compiled as Unicode Debug/Win32.

Browse Source
This commit is contained in:
rbdannenberg 2012-07-18 03:44:34 +00:00
parent a42f5b45cb
commit 16fd848f9e
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/TrackPanel.cpp
View File

@ -2950,7 +2950,11 @@ void TrackPanel::DoSlide(wxMouseEvent & event)
{ {
// Make sure we always have the first linked track of a stereo track // Make sure we always have the first linked track of a stereo track
if (!mouseTrack->GetLinked() && mTracks->GetLink(mouseTrack)) if (!mouseTrack->GetLinked() && mTracks->GetLink(mouseTrack))
mouseTrack = mTracks->GetLink(mouseTrack); mouseTrack =
#ifndef USE_MIDI
(WaveTrack *)
#endif
mTracks->GetLink(mouseTrack);
// Temporary apply the offset because we want to see if the // Temporary apply the offset because we want to see if the
// track fits with the desired offset // track fits with the desired offset

2
src/effects/SoundTouchEffect.cpp
View File

@ -35,6 +35,7 @@ bool EffectSoundTouch::ProcessLabelTrack(Track *track)
return true; return true;
} }
#ifdef USE_MIDI
bool EffectSoundTouch::ProcessNoteTrack(Track *track) bool EffectSoundTouch::ProcessNoteTrack(Track *track)
{ {
NoteTrack *nt = (NoteTrack *) track; NoteTrack *nt = (NoteTrack *) track;
@ -42,6 +43,7 @@ bool EffectSoundTouch::ProcessNoteTrack(Track *track)
nt->WarpAndTransposeNotes(mCurT0, mCurT1, *GetTimeWarper(), mSemitones); nt->WarpAndTransposeNotes(mCurT0, mCurT1, *GetTimeWarper(), mSemitones);
return true; return true;
} }
#endif
bool EffectSoundTouch::Process() bool EffectSoundTouch::Process()
{ {

2
src/effects/SoundTouchEffect.h
View File

@ -48,7 +48,9 @@ class EffectSoundTouch:public Effect {
private: private:
bool ProcessLabelTrack(Track *track); bool ProcessLabelTrack(Track *track);
#ifdef USE_MIDI
bool ProcessNoteTrack(Track *track); bool ProcessNoteTrack(Track *track);
#endif
bool ProcessOne(WaveTrack * t, sampleCount start, sampleCount end); bool ProcessOne(WaveTrack * t, sampleCount start, sampleCount end);
bool ProcessStereo(WaveTrack* leftTrack, WaveTrack* rightTrack, bool ProcessStereo(WaveTrack* leftTrack, WaveTrack* rightTrack,
sampleCount start, sampleCount end); sampleCount start, sampleCount end);