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

[MU4] fix #279780 Better selection of orchestra instruments #4474

Closed
wants to merge 1 commit into from
Closed

[MU4] fix #279780 Better selection of orchestra instruments #4474

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
42 changes: 34 additions & 8 deletions share/instruments/instruments.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1001,6 +1001,7 @@
<Channel>
<program value="68"/>
</Channel>
<genre>orchestra</genre>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Something is wrong with mixing whitespaces/tabs. We prefer whitespaces everywhere.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tabs are whitespace ;-). We prefer spaces (which are also whitespace)

</Instrument>
<Instrument id="oboe-da-caccia">
<longName>Oboe da caccia</longName>
Expand Down Expand Up @@ -1035,18 +1036,22 @@
<genre>orchestra</genre>
<genre>concertband</genre>
</Instrument>
<Instrument id="baritone-oboe">
<longName>Baritone Oboe</longName>
<shortName>Bar. Ob.</shortName>
<description>Baritone Oboe</description>
<Instrument id="bass-oboe">
<longName>Bass Oboe</longName>
<shortName>B. Ob.</shortName>
<description>Bass Oboe</description>
<musicXMLid>wind.reed.oboe.bass</musicXMLid>
<clef>G8vb</clef>
<transposingClef>G</transposingClef>
<concertClef>G8vb</concertClef>
<barlineSpan>1</barlineSpan>
<aPitchRange>47-76</aPitchRange>
<pPitchRange>47-78</pPitchRange>
<transposeDiatonic>-7</transposeDiatonic>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whitespaces/tabs

<transposeChromatic>-12</transposeChromatic>
<Channel>
<program value="68"/>
</Channel>
<genre>orchestra</genre>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whitespaces/tabs

</Instrument>
<Instrument id="piccolo-heckelphone">
<longName>Piccolo Heckelphone</longName>
Expand Down Expand Up @@ -1671,6 +1676,7 @@
<Channel>
<program value="71"/>
</Channel>
<genre>orchestra</genre>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whitespaces/tabs

