Skip to content
Permalink
Browse files

Add single-note dynamics

  • Loading branch information...
jthistle committed Dec 22, 2018
1 parent 5cc4d6b commit 459049b5c417e5fb5a4b6f29c62612dc62419d18
Showing with 14,145 additions and 312 deletions.
  1. +1 −0 demos/CMakeLists.txt
  2. +4,484 −0 demos/Dynamic_Strings.mscx
  3. +9 −0 fluid/voice.cpp
  4. +141 −30 libmscore/dynamic.cpp
  5. +23 −0 libmscore/dynamic.h
  6. +64 −0 libmscore/hairpin.cpp
  7. +28 −0 libmscore/hairpin.h
  8. +13 −6 libmscore/instrtemplate.cpp
  9. +2 −0 libmscore/instrtemplate.h
  10. +162 −18 libmscore/instrument.cpp
  11. +21 −2 libmscore/instrument.h
  12. +0 −1 libmscore/part.cpp
  13. +3 −0 libmscore/property.cpp
  14. +5 −0 libmscore/property.h
  15. +4 −1 libmscore/read114.cpp
  16. +4 −1 libmscore/read206.cpp
  17. +614 −47 libmscore/rendermidi.cpp
  18. +55 −0 libmscore/score.cpp
  19. +7 −3 libmscore/score.h
  20. +61 −0 libmscore/synthesizerstate.cpp
  21. +5 −1 libmscore/synthesizerstate.h
  22. +11 −1 libmscore/undo.cpp
  23. +16 −0 libmscore/undo.h
  24. +8 −0 libmscore/xmlwriter.cpp
  25. +2 −0 miditools/midievent.h
  26. +4 −0 mscore/editstaff.cpp
  27. +12 −1 mscore/editstaff.ui
  28. +1 −1 mscore/excerptsdialog.cpp
  29. +5 −6 mscore/exportaudio.cpp
  30. +23 −4 mscore/exportmidi.cpp
  31. +3 −0 mscore/exportmidi.h
  32. +4 −2 mscore/file.cpp
  33. +1 −1 mscore/importgtp-gp4.cpp
  34. +1 −1 mscore/importgtp-gp5.cpp
  35. +1 −0 mscore/importgtp-gp6.cpp
  36. +3 −2 mscore/importgtp.cpp
  37. +0 −1 mscore/importmxmlpass2.cpp
  38. +19 −5 mscore/inspector/inspectorDynamic.cpp
  39. +2 −0 mscore/inspector/inspectorDynamic.h
  40. +10 −1 mscore/inspector/inspectorHairpin.cpp
  41. +1 −1 mscore/inspector/inspectorTextBase.h
  42. +93 −33 mscore/inspector/inspector_dynamic.ui
  43. +149 −108 mscore/inspector/inspector_hairpin.ui
  44. +1 −1 mscore/instrwidget.cpp
  45. +1 −3 mscore/mixerdetails.cpp
  46. +0 −8 mscore/mixertrackitem.cpp
  47. +11 −5 mscore/musescore.cpp
  48. +1 −1 mscore/musescore.h
  49. +1 −7 mscore/parteditbase.cpp
  50. +3 −0 mscore/plugin/api/elements.h
  51. +2 −2 mscore/seq.cpp
  52. +109 −0 mscore/synthcontrol.cpp
  53. +8 −0 mscore/synthcontrol.h
  54. +133 −1 mscore/synthcontrol.ui
  55. +3 −2 mtest/capella/io/updateReference
  56. +2 −0 mtest/guitarpro/UncompletedMeasure.gpx-ref.mscx
  57. +2 −0 mtest/guitarpro/accent.gpx-ref.mscx
  58. +2 −0 mtest/guitarpro/arpeggio.gpx-ref.mscx
  59. +2 −0 mtest/guitarpro/artificial-harmonic.gpx-ref.mscx
  60. +2 −0 mtest/guitarpro/basic-bend.gp5-ref.mscx
  61. +2 −0 mtest/guitarpro/brush.gp4-ref.mscx
  62. +2 −0 mtest/guitarpro/brush.gp5-ref.mscx
  63. +2 −0 mtest/guitarpro/brush.gpx-ref.mscx
  64. +2 −0 mtest/guitarpro/capo-fret.gp3-ref.mscx
  65. +2 −0 mtest/guitarpro/capo-fret.gp4-ref.mscx
  66. +2 −0 mtest/guitarpro/capo-fret.gp5-ref.mscx
  67. +2 −0 mtest/guitarpro/copyright.gp3-ref.mscx
  68. +2 −0 mtest/guitarpro/copyright.gp4-ref.mscx
  69. +2 −0 mtest/guitarpro/copyright.gp5-ref.mscx
  70. +2 −0 mtest/guitarpro/copyright.gpx-ref.mscx
  71. +2 −0 mtest/guitarpro/crescendo-diminuendo.gpx-ref.mscx
  72. +2 −0 mtest/guitarpro/dead-note.gpx-ref.mscx
  73. +2 −0 mtest/guitarpro/dotted-gliss.gp3-ref.mscx
  74. +2 −0 mtest/guitarpro/dotted-tuplets.gp5-ref.mscx
  75. +2 −0 mtest/guitarpro/double-bar.gpx-ref.mscx
  76. +2 −0 mtest/guitarpro/dynamic.gp5-ref.mscx
  77. +2 −0 mtest/guitarpro/fade-in.gp4-ref.mscx
  78. +2 −0 mtest/guitarpro/fade-in.gp5-ref.mscx
  79. +2 −0 mtest/guitarpro/fingering.gp4-ref.mscx
  80. +2 −0 mtest/guitarpro/fingering.gp5-ref.mscx
  81. +2 −0 mtest/guitarpro/fingering.gpx-ref.mscx
  82. +2 −0 mtest/guitarpro/free-time.gpx-ref.mscx
  83. +2 −0 mtest/guitarpro/ghost_note.gp3-ref.mscx
  84. +2 −0 mtest/guitarpro/grace.gp5-ref.mscx
  85. +2 −0 mtest/guitarpro/heavy-accent.gp5-ref.mscx
  86. +2 −0 mtest/guitarpro/high-pitch.gp3-ref.mscx
  87. +2 −0 mtest/guitarpro/keysig.gp4-ref.mscx
  88. +2 −0 mtest/guitarpro/keysig.gp5-ref.mscx
  89. +2 −0 mtest/guitarpro/let-ring.gp4-ref.mscx
  90. +2 −0 mtest/guitarpro/let-ring.gp5-ref.mscx
  91. +2 −0 mtest/guitarpro/let-ring.gpx-ref.mscx
  92. +2 −0 mtest/guitarpro/mordents.gpx-ref.mscx
  93. +2 −0 mtest/guitarpro/multivoices.gpx-ref.mscx
  94. +2 −0 mtest/guitarpro/ottava1.gpx-ref.mscx
  95. +4 −0 mtest/guitarpro/ottava2.gpx-ref.mscx
  96. +4 −0 mtest/guitarpro/ottava3.gpx-ref.mscx
  97. +4 −0 mtest/guitarpro/ottava4.gpx-ref.mscx
  98. +4 −0 mtest/guitarpro/ottava5.gpx-ref.mscx
  99. +2 −0 mtest/guitarpro/palm-mute.gp4-ref.mscx
  100. +2 −0 mtest/guitarpro/palm-mute.gp5-ref.mscx
  101. +2 −0 mtest/guitarpro/palm-mute.gpx-ref.mscx
  102. +2 −0 mtest/guitarpro/pick-up-down.gp4-ref.mscx
  103. +2 −0 mtest/guitarpro/pick-up-down.gp5-ref.mscx
  104. +2 −0 mtest/guitarpro/pick-up-down.gpx-ref.mscx
  105. +2 −0 mtest/guitarpro/repeated-bars.gpx-ref.mscx
  106. +2 −0 mtest/guitarpro/repeats.gpx-ref.mscx
  107. +2 −0 mtest/guitarpro/rest-centered.gp4-ref.mscx
  108. +2 −0 mtest/guitarpro/rest-centered.gp5-ref.mscx
  109. +2 −0 mtest/guitarpro/rest-centered.gpx-ref.mscx
  110. +2 −0 mtest/guitarpro/sforzato.gp4-ref.mscx
  111. +2 −0 mtest/guitarpro/shift-slide.gp4-ref.mscx
  112. +2 −0 mtest/guitarpro/slide-in-above.gp4-ref.mscx
  113. +2 −0 mtest/guitarpro/slur-notes-effect-mask.gp5-ref.mscx
  114. +2 −0 mtest/guitarpro/slur.gp4-ref.mscx
  115. +2 −0 mtest/guitarpro/slur.gpx-ref.mscx
  116. +2 −0 mtest/guitarpro/slur_hammer_slur.gpx-ref.mscx
  117. +2 −0 mtest/guitarpro/slur_over_3_measures.gpx-ref.mscx
  118. +2 −0 mtest/guitarpro/slur_slur_hammer.gpx-ref.mscx
  119. +2 −0 mtest/guitarpro/slur_voices.gpx-ref.mscx
  120. +2 −0 mtest/guitarpro/tap-slap-pop.gp5-ref.mscx
  121. +2 −0 mtest/guitarpro/tap-slap-pop.gpx-ref.mscx
  122. +2 −0 mtest/guitarpro/tempo.gp3-ref.mscx
  123. +2 −0 mtest/guitarpro/tempo.gp4-ref.mscx
  124. +2 −0 mtest/guitarpro/tempo.gp5-ref.mscx
  125. +2 −0 mtest/guitarpro/testIrrTuplet.gp4-ref.mscx
  126. +2 −0 mtest/guitarpro/text.gpx-ref.mscx
  127. +2 −0 mtest/guitarpro/tremolos.gp5-ref.mscx
  128. +2 −0 mtest/guitarpro/tremolos.gpx-ref.mscx
  129. +2 −0 mtest/guitarpro/trill.gp4-ref.mscx
  130. +2 −0 mtest/guitarpro/trill.gpx-ref.mscx
  131. +2 −0 mtest/guitarpro/tuplets.gpx-ref.mscx
  132. +2 −0 mtest/guitarpro/tuplets2.gpx-ref.mscx
  133. +2 −0 mtest/guitarpro/turn.gpx-ref.mscx
  134. +2 −0 mtest/guitarpro/vibrato.gp5-ref.mscx
  135. +2 −0 mtest/guitarpro/vibrato.gpx-ref.mscx
  136. +2 −0 mtest/guitarpro/volta.gp3-ref.mscx
  137. +2 −0 mtest/guitarpro/volta.gp4-ref.mscx
  138. +2 −0 mtest/guitarpro/volta.gp5-ref.mscx
  139. +2 −0 mtest/guitarpro/volume-swell.gpx-ref.mscx
  140. +2 −0 mtest/guitarpro/wah.gpx-ref.mscx
  141. +1 −0 mtest/importmidi/chord_collect.mscx
  142. +1 −0 mtest/importmidi/perc_respect_beat.mscx
  143. +1 −0 mtest/importmidi/perc_triplet.mscx
  144. +2,045 −0 mtest/libmscore/midi/testAndanteExcerpts-ref.txt
  145. +20 −0 mtest/libmscore/midi/testBeforeAfterGraceTrill-ref.txt
  146. +20 −0 mtest/libmscore/midi/testBeforeAfterGraceTrillPlay=false-ref.txt
  147. +56 −0 mtest/libmscore/midi/testGlissando-71826-ref.txt
  148. +284 −0 mtest/libmscore/midi/testGlissando-ref.txt
  149. +88 −0 mtest/libmscore/midi/testGlissandoAcrossStaffs-ref.txt
  150. +44 −0 mtest/libmscore/midi/testGuitarTrem-ref.txt
  151. +1,294 −0 mtest/libmscore/midi/testKantataBWV140Excerpts-ref.txt
  152. +204 −0 mtest/libmscore/midi/testMordents-ref.txt
  153. +56 −0 mtest/libmscore/midi/testMultiNoteTremolo-ref.txt
  154. +320 −0 mtest/libmscore/midi/testOrnamentAccidentals-ref.txt
  155. +64 −0 mtest/libmscore/midi/testOrnaments-ref.txt
  156. +120 −0 mtest/libmscore/midi/testOrnamentsTrillsOttava-ref.txt
  157. +48 −0 mtest/libmscore/midi/testPauses-ref.txt
  158. +64 −0 mtest/libmscore/midi/testPausesRepeats-ref.txt
  159. +68 −0 mtest/libmscore/midi/testPausesTempoTimesigChange-ref.txt
  160. BIN mtest/libmscore/midi/testSingleNoteDynamics-ref.mid
  161. +1,181 −0 mtest/libmscore/midi/testSingleNoteDynamics.mscx
  162. +56 −0 mtest/libmscore/midi/testSwing16thDots-ref.txt
  163. +48 −0 mtest/libmscore/midi/testSwing16thSimple-ref.txt
  164. +60 −0 mtest/libmscore/midi/testSwing16thTies-ref.txt
  165. +40 −0 mtest/libmscore/midi/testSwing16thTriplets-ref.txt
  166. +48 −0 mtest/libmscore/midi/testSwing8thDots-ref.txt
  167. +88 −0 mtest/libmscore/midi/testSwing8thSimple-ref.txt
  168. +48 −0 mtest/libmscore/midi/testSwing8thTies-ref.txt
  169. +32 −0 mtest/libmscore/midi/testSwing8thTriplets-ref.txt
  170. +84 −0 mtest/libmscore/midi/testSwingOdd-ref.txt
  171. +156 −0 mtest/libmscore/midi/testSwingPickup-ref.txt
  172. +96 −0 mtest/libmscore/midi/testSwingStyleText-ref.txt
  173. +36 −0 mtest/libmscore/midi/testTieTrill-ref.txt
  174. +52 −0 mtest/libmscore/midi/testTrillLines-ref.txt
  175. +480 −0 mtest/libmscore/midi/testTrillTempos-ref.txt
  176. +79 −0 mtest/libmscore/midi/testTrillTransposingInstrument-ref.txt
  177. +22 −1 mtest/libmscore/midi/tst_midi.cpp
  178. +15 −0 mtest/musicxml/io/testDynamics1.xml
  179. +177 −0 share/instruments/instruments.xml
  180. +2 −0 synthesizer/event.h
  181. +9 −2 synthesizer/msynthesizer.cpp
  182. +8 −0 synthesizer/msynthesizer.h
  183. +4 −1 zerberus/channel.cpp
@@ -21,6 +21,7 @@ install(FILES
Fugue_1.mscx
Reunion.mscz
Unclaimed_Gift.mscx
Dynamic_Strings.mscx
DESTINATION ${Mscore_SHARE_NAME}${Mscore_INSTALL_NAME}demos
)

0 comments on commit 459049b

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