X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmidi_region.cc;h=8868b7c6814044074f51762c442a1b0645ce923c;hb=8c6e9e15d4acdbf9b6fa8e7411b75650fd6421fc;hp=e64a343e68804ca6f991b7afbae8c6fa62a0a826;hpb=3b4a406ba12e0d7f94c0b75fe96a52da0ad01a71;p=ardour.git diff --git a/libs/ardour/midi_region.cc b/libs/ardour/midi_region.cc index e64a343e68..8868b7c681 100644 --- a/libs/ardour/midi_region.cc +++ b/libs/ardour/midi_region.cc @@ -44,7 +44,7 @@ #include "ardour/tempo.h" #include "ardour/types.h" -#include "i18n.h" +#include "pbd/i18n.h" #include using namespace std; @@ -81,7 +81,6 @@ MidiRegion::MidiRegion (const SourceList& srcs) , _length_beats (Properties::length_beats, midi_source(0)->length_beats()) { 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); @@ -102,12 +101,13 @@ 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) +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()) , _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 = Evoral::Beats (_session.tempo_map().exact_qn_at_frame (other->_position + offset, sub_num) - (other->pulse() * 4.0)) + other->_start_beats; + update_length_beats (sub_num); register_properties (); @@ -120,6 +120,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 @@ -164,6 +195,7 @@ MidiRegion::clone (boost::shared_ptr newsrc) const boost::shared_ptr ret (boost::dynamic_pointer_cast (RegionFactory::create (newsrc, plist, true))); ret->set_beat (beat()); + ret->set_pulse (pulse()); return ret; } @@ -184,11 +216,11 @@ 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)); + _start_beats = Evoral::Beats ((pulse() * 4.0) - _session.tempo_map().quarter_note_at_frame (_position - _start)); } void -MidiRegion::set_length_internal (framecnt_t len, const int32_t& sub_num) +MidiRegion::set_length_internal (framecnt_t len, const int32_t sub_num) { Region::set_length_internal (len, sub_num); update_length_beats (sub_num); @@ -199,7 +231,7 @@ MidiRegion::update_after_tempo_map_change (bool /* send */) { boost::shared_ptr pl (playlist()); - if (!pl || position_lock_style() != MusicTime) { + if (!pl) { return; } @@ -207,12 +239,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 = _position - _session.tempo_map().frame_at_pulse (pulse() - (_start_beats.val().to_double() / 4.0)); + + /* _length doesn't change for audio-locked regions. update length_beats to match. */ + _length_beats = Evoral::Beats (_session.tempo_map().quarter_note_at_frame (_position + _length) - _session.tempo_map().quarter_note_at_frame (_position)); + + 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().frame_at_pulse (pulse() + (_length_beats.val().to_double() / 4.0)) - _position; - PropertyChange s_and_l; if (old_start != _start) { s_and_l.add (Properties::start); } @@ -227,46 +289,56 @@ MidiRegion::update_after_tempo_map_change (bool /* send */) } void -MidiRegion::update_length_beats (const int32_t& sub_num) +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 = Evoral::Beats (_session.tempo_map().exact_qn_at_frame (_position + _length, sub_num) - (pulse() * 4.0)); } void -MidiRegion::set_position_internal (framepos_t pos, bool allow_bbt_recompute, const int32_t& sub_num) +MidiRegion::set_position_internal (framepos_t pos, bool allow_bbt_recompute, const int32_t sub_num) { Region::set_position_internal (pos, allow_bbt_recompute, sub_num); /* set _start to new position in tempo map */ - _start = _position - _session.tempo_map().frame_at_beat (beat() - _start_beats.val().to_double()); + _start = _position - _session.tempo_map().frame_at_pulse (pulse() - (_start_beats.val().to_double() / 4.0)); /* in construction from src */ if (_length_beats == Evoral::Beats()) { 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 = Evoral::Beats (_session.tempo_map().quarter_note_at_frame (_position + _length) - _session.tempo_map().quarter_note_at_frame (_position)); + } 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().frame_at_pulse (pulse() + (_length_beats.val().to_double() / 4.0)) - _position, sub_num); + } } framecnt_t MidiRegion::read_at (Evoral::EventSink& out, framepos_t position, framecnt_t dur, + Evoral::Range* loop_range, 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, 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, + 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, chan_n, mode); /* no tracker */ } framecnt_t @@ -274,6 +346,7 @@ MidiRegion::_read_at (const SourceList& /*srcs*/, Evoral::EventSink& dst, framepos_t position, framecnt_t dur, + Evoral::Range* loop_range, uint32_t chan_n, NoteMode mode, MidiStateTracker* tracker, @@ -313,25 +386,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 + << " pulse = " << pulse() + << " start_pulse = " << start_pulse() + << " 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 + 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, + tracker, + filter, + _filtered_parameters, + pulse(), + _start_beats.val().to_double() ) != to_read) { return 0; /* "read nothing" */ } @@ -418,6 +500,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 () { @@ -484,7 +583,7 @@ MidiRegion::fix_negative_start () } void -MidiRegion::set_start_internal (framecnt_t s, const int32_t& sub_num) +MidiRegion::set_start_internal (framecnt_t s, const int32_t sub_num) { Region::set_start_internal (s, sub_num); @@ -494,18 +593,20 @@ MidiRegion::set_start_internal (framecnt_t s, const int32_t& sub_num) } void -MidiRegion::trim_to_internal (framepos_t position, framecnt_t length, const int32_t& sub_num) +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 not been set by set_position_internal */ - const double beat_delta = _session.tempo_map().exact_beat_at_frame (position, sub_num) - beat(); + /* 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_pulse = _session.tempo_map().exact_qn_at_frame (position, sub_num) / 4.0; + const double pulse_delta = pos_pulse - pulse(); /* 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 @@ -516,21 +617,18 @@ MidiRegion::trim_to_internal (framepos_t position, framecnt_t length, const int3 */ if (_position != position) { + /* sets _beat to new position.*/ set_position_internal (position, true, sub_num); what_changed.add (Properties::position); - } - - const double new_beat = _session.tempo_map().exact_beat_at_frame (position, sub_num); - const double new_start_beat = _start_beats.val().to_double() + beat_delta; - new_start = _position - _session.tempo_map().frame_at_beat (new_beat - new_start_beat); + const double new_start_pulse = (_start_beats.val().to_double() / 4.0) + pulse_delta; + const framepos_t new_start = _position - _session.tempo_map().frame_at_pulse (pulse() - new_start_pulse); - 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 = Evoral::Beats (new_start_pulse * 4.0); what_changed.add (Properties::start_beats); set_start_internal (new_start, sub_num); @@ -538,6 +636,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);