# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1349161058 -10800
# Node ID 6b42aed2745bbfd18727fca30246cf42f5fabb15
# Parent  265ce3091d881d157cd8d812a90e5be986533e64
Cleanups and correct the dmf_create_stdio() issue here as well.

diff -r 265ce3091d88 -r 6b42aed2745b mod2wav.c
--- a/mod2wav.c	Tue Oct 02 09:44:24 2012 +0300
+++ b/mod2wav.c	Tue Oct 02 09:57:38 2012 +0300
@@ -241,9 +241,10 @@
     jssInit();
     
     // Open the source file
-    if ((inFile = dmf_create_stdio(srcFilename)) == NULL)
+    if ((inFile = dmf_create_stdio(srcFilename, "rb")) == NULL)
     {
-        fprintf(stderr, "Error opening input file '%s'. (%s)\n", srcFilename, strerror(errno));
+        dmError("Error opening input file '%s', %d: %s\n",
+            srcFilename, errno, strerror(errno));
         return 1;
     }
 
@@ -273,7 +274,7 @@
     dmf_close(inFile);
     if (result != DMERR_OK)
     {
-        fprintf(stderr, "Error loading module file, %d: %s\n",
+        dmError("Error loading module file, %d: %s\n",
             result, dmErrorStr(result));
         return 3;
     }
@@ -281,7 +282,7 @@
     // Try to convert it
     if ((result = jssConvertModuleForPlaying(mod)) != DMERR_OK)
     {
-        fprintf(stderr, "Could not convert module for playing, %d: %s\n",
+        dmError("Could not convert module for playing, %d: %s\n",
             result, dmErrorStr(result));
         return 3;
     }
@@ -290,15 +291,14 @@
     dev = jvmInit(optOutFormat, optOutChannels, optOutFreq, JMIX_AUTO);
     if (dev == NULL)
     {
-        fprintf(stderr, "jvmInit() returned NULL\n");
+        dmError("jvmInit() returned NULL\n");
         return 4;
     }
 
     sampSize = jvmGetSampleSize(dev);
-    mb = dmMalloc(bufLen * sampSize);
-    if (mb == NULL)
+    if ((mb = dmMalloc(bufLen * sampSize)) == NULL)
     {
-        fprintf(stderr, "Could not allocate mixing buffer\n");
+        dmError("Could not allocate mixing buffer\n");
         return 5;
     }
     
@@ -309,7 +309,7 @@
     // Initialize player
     if ((plr = jmpInit(dev)) == NULL)
     {
-        fprintf(stderr, "jmpInit() returned NULL\n");
+        dmError("jmpInit() returned NULL.\n");
         return 6;
     }