Skip to content

Commit

Permalink
fix #305705: part 3, Bouzouki uses metal strings (and some more)
Browse files Browse the repository at this point in the history
As the HQ soundfont has a sound for 12-string Guitar, this seems an
almost perfect match for Bouzouki (using courses rather than strings
too)
Changing that for the 12-string Guitar too, of course.
While at it I detected that the HQ soundfont also has sounds for Ukulele
and Mandolin, so let's use those too (and fall back to nylon strings
otherwise).
Also fix some marching band percussion instruments to use the correct
soundbank (and the same the Small Marching Band template use already)
even if that bank is currently not populated (but is in the latest
update to the soundfont), didn't sound before, doesn't sound with the
current soundfont (so no harm done) but will with the updated soundfont
  • Loading branch information
Jojo-Schmitz committed May 22, 2020
1 parent fcbdf34 commit 9b93615
Showing 1 changed file with 29 additions and 12 deletions.
41 changes: 29 additions & 12 deletions share/instruments/instruments.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7242,7 +7242,8 @@
<velocity>500</velocity>
</Articulation>
<channel>
<program>56</program>
<controller ctrl="0" value="1"/>
<program value="56"/> <!--Marching Snare-->
</channel>
<genre>marching</genre>
</Instrument>
Expand Down Expand Up @@ -7448,7 +7449,8 @@
<velocity>500</velocity>
</Articulation>
<channel>
<program>96</program>
<controller ctrl="0" value="1"/>
<program value="96"/> <!--Marching Tenor-->
</channel>
<genre>marching</genre>
</Instrument>
Expand Down Expand Up @@ -7556,7 +7558,8 @@
<velocity>500</velocity>
</Articulation>
<channel>
<program>59</program>
<controller ctrl="0" value="1"/>
<program value="59"/> <!--Marching Bass-->
</channel>
<genre>marching</genre>
</Instrument>
Expand Down Expand Up @@ -7665,7 +7668,8 @@
<velocity>500</velocity>
</Articulation>
<channel>
<program>58</program>
<controller ctrl="0" value="1"/>
<program value="58"/> <!--Marching Cymbals-->
</channel>
<genre>marching</genre>
</Instrument>
Expand Down Expand Up @@ -9487,7 +9491,7 @@ Aeolus organ synthesizer, currently disabled -->
<pPitchRange>43-76</pPitchRange>
<singleNoteDynamics>0</singleNoteDynamics>
<Channel>
<program value="105"/>
<program value="105"/> <!--Banjo-->
</Channel>
</Instrument>
<Instrument id="irish-tenor-banjo-tablature">
Expand Down Expand Up @@ -9665,7 +9669,8 @@ Aeolus organ synthesizer, currently disabled -->
<pPitchRange>50-90</pPitchRange>
<singleNoteDynamics>0</singleNoteDynamics>
<Channel>
<program value="24"/> <!--Acoustic Guitar (nylon)-->
<controller ctrl="32" value="8"/> <!--12-String Guitar-->
<program value="25"/> <!--Acoustic Guitar (steel)-->
</Channel>
<genre>world</genre>
</Instrument>
Expand All @@ -9688,7 +9693,8 @@ Aeolus organ synthesizer, currently disabled -->
<pPitchRange>48-90</pPitchRange>
<singleNoteDynamics>0</singleNoteDynamics>
<Channel>
<program value="24"/> <!--Acoustic Guitar (nylon)-->
<controller ctrl="32" value="8"/> <!--12-String Guitar-->
<program value="25"/> <!--Acoustic Guitar (steel)-->
</Channel>
<genre>world</genre>
</Instrument>
Expand Down Expand Up @@ -9832,7 +9838,7 @@ Aeolus organ synthesizer, currently disabled -->
<pPitchRange>35-83</pPitchRange>
<singleNoteDynamics>0</singleNoteDynamics>
<Channel>
<program value="24"/>
<program value="24"/> <!--Acoustic Guitar (nylon)-->
</Channel>
<genre>world</genre>
</Instrument>
Expand Down Expand Up @@ -9863,7 +9869,7 @@ Aeolus organ synthesizer, currently disabled -->
<pPitchRange>62-93</pPitchRange>
<singleNoteDynamics>0</singleNoteDynamics>
<Channel>
<program value="25"/>
<program value="25"/> <!--Acoustic Guitar (steel)-->
</Channel>
<genre>world</genre>
</Instrument>
Expand Down Expand Up @@ -9896,7 +9902,7 @@ Aeolus organ synthesizer, currently disabled -->
<pPitchRange>35-78</pPitchRange>
<singleNoteDynamics>0</singleNoteDynamics>
<Channel>
<program value="24"/>
<program value="24"/> <!--Acoustic Guitar (nylon)-->
</Channel>
</Instrument>
<Instrument id="contra-guitar">
Expand Down Expand Up @@ -9992,7 +9998,7 @@ Aeolus organ synthesizer, currently disabled -->
<transposeChromatic>-12</transposeChromatic>
<singleNoteDynamics>0</singleNoteDynamics>
<Channel>
<program value="25"/>
<program value="25"/> <!--Acoustic Guitar (steel)-->
</Channel>
</Instrument>
<Instrument id="guitar-steel-tablature">
Expand Down Expand Up @@ -10059,6 +10065,7 @@ Aeolus organ synthesizer, currently disabled -->
<aPitchRange>40-83</aPitchRange>
<pPitchRange>40-85</pPitchRange>
<Channel name="open">
<controller ctrl="32" value="8"/> <!--12-String Guitar-->
<program value="25"/> <!--Acoustic Guitar (steel)-->
</Channel>
<Channel name="mute">
Expand Down Expand Up @@ -10158,7 +10165,7 @@ Aeolus organ synthesizer, currently disabled -->
<transposeChromatic>-12</transposeChromatic>
<singleNoteDynamics>0</singleNoteDynamics>
<Channel>
<program value="27"/>
<program value="27"/> <!--Electric Guitar (clean)-->
</Channel>
</Instrument>
<Instrument id="electric-guitar-tablature">
Expand Down Expand Up @@ -10545,6 +10552,7 @@ Aeolus organ synthesizer, currently disabled -->
<pPitchRange>55-100</pPitchRange>
<singleNoteDynamics>0</singleNoteDynamics>
<Channel>
<controller ctrl="32" value="16"/> <!--Mandolin-->
<program value="24"/> <!--Acoustic Guitar (nylon)-->
</Channel>
<genre>popular</genre>
Expand Down Expand Up @@ -10576,6 +10584,7 @@ Aeolus organ synthesizer, currently disabled -->
<pPitchRange>48-93</pPitchRange>
<singleNoteDynamics>0</singleNoteDynamics>
<Channel>
<controller ctrl="32" value="16"/> <!--Mandolin-->
<program value="24"/> <!--Acoustic Guitar (nylon)-->
</Channel>
</Instrument>
Expand All @@ -10597,6 +10606,7 @@ Aeolus organ synthesizer, currently disabled -->
<pPitchRange>48-93</pPitchRange>
<singleNoteDynamics>0</singleNoteDynamics>
<Channel>
<controller ctrl="32" value="16"/> <!--Mandolin-->
<program value="24"/> <!--Acoustic Guitar (nylon)-->
</Channel>
</Instrument>
Expand All @@ -10618,6 +10628,7 @@ Aeolus organ synthesizer, currently disabled -->
<pPitchRange>48-93</pPitchRange>
<singleNoteDynamics>0</singleNoteDynamics>
<Channel>
<controller ctrl="32" value="16"/> <!--Mandolin-->
<program value="24"/> <!--Acoustic Guitar (nylon)-->
</Channel>
</Instrument>
Expand All @@ -10639,6 +10650,7 @@ Aeolus organ synthesizer, currently disabled -->
<pPitchRange>36-81</pPitchRange>
<singleNoteDynamics>0</singleNoteDynamics>
<Channel>
<controller ctrl="32" value="16"/> <!--Mandolin-->
<program value="24"/> <!--Acoustic Guitar (nylon)-->
</Channel>
</Instrument>
Expand All @@ -10660,6 +10672,7 @@ Aeolus organ synthesizer, currently disabled -->
<pPitchRange>36-88</pPitchRange>
<singleNoteDynamics>0</singleNoteDynamics>
<Channel>
<controller ctrl="32" value="16"/> <!--Mandolin-->
<program value="24"/> <!--Acoustic Guitar (nylon)-->
</Channel>
</Instrument>
Expand Down Expand Up @@ -10711,6 +10724,7 @@ Aeolus organ synthesizer, currently disabled -->
<pPitchRange>60-81</pPitchRange>
<singleNoteDynamics>0</singleNoteDynamics>
<Channel>
<controller ctrl="32" value="8"/> <!--Ukulele-->
<program value="24"/> <!--Acoustic Guitar (nylon)-->
</Channel>
<genre>common</genre>
Expand Down Expand Up @@ -10746,6 +10760,7 @@ Aeolus organ synthesizer, currently disabled -->
<pPitchRange>55-81</pPitchRange>
<singleNoteDynamics>0</singleNoteDynamics>
<Channel>
<controller ctrl="32" value="8"/> <!--Ukulele-->
<program value="24"/> <!--Acoustic Guitar (nylon)-->
</Channel>
</Instrument>
Expand All @@ -10767,6 +10782,7 @@ Aeolus organ synthesizer, currently disabled -->
<pPitchRange>60-81</pPitchRange>
<singleNoteDynamics>0</singleNoteDynamics>
<Channel>
<controller ctrl="32" value="8"/> <!--Ukulele-->
<program value="24"/> <!--Acoustic Guitar (nylon)-->
</Channel>
</Instrument>
Expand All @@ -10788,6 +10804,7 @@ Aeolus organ synthesizer, currently disabled -->
<pPitchRange>50-76</pPitchRange>
<singleNoteDynamics>0</singleNoteDynamics>
<Channel>
<controller ctrl="32" value="8"/> <!--Ukulele-->
<program value="24"/> <!--Acoustic Guitar (nylon)-->
</Channel>
</Instrument>
Expand Down

0 comments on commit 9b93615

Please sign in to comment.