dan-giddins · dan-giddins · Sep 24, 2023 · Jul 2, 2023 · Jul 2, 2023 · Jul 2, 2023
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -281,6 +281,11 @@ ELSE(WANT_CMT)
 ENDIF(WANT_CMT)
 
 IF(WANT_SWH)
+	IF(LMMS_BUILD_APPLE)
+		# Prefer system perl over Homebrew, MacPorts, etc
+		SET(Perl_ROOT "/usr/bin")
+	ENDIF()
+	FIND_PACKAGE(Perl)
 	IF(PERL_FOUND)
 		SET(LMMS_HAVE_SWH TRUE)
 		SET(STATUS_SWH "OK")

diff --git a/CMakeSettings.json b/CMakeSettings.json
@@ -0,0 +1,66 @@
+ï»¿{
+	"configurations": [
+		{
+			"name": "x64-Debug",
+			"generator": "Ninja",
+			"configurationType": "Debug",
+			"inheritEnvironments": [ "msvc_x64" ],
+			"buildRoot": "${projectDir}\\out\\build\\${name}",
+			"installRoot": "${projectDir}\\out\\install\\${name}",
+			"variables": [
+				{
+					"name": "Qt5_DIR",
+					"value": "C:/Qt/5.15.2/msvc2019_64/lib/cmake",
+					"type": "PATH"
+				},
+				{
+					"name": "Qt5Test_DIR",
+					"value": "C:/Qt/5.15.2/msvc2019_64/lib/cmake/Qt5Test",
+					"type": "PATH"
+				},
+				{
+					"name": "PERL_EXECUTABLE",
+					"value": "C:/Strawberry/perl/bin/perl.exe",
+					"type": "FILEPATH"
+				},
+				{
+					"name": "VCPKG_TRACE_FIND_PACKAGE",
+					"value": "ON",
+					"type": "STRING"
+				}
+			],
+			"cmakeToolchain": "C:/vcpkg/scripts/buildsystems/vcpkg.cmake"
+		},
+		{
+			"name": "x64-Release",
+			"generator": "Ninja",
+			"configurationType": "Release",
+			"buildRoot": "${projectDir}\\out\\build\\${name}",
+			"installRoot": "${projectDir}\\out\\install\\${name}",
+			"cmakeToolchain": "C:/vcpkg/scripts/buildsystems/vcpkg.cmake",
+			"inheritEnvironments": [ "msvc_x64" ],
+			"variables": [
+				{
+					"name": "Qt5_DIR",
+					"value": "C:/Qt/5.15.2/msvc2019_64/lib/cmake",
+					"type": "PATH"
+				},
+				{
+					"name": "Qt5Test_DIR",
+					"value": "C:/Qt/5.15.2/msvc2019_64/lib/cmake/Qt5Test",
+					"type": "PATH"
+				},
+				{
+					"name": "PERL_EXECUTABLE",
+					"value": "C:/Strawberry/perl/bin/perl.exe",
+					"type": "FILEPATH"
+				},
+				{
+					"name": "VCPKG_TRACE_FIND_PACKAGE",
+					"value": "ON",
+					"type": "STRING"
+				}
+			]
+		}
+	]
+}
diff --git a/cmake/modules/PluginList.cmake b/cmake/modules/PluginList.cmake
@@ -99,11 +99,3 @@ IF(LIST_PLUGINS)
 	LIST_ALL_PLUGINS()
 ENDIF()
 
