From 9b3c67f8ccf9d78a1fcf4885c566c4fa27391239 Mon Sep 17 00:00:00 2001
From: Tres Finocchiaro <tres.finocchiaro@gmail.com>
Date: Wed, 8 Nov 2017 23:13:30 -0500
Subject: [PATCH] Temporarily use fork

---
 .gitmodules                                | 6 +++---
 build/plugins/LadspaEffect/tap/tap-plugins | 1 +
 plugins/LadspaEffect/tap/CMakeLists.txt    | 6 +++++-
 plugins/LadspaEffect/tap/tap               | 1 -
 plugins/LadspaEffect/tap/tap-plugins       | 1 +
 5 files changed, 10 insertions(+), 5 deletions(-)
 create mode 160000 build/plugins/LadspaEffect/tap/tap-plugins
 delete mode 160000 plugins/LadspaEffect/tap/tap
 create mode 160000 plugins/LadspaEffect/tap/tap-plugins

diff --git a/.gitmodules b/.gitmodules
index af99744f6ec..f63dff2a734 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -16,6 +16,6 @@
 [submodule "plugins/Xpressive/exprtk"]
 	path = plugins/Xpressive/exprtk
 	url = https://github.com/ArashPartow/exprtk
-[submodule "plugins/LadspaEffect/tap/tap"]
-	path = plugins/LadspaEffect/tap/tap
-	url = https://github.com/tomszilagyi/tap-plugins
+[submodule "plugins/LadspaEffect/tap/tap-plugins"]
+	path = plugins/LadspaEffect/tap/tap-plugins
+	url = https://github.com/tresf/tap-plugins
diff --git a/build/plugins/LadspaEffect/tap/tap-plugins b/build/plugins/LadspaEffect/tap/tap-plugins
new file mode 160000
index 00000000000..6a252e6e6ee
--- /dev/null
+++ b/build/plugins/LadspaEffect/tap/tap-plugins
@@ -0,0 +1 @@
+Subproject commit 6a252e6e6eee5cc7a1c2b342f834f9d0ff420713
diff --git a/plugins/LadspaEffect/tap/CMakeLists.txt b/plugins/LadspaEffect/tap/CMakeLists.txt
index 36b8b390f14..a8f444c3166 100644
--- a/plugins/LadspaEffect/tap/CMakeLists.txt
+++ b/plugins/LadspaEffect/tap/CMakeLists.txt
@@ -1,10 +1,14 @@
 INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/include")
-FILE(GLOB PLUGIN_SOURCES tap/*.c)
+FILE(GLOB PLUGIN_SOURCES tap-plugins/*.c)
 LIST(SORT PLUGIN_SOURCES)
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -Wno-write-strings -fomit-frame-pointer -fno-strict-aliasing -fstrength-reduce -funroll-loops -ffast-math")
 FOREACH(_item ${PLUGIN_SOURCES})
 	GET_FILENAME_COMPONENT(_plugin "${_item}" NAME_WE)
 	ADD_LIBRARY("${_plugin}" MODULE "${_item}")
+	# TAP pinknoise will re-init srand(); use existing seed instead
+	IF("${_plugin}" MATCHES "tap_pinknoise")
+		TARGET_COMPILE_DEFINITIONS("${_plugin}" PRIVATE TAP_DISABLE_SRAND=1)
+	ENDIF()
 	INSTALL(TARGETS "${_plugin}" LIBRARY DESTINATION "${PLUGIN_DIR}/ladspa")
 	SET_TARGET_PROPERTIES("${_plugin}" PROPERTIES PREFIX "")
 	# Don't strip if "Debug" or "RelWithDebInfo"
diff --git a/plugins/LadspaEffect/tap/tap b/plugins/LadspaEffect/tap/tap
deleted file mode 160000
index 853e92b261f..00000000000
--- a/plugins/LadspaEffect/tap/tap
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 853e92b261fa3b709447b88db0796e74aad16d2c
diff --git a/plugins/LadspaEffect/tap/tap-plugins b/plugins/LadspaEffect/tap/tap-plugins
new file mode 160000
index 00000000000..b3978dc4d49
--- /dev/null
+++ b/plugins/LadspaEffect/tap/tap-plugins
@@ -0,0 +1 @@
+Subproject commit b3978dc4d49d9caf951a08fe55a58cda530c5e35