fix #305134: crash on chordsymbol playback #6071
Conversation
Jojo-Schmitz
force-pushed
the
harmony-name
branch
from
108d4ea
to
bfb1bfe
Compare
libmscore/instrument.cpp
Outdated
| const char* Channel::DEFAULT_NAME = QT_TRANSLATE_NOOP("channel", "Normal"); | ||
| const char* Channel::HARMONY_NAME = QT_TRANSLATE_NOOP("channel", "Chord symbols"); | ||
| const char* Channel::DEFAULT_NAME = QT_TRANSLATE_NOOP("InstrumentsXML", "Normal"); | ||
| const char* Channel::HARMONY_NAME = QT_TRANSLATE_NOOP("InstrumentsXML", "Chord symbols"); |
There was a problem hiding this comment.
Using the same context as the rest of the instruments, like long- and short names, channels, etc..
Simplifies the code that picks up those translations quite a bit, but means that the current translations of these 2 texts won't be taken (as they have a different context), so needs to get merged and translated to be able to see for sure whether it then shows the translated names in the UI.
Wonder whether to use QT_TRANSLATE_NOOP3("InstrumentsXML", "Normal", "Channel") instead to give some hint to the translators? Maybe modify share/instruments/generateTS.py to do the same for the channels from instruments.xml? Hmm, maybe not, better add some comments //: ... for the translators, I'll go with that.
Another and more important question is whether to use "normal" (lowercase) and "harmony" for those channel names (only the latter is used in the score files as far as I can tell), as in the original implementation (prior to efcf14a), and leave it to the translators to translate it for the UI (others like arco, pizzicato, etc. are lowercase too), esp. as "Chord symbols" is too long for that mixer label already.
Done now, via a 2nd commit.
…tion + collect_artifacts
Jojo-Schmitz
force-pushed
the
harmony-name
branch
from
2f0cf1e
to
144e69b
Compare
fix #305134: crash on chordsymbol playback
| item->setText(0, qApp->translate("InstrumentsXML", a->name().toUtf8().data())); | ||
| QString name = a->name(); | ||
| if (a->name().isEmpty()) | ||
| name == Channel::DEFAULT_NAME; |
There was a problem hiding this comment.
This is supposed to be assignment, right?
There was a problem hiding this comment.
Outch... Of course
| } | ||
| QString name = e.name; | ||
| if (e.name.isEmpty()) | ||
| name == Channel::DEFAULT_NAME; |
| } | ||
| QString name = e.name; | ||
| if (e.name.isEmpty()) | ||
| name == Channel::DEFAULT_NAME; |
|
Ok that is pretty bad. Thanks for noticing! Something to fix, tomorrow... |
|
See #6082 |
No description provided.