From cfd87ab3f19327392ba43439d3b176fcfa66d567 Mon Sep 17 00:00:00 2001
From: akallabeth <akallabeth@posteo.net>
Date: Thu, 30 Jun 2022 11:11:29 +0200
Subject: [PATCH] Fix rdpecam server channel naming

---
 channels/rdpecam/CMakeLists.txt        | 3 +--
 channels/rdpecam/ChannelOptions.cmake  | 9 ++-------
 channels/rdpecam/server/CMakeLists.txt | 3 +--
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/channels/rdpecam/CMakeLists.txt b/channels/rdpecam/CMakeLists.txt
index 2ea7828d0..63ed41069 100644
--- a/channels/rdpecam/CMakeLists.txt
+++ b/channels/rdpecam/CMakeLists.txt
@@ -15,8 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-define_channel("camera-device")
-define_channel("camera-device-enumerator")
+define_channel("rdpecam")
 
 if(WITH_SERVER_CHANNELS)
 	add_channel_server(${MODULE_PREFIX} ${CHANNEL_NAME})
diff --git a/channels/rdpecam/ChannelOptions.cmake b/channels/rdpecam/ChannelOptions.cmake
index 6377499d7..7528d115c 100644
--- a/channels/rdpecam/ChannelOptions.cmake
+++ b/channels/rdpecam/ChannelOptions.cmake
@@ -1,14 +1,9 @@
 
-set(OPTION_DEFAULT OFF)
+set(OPTION_DEFAULT ON)
 set(OPTION_CLIENT_DEFAULT OFF)
 set(OPTION_SERVER_DEFAULT ON)
 
-define_channel_options(NAME "camera-device" TYPE "dynamic"
-	DESCRIPTION "Video Capture Virtual Channel Extension"
-	SPECIFICATIONS "[MS-RDPECAM]"
-	DEFAULT ${OPTION_DEFAULT})
-
-define_channel_options(NAME "camera-device-enumerator" TYPE "dynamic"
+define_channel_options(NAME "rdpecam" TYPE "dynamic"
 	DESCRIPTION "Video Capture Virtual Channel Extension"
 	SPECIFICATIONS "[MS-RDPECAM]"
 	DEFAULT ${OPTION_DEFAULT})
diff --git a/channels/rdpecam/server/CMakeLists.txt b/channels/rdpecam/server/CMakeLists.txt
index e272f9d40..2a65ba7fe 100644
--- a/channels/rdpecam/server/CMakeLists.txt
+++ b/channels/rdpecam/server/CMakeLists.txt
@@ -15,8 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-define_channel_server("camera-device")
-define_channel_server("camera-device-enumerator")
+define_channel_server("rdpecam")
 
 set(${MODULE_PREFIX}_SRCS
 	camera_device_enumerator_main.c