diff options
Diffstat (limited to 'src/devices/sound/ymz280b.h')
-rw-r--r-- | src/devices/sound/ymz280b.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/devices/sound/ymz280b.h b/src/devices/sound/ymz280b.h index 5da3ea46cc3..319f85b83f4 100644 --- a/src/devices/sound/ymz280b.h +++ b/src/devices/sound/ymz280b.h @@ -32,14 +32,13 @@ protected: virtual void device_start() override; virtual void device_post_load() override; virtual void device_reset() override; - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; virtual void device_clock_changed() override; // sound stream update overrides virtual void sound_stream_update(sound_stream &stream, std::vector<read_stream_view> const &inputs, std::vector<write_stream_view> &outputs) override; // device_rom_interface overrides - virtual void rom_bank_updated() override; + virtual void rom_bank_pre_change() override; private: /* struct describing a single playing ADPCM voice */ @@ -80,17 +79,17 @@ private: }; void update_irq_state(); - void update_step(struct YMZ280BVoice *voice); - void update_volumes(struct YMZ280BVoice *voice); - void update_irq_state_timer_common(int voicenum); - int generate_adpcm(struct YMZ280BVoice *voice, s16 *buffer, int samples); - int generate_pcm8(struct YMZ280BVoice *voice, s16 *buffer, int samples); - int generate_pcm16(struct YMZ280BVoice *voice, s16 *buffer, int samples); + void update_step(YMZ280BVoice *voice); + void update_volumes(YMZ280BVoice *voice); + TIMER_CALLBACK_MEMBER(update_irq_state_timer_common); + int generate_adpcm(YMZ280BVoice *voice, s16 *buffer, int samples); + int generate_pcm8(YMZ280BVoice *voice, s16 *buffer, int samples); + int generate_pcm16(YMZ280BVoice *voice, s16 *buffer, int samples); void write_to_register(int data); int compute_status(); // internal state - struct YMZ280BVoice m_voice[8]; /* the 8 voices */ + YMZ280BVoice m_voice[8]; /* the 8 voices */ u8 m_current_register; /* currently accessible register */ u8 m_status_register; /* current status register */ u8 m_irq_state; /* current IRQ state */ |