summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author Curt Coder <curtcoder@mail.com>2009-05-04 13:18:58 +0000
committer Curt Coder <curtcoder@mail.com>2009-05-04 13:18:58 +0000
commit91a7d9908bad55e9ba986543882053933d3ba90d (patch)
tree31e87b6549bf355c0005fcfd74336e0ae2947f44 /src
parent1067adb1a1a70884c31a8403408a353640e900ac (diff)
Converted the WAVE sound device to stereo (for MESS).
Diffstat (limited to 'src')
-rw-r--r--src/emu/sound/wave.c31
1 files changed, 18 insertions, 13 deletions
diff --git a/src/emu/sound/wave.c b/src/emu/sound/wave.c
index 14c82ca06a9..d9b5e1dd265 100644
--- a/src/emu/sound/wave.c
+++ b/src/emu/sound/wave.c
@@ -19,8 +19,6 @@
#define ALWAYS_PLAY_SOUND 0
-
-
static STREAM_UPDATE( wave_sound_update )
{
#ifdef MESS
@@ -29,26 +27,33 @@ static STREAM_UPDATE( wave_sound_update )
cassette_state state;
double time_index;
double duration;
- stream_sample_t *buffer = outputs[0];
+ stream_sample_t *left_buffer = outputs[0];
+ stream_sample_t *right_buffer = outputs[1];
int i;
state = cassette_get_state(image);
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))))
{
cassette = cassette_get_image(image);
time_index = cassette_get_position(image);
duration = ((double) samples) / image->machine->sample_rate;
- cassette_get_samples(cassette, 0, time_index, duration, samples, 2, buffer, CASSETTE_WAVEFORM_16BIT);
+ cassette_get_samples(cassette, 0, time_index, duration, samples, 2, left_buffer, CASSETTE_WAVEFORM_16BIT);
+ cassette_get_samples(cassette, 1, time_index, duration, samples, 2, right_buffer, CASSETTE_WAVEFORM_16BIT);
- for (i = samples-1; i >= 0; i--)
- buffer[i] = ((INT16 *) buffer)[i];
+ for (i = samples - 1; i >= 0; i--)
+ {
+ left_buffer[i] = ((INT16 *) left_buffer)[i];
+ right_buffer[i] = ((INT16 *) right_buffer)[i];
+ }
}
else
{
- memset(buffer, 0, sizeof(*buffer) * samples);
+ memset(left_buffer, 0, sizeof(*left_buffer) * samples);
+ memset(right_buffer, 0, sizeof(*right_buffer) * samples);
}
#endif
}
@@ -65,7 +70,7 @@ static DEVICE_START( wave )
#ifdef MESS
image = devtag_get_device( device->machine, (const char *)device->static_config );
#endif
- stream_create(device, 0, 1, device->machine->sample_rate, (void *)image, wave_sound_update);
+ stream_create(device, 0, 2, device->machine->sample_rate, (void *)image, wave_sound_update);
}
@@ -82,15 +87,15 @@ DEVICE_GET_INFO( wave )
case DEVINFO_INT_TOKEN_BYTES: info->i = 0; break;
/* --- the following bits of info are returned as pointers to data or functions --- */
- case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( wave ); break;
+ case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( wave ); break;
case DEVINFO_FCT_STOP: /* nothing */ break;
case DEVINFO_FCT_RESET: /* nothing */ break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
case DEVINFO_STR_NAME: strcpy(info->s, "Cassette"); break;
- case DEVINFO_STR_FAMILY: strcpy(info->s, "Cassette"); break;
- case DEVINFO_STR_VERSION: strcpy(info->s, "1.0"); break;
- case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break;
- case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright The MESS Team"); break;
+ case DEVINFO_STR_FAMILY: strcpy(info->s, "Cassette"); break;
+ case DEVINFO_STR_VERSION: strcpy(info->s, "1.0"); break;
+ case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break;
+ case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright The MESS Team"); break;
}
}