LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #4491 from Jojo-Schmitz/tubo-shaker

Browse source 
fix #280632: Add shaker, fix tubo instrument
This commit is contained in:
anatoly-os 2019-01-11 14:16:32 +02:00 committed by GitHub
commit 81f790254e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
share/instruments/instruments.xml
View file

@ -5709,11 +5709,11 @@
<stafftype staffTypePreset="perc1Line">percussion</stafftype>
<barlineSpan>1</barlineSpan>
<drumset>1</drumset>
<Drum pitch="81">
<Drum pitch="82">
<head>normal</head>
<line>0</line>
<voice>0</voice>
<name>Open Triangle</name>
<name>Shaker</name>
<stem>1</stem>
<shortcut>A</shortcut>
</Drum>
@ -5723,6 +5723,27 @@
</Channel>
<genre>world</genre>
</Instrument>
<Instrument id="shaker">
<longName>Shaker</longName>
<shortName>Sh.</shortName>
<description>Shaker</description>
<clef>PERC</clef>
<stafftype staffTypePreset="perc1Line">percussion</stafftype>
<barlineSpan>1</barlineSpan>
<drumset>1</drumset>
<Drum pitch="82">
<head>normal</head>
<line>0</line>
<voice>0</voice>
<name>Shaker</name>
<stem>1</stem>
<shortcut>A</shortcut>
</Drum>
<Channel>
<controller ctrl="0" value="1"/>
<program value="0"/>
</Channel>
</Instrument>
<Instrument id="metal-castanets">
<longName>Metal Castanets</longName>
<shortName>Met. Cst.</shortName>
@ -6683,7 +6704,7 @@
<head>diamond</head>
<line>0</line>
<voice>0</voice>
<name>Triangle</name>
<name>Open Triangle</name>
<stem>1</stem>
<shortcut>D</shortcut>
</Drum>

2
share/instruments/instrumentsxml.h
View file

@ -752,6 +752,8 @@ QT_TRANSLATE_NOOP("InstrumentsXML", "Bowl Gongs"),
QT_TRANSLATE_NOOP3("InstrumentsXML", "Bw. Gon.", "Bowl Gongs"),
QT_TRANSLATE_NOOP("InstrumentsXML", "Tubo"),
QT_TRANSLATE_NOOP3("InstrumentsXML", "Tu.", "Tubo"),
QT_TRANSLATE_NOOP("InstrumentsXML", "Shaker"),
QT_TRANSLATE_NOOP3("InstrumentsXML", "Sh.", "Shaker"),
QT_TRANSLATE_NOOP("InstrumentsXML", "Metal Castanets"),
QT_TRANSLATE_NOOP3("InstrumentsXML", "Met. Cst.", "Metal Castanets"),
QT_TRANSLATE_NOOP("InstrumentsXML", "Automobile Brake Drums"),