Skip to content

Commit 17a324f

Browse files
shoogleJojo-Schmitz
shoogle
authored and
Jojo-Schmitz
committed
Update instruments.xml to sort Articulations and Channels
Backport of musescore#8289, additionally fixing the order of channels for accustic bass and fixing an mtest
1 parent 0f82fb9 commit 17a324f

File tree

2 files changed

+45
-45
lines changed

2 files changed

+45
-45
lines changed

‎mtest/musicxml/io/testSystemBrackets3_ref.mscx‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -194,28 +194,28 @@ Gtr. 1</shortName>
194194
<midiPort>0</midiPort>
195195
<midiChannel>2</midiChannel>
196196
</Channel>
197-
<Channel name="harmonics">
198-
<program value="31"/>
197+
<Channel name="mute">
198+
<program value="28"/>
199199
<midiPort>0</midiPort>
200200
<midiChannel>1</midiChannel>
201201
</Channel>
202-
<Channel name="distortion">
203-
<program value="30"/>
202+
<Channel name="jazz">
203+
<program value="26"/>
204204
<midiPort>0</midiPort>
205205
<midiChannel>3</midiChannel>
206206
</Channel>
207-
<Channel name="overdriven">
208-
<program value="29"/>
207+
<Channel name="harmonics">
208+
<program value="31"/>
209209
<midiPort>0</midiPort>
210210
<midiChannel>4</midiChannel>
211211
</Channel>
212-
<Channel name="mute">
213-
<program value="28"/>
212+
<Channel name="distortion">
213+
<program value="30"/>
214214
<midiPort>0</midiPort>
215215
<midiChannel>5</midiChannel>
216216
</Channel>
217-
<Channel name="jazz">
218-
<program value="26"/>
217+
<Channel name="overdriven">
218+
<program value="29"/>
219219
<midiPort>0</midiPort>
220220
<midiChannel>6</midiChannel>
221221
</Channel>
@@ -323,28 +323,28 @@ Gtr. 2</shortName>
323323
<midiPort>0</midiPort>
324324
<midiChannel>8</midiChannel>
325325
</Channel>
326-
<Channel name="harmonics">
327-
<program value="31"/>
326+
<Channel name="mute">
327+
<program value="28"/>
328328
<midiPort>0</midiPort>
329329
<midiChannel>7</midiChannel>
330330
</Channel>
331-
<Channel name="distortion">
332-
<program value="30"/>
331+
<Channel name="jazz">
332+
<program value="26"/>
333333
<midiPort>0</midiPort>
334334
<midiChannel>10</midiChannel>
335335
</Channel>
336-
<Channel name="overdriven">
337-
<program value="29"/>
336+
<Channel name="harmonics">
337+
<program value="31"/>
338338
<midiPort>0</midiPort>
339339
<midiChannel>11</midiChannel>
340340
</Channel>
341-
<Channel name="mute">
342-
<program value="28"/>
341+
<Channel name="distortion">
342+
<program value="30"/>
343343
<midiPort>0</midiPort>
344344
<midiChannel>12</midiChannel>
345345
</Channel>
346-
<Channel name="jazz">
347-
<program value="26"/>
346+
<Channel name="overdriven">
347+
<program value="29"/>
348348
<midiPort>0</midiPort>
349349
<midiChannel>13</midiChannel>
350350
</Channel>

