LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #20117 from cbjeukendrup/playable_typo

Browse source 
Fix typo: playble -> playable (including in translatable string)
This commit is contained in:
RomanPudashkin 2023-11-21 09:19:19 +02:00 committed by GitHub
commit 60ea8f1cee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/appshell/qml/Preferences/internal/NoteInputSection.qml
View file

@ -74,7 +74,7 @@ BaseSection {
id: warnBendsBox
width: parent.width
text: qsTrc("appshell/preferences", "Color guitar bends outside of playble range")
text: qsTrc("appshell/preferences", "Color guitar bends outside of playable range")
navigation.name: "WarnBendBox"
navigation.panel: root.navigation

8
src/engraving/dom/chord.cpp
View file

@ -2416,7 +2416,7 @@ Measure* Chord::measure() const
// graceNotesBefore
//---------------------------------------------------------
GraceNotesGroup& Chord::graceNotesBefore(bool filterUnplayble) const
GraceNotesGroup& Chord::graceNotesBefore(bool filterUnplayable) const
{
m_graceNotesBefore.clear();
for (Chord* c : m_graceNotes) {
@ -2427,7 +2427,7 @@ GraceNotesGroup& Chord::graceNotesBefore(bool filterUnplayble) const
| NoteType::GRACE4
| NoteType::GRACE16
| NoteType::GRACE32)) {
if (filterUnplayble && !c->isChordPlayable()) {
if (filterUnplayable && !c->isChordPlayable()) {
continue;
}
@ -2441,14 +2441,14 @@ GraceNotesGroup& Chord::graceNotesBefore(bool filterUnplayble) const
// graceNotesAfter
//---------------------------------------------------------
GraceNotesGroup& Chord::graceNotesAfter(bool filterUnplayble) const
GraceNotesGroup& Chord::graceNotesAfter(bool filterUnplayable) const
{
m_graceNotesAfter.clear();
for (int i = static_cast<int>(m_graceNotes.size()) - 1; i >= 0; i--) {
Chord* c = m_graceNotes[i];
assert(c->noteType() != NoteType::NORMAL && c->noteType() != NoteType::INVALID);
if (c->noteType() & (NoteType::GRACE8_AFTER | NoteType::GRACE16_AFTER | NoteType::GRACE32_AFTER)) {
if (filterUnplayble && !c->isChordPlayable()) {
if (filterUnplayable && !c->isChordPlayable()) {
continue;
}

4
src/engraving/dom/chord.h
View file

@ -181,8 +181,8 @@ public:
const std::vector<Chord*>& graceNotes() const { return m_graceNotes; }
std::vector<Chord*>& graceNotes() { return m_graceNotes; }
GraceNotesGroup& graceNotesBefore(bool filterUnplayble = false) const;
GraceNotesGroup& graceNotesAfter(bool filterUnplayble = false) const;
GraceNotesGroup& graceNotesBefore(bool filterUnplayable = false) const;
GraceNotesGroup& graceNotesAfter(bool filterUnplayable = false) const;
size_t graceIndex() const { return m_graceIndex; }
void setGraceIndex(size_t val) { m_graceIndex = val; }

4
src/engraving/playback/playbackmodel.cpp
View file

@ -189,7 +189,7 @@ const PlaybackData& PlaybackModel::resolveTrackPlaybackData(const ID& partId, co
void PlaybackModel::triggerEventsForItems(const std::vector<const EngravingItem*>& items)
{
std::vector<const EngravingItem*> playableItems = filterPlaybleItems(items);
std::vector<const EngravingItem*> playableItems = filterPlayableItems(items);
if (playableItems.empty()) {
return;
}
@ -778,7 +778,7 @@ const RepeatList& PlaybackModel::repeatList() const
return m_score->repeatList();
}
std::vector<const EngravingItem*> PlaybackModel::filterPlaybleItems(const std::vector<const EngravingItem*>& items) const
std::vector<const EngravingItem*> PlaybackModel::filterPlayableItems(const std::vector<const EngravingItem*>& items) const
{
std::vector<const EngravingItem*> result;

2
src/engraving/playback/playbackmodel.h
View file

@ -133,7 +133,7 @@ private:
const RepeatList& repeatList() const;
std::vector<const EngravingItem*> filterPlaybleItems(const std::vector<const EngravingItem*>& items) const;
std::vector<const EngravingItem*> filterPlayableItems(const std::vector<const EngravingItem*>& items) const;
mpe::ArticulationsProfilePtr defaultActiculationProfile(const InstrumentTrackId& trackId) const;

4
src/engraving/playback/renderers/gracechordsrenderer.cpp
View file

@ -29,7 +29,7 @@
using namespace mu::engraving;
using namespace mu::mpe;
static constexpr bool FILTER_UNPLAYBLE = true;
static constexpr bool FILTER_UNPLAYABLE = true;
const ArticulationTypeSet& GraceChordsRenderer::supportedTypes()
{
@ -78,7 +78,7 @@ void GraceChordsRenderer::renderGraceNote(const Note* graceNote, const Note* pri
};
if (isPlacedBeforePrincipalNote(graceNoteType)) {
const std::vector<Chord*>& graceChords = principalNote->chord()->graceNotesBefore(FILTER_UNPLAYBLE);
const std::vector<Chord*>& graceChords = principalNote->chord()->graceNotesBefore(FILTER_UNPLAYABLE);
GraceNotesContext graceCtx = buildGraceNotesContext(graceChords, ctx, graceNoteType);
renderGraceNoteEvents(graceChords, graceNoteAccepted, ctx, graceCtx, result);