From cbee698e6b2c7e6043909fb672ee4f9868475841 Mon Sep 17 00:00:00 2001 From: Robert Jonsson Date: Fri, 21 Jan 2011 22:36:42 +0000 Subject: graphical editing of automation 1st drop --- muse2/muse/audiotrack.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'muse2/muse/audiotrack.cpp') diff --git a/muse2/muse/audiotrack.cpp b/muse2/muse/audiotrack.cpp index eb70c51e..4be1a1a9 100644 --- a/muse2/muse/audiotrack.cpp +++ b/muse2/muse/audiotrack.cpp @@ -871,8 +871,10 @@ void AudioTrack::writeProperties(int level, Xml& xml) const } for (ciCtrlList icl = _controller.begin(); icl != _controller.end(); ++icl) { const CtrlList* cl = icl->second; - QString s("controller id=\"%1\" cur=\"%2\""); - xml.tag(level++, s.arg(cl->id()).arg(cl->curVal()).toAscii().constData()); + + QString s= QString("controller id=\"%1\" cur=\"%2\"").arg(cl->id()).arg(cl->curVal()).toAscii().constData(); + s += QString(" color=\"%1\" visible=\"%2\"").arg(cl->color().name()).arg(cl->isVisible()); + xml.tag(level++, s.toAscii().constData()); int i = 0; for (ciCtrl ic = cl->begin(); ic != cl->end(); ++ic) { QString s("%1 %2, "); @@ -967,7 +969,7 @@ bool AudioTrack::readProperties(Xml& xml, const QString& tag) else if (tag == "controller") { CtrlList* l = new CtrlList(); l->read(xml); - + // Since (until now) muse wrote a 'zero' for plugin controller current value // in the XML file, we can't use that value, now that plugin automation is added. // We must take the value from the plugin control value. @@ -995,8 +997,9 @@ bool AudioTrack::readProperties(Xml& xml, const QString& tag) d->insert(std::pair (i->first, i->second)); if(!ctlfound) - d->setCurVal(l->curVal()); - + d->setCurVal(l->curVal()); + d->setColor(l->color()); + d->setVisible(l->isVisible()); d->setDefault(l->getDefault()); delete l; l = d; -- cgit v1.2.3