aboutsummaryrefslogtreecommitdiff
path: root/src/adlmidi_opl3.cpp
diff options
context:
space:
mode:
authorVitaly Novichkov <Wohlstand@users.noreply.github.com>2019-02-24 03:27:23 +0300
committerGitHub <noreply@github.com>2019-02-24 03:27:23 +0300
commit48dabfa6f8efc25910eb73bfdcb024dd439dd2fd (patch)
treec2c1a351daa89940713a58e1920c661cd93d5716 /src/adlmidi_opl3.cpp
parent8782feff7a55ea3a7ab1626dfd519a19bf54f959 (diff)
parent48751ca040600d80e92deecbabe61804e01a8ae7 (diff)
downloadlibADLMIDI-48dabfa6f8efc25910eb73bfdcb024dd439dd2fd.tar.gz
libADLMIDI-48dabfa6f8efc25910eb73bfdcb024dd439dd2fd.tar.bz2
libADLMIDI-48dabfa6f8efc25910eb73bfdcb024dd439dd2fd.zip
Merge pull request #207 from jpcima/javaopl3
javaopl3 work in progress
Diffstat (limited to 'src/adlmidi_opl3.cpp')
-rw-r--r--src/adlmidi_opl3.cpp14
1 files changed, 14 insertions, 0 deletions
diff --git a/src/adlmidi_opl3.cpp b/src/adlmidi_opl3.cpp
index 7101319..a7bffc3 100644
--- a/src/adlmidi_opl3.cpp
+++ b/src/adlmidi_opl3.cpp
@@ -48,6 +48,11 @@ static const unsigned OPLBase = 0x388;
# ifndef ADLMIDI_DISABLE_OPAL_EMULATOR
# include "chips/opal_opl3.h"
# endif
+
+// Java emulator
+# ifndef ADLMIDI_DISABLE_JAVA_EMULATOR
+# include "chips/java_opl3.h"
+# endif
#endif
static const unsigned adl_emulatorSupport = 0
@@ -63,6 +68,10 @@ static const unsigned adl_emulatorSupport = 0
# ifndef ADLMIDI_DISABLE_OPAL_EMULATOR
| (1u << ADLMIDI_EMU_OPAL)
# endif
+
+# ifndef ADLMIDI_DISABLE_JAVA_EMULATOR
+ | (1u << ADLMIDI_EMU_JAVA)
+# endif
#endif
;
@@ -781,6 +790,11 @@ void OPL3::reset(int emulator, unsigned long PCM_RATE, void *audioTickHandler)
chip = new OpalOPL3;
break;
#endif
+#ifndef ADLMIDI_DISABLE_JAVA_EMULATOR
+ case ADLMIDI_EMU_JAVA:
+ chip = new JavaOPL3;
+ break;
+#endif
}
m_chips[i].reset(chip);
chip->setChipId((uint32_t)i);