ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

audio: don't apply volume effect if backend has VOICE_VOLUME_CAP 

If the audio backend is capable of volume control, don't apply
software volume (mixeng_volume ()), but instead, rely on backend
volume control. This will allow guest to have full range volume
control.

Signed-off-by: Marc-Andr? Lureau <marcandre.lureau@redhat.com>
Signed-off-by: malc <av1474@comtv.ru>
This commit is contained in:
Marc-André Lureau 2012-04-17 14:32:36 +02:00 committed by malc
parent 6c95ab94f9
commit c01b245623
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
audio/audio.c
View File

@ -957,7 +957,9 @@ int audio_pcm_sw_read (SWVoiceIn *sw, void *buf, int size)
total += isamp; total += isamp;
} }
mixeng_volume (sw->buf, ret, &sw->vol); if (!(hw->ctl_caps & VOICE_VOLUME_CAP)) {
mixeng_volume (sw->buf, ret, &sw->vol);
}
sw->clip (buf, sw->buf, ret); sw->clip (buf, sw->buf, ret);
sw->total_hw_samples_acquired += total; sw->total_hw_samples_acquired += total;
@ -1041,7 +1043,10 @@ int audio_pcm_sw_write (SWVoiceOut *sw, void *buf, int size)
swlim = audio_MIN (swlim, samples); swlim = audio_MIN (swlim, samples);
if (swlim) { if (swlim) {
sw->conv (sw->buf, buf, swlim); sw->conv (sw->buf, buf, swlim);
mixeng_volume (sw->buf, swlim, &sw->vol);
if (!(sw->hw->ctl_caps & VOICE_VOLUME_CAP)) {
mixeng_volume (sw->buf, swlim, &sw->vol);
}
} }
while (swlim) { while (swlim) {

5
audio/audio_int.h
View File

@ -82,6 +82,7 @@ typedef struct HWVoiceOut {
int samples; int samples;
QLIST_HEAD (sw_out_listhead, SWVoiceOut) sw_head; QLIST_HEAD (sw_out_listhead, SWVoiceOut) sw_head;
QLIST_HEAD (sw_cap_listhead, SWVoiceCap) cap_head; QLIST_HEAD (sw_cap_listhead, SWVoiceCap) cap_head;
int ctl_caps;
struct audio_pcm_ops *pcm_ops; struct audio_pcm_ops *pcm_ops;
QLIST_ENTRY (HWVoiceOut) entries; QLIST_ENTRY (HWVoiceOut) entries;
} HWVoiceOut; } HWVoiceOut;
@ -101,6 +102,7 @@ typedef struct HWVoiceIn {
int samples; int samples;
QLIST_HEAD (sw_in_listhead, SWVoiceIn) sw_head; QLIST_HEAD (sw_in_listhead, SWVoiceIn) sw_head;
int ctl_caps;
struct audio_pcm_ops *pcm_ops; struct audio_pcm_ops *pcm_ops;
QLIST_ENTRY (HWVoiceIn) entries; QLIST_ENTRY (HWVoiceIn) entries;
} HWVoiceIn; } HWVoiceIn;
@ -150,6 +152,7 @@ struct audio_driver {
int max_voices_in; int max_voices_in;
int voice_size_out; int voice_size_out;
int voice_size_in; int voice_size_in;
int ctl_caps;
}; };
struct audio_pcm_ops { struct audio_pcm_ops {
@ -233,6 +236,8 @@ void audio_run (const char *msg);
#define VOICE_DISABLE 2 #define VOICE_DISABLE 2
#define VOICE_VOLUME 3 #define VOICE_VOLUME 3
#define VOICE_VOLUME_CAP (1 << VOICE_VOLUME)
static inline int audio_ring_dist (int dst, int src, int len) static inline int audio_ring_dist (int dst, int src, int len)
{ {
return (dst >= src) ? (dst - src) : (len - src + dst); return (dst >= src) ? (dst - src) : (len - src + dst);

2
audio/audio_template.h
View File

@ -263,6 +263,8 @@ static HW *glue (audio_pcm_hw_add_new_, TYPE) (struct audsettings *as)
} }
hw->pcm_ops = drv->pcm_ops; hw->pcm_ops = drv->pcm_ops;
hw->ctl_caps = drv->ctl_caps;
QLIST_INIT (&hw->sw_head); QLIST_INIT (&hw->sw_head);
#ifdef DAC #ifdef DAC
QLIST_INIT (&hw->cap_head); QLIST_INIT (&hw->cap_head);