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

Merged camera-device.h with existing rdpecam.h

Browse Source
This commit is contained in:
akallabeth 2022-06-30 11:59:37 +02:00 committed by akallabeth
parent 2045b86458
commit 34f9d4246a
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
channels/rdpecam/server/camera_device_enumerator_main.c
View File

@ -102,7 +102,7 @@ static UINT enumerator_server_open_channel(enumerator_server* enumerator)
}
enumerator->enumerator_channel = WTSVirtualChannelOpenEx(
enumerator->SessionId, CAM_DEVICE_ENUMERATOR_DVC_CHANNEL_NAME, WTS_CHANNEL_OPTION_DYNAMIC);
enumerator->SessionId, RDPECAM_CONTROL_DVC_CHANNEL_NAME, WTS_CHANNEL_OPTION_DYNAMIC);
if (!enumerator->enumerator_channel)
{
Error = GetLastError();

14
include/freerdp/channels/camera-device.h → include/freerdp/channels/rdpecam.h
View File

@ -1,8 +1,9 @@
/**
* FreeRDP: A Remote Desktop Protocol Implementation
* Video Capture Virtual Channel Extension
* Video Optimized Remoting Virtual Channel Extension
*
* Copyright 2022 Pascal Nowack <Pascal.Nowack@gmx.de>
* Copyright 2021 Armin Novak <armin.novak@thincast.com>
* Copyright 2021 Thincast Technologies GmbH
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -17,14 +18,15 @@
* limitations under the License.
*/
#ifndef FREERDP_CHANNEL_CAMERA_DEVICE_H
#define FREERDP_CHANNEL_CAMERA_DEVICE_H
#ifndef FREERDP_CHANNEL_RDPECAM_H
#define FREERDP_CHANNEL_RDPECAM_H
#include <freerdp/api.h>
#include <freerdp/dvc.h>
#include <freerdp/types.h>
#define CAM_DEVICE_ENUMERATOR_DVC_CHANNEL_NAME "RDCamera_Device_Enumerator"
#define RDPECAM_DVC_CHANNEL_NAME "rdpecam"
#define RDPECAM_CONTROL_DVC_CHANNEL_NAME "RDCamera_Device_Enumerator"
typedef enum
{
@ -332,4 +334,4 @@ typedef struct
CAM_PROPERTY_VALUE PropertyValue;
} CAM_SET_PROPERTY_VALUE_REQUEST;
#endif /* FREERDP_CHANNEL_CAMERA_DEVICE_H */
#endif /* FREERDP_CHANNEL_RDPECAM_H */

2
include/freerdp/server/rdpecam-enumerator.h
View File

@ -20,7 +20,7 @@
#ifndef FREERDP_CHANNEL_CAM_DEV_ENUM_SERVER_CAM_DEV_ENUM_H
#define FREERDP_CHANNEL_CAM_DEV_ENUM_SERVER_CAM_DEV_ENUM_H
#include <freerdp/channels/camera-device.h>
#include <freerdp/channels/rdpecam.h>
#include <freerdp/channels/wtsvc.h>
typedef struct _cam_dev_enum_server_context CamDevEnumServerContext;

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

@ -20,7 +20,7 @@
#ifndef FREERDP_CHANNEL_CAMERA_DEVICE_SERVER_CAMERA_DEVICE_H
#define FREERDP_CHANNEL_CAMERA_DEVICE_SERVER_CAMERA_DEVICE_H
#include <freerdp/channels/camera-device.h>
#include <freerdp/channels/rdpecam.h>
#include <freerdp/channels/wtsvc.h>
typedef struct camera_device_server_context CameraDeviceServerContext;