summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/sound/samples.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/emu/sound/samples.c')
-rw-r--r--src/emu/sound/samples.c58
1 files changed, 29 insertions, 29 deletions
diff --git a/src/emu/sound/samples.c b/src/emu/sound/samples.c
index ed57e4327fe..f933b3c6d44 100644
--- a/src/emu/sound/samples.c
+++ b/src/emu/sound/samples.c
@@ -76,13 +76,13 @@ const device_type SAMPLES = &device_creator<samples_device>;
samples_device::samples_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, SAMPLES, "Samples", tag, owner, clock),
- device_sound_interface(mconfig, *this)
+ device_sound_interface(mconfig, *this)
{
}
samples_device::samples_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, type, name, tag, owner, clock),
- device_sound_interface(mconfig, *this)
+ device_sound_interface(mconfig, *this)
{
}
@@ -114,11 +114,11 @@ void samples_device::start(UINT8 channel, UINT32 samplenum, bool loop)
if (m_sample.count() == 0)
return;
- assert(samplenum < m_sample.count());
- assert(channel < m_channels);
+ assert(samplenum < m_sample.count());
+ assert(channel < m_channels);
// force an update before we start
- channel_t &chan = m_channel[channel];
+ channel_t &chan = m_channel[channel];
chan.stream->update();
// update the parameters
@@ -141,10 +141,10 @@ void samples_device::start(UINT8 channel, UINT32 samplenum, bool loop)
void samples_device::start_raw(UINT8 channel, const INT16 *sampledata, UINT32 samples, UINT32 frequency, bool loop)
{
- assert(channel < m_channels);
+ assert(channel < m_channels);
// force an update before we start
- channel_t &chan = m_channel[channel];
+ channel_t &chan = m_channel[channel];
chan.stream->update();
// update the parameters
@@ -166,10 +166,10 @@ void samples_device::start_raw(UINT8 channel, const INT16 *sampledata, UINT32 sa
void samples_device::set_frequency(UINT8 channel, UINT32 freq)
{
- assert(channel < m_channels);
+ assert(channel < m_channels);
// force an update before we start
- channel_t &chan = m_channel[channel];
+ channel_t &chan = m_channel[channel];
chan.stream->update();
chan.step = (INT64(freq) << FRAC_BITS) / machine().sample_rate();
}
@@ -182,10 +182,10 @@ void samples_device::set_frequency(UINT8 channel, UINT32 freq)
void samples_device::set_volume(UINT8 channel, float volume)
{
- assert(channel < m_channels);
+ assert(channel < m_channels);
// force an update before we start
- channel_t &chan = m_channel[channel];
+ channel_t &chan = m_channel[channel];
chan.stream->set_output_gain(0, volume);
}
@@ -196,10 +196,10 @@ void samples_device::set_volume(UINT8 channel, float volume)
void samples_device::pause(UINT8 channel, bool pause)
{
- assert(channel < m_channels);
+ assert(channel < m_channels);
// force an update before we start
- channel_t &chan = m_channel[channel];
+ channel_t &chan = m_channel[channel];
chan.paused = pause;
}
@@ -210,12 +210,12 @@ void samples_device::pause(UINT8 channel, bool pause)
void samples_device::stop(UINT8 channel)
{
- assert(channel < m_channels);
+ assert(channel < m_channels);
// force an update before we start
- channel_t &chan = m_channel[channel];
- chan.source = NULL;
- chan.source_num = -1;
+ channel_t &chan = m_channel[channel];
+ chan.source = NULL;
+ chan.source_num = -1;
}
@@ -238,10 +238,10 @@ void samples_device::stop_all()
UINT32 samples_device::base_frequency(UINT8 channel) const
{
- assert(channel < m_channels);
+ assert(channel < m_channels);
// force an update before we start
- const channel_t &chan = m_channel[channel];
+ const channel_t &chan = m_channel[channel];
chan.stream->update();
return chan.basefreq;
}
@@ -254,10 +254,10 @@ UINT32 samples_device::base_frequency(UINT8 channel) const
bool samples_device::playing(UINT8 channel) const
{
- assert(channel < m_channels);
+ assert(channel < m_channels);
// force an update before we start
- const channel_t &chan = m_channel[channel];
+ const channel_t &chan = m_channel[channel];
chan.stream->update();
return (chan.source != NULL);
}
@@ -283,7 +283,7 @@ void samples_device::device_start()
{
// initialize channel
channel_t &chan = m_channel[channel];
- chan.stream = stream_alloc(0, 1, machine().sample_rate());
+ chan.stream = stream_alloc(0, 1, machine().sample_rate());
chan.source = NULL;
chan.source_num = -1;
chan.step = 0;
@@ -291,13 +291,13 @@ void samples_device::device_start()
chan.paused = 0;
// register with the save state system
- save_item(NAME(chan.source_length), channel);
- save_item(NAME(chan.source_num), channel);
- save_item(NAME(chan.pos), channel);
- save_item(NAME(chan.frac), channel);
- save_item(NAME(chan.step), channel);
- save_item(NAME(chan.loop), channel);
- save_item(NAME(chan.paused), channel);
+ save_item(NAME(chan.source_length), channel);
+ save_item(NAME(chan.source_num), channel);
+ save_item(NAME(chan.pos), channel);
+ save_item(NAME(chan.frac), channel);
+ save_item(NAME(chan.step), channel);
+ save_item(NAME(chan.loop), channel);
+ save_item(NAME(chan.paused), channel);
}
// initialize any custom handlers