--- sourceforge.net/trunk/rdesktop/rdesktop.c	2004/02/19 22:36:03	610
+++ sourceforge.net/trunk/rdesktop/rdesktop.c	2004/03/05 06:39:00	630
@@ -131,8 +131,9 @@
 	fprintf(stderr, "             or      LPT1=/dev/lp0,LPT2=/dev/lp1\n");
 	fprintf(stderr, "         '-r printer:mydeskjet': enable printer redirection\n");
 	fprintf(stderr,
-		"             or       mydeskjet=\"HP LaserJet IIIP\" to enter server driver as well\n");
-	fprintf(stderr, "         '-r sound': enable sound redirection\n");
+		"             or      mydeskjet=\"HP LaserJet IIIP\" to enter server driver as well\n");
+	fprintf(stderr, "         '-r sound:[local|off|remote]': enable sound redirection\n");
+	fprintf(stderr, "                     remote would leave sound on server\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");
@@ -414,11 +415,37 @@
 
 				if (strncmp("sound", optarg, 5) == 0)
 				{
+					optarg += 5;
+
+					if (*optarg == ':')
+					{
+						*optarg++;
+						while ((p = next_arg(optarg, ',')))
+						{
+							if (strncmp("remote", optarg, 6) == 0)
+								flags |= RDP_LOGON_LEAVE_AUDIO;
+
+							if (strncmp("local", optarg, 5) == 0)
+#ifdef WITH_RDPSND
+								g_rdpsnd = True;
+#else
+								warning("Not compiled with sound support");
+#endif
+
+							if (strncmp("off", optarg, 3) == 0)
+								g_rdpsnd = False;
+
+							optarg = p;
+						}
+					}
+					else
+					{
 #ifdef WITH_RDPSND
-					g_rdpsnd = True;
+						g_rdpsnd = True;
 #else
-					warning("Not compiled with sound support");
+						warning("Not compiled with sound support");
 #endif
+					}
 				}
 				else if (strncmp("disk", optarg, 4) == 0)
 				{