/*
- Copyright (C) 2006 Paul Davis
- Written by Dave Robillard, 2006
+ Copyright (C) 2006 Paul Davis
+ Written by Dave Robillard, 2006
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.
#include <cassert>
#include <algorithm>
+#include <iostream>
#include <stdlib.h>
-#include <sigc++/bind.h>
+#include "evoral/EventList.hpp"
-#include <ardour/types.h>
-#include <ardour/configuration.h>
-#include <ardour/midi_playlist.h>
-#include <ardour/midi_region.h>
-#include <ardour/session.h>
+#include "ardour/debug.h"
+#include "ardour/types.h"
+#include "ardour/configuration.h"
+#include "ardour/midi_playlist.h"
+#include "ardour/midi_region.h"
+#include "ardour/session.h"
+#include "ardour/midi_ring_buffer.h"
-#include <pbd/error.h>
+#include "pbd/error.h"
#include "i18n.h"
using namespace ARDOUR;
-using namespace sigc;
+using namespace PBD;
using namespace std;
-MidiPlaylist::State::~State ()
-{}
-
MidiPlaylist::MidiPlaylist (Session& session, const XMLNode& node, bool hidden)
- : Playlist (session, node, hidden)
+ : Playlist (session, node, DataType::MIDI, hidden)
+ , _note_mode(Sustained)
{
- in_set_state = true;
- set_state (node);
- in_set_state = false;
+ const XMLProperty* prop = node.property("type");
+ assert(prop && DataType(prop->value()) == DataType::MIDI);
- save_state (_("initial state"));
-
- if (!hidden) {
- PlaylistCreated (this); /* EMIT SIGNAL */
- }
+ in_set_state++;
+ set_state (node, Stateful::loading_state_version);
+ in_set_state--;
}
MidiPlaylist::MidiPlaylist (Session& session, string name, bool hidden)
- : Playlist (session, name, hidden)
+ : Playlist (session, name, DataType::MIDI, hidden)
+ , _note_mode(Sustained)
{
- save_state (_("initial state"));
-
- if (!hidden) {
- PlaylistCreated (this); /* EMIT SIGNAL */
- }
-
}
-MidiPlaylist::MidiPlaylist (const MidiPlaylist& other, string name, bool hidden)
- : Playlist (other, name, hidden)
+MidiPlaylist::MidiPlaylist (boost::shared_ptr<const MidiPlaylist> other, string name, bool hidden)
+ : Playlist (other, name, hidden)
+ , _note_mode(other->_note_mode)
{
- save_state (_("initial state"));
-
- /*
- list<Region*>::const_iterator in_o = other.regions.begin();
- list<Region*>::iterator in_n = regions.begin();
-
- while (in_o != other.regions.end()) {
- MidiRegion *ar = dynamic_cast<MidiRegion *>( (*in_o) );
-
- for (list<Crossfade *>::const_iterator xfades = other._crossfades.begin(); xfades != other._crossfades.end(); ++xfades) {
- if ( &(*xfades)->in() == ar) {
- // We found one! Now copy it!
-
- list<Region*>::const_iterator out_o = other.regions.begin();
- list<Region*>::const_iterator out_n = regions.begin();
-
- while (out_o != other.regions.end()) {
-
- MidiRegion *ar2 = dynamic_cast<MidiRegion *>( (*out_o) );
-
- if ( &(*xfades)->out() == ar2) {
- MidiRegion *in = dynamic_cast<MidiRegion*>( (*in_n) );
- MidiRegion *out = dynamic_cast<MidiRegion*>( (*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++;
- }
-*/
- if (!hidden) {
- PlaylistCreated (this); /* EMIT SIGNAL */
- }
}
-MidiPlaylist::MidiPlaylist (const MidiPlaylist& other, jack_nframes_t start, jack_nframes_t cnt, string name, bool hidden)
- : Playlist (other, start, cnt, name, hidden)
+MidiPlaylist::MidiPlaylist (boost::shared_ptr<const MidiPlaylist> other, nframes_t start, nframes_t dur, string name, bool hidden)
+ : Playlist (other, start, dur, name, hidden)
+ , _note_mode(other->_note_mode)
{
- save_state (_("initial state"));
-
/* this constructor does NOT notify others (session) */
}
MidiPlaylist::~MidiPlaylist ()
{
- set <Region*> all_regions;
-
- GoingAway (this);
-
- /* find every region we've ever used, and add it to the set of
- all regions.
- */
-
- for (RegionList::iterator x = regions.begin(); x != regions.end(); ++x) {
- all_regions.insert (*x);
- }
-
- for (StateMap::iterator i = states.begin(); i != states.end(); ++i) {
-
- MidiPlaylist::State* apstate = dynamic_cast<MidiPlaylist::State*> (*i);
-
- for (RegionList::iterator r = apstate->regions.begin(); r != apstate->regions.end(); ++r) {
- all_regions.insert (*r);
- }
-
- delete apstate;
- }
-
- /* delete every region */
-
- for (set<Region *>::iterator ar = all_regions.begin(); ar != all_regions.end(); ++ar) {
- (*ar)->unlock_sources ();
- delete *ar;
- }
-
}
-struct RegionSortByLayer
-{
- bool operator() (Region *a, Region *b)
- {
- return a->layer() < b->layer();
- }
+template<typename Time>
+struct EventsSortByTime {
+ bool operator() (Evoral::Event<Time>* a, Evoral::Event<Time>* b) {
+ return a->time() < b->time();
+ }
};
-/** FIXME: semantics of return value? */
-jack_nframes_t
-MidiPlaylist::read (RawMidi *buf, RawMidi *mixdown_buffer, jack_nframes_t start,
- jack_nframes_t cnt, unsigned chan_n)
+/** Returns the number of frames in time duration read (eg could be large when 0 events are read) */
+nframes_t
+MidiPlaylist::read (MidiRingBuffer<nframes_t>& dst, nframes_t start, nframes_t dur, unsigned chan_n)
{
/* this function is never called from a realtime thread, so
its OK to block (for short intervals).
*/
- Glib::Mutex::Lock rm (region_lock);
+ Glib::RecMutex::Lock rm (region_lock);
+ DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("++++++ %1 .. %2 +++++++++++++++++++++++++++++++++++++++++++++++\n", start, start + dur));
- jack_nframes_t ret = 0;
- jack_nframes_t end = start + cnt - 1;
- jack_nframes_t read_frames = 0;
- jack_nframes_t skip_frames = 0;
+ nframes_t end = start + dur - 1;
_read_data_count = 0;
- vector<MidiRegion*> regs; // relevent regions overlapping start <--> end
+ // relevent regions overlapping start <--> end
+ vector< boost::shared_ptr<Region> > regs;
+ typedef pair<MidiStateTracker*,nframes64_t> TrackerInfo;
+ vector<TrackerInfo> tracker_info;
+ uint32_t note_cnt = 0;
for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {
- MidiRegion* const mr = dynamic_cast<MidiRegion*>(*i);
- if (mr && mr->coverage (start, end) != OverlapNone) {
- regs.push_back(mr);
- }
- }
-
- RegionSortByLayer layer_cmp;
- sort(regs.begin(), regs.end(), layer_cmp);
-
- for (vector<MidiRegion*>::iterator i = regs.begin(); i != regs.end(); ++i) {
- (*i)->read_at (buf, mixdown_buffer, start, cnt, chan_n, read_frames, skip_frames);
- ret += (*i)->read_data_count();
- }
+ if ((*i)->coverage (start, end) != OverlapNone) {
+ regs.push_back(*i);
+ } else {
+ NoteTrackers::iterator t = _note_trackers.find ((*i).get());
+ if (t != _note_trackers.end()) {
- _read_data_count += ret;
-
- return ret;
-}
+ /* add it the set of trackers we will do note resolution
+ on, and remove it from the list we are keeping
+ around, because we don't need it anymore.
+ if the end of the region (where we want to theoretically resolve notes)
+ is outside the current read range, then just do it at the start
+ of this read range.
+ */
-void
-MidiPlaylist::remove_dependents (Region& region)
-{
- MidiRegion* r = dynamic_cast<MidiRegion*> (®ion);
+ nframes64_t resolve_at = (*i)->last_frame();
+ if (resolve_at >= end) {
+ resolve_at = start;
+ }
- if (r == 0) {
- PBD::fatal << _("programming error: non-midi Region passed to remove_overlap in midi playlist")
- << endmsg;
- return;
+ tracker_info.push_back (TrackerInfo (t->second, resolve_at));
+ DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("time to resolve & remove tracker for %1 @ %2\n", (*i)->name(), resolve_at));
+ note_cnt += (t->second->on());
+ _note_trackers.erase (t);
+ }
+ }
}
-}
-
-
-void
-MidiPlaylist::flush_notifications ()
-{
- Playlist::flush_notifications();
-
- if (in_flush) {
- return;
+ if (note_cnt == 0 && !tracker_info.empty()) {
+ /* trackers to dispose of, but they have no notes in them */
+ DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("Clearing %1 empty trackers\n", tracker_info.size()));
+ for (vector<TrackerInfo>::iterator t = tracker_info.begin(); t != tracker_info.end(); ++t) {
+ delete (*t).first;
+ }
+ tracker_info.clear ();
}
- in_flush = true;
+ if (regs.size() == 1 && tracker_info.empty()) {
- in_flush = false;
-}
+ /* just a single region - read directly into dst */
-void
-MidiPlaylist::refresh_dependents (Region& r)
-{
- MidiRegion* ar = dynamic_cast<MidiRegion*>(&r);
+ DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("Single region (%1) read, no out-of-bound region tracking info\n", regs.front()->name()));
- if (ar == 0) {
- return;
- }
-}
+ boost::shared_ptr<MidiRegion> mr = boost::dynamic_pointer_cast<MidiRegion>(regs.front());
-void
-MidiPlaylist::finalize_split_region (Region *o, Region *l, Region *r)
-{
- /*
- MidiRegion *orig = dynamic_cast<MidiRegion*>(o);
- MidiRegion *left = dynamic_cast<MidiRegion*>(l);
- MidiRegion *right = dynamic_cast<MidiRegion*>(r);
+ if (mr) {
- for (Crossfades::iterator x = _crossfades.begin(); x != _crossfades.end();) {
- Crossfades::iterator tmp;
- tmp = x;
- ++tmp;
+ NoteTrackers::iterator t = _note_trackers.find (mr.get());
+ MidiStateTracker* tracker;
+ bool new_tracker = false;
- Crossfade *fade = 0;
-
- if ((*x)->_in == orig) {
- if (! (*x)->covers(right->position())) {
- fade = new Crossfade( *(*x), left, (*x)->_out);
+ if (t == _note_trackers.end()) {
+ tracker = new MidiStateTracker;
+ new_tracker = true;
+ DEBUG_TRACE (DEBUG::MidiPlaylistIO, "\tBEFORE: new tracker\n");
} else {
- // Overlap, the crossfade is copied on the left side of the right region instead
- fade = new Crossfade( *(*x), right, (*x)->_out);
+ tracker = t->second;
+ DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("\tBEFORE: tracker says there are %1 on notes\n", tracker->on()));
}
- }
- if ((*x)->_out == orig) {
- if (! (*x)->covers(right->position())) {
- fade = new Crossfade( *(*x), (*x)->_in, right);
- } else {
- // Overlap, the crossfade is copied on the right side of the left region instead
- fade = new Crossfade( *(*x), (*x)->_in, left);
+ mr->read_at (dst, start, dur, chan_n, _note_mode, tracker);
+ DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("\tAFTER: tracker says there are %1 on notes\n", tracker->on()));
+
+ if (new_tracker) {
+ pair<Region*,MidiStateTracker*> newpair;
+ newpair.first = mr.get();
+ newpair.second = tracker;
+ _note_trackers.insert (newpair);
+ DEBUG_TRACE (DEBUG::MidiPlaylistIO, "\tadded tracker to trackers\n");
}
- }
- if (fade) {
- _crossfades.remove( (*x) );
- add_crossfade (*fade);
+ _read_data_count += mr->read_data_count();
}
- x = tmp;
- }*/
-}
-
-void
-MidiPlaylist::check_dependents (Region& r, bool norefresh)
-{
- MidiRegion* other;
- MidiRegion* region;
- MidiRegion* top;
- MidiRegion* bottom;
-
- if (in_set_state || in_partition) {
- return;
- }
- if ((region = dynamic_cast<MidiRegion*> (&r)) == 0) {
- PBD::fatal << _("programming error: non-midi Region tested for overlap in midi playlist")
- << endmsg;
- return;
- }
+ } else {
- if (!norefresh) {
- refresh_dependents (r);
- }
+ /* multiple regions and/or note resolution: sort by layer, read into a temporary non-monotonically
+ sorted EventSink, sort and then insert into dst.
+ */
- for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {
+ DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("%1 regions to read, plus %2 trackers\n", regs.size(), tracker_info.size()));
- other = dynamic_cast<MidiRegion*> (*i);
+ Evoral::EventList<nframes_t> evlist;
- if (other == region) {
- continue;
+ for (vector<TrackerInfo>::iterator t = tracker_info.begin(); t != tracker_info.end(); ++t) {
+ DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("Resolve %1 notes\n", (*t).first->on()));
+ (*t).first->resolve_notes (evlist, (*t).second);
+ delete (*t).first;
}
- if (other->muted() || region->muted()) {
- continue;
+#ifndef NDEBUG
+ DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("After resolution we now have %1 events\n", evlist.size()));
+ for (Evoral::EventList<nframes_t>::iterator x = evlist.begin(); x != evlist.end(); ++x) {
+ DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("\t%1\n", **x));
}
+#endif
- if (other->layer() < region->layer()) {
- top = region;
- bottom = other;
- } else {
- top = other;
- bottom = region;
- }
-
- }
-}
-
-
-int
-MidiPlaylist::set_state (const XMLNode& node)
-{
- /*
- XMLNode *child;
- XMLNodeList nlist;
- XMLNodeConstIterator niter;
-
- if (!in_set_state) {
- Playlist::set_state (node);
- }
+ DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("for %1 .. %2 we have %3 to consider\n", start, start+dur-1, regs.size()));
- nlist = node.children();
-
- for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
+ for (vector<boost::shared_ptr<Region> >::iterator i = regs.begin(); i != regs.end(); ++i) {
+ boost::shared_ptr<MidiRegion> mr = boost::dynamic_pointer_cast<MidiRegion>(*i);
+ if (!mr) {
+ continue;
+ }
- child = *niter;
+ NoteTrackers::iterator t = _note_trackers.find (mr.get());
+ MidiStateTracker* tracker;
+ bool new_tracker = false;
- }*/
- return 0;
-}
+ DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("Before %1 (%2 .. %3) we now have %4 events\n", mr->name(), mr->position(), mr->last_frame(), evlist.size()));
-void
-MidiPlaylist::drop_all_states ()
-{
- set<Region*> all_regions;
-
- /* find every region we've ever used, and add it to the set of
- all regions. same for xfades;
- */
+ if (t == _note_trackers.end()) {
+ tracker = new MidiStateTracker;
+ new_tracker = true;
+ DEBUG_TRACE (DEBUG::MidiPlaylistIO, "\tBEFORE: new tracker\n");
+ } else {
+ tracker = t->second;
+ DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("\tBEFORE: tracker says there are %1 on notes\n", tracker->on()));
+ }
- for (StateMap::iterator i = states.begin(); i != states.end(); ++i) {
- MidiPlaylist::State* apstate = dynamic_cast<MidiPlaylist::State*> (*i);
+ mr->read_at (evlist, start, dur, chan_n, _note_mode, tracker);
+ _read_data_count += mr->read_data_count();
- for (RegionList::iterator r = apstate->regions.begin(); r != apstate->regions.end(); ++r) {
- all_regions.insert (*r);
+#ifndef NDEBUG
+ DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("After %1 (%2 .. %3) we now have %4\n", mr->name(), mr->position(), mr->last_frame(), evlist.size()));
+ for (Evoral::EventList<nframes_t>::iterator x = evlist.begin(); x != evlist.end(); ++x) {
+ DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("\t%1\n", **x));
+ }
+ DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("\tAFTER: tracker says there are %1 on notes\n", tracker->on()));
+#endif
+
+ if (new_tracker) {
+ pair<Region*,MidiStateTracker*> newpair;
+ newpair.first = mr.get();
+ newpair.second = tracker;
+ _note_trackers.insert (newpair);
+ DEBUG_TRACE (DEBUG::MidiPlaylistIO, "\tadded tracker to trackers\n");
+ }
}
- }
- /* now remove from the "all" lists every region that is in the current list. */
+ if (!evlist.empty()) {
- for (list<Region*>::iterator i = regions.begin(); i != regions.end(); ++i) {
- set
- <Region*>::iterator x = all_regions.find (*i);
- if (x != all_regions.end()) {
- all_regions.erase (x);
- }
- }
+ /* sort the event list */
+ EventsSortByTime<nframes_t> time_cmp;
+ evlist.sort (time_cmp);
- /* delete every region that is left - these are all things that are part of our "history" */
+#ifndef NDEBUG
+ DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("Final we now have %1 events\n", evlist.size()));
+ for (Evoral::EventList<nframes_t>::iterator x = evlist.begin(); x != evlist.end(); ++x) {
+ DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("\t%1\n", **x));
+ }
+#endif
+ /* write into dst */
+ for (Evoral::EventList<nframes_t>::iterator e = evlist.begin(); e != evlist.end(); ++e) {
+ Evoral::Event<nframes_t>* ev (*e);
+ dst.write (ev->time(), ev->event_type(), ev->size(), ev->buffer());
+ delete ev;
+ }
- for (set
- <Region *>::iterator ar = all_regions.begin(); ar != all_regions.end(); ++ar) {
- (*ar)->unlock_sources ();
- delete *ar;
+ }
}
- /* Now do the generic thing ... */
-
- StateManager::drop_all_states ();
+ DEBUG_TRACE (DEBUG::MidiPlaylistIO, "-------------------------------------------------------------\n");
+ return dur;
}
-StateManager::State*
-MidiPlaylist::state_factory (std::string why) const
+void
+MidiPlaylist::clear_note_trackers ()
{
- State* state = new State (why);
-
- state->regions = regions;
- state->region_states.clear ();
- for (RegionList::const_iterator i = regions.begin(); i != regions.end(); ++i) {
- state->region_states.push_back ((*i)->get_memento());
+ Glib::RecMutex::Lock rm (region_lock);
+ for (NoteTrackers::iterator n = _note_trackers.begin(); n != _note_trackers.end(); ++n) {
+ delete n->second;
}
-
- return state;
+ _note_trackers.clear ();
}
-Change
-MidiPlaylist::restore_state (StateManager::State& state)
+void
+MidiPlaylist::remove_dependents (boost::shared_ptr<Region> region)
{
- {
- RegionLock rlock (this);
- State* apstate = dynamic_cast<State*> (&state);
+ /* MIDI regions have no dependents (crossfades) but we might be tracking notes */
+ NoteTrackers::iterator t = _note_trackers.find (region.get());
- in_set_state = true;
+ /* GACK! THREAD SAFETY! */
- regions = apstate->regions;
+ if (t != _note_trackers.end()) {
+ delete t->second;
+ _note_trackers.erase (t);
+ }
+}
- for (list<UndoAction>::iterator s = apstate->
- region_states.begin();
- s != apstate->region_states.end();
- ++s) {
- (*s) ();
- }
- in_set_state = false;
- }
+void
+MidiPlaylist::refresh_dependents (boost::shared_ptr<Region> /*r*/)
+{
+ /* MIDI regions have no dependents (crossfades) */
+}
- notify_length_changed ();
- return Change (~0);
+void
+MidiPlaylist::finalize_split_region (boost::shared_ptr<Region> /*original*/, boost::shared_ptr<Region> /*left*/, boost::shared_ptr<Region> /*right*/)
+{
+ /* No MIDI crossfading (yet?), so nothing to do here */
}
-UndoAction
-MidiPlaylist::get_memento () const
+void
+MidiPlaylist::check_dependents (boost::shared_ptr<Region> /*r*/, bool /*norefresh*/)
{
- return sigc::bind (mem_fun (*(const_cast<MidiPlaylist*> (this)), &StateManager::use_state), _current_state_id);
+ /* MIDI regions have no dependents (crossfades) */
}
-XMLNode&
-MidiPlaylist::state (bool full_state)
+int
+MidiPlaylist::set_state (const XMLNode& node, int version)
{
- XMLNode& node = Playlist::state (full_state);
+ in_set_state++;
+ freeze ();
+
+ Playlist::set_state (node, version);
- return node;
+ thaw();
+ in_set_state--;
+
+ return 0;
}
void
MidiPlaylist::dump () const
{
- Region *r;
+ boost::shared_ptr<Region> r;
cerr << "Playlist \"" << _name << "\" " << endl
<< regions.size() << " regions "
}
bool
-MidiPlaylist::destroy_region (Region* region)
+MidiPlaylist::destroy_region (boost::shared_ptr<Region> region)
{
- MidiRegion* r = dynamic_cast<MidiRegion*> (region);
+ boost::shared_ptr<MidiRegion> r = boost::dynamic_pointer_cast<MidiRegion> (region);
bool changed = false;
if (r == 0) {
++tmp;
if ((*i) == region) {
- (*i)->unlock_sources ();
regions.erase (i);
changed = true;
}
}
}
- for (StateMap::iterator s = states.begin(); s != states.end(); ) {
- StateMap::iterator tmp;
-
- tmp = s;
- ++tmp;
-
- State* astate = dynamic_cast<State*> (*s);
-
- list<UndoAction>::iterator rsi, rsitmp;
- RegionList::iterator ri, ritmp;
-
- for (ri = astate->regions.begin(), rsi = astate->region_states.begin();
- ri != astate->regions.end() && rsi != astate->region_states.end();) {
-
-
- ritmp = ri;
- ++ritmp;
-
- rsitmp = rsi;
- ++rsitmp;
-
- if (region == (*ri)) {
- astate->regions.erase (ri);
- astate->region_states.erase (rsi);
- }
-
- ri = ritmp;
- rsi = rsitmp;
- }
-
- s = tmp;
- }
-
if (changed) {
/* overload this, it normally means "removed", not destroyed */
return changed;
}
-
-void
-MidiPlaylist::get_equivalent_regions (const MidiRegion& other, vector<MidiRegion*>& results)
+set<Evoral::Parameter>
+MidiPlaylist::contained_automation()
{
- for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {
+ /* this function is never called from a realtime thread, so
+ its OK to block (for short intervals).
+ */
- MidiRegion* ar = dynamic_cast<MidiRegion*> (*i);
+ Glib::RecMutex::Lock rm (region_lock);
- if (ar) {
- if (Config->get_use_overlap_equivalency()) {
- if (ar->overlap_equivalent (other)) {
- results.push_back (ar);
- } else if (ar->equivalent (other)) {
- results.push_back (ar);
- }
- }
- }
- }
-}
+ set<Evoral::Parameter> ret;
-void
-MidiPlaylist::get_region_list_equivalent_regions (const MidiRegion& other, vector<MidiRegion*>& results)
-{
- for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {
+ for (RegionList::const_iterator r = regions.begin(); r != regions.end(); ++r) {
+ boost::shared_ptr<MidiRegion> mr = boost::dynamic_pointer_cast<MidiRegion>(*r);
- MidiRegion* ar = dynamic_cast<MidiRegion*> (*i);
-
- if (ar && ar->region_list_equivalent (other)) {
- results.push_back (ar);
+ for (Automatable::Controls::iterator c = mr->model()->controls().begin();
+ c != mr->model()->controls().end(); ++c) {
+ ret.insert(c->first);
}
}
+
+ return ret;
}
+
bool
-MidiPlaylist::region_changed (Change what_changed, Region* region)
+MidiPlaylist::region_changed (const PBD::PropertyChange& what_changed, boost::shared_ptr<Region> region)
{
if (in_flush || in_set_state) {
return false;
}
- Change our_interests = Change (/*MidiRegion::FadeInChanged|
- MidiRegion::FadeOutChanged|
- MidiRegion::FadeInActiveChanged|
- MidiRegion::FadeOutActiveChanged|
- MidiRegion::EnvelopeActiveChanged|
- MidiRegion::ScaleAmplitudeChanged|
- MidiRegion::EnvelopeChanged*/);
+ // Feeling rather uninterested today, but thanks for the heads up anyway!
+
+ PBD::PropertyChange our_interests;
+
bool parent_wants_notify;
parent_wants_notify = Playlist::region_changed (what_changed, region);
- maybe_save_state (_("region modified"));
-
- if ((parent_wants_notify || (what_changed & our_interests))) {
- notify_modified ();
+ if (parent_wants_notify || what_changed.contains (our_interests)) {
+ notify_contents_changed ();
}
return true;