X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmidi_region.cc;h=869cb487e48eeb72c24e842f4ce4bb69adf4eb01;hb=dca96d8b5d6737ec811cf5a46548d39a7912bec8;hp=fe5c04be2585bf98b8f58e1dd3b653ddc98f6c01;hpb=190ac88248eaea43a6bb78074a9347b7cde0dc82;p=ardour.git diff --git a/libs/ardour/midi_region.cc b/libs/ardour/midi_region.cc index fe5c04be25..869cb487e4 100644 --- a/libs/ardour/midi_region.cc +++ b/libs/ardour/midi_region.cc @@ -28,12 +28,13 @@ #include #include -#include "evoral/types.hpp" +#include "evoral/Beats.hpp" #include "pbd/xml++.h" #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" @@ -44,7 +45,7 @@ #include "ardour/tempo.h" #include "ardour/types.h" -#include "i18n.h" +#include "pbd/i18n.h" #include using namespace std; @@ -53,17 +54,14 @@ using namespace PBD; namespace ARDOUR { namespace Properties { - PBD::PropertyDescriptor midi_data; - PBD::PropertyDescriptor start_beats; - PBD::PropertyDescriptor length_beats; + PBD::PropertyDescriptor start_beats; + PBD::PropertyDescriptor length_beats; } } void MidiRegion::make_property_quarks () { - Properties::midi_data.property_id = g_quark_from_static_string (X_("midi-data")); - DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for midi-data = %1\n", Properties::midi_data.property_id)); Properties::start_beats.property_id = g_quark_from_static_string (X_("start-beats")); DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for start-beats = %1\n", Properties::start_beats.property_id)); Properties::length_beats.property_id = g_quark_from_static_string (X_("length-beats")); @@ -80,11 +78,10 @@ MidiRegion::register_properties () /* Basic MidiRegion constructor (many channels) */ MidiRegion::MidiRegion (const SourceList& srcs) : Region (srcs) - , _start_beats (Properties::start_beats, Evoral::MusicalTime()) - , _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); @@ -94,9 +91,9 @@ MidiRegion::MidiRegion (const SourceList& srcs) MidiRegion::MidiRegion (boost::shared_ptr other) : Region (other) , _start_beats (Properties::start_beats, other->_start_beats) - , _length_beats (Properties::length_beats, Evoral::MusicalTime()) + , _length_beats (Properties::length_beats, other->_length_beats) { - update_length_beats (); + //update_length_beats (); register_properties (); assert(_name.val().find("/") == string::npos); @@ -105,17 +102,14 @@ 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) - : Region (other, offset) - , _start_beats (Properties::start_beats, Evoral::MusicalTime()) - , _length_beats (Properties::length_beats, Evoral::MusicalTime()) +MidiRegion::MidiRegion (boost::shared_ptr other, frameoffset_t offset, const int32_t sub_num) + : Region (other, offset, sub_num) + , _start_beats (Properties::start_beats, 0.0) + , _length_beats (Properties::length_beats, other->_length_beats) { - BeatsFramesConverter bfc (_session.tempo_map(), _position); - Evoral::MusicalTime const offset_beats = bfc.from (offset); - - _start_beats = other->_start_beats.val() + offset_beats; - _length_beats = other->_length_beats.val() - offset_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 (); assert(_name.val().find("/") == string::npos); @@ -127,6 +121,37 @@ MidiRegion::~MidiRegion () { } +/** Export the MIDI data of the MidiRegion to a new MIDI file (SMF). + */ +bool +MidiRegion::do_export (string path) const +{ + boost::shared_ptr newsrc; + + /* caller must check for pre-existing file */ + assert (!path.empty()); + assert (!Glib::file_test (path, Glib::FILE_TEST_EXISTS)); + newsrc = boost::dynamic_pointer_cast( + SourceFactory::createWritable(DataType::MIDI, _session, + path, false, _session.frame_rate())); + + BeatsFramesConverter bfc (_session.tempo_map(), _position); + Evoral::Beats const bbegin = bfc.from (_start); + Evoral::Beats const bend = bfc.from (_start + _length); + + { + /* 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)->export_write_to (lm, newsrc, bbegin, bend)) { + return false; + } + } + + return true; +} + + /** Create a new MidiRegion that has its own version of some/all of the Source used by another. */ boost::shared_ptr @@ -147,8 +172,8 @@ boost::shared_ptr MidiRegion::clone (boost::shared_ptr newsrc) const { BeatsFramesConverter bfc (_session.tempo_map(), _position); - Evoral::MusicalTime const bbegin = bfc.from (_start); - Evoral::MusicalTime const bend = bfc.from (_start + _length); + Evoral::Beats const bbegin = bfc.from (_start); + Evoral::Beats const bend = bfc.from (_start + _length); { /* Lock our source since we'll be reading from it. write_to() will @@ -166,10 +191,14 @@ 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); - return boost::dynamic_pointer_cast (RegionFactory::create (newsrc, plist, true)); + boost::shared_ptr ret (boost::dynamic_pointer_cast (RegionFactory::create (newsrc, plist, true))); + ret->set_pos_beats (pos_beats()); + + return ret; } void @@ -178,7 +207,17 @@ MidiRegion::post_set (const PropertyChange& pc) Region::post_set (pc); if (pc.contains (Properties::length) && !pc.contains (Properties::length_beats)) { - update_length_beats (); + /* 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 (); } @@ -187,69 +226,154 @@ MidiRegion::post_set (const PropertyChange& pc) void MidiRegion::set_start_beats_from_start_frames () { - BeatsFramesConverter c (_session.tempo_map(), _position - _start); - _start_beats = c.from (_start); + if (position_lock_style() == AudioTime) { + _start_beats = pos_beats() - _session.tempo_map().quarter_note_at_frame (_position - _start); + } } void -MidiRegion::set_length_internal (framecnt_t len) +MidiRegion::set_length_internal (framecnt_t len, const int32_t sub_num) { - Region::set_length_internal (len); - update_length_beats (); + Region::set_length_internal (len, sub_num); + update_length_beats (sub_num); } void -MidiRegion::update_after_tempo_map_change () +MidiRegion::update_after_tempo_map_change (bool /* send */) { - Region::update_after_tempo_map_change (); + boost::shared_ptr pl (playlist()); + + if (!pl) { + return; + } + + const framepos_t old_pos = _position; + 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(); - /* _position has now been updated for the new tempo map */ - _start = _position - _session.tempo_map().framepos_minus_beats (_position, _start_beats); + s_and_l.add (Properties::start); + s_and_l.add (Properties::length_beats); - send_change (Properties::start); + send_change (s_and_l); + return; + } + + 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); + + if (old_start != _start) { + s_and_l.add (Properties::start); + } + if (old_length != _length) { + s_and_l.add (Properties::length); + } + if (old_pos != _position) { + s_and_l.add (Properties::position); + } + + send_change (s_and_l); } void -MidiRegion::update_length_beats () +MidiRegion::update_length_beats (const int32_t sub_num) { - BeatsFramesConverter converter (_session.tempo_map(), _position); - _length_beats = converter.from (_length); + _length_beats = _session.tempo_map().exact_qn_at_frame (_position + _length, sub_num) - pos_beats(); } void -MidiRegion::set_position_internal (framepos_t pos, bool allow_bbt_recompute) +MidiRegion::set_position_internal (framepos_t pos, bool allow_bbt_recompute, const int32_t sub_num) { - Region::set_position_internal (pos, allow_bbt_recompute); - /* zero length regions don't exist - so if _length_beats is zero, this object - is under construction. - */ - if (_length_beats.val() == Evoral::MusicalTime()) { + 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 = _session.tempo_map().frames_between_quarter_notes (pos_beats() - start_beats(), pos_beats()); + + /* in construction from src */ + if (_length_beats == 0.0) { + update_length_beats (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 + at the new position (tempo map may dictate a different number of frames). */ - BeatsFramesConverter converter (_session.tempo_map(), _position); - Region::set_length_internal (converter.to (_length_beats)); + 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, uint32_t chan_n, NoteMode mode, MidiStateTracker* tracker) const +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); + 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 -MidiRegion::_read_at (const SourceList& /*srcs*/, Evoral::EventSink& dst, framepos_t position, framecnt_t dur, uint32_t chan_n, - NoteMode mode, MidiStateTracker* tracker) const +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, + MidiChannelFilter* filter) const { frameoffset_t internal_offset = 0; - framecnt_t to_read = 0; + framecnt_t to_read = 0; /* precondition: caller has verified that we cover the desired section */ @@ -282,24 +406,34 @@ MidiRegion::_read_at (const SourceList& /*srcs*/, Evoral::EventSink& 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, - _filtered_parameters + 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" */ } @@ -318,10 +452,6 @@ MidiRegion::set_state (const XMLNode& node, int version) { int ret = Region::set_state (node, version); - if (ret == 0) { - update_length_beats (); - } - return ret; } @@ -383,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 () { @@ -408,24 +555,6 @@ MidiRegion::model_changed () midi_source()->AutomationStateChanged.connect_same_thread ( _model_connection, boost::bind (&MidiRegion::model_automation_state_changed, this, _1) ); - - model()->ContentsChanged.connect_same_thread ( - _model_contents_connection, boost::bind (&MidiRegion::model_contents_changed, this)); -} - -void -MidiRegion::model_contents_changed () -{ - { - /* Invalidate source iterator to force reading new contents even if the - calls to read() progress linearly. Try-lock only to avoid deadlock - when called while writing with the source already locked. */ - Glib::Threads::Mutex::Lock lm (midi_source(0)->mutex(), Glib::Threads::TRY_LOCK); - if (lm.locked()) { - midi_source(0)->invalidate (lm); - } - } - send_change (PropertyChange (Properties::midi_data)); } void @@ -446,8 +575,11 @@ MidiRegion::model_automation_state_changed (Evoral::Parameter const & p) for a given set of filtered_parameters, so now that we've changed that list we must invalidate the iterator. */ - Glib::Threads::Mutex::Lock lm (midi_source(0)->mutex()); - midi_source(0)->invalidate (lm); + Glib::Threads::Mutex::Lock lm (midi_source(0)->mutex(), Glib::Threads::TRY_LOCK); + if (lm.locked()) { + /* TODO: This is too aggressive, we need more fine-grained invalidation. */ + midi_source(0)->invalidate (lm); + } } /** This is called when a trim drag has resulted in a -ve _start time for this region. @@ -460,20 +592,80 @@ MidiRegion::fix_negative_start () model()->insert_silence_at_start (c.from (-_start)); _start = 0; - _start_beats = Evoral::MusicalTime(); + _start_beats = 0.0; } -/** Transpose the notes in this region by a given number of semitones */ void -MidiRegion::transpose (int semitones) +MidiRegion::set_start_internal (framecnt_t s, const int32_t sub_num) { - BeatsFramesConverter c (_session.tempo_map(), _start); - model()->transpose (c.from (_start), c.from (_start + _length), semitones); + Region::set_start_internal (s, sub_num); + set_start_beats_from_start_frames (); } void -MidiRegion::set_start_internal (framecnt_t s) +MidiRegion::trim_to_internal (framepos_t position, framecnt_t length, const int32_t sub_num) { - Region::set_start_internal (s); - set_start_beats_from_start_frames (); + if (locked()) { + return; + } + + PropertyChange what_changed; + + + /* 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 + * (soon-to-be old) position + * 2. we call set_position_internal; position is set and length in frames re-computed using + * length in beats from (1) but at the new position, which is wrong if the region + * straddles a tempo/meter change. + */ + + 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); + + 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; + } + + _start_beats = new_start_qn; + what_changed.add (Properties::start_beats); + + set_start_internal (new_start, sub_num); + what_changed.add (Properties::start); + } + + 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); + } + + set_whole_file (false); + + PropertyChange start_and_length; + + start_and_length.add (Properties::start); + start_and_length.add (Properties::length); + + if (what_changed.contains (start_and_length)) { + first_edit (); + } + + if (!what_changed.empty()) { + send_change (what_changed); + } }