diff options
Diffstat (limited to 'muse2/muse/arranger')
| -rw-r--r-- | muse2/muse/arranger/arranger.cpp | 8 | ||||
| -rw-r--r-- | muse2/muse/arranger/pcanvas.cpp | 7 |
2 files changed, 9 insertions, 6 deletions
diff --git a/muse2/muse/arranger/arranger.cpp b/muse2/muse/arranger/arranger.cpp index 89872bdf..31ee0451 100644 --- a/muse2/muse/arranger/arranger.cpp +++ b/muse2/muse/arranger/arranger.cpp @@ -741,8 +741,8 @@ void Arranger::writeStatus(int level, MusECore::Xml& xml) xml.intTag(level, "info", ib->isChecked()); split->writeStatus(level, xml); - xml.intTag(level, "xpos", hscroll->pos()); xml.intTag(level, "xmag", hscroll->mag()); + xml.intTag(level, "xpos", hscroll->pos()); xml.intTag(level, "ypos", vscroll->value()); xml.etag(level, "arranger"); } @@ -808,10 +808,8 @@ void Arranger::readStatus(MusECore::Xml& xml) split->readStatus(xml); else if (tag == "xmag") hscroll->setMag(xml.parseInt()); - else if (tag == "xpos") { - int hpos = xml.parseInt(); - hscroll->setPos(hpos); - } + else if (tag == "xpos") + hscroll->setPos(xml.parseInt()); else if (tag == "ypos") vscroll->setValue(xml.parseInt()); else diff --git a/muse2/muse/arranger/pcanvas.cpp b/muse2/muse/arranger/pcanvas.cpp index bcbb3e58..646a9382 100644 --- a/muse2/muse/arranger/pcanvas.cpp +++ b/muse2/muse/arranger/pcanvas.cpp @@ -1025,6 +1025,8 @@ bool PartCanvas::mousePress(QMouseEvent* event) foreach(int frame, automation.currentCtrlFrameList) MusEGlobal::audio->msgEraseACEvent((MusECore::AudioTrack*)automation.currentTrack, automation.currentCtrlList->id(), frame); + // User probably would like to hear results so make sure controller is enabled. + ((MusECore::AudioTrack*)automation.currentTrack)->enableController(automation.currentCtrlList->id(), true); } } else { @@ -3877,7 +3879,7 @@ void PartCanvas::processAutomationMovements(QPoint pos, bool addPoint) int frame = MusEGlobal::tempomap.tick2frame(pos.x()); // FIXME Inefficient to add with wait here, then remove and add with wait again below. Tim. MusEGlobal::audio->msgAddACEvent((MusECore::AudioTrack*)automation.currentTrack, automation.currentCtrlList->id(), frame, 1.0 /*dummy value */); - + MusECore::iCtrl ic=automation.currentCtrlList->begin(); for (; ic !=automation.currentCtrlList->end(); ++ic) { MusECore::CtrlVal &cv = ic->second; @@ -3956,6 +3958,9 @@ void PartCanvas::processAutomationMovements(QPoint pos, bool addPoint) MusEGlobal::audio->msgChangeACEvent((MusECore::AudioTrack*)automation.currentTrack, automation.currentCtrlList->id(), icc->second.frame, newFrame, cvval); else MusEGlobal::audio->msgAddACEvent((MusECore::AudioTrack*)automation.currentTrack, automation.currentCtrlList->id(), newFrame, cvval); + + // User probably would like to hear results so make sure controller is enabled. + ((MusECore::AudioTrack*)automation.currentTrack)->enableController(automation.currentCtrlList->id(), true); } } |