‎share/instruments/instruments.xml‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7568,12 +7568,12 @@
75687568
<velocity>100</velocity>
75697569
<gateTime>100</gateTime>
75707570
</Articulation>
7571-
<Articulation name="sforzato">
7572-
<velocity>130</velocity>
7573-
</Articulation>
75747571
<Articulation name="marcato">
75757572
<velocity>500</velocity>
75767573
</Articulation>
7574+
<Articulation name="sforzato">
7575+
<velocity>130</velocity>
7576+
</Articulation>
75777577
<Channel>
75787578
<controller ctrl="0" value="1"/>
75797579
<program value="56"/> <!--Marching Snare-->
@@ -7776,12 +7776,12 @@
77767776
<velocity>100</velocity>
77777777
<gateTime>100</gateTime>
77787778
</Articulation>
7779-
<Articulation name="sforzato">
7780-
<velocity>130</velocity>
7781-
</Articulation>
77827779
<Articulation name="marcato">
77837780
<velocity>500</velocity>
77847781
</Articulation>
7782+
<Articulation name="sforzato">
7783+
<velocity>130</velocity>
7784+
</Articulation>
77857785
<Channel>
77867786
<controller ctrl="0" value="1"/>
77877787
<program value="96"/> <!--Marching Tenor-->
@@ -7886,12 +7886,12 @@
78867886
<velocity>100</velocity>
78877887
<gateTime>100</gateTime>
78887888
</Articulation>
7889-
<Articulation name="sforzato">
7890-
<velocity>130</velocity>
7891-
</Articulation>
78927889
<Articulation name="marcato">
78937890
<velocity>500</velocity>
78947891
</Articulation>
7892+
<Articulation name="sforzato">
7893+
<velocity>130</velocity>
7894+
</Articulation>
78957895
<Channel>
78967896
<controller ctrl="0" value="1"/>
78977897
<program value="59"/> <!--Marching Bass-->
@@ -7997,12 +7997,12 @@
79977997
<velocity>100</velocity>
79987998
<gateTime>100</gateTime>
79997999
</Articulation>
8000-
<Articulation name="sforzato">
8001-
<velocity>130</velocity>
8002-
</Articulation>
80038000
<Articulation name="marcato">
80048001
<velocity>500</velocity>
80058002
</Articulation>
8003+
<Articulation name="sforzato">
8004+
<velocity>130</velocity>
8005+
</Articulation>
80068006
<Channel>
80078007
<controller ctrl="0" value="1"/>
80088008
<program value="58"/> <!--Marching Cymbals-->
@@ -10542,6 +10542,12 @@ Aeolus organ synthesizer, currently disabled -->
1054210542
<Channel name="open">
1054310543
<program value="27"/> <!--Electric Guitar (clean)-->
1054410544
</Channel>
10545+
<Channel name="mute">
10546+
<program value="28"/> <!--Electric Guitar (muted)-->
10547+
</Channel>
10548+
<Channel name="jazz">
10549+
<program value="26"/> <!--Electric Guitar (jazz)-->
10550+
</Channel>
1054510551
<Channel name="harmonics">
1054610552
<program value="31"/> <!--Guitar Harmonics-->
1054710553
</Channel>
@@ -10551,12 +10557,6 @@ Aeolus organ synthesizer, currently disabled -->
1055110557
<Channel name="overdriven">
1055210558
<program value="29"/> <!--Overdriven Guitar-->
1055310559
</Channel>
10554-
<Channel name="mute">
10555-
<program value="28"/> <!--Electric Guitar (muted)-->
10556-
</Channel>
10557-
<Channel name="jazz">
10558-
<program value="26"/> <!--Electric Guitar (jazz)-->
10559-
</Channel>
1056010560
<genre>common</genre>
1056110561
<genre>jazz</genre>
1056210562
<genre>popular</genre>
@@ -11377,7 +11377,7 @@ Aeolus organ synthesizer, currently disabled -->
1137711377
<genre>popular</genre>
1137811378
</Instrument>
1137911379
<Instrument id="acoustic-bass">
11380-
<!-- 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. -->
11380+
<!--Same instrument as the orchestral contrabass, but by default plucked rather than bowed, and with string date for tablatur-->
1138111381
<family>bass-guitars</family>
1138211382
<longName>Acoustic Bass</longName>
1138311383
<shortName>Bass</shortName>
@@ -11401,18 +11401,18 @@ Aeolus organ synthesizer, currently disabled -->
1140111401
<Channel name="pizzicato">
1140211402
<program value="32"/> <!--Acoustic Bass-->
1140311403
</Channel>
11404-
<Channel name="arco">
11405-
<program value="43"/> <!--Contrabass-->
11406-
</Channel>
11407-
<Channel name="tremolo">
11408-
<program value="44"/> <!--Tremolo Strings-->
11409-
</Channel>
1141011404
<Channel name="slap">
1141111405
<program value="36"/> <!--Slap Bass 1-->
1141211406
</Channel>
1141311407
<Channel name="pop">
1141411408
<program value="37"/> <!--Slap Bass 2-->
1141511409
</Channel>
11410+
<Channel name="arco">
11411+
<program value="43"/> <!--Contrabass-->
11412+
</Channel>
11413+
<Channel name="tremolo">
11414+
<program value="44"/> <!--Tremolo Strings-->
11415+
</Channel>
1141611416
<genre>common</genre>
1141711417
<genre>jazz</genre>
1141811418
</Instrument>

0 commit comments

Comments
 (0)