This patchset supersedes last patchset. Changes: - rebased on current master; - removed merged patches; - merge Pavel's split of "worker: simplify surface_update_dest()"; - added some patches. Some patches on discussion were not posted. Marc-André Lureau (19): worker: changed some spice_assert in display_channel_draw_till worker: change some asserts in stream functions worker: use spice_return_if_fail() instead of spice_assert() in release_item display: replace some dubious asserts display: reuse code in display_channel_draw_until display: Simplify display_channel_create_surface display: move more logic in add_drawable() worker: remove redundant check worker: move dcc_send & marshallers to dcc-send.c server: cleanups server: move enum and struct away from red_common server: rename _tmpl files server: rename files worker: move more stream functions worker: move current_remove* worker: move red_pipes_remove_drawable display: fix generate_uid name display: rename detach_streams_behind display: remove some public declarations NEWS | 2 +- server/Makefile.am | 72 +- server/cache-item.tmpl.c | 143 ++ server/cache_item.tmpl.c | 143 -- server/canvas.c | 24 + server/canvas.h | 27 + server/char-device.c | 1035 ++++++++++ server/char-device.h | 216 ++ server/char_device.c | 1035 ---------- server/char_device.h | 216 -- server/cursor-channel.c | 2 +- server/dcc-encoders.h | 9 +- server/dcc-send.c | 2450 +++++++++++++++++++++++ server/dcc.c | 34 +- server/dcc.h | 4 + server/dispatcher.h | 2 +- server/display-channel.c | 412 +++- server/display-channel.h | 49 +- server/glz-encode-match.tmpl.c | 154 ++ server/glz-encode.tmpl.c | 574 ++++++ server/glz-encoder-dict.c | 634 ++++++ server/glz-encoder-dict.h | 71 + server/glz-encoder-priv.h | 201 ++ server/glz-encoder.c | 311 +++ server/glz-encoder.h | 74 + server/glz_encode_match_tmpl.c | 154 -- server/glz_encode_tmpl.c | 574 ------ server/glz_encoder.c | 311 --- server/glz_encoder.h | 55 - server/glz_encoder_config.h | 59 - server/glz_encoder_dictionary.c | 633 ------ server/glz_encoder_dictionary.h | 69 - server/glz_encoder_dictionary_protected.h | 186 -- server/image-cache.c | 214 ++ server/image-cache.h | 65 + server/inputs-channel.c | 679 +++++++ server/inputs-channel.h | 38 + server/inputs_channel.c | 679 ------- server/inputs_channel.h | 38 - server/jpeg-encoder.c | 249 +++ server/jpeg-encoder.h | 61 + server/jpeg_encoder.c | 248 --- server/jpeg_encoder.h | 61 - server/main-channel.c | 1345 +++++++++++++ server/main-channel.h | 103 + server/main-dispatcher.c | 217 +++ server/main-dispatcher.h | 36 + server/main_channel.c | 1345 ------------- server/main_channel.h | 103 - server/main_dispatcher.c | 217 --- server/main_dispatcher.h | 36 - server/memslot.c | 183 ++ server/memslot.h | 71 + server/migration-protocol.h | 213 ++ server/migration_protocol.h | 213 -- server/mjpeg-encoder.c | 1375 +++++++++++++ server/mjpeg-encoder.h | 100 + server/mjpeg_encoder.c | 1375 ------------- server/mjpeg_encoder.h | 100 - server/pixmap-cache.h | 1 - server/red_bitmap_utils_tmpl.c | 160 -- server/red_channel.c | 2 +- server/red_common.h | 31 +- server/red_dispatcher.c | 18 +- server/red_dispatcher.h | 2 - server/red_memslots.c | 184 -- server/red_memslots.h | 72 - server/red_parse_qxl.c | 62 +- server/red_parse_qxl.h | 2 +- server/red_record_qxl.c | 62 +- server/red_record_qxl.h | 2 +- server/red_replay_qxl.c | 2 +- server/red_worker.c | 3028 +---------------------------- server/red_worker.h | 16 +- server/reds.c | 14 +- server/reds.h | 5 +- server/reds_stream.c | 2 +- server/reds_sw_canvas.c | 26 - server/reds_sw_canvas.h | 24 - server/smartcard.c | 4 +- server/snd_worker.c | 1625 ---------------- server/snd_worker.h | 33 - server/sound.c | 1625 ++++++++++++++++ server/sound.h | 33 + server/spice-bitmap-utils.c | 168 +- server/spice-bitmap-utils.h | 15 +- server/spice-bitmap-utils.tmpl.c | 160 ++ server/spice_bitmap_utils.c | 188 -- server/spice_bitmap_utils.h | 8 - server/spice_image_cache.c | 214 -- server/spice_image_cache.h | 65 - server/spice_server_utils.h | 41 - server/spicevmc.c | 4 +- server/stream.c | 195 +- server/stream.h | 18 +- server/utils.h | 31 +- server/zlib-encoder.c | 125 ++ server/zlib-encoder.h | 47 + server/zlib_encoder.c | 125 -- server/zlib_encoder.h | 47 - 100 files changed, 13838 insertions(+), 13947 deletions(-) create mode 100644 server/cache-item.tmpl.c delete mode 100644 server/cache_item.tmpl.c create mode 100644 server/canvas.c create mode 100644 server/canvas.h create mode 100644 server/char-device.c create mode 100644 server/char-device.h delete mode 100644 server/char_device.c delete mode 100644 server/char_device.h create mode 100644 server/dcc-send.c create mode 100644 server/glz-encode-match.tmpl.c create mode 100644 server/glz-encode.tmpl.c create mode 100644 server/glz-encoder-dict.c create mode 100644 server/glz-encoder-dict.h create mode 100644 server/glz-encoder-priv.h create mode 100644 server/glz-encoder.c create mode 100644 server/glz-encoder.h delete mode 100644 server/glz_encode_match_tmpl.c delete mode 100644 server/glz_encode_tmpl.c delete mode 100644 server/glz_encoder.c delete mode 100644 server/glz_encoder.h delete mode 100644 server/glz_encoder_config.h delete mode 100644 server/glz_encoder_dictionary.c delete mode 100644 server/glz_encoder_dictionary.h delete mode 100644 server/glz_encoder_dictionary_protected.h create mode 100644 server/image-cache.c create mode 100644 server/image-cache.h create mode 100644 server/inputs-channel.c create mode 100644 server/inputs-channel.h delete mode 100644 server/inputs_channel.c delete mode 100644 server/inputs_channel.h create mode 100644 server/jpeg-encoder.c create mode 100644 server/jpeg-encoder.h delete mode 100644 server/jpeg_encoder.c delete mode 100644 server/jpeg_encoder.h create mode 100644 server/main-channel.c create mode 100644 server/main-channel.h create mode 100644 server/main-dispatcher.c create mode 100644 server/main-dispatcher.h delete mode 100644 server/main_channel.c delete mode 100644 server/main_channel.h delete mode 100644 server/main_dispatcher.c delete mode 100644 server/main_dispatcher.h create mode 100644 server/memslot.c create mode 100644 server/memslot.h create mode 100644 server/migration-protocol.h delete mode 100644 server/migration_protocol.h create mode 100644 server/mjpeg-encoder.c create mode 100644 server/mjpeg-encoder.h delete mode 100644 server/mjpeg_encoder.c delete mode 100644 server/mjpeg_encoder.h delete mode 100644 server/red_bitmap_utils_tmpl.c delete mode 100644 server/red_memslots.c delete mode 100644 server/red_memslots.h delete mode 100644 server/reds_sw_canvas.c delete mode 100644 server/reds_sw_canvas.h delete mode 100644 server/snd_worker.c delete mode 100644 server/snd_worker.h create mode 100644 server/sound.c create mode 100644 server/sound.h create mode 100644 server/spice-bitmap-utils.tmpl.c delete mode 100644 server/spice_bitmap_utils.c delete mode 100644 server/spice_bitmap_utils.h delete mode 100644 server/spice_image_cache.c delete mode 100644 server/spice_image_cache.h delete mode 100644 server/spice_server_utils.h create mode 100644 server/zlib-encoder.c create mode 100644 server/zlib-encoder.h delete mode 100644 server/zlib_encoder.c delete mode 100644 server/zlib_encoder.h -- 2.4.3 _______________________________________________ Spice-devel mailing list Spice-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/spice-devel