Browse Source

deps,shared,obs-ffmpeg: Move media-playback to shared folder

tytan652 2 years ago
parent
commit
ade04f4f1c

+ 0 - 1
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)

+ 1 - 1
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)

+ 4 - 0
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)

+ 0 - 0
deps/media-playback/CMakeLists.txt → shared/media-playback/CMakeLists.txt


+ 0 - 0
deps/media-playback/LICENSE.media-playback → shared/media-playback/LICENSE.media-playback


+ 0 - 0
deps/media-playback/media-playback/cache.c → shared/media-playback/media-playback/cache.c


+ 0 - 0
deps/media-playback/media-playback/cache.h → shared/media-playback/media-playback/cache.h


+ 0 - 0
deps/media-playback/media-playback/closest-format.h → shared/media-playback/media-playback/closest-format.h


+ 0 - 0
deps/media-playback/media-playback/decode.c → shared/media-playback/media-playback/decode.c


+ 0 - 0
deps/media-playback/media-playback/decode.h → shared/media-playback/media-playback/decode.h


+ 0 - 0
deps/media-playback/media-playback/media-playback.c → shared/media-playback/media-playback/media-playback.c


+ 0 - 0
deps/media-playback/media-playback/media-playback.h → shared/media-playback/media-playback/media-playback.h


+ 0 - 0
deps/media-playback/media-playback/media.c → shared/media-playback/media-playback/media.c


+ 0 - 0
deps/media-playback/media-playback/media.h → shared/media-playback/media-playback/media.h