summaryrefslogtreecommitdiff
path: root/libs/ardour/amp.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2016-02-29 09:09:53 -0500
committerPaul Davis <paul@linuxaudiosystems.com>2016-05-31 15:30:38 -0400
commit8eafe8b8045e60b305a40b729b9daea2c6289d28 (patch)
treec50dff992ee908e81e63296aaa25992ae09b1661 /libs/ardour/amp.cc
parent405f9fc712836937bf44dba48c64c1741bc4101c (diff)
vca design: gain controls cannot silently "merge" the master(s) value into their own
Diffstat (limited to 'libs/ardour/amp.cc')
-rw-r--r--libs/ardour/amp.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/ardour/amp.cc b/libs/ardour/amp.cc
index d5b9f56ca5..0e29922747 100644
--- a/libs/ardour/amp.cc
+++ b/libs/ardour/amp.cc
@@ -118,7 +118,7 @@ Amp::run (BufferSet& bufs, framepos_t /*start_frame*/, framepos_t /*end_frame*/,
} else { /* manual (scalar) gain */
- gain_t const dg = _gain_control->user_double();
+ gain_t const dg = _gain_control->user_double() * _gain_control->get_master_gain ();
if (_current_gain != dg) {