summaryrefslogtreecommitdiff
path: root/muse2/muse/audiotrack.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/audiotrack.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/audiotrack.cpp')
-rw-r--r--muse2/muse/audiotrack.cpp15
1 files changed, 11 insertions, 4 deletions
diff --git a/muse2/muse/audiotrack.cpp b/muse2/muse/audiotrack.cpp
index 42229111..23484141 100644
--- a/muse2/muse/audiotrack.cpp
+++ b/muse2/muse/audiotrack.cpp
@@ -23,6 +23,7 @@
#include "audiodev.h"
#include "synth.h"
#include "dssihost.h"
+#include "app.h"
bool AudioAux::_isVisible=true;
bool AudioInput::_isVisible=true;
@@ -606,10 +607,13 @@ void AudioTrack::seekPrevACEvent(int id)
if(cl->empty())
return;
- iCtrl s = cl->lower_bound(song->cPos().frame());
+ //iCtrl s = cl->lower_bound(song->cPos().frame());
+ iCtrl s = cl->lower_bound(audio->pos().frame()); // p4.0.33
if(s != cl->begin())
--s;
- song->setPos(Song::CPOS, Pos(s->second.frame, false), true, false, true);
+
+ //song->setPos(Song::CPOS, Pos(s->second.frame, false), true, false, true);
+ song->setPos(Song::CPOS, Pos(s->second.frame, false), false, true, false); // p4.0.33
return;
}
@@ -627,13 +631,16 @@ void AudioTrack::seekNextACEvent(int id)
if(cl->empty())
return;
- iCtrl s = cl->upper_bound(song->cPos().frame());
+ //iCtrl s = cl->upper_bound(song->cPos().frame());
+ iCtrl s = cl->upper_bound(audio->pos().frame()); // p4.0.33
+
if(s == cl->end())
{
--s;
}
- song->setPos(Song::CPOS, Pos(s->second.frame, false), true, false, true);
+ //song->setPos(Song::CPOS, Pos(s->second.frame, false), true, false, true);
+ song->setPos(Song::CPOS, Pos(s->second.frame, false), false, true, false); // p4.0.33
return;
}