X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmidi_region.cc;h=936ce047eec35f2620641a37f2a3f0bbc9e37bf3;hb=d9cebc2edf8accded23c6f2a1caab73eb47a50fd;hp=f166dafda8a3f19c0ef165c4048dcd5dfc07decd;hpb=ce7a5e1c9fa3edf2d9cc66875505e402a0aaa6f6;p=ardour.git diff --git a/libs/ardour/midi_region.cc b/libs/ardour/midi_region.cc index f166dafda8..936ce047ee 100644 --- a/libs/ardour/midi_region.cc +++ b/libs/ardour/midi_region.cc @@ -47,23 +47,15 @@ using namespace std; using namespace ARDOUR; using namespace PBD; -/** Basic MidiRegion constructor (one channel) */ -MidiRegion::MidiRegion (boost::shared_ptr src) - : Region (src) -{ - assert(_name.val().find("/") == string::npos); - midi_source(0)->Switched.connect_same_thread (*this, boost::bind (&MidiRegion::switch_source, this, _1)); -} - /* Basic MidiRegion constructor (many channels) */ MidiRegion::MidiRegion (const SourceList& srcs) : Region (srcs) { - assert(_name.val().find("/") == string::npos); 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, frameoffset_t offset, bool offset_relative) : Region (other, offset, offset_relative) @@ -72,30 +64,6 @@ MidiRegion::MidiRegion (boost::shared_ptr other, frameoffset_t 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, Stateful::loading_state_version)) { - throw failed_constructor(); - } - - 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); -} - -MidiRegion::MidiRegion (const SourceList& srcs, const XMLNode& node) - : Region (srcs, node) -{ - if (set_state (node, Stateful::loading_state_version)) { - throw failed_constructor(); - } - - 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); -} - MidiRegion::~MidiRegion () { }