Mercurial > hg > dmlib

changeset 1207:59b5821b5cf9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename function arguments.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 05 Mar 2015 21:23:47 +0200
parents 0f07f752cd73
children fa758951720f
files tools/xm2jss.c
diffstat 1 files changed, 56 insertions(+), 42 deletions(-) [+]
line wrap: on
line diff
--- a/tools/xm2jss.c	Thu Mar 05 20:14:06 2015 +0200
+++ b/tools/xm2jss.c	Thu Mar 05 21:23:47 2015 +0200
@@ -190,27 +190,29 @@
 
 /* Convert a note
  */
-static int jssConvertNote(Uint8 *patBuf, const size_t patBufSize, size_t *patSize, const JSSNote *note)
+static int jssConvertNote(
+    Uint8 *patBuf, const size_t patBufSize,
+    size_t *patSize, const JSSNote *pnote)
 {
     Uint8 tmp;
-    if (note->note == jsetNotSet)
+    if (pnote->note == jsetNotSet)
         tmp = 0;
     else
-    if (note->note == jsetNoteOff)
+    if (pnote->note == jsetNoteOff)
         tmp = 127;
     else
-        tmp = note->note + 1;
+        tmp = pnote->note + 1;
 
     if (tmp > 0x7f)
         JSSERROR(DMERR_BOUNDS, DMERR_BOUNDS, "Note value out of bounds %d > 0x7f.\n", tmp);
 
     JSPUTBYTE(tmp & 0x7f);
     
-    JSCONVPUT(note->instrument, "Instrument");
-    JSCONVPUT(note->volume, "Volume");
-    JSCONVPUT(note->effect, "Effect");
+    JSCONVPUT(pnote->instrument, "Instrument");
+    JSCONVPUT(pnote->volume, "Volume");
+    JSCONVPUT(pnote->effect, "Effect");
     
-    tmp = (note->param != jsetNotSet) ? note->param : 0;
+    tmp = (pnote->param != jsetNotSet) ? pnote->param : 0;
     JSPUTBYTE(tmp);
     
     return DMERR_OK;
@@ -219,18 +221,20 @@
 
 /* Compress a note
  */
-static int jssCompressNote(Uint8 *patBuf, const size_t patBufSize, size_t *patSize, const JSSNote *note)
+static int jssCompressNote(
+    Uint8 *patBuf, const size_t patBufSize,
+    size_t *patSize, const JSSNote *pnote)
 {
     Uint8 qflags = 0;
     int qcomp = 0;
 
     // Determine what would get stored,
     // aka actually how much space we use    
-    JSCOMP(note->note,       COMP_NOTE);
-    JSCOMP(note->instrument, COMP_INSTRUMENT);
-    JSCOMP(note->volume,     COMP_VOLUME);
-    JSCOMP(note->effect,     COMP_EFFECT);
-    if (note->param != jsetNotSet && note->param != 0)
+    JSCOMP(pnote->note,       COMP_NOTE);
+    JSCOMP(pnote->instrument, COMP_INSTRUMENT);
+    JSCOMP(pnote->volume,     COMP_VOLUME);
+    JSCOMP(pnote->effect,     COMP_EFFECT);
+    if (pnote->param != jsetNotSet && pnote->param != 0)
     {
         qflags |= COMP_PARAM;
         qcomp++;
@@ -241,23 +245,23 @@
         // Okay, it's less than 4 bytes, so use compressed
         JSPUTBYTE(qflags | 0x80);
         
-        if (note->note != jsetNotSet)
+        if (pnote->note != jsetNotSet)
         {
-            Uint8 tmp = (note->note != jsetNoteOff) ? note->note : 127;
+            Uint8 tmp = (pnote->note != jsetNoteOff) ? pnote->note : 127;
             if (tmp > 0x7f)
                 JSSERROR(DMERR_BOUNDS, DMERR_BOUNDS, "Note value out of bounds %d > 0x7f.\n", tmp);
             JSPUTBYTE(tmp);
         }
         
-        JSCOMPPUT(COMP_INSTRUMENT, note->instrument, "Instrument");
-        JSCOMPPUT(COMP_VOLUME, note->volume, "Volume");
-        JSCOMPPUT(COMP_EFFECT, note->effect, "Effect");
-        JSCOMPPUT(COMP_PARAM, note->param, "Param");
+        JSCOMPPUT(COMP_INSTRUMENT, pnote->instrument, "Instrument");
+        JSCOMPPUT(COMP_VOLUME, pnote->volume, "Volume");
+        JSCOMPPUT(COMP_EFFECT, pnote->effect, "Effect");
+        JSCOMPPUT(COMP_PARAM, pnote->param, "Param");
     }
     else
     {
         // Was 4 bytes or more, just dump it all in ..
-        return jssConvertNote(patBuf, patBufSize, patSize, note);
+        return jssConvertNote(patBuf, patBufSize, patSize, pnote);
     }
 
     return DMERR_OK;
@@ -266,7 +270,9 @@
 
 /* Compress pattern
  */
-static int jssConvertPatternCompHoriz(Uint8 *patBuf, const size_t patBufSize, size_t *patSize, const JSSPattern *pattern)
+static int jssConvertPatternCompHoriz(
+    Uint8 *patBuf, const size_t patBufSize,
+    size_t *patSize, const JSSPattern *pattern)
 {
     int row, channel;
     *patSize = 0;
@@ -274,8 +280,8 @@
     for (row = 0; row < pattern->nrows; row++)
     for (channel = 0; channel < pattern->nchannels; channel++)
     {
-        const JSSNote *note = &pattern->data[(pattern->nchannels * row) + channel];
-        const int res = jssCompressNote(patBuf, patBufSize, patSize, note);
+        const JSSNote *pnote = &pattern->data[(pattern->nchannels * row) + channel];
+        const int res = jssCompressNote(patBuf, patBufSize, patSize, pnote);
         if (res != DMERR_OK)
         {
             JSSERROR(res, res, "Note compression failed [patBuf=%p, patBufSize=%d, patSize=%d, row=%d, chn=%d]\n",
@@ -288,7 +294,9 @@
 }
 
 
-static int jssConvertPatternCompVert(Uint8 *patBuf, const size_t patBufSize, size_t *patSize, const JSSPattern *pattern)
+static int jssConvertPatternCompVert(
+    Uint8 *patBuf, const size_t patBufSize,
+    size_t *patSize, const JSSPattern *pattern)
 {
     int row, channel;
     *patSize = 0;
@@ -296,8 +304,8 @@
     for (channel = 0; channel < pattern->nchannels; channel++)
     for (row = 0; row < pattern->nrows; row++)
     {
-        const JSSNote *note = &pattern->data[(pattern->nchannels * row) + channel];
-        const int res = jssCompressNote(patBuf, patBufSize, patSize, note);
+        const JSSNote *pnote = &pattern->data[(pattern->nchannels * row) + channel];
+        const int res = jssCompressNote(patBuf, patBufSize, patSize, pnote);
         if (res != DMERR_OK)
         {
             JSSERROR(res, res, "Note compression failed [patBuf=%p, patBufSize=%d, patSize=%d, row=%d, chn=%d]\n",
@@ -312,7 +320,9 @@
 
 /* Convert a pattern
  */
-static int jssConvertPatternRawHoriz(Uint8 *patBuf, const size_t patBufSize, size_t *patSize, const JSSPattern *pattern)
+static int jssConvertPatternRawHoriz(
+    Uint8 *patBuf, const size_t patBufSize,
+    size_t *patSize, const JSSPattern *pattern)
 {
     int row, channel;
     *patSize = 0;
@@ -320,8 +330,8 @@
     for (row = 0; row < pattern->nrows; row++)
     for (channel = 0; channel < pattern->nchannels; channel++)
     {
-        const JSSNote *note = &pattern->data[(pattern->nchannels * row) + channel];
-        const int res = jssConvertNote(patBuf, patBufSize, patSize, note);
+        const JSSNote *pnote = &pattern->data[(pattern->nchannels * row) + channel];
+        const int res = jssConvertNote(patBuf, patBufSize, patSize, pnote);
         if (res != DMERR_OK)
         {
             JSSERROR(res, res, "Note conversion failed [patBuf=%p, patBufSize=%d, patSize=%d, row=%d, chn=%d]\n",
@@ -334,7 +344,9 @@
 }
 
 
-static int jssConvertPatternRawVert(Uint8 *patBuf, const size_t patBufSize, size_t *patSize, const JSSPattern *pattern)
+static int jssConvertPatternRawVert(
+    Uint8 *patBuf, const size_t patBufSize,
+    size_t *patSize, const JSSPattern *pattern)
 {
     int row, channel;
     *patSize = 0;
@@ -342,8 +354,8 @@
     for (channel = 0; channel < pattern->nchannels; channel++)
     for (row = 0; row < pattern->nrows; row++)
     {
-        const JSSNote *note = &pattern->data[(pattern->nchannels * row) + channel];
-        const int res = jssConvertNote(patBuf, patBufSize, patSize, note);
+        const JSSNote *pnote = &pattern->data[(pattern->nchannels * row) + channel];
+        const int res = jssConvertNote(patBuf, patBufSize, patSize, pnote);
         if (res != DMERR_OK)
         {
             JSSERROR(res, res, "Note conversion failed [patBuf=%p, patBufSize=%d, patSize=%d, row=%d, chn=%d]\n",
@@ -359,24 +371,26 @@
 #define JSFOREACHNOTE1                                                              \
   for (channel = 0; channel < pattern->nchannels; channel++)                        \
   for (row = 0; row < pattern->nrows; row++) {                                      \
-  const JSSNote *note = &pattern->data[(pattern->nchannels * row) + channel];
+  const JSSNote *pnote = &pattern->data[(pattern->nchannels * row) + channel];
 
 #define JSFOREACHNOTE2 }
 
-static int jssConvertPatternRawElem(Uint8 *patBuf, const size_t patBufSize, size_t *patSize, const JSSPattern *pattern)
+static int jssConvertPatternRawElem(
+    Uint8 *patBuf, const size_t patBufSize,
+    size_t *patSize, const JSSPattern *pattern)
 {
     Uint8 tmp;
     int row, channel;
     *patSize = 0;
     
     JSFOREACHNOTE1;
-    if (note->note == jsetNotSet)
+    if (pnote->note == jsetNotSet)
         tmp = 0;
     else
-    if (note->note == jsetNoteOff)
+    if (pnote->note == jsetNoteOff)
         tmp = 127;
     else
-        tmp = note->note + 1;
+        tmp = pnote->note + 1;
 
     if (tmp > 0x7f)
         JSSERROR(DMERR_BOUNDS, DMERR_BOUNDS, "Note value out of bounds %d > 0x7f.\n", tmp);
@@ -385,19 +399,19 @@
     JSFOREACHNOTE2;
     
     JSFOREACHNOTE1;
-    JSCONVPUT(note->instrument, "Instrument");
+    JSCONVPUT(pnote->instrument, "Instrument");
     JSFOREACHNOTE2;
     
     JSFOREACHNOTE1;
-    JSCONVPUT(note->volume, "Volume");
+    JSCONVPUT(pnote->volume, "Volume");
     JSFOREACHNOTE2;
     
     JSFOREACHNOTE1;
-    JSCONVPUT(note->effect, "Effect");
+    JSCONVPUT(pnote->effect, "Effect");
     JSFOREACHNOTE2;
     
     JSFOREACHNOTE1;
-    tmp = (note->param != jsetNotSet) ? note->param : 0;
+    tmp = (pnote->param != jsetNotSet) ? pnote->param : 0;
     JSPUTBYTE(tmp);
     JSFOREACHNOTE2;