From 6afb6d9c9f6b79e7531a84870c0572c610879819 Mon Sep 17 00:00:00 2001 From: jp9000 Date: Sun, 21 Mar 2021 02:46:01 -0700 Subject: [PATCH] rtmp-services: Move service-specific files Cleans up the directory a bit --- plugins/rtmp-services/CMakeLists.txt | 16 ++++++++-------- plugins/rtmp-services/rtmp-common.c | 8 ++++---- plugins/rtmp-services/rtmp-services-main.c | 3 ++- .../{ => service-specific}/nimotv.c | 0 .../{ => service-specific}/nimotv.h | 0 .../{ => service-specific}/showroom.c | 0 .../{ => service-specific}/showroom.h | 0 .../{ => service-specific}/twitch.c | 0 .../{ => service-specific}/twitch.h | 0 .../{ => service-specific}/younow.c | 0 .../{ => service-specific}/younow.h | 0 11 files changed, 14 insertions(+), 13 deletions(-) rename plugins/rtmp-services/{ => service-specific}/nimotv.c (100%) rename plugins/rtmp-services/{ => service-specific}/nimotv.h (100%) rename plugins/rtmp-services/{ => service-specific}/showroom.c (100%) rename plugins/rtmp-services/{ => service-specific}/showroom.h (100%) rename plugins/rtmp-services/{ => service-specific}/twitch.c (100%) rename plugins/rtmp-services/{ => service-specific}/twitch.h (100%) rename plugins/rtmp-services/{ => service-specific}/younow.c (100%) rename plugins/rtmp-services/{ => service-specific}/younow.h (100%) diff --git a/plugins/rtmp-services/CMakeLists.txt b/plugins/rtmp-services/CMakeLists.txt index 772d07387..0c27734c0 100644 --- a/plugins/rtmp-services/CMakeLists.txt +++ b/plugins/rtmp-services/CMakeLists.txt @@ -7,10 +7,10 @@ include_directories(${LIBCURL_INCLUDE_DIRS}) include_directories(${OBS_JANSSON_INCLUDE_DIRS}) set(rtmp-services_SOURCES - twitch.c - younow.c - nimotv.c - showroom.c + service-specific/twitch.c + service-specific/younow.c + service-specific/nimotv.c + service-specific/showroom.c rtmp-common.c rtmp-custom.c rtmp-services-main.c) @@ -23,10 +23,10 @@ if(WIN32) endif() set(rtmp-services_HEADERS - twitch.h - younow.h - nimotv.h - showroom.h + service-specific/twitch.h + service-specific/younow.h + service-specific/nimotv.h + service-specific/showroom.h rtmp-format-ver.h) set(RTMP_SERVICES_URL diff --git a/plugins/rtmp-services/rtmp-common.c b/plugins/rtmp-services/rtmp-common.c index 2284a6c54..f53365172 100644 --- a/plugins/rtmp-services/rtmp-common.c +++ b/plugins/rtmp-services/rtmp-common.c @@ -5,10 +5,10 @@ #include #include "rtmp-format-ver.h" -#include "twitch.h" -#include "younow.h" -#include "nimotv.h" -#include "showroom.h" +#include "service-specific/twitch.h" +#include "service-specific/younow.h" +#include "service-specific/nimotv.h" +#include "service-specific/showroom.h" struct rtmp_common { char *service; diff --git a/plugins/rtmp-services/rtmp-services-main.c b/plugins/rtmp-services/rtmp-services-main.c index 3ccfb8883..77fbb844e 100644 --- a/plugins/rtmp-services/rtmp-services-main.c +++ b/plugins/rtmp-services/rtmp-services-main.c @@ -7,7 +7,8 @@ #include "rtmp-format-ver.h" #include "lookup-config.h" -#include "showroom.h" + +#include "service-specific/showroom.h" OBS_DECLARE_MODULE() OBS_MODULE_USE_DEFAULT_LOCALE("rtmp-services", "en-US") diff --git a/plugins/rtmp-services/nimotv.c b/plugins/rtmp-services/service-specific/nimotv.c similarity index 100% rename from plugins/rtmp-services/nimotv.c rename to plugins/rtmp-services/service-specific/nimotv.c diff --git a/plugins/rtmp-services/nimotv.h b/plugins/rtmp-services/service-specific/nimotv.h similarity index 100% rename from plugins/rtmp-services/nimotv.h rename to plugins/rtmp-services/service-specific/nimotv.h diff --git a/plugins/rtmp-services/showroom.c b/plugins/rtmp-services/service-specific/showroom.c similarity index 100% rename from plugins/rtmp-services/showroom.c rename to plugins/rtmp-services/service-specific/showroom.c diff --git a/plugins/rtmp-services/showroom.h b/plugins/rtmp-services/service-specific/showroom.h similarity index 100% rename from plugins/rtmp-services/showroom.h rename to plugins/rtmp-services/service-specific/showroom.h diff --git a/plugins/rtmp-services/twitch.c b/plugins/rtmp-services/service-specific/twitch.c similarity index 100% rename from plugins/rtmp-services/twitch.c rename to plugins/rtmp-services/service-specific/twitch.c diff --git a/plugins/rtmp-services/twitch.h b/plugins/rtmp-services/service-specific/twitch.h similarity index 100% rename from plugins/rtmp-services/twitch.h rename to plugins/rtmp-services/service-specific/twitch.h diff --git a/plugins/rtmp-services/younow.c b/plugins/rtmp-services/service-specific/younow.c similarity index 100% rename from plugins/rtmp-services/younow.c rename to plugins/rtmp-services/service-specific/younow.c diff --git a/plugins/rtmp-services/younow.h b/plugins/rtmp-services/service-specific/younow.h similarity index 100% rename from plugins/rtmp-services/younow.h rename to plugins/rtmp-services/service-specific/younow.h