mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wfreerdp-server: fix regression that I made earlier

Browse Source
This commit is contained in:
Corey C 2013-02-18 16:01:37 -05:00
parent 561e49009c
commit 64a67b5cd0
5 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/Windows/wf_directsound.c
View File

@ -20,7 +20,7 @@ DSCBUFFERDESC dscbd;
DWORD lastPos; DWORD lastPos;
wfPeerContext* latestPeer; wfPeerContext* latestPeer;
int wf_directsound_set_latest_peer(wfPeerContext* peer) int wf_rdpsnd_set_latest_peer(wfPeerContext* peer)
{ {
latestPeer = peer; latestPeer = peer;
return 0; return 0;

2
server/Windows/wf_directsound.h
View File

@ -4,7 +4,7 @@
#include <freerdp/server/rdpsnd.h> #include <freerdp/server/rdpsnd.h>
#include "wf_interface.h" #include "wf_interface.h"
int wf_directsound_set_latest_peer(wfPeerContext* peer); int wf_rdpsnd_set_latest_peer(wfPeerContext* peer);
int wf_directsound_activate(rdpsnd_server_context* context); int wf_directsound_activate(rdpsnd_server_context* context);

15
server/Windows/wf_rdpsnd.c
View File

@ -27,19 +27,6 @@
#include <winpr/windows.h> #include <winpr/windows.h>
/*
#define INITGUID
#include <initguid.h>
#include <objbase.h>
#define CINTERFACE
#include <mmsystem.h>
#include <dsound.h>
#include <freerdp/server/rdpsnd.h>
*/
#include "wf_rdpsnd.h" #include "wf_rdpsnd.h"
#include "wf_info.h" #include "wf_info.h"
@ -149,6 +136,8 @@ BOOL wf_peer_rdpsnd_init(wfPeerContext* context)
context->rdpsnd->Initialize(context->rdpsnd); context->rdpsnd->Initialize(context->rdpsnd);
wf_rdpsnd_set_latest_peer(context);
wfi->snd_stop = FALSE; wfi->snd_stop = FALSE;
return TRUE; return TRUE;
} }

7
server/Windows/wf_wasapi.c
View File

@ -27,6 +27,13 @@ DEFINE_GUID(IID_IAudioCaptureClient, 0xc8adbd64, 0xe71e, 0x48a0, 0xa4,0xde, 0x18
LPWSTR devStr = NULL; LPWSTR devStr = NULL;
wfPeerContext* latestPeer = NULL; wfPeerContext* latestPeer = NULL;
int wf_rdpsnd_set_latest_peer(wfPeerContext* peer)
{
latestPeer = peer;
return 0;
}
int wf_wasapi_activate(rdpsnd_server_context* context) int wf_wasapi_activate(rdpsnd_server_context* context)
{ {
wchar_t * pattern = L"Stereo Mix"; wchar_t * pattern = L"Stereo Mix";

2
server/Windows/wf_wasapi.h
View File

@ -4,6 +4,8 @@
#include <freerdp/server/rdpsnd.h> #include <freerdp/server/rdpsnd.h>
#include "wf_interface.h" #include "wf_interface.h"
int wf_rdpsnd_set_latest_peer(wfPeerContext* peer);
int wf_wasapi_activate(rdpsnd_server_context* context); int wf_wasapi_activate(rdpsnd_server_context* context);
int wf_wasapi_get_device_string(LPWSTR pattern, LPWSTR * deviceStr); int wf_wasapi_get_device_string(LPWSTR pattern, LPWSTR * deviceStr);