Fix off-by-one MIDI note names.

Much like everything else in midnam, it's not specified whether the numbers are
0 or 1 relative, but everything out there seems to be 0 relative and this
matches the canvas, so go with that.

diff --git a/libs/midi++2/midnam_patch.cc b/libs/midi++2/midnam_patch.cc
index e69842e6cda30b8098706e51adf4e2aa9f8d709a..55e7ac1898531a7c48c6f6134d7371ee09c2187e 100644 (file)
--- a/libs/midi++2/midnam_patch.cc
+++ b/libs/midi++2/midnam_patch.cc
@@ -151,7 +151,7 @@ XMLNode&
 Note::get_state (void)
 {
        XMLNode* node = new XMLNode("Note");
-       node->add_property("Number", _number + 1);
+       node->add_property("Number", _number);
        node->add_property("Name",   _name);
 
        return *node;
@@ -163,14 +163,14 @@ Note::set_state (const XMLTree& tree, const XMLNode& node)
        assert(node.name() == "Note");
 
        const int num = string_to_int(tree, node.property("Number")->value());
-       if (num < 1 || num > 128) {
+       if (num > 127) {
                PBD::warning << string_compose("%1: Note number %2 (%3) out of range",
                                               tree.filename(), num, _name)
                             << endmsg;
                return -1;
        }
 
-       _number = num - 1;
+       _number = num;
        _name   = node.property("Name")->value();
 
        return 0;

diff --git a/patchfiles/Casio_CZ-1.midnam b/patchfiles/Casio_CZ-1.midnam
index 9d30efc3b047a0179bf2d2b22d3091cda91a9910..776d91550d6dd3eb0f7fe018af9ed471d6e64062 100644 (file)
--- a/patchfiles/Casio_CZ-1.midnam
+++ b/patchfiles/Casio_CZ-1.midnam
@@ -113,135 +113,5 @@
         </PatchNameList>
       </PatchBank>
     </ChannelNameSet>
-    <NoteNameList Name="Note Names">
-      <Note Number="1" Name=""/>
-      <Note Number="2" Name=""/>
-      <Note Number="3" Name=""/>
-      <Note Number="4" Name=""/>
-      <Note Number="5" Name=""/>
-      <Note Number="6" Name=""/>
-      <Note Number="7" Name=""/>
-      <Note Number="8" Name=""/>
-      <Note Number="9" Name=""/>
-      <Note Number="10" Name=""/>
-      <Note Number="11" Name=""/>
-      <Note Number="12" Name=""/>
-      <Note Number="13" Name=""/>
-      <Note Number="14" Name=""/>
-      <Note Number="15" Name=""/>
-      <Note Number="16" Name=""/>
-      <Note Number="17" Name=""/>
-      <Note Number="18" Name=""/>
-      <Note Number="19" Name=""/>
-      <Note Number="20" Name=""/>
-      <Note Number="21" Name=""/>
-      <Note Number="22" Name=""/>
-      <Note Number="23" Name=""/>
-      <Note Number="24" Name=""/>
-      <Note Number="25" Name=""/>
-      <Note Number="26" Name=""/>
-      <Note Number="27" Name=""/>
-      <Note Number="28" Name=""/>
-      <Note Number="29" Name=""/>
-      <Note Number="30" Name=""/>
-      <Note Number="31" Name=""/>
-      <Note Number="32" Name=""/>
-      <Note Number="33" Name=""/>
-      <Note Number="34" Name=""/>
-      <Note Number="35" Name=""/>
-      <Note Number="36" Name=""/>
-      <Note Number="37" Name=""/>
-      <Note Number="38" Name=""/>
-      <Note Number="39" Name=""/>
-      <Note Number="40" Name=""/>
-      <Note Number="41" Name=""/>
-      <Note Number="42" Name=""/>
-      <Note Number="43" Name=""/>
-      <Note Number="44" Name=""/>
-      <Note Number="45" Name=""/>
-      <Note Number="46" Name=""/>
-      <Note Number="47" Name=""/>
-      <Note Number="48" Name=""/>
-      <Note Number="49" Name=""/>
-      <Note Number="50" Name=""/>
-      <Note Number="51" Name=""/>
-      <Note Number="52" Name=""/>
-      <Note Number="53" Name=""/>
-      <Note Number="54" Name=""/>
-      <Note Number="55" Name=""/>
-      <Note Number="56" Name=""/>
-      <Note Number="57" Name=""/>
-      <Note Number="58" Name=""/>
-      <Note Number="59" Name=""/>
-      <Note Number="60" Name=""/>
-      <Note Number="61" Name=""/>
-      <Note Number="62" Name=""/>
-      <Note Number="63" Name=""/>
-      <Note Number="64" Name=""/>
-      <Note Number="65" Name=""/>
-      <Note Number="66" Name=""/>
-      <Note Number="67" Name=""/>
-      <Note Number="68" Name=""/>
-      <Note Number="69" Name=""/>
-      <Note Number="70" Name=""/>
-      <Note Number="71" Name=""/>
-      <Note Number="72" Name=""/>
-      <Note Number="73" Name=""/>
-      <Note Number="74" Name=""/>
-      <Note Number="75" Name=""/>
-      <Note Number="76" Name=""/>
-      <Note Number="77" Name=""/>
-      <Note Number="78" Name=""/>
-      <Note Number="79" Name=""/>
-      <Note Number="80" Name=""/>
-      <Note Number="81" Name=""/>
-      <Note Number="82" Name=""/>
-      <Note Number="83" Name=""/>
-      <Note Number="84" Name=""/>
-      <Note Number="85" Name=""/>
-      <Note Number="86" Name=""/>
-      <Note Number="87" Name=""/>
-      <Note Number="88" Name=""/>
-      <Note Number="89" Name=""/>
-      <Note Number="90" Name=""/>
-      <Note Number="91" Name=""/>
-      <Note Number="92" Name=""/>
-      <Note Number="93" Name=""/>
-      <Note Number="94" Name=""/>
-      <Note Number="95" Name=""/>
-      <Note Number="96" Name=""/>
-      <Note Number="97" Name=""/>
-      <Note Number="98" Name=""/>
-      <Note Number="99" Name=""/>
-      <Note Number="100" Name=""/>
-      <Note Number="101" Name=""/>
-      <Note Number="102" Name=""/>
-      <Note Number="103" Name=""/>
-      <Note Number="104" Name=""/>
-      <Note Number="105" Name=""/>
-      <Note Number="106" Name=""/>
-      <Note Number="107" Name=""/>
-      <Note Number="108" Name=""/>
-      <Note Number="109" Name=""/>
-      <Note Number="110" Name=""/>
-      <Note Number="111" Name=""/>
-      <Note Number="112" Name=""/>
-      <Note Number="113" Name=""/>
-      <Note Number="114" Name=""/>
-      <Note Number="115" Name=""/>
-      <Note Number="116" Name=""/>
-      <Note Number="117" Name=""/>
-      <Note Number="118" Name=""/>
-      <Note Number="119" Name=""/>
-      <Note Number="120" Name=""/>
-      <Note Number="121" Name=""/>
-      <Note Number="122" Name=""/>
-      <Note Number="123" Name=""/>
-      <Note Number="124" Name=""/>
-      <Note Number="125" Name=""/>
-      <Note Number="126" Name=""/>
-      <Note Number="127" Name=""/>
-      <Note Number="128" Name=""/>
-    </NoteNameList>
   </MasterDeviceNames>
 </MIDINameDocument>

diff --git a/patchfiles/Korg_Volca_Beats.midnam b/patchfiles/Korg_Volca_Beats.midnam
index 235793632951d57f1af98d3afbdf8be35a07e354..b3be55ab9c3a20001ea8b610ec459f54d86f2d30 100644 (file)
--- a/patchfiles/Korg_Volca_Beats.midnam
+++ b/patchfiles/Korg_Volca_Beats.midnam
@@ -21,16 +21,16 @@
       </PatchBank>
     </ChannelNameSet>
     <NoteNameList Name="Notes">
-      <Note Number="37" Name="Kick"/>
-      <Note Number="39" Name="Snare"/>
-      <Note Number="40" Name="Clap"/>
-      <Note Number="43" Name="Closed Hi-hat"/>
-      <Note Number="44" Name="Low Tom"/>
-      <Note Number="47" Name="Open Hi-hat"/>
-      <Note Number="50" Name="Crash Cymbal"/>
-      <Note Number="51" Name="High Tom"/>
-      <Note Number="68" Name="Agogô"/>
-      <Note Number="76" Name="Claves"/>
+      <Note Number="36" Name="Kick"/>
+      <Note Number="38" Name="Snare"/>
+      <Note Number="39" Name="Clap"/>
+      <Note Number="42" Name="Closed Hi-hat"/>
+      <Note Number="43" Name="Low Tom"/>
+      <Note Number="46" Name="Open Hi-hat"/>
+      <Note Number="49" Name="Crash Cymbal"/>
+      <Note Number="50" Name="High Tom"/>
+      <Note Number="67" Name="Agogô"/>
+      <Note Number="75" Name="Claves"/>
     </NoteNameList>
     <ControlNameList Name="Controls">
       <Control Type="7bit" Number="40" Name="Kick Level"/>