Mercurial > hg > dmlib

changeset 1092:03322ee5bb32

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change dumpmod short format sample instrument output.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 03 Mar 2015 01:40:52 +0200
parents 988a3397839e
children e4a0f83c286d
files tools/dumpmod.c
diffstat 1 files changed, 18 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/tools/dumpmod.c	Mon Mar 02 20:30:25 2015 +0200
+++ b/tools/dumpmod.c	Tue Mar 03 01:40:52 2015 +0200
@@ -306,18 +306,24 @@
     {
 #ifndef JSS_LIGHT
         if (i->desc && !optDump)
-            fprintf(f, "'%s', ", i->desc);
+            fprintf(f, "%s|", i->desc);
 #endif
         fprintf(f,
-        "s=%ld (%lx), l=%ld-%ld (%lx-%lx), v=%i (%x), f=0x%x, c4=%i (%x), rn=%i (%s%i), ft=%i, pn=%i (%x)\n",
-        (unsigned long) i->size, (unsigned long) i->size,
-        (unsigned long) i->loopS, (unsigned long) i->loopE,
-        (unsigned long) i->loopS, (unsigned long) i->loopE,
-        i->volume, i->volume, i->flags, i->C4BaseSpeed,
-        i->C4BaseSpeed, i->ERelNote,
-        patNoteTable[(48 + i->ERelNote) % 12],
-        (48 + i->ERelNote) / 12, i->EFineTune,
-        i->EPanning, i->EPanning);
+            "%8ld|%8ld..%-8ld|%03d|%-2s %-2s %-2s|"
+            "%4d|%s%d|%d|%d\n",
+            (unsigned long) i->size,
+            (unsigned long) i->loopS,
+            (unsigned long) i->loopE,
+            i->volume,
+
+            (i->flags & jsfLooped) ? "lp" : "",
+            (i->flags & jsfBiDi)   ? "bi" : "",
+            (i->flags & jsf16bit)  ? "16" : "8",
+
+            i->C4BaseSpeed,
+            patNoteTable[(48 + i->ERelNote) % 12],
+            (48 + i->ERelNote) / 12, i->EFineTune,
+            i->EPanning);
     }
 }
 
@@ -451,7 +457,7 @@
         );
         for (i = 0; i < mod->nextInstruments; i++)
         {
-            printf("#%03i: ", i + 1);
+            printf("#%03d: ", i + 1);
             printExtInstrument(stdout, mod->extInstruments[i]);
         }
     }
@@ -464,7 +470,7 @@
         );
         for (i = 0; i < mod->ninstruments; i++)
         {
-            printf("#%03i: ", i + 1);
+            printf("#%03d: ", i + 1);
             printInstrument(stdout, mod->instruments[i]);
         }
     }