-IF(MSVC)
-	SET(MSVC_INCOMPATIBLE_PLUGINS
-		LadspaEffect
-	)
-	message(WARNING "Compiling with MSVC. The following plugins are not available: ${MSVC_INCOMPATIBLE_PLUGINS}")
-	LIST(REMOVE_ITEM PLUGIN_LIST ${MSVC_INCOMPATIBLE_PLUGINS})
-ENDIF()
-
diff --git a/include/ladspa.h b/include/ladspa.h
@@ -586,6 +586,9 @@ typedef struct _LADSPA_Descriptor {
    returning NULL, so the plugin count can be determined by checking
    for the least index that results in NULL being returned. */
 
+#ifdef _MSC_VER
+__declspec(dllexport)
+#endif
 const LADSPA_Descriptor * ladspa_descriptor(unsigned long Index);
 
 /* Datatype corresponding to the ladspa_descriptor() function. */

diff --git a/plugins/LadspaEffect/calf/CMakeLists.txt b/plugins/LadspaEffect/calf/CMakeLists.txt
@@ -38,7 +38,10 @@ SET(INLINE_FLAGS "")
 IF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
 	SET(INLINE_FLAGS -finline-functions-called-once -finline-limit=80)
 ENDIF()
-target_compile_options(veal PRIVATE -fexceptions -O2 -finline-functions ${INLINE_FLAGS})
+
+IF(NOT MSVC)
+	target_compile_options(veal PRIVATE -fexceptions -O2 -finline-functions ${INLINE_FLAGS})
+endif()
 
 if(LMMS_BUILD_WIN32)
 	add_custom_command(

diff --git a/plugins/LadspaEffect/calf/veal b/plugins/LadspaEffect/calf/veal
diff --git a/plugins/LadspaEffect/caps/CMakeLists.txt b/plugins/LadspaEffect/caps/CMakeLists.txt
@@ -7,7 +7,10 @@ IF(LMMS_BUILD_WIN64)
 ADD_DEFINITIONS(-DLMMS_BUILD_WIN64)
 ENDIF(LMMS_BUILD_WIN64)
 SET_TARGET_PROPERTIES(caps PROPERTIES PREFIX "")
-SET_TARGET_PROPERTIES(caps PROPERTIES COMPILE_FLAGS "-O2 -funroll-loops -Wno-write-strings")
+
+IF (NOT MSVC)
+	SET_TARGET_PROPERTIES(caps PROPERTIES COMPILE_FLAGS "-O2 -funroll-loops -Wno-write-strings")
+ENDIF()
 
 IF(LMMS_BUILD_WIN32)
 	add_custom_command(
@@ -18,6 +21,7 @@ IF(LMMS_BUILD_WIN32)
 		COMMAND_EXPAND_LISTS
 	)
 ENDIF(LMMS_BUILD_WIN32)
+
 IF(NOT LMMS_BUILD_APPLE AND NOT LMMS_BUILD_OPENBSD)
 	SET_TARGET_PROPERTIES(caps PROPERTIES LINK_FLAGS "${LINK_FLAGS} -shared -Wl,-no-undefined")
 ENDIF(NOT LMMS_BUILD_APPLE AND NOT LMMS_BUILD_OPENBSD)

diff --git a/plugins/LadspaEffect/caps/basics.h b/plugins/LadspaEffect/caps/basics.h
@@ -38,14 +38,17 @@
 #define _ISOC99_SOURCE 1
 #define _ISOC9X_SOURCE 1
 
+#include <assert.h>
+#include <stdio.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
+#ifndef _USE_MATH_DEFINES
+#define _USE_MATH_DEFINES
+#endif
 #include <math.h>
 
-#include <assert.h>
-#include <stdio.h>
-#include <stdint.h>
 
 #include <ladspa.h> 	 
 
@@ -76,7 +79,7 @@
 
 #define MIN_GAIN .000001 /* -120 dB */
 
-/* smallest non-denormal 32 bit IEEE float is 1.18×10-38 */
+/* smallest non-denormal 32 bit IEEE float is 1.18*10-38 */
 #define NOISE_FLOOR .00000000000005 /* -266 dB */
 
 typedef int8_t			int8;

diff --git a/plugins/LadspaEffect/caps/dsp/Eq.h b/plugins/LadspaEffect/caps/dsp/Eq.h
@@ -26,6 +26,9 @@
 	02111-1307, USA or point your web browser to http://www.gnu.org.
 */
 
+
+#include "../basics.h"
+
 #ifndef _DSP_EQ_H_
 #define _DSP_EQ_H_
 
@@ -62,11 +65,11 @@ class Eq
 {
 	public:
 		/* recursion coefficients, 3 per band */
-		eq_sample __attribute__ ((aligned)) a[Bands], b[Bands], c[Bands];
+		eq_sample a[Bands], b[Bands], c[Bands];
 		/* past outputs, 2 per band */
-		eq_sample __attribute__ ((aligned)) y[2][Bands];
+		eq_sample y[2][Bands];
 		/* current gain and recursion factor, each 1 per band = 2 */
-		eq_sample __attribute__ ((aligned)) gain[Bands], gf[Bands];
+		eq_sample gain[Bands], gf[Bands];
 		/* input history */
 		eq_sample x[2];
 		/* history index */

diff --git a/plugins/LadspaEffect/caps/dsp/OnePole.h b/plugins/LadspaEffect/caps/dsp/OnePole.h
@@ -25,6 +25,8 @@
 	02111-1307, USA or point your web browser to http://www.gnu.org.
 */
 
+#include "../basics.h"
+
 #ifndef _ONE_POLE_H_
 #define _ONE_POLE_H_
 

diff --git a/plugins/LadspaEffect/caps/dsp/SVF.h b/plugins/LadspaEffect/caps/dsp/SVF.h
@@ -70,9 +70,12 @@
 	}
 */
 
+#include "../basics.h"
+
 #ifndef _DSP_SVF_H_
 #define _DSP_SVF_H_
 
+
 namespace DSP {
 
 template <int OVERSAMPLE>

diff --git a/plugins/LadspaEffect/caps/dsp/Sine.h b/plugins/LadspaEffect/caps/dsp/Sine.h
@@ -25,6 +25,8 @@
 	02111-1307, USA or point your web browser to http://www.gnu.org.
 */
 
+#include "../basics.h"
+
 #ifndef _DSP_SINE_H_
 #define _DSP_SINE_H_
 

diff --git a/plugins/LadspaEffect/caps/interface.cc b/plugins/LadspaEffect/caps/interface.cc
@@ -29,8 +29,6 @@
 	(2541 - 2580 donated to [email protected])
 */
 
-#include <sys/time.h>
-
 #include "basics.h"
 
 #include "Cabinet.h"
@@ -58,18 +56,8 @@
 #define N 39 
 static DescriptorStub * descriptors [N];
 
-/*static inline void
-seed()
-{
-	static struct timeval tv;
-  gettimeofday (&tv, 0);
-
-	srand (tv.tv_sec ^ tv.tv_usec);
-}*/
-
 extern "C" {
 
-__attribute__ ((constructor)) 
 void caps_so_init()
 {
 	DescriptorStub ** d = descriptors;
@@ -121,11 +109,8 @@ void caps_so_init()
 
 	/* make sure N is correct */
 	assert (d - descriptors == N);
-
-	//seed();
 }
 
-__attribute__ ((destructor)) 
 void caps_so_fini()
 {
 	for (ulong i = 0; i < N; ++i)
@@ -134,6 +119,9 @@ void caps_so_fini()
 
 /* /////////////////////////////////////////////////////////////////////// */
 
+#ifdef _MSC_VER
+__declspec(dllexport)
+#endif
 const LADSPA_Descriptor *
 ladspa_descriptor (unsigned long i)
 {
@@ -142,4 +130,10 @@ ladspa_descriptor (unsigned long i)
 	return 0;
 }
 
+struct CapsSoInit {
+	CapsSoInit() { caps_so_init(); } 
+	~CapsSoInit() { caps_so_fini(); } 
+}; 
+static CapsSoInit capsSoInit;
+
 }; /* extern "C" */
diff --git a/plugins/LadspaEffect/swh/ladspa b/plugins/LadspaEffect/swh/ladspa
diff --git a/plugins/LadspaEffect/tap/CMakeLists.txt b/plugins/LadspaEffect/tap/CMakeLists.txt
@@ -1,7 +1,7 @@
 INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/include")
 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 -funroll-loops -ffast-math")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -fomit-frame-pointer -fno-strict-aliasing -funroll-loops -ffast-math")
 FOREACH(_item ${PLUGIN_SOURCES})
 	GET_FILENAME_COMPONENT(_plugin "${_item}" NAME_WE)
 	ADD_LIBRARY("${_plugin}" MODULE "${_item}")

diff --git a/plugins/LadspaEffect/tap/tap-plugins b/plugins/LadspaEffect/tap/tap-plugins
diff --git a/plugins/OpulenZ/adplug b/plugins/OpulenZ/adplug
diff --git a/src/3rdparty/mingw-std-threads b/src/3rdparty/mingw-std-threads
+4 −0		ChangeLog
+66 −15		calf-gui.xml
+2 −2		configure.ac
+18 −1		doc/manuals/Limiter.html
+6 −1		doc/manuals/Multiband Limiter.html
+5 −0		doc/manuals/Sidechain Limiter.html
+ −		doc/manuals/images/Calf - Limiters - ASC behaviours.jpg
+ −		doc/manuals/images/Calf - Limiters - ASC.jpg
+1 −1		gui/gui/eq30.xml
+17 −16		gui/gui/limiter.xml
+15 −12		gui/gui/multibandlimiter.xml
+12 −9		gui/gui/sidechainlimiter.xml
+58 −48		src/analyzer.cpp
+37 −21		src/audio_fx.cpp
+1 −0		src/calf/audio_fx.h
+4 −0		src/calf/biquad.h
+4 −4		src/calf/fixed_point.h
+2 −2		src/calf/giface.h
+2 −0		src/calf/gui.h
+2 −0		src/calf/gui_config.h
+2 −0		src/calf/host_session.h
+2 −2		src/calf/jackhost.h
+5 −0		src/calf/loudness.h
+1 −1		src/calf/lv2_options.h
+1 −1		src/calf/lv2_ui.h
+3 −3		src/calf/lv2wrap.h
+3 −0		src/calf/metadata.h
+9 −9		src/calf/modules_filter.h
+1,373 −1,089		src/calf/orfanidis_eq.h
+7 −3		src/calf/osctl.h
+6 −0		src/calf/primitives.h
+14 −3		src/calf/utils.h
+1 −4		src/ctl_knob.cpp
+0 −3		src/ctl_tube.cpp
+25 −0		src/fluidsynth.cpp
+9 −3		src/giface.cpp
+92 −67		src/gtk_main_win.cpp
+16 −10		src/gui_config.cpp
+37 −18		src/host_session.cpp
+21 −6		src/jackhost.cpp
+1 −1		src/makerdf.cpp
+6 −2		src/metadata.cpp
+72 −72		src/modules_comp.cpp
+4 −3		src/modules_delay.cpp
+38 −12		src/modules_dist.cpp
+82 −75		src/modules_filter.cpp
+26 −17		src/modules_limit.cpp
+26 −26		src/modules_mod.cpp
+10 −9		src/modules_tools.cpp
+2 −1		src/organ.cpp
+26 −1		src/utils.cpp
+0 −1		src/veal.cpp
+1 −1		Makefile.am
+1 −1		hermes_filter_1200.xml
+4 −0		ladspa-util.h
+3 −0		makestub.pl
+0 −1		util/pitchscale.c
+6 −0		util/pitchscale.h
+0 −35		CMakeLists.txt
+34 −48		README.md
+0 −76		cmake_stdheaders_generator/CMakeLists.txt
+0 −11		cmake_stdheaders_generator/template.cpp
+59 −412		mingw.condition_variable.h
+0 −1,133		mingw.future.h
+0 −109		mingw.invoke.h
+135 −359		mingw.mutex.h
+0 −503		mingw.shared_mutex.h
+68 −254		mingw.thread.h
+3 −14		tests/CMakeLists.txt
+60 −486		tests/tests.cpp
+0 −226		utility_scripts/Generate-StdLikeHeaders.ps1
+0 −1		utility_scripts/generate_std_like_headers.bat
+0 −1		utility_scripts/generate_std_like_headers_interactive.bat