Mercurial > hg > svcore

changeset 560:2e50d95cf621

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* restore compileability
author Chris Cannam
date Mon, 23 Feb 2009 11:43:55 +0000
parents 32d156c75df7
children 863ad4b1f841
files data/data.pro data/fileio/MIDIFileReader.cpp data/fileio/MIDIFileWriter.cpp data/midi/MIDIInput.h
diffstat 4 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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 \
--- 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"
--- 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"
 
--- 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