merge and forward
authormirabilos <tg@debian.org>
Sun, 25 Oct 2020 02:22:50 +0000 (03:22 +0100)
committermirabilos <mirabilos@evolvis.org>
Sun, 25 Oct 2020 02:22:50 +0000 (03:22 +0100)
debian/patches/experiments/statusline-concert-transposing-pitch.diff [deleted file]
debian/patches/experiments/statusline-pitch-onofftime.diff [moved from debian/patches/experiments/statusline-velocity-onoff.diff with 70% similarity]
debian/patches/series

diff --git a/debian/patches/experiments/statusline-concert-transposing-pitch.diff b/debian/patches/experiments/statusline-concert-transposing-pitch.diff
deleted file mode 100644 (file)
index 05a240d..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: Indicate the sounding pitch in the status line if…
-  * the current instrument has an actual pitch
-    (not beat/rhythm slashes or drums)
-  * the Concert Pitch (global) toggle is off
- .
- This will show the same pitch twice for nōn-transposing
- instruments; that’s by design, to show we’re currently
- in transposing pitch mode but that instrument does not
- transpose (helps debugging).
- .
- Partially addresses node #283120.
-Author: mirabilos <m@mirbsd.org>
-Forwarded: https://github.com/musescore/MuseScore/pull/5036
-
---- a/libmscore/note.cpp
-+++ b/libmscore/note.cpp
-@@ -2771,6 +2771,13 @@ QString Note::accessibleInfo() const
-             pitchName = chord()->noStem() ? QObject::tr("Beat slash") : QObject::tr("Rhythm slash");
-       else if (staff()->isDrumStaff(tick()) && drumset)
-             pitchName = qApp->translate("drumset", drumset->name(pitch()).toUtf8().constData());
-+      else if (!concertPitch()) {
-+            pitchName = tpcUserName(false);
-+            // tpcUserName equivalent for getting the sounding pitch
-+            QString soundingPitch = propertyUserValue(Pid::TPC1) + QString::number(((_pitch + ottaveCapoFret() - int(tpc2alter(tpc()))) / 12) - 1);
-+            // almost the same string as below
-+            return QObject::tr("%1; Pitch: %2 (sounding as %3); Duration: %4%5").arg(noteTypeUserName()).arg(pitchName).arg(soundingPitch).arg(duration).arg((chord()->isGrace() ? "" : QString("; %1").arg(voice)));
-+            }
-       else
-             pitchName = tpcUserName(false);
-       return QObject::tr("%1; Pitch: %2; Duration: %3%4").arg(noteTypeUserName()).arg(pitchName).arg(duration).arg((chord()->isGrace() ? "" : QString("; %1").arg(voice)));
@@ -1,11 +1,22 @@
-# DP: https://musescore.org/en/node/290900#comment-927933
-# DP: requested velocity, on time, off time
-# DP: but velocity is hard (needs full rendermidi)
-# DP: this does tuning, on/off time
+Description: indicate pitch and on/off time in the status line
+ - indicate sounding pitch if the global concert pitch toggle
+   is off and the current instrument has an actual pitch,
+   i.e. not beat/rhythm slashes or drums; this will show the
+   identical pitch for nōn-transposing instruments by design
+   (to show we’re currently in transposing pitch mode, but the
+   current instrument is not transposing) which helps debugging
+ - indicate tuning (if any) after the sounding pitch (either mode)
+ - show on/off times if at least one of them is nōn-standard
+ .
+ The first change partially addresses node #283120.
+ The on/off time was requested in node #290900#comment-927933
+ (velocity is too hard, sorry about that).
+Author: mirabilos <m@mirbsd.org>
+Forwarded: https://github.com/musescore/MuseScore/pull/6750
 
 --- a/libmscore/note.cpp
 +++ b/libmscore/note.cpp
-@@ -2766,21 +2766,31 @@ QString Note::accessibleInfo() const
+@@ -2749,14 +2749,31 @@ QString Note::accessibleInfo() const
        QString duration = chord()->durationUserName();
        QString voice = QObject::tr("Voice: %1").arg(QString::number(track() % VOICES + 1));
        QString pitchName;
              pitchName = chord()->noStem() ? QObject::tr("Beat slash") : QObject::tr("Rhythm slash");
        else if (staff()->isDrumStaff(tick()) && drumset)
              pitchName = qApp->translate("drumset", drumset->name(pitch()).toUtf8().constData());
--      else if (!concertPitch()) {
+-      else
 +      else {
              pitchName = tpcUserName(false);
--            // tpcUserName equivalent for getting the sounding pitch
--            QString soundingPitch = propertyUserValue(Pid::TPC1) + QString::number(((_pitch + ottaveCapoFret() - int(tpc2alter(tpc()))) / 12) - 1);
--            // almost the same string as below
--            return QObject::tr("%1; Pitch: %2 (sounding as %3); Duration: %4%5").arg(noteTypeUserName()).arg(pitchName).arg(soundingPitch).arg(duration).arg((chord()->isGrace() ? "" : QString("; %1").arg(voice)));
+-      return QObject::tr("%1; Pitch: %2; Duration: %3%4").arg(noteTypeUserName()).arg(pitchName).arg(duration).arg((chord()->isGrace() ? "" : QString("; %1").arg(voice)));
 +            if (tuning() != 0)
 +                  pitchOffset = QString::asprintf("%+.3f", tuning());
 +            if (!concertPitch()) {
 +                  // almost the same string as below
 +                  return QObject::tr("%1; Pitch: %2 (sounding as %3%4); Duration: %5%6%7").arg(noteTypeUserName()).arg(pitchName).arg(soundingPitch).arg(pitchOffset).arg(duration).arg(onofftime).arg((chord()->isGrace() ? "" : QString("; %1").arg(voice)));
 +                  }
-             }
--      else
--            pitchName = tpcUserName(false);
--      return QObject::tr("%1; Pitch: %2; Duration: %3%4").arg(noteTypeUserName()).arg(pitchName).arg(duration).arg((chord()->isGrace() ? "" : QString("; %1").arg(voice)));
++            }
 +      return QObject::tr("%1; Pitch: %2%3; Duration: %4%5%6").arg(noteTypeUserName()).arg(pitchName).arg(pitchOffset).arg(duration).arg(onofftime).arg((chord()->isGrace() ? "" : QString("; %1").arg(voice)));
        }
  
index b3d398c..02bd276 100644 (file)
@@ -76,13 +76,12 @@ backports/59-blank-lines.diff
 upstream/wmclass.diff
 backports/62-measure-count.diff
 backports/63-minimise-window.diff
-experiments/statusline-concert-transposing-pitch.diff
 experiments/element-barbeat.diff
 experiments/smufl-fixes.diff
 experiments/fix-accidental-paren-pos.diff
 experiments/improve-mscore-font.diff
 experiments/silence-qdebug.diff
-experiments/statusline-velocity-onoff.diff
+experiments/statusline-pitch-onofftime.diff
 experiments/revert-restriking-patch.diff
 experiments/log-collisions.diff
 #debian-specific/qt-5.7.diff