Merge pull request #2697 from realjiangms/shadow_audio
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 22 Jun 2015 13:52:53 +0000 (09:52 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 22 Jun 2015 13:52:53 +0000 (09:52 -0400)
Shadow server: fix channel disposal and add audio support. fix message mechanism in client

1  2 
include/freerdp/server/shadow.h
server/shadow/shadow_client.c
server/shadow/shadow_server.c
server/shadow/shadow_subsystem.c
server/shadow/shadow_subsystem.h

@@@ -158,10 -167,9 +169,11 @@@ struct _RDP_SHADOW_ENTRY_POINT
        pfnShadowUnicodeKeyboardEvent UnicodeKeyboardEvent; \
        pfnShadowMouseEvent MouseEvent; \
        pfnShadowExtendedMouseEvent ExtendedMouseEvent; \
+       pfnShadowChannelAudinServerReceiveSamples AudinServerReceiveSamples; \
        \
        pfnShadowAuthenticate Authenticate; \
 +      pfnShadowClientConnect ClientConnect; \
 +      pfnShadowClientDisconnect ClientDisconnect; \
        \
        rdpShadowServer* server
  
Simple merge
Simple merge
Simple merge
Simple merge