Skip to content

Commit

Permalink
gp-import: fixed arpeggio direction for gp5
Browse files Browse the repository at this point in the history
Backport of musescore#24597
  • Loading branch information
alexpavlov96 authored and Jojo-Schmitz committed Sep 10, 2024
1 parent 63e08b6 commit 1f21da2
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions importexport/guitarpro/importgtp-gp5.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -113,12 +113,12 @@ int GuitarPro5::readBeatEffects(int track, Segment* segment)
Arpeggio* a = new Arpeggio(score);
// representation is different in guitar pro 5 - the up/down order below is correct
if (strokeup > 0) {
a->setArpeggioType(ArpeggioType::UP_STRAIGHT);
a->setArpeggioType(ArpeggioType::DOWN_STRAIGHT);
if (strokeup < 7)
a->setStretch(1.0 / std::pow(2, 6 - strokeup));
}
else if (strokedown > 0) {
a->setArpeggioType(ArpeggioType::DOWN_STRAIGHT);
a->setArpeggioType(ArpeggioType::UP_STRAIGHT);
if (strokedown < 7)
a->setStretch(1.0 / std::pow(2, 6 - strokedown));
}
Expand Down
12 changes: 6 additions & 6 deletions mtest/guitarpro/brush.gp5-ref.mscx
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
</Note>
<Arpeggio>
<linkedMain/>
<subtype>5</subtype>
<subtype>4</subtype>
<timeStretch>0.5</timeStretch>
</Arpeggio>
</Chord>
Expand Down Expand Up @@ -136,7 +136,7 @@
</Note>
<Arpeggio>
<linkedMain/>
<subtype>4</subtype>
<subtype>5</subtype>
<timeStretch>0.5</timeStretch>
</Arpeggio>
</Chord>
Expand Down Expand Up @@ -274,7 +274,7 @@
<Arpeggio>
<linked>
</linked>
<subtype>5</subtype>
<subtype>4</subtype>
<timeStretch>0.5</timeStretch>
</Arpeggio>
</Chord>
Expand Down Expand Up @@ -313,7 +313,7 @@
<Arpeggio>
<linked>
</linked>
<subtype>4</subtype>
<subtype>5</subtype>
<timeStretch>0.5</timeStretch>
</Arpeggio>
</Chord>
Expand Down Expand Up @@ -365,7 +365,7 @@
<linked>
<indexDiff>4</indexDiff>
</linked>
<subtype>5</subtype>
<subtype>4</subtype>
<timeStretch>0.5</timeStretch>
</Arpeggio>
</Chord>
Expand Down Expand Up @@ -404,7 +404,7 @@
<Arpeggio>
<linked>
</linked>
<subtype>4</subtype>
<subtype>5</subtype>
<timeStretch>0.5</timeStretch>
</Arpeggio>
</Chord>
Expand Down

0 comments on commit 1f21da2

Please sign in to comment.