diff options
| author | Robin Gareus <robin@gareus.org> | 2019-06-09 19:41:07 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2019-06-09 19:56:30 +0200 |
| commit | 9f20631984c2792486d8f272fc1bebf806e858a8 (patch) | |
| tree | f959d42c3ca2b358bdbe01337f6fca516c78d203 /gtk2_ardour/mixer_strip.cc | |
| parent | cd5b0819bf1242240c60d2da4862abc65ce548e6 (diff) | |
Update GUI: meter-type API and meter-type state changes
This removes all additional GUI side meter-type state.
The route's meter-processors is now responsible for providing
the type.
meter-type is now implicit for GainMeter, LevelMeter used by
meter-strips and mixer-strips.
Diffstat (limited to 'gtk2_ardour/mixer_strip.cc')
| -rw-r--r-- | gtk2_ardour/mixer_strip.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index de4551940a..35801cbd0f 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -563,8 +563,6 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt) gpm.gain_display.get_parent()->remove (gpm.gain_display); } - gpm.set_type (rt->meter_type()); - mute_solo_table.attach (gpm.gain_display,0,1,1,2, EXPAND|FILL, EXPAND); mute_solo_table.attach (gpm.peak_display,1,2,1,2, EXPAND|FILL, EXPAND); @@ -2217,7 +2215,7 @@ MixerStrip::show_send (boost::shared_ptr<Send> send) set_current_delivery (send); - send->meter()->set_type(_route->shared_peak_meter()->get_type()); + send->meter()->set_meter_type (_route->meter_type ()); send->set_metering (true); _current_delivery->DropReferences.connect (send_gone_connection, invalidator (*this), boost::bind (&MixerStrip::revert_to_default_display, this), gui_context()); @@ -2616,7 +2614,7 @@ void MixerStrip::set_meter_type (MeterType t) { if (_suspend_menu_callbacks) return; - gpm.set_type (t); + _route->set_meter_type (t); } void |