Chipset: Synchronize code with OPL3-BE

11 files changed, 35 insertions, 0 deletions

diff --git a/src/chips/dosbox_opl3.cpp b/src/chips/dosbox_opl3.cpp
index a3d5351..6d94eac 100644
--- a/src/chips/dosbox_opl3.cpp
+++ b/src/chips/dosbox_opl3.cpp
@@ -83,3 +83,8 @@ const char *DosBoxOPL3::emulatorName()
 {
     return "DOSBox 0.74-r4111 OPL3";
 }
+
+OPLChipBase::ChipType DosBoxOPL3::chipType()
+{
+    return CHIPTYPE_OPL3;
+}
diff --git a/src/chips/dosbox_opl3.h b/src/chips/dosbox_opl3.h
index ca3269c..58082b4 100644
--- a/src/chips/dosbox_opl3.h
+++ b/src/chips/dosbox_opl3.h
@@ -41,6 +41,7 @@ public:
     void nativePostGenerate() override {}
     void nativeGenerateN(int16_t *output, size_t frames) override;
     const char *emulatorName() override;
+    ChipType chipType() override;
 };
 
 #endif // DOSBOX_OPL3_H
diff --git a/src/chips/java_opl3.cpp b/src/chips/java_opl3.cpp
index ec8c6c7..5acd6e5 100644
--- a/src/chips/java_opl3.cpp
+++ b/src/chips/java_opl3.cpp
@@ -110,3 +110,8 @@ const char *JavaOPL3::emulatorName()
 {
     return "Java 1.0.6 OPL3";
 }
+
+OPLChipBase::ChipType JavaOPL3::chipType()
+{
+    return CHIPTYPE_OPL3;
+}
diff --git a/src/chips/java_opl3.h b/src/chips/java_opl3.h
index edadd88..ccaa4de 100644
--- a/src/chips/java_opl3.h
+++ b/src/chips/java_opl3.h
@@ -39,6 +39,7 @@ public:
     void nativePostGenerate() override {}
     void nativeGenerateN(int16_t *output, size_t frames) override;
     const char *emulatorName() override;
+    ChipType chipType() override;
 };
 
 #endif // JAVA_OPL3_H
diff --git a/src/chips/nuked_opl3.cpp b/src/chips/nuked_opl3.cpp
index ad379eb..a83ef8c 100644
--- a/src/chips/nuked_opl3.cpp
+++ b/src/chips/nuked_opl3.cpp
@@ -73,3 +73,8 @@ const char *NukedOPL3::emulatorName()
 {
     return "Nuked OPL3 (v 1.8)";
 }
+
+OPLChipBase::ChipType NukedOPL3::chipType()
+{
+    return CHIPTYPE_OPL3;
+}
diff --git a/src/chips/nuked_opl3.h b/src/chips/nuked_opl3.h
index d9c0e76..8764dd0 100644
--- a/src/chips/nuked_opl3.h
+++ b/src/chips/nuked_opl3.h
@@ -39,6 +39,7 @@ public:
     void nativePostGenerate() override {}
     void nativeGenerate(int16_t *frame) override;
     const char *emulatorName() override;
+    ChipType chipType() override;
 };
 
 #endif // NUKED_OPL3_H
diff --git a/src/chips/nuked_opl3_v174.cpp b/src/chips/nuked_opl3_v174.cpp
index a15e1ef..a3fb023 100644
--- a/src/chips/nuked_opl3_v174.cpp
+++ b/src/chips/nuked_opl3_v174.cpp
@@ -73,3 +73,8 @@ const char *NukedOPL3v174::emulatorName()
 {
     return "Nuked OPL3 (v 1.7.4)";
 }
+
+OPLChipBase::ChipType NukedOPL3v174::chipType()
+{
+    return CHIPTYPE_OPL3;
+}
diff --git a/src/chips/nuked_opl3_v174.h b/src/chips/nuked_opl3_v174.h
index bba7afd..63abb15 100644
--- a/src/chips/nuked_opl3_v174.h
+++ b/src/chips/nuked_opl3_v174.h
@@ -39,6 +39,7 @@ public:
     void nativePostGenerate() override {}
     void nativeGenerate(int16_t *frame) override;
     const char *emulatorName() override;
+    ChipType chipType() override;
 };
 
 #endif // NUKED_OPL3174_H
diff --git a/src/chips/opal_opl3.cpp b/src/chips/opal_opl3.cpp
index 3c1cbb7..260743f 100644
--- a/src/chips/opal_opl3.cpp
+++ b/src/chips/opal_opl3.cpp
@@ -79,3 +79,8 @@ const char *OpalOPL3::emulatorName()
 {
     return "Opal OPL3";
 }
+
+OPLChipBase::ChipType OpalOPL3::chipType()
+{
+    return CHIPTYPE_OPL3;
+}
diff --git a/src/chips/opal_opl3.h b/src/chips/opal_opl3.h
index ca14f3a..0ff07c5 100644
--- a/src/chips/opal_opl3.h
+++ b/src/chips/opal_opl3.h
@@ -39,6 +39,7 @@ public:
     void nativePostGenerate() override {}
     void nativeGenerate(int16_t *frame) override;
     const char *emulatorName() override;
+    ChipType chipType() override;
 };
 
 #endif // NUKED_OPL3_H
diff --git a/src/chips/opl_chip_base.h b/src/chips/opl_chip_base.h
index 006e222..980e23b 100644
--- a/src/chips/opl_chip_base.h
+++ b/src/chips/opl_chip_base.h
@@ -39,6 +39,10 @@ class OPLChipBase
 {
 public:
     enum { nativeRate = 49716 };
+    enum ChipType
+    {
+        CHIPTYPE_OPL3 = 0, CHIPTYPE_OPL2 = 1
+    };
 protected:
     uint32_t m_id;
     uint32_t m_rate;
@@ -74,6 +78,7 @@ public:
     virtual void generateAndMix32(int32_t *output, size_t frames) = 0;
 
     virtual const char* emulatorName() = 0;
+    virtual ChipType chipType() = 0;
 private:
     OPLChipBase(const OPLChipBase &c);
     OPLChipBase &operator=(const OPLChipBase &c);