[Spice-devel] [spice-gtk PATCH 5/5] agent: sync guest audio with client values

[Victor Toso]

This is done once after agent connects when it sends its capabilities.

https://bugzilla.redhat.com/show_bug.cgi?id=1012868
---
 gtk/channel-main.c       | 72 ++++++++++++++++++++++++++++++++++++++++++++++++
 gtk/spice-session-priv.h |  2 +-
 2 files changed, 73 insertions(+), 1 deletion(-)

diff --git a/gtk/channel-main.c b/gtk/channel-main.c
index 82169aa..c947185 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,7 @@ struct _SpiceMainChannelPrivate  {
     enum SpiceMouseMode         mouse_mode;
     bool                        agent_connected;
     bool                        agent_caps_received;
+    bool                        agent_volume_sync;
 
     gboolean                    agent_display_config_sent;
     guint8                      display_color_depth;
@@ -187,6 +189,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 +204,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 +1096,66 @@ gboolean spice_main_send_monitor_config(SpiceMainChannel *channel)
     return TRUE;
 }
 
+static void agent_sync_audio_playback(SpiceMainChannel *channel)
+{
+    VDAgentAudioVolumeSync *avs;
+    SpiceSession *session = spice_channel_get_session(SPICE_CHANNEL(channel));
+    SpiceAudio *audio = spice_audio_get(session, NULL);
+    guint16 *volume;
+    guint8 nchannels;
+    gboolean mute, ok;
+    gsize array_size;
+
+    ok = spice_audio_get_playback_sync_data (audio, &nchannels, &volume, &mute);
+    if (!ok || nchannels == 0) {
+        SPICE_DEBUG ("Failed to get playback sync data");
+        return;
+    }
+
+    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(channel, VD_AGENT_AUDIO_VOLUME_SYNC,
+                    sizeof(VDAgentAudioVolumeSync) + array_size, avs);
+}
+
+static void agent_sync_audio_record(SpiceMainChannel *channel)
+{
+    VDAgentAudioVolumeSync *avs;
+    SpiceSession *session = spice_channel_get_session(SPICE_CHANNEL(channel));
+    SpiceAudio *audio = spice_audio_get(session, NULL);
+    guint16 *volume;
+    guint8 nchannels;
+    gboolean mute, ok;
+    gsize array_size;
+
+    ok = spice_audio_get_record_sync_data (audio, &nchannels, &volume, &mute);
+    if (!ok || nchannels == 0) {
+        SPICE_DEBUG ("Failed to get record sync data");
+        return;
+    }
+
+    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(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 +1409,7 @@ static void agent_start(SpiceMainChannel *channel)
     };
     SpiceMsgOut *out;
 
+    c->agent_volume_sync = false;
     c->agent_caps_received = false;
     set_agent_connected(channel, TRUE);
 
@@ -1801,6 +1866,13 @@ static void main_agent_handle_msg(SpiceChannel *channel,
             c->agent_display_config_sent = true;
         }
 
+        if (test_agent_cap(self, VD_AGENT_CAP_AUDIO_VOLUME_SYNC) &&
+            c->agent_volume_sync == false) {
+            agent_sync_audio_playback(SPICE_MAIN_CHANNEL(channel));
+            agent_sync_audio_record(SPICE_MAIN_CHANNEL(channel));
+            c->agent_volume_sync = true;
+        }
+
         agent_max_clipboard(self);
 
         agent_send_msg_queue(self);
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