Move midi_util.h.

Fix building without aubio.

git-svn-id: svn://localhost/ardour2/branches/3.0@3842 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/libs/ardour/ardour/midi_util.h b/libs/ardour/ardour/midi_util.h
deleted file mode 100644 (file)
index 6bcc627..0000000
--- a/libs/ardour/ardour/midi_util.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-    Copyright (C) 2006 Paul Davis
-       Written by Dave Robillard, 2006
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#ifndef __ardour_midi_util_h__ 
-#define __ardour_midi_util_h__
-
-#include <midi++/events.h>
-
-namespace ARDOUR {
-
-/** Return the size of the given event NOT including the status byte,
- * or -1 if unknown (eg sysex)
- */
-static inline int
-midi_event_size(unsigned char status)
-{
-       // if we have a channel event
-       if (status >= 0x80 && status < 0xF0) {
-               status &= 0xF0; // mask off the channel
-       }
-
-       switch (status) {
-               case MIDI_CMD_NOTE_OFF:
-               case MIDI_CMD_NOTE_ON:
-               case MIDI_CMD_NOTE_PRESSURE:
-               case MIDI_CMD_CONTROL:
-               case MIDI_CMD_BENDER:
-               case MIDI_CMD_COMMON_SONG_POS:
-                       return 2;
-
-               case MIDI_CMD_PGM_CHANGE:
-               case MIDI_CMD_CHANNEL_PRESSURE:
-               case MIDI_CMD_COMMON_MTC_QUARTER:
-               case MIDI_CMD_COMMON_SONG_SELECT:
-                       return 1;
-
-               case MIDI_CMD_COMMON_TUNE_REQUEST:
-               case MIDI_CMD_COMMON_SYSEX_END:
-               case MIDI_CMD_COMMON_CLOCK:
-               case MIDI_CMD_COMMON_START:
-               case MIDI_CMD_COMMON_CONTINUE:
-               case MIDI_CMD_COMMON_STOP:
-               case MIDI_CMD_COMMON_SENSING:
-               case MIDI_CMD_COMMON_RESET:
-                       return 0;
-               
-               case MIDI_CMD_COMMON_SYSEX:
-                       return -1;
-       }
-
-       return -1;
-}
-
-} // namespace ARDOUR
-
-#endif /* __ardour_midi_util_h__ */

diff --git a/libs/ardour/smf_source.cc b/libs/ardour/smf_source.cc
index 5b70f8e9c6b03047097c9addd52e02a1c1feaf72..c60ee7de412d59814e34d6f24cb3553a2ec4f477 100644 (file)
--- a/libs/ardour/smf_source.cc
+++ b/libs/ardour/smf_source.cc
@@ -37,7 +37,6 @@
 #include <ardour/smf_source.h>
 #include <ardour/session.h>
 #include <ardour/midi_ring_buffer.h>
-#include <ardour/midi_util.h>
 #include <ardour/tempo.h>
 #include <ardour/audioengine.h>
 #include <ardour/event_type_map.h>

diff --git a/libs/evoral/evoral/midi_util.h b/libs/evoral/evoral/midi_util.h
new file mode 100644 (file)
index 0000000..735d884
--- /dev/null
+++ b/libs/evoral/evoral/midi_util.h
@@ -0,0 +1,72 @@
+/* This file is part of Evoral.
+ * Copyright(C) 2008 Dave Robillard <http://drobilla.net>
+ * Copyright(C) 2000-2008 Paul Davis
+ * 
+ * Evoral is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or(at your option) any later
+ * version.
+ * 
+ * Evoral is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for details.
+ * 
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef EVORAL_MIDI_UTIL_H
+#define EVORAL_MIDI_UTIL_H
+
+#include <evoral/midi_events.h>
+
+namespace Evoral {
+
+/** Return the size of the given event NOT including the status byte,
+ * or -1 if unknown (eg sysex)
+ */
+static inline int
+midi_event_size(unsigned char status)
+{
+       // if we have a channel event
+       if (status >= 0x80 && status < 0xF0) {
+               status &= 0xF0; // mask off the channel
+       }
+
+       switch (status) {
+       case MIDI_CMD_NOTE_OFF:
+       case MIDI_CMD_NOTE_ON:
+       case MIDI_CMD_NOTE_PRESSURE:
+       case MIDI_CMD_CONTROL:
+       case MIDI_CMD_BENDER:
+       case MIDI_CMD_COMMON_SONG_POS:
+               return 2;
+
+       case MIDI_CMD_PGM_CHANGE:
+       case MIDI_CMD_CHANNEL_PRESSURE:
+       case MIDI_CMD_COMMON_MTC_QUARTER:
+       case MIDI_CMD_COMMON_SONG_SELECT:
+               return 1;
+
+       case MIDI_CMD_COMMON_TUNE_REQUEST:
+       case MIDI_CMD_COMMON_SYSEX_END:
+       case MIDI_CMD_COMMON_CLOCK:
+       case MIDI_CMD_COMMON_START:
+       case MIDI_CMD_COMMON_CONTINUE:
+       case MIDI_CMD_COMMON_STOP:
+       case MIDI_CMD_COMMON_SENSING:
+       case MIDI_CMD_COMMON_RESET:
+               return 0;
+       
+       case MIDI_CMD_COMMON_SYSEX:
+               return -1;
+       }
+
+       return -1;
+}
+
+} // namespace Evoral
+
+#endif // EVORAL_MIDI_UTIL_H
+

diff --git a/libs/vamp-plugins/plugins.cpp b/libs/vamp-plugins/plugins.cpp
index c45912be9b1d07306718ee5cfdbb175744e499e8..249afd00048ee5d4fbb92d3f7d877a8cde126215 100644 (file)
--- a/libs/vamp-plugins/plugins.cpp
+++ b/libs/vamp-plugins/plugins.cpp
@@ -41,13 +41,17 @@
 #include "SpectralCentroid.h"
 #include "PercussionOnsetDetector.h"
 #include "AmplitudeFollower.h"
+#ifdef HAVE_AUBIO
 #include "Onset.h"
+#endif
 
 static Vamp::PluginAdapter<ZeroCrossing> zeroCrossingAdapter;
 static Vamp::PluginAdapter<SpectralCentroid> spectralCentroidAdapter;
 static Vamp::PluginAdapter<PercussionOnsetDetector> percussionOnsetAdapter;
 static Vamp::PluginAdapter<AmplitudeFollower> amplitudeAdapter;
+#ifdef HAVE_AUBIO
 static Vamp::PluginAdapter<Onset> onsetAdapter;
+#endif
 
 const VampPluginDescriptor *vampGetPluginDescriptor(unsigned int version,
                                                     unsigned int index)
@@ -59,7 +63,9 @@ const VampPluginDescriptor *vampGetPluginDescriptor(unsigned int version,
     case  1: return spectralCentroidAdapter.getDescriptor();
     case  2: return percussionOnsetAdapter.getDescriptor();
     case  3: return amplitudeAdapter.getDescriptor();
+#ifdef HAVE_AUBIO
     case  4: return onsetAdapter.getDescriptor();
+#endif
     default: return 0;
     }
 }