Mercurial > hg > dmlib

changeset 1148:1ed8af15581a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Comments and cosmetics.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 05 Mar 2015 04:59:01 +0200
parents 5e1d67f33dec
children f5edb39a8db1
files minijss/jloadxm.c
diffstat 1 files changed, 10 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/minijss/jloadxm.c	Thu Mar 05 02:37:33 2015 +0200
+++ b/minijss/jloadxm.c	Thu Mar 05 04:59:01 2015 +0200
@@ -104,7 +104,8 @@
 
 /* Unpack XM-format pattern from file-stream into JSS-pattern structure
  */
-#define JSGETBYTE(XV) do {                              \
+#define JSGETBYTE(XV) \
+do {                                                    \
     size--;                                             \
     if (size < 0)                                       \
         JSSERROR(DMERR_OUT_OF_DATA, DMERR_OUT_OF_DATA,  \
@@ -113,17 +114,22 @@
 } while (0)
 
 
+/* Convert XM note value to internal JSS note
+ */
 static int jssXMConvertNote(int val)
 {
     if (val < 1 || val > 97)
         return jsetNotSet;
-    else if (val == 97)
+    else
+    if (val == 97)
         return jsetNoteOff;
     else
         return val - 1;
 }
 
 
+/* Unpack a XM pattern structure from resource to given JSS pattern
+ */
 static int jssXMUnpackPattern(DMResource *inFile, int size, JSSPattern *pattern)
 {
     int packb, row, channel, tmp;
@@ -215,7 +221,8 @@
 static int jssXMConvertEnvelope(JSSEnvelope * d, XMEnvelope * s, char * e, int instr)
 {
     int i;
-    (void) e; (void) instr;
+    (void) name;
+    (void) ninstr;
 
     // Convert envelope points
     for (i = 0; i < XM_MaxEnvPoints; i++)