X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fmidi_region.h;h=0b62809fc396ee8528f1f0f0d06a1798eaad65da;hb=7b6b75f38ff6b34de3f70e36045498f227c1727d;hp=34ce5628522998352bf3f0d3b8739c356d762db2;hpb=1f81c127fe2dc0f23142a95ad90671bf8f3486c6;p=ardour.git

diff --git a/libs/ardour/ardour/midi_region.h b/libs/ardour/ardour/midi_region.h
index 34ce562852..0b62809fc3 100644
--- a/libs/ardour/ardour/midi_region.h
+++ b/libs/ardour/ardour/midi_region.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000-2006 Paul Davis 
+    Copyright (C) 2000-2006 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -35,8 +35,6 @@
 
 class XMLNode;
 
-using std::vector;
-
 namespace ARDOUR {
 
 class Route;
@@ -44,6 +42,7 @@ class Playlist;
 class Session;
 class MidiFilter;
 class MidiSource;
+class MidiStateTracker;
 template<typename T> class MidiRingBuffer;
 
 class MidiRegion : public Region
@@ -51,43 +50,46 @@ class MidiRegion : public Region
   public:
 	~MidiRegion();
 
+        boost::shared_ptr<MidiRegion> clone ();
+        
 	boost::shared_ptr<MidiSource> midi_source (uint32_t n=0) const;
-	
-	/* Stub Readable interface */
-	virtual nframes_t read (Sample*, sframes_t pos, nframes_t cnt, int channel) const { return 0; }
-	virtual sframes_t readable_length() const { return length(); }
-
-	nframes_t read_at (MidiRingBuffer<nframes_t>& dst,
-			sframes_t position,
-			nframes_t dur, 
-			uint32_t  chan_n = 0,
-			NoteMode  mode = Sustained) const;
 
-	nframes_t master_read_at (MidiRingBuffer<nframes_t>& dst,
-			sframes_t position,
-			nframes_t dur,
-			uint32_t  chan_n = 0,
-			NoteMode  mode = Sustained) const;
-
-	XMLNode& state (bool);
-	int      set_state (const XMLNode&);
-
-	int separate_by_channel (ARDOUR::Session&, vector< boost::shared_ptr<Region> >&) const;
+	/* Stub Readable interface */
+	virtual framecnt_t read (Sample*, framepos_t /*pos*/, framecnt_t /*cnt*/, int /*channel*/) const { return 0; }
+	virtual framecnt_t readable_length() const { return length(); }
+
+	framecnt_t read_at (Evoral::EventSink<nframes_t>& dst,
+			    framepos_t position,
+			    framecnt_t dur,
+			    uint32_t  chan_n = 0,
+			    NoteMode  mode = Sustained,
+			    MidiStateTracker* tracker = 0) const;
 	
+	framepos_t master_read_at (MidiRingBuffer<nframes_t>& dst,
+				   framepos_t position,
+				   framecnt_t dur,
+				   uint32_t  chan_n = 0,
+				   NoteMode  mode = Sustained) const;
+
+	XMLNode& state ();
+	int      set_state (const XMLNode&, int version);
+	
+	int separate_by_channel (ARDOUR::Session&, std::vector< boost::shared_ptr<Region> >&) const;
+
 	/* automation */
 	
 	boost::shared_ptr<Evoral::Control>
 	control(const Evoral::Parameter& id, bool create=false) {
-		return model()->data().control(id, create);
+		return model()->control(id, create);
 	}
 
 	virtual boost::shared_ptr<const Evoral::Control>
 	control(const Evoral::Parameter& id) const {
-		return model()->data().control(id);
+		return model()->control(id);
 	}
 
 	/* export */
-	
+
 	int exportme (ARDOUR::Session&, ARDOUR::ExportSpecification&);
 
 	boost::shared_ptr<MidiModel> model()             { return midi_source()->model(); }
@@ -96,31 +98,29 @@ class MidiRegion : public Region
   private:
 	friend class RegionFactory;
 
-	MidiRegion (boost::shared_ptr<MidiSource>, nframes_t start, nframes_t length);
-	MidiRegion (boost::shared_ptr<MidiSource>, nframes_t start, nframes_t length, const string& name, layer_t = 0, Region::Flag flags = Region::DefaultFlags);
-	MidiRegion (const SourceList &, nframes_t start, nframes_t length, const string& name, layer_t = 0, Region::Flag flags = Region::DefaultFlags);
-	MidiRegion (boost::shared_ptr<const MidiRegion>, nframes_t start, nframes_t length, const string& name, layer_t = 0, Region::Flag flags = Region::DefaultFlags);
-	MidiRegion (boost::shared_ptr<const MidiRegion>);
-	MidiRegion (boost::shared_ptr<MidiSource>, const XMLNode&);
-	MidiRegion (const SourceList &, const XMLNode&);
+	MidiRegion (const SourceList&);
+	MidiRegion (boost::shared_ptr<const MidiRegion>, frameoffset_t offset = 0, bool offset_relative = true);
 
   private:
-	nframes_t _read_at (const SourceList&, MidiRingBuffer<nframes_t>& dst,
-			    nframes_t position,
-			    nframes_t dur, 
-			    uint32_t chan_n = 0,
-				NoteMode mode = Sustained) const;
+	framecnt_t _read_at (const SourceList&, Evoral::EventSink<nframes_t>& dst,
+			     framepos_t position,
+			     framecnt_t dur,
+			     uint32_t chan_n = 0,
+			     NoteMode mode = Sustained, 
+			     MidiStateTracker* tracker = 0) const;
 
 	void recompute_at_start ();
 	void recompute_at_end ();
-	
-	void set_position_internal (nframes_t pos, bool allow_bbt_recompute);
 
-	void switch_source(boost::shared_ptr<Source> source);
+	void set_position_internal (framepos_t pos, bool allow_bbt_recompute);
 
-  protected:
+	void switch_source(boost::shared_ptr<Source> source);
+	void model_changed ();
+	void model_automation_state_changed (Evoral::Parameter const &);
 
-	int set_live_state (const XMLNode&, Change&, bool send);
+	std::set<Evoral::Parameter> _filtered_parameters; ///< parameters that we ask our source not to return when reading
+	PBD::ScopedConnection _model_connection;
+	PBD::ScopedConnection _source_connection;
 };
 
 } /* namespace ARDOUR */