Update of /cvsroot/audacity/audacity-src/src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv21689/src
Modified Files:
Menus.cpp Track.cpp Track.h TrackPanel.cpp
Log Message:
Fix build when USE_MIDI is not defined
Index: Track.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Track.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- Track.cpp 10 Jul 2008 18:14:01 -0000 1.49
+++ Track.cpp 9 Aug 2008 05:45:48 -0000 1.50
@@ -713,6 +713,7 @@
return waveTrackArray;
}
+#if defined(USE_MIDI)
NoteTrackArray TrackList::GetNoteTrackArray(bool selectionOnly)
{
NoteTrackArray noteTrackArray;
@@ -727,6 +728,7 @@
}
return noteTrackArray;
}
+#endif
#ifdef new
#undef new
Index: Track.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Track.h,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- Track.h 7 Jul 2008 18:13:44 -0000 1.47
+++ Track.h 9 Aug 2008 05:45:48 -0000 1.48
@@ -23,17 +23,23 @@
#include <wx/gdicmn.h>
#endif //EXPERIMENTAL_RULER_AUTOSIZE
+#ifdef __WXMSW__
+#pragma warning(disable:4284)
+#endif
+
class wxTextFile;
class DirManager;
class UndoStack;
+class LabelTrack;
class TimeTrack;
class WaveTrack;
-class NoteTrack;
-#ifdef __WXMSW__
-#pragma warning(disable:4284)
-#endif
+
WX_DEFINE_ARRAY(WaveTrack*, WaveTrackArray);
+
+#if defined(USE_MIDI)
+class NoteTrack;
WX_DEFINE_ARRAY(NoteTrack*, NoteTrackArray);
+#endif
class AUDACITY_DLL_API Track: public XMLTagHandler {
@@ -84,7 +90,9 @@
enum {
None,
Wave,
+#if defined(USE_MIDI)
Note,
+#endif
Label,
Time
} TrackKindEnum;
@@ -238,8 +246,11 @@
WaveTrackArray GetWaveTrackArray(bool selectionOnly);
/** Consider this function depricated in favor of GetWaveTrackArray */
void GetWaveTracks(bool selectionOnly, int *num, WaveTrack ***tracks);
+
+#if defined(USE_MIDI)
NoteTrackArray GetNoteTrackArray(bool selectionOnly);
-
+#endif
+
/// Mainly a test function. Uses a linear search, so could be slow.
bool Contains(Track * t) const;
@@ -300,12 +311,6 @@
};
-class WaveTrack;
-class NoteTrack;
-class LabelTrack;
-class TimeTrack;
-class DirManager;
-
class AUDACITY_DLL_API TrackFactory
{
private:
@@ -324,9 +329,11 @@
WaveTrack* DuplicateWaveTrack(WaveTrack &orig);
WaveTrack *NewWaveTrack(sampleFormat format = (sampleFormat)0,
double rate = 0);
- NoteTrack *NewNoteTrack();
LabelTrack *NewLabelTrack();
TimeTrack *NewTimeTrack();
+#if defined(USE_MIDI)
+ NoteTrack *NewNoteTrack();
+#endif
};
#endif
Index: Menus.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Menus.cpp,v
retrieving revision 1.402
retrieving revision 1.403
diff -u -d -r1.402 -r1.403
--- Menus.cpp 7 Aug 2008 23:55:50 -0000 1.402
+++ Menus.cpp 9 Aug 2008 05:45:48 -0000 1.403
@@ -248,8 +248,10 @@
c->AddSeparator();
c->AddItem(wxT("ExportLabels"), _("Export &Labels..."),
FN(OnExportLabels));
c->AddItem(wxT("ExportMultiple"), _("Export &Multiple..."),
FN(OnExportMultiple));
+#if defined(USE_MIDI)
c->AddItem(wxT("ExportMIDI"), _("Export MIDI..."),
FN(OnExportMIDI));
-
+#endif
+
c->SetCommandFlags(wxT("ExportLabels"),
AudioIONotBusyFlag | LabelTracksExistFlag,
AudioIONotBusyFlag | LabelTracksExistFlag);
@@ -1307,6 +1309,7 @@
}
}
}
+#if defined(USE_MIDI)
else if (t->GetKind() == Track::Note) {
NoteTrack *nt = (NoteTrack *) t;
@@ -1317,6 +1320,7 @@
flags |= NoteTracksSelectedFlag;
}
}
+#endif
t = iter.Next();
}
@@ -2706,9 +2710,11 @@
gPrefs->Read(wxT("/GUI/EnableCutLines"), (long)0))
{
((WaveTrack*)n)->Copy(mViewInfo.sel0, mViewInfo.sel1, &dest);
+#if defined(USE_MIDI)
} else if (n->GetKind() == Track::Note) {
// Since portsmf has a built-in cut operator, we use that instead
n->Cut(mViewInfo.sel0, mViewInfo.sel1, &dest);
+#endif
} else {
n->Copy(mViewInfo.sel0, mViewInfo.sel1, &dest);
}
@@ -2723,14 +2729,15 @@
n = iter.Next();
}
+#if defined(USE_MIDI)
n = iter.First();
-
while (n) {
if (n->GetSelected() && n->GetKind() != Track::Note)
//if NoteTrack, it was cut, so do not clear anything
n->Clear(mViewInfo.sel0, mViewInfo.sel1);
n = iter.Next();
}
+#endif
msClipLen = (mViewInfo.sel1 - mViewInfo.sel0);
msClipProject = this;
Index: TrackPanel.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/TrackPanel.cpp,v
retrieving revision 1.417
retrieving revision 1.418
diff -u -d -r1.417 -r1.418
--- TrackPanel.cpp 7 Aug 2008 00:06:40 -0000 1.417
+++ TrackPanel.cpp 9 Aug 2008 05:45:48 -0000 1.418
@@ -5755,10 +5755,12 @@
theMenu->Enable(i, !unsafe);
}
}
-
+
+#if defined(USE_MIDI)
if (t->GetKind() == Track::Note)
theMenu = mNoteTrackMenu;
-
+#endif
+
if (t->GetKind() == Track::Label){
#ifdef EXPERIMENTAL_STICKY_TRACKS
delete mLabelTrackMenu;
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
