ChomeNS/SongPlayer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix "Invalid song format" on some NBS songs with the pitch

Browse source
This commit is contained in:
Chayapak 2023-08-28 17:12:33 +07:00
parent 623c569c99
commit 44db9f75b0
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/com/github/hhhzzzsss/songplayer/conversion/NBSConverter.java
View file

@ -153,13 +153,13 @@ public class NBSConverter {
layerVolume = nbsLayers.get(note.layer).volume; layerVolume = nbsLayers.get(note.layer).volume;
} }
int key = note.key; int key = note.key + SongHandler.getInstance().pitch;
while (key < 33) key += 12; while (key < 33) key += 12;
while (key > 57) key -= 12; while (key > 57) key -= 12;
int pitch = key-33; int pitch = key-33;
int noteId = (pitch + instrument.instrumentId*25) + SongHandler.getInstance().pitch; int noteId = pitch + instrument.instrumentId*25;
song.add(new Note(noteId, getMilliTime(note.tick, tempo))); song.add(new Note(noteId, getMilliTime(note.tick, tempo)));
} }