mfreerdp-server: temporarily removed conditional compilation of rdpsnd and audin

server/Mac/mf_audin.h

@@ -3,6 +3,7 @@
  * FreeRDP Mac OS X Server (Audio Input)
  *
  * Copyright 2012 Marc-Andre Moreau <marcandre.moreau@gmail.com>
+ * Copyright 2013 Corey Clayton <can.of.tuna@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,10 +23,11 @@
 
 #include <freerdp/freerdp.h>
 #include <freerdp/listener.h>
-#include <freerdp/server/audin.h>
 
+#include "mf_interface.h"
 #include "mfreerdp.h"
 
+
 void mf_peer_audin_init(mfPeerContext* context);
 
 #endif /* MF_AUDIN_H */

server/Mac/mf_interface.h

@@ -23,22 +23,24 @@
 
 #include <pthread.h>
 
+#include <freerdp/codec/rfx.h>
 #include <freerdp/codec/nsc.h>
 #include <freerdp/listener.h>
 #include <freerdp/utils/stream.h>
 
-#ifdef WITH_SERVER_CHANNELS
+//#ifdef WITH_SERVER_CHANNELS
 #include <freerdp/channels/wtsvc.h>
-#endif
+//#endif
 
-#ifdef CHANNEL_RDPSND_SERVER
+//#ifdef CHANNEL_RDPSND_SERVER
 #include <freerdp/server/rdpsnd.h>
-#include "mf_rdpsnd.h"
-#endif
+//#include "mf_rdpsnd.h"
+//#endif
 
-#ifdef CHANNEL_AUDIN_SERVER
-#include "mf_audin.h"
-#endif
+//#ifdef CHANNEL_AUDIN_SERVER
+#include <freerdp/server/audin.h>
+//#include "mf_audin.h"
+//#endif
 
 typedef struct mf_info mfInfo;
 typedef struct mf_peer_context mfPeerContext;
@@ -55,16 +57,16 @@ struct mf_peer_context
 	RFX_CONTEXT* rfx_context;
 	NSC_CONTEXT* nsc_context;
     
-#ifdef WITH_SERVER_CHANNELS
+//#ifdef WITH_SERVER_CHANNELS
 	WTSVirtualChannelManager* vcm;
-#endif
-#ifdef CHANNEL_AUDIN_SERVER
+//#endif
+//#ifdef CHANNEL_AUDIN_SERVER
 	audin_server_context* audin;
-#endif
+//#endif
     
-#ifdef CHANNEL_RDPSND_SERVER
+//#ifdef CHANNEL_RDPSND_SERVER
 	rdpsnd_server_context* rdpsnd;
-#endif
+//#endif
 };
 
 

server/Mac/mf_peer.c

@@ -22,7 +22,6 @@
 #endif
 
 #include <freerdp/listener.h>
-#include <freerdp/utils/sleep.h>
 #include <freerdp/codec/rfx.h>
 #include <freerdp/utils/stream.h>
 

server/Mac/mf_rdpsnd.h

@@ -24,6 +24,7 @@
 #include <freerdp/listener.h>
 #include <freerdp/server/rdpsnd.h>
 
+#include "mf_interface.h"
 #include "mfreerdp.h"
 
 BOOL mf_peer_rdpsnd_init(mfPeerContext* context);

server/Mac/mfreerdp.c

@@ -35,8 +35,8 @@
 #include <winpr/crt.h>
 
 #include <freerdp/constants.h>
-#include <freerdp/utils/sleep.h>
-#include <freerdp/utils/memory.h>
+//#include <freerdp/utils/sleep.h>
+//#include <freerdp/utils/memory.h>
 
 #include "mfreerdp.h"
 #include "mf_peer.h"