X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmidi_region.cc;h=14cd6d80b086a7dc40c53e79a65d4a40d0bb7426;hb=b285559767e21aae4467270590f048c3263fd742;hp=e7298e752623423c4a7c8e472001a44a9077c5ef;hpb=0d5f4c553a7365612a44e1e0997a6d0e14d8b7ff;p=ardour.git diff --git a/libs/ardour/midi_region.cc b/libs/ardour/midi_region.cc index e7298e7526..14cd6d80b0 100644 --- a/libs/ardour/midi_region.cc +++ b/libs/ardour/midi_region.cc @@ -28,21 +28,26 @@ #include #include +#include "temporal/beats.h" + #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" #include "ardour/midi_source.h" +#include "ardour/playlist.h" #include "ardour/region_factory.h" #include "ardour/session.h" #include "ardour/source_factory.h" #include "ardour/tempo.h" #include "ardour/types.h" +#include "ardour/evoral_types_convert.h" -#include "i18n.h" +#include "pbd/i18n.h" #include using namespace std; @@ -51,17 +56,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")); @@ -78,11 +80,11 @@ MidiRegion::register_properties () /* Basic MidiRegion constructor (many channels) */ MidiRegion::MidiRegion (const SourceList& srcs) : Region (srcs) - , _start_beats (Properties::start_beats, 0) - , _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()) + , _ignore_shift (false) { 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); @@ -92,9 +94,10 @@ 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) 0) + , _length_beats (Properties::length_beats, other->_length_beats) + , _ignore_shift (false) { - update_length_beats (); + //update_length_beats (); register_properties (); assert(_name.val().find("/") == string::npos); @@ -103,19 +106,21 @@ 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) +MidiRegion::MidiRegion (boost::shared_ptr other, MusicSample offset) : Region (other, offset) - , _start_beats (Properties::start_beats, (Evoral::MusicalTime) 0) - , _length_beats (Properties::length_beats, (Evoral::MusicalTime) 0) + , _start_beats (Properties::start_beats, other->_start_beats) + , _length_beats (Properties::length_beats, other->_length_beats) + , _ignore_shift (false) { - BeatsFramesConverter bfc (_session.tempo_map(), _position); - Evoral::MusicalTime const offset_beats = bfc.from (offset); - - _start_beats = other->_start_beats + offset_beats; - _length_beats = other->_length_beats - offset_beats; register_properties (); + const double offset_quarter_note = _session.tempo_map().exact_qn_at_sample (other->_position + offset.sample, offset.division) - other->_quarter_note; + if (offset.sample != 0) { + _start_beats = other->_start_beats + offset_quarter_note; + _length_beats = other->_length_beats - offset_quarter_note; + } + assert(_name.val().find("/") == string::npos); midi_source(0)->ModelChanged.connect_same_thread (_source_connection, boost::bind (&MidiRegion::model_changed, this)); model_changed (); @@ -125,6 +130,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.sample_rate())); + + BeatsSamplesConverter bfc (_session.tempo_map(), _position); + Temporal::Beats const bbegin = bfc.from (_start); + Temporal::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 @@ -133,22 +169,36 @@ MidiRegion::clone (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())); + path, false, _session.sample_rate())); return clone (newsrc); } 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); + BeatsSamplesConverter bfc (_session.tempo_map(), _position); + Temporal::Beats const bbegin = bfc.from (_start); + Temporal::Beats const bend = bfc.from (_start + _length); + + { + boost::shared_ptr 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. + */ - if (midi_source(0)->write_to (newsrc, bbegin, bend)) { - return boost::shared_ptr (); + if (ms->write_to (lm, newsrc, bbegin, bend)) { + return boost::shared_ptr (); + } } PropertyList plist; @@ -158,10 +208,15 @@ 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::position, _position); + 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_quarter_note (quarter_note()); + + return ret; } void @@ -170,78 +225,190 @@ MidiRegion::post_set (const PropertyChange& pc) Region::post_set (pc); if (pc.contains (Properties::length) && !pc.contains (Properties::length_beats)) { - update_length_beats (); - } else if (pc.contains (Properties::start) && !pc.contains (Properties::start_beats)) { - set_start_beats_from_start_frames (); + /* 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()) { + update_length_beats (0); + } + } + + if (pc.contains (Properties::start) && !pc.contains (Properties::start_beats)) { + set_start_beats_from_start_samples (); } } void -MidiRegion::set_start_beats_from_start_frames () +MidiRegion::set_start_beats_from_start_samples () { - BeatsFramesConverter c (_session.tempo_map(), _position - _start); - _start_beats = c.from (_start); + if (position_lock_style() == AudioTime) { + _start_beats = quarter_note() - _session.tempo_map().quarter_note_at_sample (_position - _start); + } } void -MidiRegion::set_length_internal (framecnt_t len) +MidiRegion::set_length_internal (samplecnt_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 samplepos_t old_pos = _position; + const samplepos_t old_length = _length; + const samplepos_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. - /* _position has now been updated for the new tempo map */ - _start = _position - _session.tempo_map().framepos_minus_beats (_position, _start_beats); + 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().samples_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_sample (_position + _length) - quarter_note(); + + s_and_l.add (Properties::start); + s_and_l.add (Properties::length_beats); + + send_change (s_and_l); + return; + } - send_change (Properties::start); + Region::update_after_tempo_map_change (false); + + /* _start has now been updated. */ + _length = max ((samplecnt_t) 1, _session.tempo_map().samples_between_quarter_notes (quarter_note(), quarter_note() + _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_sample (_position + _length, sub_num) - quarter_note(); } void -MidiRegion::set_position_internal (framepos_t pos, bool allow_bbt_recompute) +MidiRegion::set_position_internal (samplepos_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) { + 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().samples_between_quarter_notes (quarter_note() - start_beats(), quarter_note()); + + /* 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_sample (_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 + at the new position (tempo map may dictate a different number of samples). */ - BeatsFramesConverter converter (_session.tempo_map(), _position); - Region::set_length_internal (converter.to (_length_beats)); + Region::set_length_internal (_session.tempo_map().samples_between_quarter_notes (quarter_note(), quarter_note() + 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 +void +MidiRegion::set_position_music_internal (double qn) +{ + Region::set_position_music_internal (qn); + /* set _start to new position in tempo map */ + _start = _session.tempo_map().samples_between_quarter_notes (quarter_note() - start_beats(), quarter_note()); + + if (position_lock_style() == AudioTime) { + _length_beats = _session.tempo_map().quarter_note_at_sample (_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 samples). + */ + _length = _session.tempo_map().samples_between_quarter_notes (quarter_note(), quarter_note() + length_beats()); + } +} + +samplecnt_t +MidiRegion::read_at (Evoral::EventSink& out, + samplepos_t position, + samplecnt_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 +samplecnt_t +MidiRegion::master_read_at (MidiRingBuffer& out, + samplepos_t position, + samplecnt_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 +samplecnt_t +MidiRegion::_read_at (const SourceList& /*srcs*/, + Evoral::EventSink& dst, + samplepos_t position, + samplecnt_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; + sampleoffset_t internal_offset = 0; + samplecnt_t to_read = 0; /* precondition: caller has verified that we cover the desired section */ @@ -269,25 +436,39 @@ MidiRegion::_read_at (const SourceList& /*srcs*/, Evoral::EventSink& } boost::shared_ptr src = midi_source(chan_n); - src->set_note_mode(mode); - - /* - cerr << "MR " << name () << " read @ " << position << " * " << to_read - << " _position = " << _position - << " _start = " << _start - << " intoffset = " << internal_offset - << endl; - */ - /* This call reads events from a source and writes them to `dst' timed in session frames */ + Glib::Threads::Mutex::Lock lm(src->mutex()); + + src->set_note_mode(lm, mode); + +#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 + << " quarter_note = " << quarter_note() + << " start_beat = " << _start_beats + << endl; +#endif + + /* This call reads events from a source and writes them to `dst' timed in session samples */ if (src->midi_read ( - 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 + lm, // source lock + dst, // destination buffer + _position - _start, // start position of the source in session samples + _start + internal_offset, // where to start reading in the source + to_read, // read duration in samples + loop_range, + cursor, + tracker, + filter, + _filtered_parameters, + quarter_note(), + _start_beats ) != to_read) { return 0; /* "read nothing" */ } @@ -306,10 +487,6 @@ MidiRegion::set_state (const XMLNode& node, int version) { int ret = Region::set_state (node, version); - if (ret == 0) { - update_length_beats (); - } - return ret; } @@ -334,7 +511,7 @@ MidiRegion::recompute_at_start () } int -MidiRegion::separate_by_channel (ARDOUR::Session&, vector< boost::shared_ptr >&) const +MidiRegion::separate_by_channel (vector< boost::shared_ptr >&) const { // TODO return -1; @@ -371,6 +548,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 () { @@ -397,14 +591,26 @@ MidiRegion::model_changed () _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)); + model()->ContentsShifted.connect_same_thread (_model_shift_connection, boost::bind (&MidiRegion::model_shifted, this, _1)); } - void -MidiRegion::model_contents_changed () +MidiRegion::model_shifted (double qn_distance) { - send_change (PropertyChange (Properties::midi_data)); + if (!model()) { + return; + } + + if (!_ignore_shift) { + PropertyChange what_changed; + _start_beats += qn_distance; + samplepos_t const new_start = _session.tempo_map().samples_between_quarter_notes (_quarter_note - _start_beats, _quarter_note); + _start = new_start; + what_changed.add (Properties::start); + what_changed.add (Properties::start_beats); + send_change (what_changed); + } else { + _ignore_shift = false; + } } void @@ -413,9 +619,9 @@ MidiRegion::model_automation_state_changed (Evoral::Parameter const & p) /* Update our filtered parameters list after a change to a parameter's AutoState */ boost::shared_ptr ac = model()->automation_control (p); - assert (ac); - - if (ac->alist()->automation_state() == Play) { + if (!ac || ac->alist()->automation_state() == Play) { + /* It should be "impossible" for ac to be NULL, but if it is, don't + filter the parameter so events aren't lost. */ _filtered_parameters.erase (p); } else { _filtered_parameters.insert (p); @@ -425,8 +631,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 (); + 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. @@ -435,24 +644,88 @@ MidiRegion::model_automation_state_changed (Evoral::Parameter const & p) void MidiRegion::fix_negative_start () { - BeatsFramesConverter c (_session.tempo_map(), _position); + BeatsSamplesConverter c (_session.tempo_map(), _position); + + _ignore_shift = true; + + model()->insert_silence_at_start (Temporal::Beats (- _start_beats)); - model()->insert_silence_at_start (c.from (-_start)); _start = 0; - _start_beats = 0; + _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 (samplecnt_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_samples (); } void -MidiRegion::set_start_internal (framecnt_t s) +MidiRegion::trim_to_internal (samplepos_t position, samplecnt_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 samples 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_sample (position, sub_num); + const double old_pos_qn = quarter_note(); + + /* 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); + samplepos_t new_start = _session.tempo_map().samples_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); + } }