CVS: rdesktop constants.h,1.29,1.30 rdesktop.c,1.95,1.96

Update of /cvsroot/rdesktop/rdesktop
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29619

Modified Files:
	constants.h rdesktop.c 
Log Message:
leave sound on server -r sound:remote thanks to cbquillen for finding out.

Index: constants.h
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/constants.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** constants.h	4 Mar 2004 07:57:02 -0000	1.29
--- constants.h	4 Mar 2004 12:43:10 -0000	1.30
***************
*** 13,17 ****
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
!    
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
--- 13,17 ----
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
! 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
***************
*** 238,245 ****
  
  /* Logon flags */
! #define RDP_LOGON_NORMAL	0x33
! #define RDP_LOGON_AUTO		0x8
! #define RDP_LOGON_BLOB		0x100
! #define RDP_COMPRESSION		0x80
  
  /* Keymap flags */
--- 238,246 ----
  
  /* Logon flags */
! #define RDP_LOGON_AUTO		0x0008
! #define RDP_LOGON_NORMAL	0x0033
! #define RDP_COMPRESSION		0x0080
! #define RDP_LOGON_BLOB		0x0100
! #define RDP_LOGON_LEAVE_AUDIO	0x2000
  
  /* Keymap flags */
***************
*** 329,332 ****
--- 330,334 ----
  #define STATUS_INVALID_DEVICE_REQUEST	0xc0000010
  #define STATUS_ACCESS_DENIED		0xc0000022
+ #define STATUS_OBJECT_NAME_COLLISION    0xc0000035
  #define STATUS_DISK_FULL                0xc000007f
  #define STATUS_FILE_IS_A_DIRECTORY      0xc00000ba
***************
*** 334,338 ****
  #define STATUS_TIMEOUT                  0xc0000102
  #define STATUS_CANCELLED                0xc0000120
- #define STATUS_OBJECT_NAME_COLLISION    0xc0000035
  
  
--- 336,339 ----

Index: rdesktop.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdesktop.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -C2 -d -r1.95 -r1.96
*** rdesktop.c	19 Feb 2004 22:36:03 -0000	1.95
--- rdesktop.c	4 Mar 2004 12:43:10 -0000	1.96
***************
*** 132,137 ****
  	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");
  	fprintf(stderr, "   -0: attach to console\n");
  	fprintf(stderr, "   -4: use RDP version 4\n");
--- 132,138 ----
  	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:[on|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");
***************
*** 415,423 ****
  				if (strncmp("sound", optarg, 5) == 0)
  				{
  #ifdef WITH_RDPSND
! 					g_rdpsnd = True;
  #else
! 					warning("Not compiled with sound support");
  #endif
  				}
  				else if (strncmp("disk", optarg, 4) == 0)
--- 416,441 ----
  				if (strncmp("sound", optarg, 5) == 0)
  				{
+ 					if (*(optarg + 6) == ':')
+ 					{
+ 
+ 						if (strncmp("remote", optarg + 7, 6) == 0)
+ 							flags |= RDP_LOGON_LEAVE_AUDIO;
+ 						else if (strncmp("on", optarg + 7, 2) == 0)
+ 						{
  #ifdef WITH_RDPSND
! 							g_rdpsnd = True;
  #else
! 							warning("Not compiled with sound support");
  #endif
+ 						}
+ 					}
+ 					else
+ 					{
+ #ifdef WITH_RDPSND
+ 						g_rdpsnd = True;
+ #else
+ 						warning("Not compiled with sound support");
+ #endif
+ 					}
  				}
  				else if (strncmp("disk", optarg, 4) == 0)



-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click