/*
- 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
#include <set>
-#include <sigc++/bind.h>
-#include <sigc++/class_slot.h>
#include <glibmm/thread.h>
using namespace std;
using namespace ARDOUR;
+using namespace PBD;
/** Basic MidiRegion constructor (one channel) */
MidiRegion::MidiRegion (boost::shared_ptr<MidiSource> 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) */
: 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) */
: 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));
}
: 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<const MidiRegion> 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<MidiSource> 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);
}
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);
}
void
MidiRegion::set_position_internal (nframes_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 (MidiRingBuffer<nframes_t>& out, sframes_t position, nframes_t dur, uint32_t chan_n, NoteMode mode) const
+MidiRegion::read_at (Evoral::EventSink<nframes_t>& 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<nframes_t>& 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<nframes_t>& dst, nframes_t position, nframes_t dur, uint32_t chan_n, NoteMode mode) const
+MidiRegion::_read_at (const SourceList& /*srcs*/, Evoral::EventSink<nframes_t>& dst, sframes_t position, nframes_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;
-
+
/* 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;
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()) {
+ if ((to_read = min (dur, _length - internal_offset)) == 0) {
return 0; /* read nothing */
}
} 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 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" */
}
return to_read;
}
-
+
XMLNode&
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));
}
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));
}
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
* (non destructively) "chop" notes that pass the end boundary, to
* prevent stuck notes.
*/
-}
+}
void
MidiRegion::recompute_at_start ()
projects / ardour.git / blobdiff