summaryrefslogtreecommitdiffstats
path: root/server/reds.c
diff options
context:
space:
mode:
authorChristophe Fergeau <cfergeau@redhat.com>2015-07-10 11:13:53 +0200
committerChristophe Fergeau <cfergeau@redhat.com>2015-07-29 17:40:48 +0200
commitde66161c6e3f99a1ae140b74d25171b3a24780e9 (patch)
treea13fe01d3fca72a89e9c71b19c810c844d4192f7 /server/reds.c
parent04d9d790132127ae3b70dd86c1a7e914498d9dab (diff)
downloadspice-de66161c6e3f99a1ae140b74d25171b3a24780e9.tar.gz
spice-de66161c6e3f99a1ae140b74d25171b3a24780e9.tar.xz
spice-de66161c6e3f99a1ae140b74d25171b3a24780e9.zip
Adjust to new SpiceImageCompress name
This has been renamed to SpiceImageCompression in order to avoid clashes with older spice-server in the SPICE_IMAGE_COMPRESS_ namespace. This commit is a straight rename of SpiceImageCompress to SpiceImageCompression and SPICE_IMAGE_COMPRESS_ to SPICE_IMAGE_COMPRESSION_
Diffstat (limited to 'server/reds.c')
-rw-r--r--server/reds.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/server/reds.c b/server/reds.c
index c74894a0..cec28b8e 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -111,7 +111,7 @@ static int ticketing_enabled = 1; //Ticketing is enabled by default
static pthread_mutex_t *lock_cs;
static long *lock_count;
uint32_t streaming_video = SPICE_STREAM_VIDEO_FILTER;
-SpiceImageCompress image_compression = SPICE_IMAGE_COMPRESS_AUTO_GLZ;
+SpiceImageCompression image_compression = SPICE_IMAGE_COMPRESSION_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;
@@ -2709,7 +2709,7 @@ static inline void on_activating_ticketing(void)
}
}
-static void set_image_compression(SpiceImageCompress val)
+static void set_image_compression(SpiceImageCompression val)
{
if (val == image_compression) {
return;
@@ -3553,13 +3553,13 @@ SPICE_GNUC_VISIBLE int spice_server_set_tls(SpiceServer *s, int port,
}
SPICE_GNUC_VISIBLE int spice_server_set_image_compression(SpiceServer *s,
- SpiceImageCompress comp)
+ SpiceImageCompression comp)
{
spice_assert(reds == s);
#ifndef USE_LZ4
- if (comp == SPICE_IMAGE_COMPRESS_LZ4) {
+ if (comp == SPICE_IMAGE_COMPRESSION_LZ4) {
spice_warning("LZ4 compression not supported, falling back to auto GLZ");
- comp = SPICE_IMAGE_COMPRESS_AUTO_GLZ;
+ comp = SPICE_IMAGE_COMPRESSION_AUTO_GLZ;
set_image_compression(comp);
return -1;
}
@@ -3568,7 +3568,7 @@ SPICE_GNUC_VISIBLE int spice_server_set_image_compression(SpiceServer *s,
return 0;
}
-SPICE_GNUC_VISIBLE SpiceImageCompress spice_server_get_image_compression(SpiceServer *s)
+SPICE_GNUC_VISIBLE SpiceImageCompression spice_server_get_image_compression(SpiceServer *s)
{
spice_assert(reds == s);
return image_compression;