Mercurial > hg > dmlib

diff tools/xm2jss.c @ 1210:6b48bad13399

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename pattern note packing flag COMP_* constants to JM_COMP_*.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 05 Mar 2015 21:48:22 +0200
parents cb31e57982f2
children 83ed44e9630b
line wrap: on
line diff
--- a/tools/xm2jss.c	Thu Mar 05 21:47:07 2015 +0200
+++ b/tools/xm2jss.c	Thu Mar 05 21:48:22 2015 +0200
@@ -230,13 +230,13 @@
 
     // Determine what would get stored,
     // aka actually how much space we use    
-    JSCOMP(pnote->note,       COMP_NOTE);
-    JSCOMP(pnote->instrument, COMP_INSTRUMENT);
-    JSCOMP(pnote->volume,     COMP_VOLUME);
-    JSCOMP(pnote->effect,     COMP_EFFECT);
+    JSCOMP(pnote->note,       JM_COMP_NOTE);
+    JSCOMP(pnote->instrument, JM_COMP_INSTRUMENT);
+    JSCOMP(pnote->volume,     JM_COMP_VOLUME);
+    JSCOMP(pnote->effect,     JM_COMP_EFFECT);
     if (pnote->param != jsetNotSet && pnote->param != 0)
     {
-        qflags |= COMP_PARAM;
+        qflags |= JM_COMP_PARAM;
         qcomp++;
     }
     
@@ -253,10 +253,10 @@
             JSPUTBYTE(tmp);
         }
         
-        JSCOMPPUT(COMP_INSTRUMENT, pnote->instrument, "Instrument");
-        JSCOMPPUT(COMP_VOLUME, pnote->volume, "Volume");
-        JSCOMPPUT(COMP_EFFECT, pnote->effect, "Effect");
-        JSCOMPPUT(COMP_PARAM, pnote->param, "Param");
+        JSCOMPPUT(JM_COMP_INSTRUMENT, pnote->instrument, "Instrument");
+        JSCOMPPUT(JM_COMP_VOLUME, pnote->volume, "Volume");
+        JSCOMPPUT(JM_COMP_EFFECT, pnote->effect, "Effect");
+        JSCOMPPUT(JM_COMP_PARAM, pnote->param, "Param");
     }
     else
     {