Mercurial > hg > dmlib

changeset 1112:14bd24790929

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Various improvements in dumpmod output.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 04 Mar 2015 01:29:02 +0200
parents f9a96fc2a932
children 28dcf10fb8a9
files tools/dumpmod.c
diffstat 1 files changed, 44 insertions(+), 47 deletions(-) [+]
line wrap: on
line diff
--- a/tools/dumpmod.c	Wed Mar 04 01:15:17 2015 +0200
+++ b/tools/dumpmod.c	Wed Mar 04 01:29:02 2015 +0200
@@ -200,31 +200,28 @@
 /*
  * Print given extended instrument
  */
-void printEnvelope(FILE *f, JSSEnvelope *e, char *s)
+void printEnvelope(FILE *f, JSSEnvelope *e, const char *name)
 {
     int i;
 
     fprintf(f,
-        "\t%s-envelope:\n"
-        "\t - flags.....: %.4x", s, e->flags);
-
-    if (e->flags & jenvfUsed)
-        fprintf(f, " [used]");
-    if (e->flags & jenvfSustain)
-        fprintf(f, " [sust]");
-    if (e->flags & jenvfLooped)
-        fprintf(f, " [loop]");
-
-    fprintf(f, "\n"
-        "\t - npoints...: %i\n"
-        "\t - sustain...: %i\n"
-        "\t - loopS.....: %i\n"
-        "\t - loopE.....: %i\n",
-        e->npoints, e->sustain, e->loopS, e->loopE);
+        "    %s-envelope:\n"
+        "      flags......: %.4x%s%s%s\n"
+        "      npoints....: %d\n"
+        "      sustain....: %d\n"
+        "      loop.......: %d - %d\n",
+        name, e->flags,
+        (e->flags & jenvfUsed) ? " [used]" : "",
+        (e->flags & jenvfSustain) ? " [sust]" : "",
+        (e->flags & jenvfLooped) ? " [loop]" : "",
+        e->npoints, e->sustain,
+        e->loopS, e->loopE);
 
     if (dmVerbosity >= 2)
     {
-        fprintf(f, "\t - Points....:");
+        fprintf(f,
+        "      Points.....:");
+
         for (i = 0; i < e->npoints; i++)
         {
             fprintf(f, " [%i:%i]",
@@ -238,22 +235,24 @@
 
 void printExtInstrument(FILE *f, JSSExtInstrument *i)
 {
+    fprintf(f,
+        "Description: ");
 #ifndef JSS_LIGHT
     if (i->desc && !optDump)
     {
-        fprintf(f,
-        "Description: '");
+        fprintf(f, "'");
         printEscaped(f, i->desc);
-        fprintf(f, "'\n");
+        fprintf(f, "'");
     }
 #endif
     fprintf(f,
-        "nsamples.......: %i\n"
-        "vibratoType....: %i\n"
-        "vibratoSweep...: %i\n"
-        "vibratoDepth...: %i\n"
-        "vibratoRate....: %i\n"
-        "fadeOut........: %i\n",
+        "\n"
+        "  nsamples.......: %i\n"
+        "  vibratoType....: %i\n"
+        "  vibratoSweep...: %i\n"
+        "  vibratoDepth...: %i\n"
+        "  vibratoRate....: %i\n"
+        "  fadeOut........: %i\n",
         i->nsamples, i->vibratoType, i->vibratoSweep,
         i->vibratoDepth, i->vibratoRate, i->fadeOut);
 
@@ -270,38 +269,36 @@
 {
     if (dmVerbosity >= 1)
     {
+        fprintf(f,
+            "Description: ");
 #ifndef JSS_LIGHT
         if (i->desc && !optDump)
         {
-            fprintf(f,
-            "Description: '");
+            fprintf(f, "'");
             printEscaped(f, i->desc);
-            fprintf(f, "'\n");
+            fprintf(f, "'");
         }
 #endif
         fprintf(f,
-            "size...........: %ld (0x%lx)\n"
-            "loopStart......: %ld (0x%lx)\n"
-            "loopEnd........: %ld (0x%lx)\n"
-            "volume.........: %d (0x%x)\n"
-            "flags..........: 0x%x ",
+            "\n"
+            "  size...........: %ld (0x%lx)\n"
+            "  loop...........: %ld - %ld (0x%lx - 0x%lx)\n"
+            "  volume.........: %d (0x%x)\n"
+            "  flags..........: 0x%x %s%s%s\n"
+            "  C4BaseSpeed....: %d (0x%x)\n"
+            "  ERelNote.......: %s%d (%d)\n"
+            "  EFineTune......: %d\n"
+            "  EPanning.......: %d (0x%x)\n\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);
-        
-        if (i->flags & jsfLooped)  fprintf(f, "[loop] ");
-        if (i->flags & jsfBiDi)    fprintf(f, "[bi-di] ");
-        if (i->flags & jsf16bit)   fprintf(f, "[16bit] ");
-        
-        fprintf(f,
-            "\nC4BaseSpeed....: %d (0x%x)\n"
-            "ERelNote.......: %d (%s%d)\n"
-            "EFineTune......: %d\n"
-            "EPanning,,,....: %d (0x%x)\n\n",
+            i->flags,
+            (i->flags & jsfLooped) ? "[loop]" : "",
+            (i->flags & jsfBiDi)   ? "[bi-di]" : "",
+            (i->flags & jsf16bit)  ? "[16 bit]" : "[8 bit]",
             i->C4BaseSpeed, i->C4BaseSpeed,
-            i->ERelNote, patNoteTable[(48 + i->ERelNote) % 12], (48 + i->ERelNote) / 12,
+            patNoteTable[(48 + i->ERelNote) % 12], (48 + i->ERelNote) / 12, i->ERelNote,
             i->EFineTune, i->EPanning, i->EPanning);
     }
     else