[Spice-commits] 2 commits - configure.ac server/reds.c server/spice.h

[Gerd Hoffmann]

 configure.ac   |    2 +-
 server/reds.c  |   27 +++++++++++++++++++++++++++
 server/spice.h |   13 ++++++++++++-
 3 files changed, 40 insertions(+), 2 deletions(-)

New commits:
commit b718f59d4617067c589dae020d14bf4327e2fa62
Author: Gerd Hoffmann <kraxel at redhat.com>
Date:   Mon Aug 30 12:47:35 2010 +0200

    Bump versions.
    
    Update #define in server/spice.h in preparation for the 0.6.0 release.
    We also got some new functions, thus we have to increate the shared
    lib minor number for spice-server.

diff --git a/configure.ac b/configure.ac
index f27265a..d05b834 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ AM_PROG_CC_C_O
 AC_C_BIGENDIAN
 AC_PATH_PROGS(PYTHON, python2 python)
 
-SPICE_LT_VERSION=m4_format("%d:%d:%d", 1, 0, 1)
+SPICE_LT_VERSION=m4_format("%d:%d:%d", 1, 0, 2)
 AC_SUBST(SPICE_LT_VERSION)
 
 # Check for the CPU we are using
diff --git a/server/spice.h b/server/spice.h
index ef16a6a..65683a3 100644
--- a/server/spice.h
+++ b/server/spice.h
@@ -21,7 +21,7 @@
 #include <stdint.h>
 #include <sys/socket.h>
 
-#define SPICE_SERVER_VERSION 0x000503 /* release 0.5.3 */
+#define SPICE_SERVER_VERSION 0x000600 /* release 0.6.0 */
 
 /* interface base type */
 
commit 9681ebb671313f585e2f3c35920d0489e752f508
Author: Gerd Hoffmann <kraxel at redhat.com>
Date:   Fri Aug 27 15:35:06 2010 +0200

    Add config functions.
    
    A bunch of configuration functions where never ported forward from
    rhel-6 to upstream.  Add them so we can add qemu config options for
    these settings.

diff --git a/server/reds.c b/server/reds.c
index 3ed5ba9..00bfb61 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -3933,6 +3933,33 @@ __visible__ int spice_server_kbd_leds(SpiceKbdInstance *sin, int leds)
     return 0;
 }
 
+__visible__ int spice_server_set_streaming_video(SpiceServer *s, int value)
+{
+    ASSERT(reds == s);
+    if (value != SPICE_STREAM_VIDEO_OFF &&
+        value != SPICE_STREAM_VIDEO_ALL &&
+        value != SPICE_STREAM_VIDEO_FILTER)
+        return -1;
+    streaming_video = value;
+    red_dispatcher_on_sv_change();
+    return 0;
+}
+
+__visible__ int spice_server_set_playback_compression(SpiceServer *s, int enable)
+{
+    ASSERT(reds == s);
+    snd_set_playback_compression(enable);
+    return 0;
+}
+
+__visible__ int spice_server_set_agent_mouse(SpiceServer *s, int enable)
+{
+    ASSERT(reds == s);
+    agent_mouse = enable;
+    reds_update_mouse_mode();
+    return 0;
+}
+
 __visible__ int spice_server_migrate_info(SpiceServer *s, const char* dest,
                                           int port, int secure_port,
                                           const char* cert_subject)
diff --git a/server/spice.h b/server/spice.h
index fc7d5b5..ef16a6a 100644
--- a/server/spice.h
+++ b/server/spice.h
@@ -360,6 +360,17 @@ int spice_server_set_channel_security(SpiceServer *s, const char *channel, int s
 
 int spice_server_add_renderer(SpiceServer *s, const char *name);
 
+enum {
+    SPICE_STREAM_VIDEO_INVALID,
+    SPICE_STREAM_VIDEO_OFF,
+    SPICE_STREAM_VIDEO_ALL,
+    SPICE_STREAM_VIDEO_FILTER
+};
+
+int spice_server_set_streaming_video(SpiceServer *s, int value);
+int spice_server_set_playback_compression(SpiceServer *s, int enable);
+int spice_server_set_agent_mouse(SpiceServer *s, int enable);
+
 int spice_server_get_sock_info(SpiceServer *s, struct sockaddr *sa, socklen_t *salen);
 int spice_server_get_peer_info(SpiceServer *s, struct sockaddr *sa, socklen_t *salen);