Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
37 changes: 37 additions & 0 deletions src/importer/GpifParser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -414,6 +414,9 @@ export class GpifParser {
case 'Transpose':
this.parseTranspose(track, c);
break;
case 'RSE':
this.parseRSE(track, c);
break;
}
}
}
Expand Down Expand Up @@ -977,6 +980,40 @@ export class GpifParser {
}
}

private parseRSE(track: Track, node: XmlNode): void {
for (let c of node.childNodes) {
if (c.nodeType === XmlNodeType.Element) {
switch (c.localName) {
case 'ChannelStrip':
this.parseChannelStrip(track, c);
break;
}
}
}
}

private parseChannelStrip(track: Track, node: XmlNode): void {
for (let c of node.childNodes) {
if (c.nodeType === XmlNodeType.Element) {
switch (c.localName) {
case 'Parameters':
this.parseChannelStripParameters(track, c);
break;
}
}
}
}

private parseChannelStripParameters(track: Track, node: XmlNode): void {
if (node.firstChild && node.firstChild.value) {
let parameters = node.firstChild.value.split(' ');
if (parameters.length >= 12) {
track.playbackInfo.balance = Math.floor(parseFloat(parameters[11]) * 16);
track.playbackInfo.volume = Math.floor(parseFloat(parameters[12]) * 16);
}
}
}

//
// <MasterBars>...</MasterBars>
//
Expand Down
Binary file added test-data/guitarpro7/track-balance.gp
Binary file not shown.
Binary file added test-data/guitarpro7/track-volume.gp
Binary file not shown.
4 changes: 2 additions & 2 deletions test/audio/MidiFileGenerator.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ describe('MidiFileGeneratorTest', () => {
let info: PlaybackInformation = score.tracks[0].playbackInfo;
let expectedEvents: FlatMidiEvent[] = [
// channel init
new ControlChangeEvent(0, 0, info.primaryChannel, ControllerType.VolumeCoarse, 120),
new ControlChangeEvent(0, 0, info.primaryChannel, ControllerType.VolumeCoarse, 96),
new ControlChangeEvent(0, 0, info.primaryChannel, ControllerType.PanCoarse, 64),
new ControlChangeEvent(0, 0, info.primaryChannel, ControllerType.ExpressionControllerCoarse, 127),
new ControlChangeEvent(0, 0, info.primaryChannel, ControllerType.RegisteredParameterFine, 0),
Expand All @@ -207,7 +207,7 @@ describe('MidiFileGeneratorTest', () => {
new ControlChangeEvent(0, 0, info.primaryChannel, ControllerType.DataEntryCoarse, 16),
new ProgramChangeEvent(0, 0, info.primaryChannel, info.program),

new ControlChangeEvent(0, 0, info.secondaryChannel, ControllerType.VolumeCoarse, 120),
new ControlChangeEvent(0, 0, info.secondaryChannel, ControllerType.VolumeCoarse, 96),
new ControlChangeEvent(0, 0, info.secondaryChannel, ControllerType.PanCoarse, 64),
new ControlChangeEvent(0, 0, info.secondaryChannel, ControllerType.ExpressionControllerCoarse, 127),
new ControlChangeEvent(0, 0, info.secondaryChannel, ControllerType.RegisteredParameterFine, 0),
Expand Down
23 changes: 23 additions & 0 deletions test/importer/Gp7Importer.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -870,4 +870,27 @@ describe('Gp7ImporterTest', () => {
expect(score.tracks[0].staves[0].bars[1].voices[0].beats[3].lyrics).toBe(null);
});

it('track-volume', async () => {
const reader = await prepareGp7ImporterWithFile('guitarpro7/track-volume.gp');
let score: Score = reader.readScore();

expect(score.tracks[0].playbackInfo.volume).toBe(16);
expect(score.tracks[1].playbackInfo.volume).toBe(14);
expect(score.tracks[2].playbackInfo.volume).toBe(12);
expect(score.tracks[3].playbackInfo.volume).toBe(10);
expect(score.tracks[4].playbackInfo.volume).toBe(7);
expect(score.tracks[5].playbackInfo.volume).toBe(3);
expect(score.tracks[6].playbackInfo.volume).toBe(0);
});

it('track-balance', async () => {
const reader = await prepareGp7ImporterWithFile('guitarpro7/track-balance.gp');
let score: Score = reader.readScore();

expect(score.tracks[0].playbackInfo.balance).toBe(0);
expect(score.tracks[1].playbackInfo.balance).toBe(4);
expect(score.tracks[2].playbackInfo.balance).toBe(8);
expect(score.tracks[3].playbackInfo.balance).toBe(12);
expect(score.tracks[4].playbackInfo.balance).toBe(16);
});
});