Attachment #511 for bug #5011

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

Lines 153-158 Link Here

(-)channels.c (+1 lines)
153	if (i >= g_num_channels)	153	if (i >= g_num_channels)
154	return;	154	return;
155		155
		156
156	in_uint32_le(s, length);	157	in_uint32_le(s, length);
157	in_uint32_le(s, flags);	158	in_uint32_le(s, flags);
158	if ((flags & CHANNEL_FLAG_FIRST) && (flags & CHANNEL_FLAG_LAST))	159	if ((flags & CHANNEL_FLAG_FIRST) && (flags & CHANNEL_FLAG_LAST))

Lines 1097-1102 Link Here

(-)rdesktop.c (+1 lines)
1097	if (!ui_init())	1097	if (!ui_init())
1098	return EX_OSERR;	1098	return EX_OSERR;
1099		1099
		1100	rdpsnd_preinit();
1100	#ifdef WITH_RDPSND	1101	#ifdef WITH_RDPSND
1101	if (g_rdpsnd)	1102	if (g_rdpsnd)
1102	{	1103	{

Lines 45-50 Link Here

(-)rdpsnd.c (-4 / +14 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 580-585 Link Here
580	{	582	{
581	uint16 len;	583	uint16 len;
582		584
		585	if (!g_rdpsnd)
		586	return;
		587
583	while (!s_check_end(s))	588	while (!s_check_end(s))
584	{	589	{
585	/* New packet */	590	/* New packet */
Lines 696-701 Link Here
696	}	701	}
697		702
698	RD_BOOL	703	RD_BOOL
		704	rdpsnd_preinit()
		705	{
		706	rdpsnd_channel =
		707	channel_register("rdpsnd", CHANNEL_OPTION_INITIALIZED \| CHANNEL_OPTION_ENCRYPT_RDP,
		708	rdpsnd_process);
		709	return (rdpsnd_channel != NULL);
		710	}
		711
		712	RD_BOOL
699	rdpsnd_init(char *optarg)	713	rdpsnd_init(char *optarg)
700	{	714	{
701	struct audio_driver *pos;	715	struct audio_driver *pos;
Lines 707-716 Link Here
707	packet.p = packet.end = packet.data;	721	packet.p = packet.end = packet.data;
708	packet.size = 0;	722	packet.size = 0;
709		723
710	rdpsnd_channel =
711	channel_register("rdpsnd", CHANNEL_OPTION_INITIALIZED \| CHANNEL_OPTION_ENCRYPT_RDP,
712	rdpsnd_process);
713
714	rdpsnddbg_channel =	724	rdpsnddbg_channel =
715	channel_register("snddbg", CHANNEL_OPTION_INITIALIZED \| CHANNEL_OPTION_ENCRYPT_RDP,	725	channel_register("snddbg", CHANNEL_OPTION_INITIALIZED \| CHANNEL_OPTION_ENCRYPT_RDP,
716	rdpsnddbg_process);	726	rdpsnddbg_process);

Return to bug 5011