Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: musescore/MuseScore
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0eb496cc91a9
Choose a base ref
...
head repository: musescore/MuseScore
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f1d882aea3d0
Choose a head ref
2 contributors
Loading
Showing with 3,948 additions and 5,859 deletions.
  1. +244 −77 mscore/importmidi/importmidi.cpp
  2. +30 −5 mscore/importmidi/importmidi_clef.cpp
  3. +2 −0 mscore/importmidi/importmidi_clef.h
  4. +1 −1 mscore/importmidi/importmidi_delegate.cpp
  5. +1 −1 mscore/importmidi/importmidi_inner.h
  6. +165 −90 mscore/importmidi/importmidi_model.cpp
  7. +1 −1 mscore/importmidi/importmidi_model.h
  8. +8 −4 mscore/importmidi/importmidi_operations.h
  9. +1 −0 mtest/CMakeLists.txt
  10. +36 −22 mtest/importmidi/chord_big_error.mscx
  11. +46 −341 mtest/importmidi/chord_collect.mscx
  12. +36 −22 mtest/importmidi/chord_legato.mscx
  13. +36 −22 mtest/importmidi/chord_small_error.mscx
  14. +36 −85 mtest/importmidi/clef_melody.mscx
  15. +36 −50 mtest/importmidi/clef_prev.mscx
  16. +36 −78 mtest/importmidi/clef_tied.mscx
  17. +37 −29 mtest/importmidi/division.mscx
  18. BIN mtest/importmidi/empty_track.mid
  19. +110 −0 mtest/importmidi/empty_track.mscx
  20. +36 −29 mtest/importmidi/human_4-4.mscx
  21. +39 −997 mtest/importmidi/human_tempo.mscx
  22. +37 −34 mtest/importmidi/instrument_3staff_organ.mscx
  23. +118 −92 mtest/importmidi/instrument_channels.mscx
  24. BIN mtest/importmidi/instrument_clef.mid
  25. +146 −0 mtest/importmidi/instrument_clef.mscx
  26. +78 −87 mtest/importmidi/instrument_grand.mscx
  27. +74 −58 mtest/importmidi/instrument_grand2.mscx
  28. +37 −50 mtest/importmidi/m1.mscx
  29. +37 −50 mtest/importmidi/m2.mscx
  30. +37 −57 mtest/importmidi/m3.mscx
  31. +37 −57 mtest/importmidi/m4.mscx
  32. +37 −50 mtest/importmidi/m5.mscx
  33. +36 −78 mtest/importmidi/meter_12-8.mscx
  34. +44 −47 mtest/importmidi/meter_15-8.mscx
  35. +36 −43 mtest/importmidi/meter_4-4.mscx
  36. +36 −8 mtest/importmidi/meter_9-8.mscx
  37. +36 −22 mtest/importmidi/meter_central_long_note.mscx
  38. +36 −15 mtest/importmidi/meter_central_long_rest.mscx
  39. +36 −106 mtest/importmidi/meter_chord_example.mscx
  40. +36 −36 mtest/importmidi/meter_dot_tie.mscx
  41. +36 −36 mtest/importmidi/meter_dots_example1.mscx
  42. +36 −36 mtest/importmidi/meter_dots_example2.mscx
  43. +36 −29 mtest/importmidi/meter_dots_example3.mscx
  44. +36 −29 mtest/importmidi/meter_first_2_8th_rests_compound.mscx
  45. +36 −15 mtest/importmidi/meter_half_rest_3-4.mscx
  46. +36 −29 mtest/importmidi/meter_last_quarter_rest_compound.mscx
  47. +36 −15 mtest/importmidi/meter_rests.mscx
  48. +36 −29 mtest/importmidi/meter_two_beats_over.mscx
  49. +36 −8 mtest/importmidi/min_duration.mscx
  50. +34 −190 mtest/importmidi/perc_drums.mscx
  51. +34 −344 mtest/importmidi/perc_remove_ties.mscx
  52. +36 −29 mtest/importmidi/pickup.mscx
  53. +36 −8 mtest/importmidi/quant_dotted_4th.mscx
  54. +36 −15 mtest/importmidi/simplify_16th_staccato.mscx
  55. +36 −29 mtest/importmidi/simplify_32nd_staccato.mscx
  56. +36 −15 mtest/importmidi/simplify_4th_dotted_tied.mscx
  57. +36 −22 mtest/importmidi/simplify_8th_dont.mscx
  58. +36 −22 mtest/importmidi/simplify_8th_dotted_no_staccato.mscx
  59. +36 −8 mtest/importmidi/simplify_dotted_3-4.mscx
  60. +36 −8 mtest/importmidi/simplify_staccato_9-8.mscx
  61. +36 −57 mtest/importmidi/simplify_triplet_staccato.mscx
  62. +37 −113 mtest/importmidi/split_2_melodies.mscx
  63. +37 −57 mtest/importmidi/split_acid.mscx
  64. +37 −43 mtest/importmidi/split_nontuplet.mscx
  65. +37 −106 mtest/importmidi/split_octave.mscx
  66. +37 −36 mtest/importmidi/split_tuplet.mscx
  67. +36 −57 mtest/importmidi/swing_clef.mscx
  68. +36 −57 mtest/importmidi/swing_shuffle.mscx
  69. +36 −57 mtest/importmidi/swing_triplets.mscx
  70. +36 −43 mtest/importmidi/timesig_changes.mscx
  71. +58 −0 mtest/importmidi/tst_importmidi.cpp
  72. +36 −78 mtest/importmidi/tuplet_16th_8th.mscx
  73. +36 −78 mtest/importmidi/tuplet_2_voices_3_5_tuplets.mscx
  74. +36 −57 mtest/importmidi/tuplet_2_voices_tuplet_non.mscx
  75. +36 −29 mtest/importmidi/tuplet_3-4.mscx
  76. +36 −127 mtest/importmidi/tuplet_3_5_7_tuplets.mscx
  77. +37 −85 mtest/importmidi/tuplet_5_5_tuplets_rests.mscx
  78. +36 −50 mtest/importmidi/tuplet_7_staccato.mscx
  79. +36 −43 mtest/importmidi/tuplet_duplet.mscx
  80. +36 −57 mtest/importmidi/tuplet_mars.mscx
  81. +36 −71 mtest/importmidi/tuplet_nonuplet_3-4.mscx
  82. +36 −85 mtest/importmidi/tuplet_nonuplet_4-4.mscx
  83. +36 −29 mtest/importmidi/tuplet_off_time_other_bar.mscx
  84. +36 −50 mtest/importmidi/tuplet_off_time_other_bar2.mscx
  85. +36 −57 mtest/importmidi/tuplet_quadruplet.mscx
  86. +36 −57 mtest/importmidi/tuplet_septuplet.mscx
  87. +36 −64 mtest/importmidi/tuplet_tied_3_5_tuplets.mscx
  88. +36 −57 mtest/importmidi/tuplet_tied_3_5_tuplets2.mscx
  89. +36 −43 mtest/importmidi/tuplet_triplet.mscx
  90. +36 −29 mtest/importmidi/tuplet_triplet_first_tied.mscx
  91. +36 −36 mtest/importmidi/tuplet_triplet_first_tied2.mscx
  92. +36 −29 mtest/importmidi/tuplet_triplet_last_tied.mscx
  93. +37 −211 mtest/importmidi/tuplet_triplets_mixed.mscx
  94. +36 −57 mtest/importmidi/voice_acid.mscx
  95. +36 −29 mtest/importmidi/voice_central.mscx
  96. +36 −22 mtest/importmidi/voice_intersect.mscx
  97. +36 −43 mtest/importmidi/voice_tuplet.mscx
Loading