X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmidi_region.cc;h=fe03e64f72a3b1ba7b040777f6e67735f7532c67;hb=c158c44fab4d5cd0a6fade9213b262849d90dc31;hp=b95f35f72633081bf908a9ab4507872264535831;hpb=f8fe64a91e7ae7f6ac761e8ae16a485ed70fb994;p=ardour.git diff --git a/libs/ardour/midi_region.cc b/libs/ardour/midi_region.cc index b95f35f726..fe03e64f72 100644 --- a/libs/ardour/midi_region.cc +++ b/libs/ardour/midi_region.cc @@ -24,8 +24,6 @@ #include -#include -#include #include @@ -39,6 +37,7 @@ #include "ardour/dB.h" #include "ardour/playlist.h" #include "ardour/midi_source.h" +#include "ardour/region_factory.h" #include "ardour/types.h" #include "ardour/midi_ring_buffer.h" @@ -47,112 +46,92 @@ using namespace std; using namespace ARDOUR; - -/** Basic MidiRegion constructor (one channel) */ -MidiRegion::MidiRegion (boost::shared_ptr src, nframes_t start, nframes_t length) - : Region (src, start, length, PBD::basename_nosuffix(src->name()), DataType::MIDI, 0, Region::Flag(Region::DefaultFlags|Region::External)) -{ - assert(_name.find("/") == string::npos); - midi_source(0)->Switched.connect(sigc::mem_fun(this, &MidiRegion::switch_source)); -} - -/* Basic MidiRegion constructor (one channel) */ -MidiRegion::MidiRegion (boost::shared_ptr src, nframes_t start, nframes_t length, const string& name, layer_t layer, Flag flags) - : Region (src, start, length, name, DataType::MIDI, layer, flags) -{ - assert(_name.find("/") == string::npos); - midi_source(0)->Switched.connect(sigc::mem_fun(this, &MidiRegion::switch_source)); -} +using namespace PBD; /* Basic MidiRegion constructor (many channels) */ -MidiRegion::MidiRegion (const SourceList& srcs, nframes_t start, nframes_t length, const string& name, layer_t layer, Flag flags) - : Region (srcs, start, length, name, DataType::MIDI, layer, flags) +MidiRegion::MidiRegion (const SourceList& srcs) + : Region (srcs) { - assert(_name.find("/") == string::npos); - midi_source(0)->Switched.connect(sigc::mem_fun(this, &MidiRegion::switch_source)); + midi_source(0)->Switched.connect_same_thread (*this, boost::bind (&MidiRegion::switch_source, this, _1)); + assert(_name.val().find("/") == string::npos); + assert(_type == DataType::MIDI); } - /** Create a new MidiRegion, that is part of an existing one */ -MidiRegion::MidiRegion (boost::shared_ptr other, nframes_t offset, nframes_t length, const string& name, layer_t layer, Flag flags) - : Region (other, offset, length, name, layer, flags) +MidiRegion::MidiRegion (boost::shared_ptr other, frameoffset_t offset, bool offset_relative) + : Region (other, offset, offset_relative) { - assert(_name.find("/") == string::npos); - midi_source(0)->Switched.connect(sigc::mem_fun(this, &MidiRegion::switch_source)); + assert(_name.val().find("/") == string::npos); + midi_source(0)->Switched.connect_same_thread (*this, boost::bind (&MidiRegion::switch_source, this, _1)); } -MidiRegion::MidiRegion (boost::shared_ptr other) - : Region (other) +MidiRegion::~MidiRegion () { - assert(_name.find("/") == string::npos); - midi_source(0)->Switched.connect(sigc::mem_fun(this, &MidiRegion::switch_source)); } -MidiRegion::MidiRegion (boost::shared_ptr src, const XMLNode& node) - : Region (src, node) +/** Create a new MidiRegion that has its own version of some/all of the Source used by another. + */ +boost::shared_ptr +MidiRegion::clone () { - if (set_state (node, Stateful::loading_state_version)) { - throw failed_constructor(); - } + BeatsFramesConverter bfc (_session.tempo_map(), _position); + double bbegin = bfc.from (_position); + double bend = bfc.from (last_frame() + 1); - midi_source(0)->Switched.connect(sigc::mem_fun(this, &MidiRegion::switch_source)); - assert(_name.find("/") == string::npos); - assert(_type == DataType::MIDI); -} + boost::shared_ptr ms = midi_source(0)->clone (bbegin, bend); -MidiRegion::MidiRegion (const SourceList& srcs, const XMLNode& node) - : Region (srcs, node) -{ - if (set_state (node, Stateful::loading_state_version)) { - throw failed_constructor(); - } + PropertyList plist; - midi_source(0)->Switched.connect(sigc::mem_fun(this, &MidiRegion::switch_source)); - assert(_name.find("/") == string::npos); - assert(_type == DataType::MIDI); -} + plist.add (Properties::name, ms->name()); + plist.add (Properties::whole_file, true); + plist.add (Properties::start, 0); + plist.add (Properties::length, _length); + plist.add (Properties::layer, 0); -MidiRegion::~MidiRegion () -{ + return boost::dynamic_pointer_cast (RegionFactory::create (ms, plist, true)); } void -MidiRegion::set_position_internal (nframes_t pos, bool allow_bbt_recompute) +MidiRegion::set_position_internal (framepos_t pos, bool allow_bbt_recompute) { - BeatsFramesConverter old_converter(_session, _position - _start); + BeatsFramesConverter old_converter(_session.tempo_map(), _position - _start); double length_beats = old_converter.from(_length); Region::set_position_internal(pos, allow_bbt_recompute); - BeatsFramesConverter new_converter(_session, pos - _start); + BeatsFramesConverter new_converter(_session.tempo_map(), pos - _start); set_length(new_converter.to(length_beats), 0); } -nframes_t -MidiRegion::read_at (Evoral::EventSink& out, sframes_t position, nframes_t dur, uint32_t chan_n, NoteMode mode, MidiStateTracker* tracker) const +framecnt_t +MidiRegion::read_at (Evoral::EventSink& out, framepos_t position, framecnt_t dur, uint32_t chan_n, NoteMode mode, MidiStateTracker* tracker) const { return _read_at (_sources, out, position, dur, chan_n, mode, tracker); } -nframes_t -MidiRegion::master_read_at (MidiRingBuffer& out, sframes_t position, nframes_t dur, uint32_t chan_n, NoteMode mode) const +framecnt_t +MidiRegion::master_read_at (MidiRingBuffer& out, framepos_t position, framecnt_t dur, uint32_t chan_n, NoteMode mode) const { return _read_at (_master_sources, out, position, dur, chan_n, mode); /* no tracker */ } -nframes_t -MidiRegion::_read_at (const SourceList& /*srcs*/, Evoral::EventSink& dst, sframes_t position, nframes_t dur, uint32_t chan_n, +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 { - nframes_t internal_offset = 0; - nframes_t src_offset = 0; - nframes_t to_read = 0; + frameoffset_t internal_offset = 0; + frameoffset_t src_offset = 0; + framecnt_t to_read = 0; /* precondition: caller has verified that we cover the desired section */ assert(chan_n == 0); + if (muted()) { + return 0; /* read nothing */ + } + if (position < _position) { internal_offset = 0; src_offset = _position - position; @@ -170,20 +149,13 @@ MidiRegion::_read_at (const SourceList& /*srcs*/, Evoral::EventSink& return 0; /* read nothing */ } - // FIXME: non-opaque MIDI regions not yet supported - assert(opaque()); - - if (muted()) { - return 0; /* read nothing */ - } - _read_data_count = 0; boost::shared_ptr src = midi_source(chan_n); src->set_note_mode(mode); - nframes_t output_buffer_position = 0; - nframes_t negative_output_buffer_position = 0; + framepos_t output_buffer_position = 0; + framepos_t negative_output_buffer_position = 0; if (_position >= _start) { // handle resizing of beginnings of regions correctly output_buffer_position = _position - _start; @@ -226,8 +198,6 @@ MidiRegion::state (bool full) char buf2[64]; LocaleGuard lg (X_("POSIX")); - node.add_property ("flags", enum_2_string (_flags)); - // XXX these should move into Region for (uint32_t n=0; n < _sources.size(); ++n) { @@ -249,50 +219,9 @@ MidiRegion::state (bool full) return node; } -int -MidiRegion::set_live_state (const XMLNode& node, int version, Change& what_changed, bool send) -{ - const XMLProperty *prop; - LocaleGuard lg (X_("POSIX")); - - Region::set_live_state (node, version, what_changed, false); - - uint32_t old_flags = _flags; - - if ((prop = node.property ("flags")) != 0) { - _flags = Flag (string_2_enum (prop->value(), _flags)); - - //_flags = Flag (strtol (prop->value().c_str(), (char **) 0, 16)); - - _flags = Flag (_flags & ~Region::LeftOfSplit); - _flags = Flag (_flags & ~Region::RightOfSplit); - } - - if ((old_flags ^ _flags) & Muted) { - what_changed = Change (what_changed|MuteChanged); - } - if ((old_flags ^ _flags) & Opaque) { - what_changed = Change (what_changed|OpacityChanged); - } - if ((old_flags ^ _flags) & Locked) { - what_changed = Change (what_changed|LockChanged); - } - - if (send) { - send_change (what_changed); - } - - return 0; -} - int MidiRegion::set_state (const XMLNode& node, int version) { - /* Region::set_state() calls the virtual set_live_state(), - which will get us back to AudioRegion::set_live_state() - to handle the relevant stuff. - */ - return Region::set_state (node, version); } @@ -300,8 +229,7 @@ void MidiRegion::recompute_at_end () { /* our length has changed - * (non destructively) "chop" notes that pass the end boundary, to - * prevent stuck notes. + * so what? stuck notes are dealt with via a note state tracker */ }