Mercurial > hg > dmlib

changeset 1358:569cf7419f03

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 25 Aug 2017 00:17:07 +0300
parents 370c40e0847f (current diff) e55426a0a010 (diff)
children 28fe5b0925dc
files
diffstat 5 files changed, 26 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/README.txt	Fri Aug 25 00:16:52 2017 +0300
+++ b/README.txt	Fri Aug 25 00:17:07 2017 +0300
@@ -56,7 +56,7 @@
 The compilation and usage of these utilities requires following
 software packages or functional equivalents installed:
 
- - GCC 4.x or later (4.6.3 and 4.7.1 used in development.)
+ - GCC 4.6 or later
  - GNU binutils
  - GNU Make
  - pkg-config
@@ -116,9 +116,9 @@
 xm2jss
 ------
 Convert XM modules to internal JMOD format. You can optionally
-even strip out various parts, such as complete instruments
-(leaving only pattern data), sample data, sample instruments,
-etc.
+optimize the module and even strip out various parts, such as
+complete instruments (leaving only pattern data), sample data,
+sample instruments, etc.
 
 
 dumpmod
@@ -211,6 +211,11 @@
 gfxconv
 -------
 
+Convert ILBM IFF to PNG:
+
+$ gfxconv -f png -o output.png input.lbm
+
+
 Image input to C64 char font conversion:
 
 $ gfxconv font16x16.pcx -f chr -o font16x16.chr
--- a/minijss/jmix_c_in.c	Fri Aug 25 00:16:52 2017 +0300
+++ b/minijss/jmix_c_in.c	Fri Aug 25 00:17:07 2017 +0300
@@ -16,7 +16,8 @@
 #define JMIXER_FUNC \
     const Sint32 vol = (FP_GETH32(tmpVolume) * mixer->globalVol) / 256; \
     memmove(&tl[0], &tl[1], 4 * sizeof(tl[0])); \
-    tl[4] = (((Sint32) sp[FP_GETH32(tmpPos)]) * vol * 3 + tl[3] * 2 + tl[2] + tl[1] + tl[0]) / (256 * 8); *(ap++) += tl[4]; \
+    tl[4] = (((Sint32) sp[FP_GETH32(tmpPos)]) * vol * 3 + tl[3] * 2 + tl[2] + tl[1] + tl[0]) / (256 * 8); \
+    *(ap++) += tl[4];
 
 #define JMIXER_NAME        jvmMix_Mono_C_FW
 #define JMIXER_NEXT        FP_ADD(tmpPos, tmpDelta);
@@ -46,8 +47,10 @@
                  vol_r = (FP_GETH32(tmpVolume) * mixer->globalVol) / 256; \
     memmove(&tl[0], &tl[1], 4 * sizeof(tl[0])); \
     memmove(&tr[0], &tr[1], 4 * sizeof(tr[0])); \
-    tl[4] = (((Sint32) sp[FP_GETH32(tmpPos)]) * vol_l * 3 + tl[3] * 2 + tl[2] + tl[1] + tl[0]) / (256 * 8); *(ap++) += tl[4]; \
-    tr[4] = (((Sint32) sp[FP_GETH32(tmpPos)]) * vol_r * 3 + tr[3] * 2 + tr[2] + tr[1] + tr[0]) / (256 * 8); *(ap++) += tr[4];
+    tl[4] = (((Sint32) sp[FP_GETH32(tmpPos)]) * vol_l * 3 + tl[3] * 2 + tl[2] + tl[1] + tl[0]) / (256 * 8); \
+    *(ap++) += tl[4]; \
+    tr[4] = (((Sint32) sp[FP_GETH32(tmpPos)]) * vol_r * 3 + tr[3] * 2 + tr[2] + tr[1] + tr[0]) / (256 * 8); \
+    *(ap++) += tr[4];
 
 #define JMIXER_NAME        jvmMix_Stereo_C_FW
 #define JMIXER_NEXT        FP_ADD(tmpPos, tmpDelta);
--- a/tools/ppl.c	Fri Aug 25 00:16:52 2017 +0300
+++ b/tools/ppl.c	Fri Aug 25 00:17:07 2017 +0300
@@ -812,7 +812,9 @@
         {
             dmClearSurface(engine.screen, col.boxBg);
 
-            dmDrawBMTextQ(engine.screen, font, DMD_TRANSPARENT, 5, 5, "%s v%s by ccr/TNSP - (c) Copyright 2012-2015 TNSP", dmProgDesc, dmProgVersion);
+            dmDrawBMTextQ(engine.screen, font, DMD_TRANSPARENT, 5, 5,
+                "%s v%s by ccr/TNSP - (c) Copyright 2012-2017 TNSP",
+                dmProgDesc, dmProgVersion);
 
             dmDrawBMTextQ(engine.screen, font, DMD_TRANSPARENT, 5, 5 + 12 + 11,
                 "Song: '%s'",
--- a/tools/view64.c	Fri Aug 25 00:16:52 2017 +0300
+++ b/tools/view64.c	Fri Aug 25 00:17:07 2017 +0300
@@ -39,13 +39,11 @@
 
 void argShowHelp()
 {
-    int i;
-
     dmPrintBanner(stdout, dmProgName, "[options] <input image file>");
     dmArgsPrintHelp(stdout, optList, optListN, 0);
 
     printf("\nAvailable bitmap formats:\n");
-    for (i = 0; i < ndmC64ImageFormats; i++)
+    for (int i = 0; i < ndmC64ImageFormats; i++)
     {
         const DMC64ImageFormat *fmt = &dmC64ImageFormats[i];
         char buf[64];
--- a/tools/xm2jss.c	Fri Aug 25 00:16:52 2017 +0300
+++ b/tools/xm2jss.c	Fri Aug 25 00:17:07 2017 +0300
@@ -1126,14 +1126,19 @@
     // Remap orders list
     //
     dmMsg(1, "Remapping orders list.\n");
+    nunused = 0;
     for (int i = 0; i < m->norders; i++)
     {
         int map = mapPatterns[m->orderList[i]];
         if (map != m->orderList[i])
-        dmPrint(2, "%02x -> %02x : ", m->orderList[i], map);
+        {
+            dmPrint(2, "%02x -> %02x : ", m->orderList[i], map);
+            nunused++;
+        }
         r->orderList[i] = map;
     }
-    dmPrint(2, "\n");
+    if (nunused)
+        dmPrint(2, "\n");
 
     return r;
 }