X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fardour%2Fardour%2Fmidi_region.h;h=9039db63d5ba6d1240ef28f6ea1fcde73bc6b025;hb=efc2660fec0d01c4c47d3fffcc5443025b33afc0;hp=b4557ed1dd828fcc0d3911b188c97dff701f79b8;hpb=f3b4644969c4a40c1afdd4aa2e77ce8b8b25a3f9;p=ardour.git

diff --git a/libs/ardour/ardour/midi_region.h b/libs/ardour/ardour/midi_region.h
index b4557ed1dd..9039db63d5 100644
--- a/libs/ardour/ardour/midi_region.h
+++ b/libs/ardour/ardour/midi_region.h
@@ -24,16 +24,20 @@
 #include <vector>
 
 #include "evoral/Beats.hpp"
+#include "evoral/Range.hpp"
+
+#include "pbd/string_convert.h"
 
 #include "ardour/ardour.h"
+#include "ardour/midi_cursor.h"
 #include "ardour/region.h"
 
 class XMLNode;
 
 namespace ARDOUR {
 	namespace Properties {
-		LIBARDOUR_API extern PBD::PropertyDescriptor<Evoral::Beats> start_beats;
-		LIBARDOUR_API extern PBD::PropertyDescriptor<Evoral::Beats> length_beats;
+		LIBARDOUR_API extern PBD::PropertyDescriptor<double> start_beats;
+		LIBARDOUR_API extern PBD::PropertyDescriptor<double> length_beats;
 	}
 }
 
@@ -61,6 +65,8 @@ class LIBARDOUR_API MidiRegion : public Region
 
 	~MidiRegion();
 
+	bool do_export (std::string path) const;
+
 	boost::shared_ptr<MidiRegion> clone (std::string path = std::string()) const;
 	boost::shared_ptr<MidiRegion> clone (boost::shared_ptr<MidiSource>) const;
 
@@ -73,6 +79,8 @@ class LIBARDOUR_API MidiRegion : public Region
 	framecnt_t read_at (Evoral::EventSink<framepos_t>& dst,
 	                    framepos_t position,
 	                    framecnt_t dur,
+	                    Evoral::Range<framepos_t>* loop_range,
+	                    MidiCursor& cursor,
 	                    uint32_t  chan_n = 0,
 	                    NoteMode  mode = Sustained,
 	                    MidiStateTracker* tracker = 0,
@@ -81,6 +89,8 @@ class LIBARDOUR_API MidiRegion : public Region
 	framecnt_t master_read_at (MidiRingBuffer<framepos_t>& dst,
 	                           framepos_t position,
 	                           framecnt_t dur,
+	                           Evoral::Range<framepos_t>* loop_range,
+	                           MidiCursor& cursor,
 	                           uint32_t  chan_n = 0,
 	                           NoteMode  mode = Sustained) const;
 
@@ -101,7 +111,11 @@ class LIBARDOUR_API MidiRegion : public Region
 	boost::shared_ptr<const MidiModel> model() const;
 
 	void fix_negative_start ();
-	Evoral::Beats start_beats () {return _start_beats.val(); }
+	double start_beats () const {return _start_beats; }
+	double length_beats () const {return _length_beats; }
+
+	void clobber_sources (boost::shared_ptr<MidiSource> source);
+
   protected:
 
 	virtual bool can_trim_start_before_source_start () const {
@@ -110,16 +124,18 @@ class LIBARDOUR_API MidiRegion : public Region
 
   private:
 	friend class RegionFactory;
-	PBD::Property<Evoral::Beats> _start_beats;
-	PBD::Property<Evoral::Beats> _length_beats;
+	PBD::Property<double> _start_beats;
+	PBD::Property<double> _length_beats;
 
 	MidiRegion (const SourceList&);
 	MidiRegion (boost::shared_ptr<const MidiRegion>);
-	MidiRegion (boost::shared_ptr<const MidiRegion>, frameoffset_t offset);
+	MidiRegion (boost::shared_ptr<const MidiRegion>, ARDOUR::MusicFrame offset);
 
 	framecnt_t _read_at (const SourceList&, Evoral::EventSink<framepos_t>& dst,
 	                     framepos_t position,
 	                     framecnt_t dur,
+	                     Evoral::Range<framepos_t>* loop_range,
+	                     MidiCursor& cursor,
 	                     uint32_t chan_n = 0,
 	                     NoteMode mode = Sustained,
 	                     MidiStateTracker* tracker = 0,
@@ -131,13 +147,15 @@ class LIBARDOUR_API MidiRegion : public Region
 	void recompute_at_start ();
 	void recompute_at_end ();
 
-	void set_position_internal (framepos_t pos, bool allow_bbt_recompute);
-	void set_length_internal (framecnt_t len);
-	void set_start_internal (framecnt_t);
-	void trim_to_internal (framepos_t position, framecnt_t length);
-	void update_length_beats ();
+	void set_position_internal (framepos_t pos, bool allow_bbt_recompute, const int32_t sub_num);
+	void set_position_music_internal (double qn);
+	void set_length_internal (framecnt_t len, const int32_t sub_num);
+	void set_start_internal (framecnt_t, const int32_t sub_num);
+	void trim_to_internal (framepos_t position, framecnt_t length, const int32_t sub_num);
+	void update_length_beats (const int32_t sub_num);
 
 	void model_changed ();
+	void model_shifted (double qn_distance);
 	void model_automation_state_changed (Evoral::Parameter const &);
 
 	void set_start_beats_from_start_frames ();
@@ -145,10 +163,10 @@ class LIBARDOUR_API MidiRegion : public Region
 
 	std::set<Evoral::Parameter> _filtered_parameters; ///< parameters that we ask our source not to return when reading
 	PBD::ScopedConnection _model_connection;
+	PBD::ScopedConnection _model_shift_connection;
 	PBD::ScopedConnection _source_connection;
 	PBD::ScopedConnection _model_contents_connection;
-
-	double _last_length_beats;
+	bool _ignore_shift;
 };
 
 } /* namespace ARDOUR */