--- sourceforge.net/trunk/rdesktop/rdesktop.c	2003/10/17 08:23:47	501
+++ sourceforge.net/trunk/rdesktop/rdesktop.c	2003/10/28 05:07:00	520
@@ -69,7 +69,7 @@
 extern BOOL g_owncolmap;
 
 #ifdef WITH_RDPSND
-BOOL g_rdpsnd = True;
+BOOL g_rdpsnd = False;
 #endif
 
 #ifdef RDP2VNC
@@ -95,11 +95,10 @@
 	fprintf(stderr, "   -u: user name\n");
 	fprintf(stderr, "   -d: domain\n");
 	fprintf(stderr, "   -s: shell\n");
-	fprintf(stderr, "   -S: caption button size (single application mode)\n");
 	fprintf(stderr, "   -c: working directory\n");
 	fprintf(stderr, "   -p: password (- to prompt)\n");
 	fprintf(stderr, "   -n: client hostname\n");
-	fprintf(stderr, "   -k: keyboard layout on terminal server (us,sv,gr,etc.)\n");
+	fprintf(stderr, "   -k: keyboard layout on server (en-us, de, sv, etc.)\n");
 	fprintf(stderr, "   -g: desktop geometry (WxH)\n");
 	fprintf(stderr, "   -f: full-screen mode\n");
 	fprintf(stderr, "   -b: force bitmap updates\n");
@@ -107,13 +106,12 @@
 	fprintf(stderr, "   -E: disable encryption from client to server\n");
 	fprintf(stderr, "   -m: do not send motion events\n");
 	fprintf(stderr, "   -C: use private colour map\n");
+	fprintf(stderr, "   -D: hide window manager decorations\n");
 	fprintf(stderr, "   -K: keep window manager key bindings\n");
+	fprintf(stderr, "   -S: caption button size (single application mode)\n");
 	fprintf(stderr, "   -T: window title\n");
-	fprintf(stderr, "   -D: hide window manager decorations\n");
-#ifdef WITH_RDPSND
-	fprintf(stderr, "   -A: disable audio-redirection\n");
-#endif
-	fprintf(stderr, "   -a: server bpp\n");
+	fprintf(stderr, "   -a: connection colour depth\n");
+	fprintf(stderr, "   -r: enable specified device redirection (currently: sound)\n");
 	fprintf(stderr, "   -0: attach to console\n");
 	fprintf(stderr, "   -4: use RDP version 4\n");
 	fprintf(stderr, "   -5: use RDP version 5 (default)\n");
@@ -231,7 +229,7 @@
 #define VNCOPT
 #endif
 
-	while ((c = getopt(argc, argv, VNCOPT "u:d:s:S:c:p:n:k:g:a:fbeEmCKT:AD045h?")) != -1)
+	while ((c = getopt(argc, argv, VNCOPT "u:d:s:c:p:n:k:g:fbeEmCDKS:T:a:r:045h?")) != -1)
 	{
 		switch (c)
 		{
@@ -262,23 +260,6 @@
 				STRNCPY(shell, optarg, sizeof(shell));
 				break;
 
-			case 'S':
-				if (!strcmp(optarg, "standard"))
-				{
-					g_win_button_size = 18;
-					break;
-				}
-
-				g_win_button_size = strtol(optarg, &p, 10);
-
-				if (*p)
-				{
-					error("invalid button size\n");
-					return 1;
-				}
-
-				break;
-
 			case 'c':
 				STRNCPY(directory, optarg, sizeof(directory));
 				break;
@@ -357,16 +338,33 @@
 				g_owncolmap = True;
 				break;
 
+			case 'D':
+				g_hide_decorations = True;
+				break;
+
 			case 'K':
 				g_grab_keyboard = False;
 				break;
 
-			case 'T':
-				STRNCPY(g_title, optarg, sizeof(g_title));
+			case 'S':
+				if (!strcmp(optarg, "standard"))
+				{
+					g_win_button_size = 18;
+					break;
+				}
+
+				g_win_button_size = strtol(optarg, &p, 10);
+
+				if (*p)
+				{
+					error("invalid button size\n");
+					return 1;
+				}
+
 				break;
 
-			case 'D':
-				g_hide_decorations = True;
+			case 'T':
+				STRNCPY(g_title, optarg, sizeof(g_title));
 				break;
 
 			case 'a':
@@ -379,11 +377,15 @@
 				}
 				break;
 
+			case 'r':
+				if (!strcmp(optarg, "sound"))
 #ifdef WITH_RDPSND
-			case 'A':
-				g_rdpsnd = False;
-				break;
+					g_rdpsnd = True;
+#else
+					warning("Not compiled with sound support");
 #endif
+				break;
+
 			case '0':
 				g_console_session = True;
 				break;
@@ -459,9 +461,7 @@
 
 #ifdef WITH_RDPSND
 	if (g_rdpsnd)
-	{
 		rdpsnd_init();
-	}
 #endif
 	/* rdpdr_init(); */