summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Jonsson <spamatica@gmail.com>2006-08-30 20:44:05 +0000
committerRobert Jonsson <spamatica@gmail.com>2006-08-30 20:44:05 +0000
commit5fdc88d60b6c6b779b4cd0747b8faec99349343f (patch)
treece87b31fdef8825789aef4397064f661455a4406
parentca818be8d6b259c592c3483dbbdc0da61e8c4bac (diff)
minor fixes:
- min track height - select other softsynths oh my back hurts, time to stop!
-rw-r--r--muse/muse/mixer/mstrip.cpp2
-rw-r--r--muse/muse/track.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/muse/muse/mixer/mstrip.cpp b/muse/muse/mixer/mstrip.cpp
index fad96b07..5838af8b 100644
--- a/muse/muse/mixer/mstrip.cpp
+++ b/muse/muse/mixer/mstrip.cpp
@@ -1179,7 +1179,7 @@ void MidiInPortStrip::oRoutePressed()
SynthIList* asl = song->syntis();
int sn = 0;
- for (iSynthI i = asl->begin(); i != asl->end(); ++i) {
+ for (iSynthI i = asl->begin(); i != asl->end(); ++i,++sn) {
QAction* action = pup->addAction((*i)->name());
QMap<QString, QVariant> data;
diff --git a/muse/muse/track.cpp b/muse/muse/track.cpp
index 0b8186eb..6c011d5e 100644
--- a/muse/muse/track.cpp
+++ b/muse/muse/track.cpp
@@ -328,7 +328,7 @@ bool Track::readProperties(QDomNode node)
}
}
else if (tag == "height")
- arrangerTrack.h = i;
+ arrangerTrack.h = i < minTrackHeight ? minTrackHeight : i;
else if (tag == "subtrack") {
ArrangerTrack* st = new ArrangerTrack;
for (QDomNode n = node.firstChild(); !n.isNull(); n = n.nextSibling()) {