From a440a8e0200a36491ae540f6f00beae59c148549 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Mon, 11 Feb 2013 07:44:56 +0000 Subject: Cleanups and version bump --- src/emu/sound/digitalk.c | 47 +++++++++++++++++++++++------------------------ src/emu/sound/digitalk.h | 2 +- src/emu/sound/flt_rc.c | 11 +++++------ src/emu/sound/flt_rc.h | 6 +++--- src/emu/sound/flt_vol.c | 7 +++---- src/emu/sound/flt_vol.h | 4 ++-- src/emu/sound/iremga20.c | 8 ++++---- src/emu/sound/iremga20.h | 6 +++--- src/emu/sound/k005289.c | 4 ++-- src/emu/sound/k005289.h | 8 ++++---- src/emu/sound/k056800.c | 2 -- src/emu/sound/n63701x.c | 9 ++++----- src/emu/sound/n63701x.h | 14 +++++++------- src/emu/sound/spu.c | 4 ++-- src/emu/sound/t6721a.h | 2 +- src/emu/sound/tiaintf.c | 6 +++--- src/emu/sound/tiaintf.h | 4 ++-- 17 files changed, 69 insertions(+), 75 deletions(-) (limited to 'src/emu/sound') diff --git a/src/emu/sound/digitalk.c b/src/emu/sound/digitalk.c index ea78a5f807d..3af96b6eb13 100644 --- a/src/emu/sound/digitalk.c +++ b/src/emu/sound/digitalk.c @@ -263,29 +263,29 @@ const device_type DIGITALKER = &device_creator; digitalker_device::digitalker_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, DIGITALKER, "Digitalker", tag, owner, clock), - device_sound_interface(mconfig, *this), - m_rom(NULL), - m_stream(NULL), - m_data(0), - m_cs(0), - m_cms(0), - m_wr(0), - m_intr(0), - m_bpos(0), - m_apos(0), - m_mode(0), - m_cur_segment(0), - m_cur_repeat(0), - m_segments(0), - m_repeats(0), - m_prev_pitch(0), - m_pitch(0), - m_pitch_pos(0), - m_stop_after(0), - m_cur_dac(0), - m_cur_bits(0), - m_zero_count(0), - m_dac_index(0) + device_sound_interface(mconfig, *this), + m_rom(NULL), + m_stream(NULL), + m_data(0), + m_cs(0), + m_cms(0), + m_wr(0), + m_intr(0), + m_bpos(0), + m_apos(0), + m_mode(0), + m_cur_segment(0), + m_cur_repeat(0), + m_segments(0), + m_repeats(0), + m_prev_pitch(0), + m_pitch(0), + m_pitch_pos(0), + m_stop_after(0), + m_cur_dac(0), + m_cur_bits(0), + m_zero_count(0), + m_dac_index(0) { } @@ -688,4 +688,3 @@ WRITE8_MEMBER( digitalker_device::digitalker_data_w ) { m_data = data; } - diff --git a/src/emu/sound/digitalk.h b/src/emu/sound/digitalk.h index d293fabb9a9..70fc392764c 100644 --- a/src/emu/sound/digitalk.h +++ b/src/emu/sound/digitalk.h @@ -19,7 +19,7 @@ // ======================> digitalker_device class digitalker_device : public device_t, - public device_sound_interface + public device_sound_interface { public: digitalker_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); diff --git a/src/emu/sound/flt_rc.c b/src/emu/sound/flt_rc.c index 7d026a65253..f05cc63883e 100644 --- a/src/emu/sound/flt_rc.c +++ b/src/emu/sound/flt_rc.c @@ -19,11 +19,11 @@ const device_type FILTER_RC = &device_creator; filter_rc_device::filter_rc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, FILTER_RC, "RC Filter", tag, owner, clock), - device_sound_interface(mconfig, *this), - m_stream(NULL), - m_k(0), - m_memory(0), - m_type(0) + device_sound_interface(mconfig, *this), + m_stream(NULL), + m_k(0), + m_memory(0), + m_type(0) { } @@ -119,4 +119,3 @@ void filter_rc_device::filter_rc_set_RC(int type, double R1, double R2, double R m_stream->update(); set_RC_info(type, R1, R2, R3, C); } - diff --git a/src/emu/sound/flt_rc.h b/src/emu/sound/flt_rc.h index aeb18716632..acf5c628baa 100644 --- a/src/emu/sound/flt_rc.h +++ b/src/emu/sound/flt_rc.h @@ -73,13 +73,13 @@ extern const flt_rc_config flt_rc_ac_default; // ======================> filter_rc_device class filter_rc_device : public device_t, - public device_sound_interface + public device_sound_interface { public: filter_rc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~filter_rc_device() { } - void filter_rc_set_RC(int type, double R1, double R2, double R3, double C); + void filter_rc_set_RC(int type, double R1, double R2, double R3, double C); protected: // device-level overrides @@ -89,7 +89,7 @@ protected: virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); private: - void set_RC_info(int type, double R1, double R2, double R3, double C); + void set_RC_info(int type, double R1, double R2, double R3, double C); private: sound_stream* m_stream; diff --git a/src/emu/sound/flt_vol.c b/src/emu/sound/flt_vol.c index 2532371ecb9..eac2ca7ac7a 100644 --- a/src/emu/sound/flt_vol.c +++ b/src/emu/sound/flt_vol.c @@ -11,9 +11,9 @@ const device_type FILTER_VOLUME = &device_creator; filter_volume_device::filter_volume_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, FILTER_VOLUME, "Volume Filter", tag, owner, clock), - device_sound_interface(mconfig, *this), - m_stream(NULL), - m_gain(0) + device_sound_interface(mconfig, *this), + m_stream(NULL), + m_gain(0) { } @@ -48,4 +48,3 @@ void filter_volume_device::flt_volume_set_volume(float volume) { m_gain = (int)(volume * 256); } - diff --git a/src/emu/sound/flt_vol.h b/src/emu/sound/flt_vol.h index 7836930247c..8440989764a 100644 --- a/src/emu/sound/flt_vol.h +++ b/src/emu/sound/flt_vol.h @@ -22,13 +22,13 @@ // ======================> filter_volume_device class filter_volume_device : public device_t, - public device_sound_interface + public device_sound_interface { public: filter_volume_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~filter_volume_device() { } - void flt_volume_set_volume(float volume); + void flt_volume_set_volume(float volume); protected: // device-level overrides diff --git a/src/emu/sound/iremga20.c b/src/emu/sound/iremga20.c index c2e32675731..9314760f57c 100644 --- a/src/emu/sound/iremga20.c +++ b/src/emu/sound/iremga20.c @@ -46,10 +46,10 @@ const device_type IREMGA20 = &device_creator; iremga20_device::iremga20_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, IREMGA20, "Irem GA20", tag, owner, clock), - device_sound_interface(mconfig, *this), - m_rom(NULL), - m_rom_size(0), - m_stream(NULL) + device_sound_interface(mconfig, *this), + m_rom(NULL), + m_rom_size(0), + m_stream(NULL) { } diff --git a/src/emu/sound/iremga20.h b/src/emu/sound/iremga20.h index 02a70f5aaa4..f919065e749 100644 --- a/src/emu/sound/iremga20.h +++ b/src/emu/sound/iremga20.h @@ -56,12 +56,12 @@ protected: virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); public: - DECLARE_WRITE8_MEMBER( irem_ga20_w ); - DECLARE_READ8_MEMBER( irem_ga20_r ); + DECLARE_WRITE8_MEMBER( irem_ga20_w ); + DECLARE_READ8_MEMBER( irem_ga20_r ); private: void iremga20_reset(); - + private: UINT8 *m_rom; INT32 m_rom_size; diff --git a/src/emu/sound/k005289.c b/src/emu/sound/k005289.c index c3f492e6df2..710f7b4369a 100644 --- a/src/emu/sound/k005289.c +++ b/src/emu/sound/k005289.c @@ -45,11 +45,11 @@ const device_type K005289 = &device_creator; k005289_device::k005289_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, K005289, "K005289", tag, owner, clock), - device_sound_interface(mconfig, *this), + device_sound_interface(mconfig, *this), m_sound_prom(NULL), m_stream(NULL), m_mclock(0), - m_rate(0), + m_rate(0), m_mixer_table(NULL), m_mixer_lookup(NULL), m_mixer_buffer(NULL), diff --git a/src/emu/sound/k005289.h b/src/emu/sound/k005289.h index cef1781df7c..349bb57281b 100644 --- a/src/emu/sound/k005289.h +++ b/src/emu/sound/k005289.h @@ -30,7 +30,7 @@ struct k005289_sound_channel // ======================> k005289_device class k005289_device : public device_t, - public device_sound_interface + public device_sound_interface { public: k005289_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); @@ -52,8 +52,8 @@ public: DECLARE_WRITE8_MEMBER( k005289_keylatch_B_w ); private: - void make_mixer_table(int voices); - void k005289_recompute(); + void make_mixer_table(int voices); + void k005289_recompute(); private: k005289_sound_channel m_channel_list[2]; @@ -61,7 +61,7 @@ private: const unsigned char *m_sound_prom; sound_stream *m_stream; int m_mclock; - int m_rate; + int m_rate; /* mixer tables and internal buffers */ INT16 *m_mixer_table; diff --git a/src/emu/sound/k056800.c b/src/emu/sound/k056800.c index 1d587d92c18..5623fc20354 100644 --- a/src/emu/sound/k056800.c +++ b/src/emu/sound/k056800.c @@ -198,5 +198,3 @@ void k056800_device::device_reset() { DEVICE_RESET_NAME( k056800 )(this); } - - diff --git a/src/emu/sound/n63701x.c b/src/emu/sound/n63701x.c index 3b4acf8dc61..22ebcc3385b 100644 --- a/src/emu/sound/n63701x.c +++ b/src/emu/sound/n63701x.c @@ -24,16 +24,16 @@ silence compression: '00 nn' must be replaced by nn+1 times '80'. inside 16 bits without overflowing. */ static const int vol_table[4] = { 26, 84, 200, 258 }; - + // device type definition const device_type NAMCO_63701X = &device_creator; namco_63701x_device::namco_63701x_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NAMCO_63701X, "Namco 63701X", tag, owner, clock), - device_sound_interface(mconfig, *this), - m_stream(NULL), - m_rom(NULL) + device_sound_interface(mconfig, *this), + m_stream(NULL), + m_rom(NULL) { } @@ -140,4 +140,3 @@ WRITE8_MEMBER( namco_63701x_device::namco_63701x_w ) } } } - diff --git a/src/emu/sound/n63701x.h b/src/emu/sound/n63701x.h index 3493a2a7767..3ea3c60c5ba 100644 --- a/src/emu/sound/n63701x.h +++ b/src/emu/sound/n63701x.h @@ -21,12 +21,12 @@ struct voice_63701x { voice_63701x() : select(0), - playing(0), - base_addr(0), - position(0), - volume(0), - silence_counter(0) {} - + playing(0), + base_addr(0), + position(0), + volume(0), + silence_counter(0) {} + int select; int playing; int base_addr; @@ -58,7 +58,7 @@ public: private: voice_63701x m_voices[2]; sound_stream *m_stream; /* channel assigned by the mixer */ - UINT8 *m_rom; /* pointer to sample ROM */ + UINT8 *m_rom; /* pointer to sample ROM */ }; extern const device_type NAMCO_63701X; diff --git a/src/emu/sound/spu.c b/src/emu/sound/spu.c index 1a0c25cf170..072bd0b0502 100644 --- a/src/emu/sound/spu.c +++ b/src/emu/sound/spu.c @@ -2338,7 +2338,7 @@ void spu_device::key_on(const int v) void spu_device::set_xa_format(const float _freq, const int channels) { // Adjust frequency to compensate for slightly slower/faster frame rate -// float freq=44100.0; //(_freq*get_adjusted_frame_rate())/ps1hw.rcnt->get_vertical_refresh(); +// float freq=44100.0; //(_freq*get_adjusted_frame_rate())/ps1hw.rcnt->get_vertical_refresh(); xa_freq=(unsigned int)((_freq/44100.0)*4096.0f); xa_channels=channels; @@ -2499,7 +2499,7 @@ void spu_device::generate_cdda(void *ptr, const unsigned int sz) if (! cdda_buffer->get_bytes_in()) cdda_playing=false; -// if (n>0) printf("cdda buffer underflow (n=%d cdda_in=%d spf=%d)\n",n,cdda_buffer->get_bytes_in(),cdda_spf); +// if (n>0) printf("cdda buffer underflow (n=%d cdda_in=%d spf=%d)\n",n,cdda_buffer->get_bytes_in(),cdda_spf); } } diff --git a/src/emu/sound/t6721a.h b/src/emu/sound/t6721a.h index 66cc6c593db..9005f596da6 100644 --- a/src/emu/sound/t6721a.h +++ b/src/emu/sound/t6721a.h @@ -62,7 +62,7 @@ // ======================> t6721a_device class t6721a_device : public device_t, - public device_sound_interface + public device_sound_interface { public: t6721a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); diff --git a/src/emu/sound/tiaintf.c b/src/emu/sound/tiaintf.c index 2b1fe9963a2..ccc9abee31b 100644 --- a/src/emu/sound/tiaintf.c +++ b/src/emu/sound/tiaintf.c @@ -16,9 +16,9 @@ const device_type TIA = &device_creator; tia_device::tia_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, TIA, "TIA", tag, owner, clock), - device_sound_interface(mconfig, *this), - m_channel(NULL), - m_chip(NULL) + device_sound_interface(mconfig, *this), + m_channel(NULL), + m_chip(NULL) { } diff --git a/src/emu/sound/tiaintf.h b/src/emu/sound/tiaintf.h index 89ef8abe527..726ff2df21b 100644 --- a/src/emu/sound/tiaintf.h +++ b/src/emu/sound/tiaintf.h @@ -20,7 +20,7 @@ // ======================> tia_device class tia_device : public device_t, - public device_sound_interface + public device_sound_interface { public: tia_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); @@ -35,7 +35,7 @@ protected: virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); public: - DECLARE_WRITE8_MEMBER( tia_sound_w ); + DECLARE_WRITE8_MEMBER( tia_sound_w ); private: sound_stream *m_channel; -- cgit v1.2.3