</Instrument>
<Instrument id="d-clarinet">
<longName>D Clarinet</longName>
Expand Down Expand Up @@ -1906,7 +1912,6 @@
<program value="71"/>
</Channel>
<genre>jazz</genre>
<genre>orchestra</genre>
<genre>concertband</genre>
</Instrument>
<Instrument id="chalumeau">
Expand Down Expand Up @@ -2878,6 +2883,7 @@
<Channel>
<program value="60"/>
</Channel>
<genre>orchestra</genre>
</Instrument>
<Instrument id="high-bb-horn">
<longName>Horn in B♭</longName>
Expand All @@ -2893,6 +2899,7 @@
<Channel>
<program value="60"/>
</Channel>
<genre>orchestra</genre>
</Instrument>
<Instrument id="a-horn">
<longName>Horn in A</longName>
Expand Down Expand Up @@ -2953,6 +2960,7 @@
<Channel>
<program value="60"/>
</Channel>
<genre>orchestra</genre>
</Instrument>
<Instrument id="eb-horn">
<longName>Horn in E♭</longName>
Expand All @@ -2968,6 +2976,7 @@
<Channel>
<program value="60"/>
</Channel>
<genre>orchestra</genre>
</Instrument>
<Instrument id="d-horn">
<longName>Horn in D</longName>
Expand All @@ -2983,6 +2992,7 @@
<Channel>
<program value="60"/>
</Channel>
<genre>orchestra</genre>
</Instrument>
<Instrument id="low-c-horn">
<longName>Horn in C</longName>
Expand All @@ -2996,6 +3006,7 @@
<Channel>
<program value="60"/>
</Channel>
<genre>orchestra</genre>
</Instrument>
<Instrument id="vienna-horn">
<longName>Vienna Horn</longName>
Expand All @@ -3011,6 +3022,7 @@
<Channel>
<program value="60"/>
</Channel>
<genre>orchestra</genre>
</Instrument>
<Instrument id="low-bb-horn">
<longName>Horn in B♭ basso</longName>
Expand All @@ -3026,6 +3038,7 @@
<Channel>
<program value="60"/>
</Channel>
<genre>orchestra</genre>
</Instrument>
<Instrument id="eb-cornet">
<longName>E♭ Cornet</longName>
Expand Down Expand Up @@ -3080,6 +3093,7 @@
<program value="59"/>
</Channel>
<genre>common</genre>
<genre>orchestra</genre>
<genre>jazz</genre>
<genre>concertband</genre>
</Instrument>
Expand Down Expand Up @@ -3296,6 +3310,7 @@
<Channel name="mute">
<program value="59"/>
</Channel>
<genre>orchestra</genre>
</Instrument>
<Instrument id="e-trumpet">
<longName>E Trumpet</longName>
Expand All @@ -3314,6 +3329,7 @@
<Channel name="mute">
<program value="59"/>
</Channel>
<genre>orchestra</genre>
</Instrument>
<Instrument id="eb-trumpet">
<longName>E♭ Trumpet</longName>
Expand All @@ -3332,6 +3348,7 @@
<Channel name="mute">
<program value="59"/>
</Channel>
<genre>orchestra</genre>
</Instrument>
<Instrument id="d-trumpet">
<longName>D Trumpet</longName>
Expand All @@ -3350,6 +3367,7 @@
<Channel name="mute">
<program value="59"/>
</Channel>
<genre>orchestra</genre>
</Instrument>
<Instrument id="c-trumpet">
<longName>C Trumpet</longName>
Expand Down Expand Up @@ -3825,6 +3843,7 @@
<Channel>
<program value="56"/>
</Channel>
<genre>orchestra</genre>
</Instrument>
<Instrument id="f-alto-ophicleide">
<longName>F Alto Ophicleide</longName>
Expand Down Expand Up @@ -4092,6 +4111,7 @@
<Channel>
<program value="57"/>
</Channel>
<genre>orchestra</genre>
</Instrument>
<Instrument id="bass-trombone">
<longName>Bass Trombone</longName>
Expand Down Expand Up @@ -4136,6 +4156,7 @@
<Channel>
<program value="58"/>
</Channel>
<genre>orchestra</genre>
</Instrument>
<Instrument id="euphonium">
<longName>Euphonium</longName>
Expand Down Expand Up @@ -4201,7 +4222,6 @@
<Channel>
<program value="58"/>
</Channel>
<genre>orchestra</genre>
</Instrument>
<Instrument id="eb-tuba">
<longName>E♭ Tuba</longName>
Expand Down Expand Up @@ -4258,7 +4278,6 @@
<Channel>
<program value="58"/>
</Channel>
<genre>orchestra</genre>
</Instrument>
<Instrument id="bb-tuba-treble">
<trackName>B♭ Tuba (Treble Clef)</trackName>
Expand Down Expand Up @@ -4390,6 +4409,7 @@
<Channel>
<program value="60"/>
</Channel>
<genre>orchestra</genre>
</Instrument>
<Instrument id="f-wagner-tuba">
<longName>F Wagner Tuba</longName>
Expand All @@ -4405,6 +4425,7 @@
<Channel>
<program value="56"/>
</Channel>
<genre>orchestra</genre>
</Instrument>
<Instrument id="conch">
<longName>Conch</longName>
Expand Down Expand Up @@ -5246,6 +5267,7 @@
<controller ctrl="0" value="1"/>
<program value="48"/>
</Channel>
<genre>orchestra</genre>
</Instrument>
<Instrument id="tom-toms">
<longName>Concert Toms</longName>
Expand Down Expand Up @@ -6113,6 +6135,7 @@
<program value="0"/>
</Channel>
<genre>common</genre>
<genre>orchestra</genre>
<genre>jazz</genre>
<genre>concertband</genre>
<genre>marching</genre>
Expand All @@ -6139,6 +6162,7 @@
<controller ctrl="0" value="1"/>
<program value="0"/>
</Channel>
<genre>orchestra</genre>
<genre>world</genre>
</Instrument>
<Instrument id="guiro">
Expand All @@ -6163,6 +6187,7 @@
<program value="0"/>
</Channel>
<genre>world</genre>
<genre>orchestra</genre>
<genre>jazz</genre>
<genre>classroom</genre>
</Instrument>
Expand Down Expand Up @@ -6329,6 +6354,7 @@
<controller ctrl="0" value="1"/>
<program value="0"/>
</Channel>
<genre>orchestra</genre>
</Instrument>
<Instrument id="thundersheet">
<longName>Thundersheet</longName>
Expand Down
4 changes: 2 additions & 2 deletions share/instruments/instrumentsxml.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,8 @@ QT_TRANSLATE_NOOP("InstrumentsXML", "Oboe da caccia"),
QT_TRANSLATE_NOOP3("InstrumentsXML", "Ob. d. ca.", "Oboe da caccia"),
QT_TRANSLATE_NOOP("InstrumentsXML", "English Horn"),
QT_TRANSLATE_NOOP3("InstrumentsXML", "E. Hn.", "English Horn"),
QT_TRANSLATE_NOOP("InstrumentsXML", "Baritone Oboe"),
QT_TRANSLATE_NOOP3("InstrumentsXML", "Bar. Ob.", "Baritone Oboe"),
QT_TRANSLATE_NOOP("InstrumentsXML", "Bass Oboe"),
QT_TRANSLATE_NOOP3("InstrumentsXML", "B. Ob.", "Bass Oboe"),
QT_TRANSLATE_NOOP("InstrumentsXML", "Piccolo Heckelphone"),
QT_TRANSLATE_NOOP3("InstrumentsXML", "P. Hph.", "Piccolo Heckelphone"),
QT_TRANSLATE_NOOP("InstrumentsXML", "Heckelphone"),
Expand Down