make GUI fader positions reflect VCA master values

diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc
index 0eea976b97b02fa73f601a162f7cd6d62d2b8f96..ce6737a5b8ed95b66e7def4dba2afa32a903eb76 100644 (file)
--- a/gtk2_ardour/gain_meter.cc
+++ b/gtk2_ardour/gain_meter.cc
@@ -524,11 +524,12 @@ void
 GainMeterBase::gain_adjusted ()
 {
        gain_t value;
+       const gain_t master_gain = _control->get_master_gain ();
 
        /* convert from adjustment range (0..1) to gain coefficient */
 
        if (_data_type == DataType::AUDIO) {
-               value = slider_position_to_gain_with_max (gain_adjustment.get_value(), Config->get_max_gain());
+               value = slider_position_to_gain_with_max (gain_adjustment.get_value(), Config->get_max_gain()) / master_gain;
        } else {
                value = gain_adjustment.get_value();
        }
@@ -547,11 +548,12 @@ GainMeterBase::gain_adjusted ()
 void
 GainMeterBase::effective_gain_display ()
 {
-       float value = GAIN_COEFF_ZERO;
+       gain_t value = GAIN_COEFF_ZERO;
+       const gain_t master_gain = _control->get_master_gain ();
 
        switch (_data_type) {
        case DataType::AUDIO:
-               value = gain_to_slider_position_with_max (_control->get_value(), Config->get_max_gain());
+               value = gain_to_slider_position_with_max (_control->get_value() * master_gain, Config->get_max_gain());
                break;
        case DataType::MIDI:
                value = _control->get_value ();