--- sourceforge.net/trunk/rdesktop/proto.h	2006/03/27 08:17:34	1199
+++ sourceforge.net/trunk/rdesktop/proto.h	2006/10/19 12:26:55	1300
@@ -54,6 +54,7 @@
 void cliprdr_send_native_format_announce(uint8 * formats_data, uint32 formats_data_length);
 void cliprdr_send_data_request(uint32 format);
 void cliprdr_send_data(uint8 * data, uint32 length);
+void cliprdr_set_mode(const char *optarg);
 BOOL cliprdr_init(void);
 /* disk.c */
 int disk_enum_devices(uint32 * id, char *optarg);
@@ -100,8 +101,8 @@
 /* pstcache.c */
 void pstcache_touch_bitmap(uint8 cache_id, uint16 cache_idx, uint32 stamp);
 BOOL pstcache_load_bitmap(uint8 cache_id, uint16 cache_idx);
-BOOL pstcache_save_bitmap(uint8 cache_id, uint16 cache_idx, uint8 * key, uint16 width,
-			  uint16 height, uint16 length, uint8 * data);
+BOOL pstcache_save_bitmap(uint8 cache_id, uint16 cache_idx, uint8 * key, uint8 width, uint8 height,
+			  uint16 length, uint8 * data);
 int pstcache_enumerate(uint8 id, HASH_KEY * keylist);
 BOOL pstcache_init(uint8 cache_id);
 /* rdesktop.c */
@@ -163,15 +164,15 @@
 BOOL rdpdr_abort_io(uint32 fd, uint32 major, NTSTATUS status);
 /* rdpsnd.c */
 void rdpsnd_send_completion(uint16 tick, uint8 packet_index);
-BOOL rdpsnd_init(void);
-/* rdpsnd_oss.c */
-BOOL wave_out_open(void);
-void wave_out_close(void);
-BOOL wave_out_format_supported(WAVEFORMATEX * pwfx);
-BOOL wave_out_set_format(WAVEFORMATEX * pwfx);
-void wave_out_volume(uint16 left, uint16 right);
-void wave_out_write(STREAM s, uint16 tick, uint8 index);
-void wave_out_play(void);
+BOOL rdpsnd_init(char *optarg);
+void rdpsnd_show_help(void);
+void rdpsnd_play(void);
+void rdpsnd_queue_write(STREAM s, uint16 tick, uint8 index);
+struct audio_packet *rdpsnd_queue_current_packet(void);
+BOOL rdpsnd_queue_empty(void);
+void rdpsnd_queue_init(void);
+void rdpsnd_queue_next(void);
+int rdpsnd_queue_next_tick(void);
 /* secure.c */
 void sec_hash_48(uint8 * out, uint8 * in, uint8 * salt1, uint8 * salt2, uint8 salt);
 void sec_hash_16(uint8 * out, uint8 * in, uint8 * salt1, uint8 * salt2);
@@ -203,9 +204,12 @@
 /* xclip.c */
 void ui_clip_format_announce(uint8 * data, uint32 length);
 void ui_clip_handle_data(uint8 * data, uint32 length);
+void ui_clip_request_failed(void);
 void ui_clip_request_data(uint32 format);
 void ui_clip_sync(void);
+void ui_clip_set_mode(const char *optarg);
 void xclip_init(void);
+void xclip_deinit(void);
 /* xkeymap.c */
 BOOL xkeymap_from_locale(const char *locale);
 FILE *xkeymap_open(const char *filename);
@@ -279,6 +283,7 @@
 void ui_seamless_create_window(unsigned long id, unsigned long group, unsigned long parent,
 			       unsigned long flags);
 void ui_seamless_destroy_window(unsigned long id, unsigned long flags);
+void ui_seamless_destroy_group(unsigned long id, unsigned long flags);
 void ui_seamless_move_window(unsigned long id, int x, int y, int width, int height,
 			     unsigned long flags);
 void ui_seamless_restack_window(unsigned long id, unsigned long behind, unsigned long flags);