X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fardour%2Fardour%2Fmidi_region.h;h=21d6c13ade5fca7da322fb9700e3f60ca9ae5a36;hb=0e63fa65b5bf96040e752386083f80403042a6e6;hp=2a4e3a61909486e0255defd34d415bcafb24e512;hpb=c1cfa12d6e5136d2e3e5501e83ff74c5009a9e60;p=ardour.git

diff --git a/libs/ardour/ardour/midi_region.h b/libs/ardour/ardour/midi_region.h
index 2a4e3a6190..21d6c13ade 100644
--- a/libs/ardour/ardour/midi_region.h
+++ b/libs/ardour/ardour/midi_region.h
@@ -23,7 +23,7 @@
 
 #include <vector>
 
-#include "evoral/types.hpp"
+#include "evoral/Beats.hpp"
 
 #include "ardour/ardour.h"
 #include "ardour/region.h"
@@ -32,13 +32,8 @@ 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<Evoral::Beats> start_beats;
+		LIBARDOUR_API extern PBD::PropertyDescriptor<Evoral::Beats> length_beats;
 	}
 }
 
@@ -48,13 +43,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;
 
@@ -79,7 +75,8 @@ class LIBARDOUR_API MidiRegion : public Region
 	                    framecnt_t dur,
 	                    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,
@@ -104,8 +101,8 @@ class LIBARDOUR_API MidiRegion : public Region
 	boost::shared_ptr<const MidiModel> model() const;
 
 	void fix_negative_start ();
-	void transpose (int);
-
+	Evoral::Beats start_beats () {return _start_beats.val(); }
+ 	Evoral::Beats length_beats () {return _length_beats.val(); }
   protected:
 
 	virtual bool can_trim_start_before_source_start () const {
@@ -114,19 +111,20 @@ class LIBARDOUR_API MidiRegion : public Region
 
   private:
 	friend class RegionFactory;
-	PBD::Property<Evoral::MusicalTime> _start_beats;
-	PBD::Property<Evoral::MusicalTime> _length_beats;
+	PBD::Property<Evoral::Beats> _start_beats;
+	PBD::Property<Evoral::Beats> _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>, frameoffset_t offset, const int32_t& sub_num = 0);
 
 	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;
+	                     MidiStateTracker* tracker = 0,
+	                     MidiChannelFilter* filter = 0) const;
 
 	void register_properties ();
 	void post_set (const PBD::PropertyChange&);
@@ -134,17 +132,17 @@ 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_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_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;