Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add percussion panel row & column numbers to drum instruments #25672

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Add percussion panel row & column numbers to drum instruments #25672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 48 additions & 0 deletions share/instruments/instruments.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7002,6 +7002,8 @@
<name>High Bongo</name>
<stem>1</stem>
<shortcut>A</shortcut>
<panelRow>0</panelRow>
<panelColumn>0</panelColumn>
</Drum>
<Drum pitch="61"> <!--Low Bongo-->
<head>normal</head>
Expand All @@ -7010,6 +7012,8 @@
<name>Low Bongo</name>
<stem>1</stem>
<shortcut>B</shortcut>
<panelRow>0</panelRow>
<panelColumn>1</panelColumn>
</Drum>
<Channel>
<!--MIDI: Bank 128, Prog 48; MS General: Orchestra Kit-->
Expand Down Expand Up @@ -7069,6 +7073,8 @@
<name>Concert Bass Drum</name>
<stem>1</stem>
<shortcut>A</shortcut>
<panelRow>0</panelRow>
<panelColumn>0</panelColumn>
</Drum>
<Channel>
<!--MIDI: Bank 128, Prog 48; MS General: Orchestra Kit-->
Expand Down Expand Up @@ -8686,6 +8692,8 @@
<name>Closed Hi-Hat</name>
<stem>1</stem>
<shortcut>G</shortcut>
<panelRow>0</panelRow>
<panelColumn>0</panelColumn>
</Drum>
<Drum pitch="28"> <!--Slap-->
<head>cross</head>
Expand All @@ -8694,6 +8702,8 @@
<name>Pedal Hi-Hat</name>
<stem>2</stem>
<shortcut>F</shortcut>
<panelRow>0</panelRow>
<panelColumn>1</panelColumn>
</Drum>
<Drum pitch="29"> <!--Scratch Push-->
<head>cross</head>
Expand All @@ -8702,13 +8712,17 @@
<name>Open Hi-Hat</name>
<stem>1</stem>
<shortcut>E</shortcut>
<panelRow>0</panelRow>
<panelColumn>2</panelColumn>
</Drum>
<Drum pitch="30"> <!--Scratch Pull-->
<head>cross</head>
<line>0</line>
<voice>0</voice>
<name>Ride Cymbal 1</name>
<stem>1</stem>
<panelRow>0</panelRow>
<panelColumn>3</panelColumn>
</Drum>
<Drum pitch="36"> <!--Electric Bass Drum-->
<head>normal</head>
Expand All @@ -8717,13 +8731,17 @@
<name>Bass Drum 1</name>
<stem>2</stem>
<shortcut>B</shortcut>
<panelRow>0</panelRow>
<panelColumn>4</panelColumn>
</Drum>
<Drum pitch="37"> <!--Side Stick-->
<head>cross</head>
<line>3</line>
<voice>0</voice>
<name>Side Stick</name>
<stem>1</stem>
<panelRow>0</panelRow>
<panelColumn>5</panelColumn>
</Drum>
<Drum pitch="38"> <!--Acoustic Snare-->
<head>normal</head>
Expand All @@ -8732,34 +8750,44 @@
<name>Acoustic Snare</name>
<stem>1</stem>
<shortcut>A</shortcut>
<panelRow>0</panelRow>
<panelColumn>6</panelColumn>
</Drum>
<Drum pitch="54"> <!--Tambourine-->
<head>diamond</head>
<line>2</line>
<voice>0</voice>
<name>Tambourine</name>
<stem>1</stem>
<panelRow>0</panelRow>
<panelColumn>7</panelColumn>
</Drum>
<Drum pitch="55"> <!--Splash Cymbal-->
<head>cross</head>
<line>-3</line>
<voice>0</voice>
<name>Splash Cymbal</name>
<stem>1</stem>
<panelRow>1</panelRow>
<panelColumn>0</panelColumn>
</Drum>
<Drum pitch="56"> <!--Cowbell-->
<head>triangle-down</head>
<line>1</line>
<voice>0</voice>
<name>Cowbell</name>
<stem>1</stem>
<panelRow>1</panelRow>
<panelColumn>1</panelColumn>
</Drum>
<Drum pitch="58"> <!--Vibra Slap-->
<head>diamond</head>
<line>1</line>
<voice>0</voice>
<name>Vibraslap</name>
<stem>1</stem>
<panelRow>1</panelRow>
<panelColumn>2</panelColumn>
</Drum>
<Drum pitch="59"> <!--Ride Cymbal 2-->
<head>cross</head>
Expand All @@ -8768,41 +8796,53 @@
<name>Hand Cymbals</name>
<stem>1</stem>
<shortcut>C</shortcut>
<panelRow>1</panelRow>
<panelColumn>3</panelColumn>
</Drum>
<Drum pitch="62"> <!--Mute High Conga-->
<head>cross</head>
<line>2</line>
<voice>0</voice>
<name>Mute High Conga</name>
<stem>1</stem>
<panelRow>1</panelRow>
<panelColumn>4</panelColumn>
</Drum>
<Drum pitch="63"> <!--Open High Conga-->
<head>cross</head>
<line>4</line>
<voice>0</voice>
<name>Open High Conga</name>
<stem>1</stem>
<panelRow>1</panelRow>
<panelColumn>5</panelColumn>
</Drum>
<Drum pitch="64"> <!--Low Conga-->
<head>cross</head>
<line>6</line>
<voice>0</voice>
<name>Low Conga</name>
<stem>1</stem>
<panelRow>1</panelRow>
<panelColumn>6</panelColumn>
</Drum>
<Drum pitch="70"> <!--Maracas-->
<head>normal</head>
<line>2</line>
<voice>0</voice>
<name>Maracas</name>
<stem>1</stem>
<panelRow>1</panelRow>
<panelColumn>7</panelColumn>
</Drum>
<Drum pitch="75"> <!--Claves-->
<head>normal</head>
<line>0</line>
<voice>0</voice>
<name>Claves</name>
<stem>1</stem>
<panelRow>2</panelRow>
<panelColumn>0</panelColumn>
</Drum>
<Drum pitch="81"> <!--Open Triangle-->
<head>diamond</head>
Expand All @@ -8811,27 +8851,35 @@
<name>Open Triangle</name>
<stem>1</stem>
<shortcut>D</shortcut>
<panelRow>2</panelRow>
<panelColumn>1</panelColumn>
</Drum>
<Drum pitch="82"> <!--Shaker-->
<head>normal</head>
<line>4</line>
<voice>0</voice>
<name>Shaker</name>
<stem>1</stem>
<panelRow>2</panelRow>
<panelColumn>2</panelColumn>
</Drum>
<Drum pitch="84"> <!--Belltree-->
<head>cross</head>
<line>2</line>
<voice>0</voice>
<name>Mark Tree</name>
<stem>1</stem>
<panelRow>2</panelRow>
<panelColumn>3</panelColumn>
</Drum>
<Drum pitch="85"> <!--Castanets-->
<head>normal</head>
<line>1</line>
<voice>0</voice>
<name>Castanets</name>
<stem>1</stem>
<panelRow>2</panelRow>
<panelColumn>4</panelColumn>
</Drum>
<Channel>
<!--MIDI: Bank 128, Prog 48; MS General: Orchestra Kit-->
Expand Down
2 changes: 2 additions & 0 deletions share/instruments/update_instruments_xml.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,8 @@ def to_list(str):
to_subelement(d_el, drum, 'drum', 'name')
to_subelement(d_el, drum, 'stem')
to_subelement(d_el, drum, 'shortcut')
to_subelement(d_el, drum, 'row', 'panelRow')
to_subelement(d_el, drum, 'col', 'panelColumn')

if instrument['id'] in channels:
for channel in channels[instrument['id']].values():
Expand Down