aboutsummaryrefslogtreecommitdiff
path: root/src/adlmidi.cpp
diff options
context:
space:
mode:
authorVitaly Novichkov <admin@wohlnet.ru>2018-09-30 18:58:13 +0300
committerVitaly Novichkov <admin@wohlnet.ru>2018-09-30 18:58:13 +0300
commit77e8b86be524edf42a7070e2b7a1f6f67d7cfaa8 (patch)
tree82e77298d966a3295c88479ac3ae1abc5a1f84f8 /src/adlmidi.cpp
parent10c6c335697cd7e570d06089c61c1fae8acb29e1 (diff)
downloadlibADLMIDI-77e8b86be524edf42a7070e2b7a1f6f67d7cfaa8.tar.gz
libADLMIDI-77e8b86be524edf42a7070e2b7a1f6f67d7cfaa8.tar.bz2
libADLMIDI-77e8b86be524edf42a7070e2b7a1f6f67d7cfaa8.zip
Move "MaxChips" constant macro into adlmidi_private.hpp
Diffstat (limited to 'src/adlmidi.cpp')
-rw-r--r--src/adlmidi.cpp12
1 files changed, 2 insertions, 10 deletions
diff --git a/src/adlmidi.cpp b/src/adlmidi.cpp
index d0aa85f..12d0e68 100644
--- a/src/adlmidi.cpp
+++ b/src/adlmidi.cpp
@@ -23,14 +23,6 @@
#include "adlmidi_private.hpp"
-#ifdef ADLMIDI_HW_OPL
-#define MaxChips 1
-#define MaxChips_STR "1" //Why not just "#MaxCards" ? Watcom fails to pass this with "syntax error" :-P
-#else
-#define MaxChips 100
-#define MaxChips_STR "100"
-#endif
-
/* Unify MIDI player casting and interface between ADLMIDI and OPNMIDI */
#define GET_MIDI_PLAYER(device) reinterpret_cast<MIDIplay *>((device)->adl_midiPlayer)
typedef MIDIplay MidiPlayer;
@@ -107,9 +99,9 @@ ADLMIDI_EXPORT int adl_setNumChips(ADL_MIDIPlayer *device, int numChips)
#else
play->m_setup.numChips = static_cast<unsigned int>(numChips);
#endif
- if(play->m_setup.numChips < 1 || play->m_setup.numChips > MaxChips)
+ if(play->m_setup.numChips < 1 || play->m_setup.numChips > ADL_MAX_CHIPS)
{
- play->setErrorString("number of chips may only be 1.." MaxChips_STR ".\n");
+ play->setErrorString("number of chips may only be 1.." ADL_MAX_CHIPS_STR ".\n");
return -1;
}