diff options
author | Jonathon Jongsma <jjongsma@redhat.com> | 2015-01-19 16:10:42 -0600 |
---|---|---|
committer | Fabiano FidĂȘncio <fidencio@redhat.com> | 2015-02-23 23:00:44 +0100 |
commit | 858a76a5cf0a04dc76abf237d6911e4f8faad65d (patch) | |
tree | bdc1ff449e34be5fbe761775c0a3916dadd4090e | |
parent | 84eeef332dd03f2de41dec124b21ca06ef1398f1 (diff) | |
download | spice-858a76a5cf0a04dc76abf237d6911e4f8faad65d.tar.gz spice-858a76a5cf0a04dc76abf237d6911e4f8faad65d.tar.xz spice-858a76a5cf0a04dc76abf237d6911e4f8faad65d.zip |
Change reds_disable_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 c93abf62..e2fe2777 100644 --- a/server/reds.c +++ b/server/reds.c @@ -2846,7 +2846,7 @@ void reds_enable_mm_time(RedsState *reds) reds_send_mm_time(reds); } -void reds_disable_mm_time(void) +void reds_disable_mm_time(RedsState *reds) { reds->mm_time_enabled = FALSE; } diff --git a/server/reds.h b/server/reds.h index d7a25c1c..fd6f39f9 100644 --- a/server/reds.h +++ b/server/reds.h @@ -52,7 +52,7 @@ struct SpiceMigrateState { /* main thread only */ void reds_handle_channel_event(int event, SpiceChannelEventInfo *info); -void reds_disable_mm_time(void); +void reds_disable_mm_time(RedsState *reds); void reds_enable_mm_time(RedsState *reds); uint32_t reds_get_mm_time(void); void reds_set_client_mouse_allowed(RedsState *reds, diff --git a/server/sound.c b/server/sound.c index 98254309..3f9c3022 100644 --- a/server/sound.c +++ b/server/sound.c @@ -1041,7 +1041,7 @@ SPICE_GNUC_VISIBLE void spice_server_playback_start(SpicePlaybackInstance *sin) if (!channel) return; spice_assert(!playback_channel->base.active); - reds_disable_mm_time(); + reds_disable_mm_time(reds); playback_channel->base.active = TRUE; if (!playback_channel->base.client_active) { snd_set_command(&playback_channel->base, SND_PLAYBACK_CTRL_MASK); @@ -1174,7 +1174,7 @@ static void on_new_playback_channel(SndWorker *worker) snd_set_command((SndChannel *)playback_channel, SND_PLAYBACK_VOLUME_MASK); } if (playback_channel->base.active) { - reds_disable_mm_time(); + reds_disable_mm_time(reds); } } |