X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fpanner_shell.cc;h=d99e5068c155a2cce7ed036df31400236bf99d8c;hb=9bf40bde3aed831791108bfccc4b1e10b071afdc;hp=606fc0ca00ff67ea8dab18eff5cb945b06f3121e;hpb=17ace643e4edbec1e5bd7b446d039f8c94beef75;p=ardour.git

diff --git a/libs/ardour/panner_shell.cc b/libs/ardour/panner_shell.cc
index 606fc0ca00..d99e5068c1 100644
--- a/libs/ardour/panner_shell.cc
+++ b/libs/ardour/panner_shell.cc
@@ -32,7 +32,6 @@
 #include <glibmm.h>
 
 #include "pbd/cartesian.h"
-#include "pbd/boost_debug.h"
 #include "pbd/convert.h"
 #include "pbd/error.h"
 #include "pbd/failed_constructor.h"
@@ -43,6 +42,7 @@
 
 #include "ardour/audio_buffer.h"
 #include "ardour/audioengine.h"
+#include "ardour/boost_debug.h"
 #include "ardour/buffer_set.h"
 #include "ardour/debug.h"
 #include "ardour/pannable.h"
@@ -53,7 +53,7 @@
 #include "ardour/session.h"
 #include "ardour/speakers.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #include "pbd/mathfix.h"
 
@@ -155,9 +155,9 @@ PannerShell::get_state ()
 {
 	XMLNode* node = new XMLNode ("PannerShell");
 
-	node->add_property (X_("bypassed"), _bypassed ? X_("yes") : X_("no"));
-	node->add_property (X_("user-panner"), _user_selected_panner_uri);
-	node->add_property (X_("linked-to-route"), _panlinked ? X_("yes") : X_("no"));
+	node->set_property (X_("bypassed"), _bypassed);
+	node->set_property (X_("user-panner"), _user_selected_panner_uri);
+	node->set_property (X_("linked-to-route"), _panlinked);
 
 	if (_panner && _is_send) {
 		node->add_child_nocopy (_panner->get_state ());
@@ -171,31 +171,28 @@ PannerShell::set_state (const XMLNode& node, int version)
 {
 	XMLNodeList nlist = node.children ();
 	XMLNodeConstIterator niter;
-	XMLProperty const * prop;
-	LocaleGuard lg (X_("C"));
+	bool yn;
+	std::string str;
 
-	if ((prop = node.property (X_("bypassed"))) != 0) {
-		set_bypassed (string_is_affirmative (prop->value ()));
+	if (node.get_property (X_("bypassed"), yn)) {
+		set_bypassed (yn);
 	}
 
-	if ((prop = node.property (X_("linked-to-route"))) != 0) {
+	if (node.get_property (X_("linked-to-route"), yn)) {
 		if (!ARDOUR::Profile->get_mixbus()) {
-			_panlinked = string_is_affirmative (prop->value ());
+			_panlinked = yn;
 		}
 	}
 
-	if ((prop = node.property (X_("user-panner"))) != 0) {
-		_user_selected_panner_uri = prop->value ();
-	}
+	node.get_property (X_("user-panner"), _user_selected_panner_uri);
 
 	_panner.reset ();
 
 	for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
 
 		if ((*niter)->name() == X_("Panner")) {
-
-			if ((prop = (*niter)->property (X_("uri")))) {
-				PannerInfo* p = PannerManager::instance().get_by_uri(prop->value());
+			if ((*niter)->get_property (X_("uri"), str)) {
+				PannerInfo* p = PannerManager::instance().get_by_uri(str);
 				if (p) {
 					_panner.reset (p->descriptor.factory (
 								_is_send ? _pannable_internal : _pannable_route, _session.get_speakers ()));
@@ -217,13 +214,13 @@ PannerShell::set_state (const XMLNode& node, int version)
 			}
 
 			else /* backwards compatibility */
-			if ((prop = (*niter)->property (X_("type")))) {
+			if ((*niter)->get_property (X_("type"), str)) {
 
 				list<PannerInfo*>::iterator p;
 				PannerManager& pm (PannerManager::instance());
 
 				for (p = pm.panner_info.begin(); p != pm.panner_info.end(); ++p) {
-					if (prop->value() == (*p)->descriptor.name) {
+					if (str == (*p)->descriptor.name) {
 
 						/* note that we assume that all the stream panners
 						   are of the same type. pretty good
@@ -255,7 +252,7 @@ PannerShell::set_state (const XMLNode& node, int version)
 
 				if (p == pm.panner_info.end()) {
 					error << string_compose (_("Unknown panner plugin \"%1\" found in pan state - ignored"),
-					                         prop->value())
+					                         str)
 					      << endmsg;
 				}
 
@@ -343,7 +340,7 @@ PannerShell::distribute_no_automation (BufferSet& inbufs, BufferSet& outbufs, pf
 }
 
 void
-PannerShell::run (BufferSet& inbufs, BufferSet& outbufs, framepos_t start_frame, framepos_t end_frame, pframes_t nframes)
+PannerShell::run (BufferSet& inbufs, BufferSet& outbufs, samplepos_t start_sample, samplepos_t end_sample, pframes_t nframes)
 {
 	if (inbufs.count().n_audio() == 0) {
 		/* Input has no audio buffers (e.g. Aux Send in a MIDI track at a
@@ -385,7 +382,7 @@ PannerShell::run (BufferSet& inbufs, BufferSet& outbufs, framepos_t start_frame,
 
 	// If we shouldn't play automation defer to distribute_no_automation
 
-	if (!(as & Play || ((as & Touch) && !_panner->touching()))) {
+	if (!((as & Play) || ((as & (Touch | Latch)) && !_panner->touching()))) {
 
 		distribute_no_automation (inbufs, outbufs, nframes, 1.0);
 
@@ -398,7 +395,7 @@ PannerShell::run (BufferSet& inbufs, BufferSet& outbufs, framepos_t start_frame,
 			i->silence(nframes);
 		}
 
-		_panner->distribute_automated (inbufs, outbufs, start_frame, end_frame, nframes, _session.pan_automation_buffer());
+		_panner->distribute_automated (inbufs, outbufs, start_sample, end_sample, nframes, _session.pan_automation_buffer());
 	}
 }