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.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/emu/sound/samples.c b/src/emu/sound/samples.c
index 611102facf9..b2620b0b8bc 100644
--- a/src/emu/sound/samples.c
+++ b/src/emu/sound/samples.c
@@ -23,14 +23,14 @@ struct _sample_channel
typedef struct _samples_info samples_info;
struct _samples_info
{
- const device_config *device;
+ running_device *device;
int numchannels; /* how many channels */
sample_channel *channel;/* array of channels */
loaded_samples *samples;/* array of samples */
};
-INLINE samples_info *get_safe_token(const device_config *device)
+INLINE samples_info *get_safe_token(running_device *device)
{
assert(device != NULL);
assert(device->token != NULL);
@@ -236,7 +236,7 @@ loaded_samples *readsamples(running_machine *machine, const char *const *samplen
/* Start one of the samples loaded from disk. Note: channel must be in the range */
/* 0 .. Samplesinterface->channels-1. It is NOT the discrete channel to pass to */
/* mixer_play_sample() */
-void sample_start(const device_config *device,int channel,int samplenum,int loop)
+void sample_start(running_device *device,int channel,int samplenum,int loop)
{
samples_info *info = get_safe_token(device);
sample_channel *chan;
@@ -267,7 +267,7 @@ void sample_start(const device_config *device,int channel,int samplenum,int loop
}
-void sample_start_raw(const device_config *device,int channel,const INT16 *sampledata,int samples,int frequency,int loop)
+void sample_start_raw(running_device *device,int channel,const INT16 *sampledata,int samples,int frequency,int loop)
{
samples_info *info = get_safe_token(device);
sample_channel *chan;
@@ -291,7 +291,7 @@ void sample_start_raw(const device_config *device,int channel,const INT16 *sampl
}
-void sample_set_freq(const device_config *device,int channel,int freq)
+void sample_set_freq(running_device *device,int channel,int freq)
{
samples_info *info = get_safe_token(device);
sample_channel *chan;
@@ -307,7 +307,7 @@ void sample_set_freq(const device_config *device,int channel,int freq)
}
-void sample_set_volume(const device_config *device,int channel,float volume)
+void sample_set_volume(running_device *device,int channel,float volume)
{
samples_info *info = get_safe_token(device);
sample_channel *chan;
@@ -320,7 +320,7 @@ void sample_set_volume(const device_config *device,int channel,float volume)
}
-void sample_set_pause(const device_config *device,int channel,int pause)
+void sample_set_pause(running_device *device,int channel,int pause)
{
samples_info *info = get_safe_token(device);
sample_channel *chan;
@@ -336,7 +336,7 @@ void sample_set_pause(const device_config *device,int channel,int pause)
}
-void sample_stop(const device_config *device,int channel)
+void sample_stop(running_device *device,int channel)
{
samples_info *info = get_safe_token(device);
sample_channel *chan;
@@ -352,7 +352,7 @@ void sample_stop(const device_config *device,int channel)
}
-int sample_get_base_freq(const device_config *device,int channel)
+int sample_get_base_freq(running_device *device,int channel)
{
samples_info *info = get_safe_token(device);
sample_channel *chan;
@@ -367,7 +367,7 @@ int sample_get_base_freq(const device_config *device,int channel)
}
-int sample_playing(const device_config *device,int channel)
+int sample_playing(running_device *device,int channel)
{
samples_info *info = get_safe_token(device);
sample_channel *chan;
@@ -472,7 +472,7 @@ static STATE_POSTLOAD( samples_postload )
static DEVICE_START( samples )
{
int i;
- const samples_interface *intf = (const samples_interface *)device->static_config;
+ const samples_interface *intf = (const samples_interface *)device->baseconfig().static_config;
samples_info *info = get_safe_token(device);
info->device = device;