From 34f9d4246a5c9d53c48c534ef56a1d02037da28e Mon Sep 17 00:00:00 2001
From: akallabeth <akallabeth@posteo.net>
Date: Thu, 30 Jun 2022 11:59:37 +0200
Subject: [PATCH] Merged camera-device.h with existing rdpecam.h

---
 .../rdpecam/server/camera_device_enumerator_main.c |  2 +-
 .../channels/{camera-device.h => rdpecam.h}        | 14 ++++++++------
 include/freerdp/server/rdpecam-enumerator.h        |  2 +-
 include/freerdp/server/rdpecam.h                   |  2 +-
 4 files changed, 11 insertions(+), 9 deletions(-)
 rename include/freerdp/channels/{camera-device.h => rdpecam.h} (95%)

diff --git a/channels/rdpecam/server/camera_device_enumerator_main.c b/channels/rdpecam/server/camera_device_enumerator_main.c
index ae125f7e6..7657a3050 100644
--- a/channels/rdpecam/server/camera_device_enumerator_main.c
+++ b/channels/rdpecam/server/camera_device_enumerator_main.c
@@ -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();
diff --git a/include/freerdp/channels/camera-device.h b/include/freerdp/channels/rdpecam.h
similarity index 95%
rename from include/freerdp/channels/camera-device.h
rename to include/freerdp/channels/rdpecam.h
index adb97be20..ee06bcd20 100644
--- a/include/freerdp/channels/camera-device.h
+++ b/include/freerdp/channels/rdpecam.h
@@ -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 */
diff --git a/include/freerdp/server/rdpecam-enumerator.h b/include/freerdp/server/rdpecam-enumerator.h
index 230b4e49c..3f1b77069 100644
--- a/include/freerdp/server/rdpecam-enumerator.h
+++ b/include/freerdp/server/rdpecam-enumerator.h
@@ -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;
diff --git a/include/freerdp/server/rdpecam.h b/include/freerdp/server/rdpecam.h
index 67140ea97..a28ff8740 100644
--- a/include/freerdp/server/rdpecam.h
+++ b/include/freerdp/server/rdpecam.h
@@ -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;