Update of /cvsroot/audacity/audacity-src/src/toolbars
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv26476/toolbars
Modified Files:
ControlToolBar.cpp
Log Message:
Removed EXPERIMENTAL_NOTE_TRACK from the Audacity project. In order to turn
MIDI on and off, we now use the USE_MIDI flag instead of the
EXPERIMENTAL_NOTE_TRACK flag.
Index: ControlToolBar.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/toolbars/ControlToolBar.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- ControlToolBar.cpp 28 Jun 2008 21:53:52 -0000 1.28
+++ ControlToolBar.cpp 7 Jul 2008 18:13:48 -0000 1.29
@@ -334,13 +334,7 @@
TrackListIterator iter( p->GetTracks() );
for (Track *t = iter.First(); t; t = iter.Next()) {
-#ifndef EXPERIMENTAL_NOTE_TRACK
- if (t->GetKind() == Track::Wave) {
-#else /* EXPERIMENTAL_NOTE_TRACK */
-/* HCK MIDI PATCH START */
if (t->GetKind() == Track::Wave || t->GetKind() == Track::Note) {
-/* HCK MIDI PATCH END */
-#endif /* EXPERIMENTAL_NOTE_TRACK */
tracks = true;
break;
}
@@ -508,10 +502,8 @@
token = gAudioIO->StartStream(
mCutPreviewTracks->GetWaveTrackArray(false),
WaveTrackArray(),
-#ifdef EXPERIMENTAL_NOTE_TRACK
/* REQUIRES PORTMIDI */
// NoteTrackArray(),
-#endif /* EXPERIMENTAL_NOTE_TRACK */
NULL, p->GetRate(), tcp0, tcp1, p, false,
t0, t1-t0);
} else
@@ -528,10 +520,8 @@
}
token = gAudioIO->StartStream(t->GetWaveTrackArray(false),
WaveTrackArray(),
-#ifdef EXPERIMENTAL_NOTE_TRACK
/* REQUIRES PORTMIDI */
//
t->GetNoteTrackArray(false),
-#endif /* EXPERIMENTAL_NOTE_TRACK */
timetrack,
p->GetRate(), t0, t1, p, looped);
}
@@ -740,27 +730,21 @@
/* TODO: set up stereo tracks if that is how the user has set up
* their preferences, and choose sample format based on prefs */
WaveTrackArray newRecordingTracks, playbackTracks;
-#ifdef EXPERIMENTAL_NOTE_TRACK
/* REQUIRES PORTMIDI */
// NoteTrackArray midiTracks;
-#endif /* EXPERIMENTAL_NOTE_TRACK */
bool duplex;
gPrefs->Read(wxT("/AudioIO/Duplex"), &duplex, true);
if(duplex){
playbackTracks = t->GetWaveTrackArray(false);
-#ifdef EXPERIMENTAL_NOTE_TRACK
/* REQUIRES PORTMIDI */
// midiTracks = t->GetNoteTrackArray(false);
-#endif /* EXPERIMENTAL_NOTE_TRACK */
}
else {
playbackTracks = WaveTrackArray();
-#ifdef EXPERIMENTAL_NOTE_TRACK
/* REQUIRES PORTMIDI */
// midiTracks = NoteTrackArray();
-#endif /* EXPERIMENTAL_NOTE_TRACK */
}
// If SHIFT key was down, the user wants append to tracks
@@ -857,10 +841,8 @@
int token = gAudioIO->StartStream(playbackTracks,
newRecordingTracks,
-#ifdef EXPERIMENTAL_NOTE_TRACK
/* REQUIRES PORTMIDI */
// midiTracks,
-#endif /* EXPERIMENTAL_NOTE_TRACK */
t->GetTimeTrack(),
p->GetRate(), t0, t1, p);
-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
_______________________________________________
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
