summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--src/emu/sound.cpp18
-rw-r--r--src/mame/namco/namcos12_cdxa.cpp3
2 files changed, 2 insertions, 19 deletions
diff --git a/src/emu/sound.cpp b/src/emu/sound.cpp
index f5101320690..8678a34c354 100644
--- a/src/emu/sound.cpp
+++ b/src/emu/sound.cpp
@@ -45,8 +45,6 @@
const attotime sound_manager::STREAMS_UPDATE_ATTOTIME = attotime::from_hz(STREAMS_UPDATE_FREQUENCY);
-
-
//**// Output buffer management
// Output buffers store samples produced every system-wide update.
@@ -619,13 +617,6 @@ void sound_stream::sync(attotime now)
-
-
-
-
-
-
-
attotime sound_stream::sample_to_time(u64 index) const
{
attotime res = attotime::zero;
@@ -1020,12 +1011,6 @@ void sound_manager::default_effect_changed(u32 entry)
-
-
-
-
-
-
//-------------------------------------------------
// start_recording - begin audio recording
//-------------------------------------------------
@@ -1716,7 +1701,6 @@ void sound_manager::osd_information_update()
apply_osd_changes<false, osd_input_stream >(m_osd_input_streams );
apply_osd_changes<false, osd_output_stream>(m_osd_output_streams);
}
-
}
void sound_manager::generate_mapping()
@@ -2476,7 +2460,6 @@ void sound_manager::streams_update()
util::wav_add_data_16(*m_wavfile, m_record_buffer.data(), m_record_samples);
m_effects_condition.notify_all();
-
}
//**// Resampler management
@@ -2491,4 +2474,3 @@ const audio_resampler *sound_manager::get_resampler(u32 fs, u32 ft)
m_resamplers[key].reset(res);
return res;
}
-
diff --git a/src/mame/namco/namcos12_cdxa.cpp b/src/mame/namco/namcos12_cdxa.cpp
index 1ff4cf8841a..304f591c68b 100644
--- a/src/mame/namco/namcos12_cdxa.cpp
+++ b/src/mame/namco/namcos12_cdxa.cpp
@@ -292,7 +292,8 @@ void namcos12_cdxa_device::cdrom_cs0_w(offs_t offset, uint16_t data, uint16_t me
void namcos12_cdxa_device::mb87078_gain_changed(offs_t offset, uint8_t data)
{
- m_lc78836m->set_output_gain(offset, m_mb87078->gain_factor_r(offset));
+ if (offset < m_lc78836m->outputs())
+ m_lc78836m->set_output_gain(offset, m_mb87078->gain_factor_r(offset));
}
void namcos12_cdxa_device::audio_dac_w(int state)