From bc2867a7fc2f19332d1a196bfaa2360ae4b4f6c8 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Fri, 1 Jul 2016 12:11:55 +0200 Subject: [PATCH] missed these in commit (nw) --- src/devices/machine/matsucd.cpp | 4 ++-- src/devices/sound/ymf262.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/devices/machine/matsucd.cpp b/src/devices/machine/matsucd.cpp index 922f117d188..d9d8ec47b27 100644 --- a/src/devices/machine/matsucd.cpp +++ b/src/devices/machine/matsucd.cpp @@ -71,7 +71,7 @@ void matsucd_init( cdrom_image_device *cdrom_device, const char *cdda_tag ) cd.cdrom = cdrom_device->get_cdrom_file(); cd.cdda = cdrom_device->machine().device(cdda_tag); - cd.frame_timer = cdrom_device->machine().scheduler().timer_alloc(FUNC(matsu_subcode_proc)); + cd.frame_timer = cdrom_device->machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(matsu_subcode_proc),&cdrom_device->machine())); cd.stch_signal = 1; } @@ -269,7 +269,7 @@ static void matsucd_set_status( running_machine &machine, UINT8 status ) if ( cd.stch_signal != 0 ) { update_status_changed( machine, 0 ); - machine.scheduler().timer_set(attotime::from_msec(1), FUNC(matsucd_set_status_end)); + machine.scheduler().timer_set(attotime::from_msec(1), timer_expired_delegate(FUNC(matsucd_set_status_end),&machine)); } } } diff --git a/src/devices/sound/ymf262.cpp b/src/devices/sound/ymf262.cpp index 912b70e530e..b7c2aaf4b64 100644 --- a/src/devices/sound/ymf262.cpp +++ b/src/devices/sound/ymf262.cpp @@ -2269,7 +2269,7 @@ static int OPL3_LockTable(device_t *device) { cymfile = fopen("ymf262_.cym","wb"); if (cymfile) - device->machine().scheduler().timer_pulse ( attotime::from_hz(110), FUNC(cymfile_callback)); /*110 Hz pulse timer*/ + device->machine().scheduler().timer_pulse ( attotime::from_hz(110), timer_expired_delegate(FUNC(cymfile_callback),&device->machine())); /*110 Hz pulse timer*/ else device->logerror("Could not create ymf262_.cym file\n"); }