Skip to content

Commit

Permalink
Update instruments.xml to sort Articulations and Channels
Browse files Browse the repository at this point in the history 
Backport of musescore#8289, additionally fixing the order of channels for
accustic bass and fixing an mtest
  • Loading branch information
@shoogle @Jojo-Schmitz
shoogle authored and Jojo-Schmitz committed Sep 2, 2021
1 parent 0f82fb9 commit 17a324f
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 45 deletions.
40 changes: 20 additions & 20 deletions mtest/musicxml/io/testSystemBrackets3_ref.mscx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,28 +194,28 @@ Gtr. 1</shortName>
<midiPort>0</midiPort>
<midiChannel>2</midiChannel>
</Channel>
<Channel name="harmonics">
<program value="31"/>
<Channel name="mute">
<program value="28"/>
<midiPort>0</midiPort>
<midiChannel>1</midiChannel>
</Channel>
<Channel name="distortion">
<program value="30"/>
<Channel name="jazz">
<program value="26"/>
<midiPort>0</midiPort>
<midiChannel>3</midiChannel>
</Channel>
<Channel name="overdriven">
<program value="29"/>
<Channel name="harmonics">
<program value="31"/>
<midiPort>0</midiPort>
<midiChannel>4</midiChannel>
</Channel>
<Channel name="mute">
<program value="28"/>
<Channel name="distortion">
<program value="30"/>
<midiPort>0</midiPort>
<midiChannel>5</midiChannel>
</Channel>
<Channel name="jazz">
<program value="26"/>
<Channel name="overdriven">
<program value="29"/>
<midiPort>0</midiPort>
<midiChannel>6</midiChannel>
</Channel>
Expand Down Expand Up @@ -323,28 +323,28 @@ Gtr. 2</shortName>
<midiPort>0</midiPort>
<midiChannel>8</midiChannel>
</Channel>
<Channel name="harmonics">
<program value="31"/>
<Channel name="mute">
<program value="28"/>
<midiPort>0</midiPort>
<midiChannel>7</midiChannel>
</Channel>
<Channel name="distortion">
<program value="30"/>
<Channel name="jazz">
<program value="26"/>
<midiPort>0</midiPort>
<midiChannel>10</midiChannel>
</Channel>
<Channel name="overdriven">
<program value="29"/>
<Channel name="harmonics">
<program value="31"/>
<midiPort>0</midiPort>
<midiChannel>11</midiChannel>
</Channel>
<Channel name="mute">
<program value="28"/>
<Channel name="distortion">
<program value="30"/>
<midiPort>0</midiPort>
<midiChannel>12</midiChannel>
</Channel>
<Channel name="jazz">
<program value="26"/>
<Channel name="overdriven">
<program value="29"/>
<midiPort>0</midiPort>
<midiChannel>13</midiChannel>
</Channel>
Expand Down
50 changes: 25 additions & 25 deletions share/instruments/instruments.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7568,12 +7568,12 @@
<velocity>100</velocity>
<gateTime>100</gateTime>
</Articulation>
<Articulation name="sforzato">
<velocity>130</velocity>
</Articulation>
<Articulation name="marcato">
<velocity>500</velocity>
</Articulation>
<Articulation name="sforzato">
<velocity>130</velocity>
</Articulation>
<Channel>
<controller ctrl="0" value="1"/>
<program value="56"/> <!--Marching Snare-->
Expand Down Expand Up @@ -7776,12 +7776,12 @@
<velocity>100</velocity>
<gateTime>100</gateTime>
</Articulation>
<Articulation name="sforzato">
<velocity>130</velocity>
</Articulation>
<Articulation name="marcato">
<velocity>500</velocity>
</Articulation>
<Articulation name="sforzato">
<velocity>130</velocity>
</Articulation>
<Channel>
<controller ctrl="0" value="1"/>
<program value="96"/> <!--Marching Tenor-->
Expand Down Expand Up @@ -7886,12 +7886,12 @@
<velocity>100</velocity>
<gateTime>100</gateTime>
</Articulation>
<Articulation name="sforzato">
<velocity>130</velocity>
</Articulation>
<Articulation name="marcato">
<velocity>500</velocity>
</Articulation>
<Articulation name="sforzato">
<velocity>130</velocity>
</Articulation>
<Channel>
<controller ctrl="0" value="1"/>
<program value="59"/> <!--Marching Bass-->
Expand Down Expand Up @@ -7997,12 +7997,12 @@
<velocity>100</velocity>
<gateTime>100</gateTime>
</Articulation>
<Articulation name="sforzato">
<velocity>130</velocity>
</Articulation>
<Articulation name="marcato">
<velocity>500</velocity>
</Articulation>
<Articulation name="sforzato">
<velocity>130</velocity>
</Articulation>
<Channel>
<controller ctrl="0" value="1"/>
<program value="58"/> <!--Marching Cymbals-->
Expand Down Expand Up @@ -10542,6 +10542,12 @@ Aeolus organ synthesizer, currently disabled -->
<Channel name="open">
<program value="27"/> <!--Electric Guitar (clean)-->
</Channel>
<Channel name="mute">
<program value="28"/> <!--Electric Guitar (muted)-->
</Channel>
<Channel name="jazz">
<program value="26"/> <!--Electric Guitar (jazz)-->
</Channel>
<Channel name="harmonics">
<program value="31"/> <!--Guitar Harmonics-->
</Channel>
Expand All @@ -10551,12 +10557,6 @@ Aeolus organ synthesizer, currently disabled -->
<Channel name="overdriven">
<program value="29"/> <!--Overdriven Guitar-->
</Channel>
<Channel name="mute">
<program value="28"/> <!--Electric Guitar (muted)-->
</Channel>
<Channel name="jazz">
<program value="26"/> <!--Electric Guitar (jazz)-->
</Channel>
<genre>common</genre>
<genre>jazz</genre>
<genre>popular</genre>
Expand Down Expand Up @@ -11377,7 +11377,7 @@ Aeolus organ synthesizer, currently disabled -->
<genre>popular</genre>
</Instrument>
<Instrument id="acoustic-bass">
<!-- Same instrument as the orchestral contrabass, but used by default plucked, rather than bowed can't init from it, as it has not been read yet. -->
<!--Same instrument as the orchestral contrabass, but by default plucked rather than bowed, and with string date for tablatur-->
<family>bass-guitars</family>
<longName>Acoustic Bass</longName>
<shortName>Bass</shortName>
Expand All @@ -11401,18 +11401,18 @@ Aeolus organ synthesizer, currently disabled -->
<Channel name="pizzicato">
<program value="32"/> <!--Acoustic Bass-->
</Channel>
<Channel name="arco">
<program value="43"/> <!--Contrabass-->
</Channel>
<Channel name="tremolo">
<program value="44"/> <!--Tremolo Strings-->
</Channel>
<Channel name="slap">
<program value="36"/> <!--Slap Bass 1-->
</Channel>
<Channel name="pop">
<program value="37"/> <!--Slap Bass 2-->
</Channel>
<Channel name="arco">
<program value="43"/> <!--Contrabass-->
</Channel>
<Channel name="tremolo">
<program value="44"/> <!--Tremolo Strings-->
</Channel>
<genre>common</genre>
<genre>jazz</genre>
</Instrument>
Expand Down

0 comments on commit 17a324f

Please sign in to comment.