add VCA::full_name() which returns "VCA %n" : VCA %n" by default and "VCA %n : user...

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

diff --git a/libs/ardour/midi_region.cc b/libs/ardour/midi_region.cc
index 869cb487e48eeb72c24e842f4ce4bb69adf4eb01..7511aadce86b6631665c7a20ca2404eec664ee14 100644 (file)
--- a/libs/ardour/midi_region.cc
+++ b/libs/ardour/midi_region.cc
@@ -104,12 +104,16 @@ MidiRegion::MidiRegion (boost::shared_ptr<const MidiRegion> other)
 /** Create a new MidiRegion that is part of an existing one */
 MidiRegion::MidiRegion (boost::shared_ptr<const MidiRegion> other, frameoffset_t offset, const int32_t sub_num)
        : Region (other, offset, sub_num)
-       , _start_beats (Properties::start_beats, 0.0)
+       , _start_beats (Properties::start_beats, other->_start_beats)
        , _length_beats (Properties::length_beats, other->_length_beats)
 {
-       _start_beats = (_session.tempo_map().exact_qn_at_frame (other->_position + offset, sub_num) - other->pos_beats()) + other->_start_beats;
+       if (offset != 0) {
+               _start_beats = (_session.tempo_map().exact_qn_at_frame (other->_position + offset, sub_num) - other->_quarter_note) + other->_start_beats;
+               update_length_beats (sub_num);
+               /* we've potentially shifted _start_beats, now reset _start frames to match */
+               _start = _session.tempo_map().frames_between_quarter_notes (_quarter_note - _start_beats, _quarter_note);
+       }
 
-       update_length_beats (sub_num);
        register_properties ();
 
        assert(_name.val().find("/") == string::npos);
@@ -176,10 +180,18 @@ MidiRegion::clone (boost::shared_ptr<MidiSource> newsrc) const
        Evoral::Beats const bend = bfc.from (_start + _length);
 
        {
+               boost::shared_ptr<MidiSource> ms = midi_source(0);
+               Source::Lock lm (ms->mutex());
+
+               if (!ms->model()) {
+                       ms->load_model (lm);
+               }
+
                /* Lock our source since we'll be reading from it.  write_to() will
-                  take a lock on newsrc. */
-               Source::Lock lm (midi_source(0)->mutex());
-               if (midi_source(0)->write_to (lm, newsrc, bbegin, bend)) {
+                  take a lock on newsrc.
+               */
+
+               if (ms->write_to (lm, newsrc, bbegin, bend)) {
                        return boost::shared_ptr<MidiRegion> ();
                }
        }
@@ -196,7 +208,7 @@ MidiRegion::clone (boost::shared_ptr<MidiSource> newsrc) const
        plist.add (Properties::layer, 0);
 
        boost::shared_ptr<MidiRegion> ret (boost::dynamic_pointer_cast<MidiRegion> (RegionFactory::create (newsrc, plist, true)));
-       ret->set_pos_beats (pos_beats());
+       ret->set_quarter_note (quarter_note());
 
        return ret;
 }
@@ -213,12 +225,11 @@ MidiRegion::post_set (const PropertyChange& pc)
                   so disallow (this has been set from XML state anyway).
                */
                if (!_session.loading()) {
-                       /* ensure this only updates non-musical regions */
-                       if (position_lock_style() == AudioTime) {
-                               update_length_beats (0);
-                       }
+                       update_length_beats (0);
                }
-       } else if (pc.contains (Properties::start) && !pc.contains (Properties::start_beats)) {
+       }
+
+       if (pc.contains (Properties::start) && !pc.contains (Properties::start_beats)) {
                set_start_beats_from_start_frames ();
        }
 }
@@ -227,7 +238,7 @@ void
 MidiRegion::set_start_beats_from_start_frames ()
 {
        if (position_lock_style() == AudioTime) {
-               _start_beats = pos_beats() - _session.tempo_map().quarter_note_at_frame (_position - _start);
+               _start_beats = quarter_note() - _session.tempo_map().quarter_note_at_frame (_position - _start);
        }
 }
 
