Merge pull request #205 from jpcima/opal

support the Opal emulator

4 files changed, 136 insertions, 0 deletions

diff --git a/src/adlmidi_opl3.cpp b/src/adlmidi_opl3.cpp
index 8d97442..7101319 100644
--- a/src/adlmidi_opl3.cpp
+++ b/src/adlmidi_opl3.cpp
@@ -43,6 +43,11 @@ static const unsigned OPLBase = 0x388;
 #   ifndef ADLMIDI_DISABLE_DOSBOX_EMULATOR
 #       include "chips/dosbox_opl3.h"
 #   endif
+
+// Opal emulator
+#   ifndef ADLMIDI_DISABLE_OPAL_EMULATOR
+#       include "chips/opal_opl3.h"
+#   endif
 #endif
 
 static const unsigned adl_emulatorSupport = 0
@@ -54,6 +59,10 @@ static const unsigned adl_emulatorSupport = 0
 #   ifndef ADLMIDI_DISABLE_DOSBOX_EMULATOR
     | (1u << ADLMIDI_EMU_DOSBOX)
 #   endif
+
+#   ifndef ADLMIDI_DISABLE_OPAL_EMULATOR
+    | (1u << ADLMIDI_EMU_OPAL)
+#   endif
 #endif
 ;
 
@@ -767,6 +776,11 @@ void OPL3::reset(int emulator, unsigned long PCM_RATE, void *audioTickHandler)
             chip = new DosBoxOPL3;
             break;
 #endif
+#ifndef ADLMIDI_DISABLE_OPAL_EMULATOR
+        case ADLMIDI_EMU_OPAL:
+            chip = new OpalOPL3;
+            break;
+#endif
         }
         m_chips[i].reset(chip);
         chip->setChipId((uint32_t)i);
diff --git a/src/chips/opal/README b/src/chips/opal/README
new file mode 100644
index 0000000..0fe8105
--- /dev/null
+++ b/src/chips/opal/README
@@ -0,0 +1,2 @@
+Copy opal.cpp here to make this emulator available.
+This is not distributed with the software while the license is undetermined.
diff --git a/src/chips/opal_opl3.cpp b/src/chips/opal_opl3.cpp
new file mode 100644
index 0000000..895e7e0
--- /dev/null
+++ b/src/chips/opal_opl3.cpp
@@ -0,0 +1,76 @@
+/*
+ * Interfaces over Yamaha OPL3 (YMF262) chip emulators
+ *
+ * Copyright (c) 2017-2019 Vitaly Novichkov (Wohlstand)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "opal_opl3.h"
+#include "opal/opal.cpp"
+#include <new>
+#include <cstring>
+
+OpalOPL3::OpalOPL3() :
+    OPLChipBaseT()
+{
+    m_chip = new Opal(m_rate);
+    setRate(m_rate);
+}
+
+OpalOPL3::~OpalOPL3()
+{
+    Opal *chip_r = reinterpret_cast<Opal *>(m_chip);
+    delete chip_r;
+}
+
+void OpalOPL3::setRate(uint32_t rate)
+{
+    OPLChipBaseT::setRate(rate);
+    Opal *chip_r = reinterpret_cast<Opal *>(m_chip);
+    chip_r->~Opal();
+    new (chip_r) Opal(effectiveRate());
+}
+
+void OpalOPL3::reset()
+{
+    OPLChipBaseT::reset();
+    Opal *chip_r = reinterpret_cast<Opal *>(m_chip);
+    chip_r->~Opal();
+    new (chip_r) Opal(effectiveRate());
+}
+
+void OpalOPL3::writeReg(uint16_t addr, uint8_t data)
+{
+    Opal *chip_r = reinterpret_cast<Opal *>(m_chip);
+    chip_r->Port(addr, data);
+}
+
+void OpalOPL3::writePan(uint16_t addr, uint8_t data)
+{
+    //Opal *chip_r = reinterpret_cast<Opal *>(m_chip);
+    // TODO full panning
+}
+
+void OpalOPL3::nativeGenerate(int16_t *frame)
+{
+    Opal *chip_r = reinterpret_cast<Opal *>(m_chip);
+    chip_r->Sample(&frame[0], &frame[1]);
+}
+
+const char *OpalOPL3::emulatorName()
+{
+    return "Opal OPL3";
+}
diff --git a/src/chips/opal_opl3.h b/src/chips/opal_opl3.h
new file mode 100644
index 0000000..98d4262
--- /dev/null
+++ b/src/chips/opal_opl3.h
@@ -0,0 +1,44 @@
+/*
+ * Interfaces over Yamaha OPL3 (YMF262) chip emulators
+ *
+ * Copyright (c) 2017-2019 Vitaly Novichkov (Wohlstand)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef OPAL_OPL3_H
+#define OPAL_OPL3_H
+
+#include "opl_chip_base.h"
+
+class OpalOPL3 final : public OPLChipBaseT<OpalOPL3>
+{
+    void *m_chip;
+public:
+    OpalOPL3();
+    ~OpalOPL3() override;
+
+    bool canRunAtPcmRate() const override { return true; }
+    void setRate(uint32_t rate) override;
+    void reset() override;
+    void writeReg(uint16_t addr, uint8_t data) override;
+    void writePan(uint16_t addr, uint8_t data) override;
+    void nativePreGenerate() override {}
+    void nativePostGenerate() override {}
+    void nativeGenerate(int16_t *frame) override;
+    const char *emulatorName() override;
+};
+
+#endif // NUKED_OPL3_H