X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmidi_playlist.cc;h=36b6fce75fa60d3cda434d0655e99b694c82d4df;hb=1693e57e0ee37c6cd74f2feadb3af6249ac6c29d;hp=2e36e34e437a3aa403237e2d6ba9c53bc3d8ba3c;hpb=48d078b97554dbc0cf8423d42c306f7b1330bff5;p=ardour.git diff --git a/libs/ardour/midi_playlist.cc b/libs/ardour/midi_playlist.cc index 2e36e34e43..36b6fce75f 100644 --- a/libs/ardour/midi_playlist.cc +++ b/libs/ardour/midi_playlist.cc @@ -1,17 +1,17 @@ /* - Copyright (C) 2006 Paul Davis - Written by Dave Robillard, 2006 + Copyright (C) 2006 Paul Davis + 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 the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. @@ -20,246 +20,313 @@ #include #include +#include +#include #include -#include +#include "evoral/EventList.hpp" -#include -#include -#include -#include -#include -#include - -#include +#include "ardour/debug.h" +#include "ardour/midi_model.h" +#include "ardour/midi_playlist.h" +#include "ardour/midi_region.h" +#include "ardour/midi_state_tracker.h" +#include "ardour/types.h" #include "i18n.h" using namespace ARDOUR; -using namespace sigc; +using namespace PBD; using namespace std; MidiPlaylist::MidiPlaylist (Session& session, const XMLNode& node, bool hidden) - : Playlist (session, node, DataType::MIDI, hidden) + : Playlist (session, node, DataType::MIDI, hidden) + , _note_mode(Sustained) { +#ifndef NDEBUG const XMLProperty* prop = node.property("type"); assert(prop && DataType(prop->value()) == DataType::MIDI); +#endif - in_set_state = true; - set_state (node); - in_set_state = false; + in_set_state++; + 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) + : Playlist (session, name, DataType::MIDI, hidden) + , _note_mode(Sustained) { } MidiPlaylist::MidiPlaylist (boost::shared_ptr other, string name, bool hidden) - : Playlist (other, name, hidden) + : Playlist (other, name, hidden) + , _note_mode(other->_note_mode) { - throw; // nope - - /* - list::const_iterator in_o = other.regions.begin(); - list::iterator in_n = regions.begin(); - - while (in_o != other.regions.end()) { - MidiRegion *ar = dynamic_cast( (*in_o) ); - - for (list::const_iterator xfades = other._crossfades.begin(); xfades != other._crossfades.end(); ++xfades) { - if ( &(*xfades)->in() == ar) { - // We found one! Now copy it! - - list::const_iterator out_o = other.regions.begin(); - list::const_iterator out_n = regions.begin(); - - while (out_o != other.regions.end()) { - - MidiRegion *ar2 = dynamic_cast( (*out_o) ); - - if ( &(*xfades)->out() == ar2) { - MidiRegion *in = dynamic_cast( (*in_n) ); - MidiRegion *out = dynamic_cast( (*out_n) ); - Crossfade *new_fade = new Crossfade( *(*xfades), in, out); - add_crossfade(*new_fade); - break; - } - - out_o++; - out_n++; - } - // cerr << "HUH!? second region in the crossfade not found!" << endl; - } - } - - in_o++; - in_n++; - } -*/ } -MidiPlaylist::MidiPlaylist (boost::shared_ptr other, nframes_t start, nframes_t dur, string name, bool hidden) - : Playlist (other, start, dur, name, 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) { /* this constructor does NOT notify others (session) */ } MidiPlaylist::~MidiPlaylist () { - GoingAway (); /* EMIT SIGNAL */ } -struct RegionSortByLayer { - bool operator() (boost::shared_ptr a, boost::shared_ptr b) { - return a->layer() < b->layer(); +template +struct EventsSortByTimeAndType { + bool operator() (Evoral::Event