diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-01-14 10:56:17 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-01-14 10:56:17 -0500 |
| commit | cf806123ca5faaef483f898daba3f7bd38ec62eb (patch) | |
| tree | f11f2f9ff64ea3b3682c81b8dd893ba0e9476445 /gtk2_ardour/panner_ui.cc | |
| parent | cfc9a1f22ea38d4dd6c619d6cec25fe29b1c2f48 (diff) | |
| parent | d9296b71237d9d3058b0796eda25258fadd45ad9 (diff) | |
merge (with conflict fixes) with master (even against rgareus' recommendation)
Diffstat (limited to 'gtk2_ardour/panner_ui.cc')
| -rw-r--r-- | gtk2_ardour/panner_ui.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/gtk2_ardour/panner_ui.cc b/gtk2_ardour/panner_ui.cc index af297a8507..0c57fab244 100644 --- a/gtk2_ardour/panner_ui.cc +++ b/gtk2_ardour/panner_ui.cc @@ -388,7 +388,7 @@ PannerUI::build_pan_menu () items.push_back (MenuElem (_("Edit..."), sigc::mem_fun (*this, &PannerUI::pan_edit))); } - if (_route && _panner_list.size() > 1 && !_panshell->bypassed()) { + if (_panner_list.size() > 1 && !_panshell->bypassed()) { RadioMenuItem::Group group; items.push_back (SeparatorElem()); @@ -444,9 +444,7 @@ PannerUI::pan_reset () void PannerUI::pan_set_custom_type (std::string uri) { if (_suspend_menu_callbacks) return; - if (_route) { - _route->set_custom_panner_uri(uri); - } + _panshell->select_panner_by_uri(uri); } void @@ -644,8 +642,7 @@ PannerUI::position_adjusted () } void -PannerUI::set_available_panners(boost::shared_ptr<ARDOUR::Route> r, std::map<std::string,std::string> p) +PannerUI::set_available_panners(std::map<std::string,std::string> p) { - _route = r; _panner_list = p; } |