# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1526283276 -10800
# Node ID 2d7511e614030edbdc80167d5f182875f5593047
# Parent  096767827bb8a553ef00ad6e08de798354a9ac99
Cleanup plrtest.

diff -r 096767827bb8 -r 2d7511e61403 tests/plrtest.c
--- a/tests/plrtest.c	Mon May 14 09:53:40 2018 +0300
+++ b/tests/plrtest.c	Mon May 14 10:34:36 2018 +0300
@@ -20,77 +20,72 @@
 static const char jmpMODEffectTable[jmpNMODEffectTable] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
 
 
-void printRow(FILE * f, JSSPattern * p, int row)
+void printRow(FILE * fh, const JSSPattern * pat, const int row)
 {
-    int j, k;
-    char c;
-    JSSNote *n;
-
-    if (!p)
-        return;
+    const JSSNote *note = &(pat->data[pat->nchannels * row]);
+    int width = pat->nchannels < 5 ? pat->nchannels : 5;
 
-    n = &(p->data[p->nchannels * row]);
+    fprintf(fh, "%.2x: ", row);
 
-    fprintf(f, "%.2x: ", row);
-    
-    k = p->nchannels < 5 ? p->nchannels : 5;
-
-    for (j = 0; j < k; j++)
+    for (int channel = 0; channel < width; channel++)
     {
-        switch (n->note)
+        switch (note->note)
         {
             case jsetNotSet:
-                fprintf(f, "... ");
+                fprintf(fh, "... ");
                 break;
             case jsetNoteOff:
-                fprintf(f, "=== ");
+                fprintf(fh, "=== ");
                 break;
             default:
-                fprintf(f, "%s%i ", patNoteTable[n->note % 12], n->note / 12);
+                fprintf(fh, "%s%d ",
+                    patNoteTable[note->note % 12],
+                    note->note / 12);
                 break;
         }
 
-        if (n->instrument != jsetNotSet)
-            fprintf(f, "%.2x ", n->instrument + 1);
+        if (note->instrument != jsetNotSet)
+            fprintf(fh, "%.2x ", note->instrument + 1);
         else
-            fprintf(f, ".. ");
+            fprintf(fh, ".. ");
 
-        if (n->volume == jsetNotSet)
-            fprintf(f, ".. ");
-        else if (n->volume >= 0x00 && n->volume <= 0x40)
-            fprintf(f, "%.2x ", n->volume);
+        if (note->volume == jsetNotSet)
+            fprintf(fh, ".. ");
+        else
+        if (note->volume >= 0x00 && note->volume <= 0x40)
+            fprintf(fh, "%.2x ", note->volume);
         else
         {
-            switch (n->volume & 0xf0)
+            char ch;
+            switch (note->volume & 0xf0)
             {
-                case 0x50: c = '-'; break;
-                case 0x60: c = '+'; break;
-                case 0x70: c = '/'; break;
-                case 0x80: c = '\\'; break;
-                case 0x90: c = 'S'; break;
-                case 0xa0: c = 'V'; break;
-                case 0xb0: c = 'P'; break;
-                case 0xc0: c = '<'; break;
-                case 0xd0: c = '>'; break;
-                case 0xe0: c = 'M'; break;
-                default:   c = '?'; break;
+                case 0x50: ch = '-'; break;
+                case 0x60: ch = '+'; break;
+                case 0x70: ch = '/'; break;
+                case 0x80: ch = '\\'; break;
+                case 0x90: ch = 'S'; break;
+                case 0xa0: ch = 'V'; break;
+                case 0xb0: ch = 'P'; break;
+                case 0xc0: ch = '<'; break;
+                case 0xd0: ch = '>'; break;
+                case 0xe0: ch = 'M'; break;
+                default:   ch = '?'; break;
             }
-            fprintf(f, "%c%x ", c, (n->volume & 0x0f));
+            fprintf(fh, "%c%x ",
+                ch, note->volume & 0x0f);
         }
 
-        if (n->effect >= 0 && n->effect < jmpNMODEffectTable)
-            fprintf(f, "%c", jmpMODEffectTable[n->effect]);
-        else if (n->effect == jsetNotSet)
-            fprintf(f, ".");
+        if (note->effect >= 0 && note->effect < jmpNMODEffectTable)
+            fprintf(fh, "%c", jmpMODEffectTable[note->effect]);
         else
-            fprintf(f, "?");
+            fprintf(fh, "%c", note->effect == jsetNotSet ? '.' : '?');
 
-        if (n->param != jsetNotSet)
-            fprintf(f, "%.2x|", n->param);
+        if (note->param != jsetNotSet)
+            fprintf(fh, "%.2x|", note->param);
         else
-            fprintf(f, "..|");
+            fprintf(fh, "..|");
 
-        n++;
+        note++;
     }
 }
 
@@ -221,7 +216,7 @@
     jvmSetCallback(dev, jmpExec, plr);
     jmpSetModule(plr, mod);
     jmpPlayOrder(plr, 0);
-    jvmSetGlobalVol(dev, 60);
+    jvmSetGlobalVol(dev, 100);
 
     // okay, main loop here ... "play" module and print out info
     printf("----------------------------------------------------\n");