summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/audio
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/audio')
-rw-r--r--src/mame/audio/8080bw.cpp6
-rw-r--r--src/mame/audio/cinemat.cpp10
-rw-r--r--src/mame/audio/mw8080bw.cpp16
-rw-r--r--src/mame/audio/n8080.cpp24
-rw-r--r--src/mame/audio/redalert.cpp10
-rw-r--r--src/mame/audio/vicdual.cpp2
6 files changed, 34 insertions, 34 deletions
diff --git a/src/mame/audio/8080bw.cpp b/src/mame/audio/8080bw.cpp
index 6add055dafb..518d1db7a0b 100644
--- a/src/mame/audio/8080bw.cpp
+++ b/src/mame/audio/8080bw.cpp
@@ -15,7 +15,7 @@
/* */
/*******************************************************/
-void _8080bw_state::machine_start_extra_8080bw_sh()
+MACHINE_START_MEMBER(_8080bw_state,extra_8080bw_sh)
{
save_item(NAME(m_port_1_last_extra));
save_item(NAME(m_port_2_last_extra));
@@ -970,7 +970,7 @@ void _8080bw_state::schaser_reinit_555_time_remain()
}
-void _8080bw_state::machine_start_schaser_sh()
+MACHINE_START_MEMBER(_8080bw_state,schaser_sh)
{
save_item(NAME(m_schaser_explosion));
save_item(NAME(m_schaser_effect_555_is_low));
@@ -980,7 +980,7 @@ void _8080bw_state::machine_start_schaser_sh()
}
-void _8080bw_state::machine_reset_schaser_sh()
+MACHINE_RESET_MEMBER(_8080bw_state,schaser_sh)
{
address_space &space = m_maincpu->space(AS_PROGRAM);
diff --git a/src/mame/audio/cinemat.cpp b/src/mame/audio/cinemat.cpp
index 18c49e95f85..171de55408f 100644
--- a/src/mame/audio/cinemat.cpp
+++ b/src/mame/audio/cinemat.cpp
@@ -1354,7 +1354,7 @@ WRITE8_MEMBER(cinemat_state::sound_output_w)
logerror("sound_output = %02X\n", data);
}
-void cinemat_state::sound_reset_demon()
+SOUND_RESET_MEMBER( cinemat_state, demon )
{
/* generic init */
sound_reset();
@@ -1408,7 +1408,7 @@ MACHINE_CONFIG_START(cinemat_state::demon_sound)
MCFG_DEVICE_ADD("ctc", Z80CTC, 3579545 /* same as "audiocpu" */)
MCFG_Z80CTC_INTR_CB(INPUTLINE("audiocpu", INPUT_LINE_IRQ0))
- set_sound_reset_cb(config, driver_callback_delegate(&sound_reset_demon, this));
+ MCFG_SOUND_RESET_OVERRIDE(cinemat_state, demon)
MCFG_DEVICE_MODIFY("outlatch")
MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, cinemat_state, demon_sound4_w))
@@ -1447,9 +1447,9 @@ WRITE8_MEMBER(cinemat_state::qb3_sound_fifo_w)
}
-void cinemat_state::sound_reset_qb3()
+SOUND_RESET_MEMBER( cinemat_state, qb3 )
{
- sound_reset_demon();
+ SOUND_RESET_CALL_MEMBER(demon);
/* this patch prevents the sound ROM from eating itself when command $0A is sent */
/* on a cube rotate */
@@ -1459,7 +1459,7 @@ void cinemat_state::sound_reset_qb3()
MACHINE_CONFIG_START(cinemat_state::qb3_sound)
demon_sound(config);
- set_sound_reset_cb(config, driver_callback_delegate(&sound_reset_qb3, this));
+ MCFG_SOUND_RESET_OVERRIDE(cinemat_state, qb3)
MCFG_DEVICE_MODIFY("outlatch")
MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(NOOP) // not mapped through LS259
diff --git a/src/mame/audio/mw8080bw.cpp b/src/mame/audio/mw8080bw.cpp
index 82676f0f53d..f4d9781f174 100644
--- a/src/mame/audio/mw8080bw.cpp
+++ b/src/mame/audio/mw8080bw.cpp
@@ -18,7 +18,7 @@
*
*************************************/
-void mw8080bw_state::sound_start_samples()
+SOUND_START_MEMBER( mw8080bw_state, samples )
{
/* setup for save states */
save_item(NAME(m_port_1_last));
@@ -145,7 +145,7 @@ static const char *const seawolf_sample_names[] =
};
MACHINE_CONFIG_START(mw8080bw_state::seawolf_audio)
- set_sound_start_cb(config, driver_callback_delegate(&sound_start_samples, this));
+ MCFG_SOUND_START_OVERRIDE(mw8080bw_state, samples)
SPEAKER(config, "mono").front_center();
MCFG_DEVICE_ADD("samples", SAMPLES)
@@ -199,7 +199,7 @@ static const char *const gunfight_sample_names[] =
MACHINE_CONFIG_START(mw8080bw_state::gunfight_audio)
- set_sound_start_cb(config, driver_callback_delegate(&sound_start_samples, this));
+ MCFG_SOUND_START_OVERRIDE(mw8080bw_state, samples)
SPEAKER(config, "lspeaker").front_left();
SPEAKER(config, "rspeaker").front_right();
@@ -1544,7 +1544,7 @@ static const char *const gmissile_sample_names[] =
};
MACHINE_CONFIG_START(mw8080bw_state::gmissile_audio)
- set_sound_start_cb(config, driver_callback_delegate(&sound_start_samples, this));
+ MCFG_SOUND_START_OVERRIDE(mw8080bw_state, samples)
SPEAKER(config, "lspeaker").front_left();
SPEAKER(config, "rspeaker").front_right();
@@ -1638,7 +1638,7 @@ static const char *const m4_sample_names[] =
MACHINE_CONFIG_START(mw8080bw_state::m4_audio)
- set_sound_start_cb(config, driver_callback_delegate(&sound_start_samples, this));
+ MCFG_SOUND_START_OVERRIDE(mw8080bw_state, samples)
SPEAKER(config, "lspeaker").front_left();
SPEAKER(config, "rspeaker").front_right();
@@ -1894,7 +1894,7 @@ static const char *const clowns_sample_names[] =
};
MACHINE_CONFIG_START(mw8080bw_state::clowns_audio)
- set_sound_start_cb(config, driver_callback_delegate(&sound_start_samples, this));
+ MCFG_SOUND_START_OVERRIDE(mw8080bw_state, samples)
SPEAKER(config, "mono").front_center();
@@ -3263,7 +3263,7 @@ static const char *const phantom2_sample_names[] =
};
MACHINE_CONFIG_START(mw8080bw_state::phantom2_audio)
- set_sound_start_cb(config, driver_callback_delegate(&sound_start_samples, this));
+ MCFG_SOUND_START_OVERRIDE(mw8080bw_state, samples)
SPEAKER(config, "mono").front_center();
MCFG_DEVICE_ADD("samples", SAMPLES)
@@ -3507,7 +3507,7 @@ static const char *const invaders_sample_names[] =
/* left in for all games that hack into invaders samples for audio */
MACHINE_CONFIG_START(mw8080bw_state::invaders_samples_audio)
- set_sound_start_cb(config, driver_callback_delegate(&sound_start_samples, this));
+ MCFG_SOUND_START_OVERRIDE(mw8080bw_state, samples)
SPEAKER(config, "mono").front_center();
diff --git a/src/mame/audio/n8080.cpp b/src/mame/audio/n8080.cpp
index 7720c28deb7..d311fe1e21d 100644
--- a/src/mame/audio/n8080.cpp
+++ b/src/mame/audio/n8080.cpp
@@ -377,7 +377,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(n8080_state::helifire_dac_volume_timer)
}
-void n8080_state::sound_start_spacefev()
+SOUND_START_MEMBER(n8080_state,spacefev)
{
m_sound_timer[0] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(n8080_state::stop_mono_flop_callback), this));
m_sound_timer[1] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(n8080_state::stop_mono_flop_callback), this));
@@ -390,7 +390,7 @@ void n8080_state::sound_start_spacefev()
save_item(NAME(m_mono_flop));
}
-void n8080_state::sound_reset_spacefev()
+SOUND_RESET_MEMBER(n8080_state,spacefev)
{
m_n8080_hardware = 1;
@@ -406,7 +406,7 @@ void n8080_state::sound_reset_spacefev()
}
-void n8080_state::sound_start_sheriff()
+SOUND_START_MEMBER(n8080_state,sheriff)
{
m_sound_timer[0] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(n8080_state::stop_mono_flop_callback), this));
m_sound_timer[1] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(n8080_state::stop_mono_flop_callback), this));
@@ -418,7 +418,7 @@ void n8080_state::sound_start_sheriff()
save_item(NAME(m_mono_flop));
}
-void n8080_state::sound_reset_sheriff()
+SOUND_RESET_MEMBER(n8080_state,sheriff)
{
m_n8080_hardware = 2;
@@ -433,7 +433,7 @@ void n8080_state::sound_reset_sheriff()
}
-void n8080_state::sound_start_helifire()
+SOUND_START_MEMBER(n8080_state,helifire)
{
save_item(NAME(m_prev_snd_data));
save_item(NAME(m_prev_sound_pins));
@@ -444,7 +444,7 @@ void n8080_state::sound_start_helifire()
save_item(NAME(m_helifire_dac_phase));
}
-void n8080_state::sound_reset_helifire()
+SOUND_RESET_MEMBER(n8080_state,helifire)
{
m_n8080_hardware = 3;
@@ -475,8 +475,8 @@ void n8080_state::helifire_sound_io_map(address_map &map)
MACHINE_CONFIG_START(n8080_state::spacefev_sound)
- set_sound_start_cb(config, driver_callback_delegate(&sound_start_spacefev, this));
- set_sound_reset_cb(config, driver_callback_delegate(&sound_reset_spacefev, this));
+ MCFG_SOUND_START_OVERRIDE(n8080_state,spacefev)
+ MCFG_SOUND_RESET_OVERRIDE(n8080_state,spacefev)
/* basic machine hardware */
MCFG_DEVICE_ADD("audiocpu", I8035, 6000000)
@@ -515,8 +515,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(n8080_state::sheriff_sound)
- set_sound_start_cb(config, driver_callback_delegate(&sound_start_sheriff, this));
- set_sound_reset_cb(config, driver_callback_delegate(&sound_reset_sheriff, this));
+ MCFG_SOUND_START_OVERRIDE(n8080_state,sheriff)
+ MCFG_SOUND_RESET_OVERRIDE(n8080_state,sheriff)
/* basic machine hardware */
MCFG_DEVICE_ADD("audiocpu", I8035, 6000000)
@@ -553,8 +553,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(n8080_state::helifire_sound)
- set_sound_start_cb(config, driver_callback_delegate(&sound_start_helifire, this));
- set_sound_reset_cb(config, driver_callback_delegate(&sound_reset_helifire, this));
+ MCFG_SOUND_START_OVERRIDE(n8080_state,helifire)
+ MCFG_SOUND_RESET_OVERRIDE(n8080_state,helifire)
/* basic machine hardware */
MCFG_DEVICE_ADD("audiocpu", I8035, 6000000)
diff --git a/src/mame/audio/redalert.cpp b/src/mame/audio/redalert.cpp
index 6ceb5de3a47..db7e75138cd 100644
--- a/src/mame/audio/redalert.cpp
+++ b/src/mame/audio/redalert.cpp
@@ -130,7 +130,7 @@ void redalert_state::redalert_audio_map(address_map &map)
*
*************************************/
-void redalert_state::sound_start_redalert()
+SOUND_START_MEMBER(redalert_state,redalert)
{
save_item(NAME(m_ay8910_latch_1));
save_item(NAME(m_ay8910_latch_2));
@@ -227,7 +227,7 @@ MACHINE_CONFIG_START(redalert_state::redalert_audio)
redalert_audio_m37b(config);
redalert_audio_voice(config);
- set_sound_start_cb(config, driver_callback_delegate(&sound_start_redalert, this));
+ MCFG_SOUND_START_OVERRIDE( redalert_state, redalert )
MACHINE_CONFIG_END
@@ -243,7 +243,7 @@ MACHINE_CONFIG_START(redalert_state::ww3_audio)
redalert_audio_m37b(config);
- set_sound_start_cb(config, driver_callback_delegate(&sound_start_redalert, this));
+ MCFG_SOUND_START_OVERRIDE( redalert_state, redalert )
MACHINE_CONFIG_END
@@ -330,7 +330,7 @@ void redalert_state::demoneye_audio_map(address_map &map)
*
*************************************/
-void redalert_state::sound_start_demoneye()
+SOUND_START_MEMBER( redalert_state, demoneye )
{
save_item(NAME(m_ay8910_latch_1));
save_item(NAME(m_ay8910_latch_2));
@@ -355,7 +355,7 @@ MACHINE_CONFIG_START(redalert_state::demoneye_audio)
MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, redalert_state, demoneye_ay8910_data_w))
MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, redalert_state, demoneye_ay8910_latch_1_w))
- set_sound_start_cb(config, driver_callback_delegate(&sound_start_demoneye, this));
+ MCFG_SOUND_START_OVERRIDE( redalert_state, demoneye )
SPEAKER(config, "mono").front_center();
diff --git a/src/mame/audio/vicdual.cpp b/src/mame/audio/vicdual.cpp
index f059f472f34..1b2f6af170b 100644
--- a/src/mame/audio/vicdual.cpp
+++ b/src/mame/audio/vicdual.cpp
@@ -128,7 +128,7 @@ TIMER_CALLBACK_MEMBER( vicdual_state::frogs_croak_callback )
}
-void vicdual_state::machine_start_frogs_audio()
+MACHINE_START_MEMBER(vicdual_state,frogs_audio)
{
m_frogs_croak_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(vicdual_state::frogs_croak_callback), this));