Ported the "latest" YMFM changes.

To 86box.
This commit is contained in:
TC1995
2024-06-05 22:10:26 +02:00
parent a529359993
commit 0c6f54ac0e
3 changed files with 6 additions and 1 deletions

View File

@@ -485,6 +485,8 @@ public:
class ymfm_engine_callbacks class ymfm_engine_callbacks
{ {
public: public:
virtual ~ymfm_engine_callbacks() = default;
// timer callback; called by the interface when a timer fires // timer callback; called by the interface when a timer fires
virtual void engine_timer_expired(uint32_t tnum) = 0; virtual void engine_timer_expired(uint32_t tnum) = 0;
@@ -506,6 +508,7 @@ class ymfm_interface
template<typename RegisterType> friend class fm_engine_base; template<typename RegisterType> friend class fm_engine_base;
public: public:
virtual ~ymfm_interface() = default;
// the following functions must be implemented by any derived classes; the // the following functions must be implemented by any derived classes; the
// default implementations are sufficient for some minimal operation, but will // default implementations are sufficient for some minimal operation, but will
// likely need to be overridden to integrate with the outside world; they are // likely need to be overridden to integrate with the outside world; they are

View File

@@ -1518,7 +1518,7 @@ void fm_engine_base<RegisterType>::engine_timer_expired(uint32_t tnum)
for (uint32_t chnum = 0; chnum < CHANNELS; chnum++) for (uint32_t chnum = 0; chnum < CHANNELS; chnum++)
if (bitfield(RegisterType::CSM_TRIGGER_MASK, chnum)) if (bitfield(RegisterType::CSM_TRIGGER_MASK, chnum))
{ {
m_channel[chnum]->keyonoff(1, KEYON_CSM, chnum); m_channel[chnum]->keyonoff(0xf, KEYON_CSM, chnum);
m_modified_channels |= 1 << chnum; m_modified_channels |= 1 << chnum;
} }

View File

@@ -49,6 +49,8 @@ namespace ymfm
class ssg_override class ssg_override
{ {
public: public:
virtual ~ssg_override() = default;
// reset our status // reset our status
virtual void ssg_reset() = 0; virtual void ssg_reset() = 0;