summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/sound
diff options
context:
space:
mode:
Diffstat (limited to 'src/emu/sound')
-rw-r--r--src/emu/sound/sidenvel.c1
-rw-r--r--src/emu/sound/sidvoice.c1
-rw-r--r--src/emu/sound/wave.c10
3 files changed, 7 insertions, 5 deletions
diff --git a/src/emu/sound/sidenvel.c b/src/emu/sound/sidenvel.c
index d27158783f1..732aa3feba8 100644
--- a/src/emu/sound/sidenvel.c
+++ b/src/emu/sound/sidenvel.c
@@ -30,6 +30,7 @@
/* */
/*========================================================================= */
+#include "emu.h"
#include "sidvoice.h"
#include "sid.h"
diff --git a/src/emu/sound/sidvoice.c b/src/emu/sound/sidvoice.c
index e6b77f0f517..32387b569bc 100644
--- a/src/emu/sound/sidvoice.c
+++ b/src/emu/sound/sidvoice.c
@@ -1,3 +1,4 @@
+#include "emu.h"
#include "sidvoice.h"
#include "sid.h"
#include "sidenvel.h"
diff --git a/src/emu/sound/wave.c b/src/emu/sound/wave.c
index 4d82a83c34a..3a051957cd5 100644
--- a/src/emu/sound/wave.c
+++ b/src/emu/sound/wave.c
@@ -22,7 +22,7 @@
static STREAM_UPDATE( wave_sound_update )
{
#ifdef MESS
- running_device *image = param;
+ const device_config *image = (const device_config *)param;
cassette_image *cassette;
cassette_state state;
double time_index;
@@ -33,7 +33,7 @@ static STREAM_UPDATE( wave_sound_update )
state = cassette_get_state(image);
- state &= CASSETTE_MASK_UISTATE | CASSETTE_MASK_MOTOR | CASSETTE_MASK_SPEAKER;
+ state = (cassette_state)(state & (CASSETTE_MASK_UISTATE | CASSETTE_MASK_MOTOR | CASSETTE_MASK_SPEAKER));
if (image_exists(image) && (ALWAYS_PLAY_SOUND || (state == (CASSETTE_PLAY | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED))))
{
@@ -62,13 +62,13 @@ static STREAM_UPDATE( wave_sound_update )
static DEVICE_START( wave )
{
- running_device *image = NULL;
+ const device_config *image = NULL;
assert( device != NULL );
- assert( device->baseconfig().static_config != NULL );
+ assert( device->static_config != NULL );
#ifdef MESS
- image = device->machine->device( (const char *)device->baseconfig().static_config );
+ image = device->machine->device( (const char *)device->static_config );
#endif
stream_create(device, 0, 2, device->machine->sample_rate, (void *)image, wave_sound_update);
}