X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fardour%2Fpanner_manager.cc;h=ec5b675731379994fdb4f197026f700d5b00b7f8;hb=3566fa2d8ef069805c70e39101a129c35419ded7;hp=b62f36b3554cb2c5d5697c4dedf173b6fa97fd0b;hpb=21ca6a10a96c135e7435f1cc786f4395020ca232;p=ardour.git

diff --git a/libs/ardour/panner_manager.cc b/libs/ardour/panner_manager.cc
index b62f36b355..ec5b675731 100644
--- a/libs/ardour/panner_manager.cc
+++ b/libs/ardour/panner_manager.cc
@@ -146,9 +146,11 @@ PannerManager::get_descriptor (string path)
 PannerInfo*
 PannerManager::select_panner (ChanCount in, ChanCount out, std::string const uri)
 {
+	PannerInfo* rv = NULL;
 	PanPluginDescriptor* d;
 	int32_t nin = in.n_audio();
 	int32_t nout = out.n_audio();
+	uint32_t priority = 0;
 
 	/* look for user-preference -- check if channels match */
 	for (list<PannerInfo*>::iterator p = panner_info.begin(); p != panner_info.end(); ++p) {
@@ -164,40 +166,51 @@ PannerManager::select_panner (ChanCount in, ChanCount out, std::string const uri
 	for (list<PannerInfo*>::iterator p = panner_info.begin(); p != panner_info.end(); ++p) {
 		d = &(*p)->descriptor;
 
-		if (d->in == nin && d->out == nout) {
-			return *p;
+		if (d->in == nin && d->out == nout && d->priority > priority) {
+			priority = d->priority;
+			rv = *p;
 		}
 	}
+	if (rv) { return rv; }
 
 	/* no exact match, look for good fit on inputs and variable on outputs */
 
+	priority = 0;
 	for (list<PannerInfo*>::iterator p = panner_info.begin(); p != panner_info.end(); ++p) {
 		d = &(*p)->descriptor;
 
-		if (d->in == nin && d->out == -1) {
-			return *p;
+		if (d->in == nin && d->out == -1 && d->priority > priority) {
+			priority = d->priority;
+			rv = *p;
 		}
 	}
+	if (rv) { return rv; }
 
 	/* no exact match, look for good fit on outputs and variable on inputs */
 
+	priority = 0;
 	for (list<PannerInfo*>::iterator p = panner_info.begin(); p != panner_info.end(); ++p) {
 		d = &(*p)->descriptor;
 
-		if (d->in == -1 && d->out == nout) {
-			return *p;
+		if (d->in == -1 && d->out == nout && d->priority > priority) {
+			priority = d->priority;
+			rv = *p;
 		}
 	}
+	if (rv) { return rv; }
 
 	/* no exact match, look for variable fit on inputs and outputs */
 
+	priority = 0;
 	for (list<PannerInfo*>::iterator p = panner_info.begin(); p != panner_info.end(); ++p) {
 		d = &(*p)->descriptor;
 
-		if (d->in == -1 && d->out == -1) {
-			return *p;
+		if (d->in == -1 && d->out == -1 && d->priority > priority) {
+			priority = d->priority;
+			rv = *p;
 		}
 	}
+	if (rv) { return rv; }
 
 	warning << string_compose (_("no panner discovered for in/out = %1/%2"), nin, nout) << endmsg;
 
@@ -205,13 +218,35 @@ PannerManager::select_panner (ChanCount in, ChanCount out, std::string const uri
 }
 
 PannerInfo*
-PannerManager::get_by_uri (std::string uri)
+PannerManager::get_by_uri (std::string uri) const
 {
 	PannerInfo* pi = NULL;
-	for (list<PannerInfo*>::iterator p = panner_info.begin(); p != panner_info.end(); ++p) {
+	for (list<PannerInfo*>::const_iterator p = panner_info.begin(); p != panner_info.end(); ++p) {
 		if ((*p)->descriptor.panner_uri != uri) continue;
 		pi = (*p);
 		break;
 	}
 	return pi;
 }
+
+PannerUriMap
+PannerManager::get_available_panners(uint32_t const a_in, uint32_t const a_out) const
+{
+	int const in = a_in;
+	int const out = a_out;
+	PannerUriMap panner_list;
+
+	if (out < 2 || in == 0) {
+		return panner_list;
+	}
+
+	/* get available panners for current configuration. */
+	for (list<PannerInfo*>::const_iterator p = panner_info.begin(); p != panner_info.end(); ++p) {
+		 PanPluginDescriptor* d = &(*p)->descriptor;
+		 if (d->in != -1 && d->in != in) continue;
+		 if (d->out != -1 && d->out != out) continue;
+		 if (d->in == -1 && d->out == -1 && out <= 2) continue;
+		 panner_list.insert(std::pair<std::string,std::string>(d->panner_uri,d->name));
+	}
+	return panner_list;
+}