Skip to content

Fix wrong reading of alternate endings in GP5 #1028

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Danielku15 merged 1 commit into from
Nov 1, 2022
Merged

Fix wrong reading of alternate endings in GP5 #1028

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 26 additions & 30 deletions src/importer/Gp3To5Importer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,38 +261,34 @@ export class Gp3To5Importer extends ScoreImporter {
if ((flags & 0x08) !== 0) {
newMasterBar.repeatCount = this.data.readByte() + (this._versionNumber >= 500 ? 0 : 1);
}
// alternate endings
if ((flags & 0x10) !== 0) {
if (this._versionNumber < 500) {
let currentMasterBar: MasterBar | null = previousMasterBar;
// get the already existing alternatives to ignore them
let existentAlternatives: number = 0;
while (currentMasterBar) {
// found another repeat ending?
if (currentMasterBar.isRepeatEnd && currentMasterBar !== previousMasterBar) {
break;
}
// found the opening?
if (currentMasterBar.isRepeatStart) {
break;
}
existentAlternatives = existentAlternatives | currentMasterBar.alternateEndings;
currentMasterBar = currentMasterBar.previousMasterBar;
// alternate endings (pre GP5)
if ((flags & 0x10) !== 0 && this._versionNumber < 500) {
let currentMasterBar: MasterBar | null = previousMasterBar;
// get the already existing alternatives to ignore them
let existentAlternatives: number = 0;
while (currentMasterBar) {
// found another repeat ending?
if (currentMasterBar.isRepeatEnd && currentMasterBar !== previousMasterBar) {
break;
}
// now calculate the alternative for this bar
let repeatAlternative: number = 0;
let repeatMask: number = this.data.readByte();
for (let i: number = 0; i < 8; i++) {
// only add the repeating if it is not existing
let repeating: number = 1 << i;
if (repeatMask > i && (existentAlternatives & repeating) === 0) {
repeatAlternative = repeatAlternative | repeating;
}
// found the opening?
if (currentMasterBar.isRepeatStart) {
break;
}
newMasterBar.alternateEndings = repeatAlternative;
} else {
newMasterBar.alternateEndings = this.data.readByte();
existentAlternatives = existentAlternatives | currentMasterBar.alternateEndings;
currentMasterBar = currentMasterBar.previousMasterBar;
}
// now calculate the alternative for this bar
let repeatAlternative: number = 0;
let repeatMask: number = this.data.readByte();
for (let i: number = 0; i < 8; i++) {
// only add the repeating if it is not existing
let repeating: number = 1 << i;
if (repeatMask > i && (existentAlternatives & repeating) === 0) {
repeatAlternative = repeatAlternative | repeating;
}
}
newMasterBar.alternateEndings = repeatAlternative;
}
// marker
if ((flags & 0x20) !== 0) {
Expand All @@ -314,7 +310,7 @@ export class Gp3To5Importer extends ScoreImporter {
this.data.skip(4);
}
// better alternate ending mask in GP5
if (this._versionNumber >= 500 && (flags & 0x10) === 0) {
if (this._versionNumber >= 500) {
newMasterBar.alternateEndings = this.data.readByte();
}
// tripletfeel
Expand Down
Binary file added test-data/guitarpro5/alternate-endings-section-error.gp5
View file
Open in desktop
Binary file not shown.
9 changes: 9 additions & 0 deletions test/importer/Gp5Importer.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,15 @@ describe('Gp5ImporterTest', () => {
GpImporterTestHelper.checkColors(score);
});

it('alternate-endings-section-error', async () => {
const reader = await GpImporterTestHelper.prepareImporterWithFile('guitarpro5/alternate-endings-section-error.gp5');
const score: Score = reader.readScore();
expect(score.masterBars.length).toBe(2);
expect(score.masterBars[1].alternateEndings).toBe(4);
expect(score.masterBars[1].section).toBeTruthy();
expect(score.masterBars[1].section?.text).toBe("Outro");
});

it('canon', async () => {
const reader = await GpImporterTestHelper.prepareImporterWithFile('guitarpro5/canon.gp5');
let score: Score = reader.readScore();
Expand Down