diff options
| author | 2014-10-15 07:19:47 +0000 | |
|---|---|---|
| committer | 2014-10-15 07:19:47 +0000 | |
| commit | c93ed344fbd26a9c2c49bdbc99014d8dc0cbe9ef (patch) | |
| tree | a5017b8341bdadc5bcd1185ae49fe4c0a85424b8 /src/emu/sound | |
| parent | a4dd32afb6cbfaae0e452c90486060682ab1c31c (diff) | |
Cleanups and version bumpmame0155
Diffstat (limited to 'src/emu/sound')
| -rw-r--r-- | src/emu/sound/flt_rc.h | 10 | ||||
| -rw-r--r-- | src/emu/sound/k053260.c | 4 | ||||
| -rw-r--r-- | src/emu/sound/k053260.h | 2 | ||||
| -rw-r--r-- | src/emu/sound/samples.c | 2 | ||||
| -rw-r--r-- | src/emu/sound/samples.h | 6 | ||||
| -rw-r--r-- | src/emu/sound/speaker.h | 4 | ||||
| -rw-r--r-- | src/emu/sound/ymf278b.c | 2 | ||||
| -rw-r--r-- | src/emu/sound/zsg2.c | 2 |
8 files changed, 16 insertions, 16 deletions
diff --git a/src/emu/sound/flt_rc.h b/src/emu/sound/flt_rc.h index 8bfdecec973..aed08d8c0fe 100644 --- a/src/emu/sound/flt_rc.h +++ b/src/emu/sound/flt_rc.h @@ -73,7 +73,7 @@ public: // static configuration static void static_set_rc(device_t &device, 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: @@ -91,10 +91,10 @@ private: int m_k; int m_memory; int m_type; - double m_R1; - double m_R2; - double m_R3; - double m_C; + double m_R1; + double m_R2; + double m_R3; + double m_C; }; extern const device_type FILTER_RC; diff --git a/src/emu/sound/k053260.c b/src/emu/sound/k053260.c index b4d0710fd78..32fc2921eb1 100644 --- a/src/emu/sound/k053260.c +++ b/src/emu/sound/k053260.c @@ -385,7 +385,7 @@ void k053260_device::KDSC_Voice::key_on() else if (m_start + m_length >= m_device->m_rom_size) logerror("K053260: Attempting to play past the end of the ROM ( start = %06x, length = %06x )\n", - m_start, m_length); + m_start, m_length); else { @@ -464,7 +464,7 @@ UINT8 k053260_device::KDSC_Voice::read_rom() if (offs >= m_device->m_rom_size) { logerror("%s: K053260: Attempting to read past the end of the ROM (offs = %06x, size = %06x)\n", - m_device->machine().describe_context(), offs, m_device->m_rom_size); + m_device->machine().describe_context(), offs, m_device->m_rom_size); return 0; } diff --git a/src/emu/sound/k053260.h b/src/emu/sound/k053260.h index 8e2e4731d29..735978fb32b 100644 --- a/src/emu/sound/k053260.h +++ b/src/emu/sound/k053260.h @@ -60,7 +60,7 @@ private: UINT32 m_rom_size; // live state - UINT8 m_portdata[4]; + UINT8 m_portdata[4]; UINT8 m_keyon; UINT8 m_mode; diff --git a/src/emu/sound/samples.c b/src/emu/sound/samples.c index 367b5dbcd8e..568d68e536c 100644 --- a/src/emu/sound/samples.c +++ b/src/emu/sound/samples.c @@ -264,7 +264,7 @@ void samples_device::device_start() // initialize any custom handlers m_samples_start_cb.bind_relative_to(*owner()); - + if (!m_samples_start_cb.isnull()) m_samples_start_cb(); } diff --git a/src/emu/sound/samples.h b/src/emu/sound/samples.h index 28639cc6e95..cb436329a0e 100644 --- a/src/emu/sound/samples.h +++ b/src/emu/sound/samples.h @@ -23,11 +23,11 @@ #define MCFG_SAMPLES_NAMES(_names) \ samples_device::static_set_samples_names(*device, _names); - + typedef device_delegate<void ()> samples_start_cb_delegate; #define SAMPLES_START_CB_MEMBER(_name) void _name() - + #define MCFG_SAMPLES_START_CB(_class, _method) \ samples_device::set_samples_start_callback(*device, samples_start_cb_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner))); @@ -74,7 +74,7 @@ public: dynamic_array<INT16> data; // 16-bit signed data }; static bool read_sample(emu_file &file, sample_t &sample); - + // interface UINT8 m_channels; // number of discrete audio channels needed const char *const *m_names; // array of sample names diff --git a/src/emu/sound/speaker.h b/src/emu/sound/speaker.h index cc61ddf1101..ee6b3297f37 100644 --- a/src/emu/sound/speaker.h +++ b/src/emu/sound/speaker.h @@ -26,7 +26,7 @@ class speaker_sound_device : public device_t, public: speaker_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~speaker_sound_device() {} - + // static configuration static void static_set_levels(device_t &device, int num_levels, const INT16 *levels) { downcast<speaker_sound_device &>(device).m_num_levels = num_levels; downcast<speaker_sound_device &>(device).m_levels = levels;} @@ -80,7 +80,7 @@ private: // DC blocker state double m_prevx, m_prevy; - + int m_num_levels; /* optional: number of levels (if not two) */ const INT16 *m_levels; /* optional: pointer to level lookup table */ }; diff --git a/src/emu/sound/ymf278b.c b/src/emu/sound/ymf278b.c index 93ea2d58c10..1e97e2673d2 100644 --- a/src/emu/sound/ymf278b.c +++ b/src/emu/sound/ymf278b.c @@ -75,7 +75,7 @@ // default address map static ADDRESS_MAP_START( ymf278b, AS_0, 8, ymf278b_device ) - AM_RANGE(0x000000, 0x3fffff) AM_ROM + AM_RANGE(0x000000, 0x3fffff) AM_ROM ADDRESS_MAP_END diff --git a/src/emu/sound/zsg2.c b/src/emu/sound/zsg2.c index b8d1102b07d..08bff142957 100644 --- a/src/emu/sound/zsg2.c +++ b/src/emu/sound/zsg2.c @@ -142,7 +142,7 @@ void zsg2_device::device_reset() prepare_samples(i); FILE* f; - + f = fopen("zoom_samples.bin","wb"); fwrite(m_mem_copy,1,m_mem_blocks*4,f); fclose(f); |
