Skip to content

Commit

Permalink
Merge pull request #5114 from Jojo-Schmitz/templates
Browse files Browse the repository at this point in the history 
fix #290462, fix #290429: Changes to string sections
  • Loading branch information
@anatoly-os
anatoly-os committed Jun 24, 2019
1 parent 0e656f1 commit 09a7ab8
Show file tree
Hide file tree
Showing 3 changed files with 59 additions and 30 deletions.
2 changes: 2 additions & 0 deletions mtest/importmidi/instrument_channels.mscx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,13 @@
<midiChannel>0</midiChannel>
</Channel>
<Channel name="pizzicato">
<controller ctrl="32" value="21"/>
<program value="45"/>
<midiPort>0</midiPort>
<midiChannel>1</midiChannel>
</Channel>
<Channel name="tremolo">
<controller ctrl="32" value="21"/>
<program value="44"/>
<midiPort>0</midiPort>
<midiChannel>2</midiChannel>
Expand Down
12 changes: 12 additions & 0 deletions share/instruments/instruments.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10682,12 +10682,15 @@
<aPitchRange>55-88</aPitchRange>
<pPitchRange>55-103</pPitchRange>
<Channel name="arco">
<controller ctrl="32" value="21"/> <!--Violins Fast Expr.-->.
<program value="48"/> <!--String Ensemble 1-->
</Channel>
<Channel name="pizzicato">
<controller ctrl="32" value="21"/> <!--Violins Pizzicato Expr.-->.
<program value="45"/> <!--Pizzicato Strings-->
</Channel>
<Channel name="tremolo">
<controller ctrl="32" value="21"/> <!--Violins Tremolo Expr.-->.
<program value="44"/> <!--Tremolo Strings-->
</Channel>
<genre>orchestra</genre>
Expand Down Expand Up @@ -10724,12 +10727,15 @@
<aPitchRange>48-79</aPitchRange>
<pPitchRange>48-93</pPitchRange>
<Channel name="arco">
<controller ctrl="32" value="31"/> <!--Violas Fast Expr.-->.
<program value="48"/> <!--String Ensemble 1-->
</Channel>
<Channel name="pizzicato">
<controller ctrl="32" value="31"/> <!--Violas Pizzicato Expr.-->.
<program value="45"/> <!--Pizzicato Strings-->
</Channel>
<Channel name="tremolo">
<controller ctrl="32" value="31"/> <!--Violas Tremolo Expr.-->.
<program value="44"/> <!--Tremolo Strings-->
</Channel>
<genre>orchestra</genre>
Expand Down Expand Up @@ -10767,12 +10773,15 @@
<aPitchRange>36-67</aPitchRange>
<pPitchRange>36-90</pPitchRange>
<Channel name="arco">
<controller ctrl="32" value="41"/> <!--Celli Fast Expr.-->.
<program value="48"/> <!--String Ensemble 1-->
</Channel>
<Channel name="pizzicato">
<controller ctrl="32" value="41"/> <!--Celli Pizzicato Expr.-->.
<program value="45"/> <!--Pizzicato Strings-->
</Channel>
<Channel name="tremolo">
<controller ctrl="32" value="41"/> <!--Celli Tremolo Expr.-->.
<program value="44"/> <!--Tremolo Strings-->
</Channel>
<genre>orchestra</genre>
Expand Down Expand Up @@ -10816,12 +10825,15 @@
<transposeDiatonic>-7</transposeDiatonic>
<transposeChromatic>-12</transposeChromatic>
<Channel name="arco">
<controller ctrl="32" value="51"/> <!--Basses Fast Expr.-->.
<program value="48"/> <!--String Ensemble 1-->
</Channel>
<Channel name="pizzicato">
<controller ctrl="32" value="51"/> <!--Basses Pisszcato Expr.-->.
<program value="45"/> <!--Pizzicato Strings-->
</Channel>
<Channel name="tremolo">
<controller ctrl="32" value="51"/> <!--Basses Tremolo Expr.-->.
<program value="44"/> <!--Tremolo Strings-->
</Channel>
<genre>orchestra</genre>
Expand Down
75 changes: 45 additions & 30 deletions share/templates/08-Orchestral/02-Symphony_Orchestra.mscx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1159,16 +1159,16 @@
<bracket type="2" span="2" col="1"/>
<barLineSpan>4</barLineSpan>
</Staff>
<trackName>Violin 1</trackName>
<trackName>Violins 1</trackName>
<Instrument>
<longName>Violin 1</longName>
<shortName>Vln. 1</shortName>
<trackName>Violin</trackName>
<longName>Violins 1</longName>
<shortName>Vlns. 1</shortName>
<trackName>Violins</trackName>
<minPitchP>55</minPitchP>
<maxPitchP>103</maxPitchP>
<minPitchA>55</minPitchA>
<maxPitchA>88</maxPitchA>
<instrumentId>strings.violin</instrumentId>
<instrumentId>strings.group</instrumentId>
<Articulation>
<velocity>100</velocity>
<gateTime>100</gateTime>
Expand Down Expand Up @@ -1198,14 +1198,17 @@
<gateTime>100</gateTime>
</Articulation>
<Channel name="arco">
<program value="40"/>
<controller ctrl="32" value="21"/>
<program value="48"/>
<synti>Fluid</synti>
</Channel>
<Channel name="pizzicato">
<controller ctrl="32" value="21"/>
<program value="45"/>
<synti>Fluid</synti>
</Channel>
<Channel name="tremolo">
<controller ctrl="32" value="21"/>
<program value="44"/>
<synti>Fluid</synti>
</Channel>
Expand All @@ -1218,16 +1221,16 @@
</StaffType>
<barLineSpan>3</barLineSpan>
</Staff>
<trackName>Violin 2</trackName>
<trackName>Violins 2</trackName>
<Instrument>
<longName>Violin 2</longName>
<shortName>Vln. 2</shortName>
<trackName>Violin</trackName>
<longName>Violins 2</longName>
<shortName>Vlns. 2</shortName>
<trackName>Violins</trackName>
<minPitchP>55</minPitchP>
<maxPitchP>103</maxPitchP>
<minPitchA>55</minPitchA>
<maxPitchA>88</maxPitchA>
<instrumentId>strings.violin</instrumentId>
<instrumentId>strings.group</instrumentId>
<Articulation>
<velocity>100</velocity>
<gateTime>100</gateTime>
Expand Down Expand Up @@ -1257,14 +1260,17 @@
<gateTime>100</gateTime>
</Articulation>
<Channel name="arco">
<program value="40"/>
<controller ctrl="32" value="26"/>
<program value="48"/>
<synti>Fluid</synti>
</Channel>
<Channel name="pizzicato">
<controller ctrl="32" value="26"/>
<program value="45"/>
<synti>Fluid</synti>
</Channel>
<Channel name="tremolo">
<controller ctrl="32" value="26"/>
<program value="44"/>
<synti>Fluid</synti>
</Channel>
Expand All @@ -1278,16 +1284,16 @@
<defaultClef>C3</defaultClef>
<barLineSpan>2</barLineSpan>
</Staff>
<trackName>Viola</trackName>
<trackName>Violas</trackName>
<Instrument>
<longName>Viola</longName>
<shortName>Vla.</shortName>
<trackName>Viola</trackName>
<longName>Violas</longName>
<shortName>Vlas.</shortName>
<trackName>Violas</trackName>
<minPitchP>48</minPitchP>
<maxPitchP>93</maxPitchP>
<minPitchA>48</minPitchA>
<maxPitchA>79</maxPitchA>
<instrumentId>strings.viola</instrumentId>
<instrumentId>strings.group</instrumentId>
<clef>C3</clef>
<Articulation>
<velocity>100</velocity>
Expand Down Expand Up @@ -1318,14 +1324,17 @@
<gateTime>100</gateTime>
</Articulation>
<Channel name="arco">
<program value="41"/>
<controller ctrl="32" value="31"/>
<program value="48"/>
<synti>Fluid</synti>
</Channel>
<Channel name="pizzicato">
<controller ctrl="32" value="31"/>
<program value="45"/>
<synti>Fluid</synti>
</Channel>
<Channel name="tremolo">
<controller ctrl="32" value="31"/>
<program value="44"/>
<synti>Fluid</synti>
</Channel>
Expand All @@ -1339,16 +1348,16 @@
<defaultClef>F</defaultClef>
<barLineSpan>1</barLineSpan>
</Staff>
<trackName>Violoncello</trackName>
<trackName>Violoncellos</trackName>
<Instrument>
<longName>Violoncello</longName>
<shortName>Vc.</shortName>
<trackName>Violoncello</trackName>
<longName>Violoncellos</longName>
<shortName>Vcs.</shortName>
<trackName>Violoncellos</trackName>
<minPitchP>36</minPitchP>
<maxPitchP>90</maxPitchP>
<minPitchA>36</minPitchA>
<maxPitchA>67</maxPitchA>
<instrumentId>strings.cello</instrumentId>
<instrumentId>strings.group</instrumentId>
<clef>F</clef>
<Articulation>
<velocity>100</velocity>
Expand Down Expand Up @@ -1379,14 +1388,17 @@
<gateTime>100</gateTime>
</Articulation>
<Channel name="arco">
<program value="42"/>
<controller ctrl="32" value="41"/>
<program value="48"/>
<synti>Fluid</synti>
</Channel>
<Channel name="pizzicato">
<controller ctrl="32" value="41"/>
<program value="45"/>
<synti>Fluid</synti>
</Channel>
<Channel name="tremolo">
<controller ctrl="32" value="41"/>
<program value="44"/>
<synti>Fluid</synti>
</Channel>
Expand All @@ -1400,18 +1412,18 @@
<defaultConcertClef>F8vb</defaultConcertClef>
<defaultTransposingClef>F</defaultTransposingClef>
</Staff>
<trackName>Contrabass</trackName>
<trackName>Contrabasses</trackName>
<Instrument>
<longName>Contrabass</longName>
<shortName>Cb.</shortName>
<trackName>Contrabass</trackName>
<longName>Contrabasses</longName>
<shortName>Cbs.</shortName>
<trackName>Contrabasses</trackName>
<minPitchP>28</minPitchP>
<maxPitchP>67</maxPitchP>
<minPitchA>28</minPitchA>
<maxPitchA>62</maxPitchA>
<transposeDiatonic>-7</transposeDiatonic>
<transposeChromatic>-12</transposeChromatic>
<instrumentId>strings.contrabass</instrumentId>
<instrumentId>strings.group</instrumentId>
<concertClef>F8vb</concertClef>
<transposingClef>F</transposingClef>
<Articulation>
Expand Down Expand Up @@ -1443,14 +1455,17 @@
<gateTime>100</gateTime>
</Articulation>
<Channel name="arco">
<program value="43"/>
<controller ctrl="32" value="51"/>
<program value="48"/>
<synti>Fluid</synti>
</Channel>
<Channel name="pizzicato">
<controller ctrl="32" value="51"/>
<program value="32"/>
<synti>Fluid</synti>
</Channel>
<Channel name="tremolo">
<controller ctrl="32" value="51"/>
<program value="44"/>
<synti>Fluid</synti>
</Channel>
Expand Down

0 comments on commit 09a7ab8

Please sign in to comment.