[Spice-devel] [spice-gtk PATCH v2 5/7] agent: sync guest audio with client values
Victor Toso
victortoso at redhat.com
Mon Mar 23 06:26:29 PDT 2015
Functions to sync volume and mute value when necessary. In this patch,
only one sync is allowed per connection.
Related: https://bugzilla.redhat.com/show_bug.cgi?id=1012868
---
gtk/channel-main.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++
gtk/spice-audio-priv.h | 3 ++
gtk/spice-session-priv.h | 2 +-
3 files changed, 95 insertions(+), 1 deletion(-)
diff --git a/gtk/channel-main.c b/gtk/channel-main.c
index 82169aa..ce9241d 100644
--- a/gtk/channel-main.c
+++ b/gtk/channel-main.c
@@ -30,6 +30,7 @@
#include "spice-util-priv.h"
#include "spice-channel-priv.h"
#include "spice-session-priv.h"
+#include "spice-audio-priv.h"
/**
* SECTION:channel-main
@@ -77,6 +78,8 @@ struct _SpiceMainChannelPrivate {
enum SpiceMouseMode mouse_mode;
bool agent_connected;
bool agent_caps_received;
+ bool agent_volume_playback_sync;
+ bool agent_volume_record_sync;
gboolean agent_display_config_sent;
guint8 display_color_depth;
@@ -187,6 +190,7 @@ static const char *agent_msg_types[] = {
[ VD_AGENT_CLIPBOARD_GRAB ] = "clipboard grab",
[ VD_AGENT_CLIPBOARD_REQUEST ] = "clipboard request",
[ VD_AGENT_CLIPBOARD_RELEASE ] = "clipboard release",
+ [ VD_AGENT_AUDIO_VOLUME_SYNC ] = "volume-sync",
};
static const char *agent_caps[] = {
@@ -201,6 +205,7 @@ static const char *agent_caps[] = {
[ VD_AGENT_CAP_GUEST_LINEEND_LF ] = "line-end lf",
[ VD_AGENT_CAP_GUEST_LINEEND_CRLF ] = "line-end crlf",
[ VD_AGENT_CAP_MAX_CLIPBOARD ] = "max-clipboard",
+ [ VD_AGENT_CAP_AUDIO_VOLUME_SYNC ] = "volume-sync",
};
#define NAME(_a, _i) ((_i) < SPICE_N_ELEMENTS(_a) ? (_a[(_i)] ?: "?") : "?")
@@ -1092,6 +1097,90 @@ gboolean spice_main_send_monitor_config(SpiceMainChannel *channel)
return TRUE;
}
+void agent_sync_audio_playback(SpiceChannel *channel)
+{
+ VDAgentAudioVolumeSync *avs;
+ SpiceSession *session = spice_channel_get_session(channel);
+ SpiceAudio *audio = spice_audio_get(session, NULL);
+ SpiceMainChannel *main_channel = SPICE_MAIN_CHANNEL(channel);
+ SpiceMainChannelPrivate *c = main_channel->priv;
+ guint16 *volume;
+ guint8 nchannels;
+ gboolean mute;
+ gsize array_size;
+
+ if (!test_agent_cap(main_channel, VD_AGENT_CAP_AUDIO_VOLUME_SYNC) ||
+ c->agent_volume_playback_sync == true) {
+ SPICE_DEBUG("%s: is not going to sync", __func__);
+ return;
+ }
+
+ mute = SPICE_AUDIO_GET_CLASS(audio)->get_playback_mute(audio);
+ volume = SPICE_AUDIO_GET_CLASS(audio)->get_playback_volume(audio, &nchannels);
+ if (volume == NULL || nchannels == 0) {
+ SPICE_DEBUG ("Failed to get playback sync data");
+ return;
+ }
+
+ /* only one per connection */
+ c->agent_volume_playback_sync = true;
+
+ array_size = sizeof(uint16_t) * nchannels;
+ avs = g_malloc0(sizeof(VDAgentAudioVolumeSync) + array_size);
+ avs->flags |= (mute) ? VD_AGENT_AUDIO_VOLUME_SYNC_FLAG_IS_MUTE : 0;
+ avs->flags |= VD_AGENT_AUDIO_VOLUME_SYNC_FLAG_IS_PLAYBACK;
+ avs->nchannels = nchannels;
+ memcpy(avs->volume, volume, array_size);
+
+ SPICE_DEBUG ("%s mute=%s nchannels=%u volume[0]=%u flags=0x%02x",
+ __func__, spice_yes_no(mute), nchannels, volume[0], avs->flags);
+ g_clear_pointer (&volume, g_free);
+ agent_msg_queue(main_channel, VD_AGENT_AUDIO_VOLUME_SYNC,
+ sizeof(VDAgentAudioVolumeSync) + array_size, avs);
+}
+
+void agent_sync_audio_record(SpiceChannel *channel)
+{
+ VDAgentAudioVolumeSync *avs;
+ SpiceSession *session = spice_channel_get_session(SPICE_CHANNEL(channel));
+ SpiceAudio *audio = spice_audio_get(session, NULL);
+ SpiceMainChannel *main_channel = SPICE_MAIN_CHANNEL(channel);
+ SpiceMainChannelPrivate *c = main_channel->priv;
+ guint16 *volume;
+ guint8 nchannels;
+ gboolean mute;
+ gsize array_size;
+
+ if (!test_agent_cap(main_channel, VD_AGENT_CAP_AUDIO_VOLUME_SYNC) ||
+ c->agent_volume_record_sync == true) {
+ SPICE_DEBUG("%s: is not going to sync", __func__);
+ return;
+ }
+
+ mute = SPICE_AUDIO_GET_CLASS(audio)->get_record_mute(audio);
+ volume = SPICE_AUDIO_GET_CLASS(audio)->get_record_volume(audio, &nchannels);
+ if (volume == NULL || nchannels == 0) {
+ SPICE_DEBUG ("Failed to get record sync data");
+ return;
+ }
+
+ /* only one per connection */
+ c->agent_volume_record_sync = true;
+
+ array_size = sizeof(uint16_t) * nchannels;
+ avs = g_malloc0(sizeof(VDAgentAudioVolumeSync) + array_size);
+ avs->flags |= (mute) ? VD_AGENT_AUDIO_VOLUME_SYNC_FLAG_IS_MUTE : 0;
+ avs->flags |= VD_AGENT_AUDIO_VOLUME_SYNC_FLAG_IS_RECORD;
+ avs->nchannels = nchannels;
+ memcpy(avs->volume, volume, array_size);
+
+ SPICE_DEBUG ("%s mute=%s nchannels=%u volume[0]=%u flags=0x%02x",
+ __func__, spice_yes_no(mute), nchannels, volume[0], avs->flags);
+ g_clear_pointer (&volume, g_free);
+ agent_msg_queue(main_channel, VD_AGENT_AUDIO_VOLUME_SYNC,
+ sizeof(VDAgentAudioVolumeSync) + array_size, avs);
+}
+
/* any context: the message is not flushed immediately,
you can wakeup() the channel coroutine or send_msg_queue() */
static void agent_display_config(SpiceMainChannel *channel)
@@ -1345,6 +1434,8 @@ static void agent_start(SpiceMainChannel *channel)
};
SpiceMsgOut *out;
+ c->agent_volume_playback_sync = false;
+ c->agent_volume_record_sync = false;
c->agent_caps_received = false;
set_agent_connected(channel, TRUE);
diff --git a/gtk/spice-audio-priv.h b/gtk/spice-audio-priv.h
index 898c5a7..d971abc 100644
--- a/gtk/spice-audio-priv.h
+++ b/gtk/spice-audio-priv.h
@@ -31,4 +31,7 @@ struct _SpiceAudioPrivate {
G_END_DECLS
+void agent_sync_audio_playback(SpiceChannel *channel);
+void agent_sync_audio_record(SpiceChannel *channel);
+
#endif /* __SPICE_AUDIO_PRIVATE_H__ */
diff --git a/gtk/spice-session-priv.h b/gtk/spice-session-priv.h
index 46938ff..049973a 100644
--- a/gtk/spice-session-priv.h
+++ b/gtk/spice-session-priv.h
@@ -98,7 +98,7 @@ PhodavServer* channel_webdav_server_new(SpiceSession *session);
guint spice_session_get_n_display_channels(SpiceSession *session);
void spice_session_set_main_channel(SpiceSession *session, SpiceChannel *channel);
gboolean spice_session_set_migration_session(SpiceSession *session, SpiceSession *mig_session);
-
+SpiceAudio *spice_audio_get(SpiceSession *session, GMainContext *context);
G_END_DECLS
#endif /* __SPICE_CLIENT_SESSION_PRIV_H__ */
--
2.1.0
More information about the Spice-devel
mailing list