X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Faudio_playlist.cc;h=cb65164a9b03f2adb4be7032798227d72948e8fe;hb=f188ffffc18687c47d1d5a5c8b35bda4d7b75f5f;hp=60c7d4bdc38d87f8f29d83757e6b9248c90793cf;hpb=ce7a5e1c9fa3edf2d9cc66875505e402a0aaa6f6;p=ardour.git

diff --git a/libs/ardour/audio_playlist.cc b/libs/ardour/audio_playlist.cc
index 60c7d4bdc3..cb65164a9b 100644
--- a/libs/ardour/audio_playlist.cc
+++ b/libs/ardour/audio_playlist.cc
@@ -23,6 +23,7 @@
 
 
 #include "ardour/types.h"
+#include "ardour/debug.h"
 #include "ardour/configuration.h"
 #include "ardour/audioplaylist.h"
 #include "ardour/audioregion.h"
@@ -40,8 +41,10 @@ using namespace PBD;
 AudioPlaylist::AudioPlaylist (Session& session, const XMLNode& node, bool hidden)
 	: Playlist (session, node, DataType::AUDIO, hidden)
 {
+#ifndef NDEBUG
 	const XMLProperty* prop = node.property("type");
 	assert(!prop || DataType(prop->value()) == DataType::AUDIO);
+#endif
 
 	in_set_state++;
 	set_state (node, Stateful::loading_state_version);
@@ -163,7 +166,7 @@ AudioPlaylist::read (Sample *buf, Sample *mixdown_buffer, float *gain_buffer, nf
 		if ((*i)->coverage (start, end) != OverlapNone) {
 			relevant_regions[(*i)->layer()].push_back (*i);
 			relevant_layers.push_back ((*i)->layer());
-		}
+                }
 	}
 
 	for (Crossfades::iterator i = _crossfades.begin(); i != _crossfades.end(); ++i) {
@@ -188,8 +191,10 @@ AudioPlaylist::read (Sample *buf, Sample *mixdown_buffer, float *gain_buffer, nf
 		vector<boost::shared_ptr<Region> > r (relevant_regions[*l]);
 		vector<boost::shared_ptr<Crossfade> >& x (relevant_xfades[*l]);
 
+
 		for (vector<boost::shared_ptr<Region> >::iterator i = r.begin(); i != r.end(); ++i) {
 			boost::shared_ptr<AudioRegion> ar = boost::dynamic_pointer_cast<AudioRegion>(*i);
+                        DEBUG_TRACE (DEBUG::AudioPlayback, string_compose ("read from region %1\n", ar->name()));
 			assert(ar);
 			ar->read_at (buf, mixdown_buffer, gain_buffer, start, cnt, chan_n, read_frames, skip_frames);
 			_read_data_count += ar->read_data_count();
@@ -365,9 +370,6 @@ AudioPlaylist::check_dependents (boost::shared_ptr<Region> r, bool norefresh)
 	}
 
 	for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {
-
-		nframes_t xfade_length;
-
 		other = boost::dynamic_pointer_cast<AudioRegion> (*i);
 
 		if (other == region) {
@@ -397,6 +399,7 @@ AudioPlaylist::check_dependents (boost::shared_ptr<Region> r, bool norefresh)
 		touched_regions = 0;
 
 		try {
+			nframes_t xfade_length;
 			switch (c) {
 			case OverlapNone:
 				break;
@@ -525,7 +528,7 @@ AudioPlaylist::add_crossfade (boost::shared_ptr<Crossfade> xfade)
 		_crossfades.push_back (xfade);
 
 		xfade->Invalidated.connect_same_thread (*this, boost::bind (&AudioPlaylist::crossfade_invalidated, this, _1));
-		xfade->StateChanged.connect_same_thread (*this, boost::bind (&AudioPlaylist::crossfade_changed, this, _1));
+		xfade->PropertyChanged.connect_same_thread (*this, boost::bind (&AudioPlaylist::crossfade_changed, this, _1));
 
 		notify_crossfade_added (xfade);
 	}
@@ -581,7 +584,7 @@ AudioPlaylist::set_state (const XMLNode& node, int version)
 			boost::shared_ptr<Crossfade> xfade = boost::shared_ptr<Crossfade> (new Crossfade (*((const Playlist *)this), *child));
 			_crossfades.push_back (xfade);
 			xfade->Invalidated.connect_same_thread (*this, boost::bind (&AudioPlaylist::crossfade_invalidated, this, _1));
-			xfade->StateChanged.connect_same_thread (*this, boost::bind (&AudioPlaylist::crossfade_changed, this, _1));
+			xfade->PropertyChanged.connect_same_thread (*this, boost::bind (&AudioPlaylist::crossfade_changed, this, _1));
 			NewCrossfade(xfade);
 		}
 
@@ -662,17 +665,15 @@ bool
 AudioPlaylist::destroy_region (boost::shared_ptr<Region> region)
 {
 	boost::shared_ptr<AudioRegion> r = boost::dynamic_pointer_cast<AudioRegion> (region);
+
+        if (!r) {
+                return false;
+        }
+
 	bool changed = false;
 	Crossfades::iterator c, ctmp;
 	set<boost::shared_ptr<Crossfade> > unique_xfades;
 
-	if (r == 0) {
-		fatal << _("programming error: non-audio Region passed to remove_overlap in audio playlist")
-		      << endmsg;
-		/*NOTREACHED*/
-		return false;
-	}
-
 	{
 		RegionLock rlock (this);
 
@@ -726,7 +727,7 @@ AudioPlaylist::destroy_region (boost::shared_ptr<Region> region)
 }
 
 void
-AudioPlaylist::crossfade_changed (PropertyChange)
+AudioPlaylist::crossfade_changed (const PropertyChange&)
 {
 	if (in_flush || in_set_state) {
 		return;
@@ -742,24 +743,27 @@ AudioPlaylist::crossfade_changed (PropertyChange)
 }
 
 bool
-AudioPlaylist::region_changed (PropertyChange what_changed, boost::shared_ptr<Region> region)
+AudioPlaylist::region_changed (const PropertyChange& what_changed, boost::shared_ptr<Region> region)
 {
 	if (in_flush || in_set_state) {
 		return false;
 	}
 
-	PropertyChange our_interests = PropertyChange (AudioRegion::FadeInChanged|
-				       AudioRegion::FadeOutChanged|
-				       AudioRegion::FadeInActiveChanged|
-				       AudioRegion::FadeOutActiveChanged|
-				       AudioRegion::EnvelopeActiveChanged|
-				       AudioRegion::ScaleAmplitudeChanged|
-				       AudioRegion::EnvelopeChanged);
+	PropertyChange our_interests;
+
+	our_interests.add (Properties::fade_in_active);
+	our_interests.add (Properties::fade_out_active);
+	our_interests.add (Properties::scale_amplitude);
+	our_interests.add (Properties::envelope_active);
+	our_interests.add (Properties::envelope);
+	our_interests.add (Properties::fade_in);
+	our_interests.add (Properties::fade_out);
+
 	bool parent_wants_notify;
 
 	parent_wants_notify = Playlist::region_changed (what_changed, region);
 
-	if ((parent_wants_notify || (what_changed & our_interests))) {
+	if (parent_wants_notify || (what_changed.contains (our_interests))) {
 		notify_contents_changed ();
 	}