summaryrefslogtreecommitdiff
path: root/muse2/muse/ctrl.cpp
diff options
context:
space:
mode:
authorTim E. Real <termtech@rogers.com>2011-09-01 20:44:18 +0000
committerTim E. Real <termtech@rogers.com>2011-09-01 20:44:18 +0000
commit538afdda358cc49cac4554c1ce24ad2f50383907 (patch)
treed8a8c240ee9b8aa604b5c0cbeab6748b1f74351a /muse2/muse/ctrl.cpp
parent1414d8185ca9bc0b078cff7512482f013e28bde3 (diff)
Fixed tough old skeleton: Selecting 'previous/next event' in Song::execAutomationCtlPopup now
moves cursor with exact frame resolution. Reverted controls to full speed (again): Removed too-cautious msgSetVolume, msgSetPan, msgSetPluginCtrlVal. Reviewing some other possibly unneeded too-cautious msgXXX audio messages :) TODO: Fix current automation values (the 'off' value). Removed unused PanKnob from mixer CMakeLists.
Diffstat (limited to 'muse2/muse/ctrl.cpp')
-rw-r--r--muse2/muse/ctrl.cpp15
1 files changed, 13 insertions, 2 deletions
diff --git a/muse2/muse/ctrl.cpp b/muse2/muse/ctrl.cpp
index 0a863423..2793c434 100644
--- a/muse2/muse/ctrl.cpp
+++ b/muse2/muse/ctrl.cpp
@@ -20,7 +20,7 @@
#include "globals.h"
#include "ctrl.h"
#include "xml.h"
-// #include "audio.h"
+#include "audio.h"
void CtrlList::initColor(int i)
{
@@ -82,7 +82,7 @@ CtrlList::CtrlList()
// value
//---------------------------------------------------------
-double CtrlList::value(int frame)
+double CtrlList::value(int frame) const
{
// Changed by Tim. p4.0.32...
@@ -166,6 +166,17 @@ double CtrlList::value(int frame)
return rv;
}
+//---------------------------------------------------------
+// curVal
+// returns the value at the current audio position
+//---------------------------------------------------------
+double CtrlList::curVal() const
+{
+ //double v = value(Pos(audio->tickPos()).frame()); // p4.0.33
+ //double v = value(audio->pos().frame()); // Try this.
+ //return v;
+ return _curVal;
+}
//---------------------------------------------------------
// setCurVal