mfreerdp-server: rdpsnd fixes (init works)

diff --git a/server/Mac/mf_peer.c b/server/Mac/mf_peer.c
index 5ff37d7..a70ff46 100644 (file)
--- a/server/Mac/mf_peer.c
+++ b/server/Mac/mf_peer.c
@@ -30,6 +30,7 @@
 #include "mf_peer.h"\r
 #include "mf_info.h"\r
 #include "mf_event.h"\r
+#include "mf_rdpsnd.h"\r
 \r
 #include <mach/clock.h>\r
 #include <mach/mach.h>\r
@@ -197,9 +198,9 @@ void mf_peer_context_new(freerdp_peer* client, mfPeerContext* context)
     \r
        context->s = stream_new(0xFFFF);\r
     \r
-#ifdef WITH_SERVER_CHANNELS\r
+//#ifdef WITH_SERVER_CHANNELS\r
        context->vcm = WTSCreateVirtualChannelManager(client);\r
-#endif\r
+//#endif\r
     \r
     mf_info_peer_register(context->info, context);\r
 }\r
@@ -224,14 +225,14 @@ void mf_peer_context_free(freerdp_peer* client, mfPeerContext* context)
                        audin_server_context_free(context->audin);\r
 #endif\r
         \r
-#ifdef CHANNEL_RDPSND_SERVER\r
+//#ifdef CHANNEL_RDPSND_SERVER\r
                if (context->rdpsnd)\r
                        rdpsnd_server_context_free(context->rdpsnd);\r
-#endif\r
+//#endif\r
         \r
-#ifdef WITH_SERVER_CHANNELS\r
+//#ifdef WITH_SERVER_CHANNELS\r
                WTSDestroyVirtualChannelManager(context->vcm);\r
-#endif\r
+//#endif\r
        }\r
 }\r
 \r
@@ -264,7 +265,7 @@ void mf_peer_init(freerdp_peer* client)
 \r
 BOOL mf_peer_post_connect(freerdp_peer* client)\r
 {\r
-       //mfPeerContext* context = (mfPeerContext*) client->context;\r
+       mfPeerContext* context = (mfPeerContext*) client->context;\r
     rdpSettings* settings = client->settings;\r
     \r
        printf("Client %s is activated\n", client->hostname);\r
@@ -302,24 +303,24 @@ BOOL mf_peer_post_connect(freerdp_peer* client)
        /*printf("Client requested desktop: %dx%dx%d\n",\r
      client->settings->DesktopWidth, client->settings->DesktopHeight, client->settings->ColorDepth);\r
      */\r
-#ifdef WITH_SERVER_CHANNELS\r
+//#ifdef WITH_SERVER_CHANNELS\r
        /* Iterate all channel names requested by the client and activate those supported by the server */\r
     int i;\r
        for (i = 0; i < client->settings->ChannelCount; i++)\r
        {\r
                if (client->settings->ChannelDefArray[i].joined)\r
                {\r
-#ifdef CHANNEL_RDPSND_SERVER\r
+//#ifdef CHANNEL_RDPSND_SERVER\r
                        if (strncmp(client->settings->ChannelDefArray[i].Name, "rdpsnd", 6) == 0)\r
                        {\r
                                mf_peer_rdpsnd_init(context); /* Audio Output */\r
                        }\r
-#endif\r
+//#endif\r
                }\r
        }\r
     \r
        /* Dynamic Virtual Channels */\r
-#endif\r
+//#endif\r
     \r
 #ifdef CHANNEL_AUDIN_SERVER\r
        mf_peer_audin_init(context); /* Audio Input */\r
@@ -545,9 +546,9 @@ void* mf_peer_main_loop(void* arg)
                        break;\r
                }\r
         \r
-#ifdef WITH_SERVER_CHANNELS\r
+//#ifdef WITH_SERVER_CHANNELS\r
                WTSVirtualChannelManagerGetFileDescriptor(context->vcm, rfds, &rcount);\r
-#endif\r
+//#endif\r
         \r
                max_fds = 0;\r
                FD_ZERO(&rfds_set);\r
@@ -590,10 +591,10 @@ void* mf_peer_main_loop(void* arg)
                }\r
         \r
         \r
-#ifdef WITH_SERVER_CHANNELS\r
+//#ifdef WITH_SERVER_CHANNELS\r
                if (WTSVirtualChannelManagerCheckFileDescriptor(context->vcm) != TRUE)\r
                        break;\r
-#endif\r
+//#endif\r
         \r
        }\r
     \r

diff --git a/server/Mac/mf_rdpsnd.c b/server/Mac/mf_rdpsnd.c
index a125771..d5bb049 100644 (file)
--- a/server/Mac/mf_rdpsnd.c
+++ b/server/Mac/mf_rdpsnd.c
@@ -46,6 +46,7 @@ static void mf_peer_rdpsnd_activated(rdpsnd_server_context* context)
 
 BOOL mf_peer_rdpsnd_init(mfPeerContext* context)
 {
+    printf("RDPSND INIT\n");
        context->rdpsnd = rdpsnd_server_context_new(context->vcm);
        context->rdpsnd->data = context;