Mercurial > hg > dmlib

changeset 37:cec910d02b26

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cosmetics.
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 29 Sep 2012 20:43:22 +0300
parents f3407a58e01e
children 8b04b0b51edc
files mod2wav.c
diffstat 1 files changed, 67 insertions(+), 59 deletions(-) [+]
line wrap: on
line diff
--- a/mod2wav.c	Sat Sep 29 20:41:36 2012 +0300
+++ b/mod2wav.c	Sat Sep 29 20:43:22 2012 +0300
@@ -62,17 +62,18 @@
 size_t  optPlayTime;
 
 
-DMOptArg optList[] = {
-    { 0, '?', "help",    "Show this help", OPT_NONE },
-    { 2, 'v', "verbose",    "Be more verbose", OPT_NONE },
-    { 3, '1', "16bit",    "16-bit output", OPT_NONE },
-    { 4, '8', "8bit",    "8-bit output", OPT_NONE },
-    { 5, 'm', "mono",    "Mono output", OPT_NONE },
-    { 6, 's', "stereo",    "Stereo output", OPT_NONE },
-    { 7, 'f', "freq",    "Output frequency", OPT_ARGREQ },
-    { 8, 'M', "mute",    "Mute other channels than #", OPT_ARGREQ },
-    { 9, 'o', "order",    "Start from order #", OPT_ARGREQ },
-    {10, 't', "time",    "Play for # seconds", OPT_ARGREQ },
+DMOptArg optList[] =
+{
+    {  0, '?', "help",     "Show this help", OPT_NONE },
+    {  2, 'v', "verbose",  "Be more verbose", OPT_NONE },
+    {  3, '1', "16bit",    "16-bit output", OPT_NONE },
+    {  4, '8', "8bit",     "8-bit output", OPT_NONE },
+    {  5, 'm', "mono",     "Mono output", OPT_NONE },
+    {  6, 's', "stereo",   "Stereo output", OPT_NONE },
+    {  7, 'f', "freq",     "Output frequency", OPT_ARGREQ },
+    {  8, 'M', "mute",     "Mute other channels than #", OPT_ARGREQ },
+    {  9, 'o', "order",    "Start from order #", OPT_ARGREQ },
+    { 10, 't', "time",     "Play for # seconds", OPT_ARGREQ },
 //    {10, 'l', "loop",    "Loop for # times", OPT_ARGREQ },
 };
 
@@ -83,55 +84,56 @@
 {
     (void) optArg;
     
-    switch (optN) {
-    case 0:
-        dmPrintBanner(stdout, dmProgName,
-            "[options] [sourcefile] [destfile]");
-            
-        dmArgsPrintHelp(stdout, optList, optListN);
-        exit(0);
-        break;
+    switch (optN)
+    {
+        case 0:
+            dmPrintBanner(stdout, dmProgName,
+                "[options] [sourcefile] [destfile]");
+                
+            dmArgsPrintHelp(stdout, optList, optListN);
+            exit(0);
+            break;
 
-    case 2:
-        dmVerbosity++;
-        break;
-    
-    case 3:
-        optOutFormat = JSS_AUDIO_S16;
-        break;
+        case 2:
+            dmVerbosity++;
+            break;
+        
+        case 3:
+            optOutFormat = JSS_AUDIO_S16;
+            break;
 
-    case 4:
-        optOutFormat = JSS_AUDIO_U8;
-        break;
-
-    case 5:
-        optOutChannels = JSS_AUDIO_MONO;
-        break;
+        case 4:
+            optOutFormat = JSS_AUDIO_U8;
+            break;
 
-    case 6:
-        optOutFormat = JSS_AUDIO_STEREO;
-        break;
+        case 5:
+            optOutChannels = JSS_AUDIO_MONO;
+            break;
 
-    case 7:
-        optOutFreq = atoi(optArg);
-        break;
+        case 6:
+            optOutFormat = JSS_AUDIO_STEREO;
+            break;
 
-    case 8:
-        optMuteOChannels = atoi(optArg);
-        break;
+        case 7:
+            optOutFreq = atoi(optArg);
+            break;
 
-    case 9:
-        optStartOrder = atoi(optArg);
-        break;
+        case 8:
+            optMuteOChannels = atoi(optArg);
+            break;
+
+        case 9:
+            optStartOrder = atoi(optArg);
+            break;
 
-    case 10:
-        optPlayTime = atoi(optArg);
-        optUsePlayTime = TRUE;
-        break;
+        case 10:
+            optPlayTime = atoi(optArg);
+            optUsePlayTime = TRUE;
+            break;
 
-    default:
-        dmError("Unknown argument '%s'.\n", currArg);
-        return FALSE;
+        default:
+            dmError("Unknown argument '%s'.\n", currArg);
+            return FALSE;
     }
     
     return TRUE;
@@ -140,12 +142,13 @@
 
 BOOL argHandleFile(char *currArg)
 {
-    // Was not option argument
     if (!srcFilename)
         srcFilename = currArg;
-    else if (!destFilename)
+    else
+    if (!destFilename)
         destFilename = currArg;
-    else {
+    else
+    {
         dmError("Too many filename arguments (only source and dest needed) '%s'\n", currArg);
         return FALSE;
     }
@@ -228,7 +231,8 @@
         exit(1);
 
     // Check arguments
-    if (!srcFilename || !destFilename) {
+    if (!srcFilename || !destFilename)
+    {
         dmError("Input or output file not specified!\n");
         return 1;
     }
@@ -304,14 +308,17 @@
     
     // Initialize playing
     jmpSetModule(p, m);
-    if (optStartOrder >= 0) { 
+    if (optStartOrder >= 0)
+    { 
         dmMsg(1, "Starting from song order #%d\n", optStartOrder);
     } else
         optStartOrder = 0;
+
     jmpPlayOrder(p, optStartOrder);
     jvmSetGlobalVol(d, 50);
     
-    if (optMuteOChannels > 0 && optMuteOChannels <= m->nchannels) {
+    if (optMuteOChannels > 0 && optMuteOChannels <= m->nchannels)
+    {
         int i;
         for (i = 0; i < m->nchannels; i++)
             jvmMute(d, i, TRUE);
@@ -319,7 +326,8 @@
     }
     
     // Open output file
-    if ((outFile = fopen(destFilename, "wb")) == NULL) {
+    if ((outFile = fopen(destFilename, "wb")) == NULL)
+    {
         dmError("Error opening output file '%s'. (%s)\n", srcFilename, strerror(errno));
         return 7;
     }