diff options
Diffstat (limited to 'src/emu/sound.cpp')
-rw-r--r-- | src/emu/sound.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/emu/sound.cpp b/src/emu/sound.cpp index 139e6339089..95bc85bc4ae 100644 --- a/src/emu/sound.cpp +++ b/src/emu/sound.cpp @@ -1102,7 +1102,7 @@ sound_manager::sound_manager(running_machine &machine) : // count the mixers #if VERBOSE - mixer_interface_iterator iter(machine.root_device()); + mixer_interface_enumerator iter(machine.root_device()); VPRINTF(("total mixers = %d\n", iter.count())); #endif @@ -1199,7 +1199,7 @@ void sound_manager::set_attenuation(float attenuation) bool sound_manager::indexed_mixer_input(int index, mixer_input &info) const { // scan through the mixers until we find the indexed input - for (device_mixer_interface &mixer : mixer_interface_iterator(machine().root_device())) + for (device_mixer_interface &mixer : mixer_interface_enumerator(machine().root_device())) { if (index < mixer.inputs()) { @@ -1270,7 +1270,7 @@ void sound_manager::recursive_remove_stream_from_orphan_list(sound_stream *which void sound_manager::apply_sample_rate_changes() { // update sample rates if they have changed - for (speaker_device &speaker : speaker_device_iterator(machine().root_device())) + for (speaker_device &speaker : speaker_device_enumerator(machine().root_device())) { int stream_out; sound_stream *stream = speaker.output_to_stream_output(0, stream_out); @@ -1292,7 +1292,7 @@ void sound_manager::apply_sample_rate_changes() void sound_manager::reset() { // reset all the sound chips - for (device_sound_interface &sound : sound_interface_iterator(machine().root_device())) + for (device_sound_interface &sound : sound_interface_enumerator(machine().root_device())) sound.device().reset(); // apply any sample rate changes now @@ -1308,7 +1308,7 @@ void sound_manager::reset() m_orphan_stream_list[stream.get()] = 0; // then walk the graph like we do on update and remove any we touch - for (speaker_device &speaker : speaker_device_iterator(machine().root_device())) + for (speaker_device &speaker : speaker_device_enumerator(machine().root_device())) { int dummy; sound_stream *output = speaker.output_to_stream_output(0, dummy); @@ -1318,7 +1318,7 @@ void sound_manager::reset() #if (SOUND_DEBUG) // dump the sound graph when we start up - for (speaker_device &speaker : speaker_device_iterator(machine().root_device())) + for (speaker_device &speaker : speaker_device_enumerator(machine().root_device())) { int index; sound_stream *output = speaker.output_to_stream_output(0, index); @@ -1487,7 +1487,7 @@ void sound_manager::update(void *ptr, int param) std::fill_n(&m_rightmix[0], m_samples_this_update, 0); // force all the speaker streams to generate the proper number of samples - for (speaker_device &speaker : speaker_device_iterator(machine().root_device())) + for (speaker_device &speaker : speaker_device_enumerator(machine().root_device())) speaker.mix(&m_leftmix[0], &m_rightmix[0], m_last_update, endtime, m_samples_this_update, (m_muted & MUTE_REASON_SYSTEM)); // determine the maximum in this section |