X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmidi_region.cc;h=6a9e1cd762ec7e8961c23af46ab83e1e06bf92ac;hb=f72eef1651132f642f53446b4440c1696be2bd2c;hp=ba926211a3fa2f5512cbd80c201443558bee4aa2;hpb=a473d630eb165272992e90f8d854b1d66ec0be63;p=ardour.git diff --git a/libs/ardour/midi_region.cc b/libs/ardour/midi_region.cc index ba926211a3..6a9e1cd762 100644 --- a/libs/ardour/midi_region.cc +++ b/libs/ardour/midi_region.cc @@ -24,21 +24,25 @@ #include -#include +#include +#include +#include + +#include "evoral/Beats.hpp" -#include "pbd/basename.h" #include "pbd/xml++.h" -#include "pbd/enumwriter.h" +#include "pbd/basename.h" +#include "ardour/automation_control.h" +#include "ardour/midi_model.h" #include "ardour/midi_region.h" -#include "ardour/session.h" -#include "ardour/gain.h" -#include "ardour/dB.h" -#include "ardour/playlist.h" +#include "ardour/midi_ring_buffer.h" #include "ardour/midi_source.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/midi_ring_buffer.h" #include "i18n.h" #include @@ -49,16 +53,16 @@ using namespace PBD; namespace ARDOUR { namespace Properties { - PBD::PropertyDescriptor midi_data; - 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")); DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for length-beats = %1\n", Properties::length_beats.property_id)); } @@ -66,12 +70,14 @@ MidiRegion::make_property_quarks () void MidiRegion::register_properties () { + add_property (_start_beats); add_property (_length_beats); } /* 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()) { register_properties (); @@ -84,7 +90,8 @@ MidiRegion::MidiRegion (const SourceList& srcs) MidiRegion::MidiRegion (boost::shared_ptr other) : Region (other) - , _length_beats (Properties::length_beats, (Evoral::MusicalTime) 0) + , _start_beats (Properties::start_beats, other->_start_beats) + , _length_beats (Properties::length_beats, Evoral::Beats()) { update_length_beats (); register_properties (); @@ -94,15 +101,17 @@ MidiRegion::MidiRegion (boost::shared_ptr other) model_changed (); } -/** Create a new MidiRegion, that is part of an existing one */ +/** Create a new MidiRegion that is part of an existing one */ MidiRegion::MidiRegion (boost::shared_ptr other, frameoffset_t offset) : Region (other, offset) - , _length_beats (Properties::length_beats, (Evoral::MusicalTime) 0) + , _start_beats (Properties::start_beats, Evoral::Beats()) + , _length_beats (Properties::length_beats, Evoral::Beats()) { BeatsFramesConverter bfc (_session.tempo_map(), _position); - Evoral::MusicalTime const offset_beats = bfc.from (offset); + Evoral::Beats const offset_beats = bfc.from (offset); - _length_beats = other->_length_beats - offset_beats; + _start_beats = other->_start_beats.val() + offset_beats; + _length_beats = other->_length_beats.val() - offset_beats; register_properties (); @@ -118,34 +127,67 @@ MidiRegion::~MidiRegion () /** Create a new MidiRegion that has its own version of some/all of the Source used by another. */ boost::shared_ptr -MidiRegion::clone () +MidiRegion::clone (string path) const { - BeatsFramesConverter bfc (_session.tempo_map(), _position); - Evoral::MusicalTime const bbegin = bfc.from (_start); - Evoral::MusicalTime const bend = bfc.from (_start + _length); + 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())); + return clone (newsrc); +} - boost::shared_ptr ms = midi_source(0)->clone (bbegin, bend); +boost::shared_ptr +MidiRegion::clone (boost::shared_ptr newsrc) const +{ + 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)->write_to (lm, newsrc, bbegin, bend)) { + return boost::shared_ptr (); + } + } PropertyList plist; - plist.add (Properties::name, ms->name()); + plist.add (Properties::name, PBD::basename_nosuffix (newsrc->name())); plist.add (Properties::whole_file, true); plist.add (Properties::start, _start); + plist.add (Properties::start_beats, _start_beats); plist.add (Properties::length, _length); plist.add (Properties::length_beats, _length_beats); plist.add (Properties::layer, 0); - return boost::dynamic_pointer_cast (RegionFactory::create (ms, plist, true)); + return boost::dynamic_pointer_cast (RegionFactory::create (newsrc, plist, true)); } void 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 (); } } +void +MidiRegion::set_start_beats_from_start_frames () +{ + BeatsFramesConverter c (_session.tempo_map(), _position - _start); + _start_beats = c.from (_start); +} + void MidiRegion::set_length_internal (framecnt_t len) { @@ -153,6 +195,17 @@ MidiRegion::set_length_internal (framecnt_t len) update_length_beats (); } +void +MidiRegion::update_after_tempo_map_change () +{ + Region::update_after_tempo_map_change (); + + /* _position has now been updated for the new tempo map */ + _start = _position - _session.tempo_map().framepos_minus_beats (_position, _start_beats); + + send_change (Properties::start); +} + void MidiRegion::update_length_beats () { @@ -167,7 +220,7 @@ MidiRegion::set_position_internal (framepos_t pos, bool allow_bbt_recompute) /* zero length regions don't exist - so if _length_beats is zero, this object is under construction. */ - if (_length_beats) { + 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 */ @@ -177,9 +230,15 @@ MidiRegion::set_position_internal (framepos_t pos, bool allow_bbt_recompute) } 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 @@ -189,11 +248,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 */ @@ -220,13 +285,14 @@ MidiRegion::_read_at (const SourceList& /*srcs*/, Evoral::EventSink& return 0; /* read nothing */ } - _read_data_count = 0; - boost::shared_ptr src = midi_source(chan_n); - src->set_note_mode(mode); + + Glib::Threads::Mutex::Lock lm(src->mutex()); + + src->set_note_mode(lm, mode); /* - cerr << "MR read @ " << position << " * " << to_read + cerr << "MR " << name () << " read @ " << position << " * " << to_read << " _position = " << _position << " _start = " << _start << " intoffset = " << internal_offset @@ -236,18 +302,18 @@ MidiRegion::_read_at (const SourceList& /*srcs*/, Evoral::EventSink& /* 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 ) != to_read) { return 0; /* "read nothing" */ } - _read_data_count += src->read_data_count(); - return to_read; } @@ -296,10 +362,28 @@ MidiRegion::separate_by_channel (ARDOUR::Session&, vector< boost::shared_ptr +MidiRegion::control (const Evoral::Parameter& id, bool create) { - return -1; + return model()->control(id, create); +} + +boost::shared_ptr +MidiRegion::control (const Evoral::Parameter& id) const +{ + return model()->control(id); +} + +boost::shared_ptr +MidiRegion::model() +{ + return midi_source()->model(); +} + +boost::shared_ptr +MidiRegion::model() const +{ + return midi_source()->model(); } boost::shared_ptr @@ -334,15 +418,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 () -{ - send_change (PropertyChange (Properties::midi_data)); } void @@ -351,9 +426,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); @@ -363,8 +438,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::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. @@ -377,12 +455,12 @@ MidiRegion::fix_negative_start () model()->insert_silence_at_start (c.from (-_start)); _start = 0; + _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) { - BeatsFramesConverter c (_session.tempo_map(), _start); - model()->transpose (c.from (_start), c.from (_start + _length), semitones); + Region::set_start_internal (s); + set_start_beats_from_start_frames (); }