1 files changed, 54 insertions, 43 deletions

diff --git a/gst/librfb/rfbdecoder.h b/gst/librfb/rfbdecoder.h
index db16cb2c..4163efe7 100644
--- a/gst/librfb/rfbdecoder.h
+++ b/gst/librfb/rfbdecoder.h
@@ -1,4 +1,3 @@
-
 #ifndef _LIBRFB_DECODER_H_
 #define _LIBRFB_DECODER_H_
 
@@ -11,46 +10,47 @@ typedef struct _RfbDecoder RfbDecoder;
 
 struct _RfbDecoder
 {
-  int (*send_data) (guint8 *buffer, int length, gpointer user_data);
+  /* callbacks */
+  gint (*send_data) (guint8 *buffer, gint length, gpointer user_data);
+  void (*paint_rect) (RfbDecoder *decoder, gint x, gint y, gint w, gint h,
+      guint8 *data);
+  void (*copy_rect) (RfbDecoder *decoder, gint x, gint y, gint w, gint h,
+      gint src_x, gint src_y);
+  gboolean (*state) (RfbDecoder *decoder);
+
   gpointer buffer_handler_data;
 
+  gint fd;
   RfbBytestream *bytestream;
 
   gpointer decoder_private;
 
-  void (*paint_rect) (RfbDecoder *decoder, int x, int y, int w, int h,
-      guint8 *data);
-  void (*copy_rect) (RfbDecoder *decoder, int x, int y, int w, int h,
-      int src_x, int src_y);
-
   /* settable properties */
   gboolean shared_flag;
 
   /* readable properties */
   gboolean inited;
 
-  int protocol_major;
-  int protocol_minor;
-  unsigned int security_type;
+  gint protocol_major;
+  gint protocol_minor;
+  guint security_type;
 
-  unsigned int width;
-  unsigned int height;
-  unsigned int bpp;
-  unsigned int depth;
+  guint width;
+  guint height;
+  guint bpp;
+  guint depth;
   gboolean big_endian;
   gboolean true_colour;
-  unsigned int red_max;
-  unsigned int green_max;
-  unsigned int blue_max;
-  unsigned int red_shift;
-  unsigned int green_shift;
-  unsigned int blue_shift;
+  guint red_max;
+  guint green_max;
+  guint blue_max;
+  guint red_shift;
+  guint green_shift;
+  guint blue_shift;
 
-  char *name;
+  gchar *name;
 
-  /* state information */
-  gboolean (*state) (RfbDecoder *decoder);
-  int n_rects;
+  gint n_rects;
 };
 
 #if 0
@@ -58,29 +58,40 @@ typedef struct _RfbRect
 {
   RfbConnection *connection;
 
-  unsigned int x_pos;
-  unsigned int y_pos;
-  unsigned int width;
-  unsigned int height;
-  unsigned int encoding_type;
+  guint x_pos;
+  guint y_pos;
+  guint width;
+  guint height;
+  guint encoding_type;
 
-  char *data;
+  gchar *data;
 } RfbRect;
 #endif
 
-
-RfbDecoder *rfb_decoder_new (void);
-void rfb_decoder_use_file_descriptor (RfbDecoder * decoder, int fd);
-void rfb_decoder_connect_tcp (RfbDecoder *decoder, char * addr, unsigned int port);
-void rfb_decoder_set_peer (RfbDecoder * decoder);
-gboolean rfb_decoder_iterate (RfbDecoder * decoder);
-int rfb_decoder_send (RfbDecoder * decoder, guint8 *data, int len);
-void rfb_decoder_send_update_request (RfbDecoder * decoder,
-    gboolean incremental, int x, int y, int width, int height);
-void rfb_decoder_send_key_event (RfbDecoder * decoder, unsigned int key,
-    gboolean down_flag);
-void rfb_decoder_send_pointer_event (RfbDecoder * decoder,
-    int button_mask, int x, int y);
+RfbDecoder *rfb_decoder_new                 (void);
+void        rfb_decoder_free                (RfbDecoder * decoder);
+void        rfb_decoder_use_file_descriptor (RfbDecoder * decoder,
+                                             gint fd);
+gboolean    rfb_decoder_connect_tcp         (RfbDecoder * decoder,
+                                             gchar * addr,
+                                             guint port);
+gboolean    rfb_decoder_iterate             (RfbDecoder * decoder);
+gint        rfb_decoder_send                (RfbDecoder * decoder,
+                                             guint8 *data,
+                                             gint len);
+void        rfb_decoder_send_update_request (RfbDecoder * decoder,
+                                             gboolean incremental,
+                                             gint x,
+                                             gint y,
+                                             gint width,
+                                             gint height);
+void        rfb_decoder_send_key_event      (RfbDecoder * decoder,
+                                             guint key,
+                                             gboolean down_flag);
+void        rfb_decoder_send_pointer_event  (RfbDecoder * decoder,
+                                             gint button_mask,
+                                             gint x,
+                                             gint y);
 
 G_END_DECLS