X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmidi_playlist.cc;h=4d64a9ca197efea54b4b712fa7ef483e04e26ed7;hb=1dfcf07ba9448a0a73f85519f04d9c03b08f5e3e;hp=36b6fce75fa60d3cda434d0655e99b694c82d4df;hpb=1693e57e0ee37c6cd74f2feadb3af6249ac6c29d;p=ardour.git diff --git a/libs/ardour/midi_playlist.cc b/libs/ardour/midi_playlist.cc index 36b6fce75f..4d64a9ca19 100644 --- a/libs/ardour/midi_playlist.cc +++ b/libs/ardour/midi_playlist.cc @@ -17,24 +17,28 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include - #include +#include +#include #include #include -#include - #include "evoral/EventList.hpp" +#include "evoral/Control.hpp" +#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_source.h" #include "ardour/midi_state_tracker.h" +#include "ardour/region_factory.h" +#include "ardour/session.h" +#include "ardour/tempo.h" #include "ardour/types.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; using namespace PBD; @@ -43,9 +47,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 @@ -61,20 +66,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 () @@ -83,7 +94,7 @@ MidiPlaylist::~MidiPlaylist () template struct EventsSortByTimeAndType { - bool operator() (Evoral::Event