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

Renamed server channel to rdpei

Browse Source
This commit is contained in:
akallabeth 2022-06-30 11:22:47 +02:00 committed by akallabeth
parent cfd87ab3f1
commit 4d3003b154
6 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,9 +20,9 @@
#include <freerdp/config.h> #include <freerdp/config.h>
#include <freerdp/channels/log.h> #include <freerdp/channels/log.h>
#include <freerdp/server/camera-device-enumerator.h> #include <freerdp/server/rdpecam-enumerator.h>
#define TAG CHANNELS_TAG("cam-dev-enum.server") #define TAG CHANNELS_TAG("rdpecam-enumerator.server")
typedef enum typedef enum
{ {

4
channels/rdpecam/server/camera_device_main.c
View File

@ -20,9 +20,9 @@
#include <freerdp/config.h> #include <freerdp/config.h>
#include <freerdp/channels/log.h> #include <freerdp/channels/log.h>
#include <freerdp/server/camera-device.h> #include <freerdp/server/rdpecam.h>
#define TAG CHANNELS_TAG("camera-device.server") #define TAG CHANNELS_TAG("rdpecam.server")
typedef enum typedef enum
{ {

13
channels/server/channels.c
View File

@ -51,8 +51,11 @@
#include <freerdp/server/telemetry.h> #include <freerdp/server/telemetry.h>
#include <freerdp/server/rdpgfx.h> #include <freerdp/server/rdpgfx.h>
#include <freerdp/server/disp.h> #include <freerdp/server/disp.h>
#include <freerdp/server/camera-device-enumerator.h>
#include <freerdp/server/camera-device.h> #if defined(CHANNEL_RDPECAM_SERVER)
#include <freerdp/server/rdpecam-enumerator.h>
#include <freerdp/server/rdpecam.h>
#endif
#ifdef WITH_CHANNEL_GFXREDIR #ifdef WITH_CHANNEL_GFXREDIR
#include <freerdp/server/gfxredir.h> #include <freerdp/server/gfxredir.h>
@ -79,8 +82,10 @@ void freerdp_channels_dummy(void)
TelemetryServerContext* telemetry; TelemetryServerContext* telemetry;
RdpgfxServerContext* rdpgfx; RdpgfxServerContext* rdpgfx;
DispServerContext* disp; DispServerContext* disp;
#if defined (CHANNEL_RDPECAM_SERVER)
CamDevEnumServerContext* camera_enumerator; CamDevEnumServerContext* camera_enumerator;
CameraDeviceServerContext* camera_device; CameraDeviceServerContext* camera_device;
#endif
#ifdef WITH_CHANNEL_GFXREDIR #ifdef WITH_CHANNEL_GFXREDIR
GfxRedirServerContext* gfxredir; GfxRedirServerContext* gfxredir;
#endif // WITH_CHANNEL_GFXREDIR #endif // WITH_CHANNEL_GFXREDIR
@ -110,10 +115,14 @@ void freerdp_channels_dummy(void)
rdpgfx_server_context_free(rdpgfx); rdpgfx_server_context_free(rdpgfx);
disp = disp_server_context_new(NULL); disp = disp_server_context_new(NULL);
disp_server_context_free(disp); disp_server_context_free(disp);
#if defined (CHANNEL_RDPECAM_SERVER)
camera_enumerator = cam_dev_enum_server_context_new(NULL); camera_enumerator = cam_dev_enum_server_context_new(NULL);
cam_dev_enum_server_context_free(camera_enumerator); cam_dev_enum_server_context_free(camera_enumerator);
camera_device = camera_device_server_context_new(NULL); camera_device = camera_device_server_context_new(NULL);
camera_device_server_context_free(camera_device); camera_device_server_context_free(camera_device);
#endif
#ifdef WITH_CHANNEL_GFXREDIR #ifdef WITH_CHANNEL_GFXREDIR
gfxredir = gfxredir_server_context_new(NULL); gfxredir = gfxredir_server_context_new(NULL);
gfxredir_server_context_free(gfxredir); gfxredir_server_context_free(gfxredir);

9
include/config/config.h.in
View File

@ -62,9 +62,6 @@
#cmakedefine CHANNEL_AUDIN #cmakedefine CHANNEL_AUDIN
#cmakedefine CHANNEL_AUDIN_CLIENT #cmakedefine CHANNEL_AUDIN_CLIENT
#cmakedefine CHANNEL_AUDIN_SERVER #cmakedefine CHANNEL_AUDIN_SERVER
#cmakedefine CHANNEL_CAMERA
#cmakedefine CHANNEL_CAMERA_CLIENT
#cmakedefine CHANNEL_CAMERA_SERVER
#cmakedefine CHANNEL_CLIPRDR #cmakedefine CHANNEL_CLIPRDR
#cmakedefine CHANNEL_CLIPRDR_CLIENT #cmakedefine CHANNEL_CLIPRDR_CLIENT
#cmakedefine CHANNEL_CLIPRDR_SERVER #cmakedefine CHANNEL_CLIPRDR_SERVER
@ -95,9 +92,6 @@
#cmakedefine CHANNEL_PRINTER #cmakedefine CHANNEL_PRINTER
#cmakedefine CHANNEL_PRINTER_CLIENT #cmakedefine CHANNEL_PRINTER_CLIENT
#cmakedefine CHANNEL_PRINTER_SERVER #cmakedefine CHANNEL_PRINTER_SERVER
#cmakedefine CHANNEL_RDPEI
#cmakedefine CHANNEL_RDPEI_CLIENT
#cmakedefine CHANNEL_RDPEI_SERVER
#cmakedefine CHANNEL_RAIL #cmakedefine CHANNEL_RAIL
#cmakedefine CHANNEL_RAIL_CLIENT #cmakedefine CHANNEL_RAIL_CLIENT
#cmakedefine CHANNEL_RAIL_SERVER #cmakedefine CHANNEL_RAIL_SERVER
@ -107,6 +101,9 @@
#cmakedefine CHANNEL_RDPDR #cmakedefine CHANNEL_RDPDR
#cmakedefine CHANNEL_RDPDR_CLIENT #cmakedefine CHANNEL_RDPDR_CLIENT
#cmakedefine CHANNEL_RDPDR_SERVER #cmakedefine CHANNEL_RDPDR_SERVER
#cmakedefine CHANNEL_RDPECAM
#cmakedefine CHANNEL_RDPECAM_CLIENT
#cmakedefine CHANNEL_RDPECAM_SERVER
#cmakedefine CHANNEL_RDPEI #cmakedefine CHANNEL_RDPEI
#cmakedefine CHANNEL_RDPEI_CLIENT #cmakedefine CHANNEL_RDPEI_CLIENT
#cmakedefine CHANNEL_RDPEI_SERVER #cmakedefine CHANNEL_RDPEI_SERVER

0
include/freerdp/server/camera-device-enumerator.h → include/freerdp/server/rdpecam-enumerator.h
View File

2
include/freerdp/server/camera-device.h → include/freerdp/server/rdpecam.h
View File

@ -91,7 +91,7 @@ typedef UINT (*psCameraDeviceServerSetPropertyValueRequest)(
CameraDeviceServerContext* context, CameraDeviceServerContext* context,
const CAM_SET_PROPERTY_VALUE_REQUEST* setPropertyValueRequest); const CAM_SET_PROPERTY_VALUE_REQUEST* setPropertyValueRequest);
typedef struct camera_device_server_context struct camera_device_server_context
{ {
HANDLE vcm; HANDLE vcm;