diff options
author | Jonathon Jongsma <jjongsma@redhat.com> | 2015-01-27 14:12:17 -0600 |
---|---|---|
committer | Fabiano FidĂȘncio <fidencio@redhat.com> | 2015-02-23 23:00:45 +0100 |
commit | c442e7cd2d6416f1d8e6a2f52fbcbe0b09d30eb8 (patch) | |
tree | ca304ed4297556e99f805a11c80c7f71218e9fb6 /server/reds.c | |
parent | 54f4fda29cf284a03081c2316b99b46073724617 (diff) | |
download | spice-c442e7cd2d6416f1d8e6a2f52fbcbe0b09d30eb8.tar.gz spice-c442e7cd2d6416f1d8e6a2f52fbcbe0b09d30eb8.tar.xz spice-c442e7cd2d6416f1d8e6a2f52fbcbe0b09d30eb8.zip |
Move image_compression to RedsState struct
Removing more global variables
Diffstat (limited to 'server/reds.c')
-rw-r--r-- | server/reds.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/server/reds.c b/server/reds.c index fa6dc6a8..1c3b9226 100644 --- a/server/reds.c +++ b/server/reds.c @@ -91,7 +91,6 @@ SpiceCoreInterface *core = NULL; static pthread_mutex_t *lock_cs; static long *lock_count; -spice_image_compression_t image_compression = SPICE_IMAGE_COMPRESS_AUTO_GLZ; spice_wan_compression_t jpeg_state = SPICE_WAN_COMPRESSION_AUTO; spice_wan_compression_t zlib_glz_state = SPICE_WAN_COMPRESSION_AUTO; int agent_mouse = TRUE; @@ -2646,12 +2645,12 @@ static inline void on_activating_ticketing(RedsState *reds) } } -static void set_image_compression(spice_image_compression_t val) +static void reds_set_image_compression(RedsState *reds, spice_image_compression_t val) { - if (val == image_compression) { + if (val == reds->image_compression) { return; } - image_compression = val; + reds->image_compression = val; red_dispatcher_on_ic_change(); } @@ -3319,6 +3318,7 @@ SPICE_GNUC_VISIBLE SpiceServer *spice_server_new(void) memset(reds->spice_uuid, 0, sizeof(reds->spice_uuid)); reds->ticketing_enabled = TRUE; /* ticketing enabled by default */ reds->streaming_video = STREAM_VIDEO_FILTER; + reds->image_compression = SPICE_IMAGE_COMPRESS_AUTO_GLZ; return reds; } @@ -3548,14 +3548,14 @@ SPICE_GNUC_VISIBLE int spice_server_set_image_compression(SpiceServer *s, spice_image_compression_t comp) { spice_assert(reds == s); - set_image_compression(comp); + reds_set_image_compression(s, comp); return 0; } SPICE_GNUC_VISIBLE spice_image_compression_t spice_server_get_image_compression(SpiceServer *s) { spice_assert(reds == s); - return image_compression; + return s->image_compression; } SPICE_GNUC_VISIBLE int spice_server_set_jpeg_compression(SpiceServer *s, spice_wan_compression_t comp) |