# HG changeset patch
# User Chris Cannam
# Date 1235389435 0
# Node ID 2e50d95cf62149c7195b86d1d8e8dcbc3d6f6bb0
# Parent  32d156c75df7ee7751add7dde7160f2fcfe5080e
* restore compileability

diff -r 32d156c75df7 -r 2e50d95cf621 data/data.pro
--- a/data/data.pro	Mon Feb 23 11:41:28 2009 +0000
+++ b/data/data.pro	Mon Feb 23 11:43:55 2009 +0000
@@ -37,7 +37,6 @@
            fileio/FileSource.h \
            fileio/MatchFileReader.h \
            fileio/MatrixFile.h \
-           fileio/MIDIEvent.h \
            fileio/MIDIFileReader.h \
            fileio/MIDIFileWriter.h \
            fileio/MP3FileReader.h \
@@ -47,6 +46,8 @@
            fileio/ResamplingWavFileReader.h \
            fileio/WavFileReader.h \
            fileio/WavFileWriter.h \
+           midi/MIDIEvent.h \
+           midi/MIDIInput.h \
            model/AggregateWaveModel.h \
            model/AlignmentModel.h \
            model/Dense3DModelPeakCache.h \
diff -r 32d156c75df7 -r 2e50d95cf621 data/fileio/MIDIFileReader.cpp
--- a/data/fileio/MIDIFileReader.cpp	Mon Feb 23 11:41:28 2009 +0000
+++ b/data/fileio/MIDIFileReader.cpp	Mon Feb 23 11:43:55 2009 +0000
@@ -28,7 +28,7 @@
 
 #include "MIDIFileReader.h"
 
-#include "MIDIEvent.h"
+#include "data/midi/MIDIEvent.h"
 
 #include "model/Model.h"
 #include "base/Pitch.h"
diff -r 32d156c75df7 -r 2e50d95cf621 data/fileio/MIDIFileWriter.cpp
--- a/data/fileio/MIDIFileWriter.cpp	Mon Feb 23 11:41:28 2009 +0000
+++ b/data/fileio/MIDIFileWriter.cpp	Mon Feb 23 11:43:55 2009 +0000
@@ -22,7 +22,7 @@
 
 #include "MIDIFileWriter.h"
 
-#include "MIDIEvent.h"
+#include "data/midi/MIDIEvent.h"
 
 #include "model/NoteModel.h"
 
diff -r 32d156c75df7 -r 2e50d95cf621 data/midi/MIDIInput.h
--- a/data/midi/MIDIInput.h	Mon Feb 23 11:41:28 2009 +0000
+++ b/data/midi/MIDIInput.h	Mon Feb 23 11:43:55 2009 +0000
@@ -19,6 +19,9 @@
 #include <QObject>
 #include "MIDIEvent.h"
 
+#include <vector>
+#include "base/RingBuffer.h"
+
 class RtMidi;
 
 class MIDIInput : public QObject