X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmidi_playlist.cc;h=e3274c77b193c44d52f9c911e6d720616673eeea;hb=e16866416738a3b2089e760fb76d45ff7a59fe3a;hp=9aa36304a675cc930f61ddd5d853e3420328d61f;hpb=27a1cf2cf73703267cac5bda2acca386afb374b3;p=ardour.git diff --git a/libs/ardour/midi_playlist.cc b/libs/ardour/midi_playlist.cc index 9aa36304a6..e3274c77b1 100644 --- a/libs/ardour/midi_playlist.cc +++ b/libs/ardour/midi_playlist.cc @@ -17,28 +17,26 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include - #include +#include +#include #include #include -#include - -#include "pbd/error.h" - #include "evoral/EventList.hpp" +#include "evoral/Control.hpp" -#include "ardour/configuration.h" +#include "ardour/beats_frames_converter.h" #include "ardour/debug.h" #include "ardour/midi_model.h" #include "ardour/midi_playlist.h" #include "ardour/midi_region.h" -#include "ardour/midi_ring_buffer.h" +#include "ardour/midi_source.h" +#include "ardour/midi_state_tracker.h" #include "ardour/session.h" #include "ardour/types.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; using namespace PBD; @@ -47,9 +45,10 @@ using namespace std; MidiPlaylist::MidiPlaylist (Session& session, const XMLNode& node, bool hidden) : Playlist (session, node, DataType::MIDI, hidden) , _note_mode(Sustained) + , _read_end(0) { #ifndef NDEBUG - const XMLProperty* prop = node.property("type"); + XMLProperty const * prop = node.property("type"); assert(prop && DataType(prop->value()) == DataType::MIDI); #endif @@ -65,20 +64,26 @@ MidiPlaylist::MidiPlaylist (Session& session, const XMLNode& node, bool hidden) MidiPlaylist::MidiPlaylist (Session& session, string name, bool hidden) : Playlist (session, name, DataType::MIDI, hidden) , _note_mode(Sustained) + , _read_end(0) { } MidiPlaylist::MidiPlaylist (boost::shared_ptr other, string name, bool hidden) : Playlist (other, name, hidden) , _note_mode(other->_note_mode) + , _read_end(0) { } -MidiPlaylist::MidiPlaylist (boost::shared_ptr other, framepos_t start, framecnt_t dur, string name, bool hidden) +MidiPlaylist::MidiPlaylist (boost::shared_ptr other, + framepos_t start, + framecnt_t dur, + string name, + bool hidden) : Playlist (other, start, dur, name, hidden) , _note_mode(other->_note_mode) + , _read_end(0) { - /* this constructor does NOT notify others (session) */ } MidiPlaylist::~MidiPlaylist () @@ -89,7 +94,8 @@ template struct EventsSortByTimeAndType { bool operator() (Evoral::Event