diff options
author | Jonathon Jongsma <jjongsma@redhat.com> | 2015-01-27 14:15:07 -0600 |
---|---|---|
committer | Fabiano FidĂȘncio <fidencio@redhat.com> | 2015-02-23 23:00:45 +0100 |
commit | f03c8f9b3c09996d8f2ec714c7f5ba5f346e936c (patch) | |
tree | d5a64d9cbe37afd969679928f90e014b1c096701 | |
parent | c442e7cd2d6416f1d8e6a2f52fbcbe0b09d30eb8 (diff) | |
download | spice-f03c8f9b3c09996d8f2ec714c7f5ba5f346e936c.tar.gz spice-f03c8f9b3c09996d8f2ec714c7f5ba5f346e936c.tar.xz spice-f03c8f9b3c09996d8f2ec714c7f5ba5f346e936c.zip |
Move jpeg_state to RedsState struct
Also required adding reds_get_jpeg_state() for external access.
-rw-r--r-- | server/red-worker.c | 2 | ||||
-rw-r--r-- | server/reds-private.h | 1 | ||||
-rw-r--r-- | server/reds.c | 9 | ||||
-rw-r--r-- | server/reds.h | 2 |
4 files changed, 10 insertions, 4 deletions
diff --git a/server/red-worker.c b/server/red-worker.c index b8ef868a..8fb414c0 100644 --- a/server/red-worker.c +++ b/server/red-worker.c @@ -1701,7 +1701,7 @@ RedWorker* red_worker_new(QXLInstance *qxl, RedDispatcher *red_dispatcher) worker->red_dispatcher = red_dispatcher; worker->qxl = qxl; worker->image_compression = spice_server_get_image_compression(reds); - worker->jpeg_state = jpeg_state; + worker->jpeg_state = reds_get_jpeg_state(reds); worker->zlib_glz_state = zlib_glz_state; worker->driver_cap_monitors_config = 0; #ifdef RED_STATISTICS diff --git a/server/reds-private.h b/server/reds-private.h index 7021e4ff..467c2363 100644 --- a/server/reds-private.h +++ b/server/reds-private.h @@ -203,6 +203,7 @@ struct RedsState { int ticketing_enabled; uint32_t streaming_video; spice_image_compression_t image_compression; + spice_wan_compression_t jpeg_state; }; #endif diff --git a/server/reds.c b/server/reds.c index 1c3b9226..392052e0 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_wan_compression_t jpeg_state = SPICE_WAN_COMPRESSION_AUTO; spice_wan_compression_t zlib_glz_state = SPICE_WAN_COMPRESSION_AUTO; int agent_mouse = TRUE; int agent_copypaste = TRUE; @@ -3319,6 +3318,7 @@ SPICE_GNUC_VISIBLE SpiceServer *spice_server_new(void) reds->ticketing_enabled = TRUE; /* ticketing enabled by default */ reds->streaming_video = STREAM_VIDEO_FILTER; reds->image_compression = SPICE_IMAGE_COMPRESS_AUTO_GLZ; + reds->jpeg_state = SPICE_WAN_COMPRESSION_AUTO; return reds; } @@ -3566,7 +3566,7 @@ SPICE_GNUC_VISIBLE int spice_server_set_jpeg_compression(SpiceServer *s, spice_w return -1; } // todo: support dynamically changing the state - jpeg_state = comp; + s->jpeg_state = comp; return 0; } @@ -3906,3 +3906,8 @@ GArray* reds_get_renderers(RedsState *reds) { return reds->renderers; } + +spice_wan_compression_t reds_get_jpeg_state(RedsState *reds) +{ + return reds->jpeg_state; +} diff --git a/server/reds.h b/server/reds.h index a7051bbd..8545dbb7 100644 --- a/server/reds.h +++ b/server/reds.h @@ -75,7 +75,6 @@ enum { }; extern struct SpiceCoreInterface *core; -extern spice_wan_compression_t jpeg_state; extern spice_wan_compression_t zlib_glz_state; // Temporary measures to make splitting reds.c to inputs_channel.c easier @@ -114,5 +113,6 @@ void reds_on_char_device_state_destroy(RedsState *reds, SpiceCharDeviceState *de void reds_set_client_mm_time_latency(RedsState *reds, RedClient *client, uint32_t latency); uint32_t reds_get_streaming_video(RedsState *reds); +spice_wan_compression_t reds_get_jpeg_state(RedsState *reds); #endif |