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=38229b998beae62516c956095142813cfc42e717;hpb=ad017365f7a73f8ba57f667cc1aa36478b48c50e;p=ardour.git

diff --git a/libs/ardour/ardour/midi_region.h b/libs/ardour/ardour/midi_region.h
index 38229b998b..9039db63d5 100644
--- a/libs/ardour/ardour/midi_region.h
+++ b/libs/ardour/ardour/midi_region.h
@@ -23,20 +23,21 @@
 
 #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 {
-		/* 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
-		*/
-		LIBARDOUR_API extern PBD::PropertyDescriptor<void*> midi_data;
-		LIBARDOUR_API extern PBD::PropertyDescriptor<Evoral::MusicalTime> start_beats;
-		LIBARDOUR_API extern PBD::PropertyDescriptor<Evoral::MusicalTime> length_beats;
+		LIBARDOUR_API extern PBD::PropertyDescriptor<double> start_beats;
+		LIBARDOUR_API extern PBD::PropertyDescriptor<double> length_beats;
 	}
 }
 
@@ -46,13 +47,14 @@ template<typename Time> class EventSink;
 
 namespace ARDOUR {
 
-class Route;
-class Playlist;
-class Session;
+class MidiChannelFilter;
 class MidiFilter;
 class MidiModel;
 class MidiSource;
 class MidiStateTracker;
+class Playlist;
+class Route;
+class Session;
 
 template<typename T> class MidiRingBuffer;
 
@@ -63,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;
 
@@ -75,13 +79,18 @@ 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) const;
+	                    MidiStateTracker* tracker = 0,
+	                    MidiChannelFilter* filter = 0) const;
 
 	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;
 
@@ -102,7 +111,10 @@ class LIBARDOUR_API MidiRegion : public Region
 	boost::shared_ptr<const MidiModel> model() const;
 
 	void fix_negative_start ();
-	void transpose (int);
+	double start_beats () const {return _start_beats; }
+	double length_beats () const {return _length_beats; }
+
+	void clobber_sources (boost::shared_ptr<MidiSource> source);
 
   protected:
 
@@ -112,19 +124,22 @@ class LIBARDOUR_API MidiRegion : public Region
 
   private:
 	friend class RegionFactory;
-	PBD::Property<Evoral::MusicalTime> _start_beats;
-	PBD::Property<Evoral::MusicalTime> _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) const;
+	                     MidiStateTracker* tracker = 0,
+	                     MidiChannelFilter* filter = 0) const;
 
 	void register_properties ();
 	void post_set (const PBD::PropertyChange&);
@@ -132,24 +147,26 @@ 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 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 model_contents_changed ();
 
 	void set_start_beats_from_start_frames ();
-	void update_after_tempo_map_change ();
+	void update_after_tempo_map_change (bool send_change = true);
 
 	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 */