diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2007-07-31 11:41:42 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2007-07-31 11:41:42 +0000 |
commit | 42e42226b876a31d66b1d26b2d7d8cb566a53201 (patch) | |
tree | 7234d46888259044b8595ef53c4bcf09b6595bd7 /uisimulator/sdl/sound.c | |
parent | 1bc3b7feb2b0fc1014c41203ab82047ec94f69d4 (diff) | |
download | rockbox-42e42226b876a31d66b1d26b2d7d8cb566a53201.tar.gz rockbox-42e42226b876a31d66b1d26b2d7d8cb566a53201.zip |
working volume control in the sim
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14097 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'uisimulator/sdl/sound.c')
-rw-r--r-- | uisimulator/sdl/sound.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/uisimulator/sdl/sound.c b/uisimulator/sdl/sound.c index c3bb4d6592..0ade0c9edc 100644 --- a/uisimulator/sdl/sound.c +++ b/uisimulator/sdl/sound.c | |||
@@ -286,6 +286,7 @@ void pcm_calculate_peaks(int *left, int *right) | |||
286 | } | 286 | } |
287 | } | 287 | } |
288 | 288 | ||
289 | extern int sim_volume; /* in firmware/sound.c | ||
289 | void write_to_soundcard(struct pcm_udata *udata) { | 290 | void write_to_soundcard(struct pcm_udata *udata) { |
290 | if (cvt.needed) { | 291 | if (cvt.needed) { |
291 | Uint32 rd = udata->num_in; | 292 | Uint32 rd = udata->num_in; |
@@ -315,8 +316,7 @@ void write_to_soundcard(struct pcm_udata *udata) { | |||
315 | memcpy(cvt.buf, pcm_data, cvt.len); | 316 | memcpy(cvt.buf, pcm_data, cvt.len); |
316 | 317 | ||
317 | SDL_ConvertAudio(&cvt); | 318 | SDL_ConvertAudio(&cvt); |
318 | 319 | SDL_MixAudio(udata->stream, cvt.buf, cvt.len_cvt, sim_volume); | |
319 | memcpy(udata->stream, cvt.buf, cvt.len_cvt); | ||
320 | 320 | ||
321 | udata->num_in = cvt.len / pcm_sample_bytes; | 321 | udata->num_in = cvt.len / pcm_sample_bytes; |
322 | udata->num_out = cvt.len_cvt / pcm_sample_bytes; | 322 | udata->num_out = cvt.len_cvt / pcm_sample_bytes; |
@@ -357,7 +357,8 @@ void write_to_soundcard(struct pcm_udata *udata) { | |||
357 | } | 357 | } |
358 | } else { | 358 | } else { |
359 | udata->num_in = udata->num_out = MIN(udata->num_in, udata->num_out); | 359 | udata->num_in = udata->num_out = MIN(udata->num_in, udata->num_out); |
360 | memcpy(udata->stream, pcm_data, udata->num_out * pcm_sample_bytes); | 360 | SDL_MixAudio(udata->stream, pcm_data, |
361 | udata->num_out * pcm_sample_bytes, sim_volume); | ||
361 | 362 | ||
362 | if (udata->debug != NULL) { | 363 | if (udata->debug != NULL) { |
363 | fwrite(pcm_data, sizeof(Uint8), udata->num_out * pcm_sample_bytes, | 364 | fwrite(pcm_data, sizeof(Uint8), udata->num_out * pcm_sample_bytes, |