Differentiate between pitch-shift (for audio) and transpose (for MIDI). Fixes #3940.

[ardour.git] / libs / ardour / ardour / midi_region.h

diff --git a/libs/ardour/ardour/midi_region.h b/libs/ardour/ardour/midi_region.h
index 853272d3499c309aa0c31e855377ff1f44e18340..bb9f011ec8037c3b94bd6ea989a5b4816f119d84 100644 (file)
--- a/libs/ardour/ardour/midi_region.h
+++ b/libs/ardour/ardour/midi_region.h
@@ -36,13 +36,14 @@
 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; 
-        }
+       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 {
@@ -62,7 +63,7 @@ class MidiRegion : public Region
 
        ~MidiRegion();
 
-        boost::shared_ptr<MidiRegion> clone ();
+       boost::shared_ptr<MidiRegion> clone ();
         
        boost::shared_ptr<MidiSource> midi_source (uint32_t n=0) const;
 
@@ -71,17 +72,17 @@ class MidiRegion : public Region
        virtual framecnt_t readable_length() const { return length(); }
 
        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;
+                           framepos_t position,
+                           framecnt_t dur,
+                           uint32_t  chan_n = 0,
+                           NoteMode  mode = Sustained,
+                           MidiStateTracker* tracker = 0) 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;
+                                  framepos_t position,
+                                  framecnt_t dur,
+                                  uint32_t  chan_n = 0,
+                                  NoteMode  mode = Sustained) const;
 
        XMLNode& state ();
        int      set_state (const XMLNode&, int version);
@@ -107,35 +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 (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);
 
-  private:
        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;
+                            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 (framepos_t pos, bool allow_bbt_recompute);
+       void set_length_internal (framecnt_t len);
+       void update_length_beats ();
 
        void model_changed ();
        void model_automation_state_changed (Evoral::Parameter const &);
-        void model_contents_changed ();
+       void model_contents_changed ();
 
        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;
+       PBD::ScopedConnection _model_contents_connection;
+
+       double _last_length_beats;
 };
 
 } /* namespace ARDOUR */