From a4b59223f737942e78b699b6f5e6b8289e716b20 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sun, 2 Feb 2020 06:24:14 +1100 Subject: [PATCH] misc cleanup (nw) --- src/devices/video/fixfreq.cpp | 2 +- src/mame/audio/galaxian.cpp | 12 ++++++------ src/mame/audio/galaxian.h | 11 +++-------- 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/src/devices/video/fixfreq.cpp b/src/devices/video/fixfreq.cpp index 5e333d9eec5..732a6994ae4 100644 --- a/src/devices/video/fixfreq.cpp +++ b/src/devices/video/fixfreq.cpp @@ -20,7 +20,7 @@ // for quick and dirty debugging #define VERBOSE 0 -#define LOG_OUTPUT_FUNC printf +#define LOG_OUTPUT_STREAM std::cerr #include "logmacro.h" #include diff --git a/src/mame/audio/galaxian.cpp b/src/mame/audio/galaxian.cpp index 4485c26104a..ba99ca5e6b3 100644 --- a/src/mame/audio/galaxian.cpp +++ b/src/mame/audio/galaxian.cpp @@ -78,7 +78,7 @@ TODO: * it is only listed once and given as 15k. This is more in line with recordings */ #define GAL_R34 RES_K(5.1) -#define MCRST_R34 RES_K(15) +#define MCRST_R34 RES_K(15) #define GAL_R35 RES_K(150) #define GAL_R36 RES_K(22) @@ -391,14 +391,14 @@ DEFINE_DEVICE_TYPE(GALAXIAN_SOUND, galaxian_sound_device, "galaxian_sound", "Gal DEFINE_DEVICE_TYPE(MOONCRST_SOUND, mooncrst_sound_device, "mooncrst_sound", "Mooncrst Custom Sound") galaxian_sound_device::galaxian_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) -: galaxian_sound_device(mconfig, GALAXIAN_SOUND, tag, owner, clock) + : galaxian_sound_device(mconfig, GALAXIAN_SOUND, tag, owner, clock) { } galaxian_sound_device::galaxian_sound_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) -: device_t(mconfig, type, tag, owner, clock) -, m_discrete(*this, "discrete") -, m_lfo_val(0) + : device_t(mconfig, type, tag, owner, clock) + , m_discrete(*this, "discrete") + , m_lfo_val(0) { } @@ -498,7 +498,7 @@ WRITE8_MEMBER( galaxian_sound_device::sound_w ) } mooncrst_sound_device::mooncrst_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) -: galaxian_sound_device(mconfig, MOONCRST_SOUND, tag, owner, clock) + : galaxian_sound_device(mconfig, MOONCRST_SOUND, tag, owner, clock) { } diff --git a/src/mame/audio/galaxian.h b/src/mame/audio/galaxian.h index fe84309fd67..f2129722468 100644 --- a/src/mame/audio/galaxian.h +++ b/src/mame/audio/galaxian.h @@ -11,7 +11,6 @@ class galaxian_sound_device : public device_t { public: galaxian_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - galaxian_sound_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); DECLARE_WRITE8_MEMBER( sound_w ); DECLARE_WRITE8_MEMBER( pitch_w ); @@ -22,14 +21,14 @@ public: DECLARE_WRITE8_MEMBER( lfo_freq_w ); protected: + galaxian_sound_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + // device-level overrides virtual void device_start() override; virtual void device_add_mconfig(machine_config &config) override; - // sound stream update overrides - // virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; - required_device m_discrete; + private: // internal state uint8_t m_lfo_val; @@ -43,13 +42,9 @@ public: protected: // device-level overrides virtual void device_add_mconfig(machine_config &config) override; - }; DECLARE_DEVICE_TYPE(GALAXIAN_SOUND, galaxian_sound_device) DECLARE_DEVICE_TYPE(MOONCRST_SOUND, mooncrst_sound_device) -//DISCRETE_SOUND_EXTERN(galaxian_discrete); -//DISCRETE_SOUND_EXTERN(mooncrst_discrete); - #endif // MAME_AUDIO_GALAXIAN_H