diff options
| author | Robin Gareus <robin@gareus.org> | 2020-03-23 16:38:22 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2020-03-23 16:41:13 +0100 |
| commit | b760d541c6b00091d1da3af59d4145c80a22aa6a (patch) | |
| tree | 3b359d713fc4fa25473f17ab9b77ff339b9c2bbd | |
| parent | ce088f1f44ff8baa607159df6c2728b5237c949f (diff) | |
Pan: remove automation-state indirection 1/2
| -rw-r--r-- | gtk2_ardour/mixer_strip.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/panner_ui.cc | 15 |
2 files changed, 8 insertions, 9 deletions
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index fbdb7bf899..ba7f6e0942 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -780,7 +780,7 @@ MixerStrip::set_width_enum (Width w, void* owner) gpm.gain_automation_state_button.set_text (GainMeterBase::short_astate_string (gain_automation->automation_state())); if (_route->panner()) { - ((Gtk::Label*)panners.pan_automation_state_button.get_child())->set_text (GainMeterBase::short_astate_string (_route->panner()->automation_state())); + ((Gtk::Label*)panners.pan_automation_state_button.get_child())->set_text (GainMeterBase::short_astate_string (_route->pannable()->automation_state())); } switch (w) { diff --git a/gtk2_ardour/panner_ui.cc b/gtk2_ardour/panner_ui.cc index a1dcb5264b..2a6daa1701 100644 --- a/gtk2_ardour/panner_ui.cc +++ b/gtk2_ardour/panner_ui.cc @@ -148,19 +148,18 @@ PannerUI::build_astate_menu () pan_astate_menu->items().clear (); } - /** TRANSLATORS: this is `Manual' in the sense of automation not being played, - so that changes to pan must be done by hand. - */ + boost::shared_ptr<Pannable> pannable = _panshell->pannable(); + pan_astate_menu->items().push_back (MenuElem (GainMeterBase::astate_string (ARDOUR::Off), - sigc::bind ( sigc::mem_fun (_panner.get(), &Panner::set_automation_state), (AutoState) ARDOUR::Off))); + sigc::bind ( sigc::mem_fun (pannable.get(), &Pannable::set_automation_state), (AutoState) ARDOUR::Off))); pan_astate_menu->items().push_back (MenuElem (GainMeterBase::astate_string (ARDOUR::Play), - sigc::bind ( sigc::mem_fun (_panner.get(), &Panner::set_automation_state), (AutoState) Play))); + sigc::bind ( sigc::mem_fun (pannable.get(), &Pannable::set_automation_state), (AutoState) Play))); pan_astate_menu->items().push_back (MenuElem (GainMeterBase::astate_string (ARDOUR::Write), - sigc::bind ( sigc::mem_fun (_panner.get(), &Panner::set_automation_state), (AutoState) Write))); + sigc::bind ( sigc::mem_fun (pannable.get(), &Pannable::set_automation_state), (AutoState) Write))); pan_astate_menu->items().push_back (MenuElem (GainMeterBase::astate_string (ARDOUR::Touch), - sigc::bind (sigc::mem_fun (_panner.get(), &Panner::set_automation_state), (AutoState) Touch))); + sigc::bind (sigc::mem_fun (pannable.get(), &Pannable::set_automation_state), (AutoState) Touch))); pan_astate_menu->items().push_back (MenuElem (GainMeterBase::astate_string (ARDOUR::Latch), - sigc::bind ( sigc::mem_fun (_panner.get(), &Panner::set_automation_state), (AutoState) Latch))); + sigc::bind ( sigc::mem_fun (pannable.get(), &Pannable::set_automation_state), (AutoState) Latch))); } |