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

fix #298887: generic wind.flutes.whistle.tin is ambiguous #5556

Merged
merged 1 commit into from
Jan 9, 2020
Merged

fix #298887: generic wind.flutes.whistle.tin is ambiguous #5556

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
26 changes: 13 additions & 13 deletions share/instruments/instruments.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -914,32 +914,32 @@
<program value="79"/> <!--Ocarina-->
</Channel>
</Instrument>
<Instrument id="tin-whistle">
<longName>Tin Whistle</longName>
<shortName>Tin Wh.</shortName>
<Instrument id="bflat-tin-whistle">
<longName>B♭ Tin Whistle</longName>
<shortName>B♭ Tin Wh.</shortName>
<description>same as 6 hole Flageolet but metal construction</description>
<musicXMLid>wind.flutes.whistle.tin</musicXMLid>
<musicXMLid>wind.flutes.whistle.tin.bflat</musicXMLid>
<clef>G8va</clef>
<barlineSpan>1</barlineSpan>
<aPitchRange>72-96</aPitchRange>
<pPitchRange>72-102</pPitchRange>
<aPitchRange>70-94</aPitchRange>
<pPitchRange>70-100</pPitchRange>
<Channel>
<program value="78"/> <!--Whistle-->
</Channel>
<genre>classroom</genre>
</Instrument>
<Instrument id="bflat-tin-whistle">
<longName>B♭ Tin Whistle</longName>
<shortName>B♭ Tin Wh.</shortName>
<Instrument id="c-tin-whistle">
<longName>C Tin Whistle</longName>
<shortName>C Tin Wh.</shortName>
<description>same as 6 hole Flageolet but metal construction</description>
<musicXMLid>wind.flutes.whistle.tin.bflat</musicXMLid>
<musicXMLid>wind.flutes.whistle.tin</musicXMLid>
<clef>G8va</clef>
<barlineSpan>1</barlineSpan>
<aPitchRange>70-94</aPitchRange>
<pPitchRange>70-100</pPitchRange>
<aPitchRange>72-96</aPitchRange>
<pPitchRange>72-102</pPitchRange>
<Channel>
<program value="78"/> <!--Whistle-->
</Channel>
<genre>classroom</genre>
</Instrument>
<Instrument id="d-tin-whistle">
<longName>D Tin Whistle</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 @@ -173,10 +173,10 @@ QT_TRANSLATE_NOOP("InstrumentsXML", "Contrabass Recorder"),
QT_TRANSLATE_NOOP3("InstrumentsXML", "Cb. Rec.", "Contrabass Recorder"),
QT_TRANSLATE_NOOP("InstrumentsXML", "Slide Whistle"),
QT_TRANSLATE_NOOP3("InstrumentsXML", "Sl. Wh.", "Slide Whistle"),
QT_TRANSLATE_NOOP("InstrumentsXML", "Tin Whistle"),
QT_TRANSLATE_NOOP3("InstrumentsXML", "Tin Wh.", "Tin Whistle"),
QT_TRANSLATE_NOOP("InstrumentsXML", "B♭ Tin Whistle"),
QT_TRANSLATE_NOOP3("InstrumentsXML", "B♭ Tin Wh.", "B♭ Tin Whistle"),
QT_TRANSLATE_NOOP("InstrumentsXML", "C Tin Whistle"),
QT_TRANSLATE_NOOP3("InstrumentsXML", "C Tin Wh.", "C Tin Whistle"),
QT_TRANSLATE_NOOP("InstrumentsXML", "D Tin Whistle"),
QT_TRANSLATE_NOOP3("InstrumentsXML", "D Tin Wh.", "D Tin Whistle"),
QT_TRANSLATE_NOOP("InstrumentsXML", "Piccolo Oboe"),
Expand Down