X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fmidi_region.h;h=50352cc7601cce19c108475441d2c6062df869cd;hb=fac2c044d10fa4737ee391c77215f6fb1fc285e2;hp=50fc1516df1d3dc6503ff87458de8068b9f9d5cb;hpb=bb9cc45cd22af67ac275a5e73accbe14fee664d8;p=ardour.git

diff --git a/libs/ardour/ardour/midi_region.h b/libs/ardour/ardour/midi_region.h
index 50fc1516df..50352cc760 100644
--- a/libs/ardour/ardour/midi_region.h
+++ b/libs/ardour/ardour/midi_region.h
@@ -35,6 +35,17 @@
 
 class XMLNode;
 
+namespace ARDOUR {
+	namespace Properties {
+		/* this is pseudo-property: nothing has this as an actual
+		   property, but it allows us to signal changes to the
+		   MidiModel used by the MidiRegion
+		*/
+		extern PBD::PropertyDescriptor<void*> midi_data;
+		extern PBD::PropertyDescriptor<Evoral::MusicalTime> length_beats;
+	}
+}
+
 namespace ARDOUR {
 
 class Route;
@@ -42,33 +53,39 @@ class Playlist;
 class Session;
 class MidiFilter;
 class MidiSource;
+class MidiStateTracker;
 template<typename T> class MidiRingBuffer;
 
 class MidiRegion : public Region
 {
   public:
+	static void make_property_quarks ();
+
 	~MidiRegion();
 
+	boost::shared_ptr<MidiRegion> clone () const;
+
 	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(); }
+	virtual framecnt_t read (Sample*, framepos_t /*pos*/, framecnt_t /*cnt*/, int /*channel*/) const { return 0; }
+	virtual framecnt_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;
+	framecnt_t read_at (Evoral::EventSink<framepos_t>& dst,
+	                    framepos_t position,
+	                    framecnt_t dur,
+	                    uint32_t  chan_n = 0,
+	                    NoteMode  mode = Sustained,
+	                    MidiStateTracker* tracker = 0) 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;
+	framepos_t master_read_at (MidiRingBuffer<framepos_t>& dst,
+	                           framepos_t position,
+	                           framecnt_t dur,
+	                           uint32_t  chan_n = 0,
+	                           NoteMode  mode = Sustained) const;
 
-	XMLNode& state (bool);
-	int      set_state (const XMLNode&);
+	XMLNode& state ();
+	int      set_state (const XMLNode&, int version);
 
 	int separate_by_channel (ARDOUR::Session&, std::vector< boost::shared_ptr<Region> >&) const;
 
@@ -76,12 +93,12 @@ class MidiRegion : public Region
 
 	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 */
@@ -91,34 +108,50 @@ class MidiRegion : public Region
 	boost::shared_ptr<MidiModel> model()             { return midi_source()->model(); }
 	boost::shared_ptr<const MidiModel> model() const { return midi_source()->model(); }
 
+	void fix_negative_start ();
+	void transpose (int);
+
+  protected:
+
+	virtual bool can_trim_start_before_source_start () const {
+		return true;
+	}
+
   private:
 	friend class RegionFactory;
+	PBD::Property<Evoral::MusicalTime> _length_beats;
 
-	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 (const SourceList&);
 	MidiRegion (boost::shared_ptr<const MidiRegion>);
-	MidiRegion (boost::shared_ptr<MidiSource>, const XMLNode&);
-	MidiRegion (const SourceList &, const XMLNode&);
+	MidiRegion (boost::shared_ptr<const MidiRegion>, frameoffset_t offset);
 
-  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<framepos_t>& dst,
+	                     framepos_t position,
+	                     framecnt_t dur,
+	                     uint32_t chan_n = 0,
+	                     NoteMode mode = Sustained,
+	                     MidiStateTracker* tracker = 0) const;
+
+	void register_properties ();
+	void post_set (const PBD::PropertyChange&);
 
 	void recompute_at_start ();
 	void recompute_at_end ();
 
-	void set_position_internal (nframes_t pos, bool allow_bbt_recompute);
+	void set_position_internal (framepos_t pos, bool allow_bbt_recompute);
+	void set_length_internal (framecnt_t len);
+	void update_length_beats ();
 
-	void switch_source(boost::shared_ptr<Source> source);
+	void model_changed ();
+	void model_automation_state_changed (Evoral::Parameter const &);
+	void model_contents_changed ();
 
-  protected:
+	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;
+	PBD::ScopedConnection _model_contents_connection;
 
-	int set_live_state (const XMLNode&, Change&, bool send);
+	double _last_length_beats;
 };
 
 } /* namespace ARDOUR */