85 lines
2.5 KiB
Diff
85 lines
2.5 KiB
Diff
From a9f796f670f3c34c3b5874026b61bbe4d782be2e Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@gmail.com>
|
|
Date: Tue, 17 Apr 2012 14:32:40 +0200
|
|
Subject: [PATCH 506/509] audio/spice: add support for volume control
|
|
|
|
Use Spice server volume control API when available.
|
|
|
|
Signed-off-by: Marc-Andr? Lureau <marcandre.lureau@redhat.com>
|
|
Signed-off-by: malc <av1474@comtv.ru>
|
|
---
|
|
audio/spiceaudio.c | 41 +++++++++++++++++++++++++++++++++++++++++
|
|
1 file changed, 41 insertions(+)
|
|
|
|
diff --git a/audio/spiceaudio.c b/audio/spiceaudio.c
|
|
index f972110..6f15591 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 / ((1ULL << 16) + 1);
|
|
+ vol[1] = sw->vol.r / ((1ULL << 16) + 1);
|
|
+ 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 / ((1ULL << 16) + 1);
|
|
+ vol[1] = sw->vol.r / ((1ULL << 16) + 1);
|
|
+ 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.10
|
|
|