summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/sound
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2015-11-25 08:22:24 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2015-11-25 08:22:24 +0100
commit0825ce4f3b8eaab42e3682f7d01d97ce6ea0416d (patch)
tree24de29ca8cbba68740ec8cd26f15209f19c2bf0b /src/devices/sound
parentd1d8a66ab196156ab22ba1059d714cd040b44ab6 (diff)
Cleanups and version bumpmame0168
Diffstat (limited to 'src/devices/sound')
-rw-r--r--src/devices/sound/2151intf.cpp6
-rw-r--r--src/devices/sound/3526intf.cpp4
-rw-r--r--src/devices/sound/3812intf.cpp4
-rw-r--r--src/devices/sound/8950intf.cpp4
-rw-r--r--src/devices/sound/discrete.cpp8
-rw-r--r--src/devices/sound/fm.cpp4
-rw-r--r--src/devices/sound/fm2612.cpp2
-rw-r--r--src/devices/sound/k054539.cpp2
-rw-r--r--src/devices/sound/l7a1045_l6028_dsp_a.h2
-rw-r--r--src/devices/sound/mas3507d.cpp2
-rw-r--r--src/devices/sound/multipcm.cpp32
-rw-r--r--src/devices/sound/multipcm.h6
-rw-r--r--src/devices/sound/samples.cpp2
-rw-r--r--src/devices/sound/votrax.cpp38
-rw-r--r--src/devices/sound/ymdeltat.cpp2
15 files changed, 59 insertions, 59 deletions
diff --git a/src/devices/sound/2151intf.cpp b/src/devices/sound/2151intf.cpp
index 567b8cfe16d..cd87829c803 100644
--- a/src/devices/sound/2151intf.cpp
+++ b/src/devices/sound/2151intf.cpp
@@ -23,9 +23,9 @@ const device_type YM2151 = &device_creator<ym2151_device>;
ym2151_device::ym2151_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, YM2151, "YM2151", tag, owner, clock, "ym2151", __FILE__),
- device_sound_interface(mconfig, *this),
- m_stream(NULL),
- m_chip(NULL),
+ device_sound_interface(mconfig, *this),
+ m_stream(NULL),
+ m_chip(NULL),
m_lastreg(0),
m_irqhandler(*this),
m_portwritehandler(*this)
diff --git a/src/devices/sound/3526intf.cpp b/src/devices/sound/3526intf.cpp
index 6639aa83e5e..e66d745e31e 100644
--- a/src/devices/sound/3526intf.cpp
+++ b/src/devices/sound/3526intf.cpp
@@ -156,8 +156,8 @@ const device_type YM3526 = &device_creator<ym3526_device>;
ym3526_device::ym3526_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, YM3526, "YM3526", tag, owner, clock, "ym3526", __FILE__),
- device_sound_interface(mconfig, *this),
- m_stream(NULL),
+ device_sound_interface(mconfig, *this),
+ m_stream(NULL),
m_chip(NULL),
m_irq_handler(*this)
{
diff --git a/src/devices/sound/3812intf.cpp b/src/devices/sound/3812intf.cpp
index 73d0307d20a..edd752fa47d 100644
--- a/src/devices/sound/3812intf.cpp
+++ b/src/devices/sound/3812intf.cpp
@@ -154,8 +154,8 @@ const device_type YM3812 = &device_creator<ym3812_device>;
ym3812_device::ym3812_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, YM3812, "YM3812", tag, owner, clock, "ym3812", __FILE__),
- device_sound_interface(mconfig, *this),
- m_stream(NULL),
+ device_sound_interface(mconfig, *this),
+ m_stream(NULL),
m_chip(NULL),
m_irq_handler(*this)
{
diff --git a/src/devices/sound/8950intf.cpp b/src/devices/sound/8950intf.cpp
index 4ca01ed31a7..6c6a7931142 100644
--- a/src/devices/sound/8950intf.cpp
+++ b/src/devices/sound/8950intf.cpp
@@ -205,8 +205,8 @@ const device_type Y8950 = &device_creator<y8950_device>;
y8950_device::y8950_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, Y8950, "Y8950", tag, owner, clock, "y8950", __FILE__),
- device_sound_interface(mconfig, *this),
- m_stream(NULL),
+ device_sound_interface(mconfig, *this),
+ m_stream(NULL),
m_chip(NULL),
m_irq_handler(*this),
m_keyboard_read_handler(*this),
diff --git a/src/devices/sound/discrete.cpp b/src/devices/sound/discrete.cpp
index 6d72e6b1e95..3e8eaed0632 100644
--- a/src/devices/sound/discrete.cpp
+++ b/src/devices/sound/discrete.cpp
@@ -354,14 +354,14 @@ void discrete_task::check(discrete_task *dest_task)
*
*************************************/
-discrete_base_node::discrete_base_node() :
+discrete_base_node::discrete_base_node() :
m_device(NULL),
m_block(NULL),
- m_active_inputs(0),
+ m_active_inputs(0),
m_custom(NULL),
m_input_is_node(0),
m_step_intf(NULL),
- m_input_intf(NULL),
+ m_input_intf(NULL),
m_output_intf(NULL)
{
m_output[0] = 0.0;
@@ -851,7 +851,7 @@ discrete_device::discrete_device(const machine_config &mconfig, device_type type
discrete_sound_device::discrete_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: discrete_device(mconfig, DISCRETE, "DISCRETE", tag, owner, clock),
- device_sound_interface(mconfig, *this),
+ device_sound_interface(mconfig, *this),
m_stream(NULL)
{
}
diff --git a/src/devices/sound/fm.cpp b/src/devices/sound/fm.cpp
index cb30e55656a..2e3e0f5d92b 100644
--- a/src/devices/sound/fm.cpp
+++ b/src/devices/sound/fm.cpp
@@ -2422,8 +2422,8 @@ struct YM2610
UINT8 flagmask; /* YM2608 only */
UINT8 irqmask; /* YM2608 only */
-
- device_t *device;
+
+ device_t *device;
};
/* here is the virtual YM2608 */
diff --git a/src/devices/sound/fm2612.cpp b/src/devices/sound/fm2612.cpp
index 22e7e8b7749..fc74fa6e6ea 100644
--- a/src/devices/sound/fm2612.cpp
+++ b/src/devices/sound/fm2612.cpp
@@ -693,7 +693,7 @@ struct YM2612
/* dac output (YM2612) */
int dacen;
INT32 dacout;
- device_t *device;
+ device_t *device;
};
/* log output level */
diff --git a/src/devices/sound/k054539.cpp b/src/devices/sound/k054539.cpp
index 350077fb96e..90e7efbff1d 100644
--- a/src/devices/sound/k054539.cpp
+++ b/src/devices/sound/k054539.cpp
@@ -19,7 +19,7 @@ const device_type K054539 = &device_creator<k054539_device>;
k054539_device::k054539_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, K054539, "K054539 ADPCM", tag, owner, clock, "k054539", __FILE__),
- device_sound_interface(mconfig, *this), flags(0), ram(nullptr), reverb_pos(0), cur_ptr(0), cur_limit(0),
+ device_sound_interface(mconfig, *this), flags(0), ram(nullptr), reverb_pos(0), cur_ptr(0), cur_limit(0),
cur_zone(nullptr), rom(nullptr), rom_size(0), rom_mask(0), stream(nullptr), m_timer(nullptr), m_timer_state(0),
m_timer_handler(*this),
m_rgnoverride(NULL)
diff --git a/src/devices/sound/l7a1045_l6028_dsp_a.h b/src/devices/sound/l7a1045_l6028_dsp_a.h
index 836c35b20d0..b095a79568d 100644
--- a/src/devices/sound/l7a1045_l6028_dsp_a.h
+++ b/src/devices/sound/l7a1045_l6028_dsp_a.h
@@ -7,7 +7,7 @@
struct l7a1045_voice
{
l7a1045_voice() : end(0), mode(false),
- pos(0),
+ pos(0),
frac(0), l_volume(0), r_volume(0)
{
//memset(regs, 0, sizeof(UINT32)*8);
diff --git a/src/devices/sound/mas3507d.cpp b/src/devices/sound/mas3507d.cpp
index d61b932a1bf..7b081d0a4bf 100644
--- a/src/devices/sound/mas3507d.cpp
+++ b/src/devices/sound/mas3507d.cpp
@@ -12,7 +12,7 @@ const device_type MAS3507D = &device_creator<mas3507d_device>;
mas3507d_device::mas3507d_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MAS3507D, "MAS3507D", tag, owner, clock, "mas3507d", __FILE__),
- device_sound_interface(mconfig, *this), i2c_bus_state(), i2c_bus_address(), i2c_scli(false), i2c_sclo(false), i2c_sdai(false), i2c_sdao(false),
+ device_sound_interface(mconfig, *this), i2c_bus_state(), i2c_bus_address(), i2c_scli(false), i2c_sclo(false), i2c_sdai(false), i2c_sdao(false),
i2c_bus_curbit(0), i2c_bus_curval(0), i2c_subdest(), i2c_command(), i2c_bytecount(0), i2c_io_bank(0), i2c_io_adr(0), i2c_io_count(0), i2c_io_val(0)
{
}
diff --git a/src/devices/sound/multipcm.cpp b/src/devices/sound/multipcm.cpp
index ef6613d8546..3d89611cfe5 100644
--- a/src/devices/sound/multipcm.cpp
+++ b/src/devices/sound/multipcm.cpp
@@ -45,22 +45,22 @@ ALLOW_SAVE_TYPE(multipcm_device::state_t); // allow save_item on a non-fundament
//Times are based on a 44100Hz timebase. It's adjusted to the actual sampling rate on startup
const double multipcm_device::BASE_TIMES[64] = {
- 0, 0, 0, 0,
- 6222.95, 4978.37, 4148.66, 3556.01,
- 3111.47, 2489.21, 2074.33, 1778.00,
- 1555.74, 1244.63, 1037.19, 889.02,
- 777.87, 622.31, 518.59, 444.54,
- 388.93, 311.16, 259.32, 222.27,
- 194.47, 155.60, 129.66, 111.16,
- 97.23, 77.82, 64.85, 55.60,
- 48.62, 38.91, 32.43, 27.80,
- 24.31, 19.46, 16.24, 13.92,
- 12.15, 9.75, 8.12, 6.98,
- 6.08, 4.90, 4.08, 3.49,
- 3.04, 2.49, 2.13, 1.90,
- 1.72, 1.41, 1.18, 1.04,
- 0.91, 0.73, 0.59, 0.50,
- 0.45, 0.45, 0.45, 0.45
+ 0, 0, 0, 0,
+ 6222.95, 4978.37, 4148.66, 3556.01,
+ 3111.47, 2489.21, 2074.33, 1778.00,
+ 1555.74, 1244.63, 1037.19, 889.02,
+ 777.87, 622.31, 518.59, 444.54,
+ 388.93, 311.16, 259.32, 222.27,
+ 194.47, 155.60, 129.66, 111.16,
+ 97.23, 77.82, 64.85, 55.60,
+ 48.62, 38.91, 32.43, 27.80,
+ 24.31, 19.46, 16.24, 13.92,
+ 12.15, 9.75, 8.12, 6.98,
+ 6.08, 4.90, 4.08, 3.49,
+ 3.04, 2.49, 2.13, 1.90,
+ 1.72, 1.41, 1.18, 1.04,
+ 0.91, 0.73, 0.59, 0.50,
+ 0.45, 0.45, 0.45, 0.45
};
const INT32 multipcm_device::VALUE_TO_CHANNEL[32] =
diff --git a/src/devices/sound/multipcm.h b/src/devices/sound/multipcm.h
index 950905e47b8..6ea22c5e3e8 100644
--- a/src/devices/sound/multipcm.h
+++ b/src/devices/sound/multipcm.h
@@ -98,7 +98,7 @@ private:
// internal state
sound_stream *m_stream;
- sample_t *m_samples; // Max 512 samples
+ sample_t *m_samples; // Max 512 samples
slot_t *m_slots;
UINT32 m_cur_slot;
UINT32 m_address;
@@ -107,8 +107,8 @@ private:
float m_rate;
UINT32 *m_attack_step;
- UINT32 *m_decay_release_step; // Envelope step tables
- UINT32 *m_freq_step_table; // Frequency step table
+ UINT32 *m_decay_release_step; // Envelope step tables
+ UINT32 *m_freq_step_table; // Frequency step table
direct_read_data *m_direct;
diff --git a/src/devices/sound/samples.cpp b/src/devices/sound/samples.cpp
index 279eada7a1f..6da7dd48f16 100644
--- a/src/devices/sound/samples.cpp
+++ b/src/devices/sound/samples.cpp
@@ -84,7 +84,7 @@ void samples_device::start(UINT8 channel, UINT32 samplenum, bool loop)
chan.stream->update();
// update the parameters
- sample_t &sample = m_sample[samplenum];
+ sample_t &sample = m_sample[samplenum];
chan.source = (sample.data.size() > 0) ? &sample.data[0] : NULL;
chan.source_length = sample.data.size();
chan.source_num = (chan.source_length > 0) ? samplenum : -1;
diff --git a/src/devices/sound/votrax.cpp b/src/devices/sound/votrax.cpp
index ff91eb33f44..c4538f14270 100644
--- a/src/devices/sound/votrax.cpp
+++ b/src/devices/sound/votrax.cpp
@@ -96,15 +96,15 @@ const double votrax_sc01_device::s_glottal_wave[16] =
votrax_sc01_device::votrax_sc01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, VOTRAX_SC01, "Votrax SC-01", tag, owner, clock, "votrax", __FILE__),
- device_sound_interface(mconfig, *this),
- m_stream(NULL),
- m_phoneme_timer(NULL), m_rom(NULL), m_inflection(0), m_phoneme(0),
- m_request_cb(*this), m_request_state(0), m_internal_request(0), m_master_clock_freq(0), m_master_clock(0), m_counter_34(0),
- m_latch_70(0), m_latch_72(0), m_beta1(0), m_p2(0), m_p1(0), m_phi2(0), m_phi1(0), m_phi2_20(0), m_phi1_20(0), m_subphoneme_period(0),
- m_subphoneme_count(0), m_clock_88(0), m_latch_42(0), m_counter_84(0), m_latch_92(0), m_srff_132(false), m_srff_114(false), m_srff_112(false),
- m_srff_142(false), m_latch_80(0), m_counter_220(0), m_counter_222(0), m_counter_224(0), m_counter_234(0), m_counter_236(0), m_fgate(0),
- m_glottal_sync(0), m_0625_clock(0), m_counter_46(0), m_latch_46(0), m_latch_168(0), m_latch_170(0), m_f1(0), m_f2(0), m_fc(0), m_f3(0),
- m_f2q(0), m_va(0), m_fa(0), m_noise_clock(0), m_shift_252(0), m_counter_250(0)
+ device_sound_interface(mconfig, *this),
+ m_stream(NULL),
+ m_phoneme_timer(NULL), m_rom(NULL), m_inflection(0), m_phoneme(0),
+ m_request_cb(*this), m_request_state(0), m_internal_request(0), m_master_clock_freq(0), m_master_clock(0), m_counter_34(0),
+ m_latch_70(0), m_latch_72(0), m_beta1(0), m_p2(0), m_p1(0), m_phi2(0), m_phi1(0), m_phi2_20(0), m_phi1_20(0), m_subphoneme_period(0),
+ m_subphoneme_count(0), m_clock_88(0), m_latch_42(0), m_counter_84(0), m_latch_92(0), m_srff_132(false), m_srff_114(false), m_srff_112(false),
+ m_srff_142(false), m_latch_80(0), m_counter_220(0), m_counter_222(0), m_counter_224(0), m_counter_234(0), m_counter_236(0), m_fgate(0),
+ m_glottal_sync(0), m_0625_clock(0), m_counter_46(0), m_latch_46(0), m_latch_168(0), m_latch_170(0), m_f1(0), m_f2(0), m_fc(0), m_f3(0),
+ m_f2q(0), m_va(0), m_fa(0), m_noise_clock(0), m_shift_252(0), m_counter_250(0)
{
}
@@ -656,9 +656,9 @@ osd_printf_debug("counter=%d\n", m_counter_84);
{
// if the request line was previously low, reset the VD/CLD flip-flops
if (m_internal_request == CLEAR_LINE)
- {
+ {
m_srff_112 = m_srff_114 = false;
- }
+ }
m_internal_request = ASSERT_LINE;
}
@@ -698,18 +698,18 @@ osd_printf_debug("counter=%d\n", m_counter_84);
case 4:
romdata_swapped = (BIT(romdata, 0) << 3) | (BIT(romdata, 1) << 2) | (BIT(romdata, 2) << 1) | (BIT(romdata, 3) << 0);
if (m_counter_84 != 0 && romdata_swapped == (m_counter_84 ^ 0xf))
- {
+ {
m_srff_114 = true;
- }
+ }
break;
// update VD
case 5:
romdata_swapped = (BIT(romdata, 0) << 3) | (BIT(romdata, 1) << 2) | (BIT(romdata, 2) << 1) | (BIT(romdata, 3) << 0);
if (m_counter_84 != 0 && romdata_swapped == (m_counter_84 ^ 0xf))
- {
+ {
m_srff_112 = true;
- }
+ }
break;
// update FF == PAC & (VA | FA)
@@ -857,16 +857,16 @@ osd_printf_debug("[PH=%02X]\n", m_latch_80);
case 5:
if ((m_latch_46 & 0xc) == 0xc && m_srff_112)
- {
+ {
ram_write = 1;
- }
+ }
break;
case 6:
if ((m_latch_46 & 0xc) == 0xc && m_srff_114)
- {
+ {
ram_write = 1;
- }
+ }
break;
}
diff --git a/src/devices/sound/ymdeltat.cpp b/src/devices/sound/ymdeltat.cpp
index 7d67bcf357b..af9b4ac6a51 100644
--- a/src/devices/sound/ymdeltat.cpp
+++ b/src/devices/sound/ymdeltat.cpp
@@ -413,7 +413,7 @@ value: START, REC, MEMDAT, REPEAT, SPOFF, x,x,RESET meaning:
void YM_DELTAT_ADPCM_Reset(YM_DELTAT *DELTAT,int pan,int emulation_mode,device_t *device)
{
- DELTAT->device = device;
+ DELTAT->device = device;
DELTAT->now_addr = 0;
DELTAT->now_step = 0;
DELTAT->step = 0;