From 39adce26ad639f180b3cb5742215e44c322bf015 Mon Sep 17 00:00:00 2001 From: Wohlstand Date: Tue, 31 Oct 2017 15:47:18 +0300 Subject: Small clean-up of MIDI player --- utils/midiplay/adlmidiplay.cpp | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) (limited to 'utils/midiplay/adlmidiplay.cpp') diff --git a/utils/midiplay/adlmidiplay.cpp b/utils/midiplay/adlmidiplay.cpp index 8553213..8a94761 100644 --- a/utils/midiplay/adlmidiplay.cpp +++ b/utils/midiplay/adlmidiplay.cpp @@ -198,7 +198,7 @@ int main(int argc, char **argv) adl_setLoopEnabled(myDevice, recordWave ? 0 : loopEnabled); - std::fprintf(stdout, " - Use %s OPL3 Emulator\n", adl_emulatorName()); + std::fprintf(stdout, " - %s OPL3 Emulator in use\n", adl_emulatorName()); if(!recordWave) { @@ -244,24 +244,16 @@ int main(int argc, char **argv) } } + int numOfChips = 4; if(argc >= 4) + numOfChips = std::atoi(argv[3]); + + if(adl_setNumCards(myDevice, numOfChips) != 0) { - if(adl_setNumCards(myDevice, std::atoi(argv[3])) != 0) - { - printError(adl_errorString()); - return 1; - } - std::fprintf(stdout, " - Number of cards %s\n", argv[3]); - } - else - { - // 4 chips by default - if(adl_setNumCards(myDevice, 4) != 0) - { - printError(adl_errorString()); - return 1; - } + printError(adl_errorString()); + return 1; } + std::fprintf(stdout, " - Number of chips %d\n", numOfChips); if(argc >= 5) { -- cgit v1.2.3