Less weak plugin preset system (maybe AU preset stuff can use the 'normal' thing...

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

diff --git a/libs/ardour/ardour/midi_region.h b/libs/ardour/ardour/midi_region.h
index 44f775dc1c84e5fea459bb308d454dc4dea3e9dc..781f815ec551582988f91f1951faaf77fd0bcdb2 100644 (file)
--- a/libs/ardour/ardour/midi_region.h
+++ b/libs/ardour/ardour/midi_region.h
@@ -43,11 +43,13 @@ class Playlist;
 class Session;
 class MidiFilter;
 class MidiSource;
-class MidiRingBuffer;
+template<typename T> class MidiRingBuffer;
 
 class MidiRegion : public Region
 {
   public:
+       typedef double TimeType;
+
        ~MidiRegion();
 
        boost::shared_ptr<MidiSource> midi_source (uint32_t n=0) const;
@@ -56,13 +58,13 @@ class MidiRegion : public Region
        virtual nframes64_t read (Sample*, nframes64_t pos, nframes64_t cnt, int channel) const { return 0; }
        virtual nframes64_t readable_length() const { return length(); }
 
-       nframes_t read_at (MidiRingBuffer& dst,
+       nframes_t read_at (MidiRingBuffer<TimeType>& dst,
                           nframes_t position,
                           nframes_t dur, 
                           uint32_t  chan_n = 0,
                           NoteMode  mode = Sustained) const;
 
-       nframes_t master_read_at (MidiRingBuffer& dst,
+       nframes_t master_read_at (MidiRingBuffer<TimeType>& dst,
                        nframes_t position,
                        nframes_t dur,
                        uint32_t  chan_n = 0,
@@ -72,22 +74,28 @@ class MidiRegion : public Region
        int      set_state (const XMLNode&);
 
        int separate_by_channel (ARDOUR::Session&, vector<MidiRegion*>&) const;
-
-       UndoAction get_memento() const;
-
-       // Act as a proxy for MidiModel automation stuff (for CC)
-       // Yep, this is pretty ugly...
-       Controls&       controls()       { return midi_source()->model()->controls(); }
-       const Controls& controls() const { return midi_source()->model()->controls(); }
        
-       boost::shared_ptr<AutomationControl> control(Parameter id, bool create_if_missing=false)
-                       { return midi_source()->model()->control(id, create_if_missing); }
+       /* automation */
+       
+       boost::shared_ptr<Evoral::Control>
+       control(const Evoral::Parameter& id, bool create=false) {
+               return model()->data().control(id, create);
+       }
 
-       boost::shared_ptr<const AutomationControl> control(Parameter id) const
-                       { return midi_source()->model()->control(id); }
+       virtual boost::shared_ptr<const Evoral::Control>
+       control(const Evoral::Parameter& id) const {
+               return model()->data().control(id);
+       }
+
+       /* export */
        
        int exportme (ARDOUR::Session&, ARDOUR::ExportSpecification&);
 
+       UndoAction get_memento() const;
+
+       boost::shared_ptr<MidiModel> model()             { return midi_source()->model(); }
+       boost::shared_ptr<const MidiModel> model() const { return midi_source()->model(); }
+
   private:
        friend class RegionFactory;
 
@@ -100,7 +108,7 @@ class MidiRegion : public Region
        MidiRegion (const SourceList &, const XMLNode&);
 
   private:
-       nframes_t _read_at (const SourceList&, MidiRingBuffer& dst,
+       nframes_t _read_at (const SourceList&, MidiRingBuffer<TimeType>& dst,
                            nframes_t position,
                            nframes_t dur, 
                            uint32_t chan_n = 0,