summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/sound/samples.c
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2011-03-28 09:10:17 +0000
committer Aaron Giles <aaron@aarongiles.com>2011-03-28 09:10:17 +0000
commitaf071893a63485d60b1c52d9f15501d2213c8e5e (patch)
tree16635e21ef67490e0e585e45e4c8698ff520d073 /src/emu/sound/samples.c
parent58f70e918446d6940d8192adc240b4d60be66c3d (diff)
Cleanup of machine.h. Shuffled some fields around, and moved several
to private member variables with accessors: machine->m_respool ==> machine->respool() machine->config ==> machine->config() machine->gamedrv ==> machine->system() machine->m_regionlist ==> machine->first_region() machine->sample_rate ==> machine->sample_rate() Also converted internal lists to use simple_list.
Diffstat (limited to 'src/emu/sound/samples.c')
-rw-r--r--src/emu/sound/samples.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/emu/sound/samples.c b/src/emu/sound/samples.c
index b4bfdd059ce..2d76933a3ed 100644
--- a/src/emu/sound/samples.c
+++ b/src/emu/sound/samples.c
@@ -251,7 +251,7 @@ void sample_start(device_t *device,int channel,int samplenum,int loop)
chan->pos = 0;
chan->frac = 0;
chan->basefreq = sample->frequency;
- chan->step = ((INT64)chan->basefreq << FRAC_BITS) / info->device->machine->sample_rate;
+ chan->step = ((INT64)chan->basefreq << FRAC_BITS) / info->device->machine->sample_rate();
chan->loop = loop;
}
@@ -275,7 +275,7 @@ void sample_start_raw(device_t *device,int channel,const INT16 *sampledata,int s
chan->pos = 0;
chan->frac = 0;
chan->basefreq = frequency;
- chan->step = ((INT64)chan->basefreq << FRAC_BITS) / info->device->machine->sample_rate;
+ chan->step = ((INT64)chan->basefreq << FRAC_BITS) / info->device->machine->sample_rate();
chan->loop = loop;
}
@@ -292,7 +292,7 @@ void sample_set_freq(device_t *device,int channel,int freq)
/* force an update before we start */
chan->stream->update();
- chan->step = ((INT64)freq << FRAC_BITS) / info->device->machine->sample_rate;
+ chan->step = ((INT64)freq << FRAC_BITS) / info->device->machine->sample_rate();
}
@@ -468,7 +468,7 @@ static DEVICE_START( samples )
/* read audio samples */
if (intf->samplenames)
- info->samples = readsamples(device->machine, intf->samplenames,device->machine->gamedrv->name);
+ info->samples = readsamples(device->machine, intf->samplenames,device->machine->system().name);
/* allocate channels */
info->numchannels = intf->channels;
@@ -476,7 +476,7 @@ static DEVICE_START( samples )
info->channel = auto_alloc_array(device->machine, sample_channel, info->numchannels);
for (i = 0; i < info->numchannels; i++)
{
- info->channel[i].stream = device->machine->sound().stream_alloc(*device, 0, 1, device->machine->sample_rate, &info->channel[i], sample_update_sound);
+ info->channel[i].stream = device->machine->sound().stream_alloc(*device, 0, 1, device->machine->sample_rate(), &info->channel[i], sample_update_sound);
info->channel[i].source = NULL;
info->channel[i].source_num = -1;