diff options
| author | Vitaly Novichkov <admin@wohlnet.ru> | 2019-02-24 14:01:19 +0300 |
|---|---|---|
| committer | Vitaly Novichkov <admin@wohlnet.ru> | 2019-02-24 14:01:19 +0300 |
| commit | eaca4621d223686678bd0ebcb17ab1b524f49c63 (patch) | |
| tree | 9b5a7564d8fb8f5f74893ad192887c2925ad8cb5 | |
| parent | cb465d27025c3fc594025fdefd1f83bf642b61f6 (diff) | |
| download | libADLMIDI-eaca4621d223686678bd0ebcb17ab1b524f49c63.tar.gz libADLMIDI-eaca4621d223686678bd0ebcb17ab1b524f49c63.tar.bz2 libADLMIDI-eaca4621d223686678bd0ebcb17ab1b524f49c63.zip | |
JavaOPL3: Make sure no conflict with original copy linked
| -rw-r--r-- | src/chips/java/JavaOPL3.hpp | 3 | ||||
| -rw-r--r-- | src/chips/java_opl3.cpp | 14 |
2 files changed, 9 insertions, 8 deletions
diff --git a/src/chips/java/JavaOPL3.hpp b/src/chips/java/JavaOPL3.hpp index df71cab..e9772d6 100644 --- a/src/chips/java/JavaOPL3.hpp +++ b/src/chips/java/JavaOPL3.hpp @@ -60,7 +60,8 @@ #define CENTER_PANNING_POWER 0.70710678118 /* [RH] volume at center for EQP */ #define VOLUME_MUL 0.3333 -namespace JavaOPL +/* libADLMIDI: Renamed from JavaOPL3 into to prevent symbol conflicting with original version linked */ +namespace ADL_JavaOPL3 { /* libADLMIDI: random generator */ diff --git a/src/chips/java_opl3.cpp b/src/chips/java_opl3.cpp index a20a67d..e29c6d0 100644 --- a/src/chips/java_opl3.cpp +++ b/src/chips/java_opl3.cpp @@ -30,21 +30,21 @@ JavaOPL3::JavaOPL3() : OPLChipBaseBufferedT(), - m_chip(new JavaOPL::OPL3(true)) + m_chip(new ADL_JavaOPL3::OPL3(true)) { reset(); } JavaOPL3::~JavaOPL3() { - JavaOPL::OPL3 *chip_r = reinterpret_cast<JavaOPL::OPL3 *>(m_chip); + ADL_JavaOPL3::OPL3 *chip_r = reinterpret_cast<ADL_JavaOPL3::OPL3 *>(m_chip); delete chip_r; } void JavaOPL3::setRate(uint32_t rate) { OPLChipBaseBufferedT::setRate(rate); - JavaOPL::OPL3 *chip_r = reinterpret_cast<JavaOPL::OPL3 *>(m_chip); + ADL_JavaOPL3::OPL3 *chip_r = reinterpret_cast<ADL_JavaOPL3::OPL3 *>(m_chip); chip_r->Reset(); float pan = sinf((float)M_SQRT1_2); @@ -55,19 +55,19 @@ void JavaOPL3::setRate(uint32_t rate) void JavaOPL3::reset() { OPLChipBaseBufferedT::reset(); - JavaOPL::OPL3 *chip_r = reinterpret_cast<JavaOPL::OPL3 *>(m_chip); + ADL_JavaOPL3::OPL3 *chip_r = reinterpret_cast<ADL_JavaOPL3::OPL3 *>(m_chip); chip_r->Reset(); } void JavaOPL3::writeReg(uint16_t addr, uint8_t data) { - JavaOPL::OPL3 *chip_r = reinterpret_cast<JavaOPL::OPL3 *>(m_chip); + ADL_JavaOPL3::OPL3 *chip_r = reinterpret_cast<ADL_JavaOPL3::OPL3 *>(m_chip); chip_r->WriteReg(addr, data); } void JavaOPL3::writePan(uint16_t addr, uint8_t data) { - JavaOPL::OPL3 *chip_r = reinterpret_cast<JavaOPL::OPL3 *>(m_chip); + ADL_JavaOPL3::OPL3 *chip_r = reinterpret_cast<ADL_JavaOPL3::OPL3 *>(m_chip); unsigned high = (addr >> 8) & 0x01; unsigned regm = addr & 0xff; @@ -80,7 +80,7 @@ void JavaOPL3::writePan(uint16_t addr, uint8_t data) void JavaOPL3::nativeGenerateN(int16_t *output, size_t frames) { - JavaOPL::OPL3 *chip_r = reinterpret_cast<JavaOPL::OPL3 *>(m_chip); + ADL_JavaOPL3::OPL3 *chip_r = reinterpret_cast<ADL_JavaOPL3::OPL3 *>(m_chip); enum { maxframes = 256 }; |