Attachment #512 for bug #5011

View | Details | Raw Unified | Return to bug 5011
Collapse All | Expand All

Lines 442-447 Link Here

(-)constants.h (+3 lines)
442	#define RD_STATUS_CANCELLED 0xc0000120	442	#define RD_STATUS_CANCELLED 0xc0000120
443	#define RD_STATUS_DIRECTORY_NOT_EMPTY 0xc0000101	443	#define RD_STATUS_DIRECTORY_NOT_EMPTY 0xc0000101
444		444
		445	/* RDPSND constants */
		446	#define TSSNDCAPS_ALIVE 0x00000001
		447	#define TSSNDCAPS_VOLUME 0x00000002
445		448
446	/* RDPDR constants */	449	/* RDPDR constants */
447	#define RDPDR_MAX_DEVICES 0x10	450	#define RDPDR_MAX_DEVICES 0x10

Lines 1098-1108 Link Here

(-)rdesktop.c (-5 / +2 lines)
1098	return EX_OSERR;	1098	return EX_OSERR;
1099		1099
1100	#ifdef WITH_RDPSND	1100	#ifdef WITH_RDPSND
1101	if (g_rdpsnd)	1101	if (!rdpsnd_init(rdpsnd_optarg))
1102	{	1102	warning("Initializing sound-support failed!\n");
1103	if (!rdpsnd_init(rdpsnd_optarg))
1104	warning("Initializing sound-support failed!\n");
1105	}
1106	#endif	1103	#endif
1107		1104
1108	if (g_lspci_enabled)	1105	if (g_lspci_enabled)

Lines 45-50 Link Here

(-)rdpsnd.c (-2 / +10 lines)
45	#define MAX_FORMATS 10	45	#define MAX_FORMATS 10
46	#define MAX_QUEUE 50	46	#define MAX_QUEUE 50
47		47
		48	extern RD_BOOL g_rdpsnd;
		49
48	static VCHANNEL *rdpsnd_channel;	50	static VCHANNEL *rdpsnd_channel;
49	static VCHANNEL *rdpsnddbg_channel;	51	static VCHANNEL *rdpsnddbg_channel;
50	static struct audio_driver *drivers = NULL;	52	static struct audio_driver *drivers = NULL;
Lines 255-261 Link Here
255	rdpsnd_reset_state();	257	rdpsnd_reset_state();
256	}	258	}
257		259
258	if (!current_driver)	260	if (!current_driver && g_rdpsnd)
259	device_available = rdpsnd_auto_select();	261	device_available = rdpsnd_auto_select();
260		262
261	if (current_driver && !device_available && current_driver->wave_out_open())	263	if (current_driver && !device_available && current_driver->wave_out_open())
Lines 301-307 Link Here
301	}	303	}
302		304
303	out = rdpsnd_init_packet(RDPSND_NEGOTIATE \| 0x200, 20 + 18 * format_count);	305	out = rdpsnd_init_packet(RDPSND_NEGOTIATE \| 0x200, 20 + 18 * format_count);
304	out_uint32_le(out, 0x00800003); /* flags */	306
		307	/* if g_rdpsnd, enable the sound device */
		308	uint32 flags = TSSNDCAPS_VOLUME;
		309	if (g_rdpsnd)
		310	flags \|= TSSNDCAPS_ALIVE;
		311
		312	out_uint32_le(out, flags); /* TSSNDCAPS flags */
305	out_uint32(out, 0xffffffff); /* volume */	313	out_uint32(out, 0xffffffff); /* volume */
306	out_uint32(out, 0); /* pitch */	314	out_uint32(out, 0); /* pitch */
307	out_uint16(out, 0); /* UDP port */	315	out_uint16(out, 0); /* UDP port */

Lines 2209-2214 Link Here

(-)xwin.c (+1 lines)
2209	XCopyArea(g_display, contents, g_wnd, g_gc, 0, 0, g_width, g_height, 0, 0);	2209	XCopyArea(g_display, contents, g_wnd, g_gc, 0, 0, g_width, g_height, 0, 0);
2210	XFreePixmap(g_display, contents);	2210	XFreePixmap(g_display, contents);
2211	}	2211	}
		2212	g_pending_resize=1;
2212	}	2213	}
2213		2214
2214	static void	2215	static void

Return to bug 5011