Fixes to bundle manager to make it vaguely usable.

[ardour.git] / libs / ardour / ardour / midi_playlist.h

diff --git a/libs/ardour/ardour/midi_playlist.h b/libs/ardour/ardour/midi_playlist.h
index dcc202bbf4edc735b7753bd003e34332713e47cc..d7fdadb2f532092b129459a374315a4d38c03379 100644 (file)
--- a/libs/ardour/ardour/midi_playlist.h
+++ b/libs/ardour/ardour/midi_playlist.h
@@ -25,7 +25,7 @@
 
 #include <ardour/ardour.h>
 #include <ardour/playlist.h>
-#include <ardour/parameter.h>
+#include <evoral/Parameter.hpp>
 
 namespace ARDOUR
 {
@@ -34,7 +34,7 @@ class Session;
 class Region;
 class MidiRegion;
 class Source;
-class MidiRingBuffer;
+template<typename T> class MidiRingBuffer;
 
 class MidiPlaylist : public ARDOUR::Playlist
 {
@@ -47,7 +47,7 @@ public:
 
        ~MidiPlaylist ();
 
-       nframes_t read (MidiRingBuffer& buf,
+       nframes_t read (MidiRingBuffer<double>& buf,
                        nframes_t start, nframes_t cnt, uint32_t chan_n=0);
 
        int set_state (const XMLNode&);
@@ -57,7 +57,7 @@ public:
        
        void set_note_mode (NoteMode m) { _note_mode = m; }
 
-       std::set<Parameter> contained_automation();
+       std::set<Evoral::Parameter> contained_automation();
 
 protected: