# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1425749855 -7200
# Node ID 99852310dc026b6ad99f64baece1d7f2cef23dc2
# Parent  c44fcdc1c2e7a3eb291be9c584f4a2dc0ba66887
Some more work on the loader.

diff -r c44fcdc1c2e7 -r 99852310dc02 minijss/jloadjss.c
--- a/minijss/jloadjss.c	Sat Mar 07 19:25:35 2015 +0200
+++ b/minijss/jloadjss.c	Sat Mar 07 19:37:35 2015 +0200
@@ -267,11 +267,11 @@
     int i;
 
     // Read envelope data
-    if (!dmf_read_le16(inFile, &jssEnv.flags) ||
-        !dmf_read_le16(inFile, &jssEnv.npoints) ||
-        !dmf_read_le16(inFile, &jssEnv.sustain) ||
-        !dmf_read_le16(inFile, &jssEnv.loopS) ||
-        !dmf_read_le16(inFile, &jssEnv.loopE))
+    if (!dmf_read_byte(inFile, &jssEnv.flags) ||
+        !dmf_read_byte(inFile, &jssEnv.npoints) ||
+        !dmf_read_byte(inFile, &jssEnv.sustain) ||
+        !dmf_read_byte(inFile, &jssEnv.loopS) ||
+        !dmf_read_byte(inFile, &jssEnv.loopE))
         JSSERROR(DMERR_FREAD, DMERR_FREAD,
         "Failed to read %s-envelope data for instrument #%d.\n",
         name, ninst);
@@ -397,7 +397,7 @@
     for (index = 0; index < module->norders; index++)
     {
         Uint16 tmp;
-        if (!dm_fread_le16(inFile, &tmp))
+        if (!dmf_read_le16(inFile, &tmp))
             JSSERROR(DMERR_FREAD, DMERR_FREAD,
             "Failed to read orders list entry #%d.\n",
             index);