X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fmidi_region.h;h=daca7a243d16d7be6f2bbfc9f607af54e52ad099;hb=62ce39de7e971ec2b2b37e2e639ad0367fa49056;hp=edd9ef31e40cb1990c9ff6cab8a4a3aea8cd17a2;hpb=71986da212b641b53c4583d0dca02cc87c758291;p=ardour.git

diff --git a/libs/ardour/ardour/midi_region.h b/libs/ardour/ardour/midi_region.h
index edd9ef31e4..daca7a243d 100644
--- a/libs/ardour/ardour/midi_region.h
+++ b/libs/ardour/ardour/midi_region.h
@@ -23,14 +23,7 @@
 
 #include <vector>
 
-#include "pbd/fastlog.h"
-#include "pbd/undo.h"
-
 #include "ardour/ardour.h"
-#include "ardour/gain.h"
-#include "ardour/logcurve.h"
-#include "ardour/midi_model.h"
-#include "ardour/midi_source.h"
 #include "ardour/region.h"
 
 class XMLNode;
@@ -39,19 +32,25 @@ 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 
+		   MidiModel used by the MidiRegion
 		*/
 		extern PBD::PropertyDescriptor<void*> midi_data;
+		extern PBD::PropertyDescriptor<Evoral::MusicalTime> start_beats;
 		extern PBD::PropertyDescriptor<Evoral::MusicalTime> length_beats;
 	}
 }
 
+namespace Evoral {
+template<typename Time> class EventSink;
+}
+
 namespace ARDOUR {
 
 class Route;
 class Playlist;
 class Session;
 class MidiFilter;
+class MidiModel;
 class MidiSource;
 class MidiStateTracker;
 template<typename T> class MidiRingBuffer;
@@ -63,8 +62,8 @@ class MidiRegion : public Region
 
 	~MidiRegion();
 
-	boost::shared_ptr<MidiRegion> clone ();
-        
+	boost::shared_ptr<MidiRegion> clone (std::string path = std::string()) const;
+
 	boost::shared_ptr<MidiSource> midi_source (uint32_t n=0) const;
 
 	/* Stub Readable interface */
@@ -77,8 +76,8 @@ class MidiRegion : public Region
 	                    uint32_t  chan_n = 0,
 	                    NoteMode  mode = Sustained,
 	                    MidiStateTracker* tracker = 0) const;
-	
-	framepos_t master_read_at (MidiRingBuffer<framepos_t>& dst,
+
+	framecnt_t master_read_at (MidiRingBuffer<framepos_t>& dst,
 	                           framepos_t position,
 	                           framecnt_t dur,
 	                           uint32_t  chan_n = 0,
@@ -86,48 +85,43 @@ class MidiRegion : public Region
 
 	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()->control(id, create);
-	}
 
-	virtual boost::shared_ptr<const Evoral::Control>
-	control(const Evoral::Parameter& id) const {
-		return model()->control(id);
-	}
+	boost::shared_ptr<Evoral::Control> control(const Evoral::Parameter& id, bool create=false);
 
-	/* export */
+	virtual boost::shared_ptr<const Evoral::Control> control(const Evoral::Parameter& id) const;
 
-	int exportme (ARDOUR::Session&, ARDOUR::ExportSpecification&);
+	/* export */
 
-	boost::shared_ptr<MidiModel> model()             { return midi_source()->model(); }
-	boost::shared_ptr<const MidiModel> model() const { return midi_source()->model(); }
+	boost::shared_ptr<MidiModel> model();
+	boost::shared_ptr<const MidiModel> model() const;
 
 	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> _start_beats;
 	PBD::Property<Evoral::MusicalTime> _length_beats;
 
 	MidiRegion (const SourceList&);
-	MidiRegion (boost::shared_ptr<const MidiRegion>, frameoffset_t offset = 0, bool offset_relative = true);
+	MidiRegion (boost::shared_ptr<const MidiRegion>);
+	MidiRegion (boost::shared_ptr<const MidiRegion>, frameoffset_t offset);
 
 	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, 
+	                     NoteMode mode = Sustained,
 	                     MidiStateTracker* tracker = 0) const;
 
 	void register_properties ();
@@ -138,12 +132,16 @@ class MidiRegion : public Region
 
 	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 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 ();
+
 	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;