Skip to content
Permalink
Browse files

fix #113816, fix #113656, fix #113646, fix #113651: Various marching …

…percussion improvements

Reduce ambiguity (especially in cymbals),
make keyboard shortcuts more sensible,
and add room for new drums.

NOTE: this probably isn't ready to be merged in its current state.
I'm waiting on some more information on the specific MIDI assignments in
issues #109826, #114186, and #114181 before I call this a final patch.
I'm publishing it now for feedback (I'll remove this message once it's fully ready)
  • Loading branch information...
duck57 committed May 30, 2016
1 parent d160586 commit 77bdc1219ead447eacf6918fc0dd577fb8e6b758
Showing with 80 additions and 50 deletions.
  1. +80 −50 share/instruments/instruments.xml
@@ -6368,36 +6368,36 @@
<clef>PERC</clef>
<drumset>1</drumset>
<Drum pitch="48">
<head>2</head>
<line>4</line>
<head>3</head>
<line>3</line>
<voice>0</voice>
<name>Buzz</name>
<shortcut>A</shortcut>
<shortcut>B</shortcut>
</Drum>
<Drum pitch="50">
<head>0</head>
<line>4</line>
<line>3</line>
<voice>0</voice>
<name>Battery Snare</name>
<shortcut>B</shortcut>
<shortcut>A</shortcut>
</Drum>
<Drum pitch="52">
<head>1</head>
<line>4</line>
<head>6</head>
<line>5</line>
<voice>0</voice>
<name>Rim Shot</name>
<shortcut>C</shortcut>
</Drum>
<Drum pitch="53">
<head>1</head>
<line>3</line>
<line>2</line>
<voice>0</voice>
<name>Rim Click</name>
<shortcut>D</shortcut>
</Drum>
<Drum pitch="55">
<head>1</head>
<line>2</line>
<line>-1</line>
<voice>0</voice>
<name>Stick Click</name>
<shortcut>E</shortcut>
@@ -6411,33 +6411,33 @@
</Drum>
<Drum pitch="59">
<head>5</head>
<line>5</line>
<line>6</line>
<voice>0</voice>
<name>Shell</name>
<shortcut>G</shortcut>
</Drum>
<Drum pitch="60">
<head>3</head>
<line>4</line>
<line>5</line>
<voice>0</voice>
<name>Visual (BS,X-Over,Etc)</name>
</Drum>
<Drum pitch="72">
<head>1</head>
<line>1</line>
<voice>2</voice>
<line>0</line>
<voice>0</voice>
<name>Ride Cymbal</name>
<shortcut>G</shortcut>
</Drum>
<Drum pitch="74">
<head>6</head>
<line>1</line>
<voice>2</voice>
<voice>0</voice>
<name>Open High Hat</name>
</Drum>
<Drum pitch="76">
<head>1</head>
<line>1</line>
<voice>2</voice>
<voice>0</voice>
<name>Closed High Hat</name>
</Drum>
<Articulation>
@@ -6475,7 +6475,6 @@
<line>7</line>
<voice>0</voice>
<name>Drum 4 Rim</name>
<shortcut>B</shortcut>
</Drum>
<Drum pitch="26">
<head>2</head>
@@ -6500,14 +6499,13 @@
<line>5</line>
<voice>0</voice>
<name>Drum 3</name>
<shortcut>C</shortcut>
<shortcut>B</shortcut>
</Drum>
<Drum pitch="49">
<head>1</head>
<line>5</line>
<voice>0</voice>
<name>Drum 3 Rim</name>
<shortcut>D</shortcut>
</Drum>
<Drum pitch="50">
<head>2</head>
@@ -6532,14 +6530,13 @@
<line>3</line>
<voice>0</voice>
<name>Drum 2</name>
<shortcut>E</shortcut>
<shortcut>C</shortcut>
</Drum>
<Drum pitch="73">
<head>1</head>
<line>3</line>
<voice>0</voice>
<name>Drum 2 Rim</name>
<shortcut>F</shortcut>
</Drum>
<Drum pitch="75">
<head>6</head>
@@ -6552,7 +6549,7 @@
<line>1</line>
<voice>0</voice>
<name>Drum 1</name>
<shortcut>G</shortcut>
<shortcut>D</shortcut>
</Drum>
<Drum pitch="97">
<head>1</head>
@@ -6571,22 +6568,43 @@
<line>-1</line>
<voice>0</voice>
<name>Spock</name>
<shortcut>E</shortcut>
</Drum>
<Drum pitch="121">
<head>1</head>
<line>-1</line>
<voice>0</voice>
<name>Spock Rim</name>
<shortcut>G</shortcut>
</Drum>
<Drum pitch="122">
<head>2</head>
<line>-1</line>
<voice>0</voice>
<name>Spock Buzz</name>
</Drum>
<Drum pitch="123">
<Drum pitch="125">
<head>0</head>
<line>-2</line>
<voice>0</voice>
<name>Spock 2</name>
<shortcut>F</shortcut>
</Drum>
<Drum pitch="126">
<head>1</head>
<line>-1</line>
<line>-2</line>
<voice>0</voice>
<name>Spock 2 Rim</name>
</Drum>
<Drum pitch="127">
<head>2</head>
<line>-2</line>
<voice>0</voice>
<name>Spock 2 Buzz</name>
</Drum>
<Drum pitch="123">
<head>3</head>
<line>0</line>
<voice>0</voice>
<name>Stick Click</name>
</Drum>
@@ -6637,42 +6655,39 @@
<line>7</line>
<voice>0</voice>
<name>Bass Drum 1 Rim Knock</name>
<shortcut>B</shortcut>
</Drum>
<Drum pitch="24">
<head>0</head>
<line>5</line>
<voice>0</voice>
<name>Bass Drum 2</name>
<shortcut>C</shortcut>
<shortcut>B</shortcut>
</Drum>
<Drum pitch="26">
<head>1</head>
<line>5</line>
<voice>0</voice>
<name>Bass Drum 2 Rim Knock</name>
<shortcut>D</shortcut>
</Drum>
<Drum pitch="48">
<head>0</head>
<line>3</line>
<voice>0</voice>
<name>Bass Drum 3</name>
<shortcut>E</shortcut>
<shortcut>C</shortcut>
</Drum>
<Drum pitch="50">
<head>1</head>
<line>3</line>
<voice>0</voice>
<name>Bass Drum 3 Rim Knock</name>
<shortcut>F</shortcut>
</Drum>
<Drum pitch="69">
<head>0</head>
<line>1</line>
<voice>0</voice>
<name>Bass Drum 4</name>
<shortcut>G</shortcut>
<shortcut>D</shortcut>
</Drum>
<Drum pitch="71">
<head>1</head>
@@ -6685,13 +6700,28 @@
<line>-1</line>
<voice>0</voice>
<name>Bass Drum 5</name>
<shortcut>E</shortcut>
</Drum>
<Drum pitch="98">
<head>1</head>
<line>-1</line>
<voice>0</voice>
<name>Bass Drum 5 Rim Knock</name>
</Drum>
<Drum pitch="73">
<head>0</head>
<line>4</line>
<voice>0</voice>
<name>Unison</name>
<shortcut>F</shortcut>
</Drum>
<Drum pitch="74">
<head>1</head>
<line>4</line>
<voice>0</voice>
<name>Unison Rim Knock</name>
<shortcut>G</shortcut>
</Drum>
<Articulation>
<gateTime>100%</gateTime>
<velocity>100%</velocity>
@@ -6724,10 +6754,9 @@
</Drum>
<Drum pitch="74">
<head>0</head>
<line>4</line>
<line>3</line>
<voice>0</voice>
<name>Half Crash</name>
<shortcut>B</shortcut>
</Drum>
<Drum pitch="76">
<head>1</head>
@@ -6738,65 +6767,66 @@
</Drum>
<Drum pitch="77">
<head>2</head>
<line>4</line>
<line>3</line>
<voice>0</voice>
<name>Sizzle</name>
<shortcut>D</shortcut>
</Drum>
<Drum pitch="79">
<head>0</head>
<head>9</head>
<line>4</line>
<voice>0</voice>
<name>Crash-Choke</name>
<shortcut>E</shortcut>
</Drum>
<Drum pitch="81">
<head>7</head>
<line>4</line>
<head>0</head>
<line>2</line>
<voice>0</voice>
<name>Normal Tap</name>
<shortcut>F</shortcut>
</Drum>
<Drum pitch="83">
<head>7</head>
<line>4</line>
<head>9</head>
<line>2</line>
<voice>0</voice>
<name>Normal Tap-Choke</name>
<shortcut>G</shortcut>
</Drum>
<Drum pitch="84">
<head>7</head>
<line>4</line>
<head>3</head>
<line>0</line>
<voice>0</voice>
<name>Bell Tap</name>
<shortcut>B</shortcut>
</Drum>
<Drum pitch="86">
<head>7</head>
<line>4</line>
<head>9</head>
<line>0</line>
<voice>0</voice>
<name>Bell Tap-Choke</name>
</Drum>
<Drum pitch="88">
<head>7</head>
<line>4</line>
<head>6</head>
<line>2</line>
<voice>0</voice>
<name>Muted Tap</name>
<shortcut>E</shortcut>
</Drum>
<Drum pitch="89">
<head>2</head>
<head>11</head>
<line>4</line>
<voice>0</voice>
<name>Smash</name>
</Drum>
<Drum pitch="91">
<head>2</head>
<line>4</line>
<head>5</head>
<line>3</line>
<voice>0</voice>
<name>Zing</name>
</Drum>
<Drum pitch="93">
<head>2</head>
<line>4</line>
<head>6</head>
<line>5</line>
<voice>0</voice>
<name>Roll</name>
</Drum>

0 comments on commit 77bdc12

Please sign in to comment.
You can’t perform that action at this time.