From ade04f4f1cabd60c162337c6f3816bb0814e82aa Mon Sep 17 00:00:00 2001 From: tytan652 Date: Wed, 2 Aug 2023 10:35:26 +0200 Subject: [PATCH] deps,shared,obs-ffmpeg: Move media-playback to shared folder --- deps/CMakeLists.txt | 1 - plugins/obs-ffmpeg/cmake/dependencies.cmake | 2 +- plugins/obs-ffmpeg/cmake/legacy.cmake | 4 ++++ {deps => shared}/media-playback/CMakeLists.txt | 0 {deps => shared}/media-playback/LICENSE.media-playback | 0 {deps => shared}/media-playback/media-playback/cache.c | 0 {deps => shared}/media-playback/media-playback/cache.h | 0 .../media-playback/media-playback/closest-format.h | 0 {deps => shared}/media-playback/media-playback/decode.c | 0 {deps => shared}/media-playback/media-playback/decode.h | 0 .../media-playback/media-playback/media-playback.c | 0 .../media-playback/media-playback/media-playback.h | 0 {deps => shared}/media-playback/media-playback/media.c | 0 {deps => shared}/media-playback/media-playback/media.h | 0 14 files changed, 5 insertions(+), 2 deletions(-) rename {deps => shared}/media-playback/CMakeLists.txt (100%) rename {deps => shared}/media-playback/LICENSE.media-playback (100%) rename {deps => shared}/media-playback/media-playback/cache.c (100%) rename {deps => shared}/media-playback/media-playback/cache.h (100%) rename {deps => shared}/media-playback/media-playback/closest-format.h (100%) rename {deps => shared}/media-playback/media-playback/decode.c (100%) rename {deps => shared}/media-playback/media-playback/decode.h (100%) rename {deps => shared}/media-playback/media-playback/media-playback.c (100%) rename {deps => shared}/media-playback/media-playback/media-playback.h (100%) rename {deps => shared}/media-playback/media-playback/media.c (100%) rename {deps => shared}/media-playback/media-playback/media.h (100%) diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index d6f79c090..bdb859254 100644 --- a/deps/CMakeLists.txt +++ b/deps/CMakeLists.txt @@ -5,6 +5,5 @@ endif() add_subdirectory(blake2) add_subdirectory(glad) add_subdirectory(libcaption) -add_subdirectory(media-playback) add_subdirectory(obs-scripting) add_subdirectory(opts-parser) diff --git a/plugins/obs-ffmpeg/cmake/dependencies.cmake b/plugins/obs-ffmpeg/cmake/dependencies.cmake index 087e8c256..502e46cb7 100644 --- a/plugins/obs-ffmpeg/cmake/dependencies.cmake +++ b/plugins/obs-ffmpeg/cmake/dependencies.cmake @@ -17,7 +17,7 @@ find_package( # cmake-format: on if(NOT TARGET OBS::media-playback) - add_subdirectory("${CMAKE_SOURCE_DIR}/deps/media-playback" "${CMAKE_BINARY_DIR}/deps/media-playback") + add_subdirectory("${CMAKE_SOURCE_DIR}/shared/media-playback" "${CMAKE_BINARY_DIR}/shared/media-playback") endif() if(NOT TARGET OBS::opts-parser) diff --git a/plugins/obs-ffmpeg/cmake/legacy.cmake b/plugins/obs-ffmpeg/cmake/legacy.cmake index 558a34df6..d8a108b02 100644 --- a/plugins/obs-ffmpeg/cmake/legacy.cmake +++ b/plugins/obs-ffmpeg/cmake/legacy.cmake @@ -17,6 +17,10 @@ find_package( add_library(obs-ffmpeg MODULE) add_library(OBS::ffmpeg ALIAS obs-ffmpeg) +if(NOT TARGET OBS::media-playback) + add_subdirectory("${CMAKE_SOURCE_DIR}/shared/media-playback" "${CMAKE_BINARY_DIR}/shared/media-playback") +endif() + add_subdirectory(ffmpeg-mux) if(ENABLE_NEW_MPEGTS_OUTPUT) find_package(Librist QUIET) diff --git a/deps/media-playback/CMakeLists.txt b/shared/media-playback/CMakeLists.txt similarity index 100% rename from deps/media-playback/CMakeLists.txt rename to shared/media-playback/CMakeLists.txt diff --git a/deps/media-playback/LICENSE.media-playback b/shared/media-playback/LICENSE.media-playback similarity index 100% rename from deps/media-playback/LICENSE.media-playback rename to shared/media-playback/LICENSE.media-playback diff --git a/deps/media-playback/media-playback/cache.c b/shared/media-playback/media-playback/cache.c similarity index 100% rename from deps/media-playback/media-playback/cache.c rename to shared/media-playback/media-playback/cache.c diff --git a/deps/media-playback/media-playback/cache.h b/shared/media-playback/media-playback/cache.h similarity index 100% rename from deps/media-playback/media-playback/cache.h rename to shared/media-playback/media-playback/cache.h diff --git a/deps/media-playback/media-playback/closest-format.h b/shared/media-playback/media-playback/closest-format.h similarity index 100% rename from deps/media-playback/media-playback/closest-format.h rename to shared/media-playback/media-playback/closest-format.h diff --git a/deps/media-playback/media-playback/decode.c b/shared/media-playback/media-playback/decode.c similarity index 100% rename from deps/media-playback/media-playback/decode.c rename to shared/media-playback/media-playback/decode.c diff --git a/deps/media-playback/media-playback/decode.h b/shared/media-playback/media-playback/decode.h similarity index 100% rename from deps/media-playback/media-playback/decode.h rename to shared/media-playback/media-playback/decode.h diff --git a/deps/media-playback/media-playback/media-playback.c b/shared/media-playback/media-playback/media-playback.c similarity index 100% rename from deps/media-playback/media-playback/media-playback.c rename to shared/media-playback/media-playback/media-playback.c diff --git a/deps/media-playback/media-playback/media-playback.h b/shared/media-playback/media-playback/media-playback.h similarity index 100% rename from deps/media-playback/media-playback/media-playback.h rename to shared/media-playback/media-playback/media-playback.h diff --git a/deps/media-playback/media-playback/media.c b/shared/media-playback/media-playback/media.c similarity index 100% rename from deps/media-playback/media-playback/media.c rename to shared/media-playback/media-playback/media.c diff --git a/deps/media-playback/media-playback/media.h b/shared/media-playback/media-playback/media.h similarity index 100% rename from deps/media-playback/media-playback/media.h rename to shared/media-playback/media-playback/media.h