Merge branch 'master' into stable

1 files changed, 9 insertions, 12 deletions

diff --git a/src/chips/nuked_opl3.h b/src/chips/nuked_opl3.h
index ceb1dfd..25d9ed5 100644
--- a/src/chips/nuked_opl3.h
+++ b/src/chips/nuked_opl3.h
@@ -3,23 +3,20 @@
 
 #include "opl_chip_base.h"
 
-class NukedOPL3 final : public OPLChipBase
+class NukedOPL3 final : public OPLChipBaseT<NukedOPL3>
 {
     void *m_chip;
 public:
     NukedOPL3();
-    NukedOPL3(const NukedOPL3 &c);
-    virtual ~NukedOPL3() override;
+    ~NukedOPL3() override;
 
-    virtual void setRate(uint32_t rate) override;
-    virtual void reset() override;
-    virtual void reset(uint32_t rate) override;
-    virtual void writeReg(uint16_t addr, uint8_t data) override;
-    virtual int generate(int16_t *output, size_t frames) override;
-    virtual int generateAndMix(int16_t *output, size_t frames) override;
-    virtual int generate32(int32_t *output, size_t frames) override;
-    virtual int generateAndMix32(int32_t *output, size_t frames) override;
-    virtual const char *emulatorName() override;
+    void setRate(uint32_t rate) override;
+    void reset() override;
+    void writeReg(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