X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmidi_playlist.cc;h=7adbe70ff3d4cde1a43e47397cb78d8a73216db6;hb=a3eaa4d3f0606349b91c7660da19eb3fee91bce3;hp=048a54da93a006036c63fc0add6eeaa7c221d7fe;hpb=650c6d5824222a8879df5c5ba9645c264ed3b84f;p=ardour.git diff --git a/libs/ardour/midi_playlist.cc b/libs/ardour/midi_playlist.cc index 048a54da93..7adbe70ff3 100644 --- a/libs/ardour/midi_playlist.cc +++ b/libs/ardour/midi_playlist.cc @@ -1,6 +1,6 @@ /* Copyright (C) 2006 Paul Davis - Written by Dave Robillard, 2006 + Author: David Robillard 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 @@ -17,59 +17,73 @@ 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/types.h" -#include "ardour/configuration.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/session.h" -#include "ardour/midi_ring_buffer.h" - -#include "pbd/error.h" +#include "ardour/types.h" #include "i18n.h" using namespace ARDOUR; +using namespace PBD; 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"); assert(prop && DataType(prop->value()) == DataType::MIDI); +#endif in_set_state++; - set_state (node, Stateful::loading_state_version); + if (set_state (node, Stateful::loading_state_version)) { + throw failed_constructor (); + } in_set_state--; + + relayer (); } 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, nframes_t start, nframes_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 () @@ -77,253 +91,211 @@ MidiPlaylist::~MidiPlaylist () } template -struct EventsSortByTime { +struct EventsSortByTimeAndType { bool operator() (Evoral::Event