misc cleanup (nw)

This commit is contained in:
Vas Crabb 2020-02-02 06:24:14 +11:00
parent 8e73d35320
commit a4b59223f7
3 changed files with 10 additions and 15 deletions

View File

@ -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 <algorithm>

View File

@ -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)
{
}

View File

@ -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<discrete_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