summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim E. Real <termtech@rogers.com>2012-10-21 04:01:33 +0000
committerTim E. Real <termtech@rogers.com>2012-10-21 04:01:33 +0000
commitd7c62c8a41b9ce4688a03a054522cbff1983d408 (patch)
tree2bc8ef28d28df7eb9e5fafbac79c5f4b9d7e7bb7
parentc4aca7b81e76e0f098ac0f855599bdf1e3cf1e22 (diff)
In MidiEventBase::read() Repair controllers saved with lo byte 0xff.
No such control. It was supposed to be 0x00. It's an error caused by a previous bug, fixed now.
-rw-r--r--muse2/ChangeLog3
-rw-r--r--muse2/muse/midievent.cpp7
2 files changed, 10 insertions, 0 deletions
diff --git a/muse2/ChangeLog b/muse2/ChangeLog
index 365ef501..3d7c1513 100644
--- a/muse2/ChangeLog
+++ b/muse2/ChangeLog
@@ -1,3 +1,6 @@
+20.10.2012:
+ - In MidiEventBase::read() Repair controllers saved with lo byte 0xff. (Tim)
+ No such control. It was supposed to be 0x00. It's an error caused by a previous bug, fixed now.
19.10.2012:
* Improved: Midi initializations. New settings options, can be 'quiet'. Complete rewrite of initializations coding. (Tim)
* Improved: Midi controller graphs: Control selector 'S' popup now stay-open, AND NOW with multi-coloured dots:
diff --git a/muse2/muse/midievent.cpp b/muse2/muse/midievent.cpp
index 9e0e8974..7599e3d9 100644
--- a/muse2/muse/midievent.cpp
+++ b/muse2/muse/midievent.cpp
@@ -177,7 +177,14 @@ void MidiEventBase::read(Xml& xml)
break;
case Xml::TagEnd:
if (tag == "event")
+ {
+ // HACK: Repair controllers saved with lo byte 0xff.
+ // No such control. It was supposed to be 0x00.
+ // It's an error caused by a previous bug, fixed now.
+ if((type() == Controller) && ((a & 0xff) == 0xff))
+ a &= ~0xff;
return;
+ }
default:
break;
}