From ba0b4ee524e99c5b259d4022e58c57798680b653 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= <marcandre.moreau@gmail.com>
Date: Fri, 10 May 2013 16:39:16 -0400
Subject: [PATCH] libfreerdp-client: load rdpdr when rdpsnd is loaded

---
 channels/client/channels.c    | 2 +-
 client/common/cmdline.c       | 1 +
 libfreerdp/utils/svc_plugin.c | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/channels/client/channels.c b/channels/client/channels.c
index 82ee13e1c..a9ef88907 100644
--- a/channels/client/channels.c
+++ b/channels/client/channels.c
@@ -833,7 +833,7 @@ FREERDP_API int freerdp_channels_send_event(rdpChannels* channels, wMessage* eve
 
 	if (!name)
 	{
-		DEBUG_CHANNELS("unknown event_class %d", event->event_class);
+		DEBUG_CHANNELS("unknown event_class %d", GetMessageClass(event->id));
 		freerdp_event_free(event);
 		return 1;
 	}
diff --git a/client/common/cmdline.c b/client/common/cmdline.c
index 92cc70f33..1055ea827 100644
--- a/client/common/cmdline.c
+++ b/client/common/cmdline.c
@@ -1661,6 +1661,7 @@ int freerdp_client_load_addins(rdpChannels* channels, rdpSettings* settings)
 	if ((freerdp_static_channel_collection_find(settings, "rdpsnd")) ||
 			(freerdp_dynamic_channel_collection_find(settings, "tsmf")))
 	{
+		settings->DeviceRedirection = TRUE; /* rdpsnd requires rdpdr to be registered */
 		settings->AudioPlayback = TRUE; /* Both rdpsnd and tsmf require this flag to be set */
 	}
 
diff --git a/libfreerdp/utils/svc_plugin.c b/libfreerdp/utils/svc_plugin.c
index ba961b8d7..f0869a6c6 100644
--- a/libfreerdp/utils/svc_plugin.c
+++ b/libfreerdp/utils/svc_plugin.c
@@ -326,7 +326,8 @@ int svc_plugin_send_event(rdpSvcPlugin* plugin, wMessage* event)
 {
 	UINT32 status = 0;
 
-	DEBUG_SVC("event_type %d", event->event_type);
+	DEBUG_SVC("event class: %d type: %d",
+			GetMessageClass(event->id), GetMessageType(event->id));
 
 	status = plugin->channel_entry_points.pVirtualChannelEventPush(plugin->open_handle, event);