Mercurial > hg > dmlib
changeset 1349:5adf67d1dea4
Fix loading of instrument relative note, finetune and panning values, which should be signed.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Tue, 22 Aug 2017 22:01:32 +0300 |
parents | 6d67057ad2ca |
children | dcb5c16ecdb9 |
files | minijss/jloadjss.c minijss/jssmod.h |
diffstat | 2 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/minijss/jloadjss.c Tue Aug 22 21:47:05 2017 +0300 +++ b/minijss/jloadjss.c Tue Aug 22 22:01:32 2017 +0300 @@ -571,9 +571,9 @@ !dmf_read_le32(inFile, &jssI.loopE) || !dmf_read_le16(inFile, &jssI.flags) || !dmf_read_le16(inFile, &jssI.C4BaseSpeed) || - !dmf_read_le16(inFile, &jssI.ERelNote) || - !dmf_read_le16(inFile, &jssI.EFineTune) || - !dmf_read_le16(inFile, &jssI.EPanning) || + !dmf_read_le16(inFile, (Uint16 *) &jssI.ERelNote) || + !dmf_read_le16(inFile, (Uint16 *) &jssI.EFineTune) || + !dmf_read_le16(inFile, (Uint16 *) &jssI.EPanning) || !dmf_read_byte(inFile, &jssI.volume) || !dmf_read_byte(inFile, &jssI.convFlags)) {
--- a/minijss/jssmod.h Tue Aug 22 21:47:05 2017 +0300 +++ b/minijss/jssmod.h Tue Aug 22 22:01:32 2017 +0300 @@ -267,8 +267,8 @@ loopS, // Loop start position in units loopE; // Loop end position in units Uint16 flags, // Flags - see jss.h jsfXXXX - C4BaseSpeed, // C4BaseSpeed - ERelNote, // Extended: Relative note value + C4BaseSpeed; // C4BaseSpeed + Sint16 ERelNote, // Extended: Relative note value EFineTune, // Extended: Fine-tune value EPanning; // Extended: Panning Uint8 volume, // Volume [jsetMinVol...jsetMaxVol]