@@ -270,10 +281,10 @@ MidiRegion::update_after_tempo_map_change (bool /* send */)
                  For now, the musical position at the region start is retained, but subsequent events
                  will maintain their beat distance according to the map.
                */
-               _start = _session.tempo_map().frames_between_quarter_notes (pos_beats() - start_beats(), pos_beats());
+               _start = _session.tempo_map().frames_between_quarter_notes (quarter_note() - start_beats(), quarter_note());
 
                /* _length doesn't change for audio-locked regions. update length_beats to match. */
-               _length_beats = _session.tempo_map().quarter_note_at_frame (_position + _length) - pos_beats();
+               _length_beats = _session.tempo_map().quarter_note_at_frame (_position + _length) - quarter_note();
 
                s_and_l.add (Properties::start);
                s_and_l.add (Properties::length_beats);
@@ -285,7 +296,7 @@ MidiRegion::update_after_tempo_map_change (bool /* send */)
        Region::update_after_tempo_map_change (false);
 
        /* _start has now been updated. */
-       _length = _session.tempo_map().frames_between_quarter_notes (pos_beats(), pos_beats() + _length_beats);
+       _length = max ((framecnt_t) 1, _session.tempo_map().frames_between_quarter_notes (quarter_note(), quarter_note() + _length_beats));
 
        if (old_start != _start) {
                s_and_l.add (Properties::start);
@@ -303,7 +314,7 @@ MidiRegion::update_after_tempo_map_change (bool /* send */)
 void
 MidiRegion::update_length_beats (const int32_t sub_num)
 {
-       _length_beats = _session.tempo_map().exact_qn_at_frame (_position + _length, sub_num) - pos_beats();
+       _length_beats = _session.tempo_map().exact_qn_at_frame (_position + _length, sub_num) - quarter_note();
 }
 
 void
@@ -317,7 +328,7 @@ MidiRegion::set_position_internal (framepos_t pos, bool allow_bbt_recompute, con
        }
 
        /* set _start to new position in tempo map */
-       _start = _session.tempo_map().frames_between_quarter_notes (pos_beats() - start_beats(), pos_beats());
+       _start = _session.tempo_map().frames_between_quarter_notes (quarter_note() - start_beats(), quarter_note());
 
        /* in construction from src */
        if (_length_beats == 0.0) {
@@ -325,12 +336,12 @@ MidiRegion::set_position_internal (framepos_t pos, bool allow_bbt_recompute, con
        }
 
        if (position_lock_style() == AudioTime) {
-               _length_beats = _session.tempo_map().quarter_note_at_frame (_position + _length) - pos_beats();
+               _length_beats = _session.tempo_map().quarter_note_at_frame (_position + _length) - quarter_note();
        } else {
                /* leave _length_beats alone, and change _length to reflect the state of things
                   at the new position (tempo map may dictate a different number of frames).
                */
-               Region::set_length_internal (_session.tempo_map().frames_between_quarter_notes (pos_beats(), pos_beats() + length_beats()), sub_num);
+               Region::set_length_internal (_session.tempo_map().frames_between_quarter_notes (quarter_note(), quarter_note() + length_beats()), sub_num);
        }
 }
 
@@ -414,7 +425,7 @@ MidiRegion::_read_at (const SourceList&              /*srcs*/,
             << " _position = " << _position
             << " _start = " << _start
             << " intoffset = " << internal_offset
-            << " pos_beats = " << pos_beats()
+            << " quarter_note = " << quarter_note()
             << " start_beat = " << _start_beats
             << endl;
 #endif
@@ -432,7 +443,7 @@ MidiRegion::_read_at (const SourceList&              /*srcs*/,
                    tracker,
                    filter,
                    _filtered_parameters,
-                   pos_beats(),
+                   quarter_note(),
                    _start_beats
                    ) != to_read) {
                return 0; /* "read nothing" */
@@ -623,7 +634,7 @@ MidiRegion::trim_to_internal (framepos_t position, framecnt_t length, const int3
        if (_position != position) {
 
                const double pos_qn = _session.tempo_map().exact_qn_at_frame (position, sub_num);
-               const double old_pos_qn = pos_beats();
+               const double old_pos_qn = quarter_note();
 
                /* sets _pulse to new position.*/
                set_position_internal (position, true, sub_num);