Merge pull request #50 from pedrolcl/verbosity

Selectable verbosity level

Author: pedrolcl

README.md

@@ -57,7 +57,7 @@ You can use the program to listen MIDI files or to create audio files (like MP3
 
 ~~~
 $ ./sonivoxrender -h
-Usage: ./sonivoxrender [-h|--help] [-v|--version] [-d|--dls file.dls] [-r|--reverb 0..4] [-w|--wet 0..32767] [-n|--dry 0..32767] [-c|--chorus 0..4] [-l|--level 0..32767] [-g|--gain 0..100] file.mid ...
+Usage: ./sonivoxrender [-h|--help] [-v|--version] [-d|--dls file.dls] [-r|--reverb 0..4] [-w|--wet 0..32767] [-n|--dry 0..32767] [-c|--chorus 0..4] [-l|--level 0..32767] [-g|--gain 0..100] [-V|--Verbosity 0..5] file.mid ...
 Render standard MIDI files into raw PCM audio.
 Options:
     -h, --help          this help message.
@@ -69,6 +69,7 @@ Options:
     -c, --chorus n      chorus preset: 0=no, 1..4=presets.
     -l, --level n       chorus level: 0..32767.
     -g, --gain n        master gain: 0..100.
+    -V, --Verbosity n   Verbosity: 0=no, 1=fatals, 2=errors, 3=warnings, 4=infos, 5=details.
 ~~~
 
 The following examples assume the default option USE_44KHZ=ON:

example/sonivoxrender.1.md

@@ -7,7 +7,7 @@
 
 # SYNOPSIS
 
-| **sonivoxrender** [**-h|-\-help**] [**-v|-\-version**] [**-d|-\-dls** _file.dls_] [**-r|-\-reverb** _0..4_] [**-w|-\-wet** _0..32767_] [**-n|-\-dry** _0..32767_] [**-c|-\-chorus** _0..4_] [**-l|-\-level** _0..32767_] [**-g|-\-gain** _0..100_]  _midi_file_
+| **sonivoxrender** [**-h|-\-help**] [**-v|-\-version**] [**-d|-\-dls** _file.dls_] [**-r|-\-reverb** _0..4_] [**-w|-\-wet** _0..32767_] [**-n|-\-dry** _0..32767_] [**-c|-\-chorus** _0..4_] [**-l|-\-level** _0..32767_] [**-g|-\-gain** _0..100_] [**-V|-\-Verbosity** _0..5_]  _midi_file_
 
 # DESCRIPTION
 
@@ -52,6 +52,10 @@ It reads .MID (Standard MIDI Files) file format, and writes an audio stream to t
 
 :   Master gain between 0 and 100, default is 90 (10 dB below maximum).
 
+-V, -\-Verbosity _verbosity_
+
+:   Verbosity level between 0 and 5, where 0=no, 1..5=severity levels.
+
 ## Arguments
 
 _midi_file_

example/sonivoxrender.c

@@ -36,6 +36,12 @@ EAS_I32 reverb_dry = 0;
 EAS_I32 chorus_type = 0;
 EAS_I32 chorus_level = 32767;
 EAS_DATA_HANDLE mEASDataHandle = NULL;
+int verbosity =
+#ifdef NDEBUG
+    _EAS_SEVERITY_WARNING;
+#else
+    _EAS_SEVERITY_INFO;
+#endif
 const S_EAS_LIB_CONFIG *mEASConfig = NULL;
 char sLibrary_version[16];
 
@@ -95,11 +101,7 @@ int initializeLibrary(void)
 #endif
 
     EAS_SetDebugFile(stderr, 1);
-#ifdef NDEBUG
-    EAS_SetDebugLevel(_EAS_SEVERITY_WARNING);
-#else
-    EAS_SetDebugLevel(_EAS_SEVERITY_INFO);
-#endif
+    EAS_SetDebugLevel(verbosity);
 
     EAS_RESULT result = EAS_Init(&mEASDataHandle);
     if (result != EAS_SUCCESS) {
@@ -352,34 +354,39 @@ int main (int argc, char **argv)
                                            {"chorus", required_argument, 0, 'c'},
                                            {"level", required_argument, 0, 'l'},
                                            {"gain", required_argument, 0, 'g'},
+                                           {"Verbosity", required_argument, 0, 'V'},
                                            {0, 0, 0, 0}};
 
     while (1) {
-        c = getopt_long(argc, argv, "hvd:r:w:n:c:l:g:", long_options, &option_index);
+        c = getopt_long(argc, argv, "hvd:r:w:n:c:l:g:V:", long_options, &option_index);
 
         if (c == -1) {
             break;
         }
 
         switch (c) {
         case 'h':
-            fprintf(stderr,
-                    "Usage: %s [-h|--help] [-v|--version] [-d|--dls file.dls] [-r|--reverb 0..4] "
-                    "[-w|--wet 0..32767] [-n|--dry 0..32767] "
-                    "[-c|--chorus 0..4] [-l|--level 0..32767] [-g|--gain 0..100] file.mid ...\n"
-                    "Render standard MIDI files into raw PCM audio.\n"
-                    "Options:\n"
-                    "\t-h, --help\t\tthis help message.\n"
-                    "\t-v, --version\t\tsonivox version.\n"
-                    "\t-d, --dls file.dls\tDLS soundfont.\n"
-                    "\t-r, --reverb n\t\treverb preset: 0=no, 1=large hall, 2=hall, 3=chamber, "
-                    "4=room.\n"
-                    "\t-w, --wet n\t\treverb wet: 0..32767.\n"
-                    "\t-n, --dry n\t\treverb dry: 0..32767.\n"
-                    "\t-c, --chorus n\t\tchorus preset: 0=no, 1..4=presets.\n"
-                    "\t-l, --level n\t\tchorus level: 0..32767.\n"
-                    "\t-g, --gain n\t\tmaster gain: 0..100.\n",
-                    argv[0]);
+            fprintf(
+                stderr,
+                "Usage: %s [-h|--help] [-v|--version] [-d|--dls file.dls] [-r|--reverb 0..4] "
+                "[-w|--wet 0..32767] [-n|--dry 0..32767] "
+                "[-c|--chorus 0..4] [-l|--level 0..32767] [-g|--gain 0..100] [-V|--Verbosity "
+                "0..5] file.mid ...\n"
+                "Render standard MIDI files into raw PCM audio.\n"
+                "Options:\n"
+                "\t-h, --help\t\tthis help message.\n"
+                "\t-v, --version\t\tsonivox version.\n"
+                "\t-d, --dls file.dls\tDLS soundfont.\n"
+                "\t-r, --reverb n\t\treverb preset: 0=no, 1=large hall, 2=hall, 3=chamber, "
+                "4=room.\n"
+                "\t-w, --wet n\t\treverb wet: 0..32767.\n"
+                "\t-n, --dry n\t\treverb dry: 0..32767.\n"
+                "\t-c, --chorus n\t\tchorus preset: 0=no, 1..4=presets.\n"
+                "\t-l, --level n\t\tchorus level: 0..32767.\n"
+                "\t-g, --gain n\t\tmaster gain: 0..100.\n"
+                "\t-V, --Verbosity n\tVerbosity: 0=no, 1=fatals, 2=errors, 3=warnings, 4=infos, "
+                "5=details\n",
+                argv[0]);
             return EXIT_FAILURE;
         case 'v':
             fprintf(stderr, "version: %s\n", sLibrary_version);
@@ -429,6 +436,13 @@ int main (int argc, char **argv)
                 return EXIT_FAILURE;
             }
             break;
+        case 'V':
+            verbosity = atoi(optarg);
+            if ((verbosity < 0) || (verbosity > 5)) {
+                fprintf(stderr, "invalid verbosity level: %d\n", verbosity);
+                return EXIT_FAILURE;
+            }
+            break;
         case '?':
             fprintf(stderr, "unknown option %c\n", optopt);
             return EXIT_FAILURE;