track templates, backported from 2.X

[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..ad66d7c1d6d62fa96e3ddc0ffb2218795c80d471 100644 (file)
--- a/libs/ardour/ardour/midi_playlist.h
+++ b/libs/ardour/ardour/midi_playlist.h
@@ -23,9 +23,9 @@
 #include <vector>
 #include <list>
 
-#include <ardour/ardour.h>
-#include <ardour/playlist.h>
-#include <ardour/parameter.h>
+#include "ardour/ardour.h"
+#include "ardour/playlist.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,17 +47,16 @@ public:
 
        ~MidiPlaylist ();
 
-       nframes_t read (MidiRingBuffer& buf,
+       nframes_t read (MidiRingBuffer<nframes_t>& buf,
                        nframes_t start, nframes_t cnt, uint32_t chan_n=0);
 
        int set_state (const XMLNode&);
-       UndoAction get_memento() const;
 
        bool destroy_region (boost::shared_ptr<Region>);
        
        void set_note_mode (NoteMode m) { _note_mode = m; }
 
-       std::set<Parameter> contained_automation();
+       std::set<Evoral::Parameter> contained_automation();
 
 protected: