# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1425584902 -7200
# Node ID 6b48bad1339947e8466777ac2e166773554d3593
# Parent  cb31e57982f2655080f0b1905a0fa79524a032c7
Rename pattern note packing flag COMP_* constants to JM_COMP_*.

diff -r cb31e57982f2 -r 6b48bad13399 minijss/jloadjss.c
--- a/minijss/jloadjss.c	Thu Mar 05 21:47:07 2015 +0200
+++ b/minijss/jloadjss.c	Thu Mar 05 21:48:22 2015 +0200
@@ -70,7 +70,7 @@
     JSGETBYTE(&packb);
     if (packb & 0x80)
     {
-        if (packb & COMP_NOTE)
+        if (packb & JM_COMP_NOTE)
         {
             JSGETBYTE(&tmp);
             if (tmp == 127)
@@ -79,26 +79,26 @@
                 pnote->note = tmp;
         }
 
-        if (packb & COMP_INSTRUMENT)
+        if (packb & JM_COMP_INSTRUMENT)
         {
             JSGETBYTE(&tmp);
             pnote->instrument = tmp;
         }
 
-        if (packb & COMP_VOLUME)
+        if (packb & JM_COMP_VOLUME)
         {
             JSGETBYTE(&tmp);
             pnote->volume = tmp;
         }
 
-        if (packb & COMP_EFFECT)
+        if (packb & JM_COMP_EFFECT)
         {
             JSGETBYTE(&tmp);
             pnote->effect = tmp;
             pnote->param = 0;
         }
 
-        if (packb & COMP_PARAM)
+        if (packb & JM_COMP_PARAM)
         {
             JSGETBYTE(&tmp);
             pnote->param = tmp;
diff -r cb31e57982f2 -r 6b48bad13399 minijss/jssmod.h
--- a/minijss/jssmod.h	Thu Mar 05 21:47:07 2015 +0200
+++ b/minijss/jssmod.h	Thu Mar 05 21:48:22 2015 +0200
@@ -274,12 +274,12 @@
 } JSSMODInstrument;
 
 
-#define COMP_NOTE           (0x01)
-#define COMP_INSTRUMENT     (0x02)
-#define COMP_VOLUME         (0x04)
-#define COMP_EFFECT         (0x08)
-#define COMP_PARAM          (0x10)
-#define COMP_ALL (COMP_NOTE | COMP_INSTRUMENT | COMP_VOLUME | COMP_EFFECT | COMP_PARAM)
+#define JM_COMP_NOTE           (0x01)
+#define JM_COMP_INSTRUMENT     (0x02)
+#define JM_COMP_VOLUME         (0x04)
+#define JM_COMP_EFFECT         (0x08)
+#define JM_COMP_PARAM          (0x10)
+#define JM_COMP_ALL (JM_COMP_NOTE | JM_COMP_INSTRUMENT | JM_COMP_VOLUME | JM_COMP_EFFECT | JM_COMP_PARAM)
 
 
 typedef struct __attribute__((__packed__))
diff -r cb31e57982f2 -r 6b48bad13399 tools/xm2jss.c
--- 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
     {