summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--muse/muse/ctrl.cpp8
-rw-r--r--muse/muse/muse.cpp4
-rw-r--r--muse/synti/deicsonze/deicsonzegui.h2
-rw-r--r--muse/synti/zynaddsubfx/main.cpp1
4 files changed, 8 insertions, 7 deletions
diff --git a/muse/muse/ctrl.cpp b/muse/muse/ctrl.cpp
index 056f4caf..b505744e 100644
--- a/muse/muse/ctrl.cpp
+++ b/muse/muse/ctrl.cpp
@@ -284,15 +284,15 @@ void Ctrl::write(Xml& xml)
if (empty()) {
if (_type & INT)
- xml.tagE(s.arg(id()).arg(_name).arg(curVal().i).arg(_type).arg(min.i).arg(max.i).arg(_default.i).toAscii().data());
+ xml.tagE(s.arg(id()).arg(_name).arg(schedVal().i).arg(_type).arg(min.i).arg(max.i).arg(_default.i).toAscii().data());
else
- xml.tagE(s.arg(id()).arg(_name).arg(curVal().f).arg(_type).arg(min.f).arg(max.f).arg(_default.f).toAscii().data());
+ xml.tagE(s.arg(id()).arg(_name).arg(schedVal().f).arg(_type).arg(min.f).arg(max.f).arg(_default.f).toAscii().data());
return;
}
if (_type & INT)
- xml.tag(s.arg(id()).arg(_name).arg(curVal().i).arg(_type).arg(min.i).arg(max.i).arg(_default.i).toAscii().data());
+ xml.tag(s.arg(id()).arg(_name).arg(schedVal().i).arg(_type).arg(min.i).arg(max.i).arg(_default.i).toAscii().data());
else
- xml.tag(s.arg(id()).arg(_name).arg(curVal().f).arg(_type).arg(min.f).arg(max.f).arg(_default.f).toAscii().data());
+ xml.tag(s.arg(id()).arg(_name).arg(schedVal().f).arg(_type).arg(min.f).arg(max.f).arg(_default.f).toAscii().data());
int i = 0;
for (ciCtrlVal ic = begin(); ic != end(); ++ic) {
diff --git a/muse/muse/muse.cpp b/muse/muse/muse.cpp
index 35260aff..fdf2c91c 100644
--- a/muse/muse/muse.cpp
+++ b/muse/muse/muse.cpp
@@ -1256,7 +1256,7 @@ void MusE::loadProject1(const QString& path)
for (iTrack i = tl->begin(); i != tl->end(); ++i) {
Track* track = *i;
- track->blockSignals(true);
+// track->blockSignals(true);
CtrlList* cl = track->controller();
for (iCtrl ic = cl->begin(); ic != cl->end(); ++ic) {
Ctrl* ctrl = ic->second;
@@ -1269,7 +1269,7 @@ void MusE::loadProject1(const QString& path)
song->setControllerVal(track, ctrl, val);
}
}
- track->blockSignals(false);
+// track->blockSignals(false);
}
setWindowTitle(QString("MusE: Song: ") + name);
}
diff --git a/muse/synti/deicsonze/deicsonzegui.h b/muse/synti/deicsonze/deicsonzegui.h
index 964c7d96..44f04da9 100644
--- a/muse/synti/deicsonze/deicsonzegui.h
+++ b/muse/synti/deicsonze/deicsonzegui.h
@@ -141,7 +141,7 @@ class DeicsOnzeGui : public QDialog, public Ui::DeicsOnzeGuiBase, public MessGui
void setSaveOnlyUsed(bool);
void setSaveOnlyUsedComp(bool);
void setSaveConfig(bool);
- void setMidiInCh(int); //to change
+// void setMidiInCh(int); //to change
void setQuality(const QString&);
void setFontSize(int);
void saveConfiguration();
diff --git a/muse/synti/zynaddsubfx/main.cpp b/muse/synti/zynaddsubfx/main.cpp
index 92612f45..ebe18274 100644
--- a/muse/synti/zynaddsubfx/main.cpp
+++ b/muse/synti/zynaddsubfx/main.cpp
@@ -379,6 +379,7 @@ bool Zynadd::processEvent(const MidiEvent& e)
default: ctl = C_NULL; break;
}
SetController(ch, ctl, e.dataB());
+ guiCmd = GUI_REFRESH; // does not work
}
break;
}