add half of an upstream bugfix applied to a local patch
authormirabilos <tg@debian.org>
Wed, 22 Jul 2020 22:26:26 +0000 (00:26 +0200)
committermirabilos <mirabilos@evolvis.org>
Wed, 22 Jul 2020 22:26:26 +0000 (00:26 +0200)
https://github.com/musescore/MuseScore/commit/66be5a18fa40a6358b0a78723adcd42f15176fcc

debian/patches/experiments/statusline-concert-transposing-pitch.diff

index 0461964..fca346e 100644 (file)
@@ -21,7 +21,7 @@ Forwarded: https://github.com/musescore/MuseScore/pull/5036
 +      else if (!concertPitch()) {
 +            pitchName = tpcUserName(false);
 +            // tpcUserName equivalent for getting the sounding pitch
-+            QString soundingPitch = propertyUserValue(Pid::TPC1) + QString::number((_pitch / 12) - 1);
++            QString soundingPitch = propertyUserValue(Pid::TPC1) + QString::number(((_pitch + ottaveCapoFret()) / 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)));
 +            }