X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmidi_region.cc;h=4c678c04e0d818f961a451c760857a6ab03d36a4;hb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;hp=c02caff470ef2a2bc38e222896f0e05885a2ca06;hpb=2a251b457069ffb4b744fbd0dd7aca7acb31f381;p=ardour.git diff --git a/libs/ardour/midi_region.cc b/libs/ardour/midi_region.cc index c02caff470..4c678c04e0 100644 --- a/libs/ardour/midi_region.cc +++ b/libs/ardour/midi_region.cc @@ -28,7 +28,7 @@ #include #include -#include "evoral/types.hpp" +#include "evoral/Beats.hpp" #include "pbd/xml++.h" #include "pbd/basename.h" @@ -44,7 +44,7 @@ #include "ardour/tempo.h" #include "ardour/types.h" -#include "i18n.h" +#include "pbd/i18n.h" #include using namespace std; @@ -53,7 +53,6 @@ using namespace PBD; namespace ARDOUR { namespace Properties { - PBD::PropertyDescriptor midi_data; PBD::PropertyDescriptor start_beats; PBD::PropertyDescriptor length_beats; } @@ -62,8 +61,6 @@ namespace ARDOUR { 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")); @@ -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::Beats()) + , _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,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) - : Region (other, offset) +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, Evoral::Beats()) + , _length_beats (Properties::length_beats, other->_length_beats) { - BeatsFramesConverter bfc (_session.tempo_map(), _position); - Evoral::Beats const offset_beats = bfc.from (offset); - - _start_beats = other->_start_beats.val() + offset_beats; - _length_beats = other->_length_beats.val() - offset_beats; - + _start_beats = Evoral::Beats (_session.tempo_map().exact_beat_at_frame ((other->_position + offset), sub_num) - other->beat()) + other->_start_beats; + update_length_beats (sub_num); register_properties (); assert(_name.val().find("/") == string::npos); @@ -169,7 +162,10 @@ MidiRegion::clone (boost::shared_ptr newsrc) const 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_beat (beat()); + + return ret; } void @@ -178,7 +174,8 @@ MidiRegion::post_set (const PropertyChange& pc) Region::post_set (pc); if (pc.contains (Properties::length) && !pc.contains (Properties::length_beats)) { - update_length_beats (); + /* update non-musically */ + update_length_beats (0); } else if (pc.contains (Properties::start) && !pc.contains (Properties::start_beats)) { set_start_beats_from_start_frames (); } @@ -187,55 +184,83 @@ 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); + _start_beats = Evoral::Beats (beat() - _session.tempo_map().beat_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 || position_lock_style() != MusicTime) { + return; + } + + const framepos_t old_pos = _position; + const framepos_t old_length = _length; + const framepos_t old_start = _start; + + 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; - /* _position has now been updated for the new tempo map */ - _start = _position - _session.tempo_map().framepos_minus_beats (_position, _start_beats); + PropertyChange s_and_l; + 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 (Properties::start); + 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 = Evoral::Beats (_session.tempo_map().exact_beat_at_frame (_position + _length, sub_num) - beat()); } 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::Beats()) { - /* 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 - */ - BeatsFramesConverter converter (_session.tempo_map(), _position); - Region::set_length_internal (converter.to (_length_beats)); + 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()); + + /* 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); } 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, + 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, chan_n, mode, tracker, filter); } framecnt_t @@ -245,11 +270,17 @@ MidiRegion::master_read_at (MidiRingBuffer& out, framepos_t position } 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, + 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 */ @@ -299,7 +330,10 @@ MidiRegion::_read_at (const SourceList& /*srcs*/, Evoral::EventSink& _start + internal_offset, // where to start reading in the source to_read, // read duration in frames tracker, - _filtered_parameters + filter, + _filtered_parameters, + beat(), + _start_beats.val().to_double() ) != to_read) { return 0; /* "read nothing" */ } @@ -319,7 +353,10 @@ MidiRegion::set_state (const XMLNode& node, int version) int ret = Region::set_state (node, version); if (ret == 0) { - update_length_beats (); + /* set length beats to the frame (non-musical) */ + if (position_lock_style() == AudioTime) { + update_length_beats (0); + } } return ret; @@ -408,24 +445,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 @@ -448,6 +467,7 @@ MidiRegion::model_automation_state_changed (Evoral::Parameter const & p) */ 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); } } @@ -465,17 +485,80 @@ MidiRegion::fix_negative_start () _start_beats = Evoral::Beats(); } -/** 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); + + if (position_lock_style() == AudioTime) { + 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 (); + 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 + * (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) { + 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); + + if (!verify_start_and_length (new_start, length)) { + return; + } + + if (_start != new_start) { + _start_beats = Evoral::Beats (new_start_beat); + what_changed.add (Properties::start_beats); + + set_start_internal (new_start, sub_num); + what_changed.add (Properties::start); + } + + if (_length != length) { + 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); + } }