devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

working volume control in the sim

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14097 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2007-07-31 11:41:42 +00:00
parent 1bc3b7feb2
commit 42e42226b8
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
firmware/sound.c
View file

@ -663,9 +663,10 @@ void sound_set_superbass(int value)
#endif /* (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) */ #endif /* (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) */
#else /* SIMULATOR */ #else /* SIMULATOR */
int sim_volume;
void sound_set_volume(int value) void sound_set_volume(int value)
{ {
(void)value; sim_volume =128*(value +40)/46; /* 128 is SDL_MIX_MAXVOLUME */
} }
void sound_set_balance(int value) void sound_set_balance(int value)

7
uisimulator/sdl/sound.c
View file

@ -286,6 +286,7 @@ void pcm_calculate_peaks(int *left, int *right)
} }
} }
extern int sim_volume; /* in firmware/sound.c
void write_to_soundcard(struct pcm_udata *udata) { void write_to_soundcard(struct pcm_udata *udata) {
if (cvt.needed) { if (cvt.needed) {
Uint32 rd = udata->num_in; Uint32 rd = udata->num_in;
@ -315,8 +316,7 @@ void write_to_soundcard(struct pcm_udata *udata) {
memcpy(cvt.buf, pcm_data, cvt.len); memcpy(cvt.buf, pcm_data, cvt.len);
SDL_ConvertAudio(&cvt); SDL_ConvertAudio(&cvt);
SDL_MixAudio(udata->stream, cvt.buf, cvt.len_cvt, sim_volume);
memcpy(udata->stream, cvt.buf, cvt.len_cvt);
udata->num_in = cvt.len / pcm_sample_bytes; udata->num_in = cvt.len / pcm_sample_bytes;
udata->num_out = cvt.len_cvt / pcm_sample_bytes; udata->num_out = cvt.len_cvt / pcm_sample_bytes;
@ -357,7 +357,8 @@ void write_to_soundcard(struct pcm_udata *udata) {
} }
} else { } else {
udata->num_in = udata->num_out = MIN(udata->num_in, udata->num_out); udata->num_in = udata->num_out = MIN(udata->num_in, udata->num_out);
memcpy(udata->stream, pcm_data, udata->num_out * pcm_sample_bytes); SDL_MixAudio(udata->stream, pcm_data,
udata->num_out * pcm_sample_bytes, sim_volume);
if (udata->debug != NULL) { if (udata->debug != NULL) {
fwrite(pcm_data, sizeof(Uint8), udata->num_out * pcm_sample_bytes, fwrite(pcm_data, sizeof(Uint8), udata->num_out * pcm_sample_bytes,