[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/11] audio/spice: add support for volume control
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH 07/11] audio/spice: add support for volume control |
Date: |
Mon, 12 Mar 2012 19:50:07 +0100 |
Use Spice server volume control API when available.
---
audio/spiceaudio.c | 41 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 41 insertions(+), 0 deletions(-)
diff --git a/audio/spiceaudio.c b/audio/spiceaudio.c
index f972110..92964ae 100644
--- a/audio/spiceaudio.c
+++ b/audio/spiceaudio.c
@@ -202,7 +202,26 @@ static int line_out_ctl (HWVoiceOut *hw, int cmd, ...)
}
spice_server_playback_stop (&out->sin);
break;
+ case VOICE_VOLUME:
+ {
+#if ((SPICE_INTERFACE_PLAYBACK_MAJOR >= 1) && (SPICE_INTERFACE_PLAYBACK_MINOR
>= 2))
+ SWVoiceOut *sw;
+ va_list ap;
+ uint16_t vol[2];
+
+ va_start (ap, cmd);
+ sw = va_arg (ap, SWVoiceOut *);
+ va_end (ap);
+
+ vol[0] = sw->vol.l >> 16;
+ vol[1] = sw->vol.r >> 16;
+ spice_server_playback_set_volume (&out->sin, 2, vol);
+ spice_server_playback_set_mute (&out->sin, sw->vol.mute);
+#endif
+ break;
+ }
}
+
return 0;
}
@@ -304,7 +323,26 @@ static int line_in_ctl (HWVoiceIn *hw, int cmd, ...)
in->active = 0;
spice_server_record_stop (&in->sin);
break;
+ case VOICE_VOLUME:
+ {
+#if ((SPICE_INTERFACE_RECORD_MAJOR >= 2) && (SPICE_INTERFACE_RECORD_MINOR >=
2))
+ SWVoiceIn *sw;
+ va_list ap;
+ uint16_t vol[2];
+
+ va_start (ap, cmd);
+ sw = va_arg (ap, SWVoiceIn *);
+ va_end (ap);
+
+ vol[0] = sw->vol.l >> 16;
+ vol[1] = sw->vol.r >> 16;
+ spice_server_record_set_volume (&in->sin, 2, vol);
+ spice_server_record_set_mute (&in->sin, sw->vol.mute);
+#endif
+ break;
+ }
}
+
return 0;
}
@@ -337,6 +375,9 @@ struct audio_driver spice_audio_driver = {
.max_voices_in = 1,
.voice_size_out = sizeof (SpiceVoiceOut),
.voice_size_in = sizeof (SpiceVoiceIn),
+#if ((SPICE_INTERFACE_PLAYBACK_MAJOR >= 1) && (SPICE_INTERFACE_PLAYBACK_MINOR
>= 2))
+ .ctl_caps = VOICE_VOLUME_CAP
+#endif
};
void qemu_spice_audio_init (void)
--
1.7.7.6
- [Qemu-devel] [PATCH 03/11] audio: use a nominal volume of UINT_MAX, (continued)
[Qemu-devel] [PATCH 05/11] hw/ac97: the volume mask is not only 0x1f, Marc-André Lureau, 2012/03/12
[Qemu-devel] [PATCH 04/11] hw/ac97: remove USE_MIXER code, Marc-André Lureau, 2012/03/12
[Qemu-devel] [PATCH 06/11] hw/ac97: add support for volume control, Marc-André Lureau, 2012/03/12
[Qemu-devel] [PATCH 07/11] audio/spice: add support for volume control,
Marc-André Lureau <=
[Qemu-devel] [PATCH 11/11] Make mixemu mandatory, Marc-André Lureau, 2012/03/12
[Qemu-devel] [PATCH 08/11] Do not use pa_simple PulseAudio API, Marc-André Lureau, 2012/03/12
[Qemu-devel] [PATCH 09/11] configure: pa_simple is not needed anymore, Marc-André Lureau, 2012/03/12
[Qemu-devel] [PATCH 10/11] Allow controlling volume with PulseAudio backend, Marc-André Lureau, 2012/03/12
Re: [Qemu-devel] [PATCH 00/11] apply volume on client side (v3), malc, 2012/03/12