Merge branch 'master' into cairocanvas

[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 9868d1408fe3acceb957a991dc69d37fe65bd18d..b326bb30d87a0f8df2794240535de47b3ee45497 100644 (file)
--- a/libs/ardour/ardour/midi_region.h
+++ b/libs/ardour/ardour/midi_region.h
@@ -34,9 +34,9 @@ namespace ARDOUR {
                   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> start_beats;
-               extern PBD::PropertyDescriptor<Evoral::MusicalTime> length_beats;
+               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;
        }
 }
 
@@ -53,16 +53,17 @@ class MidiFilter;
 class MidiModel;
 class MidiSource;
 class MidiStateTracker;
+
 template<typename T> class MidiRingBuffer;
 
-class MidiRegion : public Region
+class LIBARDOUR_API MidiRegion : public Region
 {
   public:
        static void make_property_quarks ();
 
        ~MidiRegion();
 
-       boost::shared_ptr<MidiRegion> clone () const;
+       boost::shared_ptr<MidiRegion> clone (std::string path = std::string()) const;
 
        boost::shared_ptr<MidiSource> midi_source (uint32_t n=0) const;
 
@@ -77,7 +78,7 @@ class MidiRegion : public Region
                            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,
@@ -132,6 +133,7 @@ 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 ();