merge (with conflict fixes) with master (even against rgareus' recommendation)

[ardour.git] / gtk2_ardour / mixer_strip.cc

diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index a0f9f241987bb133d8c8e45d25c05571b295a0f7..80548ea20b71c60a4b6d2fd525ed13fefadc269c 100644 (file)
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -1041,29 +1041,13 @@ MixerStrip::update_panner_choices ()
        ENSURE_GUI_THREAD (*this, &MixerStrip::update_panner_choices)
        if (!_route->panner_shell()) { return; }
 
-       int in = _route->output()->n_ports().n_audio();
-       int out = in;
-
+       uint32_t in = _route->output()->n_ports().n_audio();
+       uint32_t out = in;
        if (_route->panner()) {
                in = _route->panner()->in().n_audio();
        }
 
-       if (out < 2 || in == 0) {
-               panners.set_available_panners(_route, std::map<std::string,std::string>());
-               return;
-       }
-
-       std::map<std::string,std::string> panner_list;
-       std::list<PannerInfo*> panner_info = PannerManager::instance().panner_info;
-       /* get available panners for current configuration. */
-       for (list<PannerInfo*>::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));
-       }
-       panners.set_available_panners(_route, panner_list);
+       panners.set_available_panners(PannerManager::instance().PannerManager::get_available_panners(in, out));
 }
 
 /*
@@ -1891,18 +1875,13 @@ MixerStrip::show_send (boost::shared_ptr<Send> send)
        gain_meter().set_controls (_route, send->meter(), send->amp());
        gain_meter().setup_meters ();
 
-       panner_ui().set_panner (_current_delivery->panner_shell(), _current_delivery->panner());
-       panner_ui().set_available_panners(boost::shared_ptr<ARDOUR::Route>(), std::map<std::string,std::string>());
+       uint32_t const in = _current_delivery->pans_required();
+       uint32_t const out = _current_delivery->pan_outs();
 
+       panner_ui().set_panner (_current_delivery->panner_shell(), _current_delivery->panner());
+       panner_ui().set_available_panners(PannerManager::instance().PannerManager::get_available_panners(in, out));
        panner_ui().setup_pan ();
-
-       /* make sure the send has audio output */
-
-       if (_current_delivery->output() && _current_delivery->output()->n_ports().n_audio() > 0) {
-               panners.show_all ();
-       } else {
-               panners.hide_all ();
-       }
+       panner_ui().show_all ();
 
        input_button.set_sensitive (false);
        group_button.set_sensitive (false);
@@ -2157,6 +2136,9 @@ MixerStrip::ab_plugins ()
 bool
 MixerStrip::level_meter_button_press (GdkEventButton* ev)
 {
+       if (_current_delivery && boost::dynamic_pointer_cast<Send>(_current_delivery)) {
+               return false;
+       }
        if (ev->button == 3) {
                popup_level_meter_menu (ev);
                return true;