X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmidi_region.cc;h=869cb487e48eeb72c24e842f4ce4bb69adf4eb01;hb=dca96d8b5d6737ec811cf5a46548d39a7912bec8;hp=eef2811c5b963c7b438862cb02486ba86f0c783c;hpb=541e6aaeb1a4f743ab43c7afdc99e1ebbd899ec5;p=ardour.git diff --git a/libs/ardour/midi_region.cc b/libs/ardour/midi_region.cc index eef2811c5b..869cb487e4 100644 --- a/libs/ardour/midi_region.cc +++ b/libs/ardour/midi_region.cc @@ -34,6 +34,7 @@ #include "pbd/basename.h" #include "ardour/automation_control.h" +#include "ardour/midi_cursor.h" #include "ardour/midi_model.h" #include "ardour/midi_region.h" #include "ardour/midi_ring_buffer.h" @@ -53,8 +54,8 @@ using namespace PBD; namespace ARDOUR { namespace Properties { - PBD::PropertyDescriptor start_beats; - PBD::PropertyDescriptor length_beats; + PBD::PropertyDescriptor start_beats; + PBD::PropertyDescriptor length_beats; } } @@ -77,11 +78,10 @@ MidiRegion::register_properties () /* Basic MidiRegion constructor (many channels) */ MidiRegion::MidiRegion (const SourceList& srcs) : Region (srcs) - , _start_beats (Properties::start_beats, Evoral::Beats()) - , _length_beats (Properties::length_beats, midi_source(0)->length_beats()) + , _start_beats (Properties::start_beats, 0.0) + , _length_beats (Properties::length_beats, midi_source(0)->length_beats().to_double()) { register_properties (); - midi_source(0)->ModelChanged.connect_same_thread (_source_connection, boost::bind (&MidiRegion::model_changed, this)); model_changed (); assert(_name.val().find("/") == string::npos); @@ -104,10 +104,11 @@ MidiRegion::MidiRegion (boost::shared_ptr other) /** Create a new MidiRegion that is part of an existing one */ MidiRegion::MidiRegion (boost::shared_ptr other, frameoffset_t offset, const int32_t sub_num) : Region (other, offset, sub_num) - , _start_beats (Properties::start_beats, Evoral::Beats()) + , _start_beats (Properties::start_beats, 0.0) , _length_beats (Properties::length_beats, other->_length_beats) { - _start_beats = Evoral::Beats (_session.tempo_map().exact_beat_at_frame ((other->_position + offset), sub_num) - other->beat()) + other->_start_beats; + _start_beats = (_session.tempo_map().exact_qn_at_frame (other->_position + offset, sub_num) - other->pos_beats()) + other->_start_beats; + update_length_beats (sub_num); register_properties (); @@ -190,11 +191,12 @@ MidiRegion::clone (boost::shared_ptr newsrc) const plist.add (Properties::start, _start); plist.add (Properties::start_beats, _start_beats); plist.add (Properties::length, _length); + plist.add (Properties::beat, _beat); plist.add (Properties::length_beats, _length_beats); plist.add (Properties::layer, 0); boost::shared_ptr ret (boost::dynamic_pointer_cast (RegionFactory::create (newsrc, plist, true))); - ret->set_beat (beat()); + ret->set_pos_beats (pos_beats()); return ret; } @@ -205,8 +207,17 @@ MidiRegion::post_set (const PropertyChange& pc) Region::post_set (pc); if (pc.contains (Properties::length) && !pc.contains (Properties::length_beats)) { - /* update non-musically */ - update_length_beats (0); + /* we're called by Stateful::set_values() which sends a change + only if the value is different from _current. + session load means we can clobber length_beats here in error (not all properties differ from current), + 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); + } + } } else if (pc.contains (Properties::start) && !pc.contains (Properties::start_beats)) { set_start_beats_from_start_frames (); } @@ -215,7 +226,9 @@ MidiRegion::post_set (const PropertyChange& pc) void MidiRegion::set_start_beats_from_start_frames () { - _start_beats = Evoral::Beats (beat() - _session.tempo_map().beat_at_frame (_position - _start)); + if (position_lock_style() == AudioTime) { + _start_beats = pos_beats() - _session.tempo_map().quarter_note_at_frame (_position - _start); + } } void @@ -230,7 +243,7 @@ MidiRegion::update_after_tempo_map_change (bool /* send */) { boost::shared_ptr pl (playlist()); - if (!pl || position_lock_style() != MusicTime) { + if (!pl) { return; } @@ -238,12 +251,42 @@ MidiRegion::update_after_tempo_map_change (bool /* send */) const framepos_t old_length = _length; const framepos_t old_start = _start; + PropertyChange s_and_l; + + if (position_lock_style() == AudioTime) { + recompute_position_from_lock_style (0); + + /* + set _start to new position in tempo map. + + The user probably expects the region contents to maintain audio position as the + tempo changes, but AFAICT this requires modifying the src file to use + SMPTE timestamps with the current disk read model (?). + + We could arguably use _start to set _start_beats here, + resulting in viewport-like behaviour (the contents maintain + their musical position while the region is stationary). + + 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()); + + /* _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(); + + s_and_l.add (Properties::start); + s_and_l.add (Properties::length_beats); + + send_change (s_and_l); + return; + } + Region::update_after_tempo_map_change (false); /* _start has now been updated. */ - _length = _session.tempo_map().frame_at_beat (beat() + _length_beats.val().to_double()) - _position; + _length = _session.tempo_map().frames_between_quarter_notes (pos_beats(), pos_beats() + _length_beats); - PropertyChange s_and_l; if (old_start != _start) { s_and_l.add (Properties::start); } @@ -260,7 +303,7 @@ MidiRegion::update_after_tempo_map_change (bool /* send */) void MidiRegion::update_length_beats (const int32_t sub_num) { - _length_beats = Evoral::Beats (_session.tempo_map().exact_beat_at_frame (_position + _length, sub_num) - beat()); + _length_beats = _session.tempo_map().exact_qn_at_frame (_position + _length, sub_num) - pos_beats(); } void @@ -268,36 +311,53 @@ MidiRegion::set_position_internal (framepos_t pos, bool allow_bbt_recompute, con { Region::set_position_internal (pos, allow_bbt_recompute, sub_num); + /* don't clobber _start _length and _length_beats if session loading.*/ + if (_session.loading()) { + return; + } + /* set _start to new position in tempo map */ - _start = _position - _session.tempo_map().frame_at_beat (beat() - _start_beats.val().to_double()); + _start = _session.tempo_map().frames_between_quarter_notes (pos_beats() - start_beats(), pos_beats()); /* in construction from src */ - if (_length_beats == Evoral::Beats()) { + if (_length_beats == 0.0) { update_length_beats (sub_num); } - /* 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().frame_at_beat (beat() + _length_beats.val().to_double()) - _position, sub_num); + if (position_lock_style() == AudioTime) { + _length_beats = _session.tempo_map().quarter_note_at_frame (_position + _length) - pos_beats(); + } 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); + } } framecnt_t MidiRegion::read_at (Evoral::EventSink& out, framepos_t position, framecnt_t dur, + Evoral::Range* loop_range, + MidiCursor& cursor, uint32_t chan_n, NoteMode mode, MidiStateTracker* tracker, MidiChannelFilter* filter) const { - return _read_at (_sources, out, position, dur, chan_n, mode, tracker, filter); + return _read_at (_sources, out, position, dur, loop_range, cursor, chan_n, mode, tracker, filter); } framecnt_t -MidiRegion::master_read_at (MidiRingBuffer& out, framepos_t position, framecnt_t dur, uint32_t chan_n, NoteMode mode) const +MidiRegion::master_read_at (MidiRingBuffer& out, + framepos_t position, + framecnt_t dur, + Evoral::Range* loop_range, + MidiCursor& cursor, + uint32_t chan_n, + NoteMode mode) const { - return _read_at (_master_sources, out, position, dur, chan_n, mode); /* no tracker */ + return _read_at (_master_sources, out, position, dur, loop_range, cursor, chan_n, mode); /* no tracker */ } framecnt_t @@ -305,6 +365,8 @@ MidiRegion::_read_at (const SourceList& /*srcs*/, Evoral::EventSink& dst, framepos_t position, framecnt_t dur, + Evoral::Range* loop_range, + MidiCursor& cursor, uint32_t chan_n, NoteMode mode, MidiStateTracker* tracker, @@ -344,27 +406,34 @@ MidiRegion::_read_at (const SourceList& /*srcs*/, src->set_note_mode(lm, mode); - /* - cerr << "MR " << name () << " read @ " << position << " * " << to_read - << " _position = " << _position - << " _start = " << _start - << " intoffset = " << internal_offset - << endl; - */ +#if 0 + cerr << "MR " << name () << " read @ " << position << " + " << to_read + << " dur was " << dur + << " len " << _length + << " l-io " << (_length - internal_offset) + << " _position = " << _position + << " _start = " << _start + << " intoffset = " << internal_offset + << " pos_beats = " << pos_beats() + << " start_beat = " << _start_beats + << endl; +#endif /* This call reads events from a source and writes them to `dst' timed in session frames */ if (src->midi_read ( lm, // source lock - dst, // destination buffer - _position - _start, // start position of the source in session frames - _start + internal_offset, // where to start reading in the source - to_read, // read duration in frames - tracker, - filter, - _filtered_parameters, - beat(), - _start_beats.val().to_double() + dst, // destination buffer + _position - _start, // start position of the source in session frames + _start + internal_offset, // where to start reading in the source + to_read, // read duration in frames + loop_range, + cursor, + tracker, + filter, + _filtered_parameters, + pos_beats(), + _start_beats ) != to_read) { return 0; /* "read nothing" */ } @@ -383,13 +452,6 @@ MidiRegion::set_state (const XMLNode& node, int version) { int ret = Region::set_state (node, version); - if (ret == 0) { - /* set length beats to the frame (non-musical) */ - if (position_lock_style() == AudioTime) { - update_length_beats (0); - } - } - return ret; } @@ -451,6 +513,23 @@ MidiRegion::midi_source (uint32_t n) const return boost::dynamic_pointer_cast(source(n)); } +/* don't use this. hopefully it will go away. + currently used by headless-chicken session utility. +*/ +void +MidiRegion::clobber_sources (boost::shared_ptr s) +{ + drop_sources(); + + _sources.push_back (s); + s->inc_use_count (); + _master_sources.push_back (s); + s->inc_use_count (); + + s->DropReferences.connect_same_thread (*this, boost::bind (&Region::source_deleted, this, boost::weak_ptr(s))); + +} + void MidiRegion::model_changed () { @@ -513,36 +592,25 @@ MidiRegion::fix_negative_start () model()->insert_silence_at_start (c.from (-_start)); _start = 0; - _start_beats = Evoral::Beats(); + _start_beats = 0.0; } void MidiRegion::set_start_internal (framecnt_t s, const int32_t sub_num) { Region::set_start_internal (s, sub_num); - - if (position_lock_style() == AudioTime) { - set_start_beats_from_start_frames (); - } + set_start_beats_from_start_frames (); } void MidiRegion::trim_to_internal (framepos_t position, framecnt_t length, const int32_t sub_num) { - framepos_t new_start; - if (locked()) { return; } PropertyChange what_changed; - /* beat has been set exactly by set_position_internal, but the source starts on a frame. - working in beats seems the correct thing to do, but reports of a missing first note - on playback suggest otherwise. for now, we work in exact beats. - */ - const double pos_beat = _session.tempo_map().exact_beat_at_frame (position, sub_num); - const double beat_delta = pos_beat - beat(); /* Set position before length, otherwise for MIDI regions this bad thing happens: * 1. we call set_length_internal; length in beats is computed using the region's current @@ -553,19 +621,22 @@ 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(); + + /* sets _pulse to new position.*/ set_position_internal (position, true, sub_num); what_changed.add (Properties::position); - } - const double new_start_beat = _start_beats.val().to_double() + beat_delta; - new_start = _position - _session.tempo_map().frame_at_beat (beat() - new_start_beat); + double new_start_qn = start_beats() + (pos_qn - old_pos_qn); + framepos_t new_start = _session.tempo_map().frames_between_quarter_notes (pos_qn - new_start_qn, pos_qn); - if (!verify_start_and_length (new_start, length)) { - return; - } + if (!verify_start_and_length (new_start, length)) { + return; + } - if (_start != new_start) { - _start_beats = Evoral::Beats (new_start_beat); + _start_beats = new_start_qn; what_changed.add (Properties::start_beats); set_start_internal (new_start, sub_num); @@ -573,6 +644,11 @@ MidiRegion::trim_to_internal (framepos_t position, framecnt_t length, const int3 } if (_length != length) { + + if (!verify_start_and_length (_start, length)) { + return; + } + set_length_internal (length, sub_num); what_changed.add (Properties::length); what_changed.add (Properties::length_beats);