TimeStretch: use system version of SoundTouch

AviSynth · Dec 24, 2024 · 2874985 · 2874985
1 parent 4a93821
commit 2874985
Show file tree

Hide file tree

Showing 34 changed files with 13 additions and 7,914 deletions.
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
@@ -15,8 +15,17 @@ else()
   set(DEVIL_PLUGIN_STATE OFF)
 endif()
 
+find_package(PkgConfig)
+pkg_check_modules(SOUNDTOUCH soundtouch)
+if(SOUNDTOUCH_FOUND)
+  set(SOUNDTOUCH_PLUGIN_STATE ON)
+else()
+  MESSAGE(WARNING "SoundTouch library not found. TimeStretch plugin will not be built.")
+  set(SOUNDTOUCH_PLUGIN_STATE OFF)
+endif()
+
 option(BUILD_IMAGESEQ "Build ImageSeq plugin" ${DEVIL_PLUGIN_STATE})
-option(BUILD_TIMESTRETCH "Build TimeStretch plugin" ON)
+option(BUILD_TIMESTRETCH "Build TimeStretch plugin" ${SOUNDTOUCH_PLUGIN_STATE})
 option(BUILD_SHIBATCH "Build Shibatch plugin" ON)
 option(BUILD_CONVERTSTACKED "Build ConvertStacked plugin" ON)
 

diff --git a/plugins/TimeStretch/CMakeLists.txt b/plugins/TimeStretch/CMakeLists.txt
@@ -20,11 +20,10 @@ if (MINGW)
 endif()
 
 # Library dependencies
-add_subdirectory("SoundTouch")
-target_link_libraries(${ProjectName} "SoundTouch")
+target_link_libraries(${ProjectName} ${SOUNDTOUCH_LINK_LIBRARIES})
 
 # Include directories
-target_include_directories(${ProjectName} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${AvsCore_SOURCE_DIR})
+target_include_directories(${ProjectName} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${AvsCore_SOURCE_DIR} ${SOUNDTOUCH_INCLUDE_DIRS})
 
 if (MSVC_IDE)
   # Copy output to a common folder for easy deployment

diff --git a/plugins/TimeStretch/SoundTouch/AAFilter.cpp b/plugins/TimeStretch/SoundTouch/AAFilter.cpp
diff --git a/plugins/TimeStretch/SoundTouch/AAFilter.h b/plugins/TimeStretch/SoundTouch/AAFilter.h