diff options
| author | Daniel Schürmann <daschuer@mixxx.org> | 2019-01-12 23:14:20 +0100 |
|---|---|---|
| committer | Daniel Schürmann <daschuer@mixxx.org> | 2019-01-12 23:14:20 +0100 |
| commit | 5c0261a9c3cf23cc164f259a131f59f25b87cb03 (patch) | |
| tree | 01f8f05f48c56bbf7a6570f17ab9ca60849ed34b /src/engine/enginemaster.h | |
| parent | dd5de6b1ab592910e1f06f1b66fe170da94cf271 (diff) | |
| parent | 1f6d795252d0454962d1ae4dd284d100e6f4180f (diff) | |
Merge remote-tracking branch 'upstream/2.2'
Conflicts:
CHANGELOG.md
LICENSE
build/wix/LICENSE.rtf
src/defs_version.h
src/engine/controls/ratecontrol.cpp
Diffstat (limited to 'src/engine/enginemaster.h')
| -rw-r--r-- | src/engine/enginemaster.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/engine/enginemaster.h b/src/engine/enginemaster.h index 15eb6ce7d6..c1996ac807 100644 --- a/src/engine/enginemaster.h +++ b/src/engine/enginemaster.h @@ -164,8 +164,7 @@ class EngineMaster : public QObject, public AudioSource { class TalkoverGainCalculator : public GainCalculator { public: inline double getGain(ChannelInfo* pChannelInfo) const { - Q_UNUSED(pChannelInfo); - return 1.0; + return pChannelInfo->m_pVolumeControl->get(); } }; class OrientationVolumeGainCalculator : public GainCalculator { |