[Spice-devel] [PATCH 1/2] spice: enums.h regenerated

Marc-André Lureau marcandre.lureau at gmail.com
Wed Jun 22 03:03:01 PDT 2011


From: Marc-André Lureau <marcandre.lureau at redhat.com>

---
 spice/enums.h |  145 +++++++++++++++++++++++++++++---------------------------
 1 files changed, 75 insertions(+), 70 deletions(-)

diff --git a/spice/enums.h b/spice/enums.h
index 29f5933..756df56 100644
--- a/spice/enums.h
+++ b/spice/enums.h
@@ -1,9 +1,10 @@
+/* this is a file autogenerated by spice_codegen.py */
 #ifndef _H_SPICE_ENUMS
 #define _H_SPICE_ENUMS
 
 /* Generated from spice.proto, don't edit */
 
-enum SpiceLinkErr {
+typedef enum SpiceLinkErr {
     SPICE_LINK_ERR_OK,
     SPICE_LINK_ERR_ERROR,
     SPICE_LINK_ERR_INVALID_MAGIC,
@@ -16,51 +17,51 @@ enum SpiceLinkErr {
     SPICE_LINK_ERR_CHANNEL_NOT_AVAILABLE,
 
     SPICE_LINK_ERR_ENUM_END
-};
+} SpiceLinkErr;
 
-enum SpiceWarnCode {
+typedef enum SpiceWarnCode {
     SPICE_WARN_GENERAL,
 
     SPICE_WARN_CODE_ENUM_END
-};
+} SpiceWarnCode;
 
-enum SpiceInfoCode {
+typedef enum SpiceInfoCode {
     SPICE_INFO_GENERAL,
 
     SPICE_INFO_CODE_ENUM_END
-};
+} SpiceInfoCode;
 
-enum SpiceMigrateFlags {
+typedef enum SpiceMigrateFlags {
     SPICE_MIGRATE_NEED_FLUSH = (1 << 0),
     SPICE_MIGRATE_NEED_DATA_TRANSFER = (1 << 1),
 
     SPICE_MIGRATE_FLAGS_MASK = 0x3
-};
+} SpiceMigrateFlags;
 
-enum SpiceNotifySeverity {
+typedef enum SpiceNotifySeverity {
     SPICE_NOTIFY_SEVERITY_INFO,
     SPICE_NOTIFY_SEVERITY_WARN,
     SPICE_NOTIFY_SEVERITY_ERROR,
 
     SPICE_NOTIFY_SEVERITY_ENUM_END
-};
+} SpiceNotifySeverity;
 
-enum SpiceNotifyVisibility {
+typedef enum SpiceNotifyVisibility {
     SPICE_NOTIFY_VISIBILITY_LOW,
     SPICE_NOTIFY_VISIBILITY_MEDIUM,
     SPICE_NOTIFY_VISIBILITY_HIGH,
 
     SPICE_NOTIFY_VISIBILITY_ENUM_END
-};
+} SpiceNotifyVisibility;
 
-enum SpiceMouseMode {
+typedef enum SpiceMouseMode {
     SPICE_MOUSE_MODE_SERVER = (1 << 0),
     SPICE_MOUSE_MODE_CLIENT = (1 << 1),
 
     SPICE_MOUSE_MODE_MASK = 0x3
-};
+} SpiceMouseMode;
 
-enum SpicePubkeyType {
+typedef enum SpicePubkeyType {
     SPICE_PUBKEY_TYPE_INVALID,
     SPICE_PUBKEY_TYPE_RSA,
     SPICE_PUBKEY_TYPE_RSA2,
@@ -73,51 +74,51 @@ enum SpicePubkeyType {
     SPICE_PUBKEY_TYPE_EC,
 
     SPICE_PUBKEY_TYPE_ENUM_END
-};
+} SpicePubkeyType;
 
-enum SpiceClipType {
+typedef enum SpiceClipType {
     SPICE_CLIP_TYPE_NONE,
     SPICE_CLIP_TYPE_RECTS,
 
     SPICE_CLIP_TYPE_ENUM_END
-};
+} SpiceClipType;
 
-enum SpicePathFlags {
+typedef enum SpicePathFlags {
     SPICE_PATH_BEGIN = (1 << 0),
     SPICE_PATH_END = (1 << 1),
     SPICE_PATH_CLOSE = (1 << 3),
     SPICE_PATH_BEZIER = (1 << 4),
 
     SPICE_PATH_FLAGS_MASK = 0x1b
-};
+} SpicePathFlags;
 
-enum SpiceVideoCodecType {
+typedef enum SpiceVideoCodecType {
     SPICE_VIDEO_CODEC_TYPE_MJPEG = 1,
 
     SPICE_VIDEO_CODEC_TYPE_ENUM_END
-};
+} SpiceVideoCodecType;
 
-enum SpiceStreamFlags {
+typedef enum SpiceStreamFlags {
     SPICE_STREAM_FLAGS_TOP_DOWN = (1 << 0),
 
     SPICE_STREAM_FLAGS_MASK = 0x1
-};
+} SpiceStreamFlags;
 
-enum SpiceBrushType {
+typedef enum SpiceBrushType {
     SPICE_BRUSH_TYPE_NONE,
     SPICE_BRUSH_TYPE_SOLID,
     SPICE_BRUSH_TYPE_PATTERN,
 
     SPICE_BRUSH_TYPE_ENUM_END
-};
+} SpiceBrushType;
 
-enum SpiceMaskFlags {
+typedef enum SpiceMaskFlags {
     SPICE_MASK_FLAGS_INVERS = (1 << 0),
 
     SPICE_MASK_FLAGS_MASK = 0x1
-};
+} SpiceMaskFlags;
 
-enum SpiceImageType {
+typedef enum SpiceImageType {
     SPICE_IMAGE_TYPE_BITMAP,
     SPICE_IMAGE_TYPE_QUIC,
     SPICE_IMAGE_TYPE_RESERVED,
@@ -132,15 +133,15 @@ enum SpiceImageType {
     SPICE_IMAGE_TYPE_JPEG_ALPHA,
 
     SPICE_IMAGE_TYPE_ENUM_END
-};
+} SpiceImageType;
 
-enum SpiceImageFlags {
+typedef enum SpiceImageFlags {
     SPICE_IMAGE_FLAGS_CACHE_ME = (1 << 0),
     SPICE_IMAGE_FLAGS_HIGH_BITS_SET = (1 << 1),
     SPICE_IMAGE_FLAGS_CACHE_REPLACE_ME = (1 << 2),
 
     SPICE_IMAGE_FLAGS_MASK = 0x7
-};
+} SpiceImageFlags;
 
 typedef enum SpiceBitmapFmt {
     SPICE_BITMAP_FMT_INVALID,
@@ -157,28 +158,28 @@ typedef enum SpiceBitmapFmt {
     SPICE_BITMAP_FMT_ENUM_END
 } SpiceBitmapFmt;
 
-enum SpiceBitmapFlags {
+typedef enum SpiceBitmapFlags {
     SPICE_BITMAP_FLAGS_PAL_CACHE_ME = (1 << 0),
     SPICE_BITMAP_FLAGS_PAL_FROM_CACHE = (1 << 1),
     SPICE_BITMAP_FLAGS_TOP_DOWN = (1 << 2),
 
     SPICE_BITMAP_FLAGS_MASK = 0x7
-};
+} SpiceBitmapFlags;
 
-enum SpiceJpegAlphaFlags {
+typedef enum SpiceJpegAlphaFlags {
     SPICE_JPEG_ALPHA_FLAGS_TOP_DOWN = (1 << 0),
 
     SPICE_JPEG_ALPHA_FLAGS_MASK = 0x1
-};
+} SpiceJpegAlphaFlags;
 
-enum SpiceImageScaleMode {
+typedef enum SpiceImageScaleMode {
     SPICE_IMAGE_SCALE_MODE_INTERPOLATE,
     SPICE_IMAGE_SCALE_MODE_NEAREST,
 
     SPICE_IMAGE_SCALE_MODE_ENUM_END
-};
+} SpiceImageScaleMode;
 
-enum SpiceRopd {
+typedef enum SpiceRopd {
     SPICE_ROPD_INVERS_SRC = (1 << 0),
     SPICE_ROPD_INVERS_BRUSH = (1 << 1),
     SPICE_ROPD_INVERS_DEST = (1 << 2),
@@ -192,31 +193,31 @@ enum SpiceRopd {
     SPICE_ROPD_INVERS_RES = (1 << 10),
 
     SPICE_ROPD_MASK = 0x7ff
-};
+} SpiceRopd;
 
-enum SpiceLineFlags {
+typedef enum SpiceLineFlags {
     SPICE_LINE_FLAGS_START_WITH_GAP = (1 << 2),
     SPICE_LINE_FLAGS_STYLED = (1 << 3),
 
     SPICE_LINE_FLAGS_MASK = 0xc
-};
+} SpiceLineFlags;
 
-enum SpiceStringFlags {
+typedef enum SpiceStringFlags {
     SPICE_STRING_FLAGS_RASTER_A1 = (1 << 0),
     SPICE_STRING_FLAGS_RASTER_A4 = (1 << 1),
     SPICE_STRING_FLAGS_RASTER_A8 = (1 << 2),
     SPICE_STRING_FLAGS_RASTER_TOP_DOWN = (1 << 3),
 
     SPICE_STRING_FLAGS_MASK = 0xf
-};
+} SpiceStringFlags;
 
-enum SpiceSurfaceFlags {
+typedef enum SpiceSurfaceFlags {
     SPICE_SURFACE_FLAGS_PRIMARY = (1 << 0),
 
     SPICE_SURFACE_FLAGS_MASK = 0x1
-};
+} SpiceSurfaceFlags;
 
-enum SpiceSurfaceFmt {
+typedef enum SpiceSurfaceFmt {
     SPICE_SURFACE_FMT_INVALID,
     SPICE_SURFACE_FMT_1_A,
     SPICE_SURFACE_FMT_8_A = 8,
@@ -226,31 +227,31 @@ enum SpiceSurfaceFmt {
     SPICE_SURFACE_FMT_32_ARGB = 96,
 
     SPICE_SURFACE_FMT_ENUM_END
-};
+} SpiceSurfaceFmt;
 
-enum SpiceAlphaFlags {
+typedef enum SpiceAlphaFlags {
     SPICE_ALPHA_FLAGS_DEST_HAS_ALPHA = (1 << 0),
     SPICE_ALPHA_FLAGS_SRC_SURFACE_HAS_ALPHA = (1 << 1),
 
     SPICE_ALPHA_FLAGS_MASK = 0x3
-};
+} SpiceAlphaFlags;
 
-enum SpiceResourceType {
+typedef enum SpiceResourceType {
     SPICE_RES_TYPE_INVALID,
     SPICE_RES_TYPE_PIXMAP,
 
     SPICE_RESOURCE_TYPE_ENUM_END
-};
+} SpiceResourceType;
 
-enum SpiceKeyboardModifierFlags {
+typedef enum SpiceKeyboardModifierFlags {
     SPICE_KEYBOARD_MODIFIER_FLAGS_SCROLL_LOCK = (1 << 0),
     SPICE_KEYBOARD_MODIFIER_FLAGS_NUM_LOCK = (1 << 1),
     SPICE_KEYBOARD_MODIFIER_FLAGS_CAPS_LOCK = (1 << 2),
 
     SPICE_KEYBOARD_MODIFIER_FLAGS_MASK = 0x7
-};
+} SpiceKeyboardModifierFlags;
 
-enum SpiceMouseButton {
+typedef enum SpiceMouseButton {
     SPICE_MOUSE_BUTTON_INVALID,
     SPICE_MOUSE_BUTTON_LEFT,
     SPICE_MOUSE_BUTTON_MIDDLE,
@@ -259,17 +260,17 @@ enum SpiceMouseButton {
     SPICE_MOUSE_BUTTON_DOWN,
 
     SPICE_MOUSE_BUTTON_ENUM_END
-};
+} SpiceMouseButton;
 
-enum SpiceMouseButtonMask {
+typedef enum SpiceMouseButtonMask {
     SPICE_MOUSE_BUTTON_MASK_LEFT = (1 << 0),
     SPICE_MOUSE_BUTTON_MASK_MIDDLE = (1 << 1),
     SPICE_MOUSE_BUTTON_MASK_RIGHT = (1 << 2),
 
     SPICE_MOUSE_BUTTON_MASK_MASK = 0x7
-};
+} SpiceMouseButtonMask;
 
-enum SpiceCursorType {
+typedef enum SpiceCursorType {
     SPICE_CURSOR_TYPE_ALPHA,
     SPICE_CURSOR_TYPE_MONO,
     SPICE_CURSOR_TYPE_COLOR4,
@@ -279,45 +280,45 @@ enum SpiceCursorType {
     SPICE_CURSOR_TYPE_COLOR32,
 
     SPICE_CURSOR_TYPE_ENUM_END
-};
+} SpiceCursorType;
 
-enum SpiceCursorFlags {
+typedef enum SpiceCursorFlags {
     SPICE_CURSOR_FLAGS_NONE = (1 << 0),
     SPICE_CURSOR_FLAGS_CACHE_ME = (1 << 1),
     SPICE_CURSOR_FLAGS_FROM_CACHE = (1 << 2),
 
     SPICE_CURSOR_FLAGS_MASK = 0x7
-};
+} SpiceCursorFlags;
 
-enum SpiceAudioDataMode {
+typedef enum SpiceAudioDataMode {
     SPICE_AUDIO_DATA_MODE_INVALID,
     SPICE_AUDIO_DATA_MODE_RAW,
     SPICE_AUDIO_DATA_MODE_CELT_0_5_1,
 
     SPICE_AUDIO_DATA_MODE_ENUM_END
-};
+} SpiceAudioDataMode;
 
-enum SpiceAudioFmt {
+typedef enum SpiceAudioFmt {
     SPICE_AUDIO_FMT_INVALID,
     SPICE_AUDIO_FMT_S16,
 
     SPICE_AUDIO_FMT_ENUM_END
-};
+} SpiceAudioFmt;
 
-enum SpiceTunnelServiceType {
+typedef enum SpiceTunnelServiceType {
     SPICE_TUNNEL_SERVICE_TYPE_INVALID,
     SPICE_TUNNEL_SERVICE_TYPE_GENERIC,
     SPICE_TUNNEL_SERVICE_TYPE_IPP,
 
     SPICE_TUNNEL_SERVICE_TYPE_ENUM_END
-};
+} SpiceTunnelServiceType;
 
-enum SpiceTunnelIpType {
+typedef enum SpiceTunnelIpType {
     SPICE_TUNNEL_IP_TYPE_INVALID,
     SPICE_TUNNEL_IP_TYPE_IPv4,
 
     SPICE_TUNNEL_IP_TYPE_ENUM_END
-};
+} SpiceTunnelIpType;
 
 enum {
     SPICE_CHANNEL_MAIN = 1,
@@ -456,6 +457,8 @@ enum {
     SPICE_MSG_PLAYBACK_MODE,
     SPICE_MSG_PLAYBACK_START,
     SPICE_MSG_PLAYBACK_STOP,
+    SPICE_MSG_PLAYBACK_VOLUME,
+    SPICE_MSG_PLAYBACK_MUTE,
 
     SPICE_MSG_END_PLAYBACK
 };
@@ -463,6 +466,8 @@ enum {
 enum {
     SPICE_MSG_RECORD_START = 101,
     SPICE_MSG_RECORD_STOP,
+    SPICE_MSG_RECORD_VOLUME,
+    SPICE_MSG_RECORD_MUTE,
 
     SPICE_MSG_END_RECORD
 };
-- 
1.7.5.2



More information about the Spice-devel mailing list