diff options
| author | Jonathon Jongsma <jjongsma@redhat.com> | 2015-01-19 16:09:27 -0600 |
|---|---|---|
| committer | Fabiano Fidêncio <fidencio@redhat.com> | 2015-02-23 23:00:44 +0100 |
| commit | 84eeef332dd03f2de41dec124b21ca06ef1398f1 (patch) | |
| tree | 0fd95fb2a00df409015a07b1ebb399a2f8ee1855 | |
| parent | 915ec59b399fbf984154918bf5366ca0d675eb3d (diff) | |
| download | spice-84eeef332dd03f2de41dec124b21ca06ef1398f1.tar.gz spice-84eeef332dd03f2de41dec124b21ca06ef1398f1.tar.xz spice-84eeef332dd03f2de41dec124b21ca06ef1398f1.zip | |
Change reds_enable_mm_time() to take RedsState arg
| -rw-r--r-- | server/reds.c | 2 | ||||
| -rw-r--r-- | server/reds.h | 2 | ||||
| -rw-r--r-- | server/sound.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/server/reds.c b/server/reds.c index a2a9ad7e..c93abf62 100644 --- a/server/reds.c +++ b/server/reds.c @@ -2839,7 +2839,7 @@ uint32_t reds_get_mm_time(void) return time_space.tv_sec * 1000 + time_space.tv_nsec / 1000 / 1000; } -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 bb91c425..d7a25c1c 100644 --- a/server/reds.h +++ b/server/reds.h @@ -53,7 +53,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 0dadbd83..98254309 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); |