summaryrefslogtreecommitdiff
path: root/muse2/muse/mixer
diff options
context:
space:
mode:
authorTim E. Real <termtech@rogers.com>2011-04-25 20:47:28 +0000
committerTim E. Real <termtech@rogers.com>2011-04-25 20:47:28 +0000
commit499ccec21dd2ac636fb019c98a902c351b4ec165 (patch)
tree03b867772f9d4543c2ae0e8ca49f389333ea5ad7 /muse2/muse/mixer
parent5974951aeaf0a86b83175e018d5bf35e509f5181 (diff)
Overhaul plugin module and add variable run-length ladspa + dssi processing. Please see ChangeLog.
Diffstat (limited to 'muse2/muse/mixer')
-rw-r--r--muse2/muse/mixer/astrip.cpp28
-rw-r--r--muse2/muse/mixer/panknob.cpp5
2 files changed, 26 insertions, 7 deletions
diff --git a/muse2/muse/mixer/astrip.cpp b/muse2/muse/mixer/astrip.cpp
index 2f1a2262..265061ad 100644
--- a/muse2/muse/mixer/astrip.cpp
+++ b/muse2/muse/mixer/astrip.cpp
@@ -430,7 +430,10 @@ void AudioStrip::volumeChanged(double val)
else
vol = pow(10.0, val/20.0);
volume = vol;
- audio->msgSetVolume((AudioTrack*)track, vol);
+ //audio->msgSetVolume((AudioTrack*)track, vol);
+ // p4.0.21 audio->msgXXX waits. Do we really need to?
+ ((AudioTrack*)track)->setVolume(vol);
+
((AudioTrack*)track)->recordAutomation(AC_VOLUME, vol);
song->update(SC_TRACK_MODIFIED); // for graphical automation update
@@ -455,7 +458,10 @@ void AudioStrip::volumePressed()
else
vol = pow(10.0, val/20.0);
volume = vol;
- audio->msgSetVolume((AudioTrack*)track, volume);
+ //audio->msgSetVolume((AudioTrack*)track, volume);
+ // p4.0.21 audio->msgXXX waits. Do we really need to?
+ ((AudioTrack*)track)->setVolume(volume);
+
((AudioTrack*)track)->startAutoRecord(AC_VOLUME, volume);
}
@@ -498,7 +504,10 @@ void AudioStrip::volLabelChanged(double val)
vol = pow(10.0, val/20.0);
volume = vol;
slider->setValue(val);
- audio->msgSetVolume((AudioTrack*)track, vol);
+ //audio->msgSetVolume((AudioTrack*)track, vol);
+ // p4.0.21 audio->msgXXX waits. Do we really need to?
+ ((AudioTrack*)track)->setVolume(vol);
+
((AudioTrack*)track)->startAutoRecord(AC_VOLUME, vol);
}
@@ -513,7 +522,10 @@ void AudioStrip::panChanged(double val)
track->enablePanController(false);
panVal = val;
- audio->msgSetPan(((AudioTrack*)track), val);
+ //audio->msgSetPan(((AudioTrack*)track), val);
+ // p4.0.21 audio->msgXXX waits. Do we really need to?
+ ((AudioTrack*)track)->setPan(val);
+
((AudioTrack*)track)->recordAutomation(AC_PAN, val);
}
@@ -528,7 +540,9 @@ void AudioStrip::panPressed()
track->enablePanController(false);
panVal = pan->value();
- audio->msgSetPan(((AudioTrack*)track), panVal);
+ //audio->msgSetPan(((AudioTrack*)track), panVal);
+ // p4.0.21 audio->msgXXX waits. Do we really need to?
+ ((AudioTrack*)track)->setPan(panVal);
((AudioTrack*)track)->startAutoRecord(AC_PAN, panVal);
}
@@ -563,7 +577,9 @@ void AudioStrip::panLabelChanged(double val)
panVal = val;
pan->setValue(val);
- audio->msgSetPan((AudioTrack*)track, val);
+ //audio->msgSetPan((AudioTrack*)track, val);
+ // p4.0.21 audio->msgXXX waits. Do we really need to?
+ ((AudioTrack*)track)->setPan(val);
((AudioTrack*)track)->startAutoRecord(AC_PAN, val);
}
diff --git a/muse2/muse/mixer/panknob.cpp b/muse2/muse/mixer/panknob.cpp
index 065c1bd1..c99f0bd5 100644
--- a/muse2/muse/mixer/panknob.cpp
+++ b/muse2/muse/mixer/panknob.cpp
@@ -8,6 +8,7 @@
#include "../audio.h"
#include "panknob.h"
+#include "track.h"
//---------------------------------------------------------
// PanKnob
@@ -26,7 +27,9 @@ PanKnob::PanKnob(QWidget* parent, AudioTrack* s)
void PanKnob::valueChanged(double val)
{
- audio->msgSetPan(src, val);
+ //audio->msgSetPan(src, val);
+ // p4.0.21 audio->msgXXX waits. Do we really need to?
+ src->setPan(val);
}