mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed stuff

This commit is contained in:
Armin Novak 2018-09-25 17:09:45 +02:00
parent 2cf0662559
commit c60ab7d068
5 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/freerdp/server/rdpsnd.h
View File

@ -57,7 +57,7 @@ struct _rdpsnd_server_context
void* data;
/* Server supported formats. Set by server. */
const AUDIO_FORMAT* server_formats;
AUDIO_FORMAT* server_formats;
size_t num_server_formats;
/* Server source PCM audio format. Set by server. */

16
include/freerdp/server/shadow.h
View File

@ -229,13 +229,11 @@ struct rdp_shadow_subsystem
typedef struct _SHADOW_MSG_OUT SHADOW_MSG_OUT;
typedef void (*MSG_OUT_FREE_FN)(UINT32 id,
SHADOW_MSG_OUT* msg); /* function to free SHADOW_MSG_OUT */
#define RDP_SHADOW_MSG_OUT_COMMON() \
int refCount; \
MSG_OUT_FREE_FN Free
struct _SHADOW_MSG_OUT
{
RDP_SHADOW_MSG_OUT_COMMON();
int refCount;
MSG_OUT_FREE_FN Free;
};
#define SHADOW_MSG_OUT_POINTER_POSITION_UPDATE_ID 2001
@ -245,7 +243,7 @@ struct _SHADOW_MSG_OUT
struct _SHADOW_MSG_OUT_POINTER_POSITION_UPDATE
{
RDP_SHADOW_MSG_OUT_COMMON();
SHADOW_MSG_OUT common;
UINT32 xPos;
UINT32 yPos;
};
@ -254,7 +252,7 @@ typedef struct _SHADOW_MSG_OUT_POINTER_POSITION_UPDATE
struct _SHADOW_MSG_OUT_POINTER_ALPHA_UPDATE
{
RDP_SHADOW_MSG_OUT_COMMON();
SHADOW_MSG_OUT common;
UINT32 xHot;
UINT32 yHot;
UINT32 width;
@ -269,8 +267,8 @@ typedef struct _SHADOW_MSG_OUT_POINTER_ALPHA_UPDATE
struct _SHADOW_MSG_OUT_AUDIO_OUT_SAMPLES
{
RDP_SHADOW_MSG_OUT_COMMON();
AUDIO_FORMAT audio_format;
SHADOW_MSG_OUT common;
AUDIO_FORMAT* audio_format;
void* buf;
int nFrames;
UINT16 wTimestamp;
@ -280,7 +278,7 @@ typedef struct _SHADOW_MSG_OUT_AUDIO_OUT_SAMPLES
struct _SHADOW_MSG_OUT_AUDIO_OUT_VOLUME
{
RDP_SHADOW_MSG_OUT_COMMON();
SHADOW_MSG_OUT common;
int left;
int right;
};

1
server/Windows/wf_rdpsnd.c
View File

@ -139,7 +139,6 @@ BOOL wf_peer_rdpsnd_init(wfPeerContext* context)
context->rdpsnd = rdpsnd_server_context_new(context->vcm);
context->rdpsnd->rdpcontext = &context->_p;
context->rdpsnd->data = context;
context->rdpsnd->server_formats = supported_audio_formats;
context->rdpsnd->num_server_formats = server_rdpsnd_get_formats(&context->rdpsnd->server_formats);
if (context->rdpsnd->num_server_formats > 0)

4
server/shadow/X11/x11_shadow.c
View File

@ -424,7 +424,7 @@ static int x11_shadow_pointer_position_update(x11ShadowSubsystem* subsystem)
templateMsg.xPos = subsystem->common.pointerX;
templateMsg.yPos = subsystem->common.pointerY;
templateMsg.Free = x11_shadow_message_free;
templateMsg.common.Free = x11_shadow_message_free;
server = subsystem->common.server;
ArrayList_Lock(server->clients);
@ -478,7 +478,7 @@ static int x11_shadow_pointer_alpha_update(x11ShadowSubsystem* subsystem)
return -1;
}
msg->Free = x11_shadow_message_free;
msg->common.Free = x11_shadow_message_free;
return shadow_client_boardcast_msg(subsystem->common.server, NULL, msgId,
(SHADOW_MSG_OUT*) msg, NULL) ? 1 : -1;
}

2
server/shadow/shadow_rdpsnd.c
View File

@ -83,7 +83,7 @@ int shadow_client_rdpsnd_init(rdpShadowClient* client)
}
if (rdpsnd->num_server_formats > 0)
rdpsnd->src_format = rdpsnd->server_formats[0];
rdpsnd->src_format = &rdpsnd->server_formats[0];
rdpsnd->Activated = rdpsnd_activated;
rdpsnd->Initialize(rdpsnd, TRUE);