diff options
| -rw-r--r-- | include/adlmidi.h | 3 | ||||
| -rw-r--r-- | src/adlmidi.cpp | 9 | ||||
| -rw-r--r-- | utils/midiplay/adlmidiplay.cpp | 9 |
3 files changed, 17 insertions, 4 deletions
diff --git a/include/adlmidi.h b/include/adlmidi.h index 1279e9f..634a22a 100644 --- a/include/adlmidi.h +++ b/include/adlmidi.h @@ -86,6 +86,9 @@ extern int adl_openBankFile(struct ADL_MIDIPlayer *device, char *filePath); extern int adl_openBankData(struct ADL_MIDIPlayer *device, void *mem, long size); +/*Returns name of currently used OPL3 emulator*/ +extern const char *adl_emulatorName(); + /*Returns string which contains last error message*/ extern const char *adl_errorString(); diff --git a/src/adlmidi.cpp b/src/adlmidi.cpp index 7aa9e8b..0f0353c 100644 --- a/src/adlmidi.cpp +++ b/src/adlmidi.cpp @@ -265,6 +265,15 @@ ADLMIDI_EXPORT int adl_openData(ADL_MIDIPlayer *device, void *mem, long size) } +ADLMIDI_EXPORT const char *adl_emulatorName() +{ + #ifdef ADLMIDI_USE_DOSBOX_OPL + return "DosBox"; + #else + return "Nuked"; + #endif +} + ADLMIDI_EXPORT const char *adl_errorString() { return ADLMIDI_ErrorString.c_str(); 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 |