summaryrefslogtreecommitdiff
path: root/muse2/muse/node.cpp
diff options
context:
space:
mode:
authorRobert Jonsson <spamatica@gmail.com>2012-10-04 16:08:51 +0000
committerRobert Jonsson <spamatica@gmail.com>2012-10-04 16:08:51 +0000
commit8f81edb163136e8374db131eeefd261fc58e2dc9 (patch)
treeaa107d525e28c06a3543b2de1d1e48d76ac057a3 /muse2/muse/node.cpp
parent2783d453532728eee509c1e61d4bdd4a5bfac64f (diff)
added gain knob to channel strips
Diffstat (limited to 'muse2/muse/node.cpp')
-rw-r--r--muse2/muse/node.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/muse2/muse/node.cpp b/muse2/muse/node.cpp
index 02264a37..ffc26ee9 100644
--- a/muse2/muse/node.cpp
+++ b/muse2/muse/node.cpp
@@ -406,8 +406,8 @@ void AudioTrack::copyData(unsigned pos, int dstChannels, int srcStartChan, int s
double _pan = controller()->value(AC_PAN, pos,
!MusEGlobal::automation || automationType() == AUTO_OFF || !_panEnCtrl || !_panEn2Ctrl);
- vol[0] = _volume * (1.0 - _pan);
- vol[1] = _volume * (1.0 + _pan);
+ vol[0] = _volume * (1.0 - _pan) * _gain;
+ vol[1] = _volume * (1.0 + _pan) * _gain;
float meter[trackChans];
// Have we been here already during this process cycle?
@@ -744,8 +744,8 @@ void AudioTrack::addData(unsigned pos, int dstChannels, int srcStartChan, int sr
double _pan = controller()->value(AC_PAN, pos,
!MusEGlobal::automation || automationType() == AUTO_OFF || !_panEnCtrl || !_panEn2Ctrl);
- vol[0] = _volume * (1.0 - _pan);
- vol[1] = _volume * (1.0 + _pan);
+ vol[0] = _volume * (1.0 - _pan) * _gain;
+ vol[1] = _volume * (1.0 + _pan) * _gain;
float meter[trackChans];
// Have we been here already during this process cycle?