diff options
| author | Vitaly Novichkov <admin@wohlnet.ru> | 2018-06-19 15:04:50 +0300 |
|---|---|---|
| committer | Vitaly Novichkov <admin@wohlnet.ru> | 2018-06-19 15:04:50 +0300 |
| commit | c0873278718da57ff19194377a35601027926c5f (patch) | |
| tree | 6fca461d067a1e615788cecf7a74c175f0033fc8 /utils/midiplay | |
| parent | 5a194eb263125e5505cca3ec0256c7efa348eaa4 (diff) | |
| parent | 1026ecd3fd8dc865fb3a85ab4a130d9d1b494fd9 (diff) | |
| download | libADLMIDI-c0873278718da57ff19194377a35601027926c5f.tar.gz libADLMIDI-c0873278718da57ff19194377a35601027926c5f.tar.bz2 libADLMIDI-c0873278718da57ff19194377a35601027926c5f.zip | |
Merge branch 'master' into stable
Diffstat (limited to 'utils/midiplay')
| -rw-r--r-- | utils/midiplay/adlmidiplay.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/utils/midiplay/adlmidiplay.cpp b/utils/midiplay/adlmidiplay.cpp index a591626..8bffc50 100644 --- a/utils/midiplay/adlmidiplay.cpp +++ b/utils/midiplay/adlmidiplay.cpp @@ -320,6 +320,8 @@ int main(int argc, char **argv) #endif #ifndef HARDWARE_OPL3 int emulator = ADLMIDI_EMU_NUKED; + #endif + #if !defined(HARDWARE_OPL3) && !defined(OUTPUT_WAVE_ONLY) g_audioFormat.type = ADLMIDI_SampleType_S16; g_audioFormat.containerSize = sizeof(Sint16); g_audioFormat.sampleOffset = sizeof(Sint16) * 2; @@ -334,7 +336,7 @@ int main(int argc, char **argv) else if(!std::strcmp("-v", argv[2])) adl_setHVibrato(myDevice, 1);//Force turn on deep vibrato - #ifndef OUTPUT_WAVE_ONLY + #if !defined(OUTPUT_WAVE_ONLY) && !defined(HARDWARE_OPL3) else if(!std::strcmp("-w", argv[2])) { //Current Wave output implementation allows only SINT16 output @@ -402,6 +404,7 @@ int main(int argc, char **argv) adl_switchEmulator(myDevice, emulator); #endif + std::fprintf(stdout, " - Library version %s\n", adl_linkedLibraryVersion()); #ifdef HARDWARE_OPL3 std::fprintf(stdout, " - Hardware OPL3 chip in use\n"); #else |