--- nono/vm/adpcm.cpp 2026/04/29 17:05:37 1.1.1.5 +++ nono/vm/adpcm.cpp 2026/04/29 17:05:49 1.1.1.6 @@ -10,6 +10,7 @@ #include "adpcm.h" #include "dmac.h" +#include "event.h" #include "mpu.h" #include "pio.h" #include "scheduler.h" @@ -32,9 +33,10 @@ ADPCMDevice::Init() dmac = GetDMACDevice(); ppi = GetPPIDevice(); - event.func = ToEventCallback(&ADPCMDevice::EventCallback); - event.SetName("ADPCM"); - scheduler->RegistEvent(event); + auto evman = GetEventManager(); + event = evman->Regist(this, + ToEventCallback(&ADPCMDevice::EventCallback), + "ADPCM"); return true; } @@ -154,13 +156,13 @@ ADPCMDevice::StartPlay() playing = true; dmac->AssertREQ(3); - event.time = div / clk; + event->time = div / clk; scheduler->StartEvent(event); } // イベント void -ADPCMDevice::EventCallback(Event& ev) +ADPCMDevice::EventCallback(Event *ev) { // XXX 適当 if (playing) {