From 2b0cfc0b3a05fc93c8d6fd9aab7b9e59bbd2c11c Mon Sep 17 00:00:00 2001
From: Wohlstand <admin@wohlnet.ru>
Date: Tue, 31 Oct 2017 13:04:45 +0300
Subject: Added ability to print name of currently using OPL3 emulator

---
 utils/midiplay/adlmidiplay.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'utils/midiplay/adlmidiplay.cpp')

diff --git a/utils/midiplay/adlmidiplay.cpp b/utils/midiplay/adlmidiplay.cpp
index a095390..8553213 100644
--- a/utils/midiplay/adlmidiplay.cpp
+++ b/utils/midiplay/adlmidiplay.cpp
@@ -197,13 +197,15 @@ int main(int argc, char **argv)
     //Turn loop on/off (for WAV recording loop must be disabled!)
     adl_setLoopEnabled(myDevice, recordWave ? 0 : loopEnabled);
 
+
+    std::fprintf(stdout, " - Use %s OPL3 Emulator\n", adl_emulatorName());
+
     if(!recordWave)
     {
         // Set up SDL
         if(SDL_OpenAudio(&spec, &obtained) < 0)
         {
             std::fprintf(stderr, "\nERROR: Couldn't open audio: %s\n\n", SDL_GetError());
-            std::fflush(stderr);
             //return 1;
         }
         if(spec.samples != obtained.samples)
@@ -212,7 +214,6 @@ int main(int argc, char **argv)
                                  " - Audio obtained (samples=%u,rate=%u,channels=%u)\n",
                          spec.samples,    spec.freq,    spec.channels,
                          obtained.samples, obtained.freq, obtained.channels);
-            std::fflush(stderr);
         }
     }
 
@@ -227,7 +228,6 @@ int main(int argc, char **argv)
                 return 1;
             }
             std::fprintf(stdout, " - Use embedded bank #%d [%s]\n", bankno, adl_getBankNames()[bankno]);
-            std::fflush(stdout);
         }
         else
         {
@@ -241,7 +241,6 @@ int main(int argc, char **argv)
                 return 1;
             }
             std::fprintf(stdout, "OK!\n");
-            std::fflush(stdout);
         }
     }
 
@@ -280,6 +279,8 @@ int main(int argc, char **argv)
         return 2;
     }
 
+    std::fflush(stdout);
+
     signal(SIGINT, sighandler);
     signal(SIGTERM, sighandler);
     #ifndef _WIN32
-- 
cgit v1.2.3