X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmidi_region.cc;h=7bb995337f64bbf7225773e28bd1350b9c8a144f;hb=6572f421a40b30112dbe11a4eace115a6af1c83e;hp=5eea77ebcacd985895ba9fe34b9172177ea40930;hpb=bed0d89337b0775e669439ef4e0759feb7ddc74e;p=ardour.git diff --git a/libs/ardour/midi_region.cc b/libs/ardour/midi_region.cc index 5eea77ebca..7bb995337f 100644 --- a/libs/ardour/midi_region.cc +++ b/libs/ardour/midi_region.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2006 Paul Davis + Copyright (C) 2000-2006 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -24,36 +24,35 @@ #include -#include -#include #include -#include -#include -#include +#include "pbd/basename.h" +#include "pbd/xml++.h" +#include "pbd/enumwriter.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include "ardour/midi_region.h" +#include "ardour/session.h" +#include "ardour/gain.h" +#include "ardour/dB.h" +#include "ardour/playlist.h" +#include "ardour/midi_source.h" +#include "ardour/types.h" +#include "ardour/midi_ring_buffer.h" #include "i18n.h" #include using namespace std; using namespace ARDOUR; +using namespace PBD; /** 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)); + midi_source(0)->Switched.connect_same_thread (*this, boost::bind (&MidiRegion::switch_source, this, _1)); } /* Basic MidiRegion constructor (one channel) */ @@ -61,7 +60,7 @@ MidiRegion::MidiRegion (boost::shared_ptr src, nframes_t start, nfra : 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)); + midi_source(0)->Switched.connect_same_thread (*this, boost::bind (&MidiRegion::switch_source, this, _1)); } /* Basic MidiRegion constructor (many channels) */ @@ -69,7 +68,7 @@ MidiRegion::MidiRegion (const SourceList& srcs, nframes_t start, nframes_t lengt : Region (srcs, start, length, name, DataType::MIDI, layer, flags) { 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)); } @@ -78,24 +77,24 @@ MidiRegion::MidiRegion (boost::shared_ptr other, nframes_t off : Region (other, offset, length, name, layer, flags) { 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)); } MidiRegion::MidiRegion (boost::shared_ptr other) : Region (other) { 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)); } MidiRegion::MidiRegion (boost::shared_ptr src, const XMLNode& node) : Region (src, node) { - if (set_state (node)) { + if (set_state (node, Stateful::loading_state_version)) { throw failed_constructor(); } - 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.find("/") == string::npos); assert(_type == DataType::MIDI); } @@ -103,11 +102,11 @@ MidiRegion::MidiRegion (boost::shared_ptr src, const XMLNode& node) MidiRegion::MidiRegion (const SourceList& srcs, const XMLNode& node) : Region (srcs, node) { - if (set_state (node)) { + if (set_state (node, Stateful::loading_state_version)) { throw failed_constructor(); } - 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.find("/") == string::npos); assert(_type == DataType::MIDI); } @@ -116,32 +115,47 @@ MidiRegion::~MidiRegion () { } +void +MidiRegion::set_position_internal (nframes_t pos, bool allow_bbt_recompute) +{ + 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.tempo_map(), pos - _start); + + set_length(new_converter.to(length_beats), 0); +} + nframes_t -MidiRegion::read_at (MidiRingBuffer& out, sframes_t position, nframes_t dur, uint32_t chan_n, NoteMode mode) const +MidiRegion::read_at (Evoral::EventSink& out, sframes_t position, nframes_t dur, uint32_t chan_n, NoteMode mode, MidiStateTracker* tracker) const { - return _read_at (_sources, out, position, dur, chan_n, mode); + 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 { - return _read_at (_master_sources, out, position, dur, chan_n, mode); + return _read_at (_master_sources, out, position, dur, chan_n, mode); /* no tracker */ } nframes_t -MidiRegion::_read_at (const SourceList& srcs, MidiRingBuffer& dst, nframes_t position, nframes_t dur, uint32_t chan_n, NoteMode mode) const +MidiRegion::_read_at (const SourceList& /*srcs*/, Evoral::EventSink& dst, sframes_t position, nframes_t dur, uint32_t chan_n, + NoteMode mode, MidiStateTracker* tracker) const { - /*cerr << "MidiRegion " << _name << "._read_at(" << position << ") - " - << position << " duration: " << dur << endl;*/ - nframes_t internal_offset = 0; nframes_t src_offset = 0; nframes_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; @@ -154,19 +168,11 @@ MidiRegion::_read_at (const SourceList& srcs, MidiRingBuffer& dst, nf if (internal_offset >= _length) { return 0; /* read nothing */ } - if ((to_read = min (dur, _length - internal_offset)) == 0) { 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); @@ -180,17 +186,26 @@ MidiRegion::_read_at (const SourceList& srcs, MidiRingBuffer& dst, nf } else { // when _start is greater than _position, we have to subtract // _start from the note times in the midi source - negative_output_buffer_position = _start; + negative_output_buffer_position = _start; } - + + /*cerr << "MR read @ " << position << " * " << to_read + << " _position = " << _position + << " _start = " << _start + << " offset = " << output_buffer_position + << " negoffset = " << negative_output_buffer_position + << " intoffset = " << internal_offset + << endl;*/ + if (src->midi_read ( dst, // destination buffer _position - _start, // start position of the source in this read context - _start + internal_offset, // where to start reading in the region + _start + internal_offset, // where to start reading in the source to_read, // read duration in frames output_buffer_position, // the offset in the output buffer - negative_output_buffer_position // amount to substract from note times - ) != to_read) { + negative_output_buffer_position, // amount to substract from note times + tracker + ) != to_read) { return 0; /* "read nothing" */ } @@ -198,7 +213,7 @@ MidiRegion::_read_at (const SourceList& srcs, MidiRingBuffer& dst, nf return to_read; } - + XMLNode& MidiRegion::state (bool full) { @@ -206,11 +221,11 @@ MidiRegion::state (bool full) char buf[64]; 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) { snprintf (buf2, sizeof(buf2), "source-%d", n); _sources[n]->id().print (buf, sizeof(buf)); @@ -231,15 +246,15 @@ MidiRegion::state (bool full) } int -MidiRegion::set_live_state (const XMLNode& node, Change& what_changed, bool send) +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, what_changed, false); + 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)); @@ -267,14 +282,14 @@ MidiRegion::set_live_state (const XMLNode& node, Change& what_changed, bool send } int -MidiRegion::set_state (const XMLNode& node) +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); + return Region::set_state (node, version); } void @@ -284,7 +299,7 @@ MidiRegion::recompute_at_end () * (non destructively) "chop" notes that pass the end boundary, to * prevent stuck notes. */ -} +} void MidiRegion::recompute_at_start ()