[Spice-devel] [PATCH 07/16] Change reds_enable_mm_time() to take RedsState arg

Frediano Ziglio fziglio at redhat.com
Wed Jan 20 07:43:33 PST 2016


From: Jonathon Jongsma <jjongsma at redhat.com>

---
 server/reds.c  | 2 +-
 server/reds.h  | 2 +-
 server/sound.c | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/server/reds.c b/server/reds.c
index da2555a..6232f1d 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -2962,7 +2962,7 @@ uint32_t reds_get_mm_time(void)
     return spice_get_monotonic_time_ms();
 }
 
-void reds_enable_mm_time(void)
+void reds_enable_mm_time(RedsState *reds)
 {
     reds->mm_time_enabled = TRUE;
     reds->mm_time_latency = MM_TIME_DELTA;
diff --git a/server/reds.h b/server/reds.h
index 8bf3210..6afd5b7 100644
--- a/server/reds.h
+++ b/server/reds.h
@@ -51,7 +51,7 @@ struct SpiceMigrateState {
 void reds_handle_channel_event(int event, SpiceChannelEventInfo *info);
 
 void reds_disable_mm_time(void);
-void reds_enable_mm_time(void);
+void reds_enable_mm_time(RedsState *reds);
 uint32_t reds_get_mm_time(void);
 void reds_set_client_mouse_allowed(RedsState *reds,
                                    int is_client_mouse_allowed,
diff --git a/server/sound.c b/server/sound.c
index b785652..09d732d 100644
--- a/server/sound.c
+++ b/server/sound.c
@@ -1060,7 +1060,7 @@ SPICE_GNUC_VISIBLE void spice_server_playback_stop(SpicePlaybackInstance *sin)
     if (!channel)
         return;
     spice_assert(playback_channel->base.active);
-    reds_enable_mm_time();
+    reds_enable_mm_time(reds);
     playback_channel->base.active = FALSE;
     if (playback_channel->base.client_active) {
         snd_set_command(&playback_channel->base, SND_PLAYBACK_CTRL_MASK);
@@ -1183,7 +1183,7 @@ static void snd_playback_cleanup(SndChannel *channel)
     PlaybackChannel *playback_channel = SPICE_CONTAINEROF(channel, PlaybackChannel, base);
 
     if (playback_channel->base.active) {
-        reds_enable_mm_time();
+        reds_enable_mm_time(reds);
     }
 
     snd_codec_destroy(&playback_channel->codec);
-- 
2.4.3



More information about the Spice-devel mailing list