From 81974d1b2a2a4c81d8f91dbb0934da2c2c1d016d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= Date: Sat, 22 Sep 2012 18:08:22 -0400 Subject: [PATCH] channels: moving dynamic virtual channels --- channels/{skel => audin}/CMakeLists.txt | 0 channels/audin/ChannelOptions.cmake | 10 ++++++++++ .../audin => audin/client}/CMakeLists.txt | 0 .../client}/alsa/CMakeLists.txt | 0 .../audin => audin/client}/alsa/audin_alsa.c | 0 .../audin => audin/client}/audin_main.c | 0 .../audin => audin/client}/audin_main.h | 14 +++++++++++++- .../client}/pulse/CMakeLists.txt | 0 .../client}/pulse/audin_pulse.c | 0 channels/drdynvc/client/CMakeLists.txt | 5 ----- channels/sample/CMakeLists.txt | 19 +++++++++++++++++++ channels/sample/ChannelOptions.cmake | 9 +++++++++ .../{skel => sample}/client/CMakeLists.txt | 0 channels/{skel => sample}/client/readme.txt | 0 .../client/server_chan_test.cpp | 0 channels/{skel => sample}/client/skel_main.c | 0 channels/{skel => sample}/client/skel_main.h | 0 channels/skel/ChannelOptions.cmake | 8 -------- channels/tsmf/ChannelOptions.cmake | 15 +++++++++++++++ .../tsmf => tsmf/client}/CMakeLists.txt | 0 .../tsmf => tsmf/client}/alsa/CMakeLists.txt | 0 .../tsmf => tsmf/client}/alsa/tsmf_alsa.c | 0 .../client}/ffmpeg/CMakeLists.txt | 0 .../tsmf => tsmf/client}/ffmpeg/tsmf_ffmpeg.c | 0 .../client}/gstreamer/CMakeLists.txt | 0 .../client}/gstreamer/tsmf_gstreamer.c | 0 .../tsmf => tsmf/client}/pulse/CMakeLists.txt | 0 .../tsmf => tsmf/client}/pulse/tsmf_pulse.c | 0 .../client/tsmf => tsmf/client}/tsmf_audio.c | 0 .../client/tsmf => tsmf/client}/tsmf_audio.h | 0 .../client/tsmf => tsmf/client}/tsmf_codec.c | 0 .../client/tsmf => tsmf/client}/tsmf_codec.h | 0 .../tsmf => tsmf/client}/tsmf_constants.h | 0 .../tsmf => tsmf/client}/tsmf_decoder.c | 0 .../tsmf => tsmf/client}/tsmf_decoder.h | 0 .../client/tsmf => tsmf/client}/tsmf_ifman.c | 0 .../client/tsmf => tsmf/client}/tsmf_ifman.h | 0 .../client/tsmf => tsmf/client}/tsmf_main.c | 0 .../client/tsmf => tsmf/client}/tsmf_main.h | 0 .../client/tsmf => tsmf/client}/tsmf_media.c | 0 .../client/tsmf => tsmf/client}/tsmf_media.h | 0 .../client/tsmf => tsmf/client}/tsmf_types.h | 0 42 files changed, 66 insertions(+), 14 deletions(-) rename channels/{skel => audin}/CMakeLists.txt (100%) create mode 100644 channels/audin/ChannelOptions.cmake rename channels/{drdynvc/client/audin => audin/client}/CMakeLists.txt (100%) rename channels/{drdynvc/client/audin => audin/client}/alsa/CMakeLists.txt (100%) rename channels/{drdynvc/client/audin => audin/client}/alsa/audin_alsa.c (100%) rename channels/{drdynvc/client/audin => audin/client}/audin_main.c (100%) rename channels/{drdynvc/client/audin => audin/client}/audin_main.h (87%) rename channels/{drdynvc/client/audin => audin/client}/pulse/CMakeLists.txt (100%) rename channels/{drdynvc/client/audin => audin/client}/pulse/audin_pulse.c (100%) create mode 100644 channels/sample/CMakeLists.txt create mode 100644 channels/sample/ChannelOptions.cmake rename channels/{skel => sample}/client/CMakeLists.txt (100%) rename channels/{skel => sample}/client/readme.txt (100%) rename channels/{skel => sample}/client/server_chan_test.cpp (100%) rename channels/{skel => sample}/client/skel_main.c (100%) rename channels/{skel => sample}/client/skel_main.h (100%) delete mode 100644 channels/skel/ChannelOptions.cmake create mode 100644 channels/tsmf/ChannelOptions.cmake rename channels/{drdynvc/client/tsmf => tsmf/client}/CMakeLists.txt (100%) rename channels/{drdynvc/client/tsmf => tsmf/client}/alsa/CMakeLists.txt (100%) rename channels/{drdynvc/client/tsmf => tsmf/client}/alsa/tsmf_alsa.c (100%) rename channels/{drdynvc/client/tsmf => tsmf/client}/ffmpeg/CMakeLists.txt (100%) rename channels/{drdynvc/client/tsmf => tsmf/client}/ffmpeg/tsmf_ffmpeg.c (100%) rename channels/{drdynvc/client/tsmf => tsmf/client}/gstreamer/CMakeLists.txt (100%) rename channels/{drdynvc/client/tsmf => tsmf/client}/gstreamer/tsmf_gstreamer.c (100%) rename channels/{drdynvc/client/tsmf => tsmf/client}/pulse/CMakeLists.txt (100%) rename channels/{drdynvc/client/tsmf => tsmf/client}/pulse/tsmf_pulse.c (100%) rename channels/{drdynvc/client/tsmf => tsmf/client}/tsmf_audio.c (100%) rename channels/{drdynvc/client/tsmf => tsmf/client}/tsmf_audio.h (100%) rename channels/{drdynvc/client/tsmf => tsmf/client}/tsmf_codec.c (100%) rename channels/{drdynvc/client/tsmf => tsmf/client}/tsmf_codec.h (100%) rename channels/{drdynvc/client/tsmf => tsmf/client}/tsmf_constants.h (100%) rename channels/{drdynvc/client/tsmf => tsmf/client}/tsmf_decoder.c (100%) rename channels/{drdynvc/client/tsmf => tsmf/client}/tsmf_decoder.h (100%) rename channels/{drdynvc/client/tsmf => tsmf/client}/tsmf_ifman.c (100%) rename channels/{drdynvc/client/tsmf => tsmf/client}/tsmf_ifman.h (100%) rename channels/{drdynvc/client/tsmf => tsmf/client}/tsmf_main.c (100%) rename channels/{drdynvc/client/tsmf => tsmf/client}/tsmf_main.h (100%) rename channels/{drdynvc/client/tsmf => tsmf/client}/tsmf_media.c (100%) rename channels/{drdynvc/client/tsmf => tsmf/client}/tsmf_media.h (100%) rename channels/{drdynvc/client/tsmf => tsmf/client}/tsmf_types.h (100%) diff --git a/channels/skel/CMakeLists.txt b/channels/audin/CMakeLists.txt similarity index 100% rename from channels/skel/CMakeLists.txt rename to channels/audin/CMakeLists.txt diff --git a/channels/audin/ChannelOptions.cmake b/channels/audin/ChannelOptions.cmake new file mode 100644 index 000000000..71cc38a8d --- /dev/null +++ b/channels/audin/ChannelOptions.cmake @@ -0,0 +1,10 @@ + +set(CHANNEL_TYPE "dynamic") +set(CHANNEL_SHORT_NAME "audin") +set(CHANNEL_LONG_NAME "Audio Input Redirection Virtual Channel Extension") +set(CHANNEL_SPECIFICATIONS "[MS-RDPEAI]") + +string(TOUPPER "WITH_${CHANNEL_SHORT_NAME}" CHANNEL_OPTION) +option(${CHANNEL_OPTION} "Build ${CHANNEL_SHORT_NAME}" ON) + + diff --git a/channels/drdynvc/client/audin/CMakeLists.txt b/channels/audin/client/CMakeLists.txt similarity index 100% rename from channels/drdynvc/client/audin/CMakeLists.txt rename to channels/audin/client/CMakeLists.txt diff --git a/channels/drdynvc/client/audin/alsa/CMakeLists.txt b/channels/audin/client/alsa/CMakeLists.txt similarity index 100% rename from channels/drdynvc/client/audin/alsa/CMakeLists.txt rename to channels/audin/client/alsa/CMakeLists.txt diff --git a/channels/drdynvc/client/audin/alsa/audin_alsa.c b/channels/audin/client/alsa/audin_alsa.c similarity index 100% rename from channels/drdynvc/client/audin/alsa/audin_alsa.c rename to channels/audin/client/alsa/audin_alsa.c diff --git a/channels/drdynvc/client/audin/audin_main.c b/channels/audin/client/audin_main.c similarity index 100% rename from channels/drdynvc/client/audin/audin_main.c rename to channels/audin/client/audin_main.c diff --git a/channels/drdynvc/client/audin/audin_main.h b/channels/audin/client/audin_main.h similarity index 87% rename from channels/drdynvc/client/audin/audin_main.h rename to channels/audin/client/audin_main.h index 6ac45a283..e848acf7a 100644 --- a/channels/drdynvc/client/audin/audin_main.h +++ b/channels/audin/client/audin_main.h @@ -20,7 +20,19 @@ #ifndef __AUDIN_MAIN_H #define __AUDIN_MAIN_H -#include "drdynvc_types.h" +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include +#include +#include + +#ifdef WITH_DEBUG_DVC +#define DEBUG_DVC(fmt, ...) DEBUG_CLASS(DVC, fmt, ## __VA_ARGS__) +#else +#define DEBUG_DVC(fmt, ...) DEBUG_NULL(fmt, ## __VA_ARGS__) +#endif typedef boolean (*AudinReceive) (uint8* data, int size, void* user_data); diff --git a/channels/drdynvc/client/audin/pulse/CMakeLists.txt b/channels/audin/client/pulse/CMakeLists.txt similarity index 100% rename from channels/drdynvc/client/audin/pulse/CMakeLists.txt rename to channels/audin/client/pulse/CMakeLists.txt diff --git a/channels/drdynvc/client/audin/pulse/audin_pulse.c b/channels/audin/client/pulse/audin_pulse.c similarity index 100% rename from channels/drdynvc/client/audin/pulse/audin_pulse.c rename to channels/audin/client/pulse/audin_pulse.c diff --git a/channels/drdynvc/client/CMakeLists.txt b/channels/drdynvc/client/CMakeLists.txt index b1deab049..69a86139b 100644 --- a/channels/drdynvc/client/CMakeLists.txt +++ b/channels/drdynvc/client/CMakeLists.txt @@ -36,8 +36,3 @@ endif() install(TARGETS drdynvc DESTINATION ${FREERDP_PLUGIN_PATH}) -if(NOT WIN32) - add_subdirectory(tsmf) -endif() - -add_subdirectory(audin) diff --git a/channels/sample/CMakeLists.txt b/channels/sample/CMakeLists.txt new file mode 100644 index 000000000..e6e70054d --- /dev/null +++ b/channels/sample/CMakeLists.txt @@ -0,0 +1,19 @@ +# FreeRDP: A Remote Desktop Protocol Client +# FreeRDP cmake build script +# +# Copyright 2012 Marc-Andre Moreau +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +add_subdirectory(client) + diff --git a/channels/sample/ChannelOptions.cmake b/channels/sample/ChannelOptions.cmake new file mode 100644 index 000000000..430a072ca --- /dev/null +++ b/channels/sample/ChannelOptions.cmake @@ -0,0 +1,9 @@ + +set(CHANNEL_TYPE "static") +set(CHANNEL_SHORT_NAME "sample") +set(CHANNEL_LONG_NAME "Sample Virtual Channel Extension") +set(CHANNEL_SPECIFICATIONS "") + +string(TOUPPER "WITH_${CHANNEL_SHORT_NAME}" CHANNEL_OPTION) +option(${CHANNEL_OPTION} "Build ${CHANNEL_SHORT_NAME}" OFF) + diff --git a/channels/skel/client/CMakeLists.txt b/channels/sample/client/CMakeLists.txt similarity index 100% rename from channels/skel/client/CMakeLists.txt rename to channels/sample/client/CMakeLists.txt diff --git a/channels/skel/client/readme.txt b/channels/sample/client/readme.txt similarity index 100% rename from channels/skel/client/readme.txt rename to channels/sample/client/readme.txt diff --git a/channels/skel/client/server_chan_test.cpp b/channels/sample/client/server_chan_test.cpp similarity index 100% rename from channels/skel/client/server_chan_test.cpp rename to channels/sample/client/server_chan_test.cpp diff --git a/channels/skel/client/skel_main.c b/channels/sample/client/skel_main.c similarity index 100% rename from channels/skel/client/skel_main.c rename to channels/sample/client/skel_main.c diff --git a/channels/skel/client/skel_main.h b/channels/sample/client/skel_main.h similarity index 100% rename from channels/skel/client/skel_main.h rename to channels/sample/client/skel_main.h diff --git a/channels/skel/ChannelOptions.cmake b/channels/skel/ChannelOptions.cmake deleted file mode 100644 index 9125cb227..000000000 --- a/channels/skel/ChannelOptions.cmake +++ /dev/null @@ -1,8 +0,0 @@ - -set(CHANNEL_TYPE "static") -set(CHANNEL_SHORT_NAME "skel") -set(CHANNEL_LONG_NAME "Skeleton Code Virtual Channel Extension") -set(CHANNEL_SPECIFICATIONS "") - -option(${CHANNEL_OPTION} "Build ${CHANNEL_SHORT_NAME}" OFF) - diff --git a/channels/tsmf/ChannelOptions.cmake b/channels/tsmf/ChannelOptions.cmake new file mode 100644 index 000000000..0e79c69f5 --- /dev/null +++ b/channels/tsmf/ChannelOptions.cmake @@ -0,0 +1,15 @@ + +set(CHANNEL_TYPE "dynamic") +set(CHANNEL_SHORT_NAME "tsmf") +set(CHANNEL_LONG_NAME "Video Redirection Virtual Channel Extension") +set(CHANNEL_SPECIFICATIONS "[MS-RDPEV]") + +string(TOUPPER "WITH_${CHANNEL_SHORT_NAME}" CHANNEL_OPTION) + +if(WIN32) + option(${CHANNEL_OPTION} "Build ${CHANNEL_SHORT_NAME}" OFF) +else() + option(${CHANNEL_OPTION} "Build ${CHANNEL_SHORT_NAME}" ON) +endif() + + diff --git a/channels/drdynvc/client/tsmf/CMakeLists.txt b/channels/tsmf/client/CMakeLists.txt similarity index 100% rename from channels/drdynvc/client/tsmf/CMakeLists.txt rename to channels/tsmf/client/CMakeLists.txt diff --git a/channels/drdynvc/client/tsmf/alsa/CMakeLists.txt b/channels/tsmf/client/alsa/CMakeLists.txt similarity index 100% rename from channels/drdynvc/client/tsmf/alsa/CMakeLists.txt rename to channels/tsmf/client/alsa/CMakeLists.txt diff --git a/channels/drdynvc/client/tsmf/alsa/tsmf_alsa.c b/channels/tsmf/client/alsa/tsmf_alsa.c similarity index 100% rename from channels/drdynvc/client/tsmf/alsa/tsmf_alsa.c rename to channels/tsmf/client/alsa/tsmf_alsa.c diff --git a/channels/drdynvc/client/tsmf/ffmpeg/CMakeLists.txt b/channels/tsmf/client/ffmpeg/CMakeLists.txt similarity index 100% rename from channels/drdynvc/client/tsmf/ffmpeg/CMakeLists.txt rename to channels/tsmf/client/ffmpeg/CMakeLists.txt diff --git a/channels/drdynvc/client/tsmf/ffmpeg/tsmf_ffmpeg.c b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c similarity index 100% rename from channels/drdynvc/client/tsmf/ffmpeg/tsmf_ffmpeg.c rename to channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c diff --git a/channels/drdynvc/client/tsmf/gstreamer/CMakeLists.txt b/channels/tsmf/client/gstreamer/CMakeLists.txt similarity index 100% rename from channels/drdynvc/client/tsmf/gstreamer/CMakeLists.txt rename to channels/tsmf/client/gstreamer/CMakeLists.txt diff --git a/channels/drdynvc/client/tsmf/gstreamer/tsmf_gstreamer.c b/channels/tsmf/client/gstreamer/tsmf_gstreamer.c similarity index 100% rename from channels/drdynvc/client/tsmf/gstreamer/tsmf_gstreamer.c rename to channels/tsmf/client/gstreamer/tsmf_gstreamer.c diff --git a/channels/drdynvc/client/tsmf/pulse/CMakeLists.txt b/channels/tsmf/client/pulse/CMakeLists.txt similarity index 100% rename from channels/drdynvc/client/tsmf/pulse/CMakeLists.txt rename to channels/tsmf/client/pulse/CMakeLists.txt diff --git a/channels/drdynvc/client/tsmf/pulse/tsmf_pulse.c b/channels/tsmf/client/pulse/tsmf_pulse.c similarity index 100% rename from channels/drdynvc/client/tsmf/pulse/tsmf_pulse.c rename to channels/tsmf/client/pulse/tsmf_pulse.c diff --git a/channels/drdynvc/client/tsmf/tsmf_audio.c b/channels/tsmf/client/tsmf_audio.c similarity index 100% rename from channels/drdynvc/client/tsmf/tsmf_audio.c rename to channels/tsmf/client/tsmf_audio.c diff --git a/channels/drdynvc/client/tsmf/tsmf_audio.h b/channels/tsmf/client/tsmf_audio.h similarity index 100% rename from channels/drdynvc/client/tsmf/tsmf_audio.h rename to channels/tsmf/client/tsmf_audio.h diff --git a/channels/drdynvc/client/tsmf/tsmf_codec.c b/channels/tsmf/client/tsmf_codec.c similarity index 100% rename from channels/drdynvc/client/tsmf/tsmf_codec.c rename to channels/tsmf/client/tsmf_codec.c diff --git a/channels/drdynvc/client/tsmf/tsmf_codec.h b/channels/tsmf/client/tsmf_codec.h similarity index 100% rename from channels/drdynvc/client/tsmf/tsmf_codec.h rename to channels/tsmf/client/tsmf_codec.h diff --git a/channels/drdynvc/client/tsmf/tsmf_constants.h b/channels/tsmf/client/tsmf_constants.h similarity index 100% rename from channels/drdynvc/client/tsmf/tsmf_constants.h rename to channels/tsmf/client/tsmf_constants.h diff --git a/channels/drdynvc/client/tsmf/tsmf_decoder.c b/channels/tsmf/client/tsmf_decoder.c similarity index 100% rename from channels/drdynvc/client/tsmf/tsmf_decoder.c rename to channels/tsmf/client/tsmf_decoder.c diff --git a/channels/drdynvc/client/tsmf/tsmf_decoder.h b/channels/tsmf/client/tsmf_decoder.h similarity index 100% rename from channels/drdynvc/client/tsmf/tsmf_decoder.h rename to channels/tsmf/client/tsmf_decoder.h diff --git a/channels/drdynvc/client/tsmf/tsmf_ifman.c b/channels/tsmf/client/tsmf_ifman.c similarity index 100% rename from channels/drdynvc/client/tsmf/tsmf_ifman.c rename to channels/tsmf/client/tsmf_ifman.c diff --git a/channels/drdynvc/client/tsmf/tsmf_ifman.h b/channels/tsmf/client/tsmf_ifman.h similarity index 100% rename from channels/drdynvc/client/tsmf/tsmf_ifman.h rename to channels/tsmf/client/tsmf_ifman.h diff --git a/channels/drdynvc/client/tsmf/tsmf_main.c b/channels/tsmf/client/tsmf_main.c similarity index 100% rename from channels/drdynvc/client/tsmf/tsmf_main.c rename to channels/tsmf/client/tsmf_main.c diff --git a/channels/drdynvc/client/tsmf/tsmf_main.h b/channels/tsmf/client/tsmf_main.h similarity index 100% rename from channels/drdynvc/client/tsmf/tsmf_main.h rename to channels/tsmf/client/tsmf_main.h diff --git a/channels/drdynvc/client/tsmf/tsmf_media.c b/channels/tsmf/client/tsmf_media.c similarity index 100% rename from channels/drdynvc/client/tsmf/tsmf_media.c rename to channels/tsmf/client/tsmf_media.c diff --git a/channels/drdynvc/client/tsmf/tsmf_media.h b/channels/tsmf/client/tsmf_media.h similarity index 100% rename from channels/drdynvc/client/tsmf/tsmf_media.h rename to channels/tsmf/client/tsmf_media.h diff --git a/channels/drdynvc/client/tsmf/tsmf_types.h b/channels/tsmf/client/tsmf_types.h similarity index 100% rename from channels/drdynvc/client/tsmf/tsmf_types.h rename to channels/tsmf/client/tsmf_types.h