--- nono/vm/adpcm.cpp	2026/04/29 17:05:28	1.1.1.4
+++ 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"
@@ -29,16 +30,13 @@ ADPCMDevice::~ADPCMDevice()
 bool
 ADPCMDevice::Init()
 {
-	if (inherited::Init() == false) {
-		return false;
-	}
-
 	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;
 }
@@ -158,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) {