From a84f7dfe1951bac95349d532d1a22da6acd2b4d2 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Sun, 2 Jul 2023 09:45:20 +0530 Subject: [PATCH 01/87] removed msvc incompaptible plugins list --- cmake/modules/PluginList.cmake | 8 -------- 1 file changed, 8 deletions(-) diff --git a/cmake/modules/PluginList.cmake b/cmake/modules/PluginList.cmake index 6b2c7519af0..cd4d3e190a9 100644 --- a/cmake/modules/PluginList.cmake +++ b/cmake/modules/PluginList.cmake @@ -98,11 +98,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() - From a30943980c902d87d900643ba21a12291fa9af7d Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Sun, 2 Jul 2023 09:52:39 +0530 Subject: [PATCH 02/87] added Time.h and related changes --- include/sys/Time.h | 33 ++++++++++++++++++++++++ include/sys/Times.h | 63 +++++++++++++++++++++++++++++++++++++++++++++ src/CMakeLists.txt | 2 ++ src/sys/Time.cpp | 54 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 152 insertions(+) create mode 100644 include/sys/Time.h create mode 100644 include/sys/Times.h create mode 100644 src/sys/Time.cpp diff --git a/include/sys/Time.h b/include/sys/Time.h new file mode 100644 index 00000000000..ab98db266f0 --- /dev/null +++ b/include/sys/Time.h @@ -0,0 +1,33 @@ +/* + * Time.h - Windows compatible implementation of sys/time.h + * Copied from http://www.codefull.net/2015/12/systime-h-replacement-for-windows/ + * + * Copyright (c) 2004-2008 Tobias Doerffel + * + * This file is part of LMMS - https://lmms.io + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program (see COPYING); if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA. + * + */ + +#pragma once + +#ifndef TIMES_H +#define TIMES_H + +#include "sys/Times.h" + +#endif \ No newline at end of file diff --git a/include/sys/Times.h b/include/sys/Times.h new file mode 100644 index 00000000000..80e38a85bf5 --- /dev/null +++ b/include/sys/Times.h @@ -0,0 +1,63 @@ +/* + * Times.h - Windows compatible implementation of sys/time.h + * Copied from http://www.codefull.net/2015/12/systime-h-replacement-for-windows/ + * + * Copyright (c) 2004-2008 Tobias Doerffel + * + * This file is part of LMMS - https://lmms.io + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program (see COPYING); if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA. + * + */ + +#ifndef TIMES_H_FILE +#define TIMES_H_FILE + +#ifdef _WIN32 +#include +#include +#include + +int gettimeofday(struct timeval* t, void* timezone); + +// from linux's sys/times.h + +//#include + +#define __need_clock_t +#include + + +/* Structure describing CPU time used by a process and its children. */ +struct tms +{ + clock_t tms_utime; /* User CPU time. */ + clock_t tms_stime; /* System CPU time. */ + + clock_t tms_cutime; /* User CPU time of dead children. */ + clock_t tms_cstime; /* System CPU time of dead children. */ +}; + +/* Store the CPU time used by this process and all its + dead children (and their dead children) in BUFFER. + Return the elapsed real time, or (clock_t) -1 for errors. + All times are in CLK_TCKths of a second. */ +clock_t times(struct tms* __buffer); + +typedef long long suseconds_t; + +#endif +#endif \ No newline at end of file diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index bd543779fb0..53a54d8e1c8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -108,6 +108,7 @@ ADD_LIBRARY(lmmsobjs OBJECT ${LMMS_INCLUDES} ${LMMS_UI_OUT} ${LMMS_RCC_OUT} + "sys/Time.cpp" ) GENERATE_EXPORT_HEADER(lmmsobjs @@ -118,6 +119,7 @@ ADD_EXECUTABLE(lmms core/main.cpp $ "${WINRC}" + "sys/Time.cpp" ) TARGET_INCLUDE_DIRECTORIES(lmms PUBLIC ${CMAKE_CURRENT_BINARY_DIR} diff --git a/src/sys/Time.cpp b/src/sys/Time.cpp new file mode 100644 index 00000000000..c69935fe0d5 --- /dev/null +++ b/src/sys/Time.cpp @@ -0,0 +1,54 @@ +/* + * TimePos.cpp - Windows compatible implementation of sys/time.cpp. + * Copied from https://www.codefull.net/2015/12/systime-h-replacement-for-windows/ + * + * Copyright (c) 2004-2014 Tobias Doerffel tv_sec = timebuffer.time; +// t->tv_usec = 1000 * timebuffer.millitm; +// return 0; +//} +// +//clock_t times(struct tms* __buffer) { +// +// __buffer->tms_utime = clock(); +// __buffer->tms_stime = 0; +// __buffer->tms_cstime = 0; +// __buffer->tms_cutime = 0; +// return __buffer->tms_utime; +//} + +#endif \ No newline at end of file From a7e9798106c9170bcbaee7c42a00d51b4f3173f5 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Sun, 2 Jul 2023 09:57:16 +0530 Subject: [PATCH 03/87] tweaked some cmake files --- plugins/LadspaEffect/calf/CMakeLists.txt | 2 +- plugins/LadspaEffect/caps/CMakeLists.txt | 2 +- plugins/LadspaEffect/swh/CMakeLists.txt | 2 +- plugins/LadspaEffect/tap/CMakeLists.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/LadspaEffect/calf/CMakeLists.txt b/plugins/LadspaEffect/calf/CMakeLists.txt index 90f50641738..d2d4805efe1 100644 --- a/plugins/LadspaEffect/calf/CMakeLists.txt +++ b/plugins/LadspaEffect/calf/CMakeLists.txt @@ -38,7 +38,7 @@ SET(INLINE_FLAGS "") IF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") SET(INLINE_FLAGS "-finline-functions-called-once -finline-limit=80") ENDIF() -SET_TARGET_PROPERTIES(veal PROPERTIES COMPILE_FLAGS "-fexceptions -O2 -finline-functions ${INLINE_FLAGS}") +SET_TARGET_PROPERTIES(veal PROPERTIES COMPILE_FLAGS "-fexceptions -finline-functions ${INLINE_FLAGS}") if(LMMS_BUILD_WIN32) add_custom_command( diff --git a/plugins/LadspaEffect/caps/CMakeLists.txt b/plugins/LadspaEffect/caps/CMakeLists.txt index bdcf3a96af4..025239789c9 100644 --- a/plugins/LadspaEffect/caps/CMakeLists.txt +++ b/plugins/LadspaEffect/caps/CMakeLists.txt @@ -9,7 +9,7 @@ ENDIF(LMMS_BUILD_WIN64) SET_TARGET_PROPERTIES(caps PROPERTIES PREFIX "") SET_TARGET_PROPERTIES(caps PROPERTIES COMPILE_FLAGS "-O2 -funroll-loops -Wno-write-strings") -IF(LMMS_BUILD_WIN32) +IF(LMMS_BUILD_WIN32 AND STRIP) add_custom_command( TARGET caps POST_BUILD diff --git a/plugins/LadspaEffect/swh/CMakeLists.txt b/plugins/LadspaEffect/swh/CMakeLists.txt index aec01c22f8e..ece3070060b 100644 --- a/plugins/LadspaEffect/swh/CMakeLists.txt +++ b/plugins/LadspaEffect/swh/CMakeLists.txt @@ -24,7 +24,7 @@ FOREACH(_item ${XML_SOURCES}) # Coerce XML source file to C ADD_CUSTOM_COMMAND( OUTPUT "${_out_file}" - COMMAND ./makestub.pl "${_item}" > "${_out_file}" + COMMAND perl ./makestub.pl "${_item}" > "${_out_file}" DEPENDS "${_item}" WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/ladspa" VERBATIM diff --git a/plugins/LadspaEffect/tap/CMakeLists.txt b/plugins/LadspaEffect/tap/CMakeLists.txt index c8d0a4eb833..1afa76153ef 100644 --- 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}") From f0662687a09e71132bcfa5284bdd49ba77ad8410 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Sun, 2 Jul 2023 09:59:37 +0530 Subject: [PATCH 04/87] removed __attribute__ --- plugins/LadspaEffect/caps/dsp/Eq.h | 6 +++--- plugins/LadspaEffect/caps/interface.cc | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/plugins/LadspaEffect/caps/dsp/Eq.h b/plugins/LadspaEffect/caps/dsp/Eq.h index 92639e8a185..89c86dd18ff 100644 --- a/plugins/LadspaEffect/caps/dsp/Eq.h +++ b/plugins/LadspaEffect/caps/dsp/Eq.h @@ -62,11 +62,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/interface.cc b/plugins/LadspaEffect/caps/interface.cc index 96e3d9806f6..8b5740203f3 100644 --- a/plugins/LadspaEffect/caps/interface.cc +++ b/plugins/LadspaEffect/caps/interface.cc @@ -69,7 +69,6 @@ seed() extern "C" { -__attribute__ ((constructor)) void caps_so_init() { DescriptorStub ** d = descriptors; @@ -125,7 +124,6 @@ void caps_so_init() //seed(); } -__attribute__ ((destructor)) void caps_so_fini() { for (ulong i = 0; i < N; ++i) From 844245d31d16aa48d46070b0ad46c8a98bc18afe Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Sun, 2 Jul 2023 10:40:30 +0530 Subject: [PATCH 05/87] defined M_PI in caps --- plugins/LadspaEffect/caps/dsp/Eq.h | 5 +++++ plugins/LadspaEffect/caps/dsp/OnePole.h | 5 +++++ plugins/LadspaEffect/caps/dsp/SVF.h | 6 ++++++ plugins/LadspaEffect/caps/dsp/Sine.h | 4 ++++ 4 files changed, 20 insertions(+) diff --git a/plugins/LadspaEffect/caps/dsp/Eq.h b/plugins/LadspaEffect/caps/dsp/Eq.h index 89c86dd18ff..3a6c89a3042 100644 --- a/plugins/LadspaEffect/caps/dsp/Eq.h +++ b/plugins/LadspaEffect/caps/dsp/Eq.h @@ -29,6 +29,11 @@ #ifndef _DSP_EQ_H_ #define _DSP_EQ_H_ + +#ifndef M_PI +#define M_PI 3.14159265358979323846264338327 +#endif + namespace DSP { /* A single bandpass as used by the Eq, expressed as a biquad. Like all diff --git a/plugins/LadspaEffect/caps/dsp/OnePole.h b/plugins/LadspaEffect/caps/dsp/OnePole.h index 9a317805321..81abcb6ff26 100644 --- a/plugins/LadspaEffect/caps/dsp/OnePole.h +++ b/plugins/LadspaEffect/caps/dsp/OnePole.h @@ -28,6 +28,11 @@ #ifndef _ONE_POLE_H_ #define _ONE_POLE_H_ + +#ifndef M_PI +#define M_PI 3.14159265358979323846264338327 +#endif + namespace DSP { class OnePoleLP diff --git a/plugins/LadspaEffect/caps/dsp/SVF.h b/plugins/LadspaEffect/caps/dsp/SVF.h index ccd5734ab3f..6d60dc7f77a 100644 --- a/plugins/LadspaEffect/caps/dsp/SVF.h +++ b/plugins/LadspaEffect/caps/dsp/SVF.h @@ -73,6 +73,12 @@ #ifndef _DSP_SVF_H_ #define _DSP_SVF_H_ +#define min(a,b) (((a) < (b)) ? (a) : (b)) + +#ifndef M_PI +#define M_PI 3.14159265358979323846264338327 +#endif + namespace DSP { template diff --git a/plugins/LadspaEffect/caps/dsp/Sine.h b/plugins/LadspaEffect/caps/dsp/Sine.h index 43e5f06e03c..95f225b446f 100644 --- a/plugins/LadspaEffect/caps/dsp/Sine.h +++ b/plugins/LadspaEffect/caps/dsp/Sine.h @@ -28,6 +28,10 @@ #ifndef _DSP_SINE_H_ #define _DSP_SINE_H_ +#ifndef M_PI +#define M_PI 3.14159265358979323846264338327 +#endif + namespace DSP { class Sine From 3411989424d3be10955d68034fad4b8d7c608184 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Sun, 2 Jul 2023 10:55:44 +0530 Subject: [PATCH 06/87] minor fix in ladspa cmakelists --- plugins/LadspaEffect/caps/CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/LadspaEffect/caps/CMakeLists.txt b/plugins/LadspaEffect/caps/CMakeLists.txt index 025239789c9..e7ffce5faf0 100644 --- a/plugins/LadspaEffect/caps/CMakeLists.txt +++ b/plugins/LadspaEffect/caps/CMakeLists.txt @@ -7,7 +7,7 @@ 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") +SET_TARGET_PROPERTIES(caps PROPERTIES COMPILE_FLAGS "-funroll-loops") IF(LMMS_BUILD_WIN32 AND STRIP) add_custom_command( @@ -17,7 +17,8 @@ IF(LMMS_BUILD_WIN32 AND STRIP) VERBATIM COMMAND_EXPAND_LISTS ) -ENDIF(LMMS_BUILD_WIN32) +ENDIF(LMMS_BUILD_WIN32 AND STRIP) + 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) From 082773dea10772d97e098484f098ad9a4477b1aa Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Sun, 2 Jul 2023 14:04:57 +0530 Subject: [PATCH 07/87] added namespace to Times.h --- include/sys/Times.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/sys/Times.h b/include/sys/Times.h index 80e38a85bf5..d10f669b74b 100644 --- a/include/sys/Times.h +++ b/include/sys/Times.h @@ -31,6 +31,9 @@ #include #include +namespace lmms +{ + int gettimeofday(struct timeval* t, void* timezone); // from linux's sys/times.h @@ -59,5 +62,7 @@ clock_t times(struct tms* __buffer); typedef long long suseconds_t; +} // namespace lmms + #endif #endif \ No newline at end of file From 5fb6fba80b9b13634aee79f57187d18fae3a9042 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Sun, 2 Jul 2023 14:15:53 +0530 Subject: [PATCH 08/87] relocated includes --- {include => src}/sys/Time.h | 0 {include => src}/sys/Times.h | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename {include => src}/sys/Time.h (100%) rename {include => src}/sys/Times.h (100%) diff --git a/include/sys/Time.h b/src/sys/Time.h similarity index 100% rename from include/sys/Time.h rename to src/sys/Time.h diff --git a/include/sys/Times.h b/src/sys/Times.h similarity index 100% rename from include/sys/Times.h rename to src/sys/Times.h From 8ccb161bf3442a06e7aea8d1dca8981ece33f9e1 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Sun, 2 Jul 2023 14:22:24 +0530 Subject: [PATCH 09/87] fixes to scripted-checks --- src/sys/Time.cpp | 2 ++ src/sys/Time.h | 2 ++ src/sys/Times.h | 12 +++++------- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/sys/Time.cpp b/src/sys/Time.cpp index c69935fe0d5..d0908bc0ccc 100644 --- a/src/sys/Time.cpp +++ b/src/sys/Time.cpp @@ -33,6 +33,8 @@ #ifndef TIME #define TIME +namespace lmms {} + //int gettimeofday(struct timeval* t, void* timezone) //{ // struct _timeb timebuffer; diff --git a/src/sys/Time.h b/src/sys/Time.h index ab98db266f0..073ee5e0449 100644 --- a/src/sys/Time.h +++ b/src/sys/Time.h @@ -30,4 +30,6 @@ #include "sys/Times.h" +namespace lmms{} + #endif \ No newline at end of file diff --git a/src/sys/Times.h b/src/sys/Times.h index d10f669b74b..d1186cf1b31 100644 --- a/src/sys/Times.h +++ b/src/sys/Times.h @@ -31,17 +31,15 @@ #include #include +#define __need_clock_t +#include + namespace lmms { int gettimeofday(struct timeval* t, void* timezone); -// from linux's sys/times.h -//#include - -#define __need_clock_t -#include /* Structure describing CPU time used by a process and its children. */ @@ -64,5 +62,5 @@ typedef long long suseconds_t; } // namespace lmms -#endif -#endif \ No newline at end of file +#endif // _WIN_32 +#endif // _TIMES_H_FILE \ No newline at end of file From 7613a124c4603471424a99d42447fdce7d68b4cd Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Sun, 2 Jul 2023 14:22:58 +0530 Subject: [PATCH 10/87] deleted unnecessary whitespaces --- src/sys/Times.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/sys/Times.h b/src/sys/Times.h index d1186cf1b31..06455876d72 100644 --- a/src/sys/Times.h +++ b/src/sys/Times.h @@ -40,8 +40,6 @@ namespace lmms int gettimeofday(struct timeval* t, void* timezone); - - /* Structure describing CPU time used by a process and its children. */ struct tms { From fa02a9272cc68ae8f1b60c384980ecfd8bdb3ff8 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Sun, 2 Jul 2023 14:47:09 +0530 Subject: [PATCH 11/87] added M_PI to cmt --- plugins/LadspaEffect/cmt/cmt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/LadspaEffect/cmt/cmt b/plugins/LadspaEffect/cmt/cmt index f7c25ed4ef7..a2c9c140774 160000 --- a/plugins/LadspaEffect/cmt/cmt +++ b/plugins/LadspaEffect/cmt/cmt @@ -1 +1 @@ -Subproject commit f7c25ed4ef7f4d7efb1bcd4229d25595d4f1ce55 +Subproject commit a2c9c140774bebfbac200c91cc56df644ff24cd6 From d85c104fefa302f2961997077c39fbe10409282b Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Sun, 2 Jul 2023 14:48:01 +0530 Subject: [PATCH 12/87] Revert "relocated includes" This reverts commit 5fb6fba80b9b13634aee79f57187d18fae3a9042. --- {src => include}/sys/Time.h | 0 {src => include}/sys/Times.h | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename {src => include}/sys/Time.h (100%) rename {src => include}/sys/Times.h (100%) diff --git a/src/sys/Time.h b/include/sys/Time.h similarity index 100% rename from src/sys/Time.h rename to include/sys/Time.h diff --git a/src/sys/Times.h b/include/sys/Times.h similarity index 100% rename from src/sys/Times.h rename to include/sys/Times.h From 601ee195b47eabe0b30e07ce8656224f91153440 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Sun, 2 Jul 2023 20:01:15 +0530 Subject: [PATCH 13/87] removed times.h and the other time files --- include/sys/Time.h | 35 ------------------------- include/sys/Times.h | 64 --------------------------------------------- src/CMakeLists.txt | 2 -- src/sys/Time.cpp | 56 --------------------------------------- 4 files changed, 157 deletions(-) delete mode 100644 include/sys/Time.h delete mode 100644 include/sys/Times.h delete mode 100644 src/sys/Time.cpp diff --git a/include/sys/Time.h b/include/sys/Time.h deleted file mode 100644 index 073ee5e0449..00000000000 --- a/include/sys/Time.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Time.h - Windows compatible implementation of sys/time.h - * Copied from http://www.codefull.net/2015/12/systime-h-replacement-for-windows/ - * - * Copyright (c) 2004-2008 Tobias Doerffel - * - * This file is part of LMMS - https://lmms.io - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program (see COPYING); if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA. - * - */ - -#pragma once - -#ifndef TIMES_H -#define TIMES_H - -#include "sys/Times.h" - -namespace lmms{} - -#endif \ No newline at end of file diff --git a/include/sys/Times.h b/include/sys/Times.h deleted file mode 100644 index 06455876d72..00000000000 --- a/include/sys/Times.h +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Times.h - Windows compatible implementation of sys/time.h - * Copied from http://www.codefull.net/2015/12/systime-h-replacement-for-windows/ - * - * Copyright (c) 2004-2008 Tobias Doerffel - * - * This file is part of LMMS - https://lmms.io - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program (see COPYING); if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA. - * - */ - -#ifndef TIMES_H_FILE -#define TIMES_H_FILE - -#ifdef _WIN32 -#include -#include -#include - -#define __need_clock_t -#include - -namespace lmms -{ - -int gettimeofday(struct timeval* t, void* timezone); - - -/* Structure describing CPU time used by a process and its children. */ -struct tms -{ - clock_t tms_utime; /* User CPU time. */ - clock_t tms_stime; /* System CPU time. */ - - clock_t tms_cutime; /* User CPU time of dead children. */ - clock_t tms_cstime; /* System CPU time of dead children. */ -}; - -/* Store the CPU time used by this process and all its - dead children (and their dead children) in BUFFER. - Return the elapsed real time, or (clock_t) -1 for errors. - All times are in CLK_TCKths of a second. */ -clock_t times(struct tms* __buffer); - -typedef long long suseconds_t; - -} // namespace lmms - -#endif // _WIN_32 -#endif // _TIMES_H_FILE \ No newline at end of file diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 53a54d8e1c8..bd543779fb0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -108,7 +108,6 @@ ADD_LIBRARY(lmmsobjs OBJECT ${LMMS_INCLUDES} ${LMMS_UI_OUT} ${LMMS_RCC_OUT} - "sys/Time.cpp" ) GENERATE_EXPORT_HEADER(lmmsobjs @@ -119,7 +118,6 @@ ADD_EXECUTABLE(lmms core/main.cpp $ "${WINRC}" - "sys/Time.cpp" ) TARGET_INCLUDE_DIRECTORIES(lmms PUBLIC ${CMAKE_CURRENT_BINARY_DIR} diff --git a/src/sys/Time.cpp b/src/sys/Time.cpp deleted file mode 100644 index d0908bc0ccc..00000000000 --- a/src/sys/Time.cpp +++ /dev/null @@ -1,56 +0,0 @@ -/* - * TimePos.cpp - Windows compatible implementation of sys/time.cpp. - * Copied from https://www.codefull.net/2015/12/systime-h-replacement-for-windows/ - * - * Copyright (c) 2004-2014 Tobias Doerffel tv_sec = timebuffer.time; -// t->tv_usec = 1000 * timebuffer.millitm; -// return 0; -//} -// -//clock_t times(struct tms* __buffer) { -// -// __buffer->tms_utime = clock(); -// __buffer->tms_stime = 0; -// __buffer->tms_cstime = 0; -// __buffer->tms_cutime = 0; -// return __buffer->tms_utime; -//} - -#endif \ No newline at end of file From 7ad2695d4d373cc82c05cd4324b30ad28899a30e Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Sun, 2 Jul 2023 20:09:36 +0530 Subject: [PATCH 14/87] addressing dom's comments 1 --- plugins/LadspaEffect/calf/CMakeLists.txt | 5 ++++- plugins/LadspaEffect/cmt/cmt | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/plugins/LadspaEffect/calf/CMakeLists.txt b/plugins/LadspaEffect/calf/CMakeLists.txt index d2d4805efe1..6ec392a81d2 100644 --- 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() -SET_TARGET_PROPERTIES(veal PROPERTIES COMPILE_FLAGS "-fexceptions -finline-functions ${INLINE_FLAGS}") + +IF(NOT MSVC) + SET_TARGET_PROPERTIES(veal PROPERTIES COMPILE_FLAGS "-fexceptions -O2 -finline-functions ${INLINE_FLAGS}") +endif() if(LMMS_BUILD_WIN32) add_custom_command( diff --git a/plugins/LadspaEffect/cmt/cmt b/plugins/LadspaEffect/cmt/cmt index a2c9c140774..5bc4d810696 160000 --- a/plugins/LadspaEffect/cmt/cmt +++ b/plugins/LadspaEffect/cmt/cmt @@ -1 +1 @@ -Subproject commit a2c9c140774bebfbac200c91cc56df644ff24cd6 +Subproject commit 5bc4d810696ea1c824651ab34c5e8d60dfd4293d From c252448c842133d8996030c25fcc0f259894fcbc Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Sun, 2 Jul 2023 20:16:24 +0530 Subject: [PATCH 15/87] addressing dom's concerns 2 --- plugins/LadspaEffect/caps/CMakeLists.txt | 4 ++-- plugins/LadspaEffect/caps/dsp/SVF.h | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/plugins/LadspaEffect/caps/CMakeLists.txt b/plugins/LadspaEffect/caps/CMakeLists.txt index e7ffce5faf0..2ee75bbc7b4 100644 --- a/plugins/LadspaEffect/caps/CMakeLists.txt +++ b/plugins/LadspaEffect/caps/CMakeLists.txt @@ -9,7 +9,7 @@ ENDIF(LMMS_BUILD_WIN64) SET_TARGET_PROPERTIES(caps PROPERTIES PREFIX "") SET_TARGET_PROPERTIES(caps PROPERTIES COMPILE_FLAGS "-funroll-loops") -IF(LMMS_BUILD_WIN32 AND STRIP) +IF(LMMS_BUILD_WIN32) add_custom_command( TARGET caps POST_BUILD @@ -17,7 +17,7 @@ IF(LMMS_BUILD_WIN32 AND STRIP) VERBATIM COMMAND_EXPAND_LISTS ) -ENDIF(LMMS_BUILD_WIN32 AND STRIP) +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") diff --git a/plugins/LadspaEffect/caps/dsp/SVF.h b/plugins/LadspaEffect/caps/dsp/SVF.h index 6d60dc7f77a..31528e8aadf 100644 --- a/plugins/LadspaEffect/caps/dsp/SVF.h +++ b/plugins/LadspaEffect/caps/dsp/SVF.h @@ -73,8 +73,6 @@ #ifndef _DSP_SVF_H_ #define _DSP_SVF_H_ -#define min(a,b) (((a) < (b)) ? (a) : (b)) - #ifndef M_PI #define M_PI 3.14159265358979323846264338327 #endif From 84edde371e1b0f1eee66aaf71f4505452c179553 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Sun, 2 Jul 2023 20:38:34 +0530 Subject: [PATCH 16/87] commented sys/time.h --- plugins/LadspaEffect/caps/interface.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/LadspaEffect/caps/interface.cc b/plugins/LadspaEffect/caps/interface.cc index 8b5740203f3..4f4edfbeee8 100644 --- a/plugins/LadspaEffect/caps/interface.cc +++ b/plugins/LadspaEffect/caps/interface.cc @@ -29,7 +29,7 @@ (2541 - 2580 donated to artemio@kdemail.net) */ -#include +// #include #include "basics.h" From 7785ebc18fb0eac0629f1ffb1af7bee62848f194 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Mon, 3 Jul 2023 17:33:36 +0530 Subject: [PATCH 17/87] another tweak to caps cmakelists --- plugins/LadspaEffect/caps/CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/LadspaEffect/caps/CMakeLists.txt b/plugins/LadspaEffect/caps/CMakeLists.txt index 2ee75bbc7b4..bb7f19152c8 100644 --- 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 "-funroll-loops") + +IF (NOT MSVC) + SET_TARGET_PROPERTIES(caps PROPERTIES COMPILE_FLAGS "-O2 -funroll-loops -Wno-write-strings") +ENDIF(NOT MSVC) IF(LMMS_BUILD_WIN32) add_custom_command( From dd89d21a6635f7ead353e766f093672fa7247a06 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Mon, 3 Jul 2023 17:41:50 +0530 Subject: [PATCH 18/87] added caps init condition --- plugins/LadspaEffect/caps/interface.cc | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/plugins/LadspaEffect/caps/interface.cc b/plugins/LadspaEffect/caps/interface.cc index 4f4edfbeee8..58a3b31e926 100644 --- a/plugins/LadspaEffect/caps/interface.cc +++ b/plugins/LadspaEffect/caps/interface.cc @@ -29,8 +29,6 @@ (2541 - 2580 donated to artemio@kdemail.net) */ -// #include - #include "basics.h" #include "Cabinet.h" @@ -58,15 +56,6 @@ #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" { void caps_so_init() @@ -140,4 +129,10 @@ ladspa_descriptor (unsigned long i) return 0; } +struct CapsSoInit { + CapsSoInit() { caps_so_init(); } + ~CapsSoInit() { caps_so_fini(); } +}; +static CapsSoInit capsSoInit; + }; /* extern "C" */ From 1c045ed8aa894239c39191b1448c3dbfb8fa89cd Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Mon, 3 Jul 2023 22:47:49 +0530 Subject: [PATCH 19/87] attepted fix on calf plugins --- plugins/LadspaEffect/caps/interface.cc | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/plugins/LadspaEffect/caps/interface.cc b/plugins/LadspaEffect/caps/interface.cc index 58a3b31e926..e6c76ce05ef 100644 --- a/plugins/LadspaEffect/caps/interface.cc +++ b/plugins/LadspaEffect/caps/interface.cc @@ -58,6 +58,9 @@ static DescriptorStub * descriptors [N]; extern "C" { +#ifdef __GNUC__ + __attribute__(constructor) +#endif void caps_so_init() { DescriptorStub ** d = descriptors; @@ -113,6 +116,9 @@ void caps_so_init() //seed(); } +#ifdef __GNUC__ + __attribute__(destructor) +#endif void caps_so_fini() { for (ulong i = 0; i < N; ++i) @@ -129,10 +135,10 @@ ladspa_descriptor (unsigned long i) return 0; } -struct CapsSoInit { - CapsSoInit() { caps_so_init(); } - ~CapsSoInit() { caps_so_fini(); } -}; -static CapsSoInit capsSoInit; + +#ifdef _MSC_VER + #pragma startup caps_so_init + #pragma exit caps_so_fini +#endif }; /* extern "C" */ From 961334e4daa6181e59a8db39ae18ce1cec25103a Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Mon, 3 Jul 2023 23:10:20 +0530 Subject: [PATCH 20/87] fixup to mingw build --- plugins/LadspaEffect/caps/interface.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/LadspaEffect/caps/interface.cc b/plugins/LadspaEffect/caps/interface.cc index e6c76ce05ef..c7f8ff83d62 100644 --- a/plugins/LadspaEffect/caps/interface.cc +++ b/plugins/LadspaEffect/caps/interface.cc @@ -59,7 +59,7 @@ static DescriptorStub * descriptors [N]; extern "C" { #ifdef __GNUC__ - __attribute__(constructor) + __attribute__((constructor)) #endif void caps_so_init() { @@ -117,7 +117,7 @@ void caps_so_init() } #ifdef __GNUC__ - __attribute__(destructor) + __attribute__((destructor)) #endif void caps_so_fini() { From 43ca0f286a82e3a83f4db5f1e8fc937775d83849 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Tue, 4 Jul 2023 18:44:38 +0530 Subject: [PATCH 21/87] added __declspec(dllexport) --- include/ladspa.h | 3 +++ plugins/LadspaEffect/caps/interface.cc | 3 +++ 2 files changed, 6 insertions(+) diff --git a/include/ladspa.h b/include/ladspa.h index 5c30a8a4b5c..8f449562fbb 100644 --- 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/caps/interface.cc b/plugins/LadspaEffect/caps/interface.cc index c7f8ff83d62..7f5b15962b4 100644 --- a/plugins/LadspaEffect/caps/interface.cc +++ b/plugins/LadspaEffect/caps/interface.cc @@ -127,6 +127,9 @@ void caps_so_fini() /* /////////////////////////////////////////////////////////////////////// */ +#ifdef _MSC_VER +__declspec(dllexport) +#endif const LADSPA_Descriptor * ladspa_descriptor (unsigned long i) { From 4a5c64aeed9a4ad8eeb41d3350c1ae33b7e86776 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Tue, 4 Jul 2023 19:12:25 +0530 Subject: [PATCH 22/87] added init condition, Will this fix it? --- plugins/LadspaEffect/caps/interface.cc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/plugins/LadspaEffect/caps/interface.cc b/plugins/LadspaEffect/caps/interface.cc index 7f5b15962b4..ff027bed7df 100644 --- a/plugins/LadspaEffect/caps/interface.cc +++ b/plugins/LadspaEffect/caps/interface.cc @@ -138,6 +138,11 @@ ladspa_descriptor (unsigned long i) return 0; } +struct CapsSoInit { + CapsSoInit() { caps_so_init(); } + ~CapsSoInit() { caps_so_fini(); } +}; +static CapsSoInit capsSoInit; #ifdef _MSC_VER #pragma startup caps_so_init From b2b8a6eb88d4316ba22d55d75de7307bdb19812e Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Tue, 4 Jul 2023 19:18:11 +0530 Subject: [PATCH 23/87] temporary blacklist for ladspa plugins for testing --- plugins/LadspaEffect/CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/plugins/LadspaEffect/CMakeLists.txt b/plugins/LadspaEffect/CMakeLists.txt index 951615ad4d0..1c3cde36d9c 100644 --- a/plugins/LadspaEffect/CMakeLists.txt +++ b/plugins/LadspaEffect/CMakeLists.txt @@ -8,6 +8,9 @@ IF(WANT_CAPS) ADD_SUBDIRECTORY(caps) ENDIF(WANT_CAPS) +# temporary condition, will be removed +IF(NOT MSVC) + IF(WANT_TAP) ADD_SUBDIRECTORY(tap) ENDIF(WANT_TAP) @@ -23,3 +26,5 @@ ENDIF(WANT_CMT) IF(WANT_CALF) ADD_SUBDIRECTORY(calf) ENDIF(WANT_CALF) + +ENDIF(NOT MSVC) From 3c957be4e4c921b0a48349a69fce56141054e234 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Tue, 4 Jul 2023 19:54:25 +0530 Subject: [PATCH 24/87] removed cmt from blacklist --- plugins/LadspaEffect/CMakeLists.txt | 8 ++++---- plugins/LadspaEffect/caps/interface.cc | 6 ------ 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/plugins/LadspaEffect/CMakeLists.txt b/plugins/LadspaEffect/CMakeLists.txt index 1c3cde36d9c..d55993e8075 100644 --- a/plugins/LadspaEffect/CMakeLists.txt +++ b/plugins/LadspaEffect/CMakeLists.txt @@ -8,6 +8,10 @@ IF(WANT_CAPS) ADD_SUBDIRECTORY(caps) ENDIF(WANT_CAPS) +IF(WANT_CMT) +ADD_SUBDIRECTORY(cmt) +ENDIF(WANT_CMT) + # temporary condition, will be removed IF(NOT MSVC) @@ -19,10 +23,6 @@ IF(WANT_SWH) ADD_SUBDIRECTORY(swh) ENDIF(WANT_SWH) -IF(WANT_CMT) -ADD_SUBDIRECTORY(cmt) -ENDIF(WANT_CMT) - IF(WANT_CALF) ADD_SUBDIRECTORY(calf) ENDIF(WANT_CALF) diff --git a/plugins/LadspaEffect/caps/interface.cc b/plugins/LadspaEffect/caps/interface.cc index ff027bed7df..4c674923728 100644 --- a/plugins/LadspaEffect/caps/interface.cc +++ b/plugins/LadspaEffect/caps/interface.cc @@ -113,7 +113,6 @@ void caps_so_init() /* make sure N is correct */ assert (d - descriptors == N); - //seed(); } #ifdef __GNUC__ @@ -144,9 +143,4 @@ struct CapsSoInit { }; static CapsSoInit capsSoInit; -#ifdef _MSC_VER - #pragma startup caps_so_init - #pragma exit caps_so_fini -#endif - }; /* extern "C" */ From 88dfa0f6013567506c3546ae0de4591eadad1838 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Tue, 4 Jul 2023 20:16:35 +0530 Subject: [PATCH 25/87] added declspec in cmt --- plugins/LadspaEffect/cmt/cmt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/LadspaEffect/cmt/cmt b/plugins/LadspaEffect/cmt/cmt index 5bc4d810696..99b0fd3d4b3 160000 --- a/plugins/LadspaEffect/cmt/cmt +++ b/plugins/LadspaEffect/cmt/cmt @@ -1 +1 @@ -Subproject commit 5bc4d810696ea1c824651ab34c5e8d60dfd4293d +Subproject commit 99b0fd3d4b32056263a0a997dc68ca5897ad76b0 From c77b3a52e75a3775855d758b86ee2f690691385f Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Wed, 5 Jul 2023 13:05:53 +0530 Subject: [PATCH 26/87] removed swh from blacklist --- plugins/LadspaEffect/CMakeLists.txt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/plugins/LadspaEffect/CMakeLists.txt b/plugins/LadspaEffect/CMakeLists.txt index d55993e8075..5528681c806 100644 --- a/plugins/LadspaEffect/CMakeLists.txt +++ b/plugins/LadspaEffect/CMakeLists.txt @@ -12,6 +12,11 @@ IF(WANT_CMT) ADD_SUBDIRECTORY(cmt) ENDIF(WANT_CMT) + +IF(WANT_SWH) +ADD_SUBDIRECTORY(swh) +ENDIF(WANT_SWH) + # temporary condition, will be removed IF(NOT MSVC) @@ -19,10 +24,6 @@ IF(WANT_TAP) ADD_SUBDIRECTORY(tap) ENDIF(WANT_TAP) -IF(WANT_SWH) -ADD_SUBDIRECTORY(swh) -ENDIF(WANT_SWH) - IF(WANT_CALF) ADD_SUBDIRECTORY(calf) ENDIF(WANT_CALF) From dff0cd4011ca66ff91b93e05ca40238ef80f3120 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Thu, 6 Jul 2023 11:01:35 +0530 Subject: [PATCH 27/87] added _USE_MATH_DEFINES to swh --- plugins/LadspaEffect/swh/ladspa | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/LadspaEffect/swh/ladspa b/plugins/LadspaEffect/swh/ladspa index d99a0db521d..922bb429119 160000 --- a/plugins/LadspaEffect/swh/ladspa +++ b/plugins/LadspaEffect/swh/ladspa @@ -1 +1 @@ -Subproject commit d99a0db521d13a87bdaa418c674ca8858e484452 +Subproject commit 922bb429119c1268df10d5c245dfb76a5dba5f64 From 87a0103e33a18040af84baee70c50b4167e02a23 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Thu, 6 Jul 2023 11:04:57 +0530 Subject: [PATCH 28/87] codefactor fix --- plugins/LadspaEffect/caps/interface.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/LadspaEffect/caps/interface.cc b/plugins/LadspaEffect/caps/interface.cc index 4c674923728..5786b27917e 100644 --- a/plugins/LadspaEffect/caps/interface.cc +++ b/plugins/LadspaEffect/caps/interface.cc @@ -112,7 +112,6 @@ void caps_so_init() /* make sure N is correct */ assert (d - descriptors == N); - } #ifdef __GNUC__ From 4570893d7102c89461bbae2e3310637d93312231 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Thu, 6 Jul 2023 11:26:23 +0530 Subject: [PATCH 29/87] added _USE_MATH_DEFINES to pitchscale.h --- plugins/LadspaEffect/swh/ladspa | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/LadspaEffect/swh/ladspa b/plugins/LadspaEffect/swh/ladspa index 922bb429119..5d05a25a158 160000 --- a/plugins/LadspaEffect/swh/ladspa +++ b/plugins/LadspaEffect/swh/ladspa @@ -1 +1 @@ -Subproject commit 922bb429119c1268df10d5c245dfb76a5dba5f64 +Subproject commit 5d05a25a158eba8583ea9c4eefd161a54ffba986 From 227414766a6f19d5f28718d8007844b297e3f502 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Thu, 6 Jul 2023 11:37:51 +0530 Subject: [PATCH 30/87] workaround to enable sinus_wavewrapper --- plugins/LadspaEffect/swh/ladspa | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/LadspaEffect/swh/ladspa b/plugins/LadspaEffect/swh/ladspa index 5d05a25a158..98908789b13 160000 --- a/plugins/LadspaEffect/swh/ladspa +++ b/plugins/LadspaEffect/swh/ladspa @@ -1 +1 @@ -Subproject commit 5d05a25a158eba8583ea9c4eefd161a54ffba986 +Subproject commit 98908789b13e99b99c342ec26d4fca1f6031cc03 From 24817311c48c3783ff7e27c1f35e397a92f6d636 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Thu, 6 Jul 2023 11:54:02 +0530 Subject: [PATCH 31/87] Revert "workaround to enable sinus_wavewrapper" This reverts commit 227414766a6f19d5f28718d8007844b297e3f502. --- plugins/LadspaEffect/swh/ladspa | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/LadspaEffect/swh/ladspa b/plugins/LadspaEffect/swh/ladspa index 98908789b13..5d05a25a158 160000 --- a/plugins/LadspaEffect/swh/ladspa +++ b/plugins/LadspaEffect/swh/ladspa @@ -1 +1 @@ -Subproject commit 98908789b13e99b99c342ec26d4fca1f6031cc03 +Subproject commit 5d05a25a158eba8583ea9c4eefd161a54ffba986 From 0b431fd24047ec4916d4354365e2b4392544b2e9 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Fri, 7 Jul 2023 09:59:19 +0530 Subject: [PATCH 32/87] fix to swh --- plugins/LadspaEffect/swh/ladspa | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/LadspaEffect/swh/ladspa b/plugins/LadspaEffect/swh/ladspa index 5d05a25a158..ec24f04536e 160000 --- a/plugins/LadspaEffect/swh/ladspa +++ b/plugins/LadspaEffect/swh/ladspa @@ -1 +1 @@ -Subproject commit 5d05a25a158eba8583ea9c4eefd161a54ffba986 +Subproject commit ec24f04536ed1ee674beb9dc266f2e74afb53b2f From 06f5ebdebc053ef35ea87fd4469dc24717d27228 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Fri, 7 Jul 2023 14:09:51 +0530 Subject: [PATCH 33/87] removed the blacklist --- plugins/LadspaEffect/CMakeLists.txt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/plugins/LadspaEffect/CMakeLists.txt b/plugins/LadspaEffect/CMakeLists.txt index 5528681c806..4e1c5f8eab0 100644 --- a/plugins/LadspaEffect/CMakeLists.txt +++ b/plugins/LadspaEffect/CMakeLists.txt @@ -12,14 +12,10 @@ IF(WANT_CMT) ADD_SUBDIRECTORY(cmt) ENDIF(WANT_CMT) - IF(WANT_SWH) ADD_SUBDIRECTORY(swh) ENDIF(WANT_SWH) -# temporary condition, will be removed -IF(NOT MSVC) - IF(WANT_TAP) ADD_SUBDIRECTORY(tap) ENDIF(WANT_TAP) @@ -28,4 +24,3 @@ IF(WANT_CALF) ADD_SUBDIRECTORY(calf) ENDIF(WANT_CALF) -ENDIF(NOT MSVC) From 529a57010c5c0825d85cd6dc631b99f6e593497e Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Fri, 7 Jul 2023 14:43:43 +0530 Subject: [PATCH 34/87] added math defines to tap_utils.h --- plugins/LadspaEffect/calf/veal | 2 +- plugins/LadspaEffect/tap/tap-plugins | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/LadspaEffect/calf/veal b/plugins/LadspaEffect/calf/veal index fe628885b76..045bba75782 160000 --- a/plugins/LadspaEffect/calf/veal +++ b/plugins/LadspaEffect/calf/veal @@ -1 +1 @@ -Subproject commit fe628885b761372b37136a3f2b7c3d56e179e3ba +Subproject commit 045bba757822605551613fd6d568b615547c5895 diff --git a/plugins/LadspaEffect/tap/tap-plugins b/plugins/LadspaEffect/tap/tap-plugins index 198b84e6ab3..35fd42ba813 160000 --- a/plugins/LadspaEffect/tap/tap-plugins +++ b/plugins/LadspaEffect/tap/tap-plugins @@ -1 +1 @@ -Subproject commit 198b84e6ab37a9c979435cdb8f0a27a0e9a2934f +Subproject commit 35fd42ba81377dc5bdfb8135543179a32d1909cb From 301c25f08af230a588d4878f2db8fea1e5e26087 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Fri, 7 Jul 2023 14:50:51 +0530 Subject: [PATCH 35/87] added math defines to calf primitives.h --- plugins/LadspaEffect/calf/veal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/LadspaEffect/calf/veal b/plugins/LadspaEffect/calf/veal index 045bba75782..7334c63e9d7 160000 --- a/plugins/LadspaEffect/calf/veal +++ b/plugins/LadspaEffect/calf/veal @@ -1 +1 @@ -Subproject commit 045bba757822605551613fd6d568b615547c5895 +Subproject commit 7334c63e9d77cc9102eafd548ce47388fa15f3e2 From 4bdd52fa0c49a049a0b7ff95daa0a1a03964a519 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Fri, 7 Jul 2023 14:54:38 +0530 Subject: [PATCH 36/87] added missing endif to calf's primitives.h --- plugins/LadspaEffect/calf/veal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/LadspaEffect/calf/veal b/plugins/LadspaEffect/calf/veal index 7334c63e9d7..d93e8999fa7 160000 --- a/plugins/LadspaEffect/calf/veal +++ b/plugins/LadspaEffect/calf/veal @@ -1 +1 @@ -Subproject commit 7334c63e9d77cc9102eafd548ce47388fa15f3e2 +Subproject commit d93e8999fa78ee344a3e653bec7a14380d86f0f4 From 7478329fc4e3070e38a8bb09cc9cf1b2f303b1ff Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Fri, 7 Jul 2023 15:11:36 +0530 Subject: [PATCH 37/87] added math defines to biquad.h --- plugins/LadspaEffect/calf/veal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/LadspaEffect/calf/veal b/plugins/LadspaEffect/calf/veal index d93e8999fa7..398d0856c43 160000 --- a/plugins/LadspaEffect/calf/veal +++ b/plugins/LadspaEffect/calf/veal @@ -1 +1 @@ -Subproject commit d93e8999fa78ee344a3e653bec7a14380d86f0f4 +Subproject commit 398d0856c4329759fa211f79cade657e32b40a58 From ffe89943a4463aa06d811287a48de36644b15c6f Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Fri, 7 Jul 2023 15:16:22 +0530 Subject: [PATCH 38/87] tweak in calf to get it built --- plugins/LadspaEffect/calf/veal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/LadspaEffect/calf/veal b/plugins/LadspaEffect/calf/veal index 398d0856c43..93a832f8f43 160000 --- a/plugins/LadspaEffect/calf/veal +++ b/plugins/LadspaEffect/calf/veal @@ -1 +1 @@ -Subproject commit 398d0856c4329759fa211f79cade657e32b40a58 +Subproject commit 93a832f8f435176704385476ce803e9037bed9aa From fad75fd2da4ad6c84b84a08fccc0509eb342d40f Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Fri, 7 Jul 2023 15:29:06 +0530 Subject: [PATCH 39/87] will it get fixed? --- plugins/LadspaEffect/calf/veal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/LadspaEffect/calf/veal b/plugins/LadspaEffect/calf/veal index 93a832f8f43..74bfae90187 160000 --- a/plugins/LadspaEffect/calf/veal +++ b/plugins/LadspaEffect/calf/veal @@ -1 +1 @@ -Subproject commit 93a832f8f435176704385476ce803e9037bed9aa +Subproject commit 74bfae9018712d74ad1c541a4e0de2402af0b167 From 03212694857d3448e344c68859003e1b992a2324 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Fri, 7 Jul 2023 15:38:34 +0530 Subject: [PATCH 40/87] final patch to fix i guess --- plugins/LadspaEffect/calf/veal | 2 +- plugins/LadspaEffect/tap/tap-plugins | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/LadspaEffect/calf/veal b/plugins/LadspaEffect/calf/veal index 74bfae90187..83f37f8acca 160000 --- a/plugins/LadspaEffect/calf/veal +++ b/plugins/LadspaEffect/calf/veal @@ -1 +1 @@ -Subproject commit 74bfae9018712d74ad1c541a4e0de2402af0b167 +Subproject commit 83f37f8accad5e8bd89be92236eed8c253d017e0 diff --git a/plugins/LadspaEffect/tap/tap-plugins b/plugins/LadspaEffect/tap/tap-plugins index 35fd42ba813..fd798c914bf 160000 --- a/plugins/LadspaEffect/tap/tap-plugins +++ b/plugins/LadspaEffect/tap/tap-plugins @@ -1 +1 @@ -Subproject commit 35fd42ba81377dc5bdfb8135543179a32d1909cb +Subproject commit fd798c914bfe9f7130f1a8aa1803b4fd3083a317 From 6242930e00f06479861fc8553274ea191ca68991 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Sat, 8 Jul 2023 14:44:37 +0530 Subject: [PATCH 41/87] added declspec to tap --- plugins/LadspaEffect/tap/tap-plugins | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/LadspaEffect/tap/tap-plugins b/plugins/LadspaEffect/tap/tap-plugins index fd798c914bf..6d5994c017e 160000 --- a/plugins/LadspaEffect/tap/tap-plugins +++ b/plugins/LadspaEffect/tap/tap-plugins @@ -1 +1 @@ -Subproject commit fd798c914bfe9f7130f1a8aa1803b4fd3083a317 +Subproject commit 6d5994c017e927be45a343e1c92c681390606e32 From c0ad959d10ffc2712bd180e7df9173145962b7da Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Sat, 8 Jul 2023 15:21:30 +0530 Subject: [PATCH 42/87] added the blacklist back in for calf --- plugins/LadspaEffect/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/plugins/LadspaEffect/CMakeLists.txt b/plugins/LadspaEffect/CMakeLists.txt index 4e1c5f8eab0..df000d80e16 100644 --- a/plugins/LadspaEffect/CMakeLists.txt +++ b/plugins/LadspaEffect/CMakeLists.txt @@ -20,7 +20,11 @@ IF(WANT_TAP) ADD_SUBDIRECTORY(tap) ENDIF(WANT_TAP) +IF(NOT MSVC) + IF(WANT_CALF) ADD_SUBDIRECTORY(calf) ENDIF(WANT_CALF) +ENDIF(NOT MSVC) + From 3637a1f47d8ccafe2bc6e036c7201fe8ac74b21b Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Sat, 8 Jul 2023 15:23:34 +0530 Subject: [PATCH 43/87] updated swh to upstream --- plugins/LadspaEffect/swh/ladspa | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/LadspaEffect/swh/ladspa b/plugins/LadspaEffect/swh/ladspa index ec24f04536e..02bda232041 160000 --- a/plugins/LadspaEffect/swh/ladspa +++ b/plugins/LadspaEffect/swh/ladspa @@ -1 +1 @@ -Subproject commit ec24f04536ed1ee674beb9dc266f2e74afb53b2f +Subproject commit 02bda232041380c2846414945798cbbfecb2f3f2 From 7e9a73435f9f92ed5dfc303645919278ebaa6deb Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Sat, 8 Jul 2023 15:29:20 +0530 Subject: [PATCH 44/87] updated cmt to master --- plugins/LadspaEffect/cmt/cmt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/LadspaEffect/cmt/cmt b/plugins/LadspaEffect/cmt/cmt index 99b0fd3d4b3..56f84d44b9b 160000 --- a/plugins/LadspaEffect/cmt/cmt +++ b/plugins/LadspaEffect/cmt/cmt @@ -1 +1 @@ -Subproject commit 99b0fd3d4b32056263a0a997dc68ca5897ad76b0 +Subproject commit 56f84d44b9bcfd8e797c9510fd19e1cfb73ec21e From 91f3b773cb7b6c5d386c94654b8db531d191a4c7 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Sat, 8 Jul 2023 15:30:01 +0530 Subject: [PATCH 45/87] pulled to cmt to master try 2 --- plugins/LadspaEffect/cmt/cmt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/LadspaEffect/cmt/cmt b/plugins/LadspaEffect/cmt/cmt index 56f84d44b9b..6e6e291fbad 160000 --- a/plugins/LadspaEffect/cmt/cmt +++ b/plugins/LadspaEffect/cmt/cmt @@ -1 +1 @@ -Subproject commit 56f84d44b9bcfd8e797c9510fd19e1cfb73ec21e +Subproject commit 6e6e291fbad1138c808860ba3f140a963b52fa58 From dd3d3b9bad04414c0ea80f76d78da03437107a28 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Mon, 10 Jul 2023 17:21:33 +0530 Subject: [PATCH 46/87] remove blacklist + experimnt removing declspec tap --- plugins/LadspaEffect/CMakeLists.txt | 3 --- plugins/LadspaEffect/tap/tap-plugins | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/plugins/LadspaEffect/CMakeLists.txt b/plugins/LadspaEffect/CMakeLists.txt index df000d80e16..7e20ed47e6c 100644 --- a/plugins/LadspaEffect/CMakeLists.txt +++ b/plugins/LadspaEffect/CMakeLists.txt @@ -20,11 +20,8 @@ IF(WANT_TAP) ADD_SUBDIRECTORY(tap) ENDIF(WANT_TAP) -IF(NOT MSVC) - IF(WANT_CALF) ADD_SUBDIRECTORY(calf) ENDIF(WANT_CALF) -ENDIF(NOT MSVC) diff --git a/plugins/LadspaEffect/tap/tap-plugins b/plugins/LadspaEffect/tap/tap-plugins index 6d5994c017e..fed7d76b673 160000 --- a/plugins/LadspaEffect/tap/tap-plugins +++ b/plugins/LadspaEffect/tap/tap-plugins @@ -1 +1 @@ -Subproject commit 6d5994c017e927be45a343e1c92c681390606e32 +Subproject commit fed7d76b673e3943c512fc9368a31c191f02ddec From cbebc0762ef2a972b7c5ac2f502ae99d36713637 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Mon, 10 Jul 2023 17:54:58 +0530 Subject: [PATCH 47/87] experiment replacing bind2nd with lambdas veal --- plugins/LadspaEffect/calf/veal | 2 +- plugins/LadspaEffect/tap/tap-plugins | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/LadspaEffect/calf/veal b/plugins/LadspaEffect/calf/veal index 83f37f8acca..0e7b7d53d4f 160000 --- a/plugins/LadspaEffect/calf/veal +++ b/plugins/LadspaEffect/calf/veal @@ -1 +1 @@ -Subproject commit 83f37f8accad5e8bd89be92236eed8c253d017e0 +Subproject commit 0e7b7d53d4fd8229b16d227566ee9a3526116f0d diff --git a/plugins/LadspaEffect/tap/tap-plugins b/plugins/LadspaEffect/tap/tap-plugins index fed7d76b673..e53e7645b33 160000 --- a/plugins/LadspaEffect/tap/tap-plugins +++ b/plugins/LadspaEffect/tap/tap-plugins @@ -1 +1 @@ -Subproject commit fed7d76b673e3943c512fc9368a31c191f02ddec +Subproject commit e53e7645b3308867a40f3b78f64ca8df36863b8c From 8f52dba32733855d9fed064e193573fd17258bd9 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Mon, 10 Jul 2023 18:15:47 +0530 Subject: [PATCH 48/87] removed functional.h in veal --- plugins/LadspaEffect/calf/veal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/LadspaEffect/calf/veal b/plugins/LadspaEffect/calf/veal index 0e7b7d53d4f..28e58a0542d 160000 --- a/plugins/LadspaEffect/calf/veal +++ b/plugins/LadspaEffect/calf/veal @@ -1 +1 @@ -Subproject commit 0e7b7d53d4fd8229b16d227566ee9a3526116f0d +Subproject commit 28e58a0542d886c8eed63852d875547900340cac From bd657a58c21dc7ebbc4c0e81097e7e3ea8f929af Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Wed, 12 Jul 2023 18:25:31 +0530 Subject: [PATCH 49/87] checked out to ladspa branch --- plugins/LadspaEffect/calf/veal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/LadspaEffect/calf/veal b/plugins/LadspaEffect/calf/veal index 28e58a0542d..188b75111df 160000 --- a/plugins/LadspaEffect/calf/veal +++ b/plugins/LadspaEffect/calf/veal @@ -1 +1 @@ -Subproject commit 28e58a0542d886c8eed63852d875547900340cac +Subproject commit 188b75111df513567ad1e2ff2dfd5826460e907c From 19e96aa6094a9cdbfaeef7a1bcfae842724fb701 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Wed, 12 Jul 2023 18:46:43 +0530 Subject: [PATCH 50/87] fixed veal --- plugins/LadspaEffect/calf/veal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/LadspaEffect/calf/veal b/plugins/LadspaEffect/calf/veal index 188b75111df..aaea579b7c4 160000 --- a/plugins/LadspaEffect/calf/veal +++ b/plugins/LadspaEffect/calf/veal @@ -1 +1 @@ -Subproject commit 188b75111df513567ad1e2ff2dfd5826460e907c +Subproject commit aaea579b7c403a55f930b82c2f705e46ad989c67 From 7c6bbd25aa6b6906c579396a3611f5cf99c5be99 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Wed, 12 Jul 2023 21:54:41 +0530 Subject: [PATCH 51/87] attempt fix at mac builds --- plugins/LadspaEffect/swh/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/LadspaEffect/swh/CMakeLists.txt b/plugins/LadspaEffect/swh/CMakeLists.txt index ece3070060b..7b5d24828dc 100644 --- a/plugins/LadspaEffect/swh/CMakeLists.txt +++ b/plugins/LadspaEffect/swh/CMakeLists.txt @@ -24,6 +24,7 @@ FOREACH(_item ${XML_SOURCES}) # Coerce XML source file to C ADD_CUSTOM_COMMAND( OUTPUT "${_out_file}" + COMMAND cpan List:MoreUtils COMMAND perl ./makestub.pl "${_item}" > "${_out_file}" DEPENDS "${_item}" WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/ladspa" From 2923971887a20732daf32b0b7c6a2146ef7d9048 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Wed, 12 Jul 2023 22:59:37 +0530 Subject: [PATCH 52/87] Revert "attempt fix at mac builds" This reverts commit 7c6bbd25aa6b6906c579396a3611f5cf99c5be99. --- plugins/LadspaEffect/swh/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/LadspaEffect/swh/CMakeLists.txt b/plugins/LadspaEffect/swh/CMakeLists.txt index 7b5d24828dc..ece3070060b 100644 --- a/plugins/LadspaEffect/swh/CMakeLists.txt +++ b/plugins/LadspaEffect/swh/CMakeLists.txt @@ -24,7 +24,6 @@ FOREACH(_item ${XML_SOURCES}) # Coerce XML source file to C ADD_CUSTOM_COMMAND( OUTPUT "${_out_file}" - COMMAND cpan List:MoreUtils COMMAND perl ./makestub.pl "${_item}" > "${_out_file}" DEPENDS "${_item}" WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/ladspa" From 4cba33a9d04d4666285a0dc17e5b4957f0b252fa Mon Sep 17 00:00:00 2001 From: Rossmaxx <74815851+Rossmaxx@users.noreply.github.com> Date: Wed, 12 Jul 2023 23:20:22 +0530 Subject: [PATCH 53/87] added list-moreutils to build.yml --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 007842b82ad..3240aaa4b59 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -93,6 +93,7 @@ jobs: libsamplerate jack sdl libgig libsoundio lilv lv2 stk \ fluid-synth portaudio fltk qt@5 carla npm install --location=global appdmg + cpan List::MoreUtils - name: Configure run: | mkdir build From b4e77152bef0470e3ad1411a1a31ae83c6819a63 Mon Sep 17 00:00:00 2001 From: Tres Finocchiaro Date: Thu, 13 Jul 2023 00:05:10 -0400 Subject: [PATCH 54/87] Attempt to fix MacOS builds --- .github/workflows/build.yml | 1 - plugins/LadspaEffect/swh/CMakeLists.txt | 10 +++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3240aaa4b59..007842b82ad 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -93,7 +93,6 @@ jobs: libsamplerate jack sdl libgig libsoundio lilv lv2 stk \ fluid-synth portaudio fltk qt@5 carla npm install --location=global appdmg - cpan List::MoreUtils - name: Configure run: | mkdir build diff --git a/plugins/LadspaEffect/swh/CMakeLists.txt b/plugins/LadspaEffect/swh/CMakeLists.txt index ece3070060b..873e1b629b7 100644 --- a/plugins/LadspaEffect/swh/CMakeLists.txt +++ b/plugins/LadspaEffect/swh/CMakeLists.txt @@ -16,6 +16,14 @@ SET(COMPILE_FLAGS "${COMPILE_FLAGS} ${PIC_FLAGS}") # Loop over every XML file FILE(GLOB XML_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/ladspa/*.xml") LIST(SORT XML_SOURCES) + +IF(LMMS_BUILD_MACOS) + # Prefer system perl over Homebrew, MacPorts, etc + SET(PERL_COMMAND "/usr/bin/perl") +ELSE() + SET(PERL_COMMAND "perl") +ENDIF() + FOREACH(_item ${XML_SOURCES}) # Get library name and (soon to be) C file GET_FILENAME_COMPONENT(_plugin "${_item}" NAME_WE) @@ -24,7 +32,7 @@ FOREACH(_item ${XML_SOURCES}) # Coerce XML source file to C ADD_CUSTOM_COMMAND( OUTPUT "${_out_file}" - COMMAND perl ./makestub.pl "${_item}" > "${_out_file}" + COMMAND ${PERL_COMMAND} ./makestub.pl "${_item}" > "${_out_file}" DEPENDS "${_item}" WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/ladspa" VERBATIM From 384aa24f536b1ac2b016132d73562f1114958e61 Mon Sep 17 00:00:00 2001 From: Tres Finocchiaro Date: Thu, 13 Jul 2023 00:22:05 -0400 Subject: [PATCH 55/87] Fix typo --- plugins/LadspaEffect/swh/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/LadspaEffect/swh/CMakeLists.txt b/plugins/LadspaEffect/swh/CMakeLists.txt index 873e1b629b7..fef80debd8e 100644 --- a/plugins/LadspaEffect/swh/CMakeLists.txt +++ b/plugins/LadspaEffect/swh/CMakeLists.txt @@ -17,7 +17,7 @@ SET(COMPILE_FLAGS "${COMPILE_FLAGS} ${PIC_FLAGS}") FILE(GLOB XML_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/ladspa/*.xml") LIST(SORT XML_SOURCES) -IF(LMMS_BUILD_MACOS) +IF(LMMS_BUILD_APPLE) # Prefer system perl over Homebrew, MacPorts, etc SET(PERL_COMMAND "/usr/bin/perl") ELSE() From da019b72ca4df806672830f2cc28f84a86399c3e Mon Sep 17 00:00:00 2001 From: Tres Finocchiaro Date: Thu, 13 Jul 2023 00:40:33 -0400 Subject: [PATCH 56/87] Formatting --- plugins/LadspaEffect/CMakeLists.txt | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/plugins/LadspaEffect/CMakeLists.txt b/plugins/LadspaEffect/CMakeLists.txt index 7e20ed47e6c..ea298160517 100644 --- a/plugins/LadspaEffect/CMakeLists.txt +++ b/plugins/LadspaEffect/CMakeLists.txt @@ -8,20 +8,18 @@ IF(WANT_CAPS) ADD_SUBDIRECTORY(caps) ENDIF(WANT_CAPS) -IF(WANT_CMT) -ADD_SUBDIRECTORY(cmt) -ENDIF(WANT_CMT) +IF(WANT_TAP) +ADD_SUBDIRECTORY(tap) +ENDIF(WANT_TAP) IF(WANT_SWH) ADD_SUBDIRECTORY(swh) ENDIF(WANT_SWH) -IF(WANT_TAP) -ADD_SUBDIRECTORY(tap) -ENDIF(WANT_TAP) +IF(WANT_CMT) +ADD_SUBDIRECTORY(cmt) +ENDIF(WANT_CMT) IF(WANT_CALF) ADD_SUBDIRECTORY(calf) -ENDIF(WANT_CALF) - - +ENDIF(WANT_CALF) \ No newline at end of file From 329613b3d4a4827e3660a395b02bc491f9833a36 Mon Sep 17 00:00:00 2001 From: Tres Finocchiaro Date: Thu, 13 Jul 2023 00:41:35 -0400 Subject: [PATCH 57/87] Formatting (again) --- plugins/LadspaEffect/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/LadspaEffect/CMakeLists.txt b/plugins/LadspaEffect/CMakeLists.txt index ea298160517..951615ad4d0 100644 --- a/plugins/LadspaEffect/CMakeLists.txt +++ b/plugins/LadspaEffect/CMakeLists.txt @@ -22,4 +22,4 @@ ENDIF(WANT_CMT) IF(WANT_CALF) ADD_SUBDIRECTORY(calf) -ENDIF(WANT_CALF) \ No newline at end of file +ENDIF(WANT_CALF) From d6b4f82be5546f22f313af9f71a4ae8628c2c2e9 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Thu, 13 Jul 2023 18:59:36 +0530 Subject: [PATCH 58/87] addressed dom's pending comment --- plugins/LadspaEffect/caps/basics.h | 11 +++++++---- plugins/LadspaEffect/caps/dsp/Eq.h | 8 +++----- plugins/LadspaEffect/caps/dsp/OnePole.h | 7 ++----- plugins/LadspaEffect/caps/dsp/SVF.h | 5 ++--- plugins/LadspaEffect/caps/dsp/Sine.h | 5 ++--- 5 files changed, 16 insertions(+), 20 deletions(-) diff --git a/plugins/LadspaEffect/caps/basics.h b/plugins/LadspaEffect/caps/basics.h index df24e8c05ed..759f6469023 100644 --- 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 +#include +#include #include #include +#ifndef _USE_MATH_DEFINES +#define _USE_MATH_DEFINES +#endif #include -#include -#include -#include #include @@ -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 index 3a6c89a3042..54fe3037b4b 100644 --- a/plugins/LadspaEffect/caps/dsp/Eq.h +++ b/plugins/LadspaEffect/caps/dsp/Eq.h @@ -26,13 +26,11 @@ 02111-1307, USA or point your web browser to http://www.gnu.org. */ -#ifndef _DSP_EQ_H_ -#define _DSP_EQ_H_ +#include "basics.h" -#ifndef M_PI -#define M_PI 3.14159265358979323846264338327 -#endif +#ifndef _DSP_EQ_H_ +#define _DSP_EQ_H_ namespace DSP { diff --git a/plugins/LadspaEffect/caps/dsp/OnePole.h b/plugins/LadspaEffect/caps/dsp/OnePole.h index 81abcb6ff26..a257b76945f 100644 --- a/plugins/LadspaEffect/caps/dsp/OnePole.h +++ b/plugins/LadspaEffect/caps/dsp/OnePole.h @@ -25,14 +25,11 @@ 02111-1307, USA or point your web browser to http://www.gnu.org. */ +#include "basics.h" + #ifndef _ONE_POLE_H_ #define _ONE_POLE_H_ - -#ifndef M_PI -#define M_PI 3.14159265358979323846264338327 -#endif - namespace DSP { class OnePoleLP diff --git a/plugins/LadspaEffect/caps/dsp/SVF.h b/plugins/LadspaEffect/caps/dsp/SVF.h index 31528e8aadf..f90740af930 100644 --- a/plugins/LadspaEffect/caps/dsp/SVF.h +++ b/plugins/LadspaEffect/caps/dsp/SVF.h @@ -70,12 +70,11 @@ } */ +#include "basics.h" + #ifndef _DSP_SVF_H_ #define _DSP_SVF_H_ -#ifndef M_PI -#define M_PI 3.14159265358979323846264338327 -#endif namespace DSP { diff --git a/plugins/LadspaEffect/caps/dsp/Sine.h b/plugins/LadspaEffect/caps/dsp/Sine.h index 95f225b446f..e8d99d404c0 100644 --- a/plugins/LadspaEffect/caps/dsp/Sine.h +++ b/plugins/LadspaEffect/caps/dsp/Sine.h @@ -25,12 +25,11 @@ 02111-1307, USA or point your web browser to http://www.gnu.org. */ +#include "basics.h" + #ifndef _DSP_SINE_H_ #define _DSP_SINE_H_ -#ifndef M_PI -#define M_PI 3.14159265358979323846264338327 -#endif namespace DSP { From 01eaa19976a5860a97ffe27dc5f4674fa3f78575 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Thu, 13 Jul 2023 19:12:31 +0530 Subject: [PATCH 59/87] fixed build issues --- plugins/LadspaEffect/caps/dsp/Eq.h | 2 +- plugins/LadspaEffect/caps/dsp/OnePole.h | 2 +- plugins/LadspaEffect/caps/dsp/SVF.h | 2 +- plugins/LadspaEffect/caps/dsp/Sine.h | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/plugins/LadspaEffect/caps/dsp/Eq.h b/plugins/LadspaEffect/caps/dsp/Eq.h index 54fe3037b4b..1f3ed5eef84 100644 --- a/plugins/LadspaEffect/caps/dsp/Eq.h +++ b/plugins/LadspaEffect/caps/dsp/Eq.h @@ -27,7 +27,7 @@ */ -#include "basics.h" +#include "../basics.h" #ifndef _DSP_EQ_H_ #define _DSP_EQ_H_ diff --git a/plugins/LadspaEffect/caps/dsp/OnePole.h b/plugins/LadspaEffect/caps/dsp/OnePole.h index a257b76945f..a53ec9fc8f9 100644 --- a/plugins/LadspaEffect/caps/dsp/OnePole.h +++ b/plugins/LadspaEffect/caps/dsp/OnePole.h @@ -25,7 +25,7 @@ 02111-1307, USA or point your web browser to http://www.gnu.org. */ -#include "basics.h" +#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 index f90740af930..fe49643a93b 100644 --- a/plugins/LadspaEffect/caps/dsp/SVF.h +++ b/plugins/LadspaEffect/caps/dsp/SVF.h @@ -70,7 +70,7 @@ } */ -#include "basics.h" +#include "../basics.h" #ifndef _DSP_SVF_H_ #define _DSP_SVF_H_ diff --git a/plugins/LadspaEffect/caps/dsp/Sine.h b/plugins/LadspaEffect/caps/dsp/Sine.h index e8d99d404c0..47477334e99 100644 --- a/plugins/LadspaEffect/caps/dsp/Sine.h +++ b/plugins/LadspaEffect/caps/dsp/Sine.h @@ -25,12 +25,11 @@ 02111-1307, USA or point your web browser to http://www.gnu.org. */ -#include "basics.h" +#include "../basics.h" #ifndef _DSP_SINE_H_ #define _DSP_SINE_H_ - namespace DSP { class Sine From 12a13007ddd83d229c33b14120befcc2b3e33d56 Mon Sep 17 00:00:00 2001 From: Tres Finocchiaro Date: Sun, 16 Jul 2023 02:09:19 -0400 Subject: [PATCH 60/87] CMake perl detection --- CMakeLists.txt | 16 +++++++++++++--- plugins/LadspaEffect/swh/CMakeLists.txt | 9 +-------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c5de064a54a..eb8ccb98e00 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -CMAKE_MINIMUM_REQUIRED(VERSION 3.9) +CMAKE_MINIMUM_REQUIRED(VERSION 3.12) PROJECT(lmms) @@ -16,6 +16,7 @@ IF(COMMAND CMAKE_POLICY) ENDIF() CMAKE_POLICY(SET CMP0020 NEW) CMAKE_POLICY(SET CMP0057 NEW) + CMAKE_POLICY(SET CMP0074 NEW) ENDIF(COMMAND CMAKE_POLICY) @@ -273,8 +274,17 @@ ELSE(WANT_CMT) ENDIF(WANT_CMT) IF(WANT_SWH) - SET(LMMS_HAVE_SWH TRUE) - SET(STATUS_SWH "OK") + 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") + ELSE() + SET(STATUS_SWH "Skipping, perl is missing") + ENDIF() ELSE(WANT_SWH) SET(STATUS_SWH "not built as requested") ENDIF(WANT_SWH) diff --git a/plugins/LadspaEffect/swh/CMakeLists.txt b/plugins/LadspaEffect/swh/CMakeLists.txt index fef80debd8e..20e4b4d70bf 100644 --- a/plugins/LadspaEffect/swh/CMakeLists.txt +++ b/plugins/LadspaEffect/swh/CMakeLists.txt @@ -17,13 +17,6 @@ SET(COMPILE_FLAGS "${COMPILE_FLAGS} ${PIC_FLAGS}") FILE(GLOB XML_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/ladspa/*.xml") LIST(SORT XML_SOURCES) -IF(LMMS_BUILD_APPLE) - # Prefer system perl over Homebrew, MacPorts, etc - SET(PERL_COMMAND "/usr/bin/perl") -ELSE() - SET(PERL_COMMAND "perl") -ENDIF() - FOREACH(_item ${XML_SOURCES}) # Get library name and (soon to be) C file GET_FILENAME_COMPONENT(_plugin "${_item}" NAME_WE) @@ -32,7 +25,7 @@ FOREACH(_item ${XML_SOURCES}) # Coerce XML source file to C ADD_CUSTOM_COMMAND( OUTPUT "${_out_file}" - COMMAND ${PERL_COMMAND} ./makestub.pl "${_item}" > "${_out_file}" + COMMAND ${PERL_EXECUTABLE} ./makestub.pl "${_item}" > "${_out_file}" DEPENDS "${_item}" WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/ladspa" VERBATIM From 91355ae89a4e8f13edc98741b6a9f11ed5b6ac22 Mon Sep 17 00:00:00 2001 From: Tres Finocchiaro Date: Sun, 16 Jul 2023 02:14:25 -0400 Subject: [PATCH 61/87] Don't mandate cmake 3.12 because mingw --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index eb8ccb98e00..2bc0223f1cb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -CMAKE_MINIMUM_REQUIRED(VERSION 3.12) +CMAKE_MINIMUM_REQUIRED(VERSION 3.9) PROJECT(lmms) From 2ac60365c66a1803b355de1b04b0c7d72f2ed4d7 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Sun, 16 Jul 2023 12:13:22 +0530 Subject: [PATCH 62/87] fixed broken unicode symbol in caps/basics.h --- plugins/LadspaEffect/caps/basics.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/LadspaEffect/caps/basics.h b/plugins/LadspaEffect/caps/basics.h index 759f6469023..4a82ae93550 100644 --- a/plugins/LadspaEffect/caps/basics.h +++ b/plugins/LadspaEffect/caps/basics.h @@ -79,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; From 881279092e9de9cdfdc91badb00b7db4b95b7b81 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Sun, 16 Jul 2023 12:14:56 +0530 Subject: [PATCH 63/87] got rid of unnecessary __attribute__(s) --- plugins/LadspaEffect/caps/interface.cc | 6 ------ 1 file changed, 6 deletions(-) diff --git a/plugins/LadspaEffect/caps/interface.cc b/plugins/LadspaEffect/caps/interface.cc index 5786b27917e..aff95f255c0 100644 --- a/plugins/LadspaEffect/caps/interface.cc +++ b/plugins/LadspaEffect/caps/interface.cc @@ -58,9 +58,6 @@ static DescriptorStub * descriptors [N]; extern "C" { -#ifdef __GNUC__ - __attribute__((constructor)) -#endif void caps_so_init() { DescriptorStub ** d = descriptors; @@ -114,9 +111,6 @@ void caps_so_init() assert (d - descriptors == N); } -#ifdef __GNUC__ - __attribute__((destructor)) -#endif void caps_so_fini() { for (ulong i = 0; i < N; ++i) From 0e6d02e6f946faf99b678523cde037f0e7de37ef Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Sun, 16 Jul 2023 12:20:01 +0530 Subject: [PATCH 64/87] updated tap plugins to master --- plugins/LadspaEffect/tap/tap-plugins | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/LadspaEffect/tap/tap-plugins b/plugins/LadspaEffect/tap/tap-plugins index e53e7645b33..85640223047 160000 --- a/plugins/LadspaEffect/tap/tap-plugins +++ b/plugins/LadspaEffect/tap/tap-plugins @@ -1 +1 @@ -Subproject commit e53e7645b3308867a40f3b78f64ca8df36863b8c +Subproject commit 85640223047d49a305e90ba1b92303eb066ba474 From 249b3325531af9d017a2d5fe7d10379b23fb6720 Mon Sep 17 00:00:00 2001 From: Tres Finocchiaro Date: Sun, 16 Jul 2023 10:25:16 -0400 Subject: [PATCH 65/87] Fix older CMake versions --- CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2bc0223f1cb..f12cc6563c8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,10 @@ IF(COMMAND CMAKE_POLICY) ENDIF() CMAKE_POLICY(SET CMP0020 NEW) CMAKE_POLICY(SET CMP0057 NEW) - CMAKE_POLICY(SET CMP0074 NEW) + # TODO: Keep CMP0074 but remove this condition when cmake 3.12+ is guaranteed + IF(${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.12) + CMAKE_POLICY(SET CMP0074 NEW) + ENDIF() ENDIF(COMMAND CMAKE_POLICY) From e9bb1a2fb269fb3386d20cc0743b884e0881d234 Mon Sep 17 00:00:00 2001 From: Tres Finocchiaro Date: Sat, 22 Jul 2023 18:38:20 -0400 Subject: [PATCH 66/87] Update plugins/LadspaEffect/swh/CMakeLists.txt Co-authored-by: Dominic Clark --- plugins/LadspaEffect/swh/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/LadspaEffect/swh/CMakeLists.txt b/plugins/LadspaEffect/swh/CMakeLists.txt index 20e4b4d70bf..a8300117735 100644 --- a/plugins/LadspaEffect/swh/CMakeLists.txt +++ b/plugins/LadspaEffect/swh/CMakeLists.txt @@ -25,7 +25,7 @@ FOREACH(_item ${XML_SOURCES}) # Coerce XML source file to C ADD_CUSTOM_COMMAND( OUTPUT "${_out_file}" - COMMAND ${PERL_EXECUTABLE} ./makestub.pl "${_item}" > "${_out_file}" + COMMAND "${PERL_EXECUTABLE}" ./makestub.pl "${_item}" > "${_out_file}" DEPENDS "${_item}" WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/ladspa" VERBATIM From 5fc18bc33b2bf6a6b1fa1d3be2e78f39d6e03911 Mon Sep 17 00:00:00 2001 From: Tres Finocchiaro Date: Sat, 22 Jul 2023 18:38:43 -0400 Subject: [PATCH 67/87] Update plugins/LadspaEffect/caps/CMakeLists.txt Co-authored-by: Dominic Clark --- plugins/LadspaEffect/caps/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/LadspaEffect/caps/CMakeLists.txt b/plugins/LadspaEffect/caps/CMakeLists.txt index bb7f19152c8..456b2711a50 100644 --- a/plugins/LadspaEffect/caps/CMakeLists.txt +++ b/plugins/LadspaEffect/caps/CMakeLists.txt @@ -10,7 +10,7 @@ SET_TARGET_PROPERTIES(caps PROPERTIES PREFIX "") IF (NOT MSVC) SET_TARGET_PROPERTIES(caps PROPERTIES COMPILE_FLAGS "-O2 -funroll-loops -Wno-write-strings") -ENDIF(NOT MSVC) +ENDIF() IF(LMMS_BUILD_WIN32) add_custom_command( From c24606b399b39b7295e8a3c6aae06df00844fd00 Mon Sep 17 00:00:00 2001 From: Tres Finocchiaro Date: Sun, 23 Jul 2023 15:01:17 -0400 Subject: [PATCH 68/87] Update CMakeLists.txt Co-authored-by: Dominic Clark --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f12cc6563c8..eeb38d66b34 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,7 @@ IF(COMMAND CMAKE_POLICY) CMAKE_POLICY(SET CMP0057 NEW) # TODO: Keep CMP0074 but remove this condition when cmake 3.12+ is guaranteed IF(${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.12) - CMAKE_POLICY(SET CMP0074 NEW) + CMAKE_POLICY(SET CMP0074 NEW) # find_package() uses _ROOT variables ENDIF() ENDIF(COMMAND CMAKE_POLICY) From 02e0664ab1e218caeec7ceec6826cb63e5cc4e02 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Sat, 9 Sep 2023 10:32:02 +0530 Subject: [PATCH 69/87] disabled compiler flags for msvc --- plugins/LadspaEffect/tap/CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/LadspaEffect/tap/CMakeLists.txt b/plugins/LadspaEffect/tap/CMakeLists.txt index 1afa76153ef..4ac78df0a39 100644 --- a/plugins/LadspaEffect/tap/CMakeLists.txt +++ b/plugins/LadspaEffect/tap/CMakeLists.txt @@ -1,7 +1,9 @@ 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 -fomit-frame-pointer -fno-strict-aliasing -funroll-loops -ffast-math") +IF (NOT MSVC) + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -Wno-write-strings -fomit-frame-pointer -fno-strict-aliasing -funroll-loops -ffast-math") +ENDIF() FOREACH(_item ${PLUGIN_SOURCES}) GET_FILENAME_COMPONENT(_plugin "${_item}" NAME_WE) ADD_LIBRARY("${_plugin}" MODULE "${_item}") @@ -24,4 +26,3 @@ FOREACH(_item ${PLUGIN_SOURCES}) TARGET_LINK_LIBRARIES("${_plugin}" m) ENDIF() ENDFOREACH() - From 65b2d673f1439a0656deaf8ebdab53896538ebf7 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Sun, 24 Sep 2023 09:27:36 +0530 Subject: [PATCH 70/87] removed unnecessary cmake policies --- CMakeLists.txt | 9 --------- 1 file changed, 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 96b6f407a84..5559a8e2626 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,15 +8,6 @@ SET(LMMS_SOURCE_DIR ${CMAKE_SOURCE_DIR}) # CMAKE_POLICY Section IF(COMMAND CMAKE_POLICY) - CMAKE_POLICY(SET CMP0005 NEW) - CMAKE_POLICY(SET CMP0003 NEW) - IF (CMAKE_MAJOR_VERSION GREATER 2) - CMAKE_POLICY(SET CMP0026 NEW) - CMAKE_POLICY(SET CMP0045 NEW) - CMAKE_POLICY(SET CMP0050 OLD) - ENDIF() - CMAKE_POLICY(SET CMP0020 NEW) - CMAKE_POLICY(SET CMP0057 NEW) # TODO: Keep CMP0074 but remove this condition when cmake 3.12+ is guaranteed IF(${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.12) CMAKE_POLICY(SET CMP0074 NEW) # find_package() uses _ROOT variables From afc9f29e8ec2dcb32ecf6044bee359b48572a290 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Sun, 24 Sep 2023 09:36:41 +0530 Subject: [PATCH 71/87] attempt fix at build failure at swh if perl missin --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7c3770f318e..fc3fd75399c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -282,6 +282,7 @@ IF(WANT_SWH) SET(LMMS_HAVE_SWH TRUE) SET(STATUS_SWH "OK") ELSE() + SET(LMMS_HAVE_SWH 0) SET(STATUS_SWH "Skipping, perl is missing") ENDIF() ELSE(WANT_SWH) From 09773976803ecfd9be8ccd7e3b2129066d9b10c2 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Sun, 24 Sep 2023 09:36:41 +0530 Subject: [PATCH 72/87] attempt fix at build failure at swh if perl missin --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7c3770f318e..c71ac298dc6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -282,6 +282,7 @@ IF(WANT_SWH) SET(LMMS_HAVE_SWH TRUE) SET(STATUS_SWH "OK") ELSE() + SET(WANT_SWH 0) SET(STATUS_SWH "Skipping, perl is missing") ENDIF() ELSE(WANT_SWH) From a32590162b12e4d09b96b4ad7e62a3c287b750c4 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Sun, 24 Sep 2023 09:43:16 +0530 Subject: [PATCH 73/87] attempt removal of basics.h include --- plugins/LadspaEffect/caps/dsp/Eq.h | 1 - plugins/LadspaEffect/caps/dsp/OnePole.h | 1 - plugins/LadspaEffect/caps/dsp/SVF.h | 1 - plugins/LadspaEffect/caps/dsp/Sine.h | 1 - 4 files changed, 4 deletions(-) diff --git a/plugins/LadspaEffect/caps/dsp/Eq.h b/plugins/LadspaEffect/caps/dsp/Eq.h index 1f3ed5eef84..66a753b466c 100644 --- a/plugins/LadspaEffect/caps/dsp/Eq.h +++ b/plugins/LadspaEffect/caps/dsp/Eq.h @@ -27,7 +27,6 @@ */ -#include "../basics.h" #ifndef _DSP_EQ_H_ #define _DSP_EQ_H_ diff --git a/plugins/LadspaEffect/caps/dsp/OnePole.h b/plugins/LadspaEffect/caps/dsp/OnePole.h index a53ec9fc8f9..f924edb61c5 100644 --- a/plugins/LadspaEffect/caps/dsp/OnePole.h +++ b/plugins/LadspaEffect/caps/dsp/OnePole.h @@ -25,7 +25,6 @@ 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 index fe49643a93b..f2cd0af54ba 100644 --- a/plugins/LadspaEffect/caps/dsp/SVF.h +++ b/plugins/LadspaEffect/caps/dsp/SVF.h @@ -70,7 +70,6 @@ } */ -#include "../basics.h" #ifndef _DSP_SVF_H_ #define _DSP_SVF_H_ diff --git a/plugins/LadspaEffect/caps/dsp/Sine.h b/plugins/LadspaEffect/caps/dsp/Sine.h index 47477334e99..c9cd4dfba5e 100644 --- a/plugins/LadspaEffect/caps/dsp/Sine.h +++ b/plugins/LadspaEffect/caps/dsp/Sine.h @@ -25,7 +25,6 @@ 02111-1307, USA or point your web browser to http://www.gnu.org. */ -#include "../basics.h" #ifndef _DSP_SINE_H_ #define _DSP_SINE_H_ From fc670dd63ae1a4aa63712b9832cc4587ece4c9ae Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Thu, 28 Sep 2023 11:57:19 +0530 Subject: [PATCH 74/87] whitespace changes --- plugins/LadspaEffect/caps/CMakeLists.txt | 2 +- plugins/LadspaEffect/caps/dsp/Eq.h | 2 -- plugins/LadspaEffect/caps/dsp/OnePole.h | 1 - plugins/LadspaEffect/caps/dsp/Sine.h | 1 - plugins/LadspaEffect/tap/CMakeLists.txt | 2 +- 5 files changed, 2 insertions(+), 6 deletions(-) diff --git a/plugins/LadspaEffect/caps/CMakeLists.txt b/plugins/LadspaEffect/caps/CMakeLists.txt index 456b2711a50..69480c32c46 100644 --- a/plugins/LadspaEffect/caps/CMakeLists.txt +++ b/plugins/LadspaEffect/caps/CMakeLists.txt @@ -8,7 +8,7 @@ ADD_DEFINITIONS(-DLMMS_BUILD_WIN64) ENDIF(LMMS_BUILD_WIN64) SET_TARGET_PROPERTIES(caps PROPERTIES PREFIX "") -IF (NOT MSVC) +IF(NOT MSVC) SET_TARGET_PROPERTIES(caps PROPERTIES COMPILE_FLAGS "-O2 -funroll-loops -Wno-write-strings") ENDIF() diff --git a/plugins/LadspaEffect/caps/dsp/Eq.h b/plugins/LadspaEffect/caps/dsp/Eq.h index 66a753b466c..b3a632071e0 100644 --- a/plugins/LadspaEffect/caps/dsp/Eq.h +++ b/plugins/LadspaEffect/caps/dsp/Eq.h @@ -27,10 +27,8 @@ */ - #ifndef _DSP_EQ_H_ #define _DSP_EQ_H_ - namespace DSP { /* A single bandpass as used by the Eq, expressed as a biquad. Like all diff --git a/plugins/LadspaEffect/caps/dsp/OnePole.h b/plugins/LadspaEffect/caps/dsp/OnePole.h index f924edb61c5..9a317805321 100644 --- a/plugins/LadspaEffect/caps/dsp/OnePole.h +++ b/plugins/LadspaEffect/caps/dsp/OnePole.h @@ -25,7 +25,6 @@ 02111-1307, USA or point your web browser to http://www.gnu.org. */ - #ifndef _ONE_POLE_H_ #define _ONE_POLE_H_ diff --git a/plugins/LadspaEffect/caps/dsp/Sine.h b/plugins/LadspaEffect/caps/dsp/Sine.h index c9cd4dfba5e..43e5f06e03c 100644 --- a/plugins/LadspaEffect/caps/dsp/Sine.h +++ b/plugins/LadspaEffect/caps/dsp/Sine.h @@ -25,7 +25,6 @@ 02111-1307, USA or point your web browser to http://www.gnu.org. */ - #ifndef _DSP_SINE_H_ #define _DSP_SINE_H_ diff --git a/plugins/LadspaEffect/tap/CMakeLists.txt b/plugins/LadspaEffect/tap/CMakeLists.txt index 4ac78df0a39..784b33e0516 100644 --- 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) -IF (NOT MSVC) +IF(NOT MSVC) SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -Wno-write-strings -fomit-frame-pointer -fno-strict-aliasing -funroll-loops -ffast-math") ENDIF() FOREACH(_item ${PLUGIN_SOURCES}) From 5991604af46b0ed4469ceccdfb5a05cb6997482a Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Thu, 28 Sep 2023 11:59:53 +0530 Subject: [PATCH 75/87] missed this change --- plugins/LadspaEffect/caps/dsp/SVF.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/plugins/LadspaEffect/caps/dsp/SVF.h b/plugins/LadspaEffect/caps/dsp/SVF.h index f2cd0af54ba..ccd5734ab3f 100644 --- a/plugins/LadspaEffect/caps/dsp/SVF.h +++ b/plugins/LadspaEffect/caps/dsp/SVF.h @@ -70,11 +70,9 @@ } */ - #ifndef _DSP_SVF_H_ #define _DSP_SVF_H_ - namespace DSP { template From 944d1e7564c887da5528d15ab4c074433ef53d0c Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Thu, 28 Sep 2023 12:04:06 +0530 Subject: [PATCH 76/87] reverted unnecessary set swh change --- CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 420f0bb97ce..0b6d3b4ff82 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -285,7 +285,6 @@ IF(WANT_SWH) SET(LMMS_HAVE_SWH TRUE) SET(STATUS_SWH "OK") ELSE() - SET(LMMS_HAVE_SWH 0) SET(STATUS_SWH "Skipping, perl is missing") ENDIF() ELSE(WANT_SWH) From 0ce1b4b6a34d464678569cbfdb126423047c9bed Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Thu, 28 Sep 2023 20:58:25 +0530 Subject: [PATCH 77/87] additional whitespace change which missed previous --- plugins/LadspaEffect/caps/dsp/Eq.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/LadspaEffect/caps/dsp/Eq.h b/plugins/LadspaEffect/caps/dsp/Eq.h index b3a632071e0..89c86dd18ff 100644 --- a/plugins/LadspaEffect/caps/dsp/Eq.h +++ b/plugins/LadspaEffect/caps/dsp/Eq.h @@ -26,9 +26,9 @@ 02111-1307, USA or point your web browser to http://www.gnu.org. */ - #ifndef _DSP_EQ_H_ #define _DSP_EQ_H_ + namespace DSP { /* A single bandpass as used by the Eq, expressed as a biquad. Like all From 7b367b9a91c7d511ce65f669e94603888f6b1af0 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Thu, 28 Sep 2023 20:59:42 +0530 Subject: [PATCH 78/87] attempt fix at x in basics.h --- plugins/LadspaEffect/caps/basics.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/LadspaEffect/caps/basics.h b/plugins/LadspaEffect/caps/basics.h index 4a82ae93550..e61d1153d89 100644 --- a/plugins/LadspaEffect/caps/basics.h +++ b/plugins/LadspaEffect/caps/basics.h @@ -79,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; From 4884e5850f34629257d2a96572fb8f3c6332d80f Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Thu, 28 Sep 2023 21:06:38 +0530 Subject: [PATCH 79/87] used lowercase x instead to fix broken utf char. --- plugins/LadspaEffect/caps/basics.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/LadspaEffect/caps/basics.h b/plugins/LadspaEffect/caps/basics.h index e61d1153d89..c8da0bb950f 100644 --- a/plugins/LadspaEffect/caps/basics.h +++ b/plugins/LadspaEffect/caps/basics.h @@ -79,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.18x10-38 */ #define NOISE_FLOOR .00000000000005 /* -266 dB */ typedef int8_t int8; From 66d5ed2af0eef8947b4b4e3d306bb78095ab3b2d Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Thu, 28 Sep 2023 21:23:40 +0530 Subject: [PATCH 80/87] Revert "added caps init condition" This reverts commit dd89d21a6635f7ead353e766f093672fa7247a06. --- plugins/LadspaEffect/caps/interface.cc | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/plugins/LadspaEffect/caps/interface.cc b/plugins/LadspaEffect/caps/interface.cc index aff95f255c0..d83de58df8a 100644 --- a/plugins/LadspaEffect/caps/interface.cc +++ b/plugins/LadspaEffect/caps/interface.cc @@ -29,6 +29,8 @@ (2541 - 2580 donated to artemio@kdemail.net) */ +// #include + #include "basics.h" #include "Cabinet.h" @@ -56,6 +58,15 @@ #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" { void caps_so_init() @@ -130,10 +141,4 @@ ladspa_descriptor (unsigned long i) return 0; } -struct CapsSoInit { - CapsSoInit() { caps_so_init(); } - ~CapsSoInit() { caps_so_fini(); } -}; -static CapsSoInit capsSoInit; - }; /* extern "C" */ From 8deca2c22e8b8347baa033c21cb7dc8aa8d540a8 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Thu, 28 Sep 2023 21:24:58 +0530 Subject: [PATCH 81/87] added caps struct initialisation --- plugins/LadspaEffect/caps/interface.cc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/plugins/LadspaEffect/caps/interface.cc b/plugins/LadspaEffect/caps/interface.cc index d83de58df8a..869179565ac 100644 --- a/plugins/LadspaEffect/caps/interface.cc +++ b/plugins/LadspaEffect/caps/interface.cc @@ -141,4 +141,10 @@ ladspa_descriptor (unsigned long i) return 0; } +struct CapsSoInit { + CapsSoInit() { caps_so_init(); } + ~CapsSoInit() { caps_so_fini(); } +}; +static CapsSoInit capsSoInit; + }; /* extern "C" */ From c347127e1afd8df0b045c8ab3c1a37860a4c9945 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Thu, 28 Sep 2023 21:25:43 +0530 Subject: [PATCH 82/87] comment --- plugins/LadspaEffect/caps/interface.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/LadspaEffect/caps/interface.cc b/plugins/LadspaEffect/caps/interface.cc index 869179565ac..729561a86a5 100644 --- a/plugins/LadspaEffect/caps/interface.cc +++ b/plugins/LadspaEffect/caps/interface.cc @@ -29,7 +29,7 @@ (2541 - 2580 donated to artemio@kdemail.net) */ -// #include +// #include this header is unnecessary and breaks msvc #include "basics.h" From 825eb4eb8e5196a6d4357242f815abfbe4adf268 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Thu, 28 Sep 2023 21:27:44 +0530 Subject: [PATCH 83/87] readded the seed() and formattings --- plugins/LadspaEffect/caps/interface.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/LadspaEffect/caps/interface.cc b/plugins/LadspaEffect/caps/interface.cc index 729561a86a5..f26a3660fbb 100644 --- a/plugins/LadspaEffect/caps/interface.cc +++ b/plugins/LadspaEffect/caps/interface.cc @@ -122,6 +122,7 @@ void caps_so_init() assert (d - descriptors == N); } + //seed(); void caps_so_fini() { for (ulong i = 0; i < N; ++i) From 8bcc08993a7700aba96bc585cad4690ee60091ec Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Thu, 28 Sep 2023 21:30:16 +0530 Subject: [PATCH 84/87] fixed seed formatting again --- plugins/LadspaEffect/caps/interface.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/LadspaEffect/caps/interface.cc b/plugins/LadspaEffect/caps/interface.cc index f26a3660fbb..75aec6d4c57 100644 --- a/plugins/LadspaEffect/caps/interface.cc +++ b/plugins/LadspaEffect/caps/interface.cc @@ -120,9 +120,10 @@ void caps_so_init() /* make sure N is correct */ assert (d - descriptors == N); + + //seed(); } - //seed(); void caps_so_fini() { for (ulong i = 0; i < N; ++i) From 9f69a8a1a0ca510fada33f4de32bdd31f5977f49 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Thu, 28 Sep 2023 21:31:14 +0530 Subject: [PATCH 85/87] redundant tabspace --- plugins/LadspaEffect/caps/interface.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/LadspaEffect/caps/interface.cc b/plugins/LadspaEffect/caps/interface.cc index 75aec6d4c57..5259bfa37b9 100644 --- a/plugins/LadspaEffect/caps/interface.cc +++ b/plugins/LadspaEffect/caps/interface.cc @@ -120,7 +120,7 @@ void caps_so_init() /* make sure N is correct */ assert (d - descriptors == N); - + //seed(); } From 3d7d8524d83b25f9dd5eab8e8d2f674f921ceacf Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Sat, 30 Sep 2023 09:34:20 +0530 Subject: [PATCH 86/87] fixed ambiguous comment in interface.cc --- plugins/LadspaEffect/caps/interface.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/LadspaEffect/caps/interface.cc b/plugins/LadspaEffect/caps/interface.cc index 5259bfa37b9..00e0a4fdbc8 100644 --- a/plugins/LadspaEffect/caps/interface.cc +++ b/plugins/LadspaEffect/caps/interface.cc @@ -29,7 +29,7 @@ (2541 - 2580 donated to artemio@kdemail.net) */ -// #include this header is unnecessary and breaks msvc +// #include needed if using the commented seed function #include "basics.h" From 06b945fb1b739c7510beb48403509a9a303cda9c Mon Sep 17 00:00:00 2001 From: dan-giddins Date: Mon, 6 Nov 2023 15:59:02 +0000 Subject: [PATCH 87/87] Update CMakeLists.txt --- plugins/LadspaEffect/tap/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/LadspaEffect/tap/CMakeLists.txt b/plugins/LadspaEffect/tap/CMakeLists.txt index 9640c5e41ad..1afa76153ef 100644 --- a/plugins/LadspaEffect/tap/CMakeLists.txt +++ b/plugins/LadspaEffect/tap/CMakeLists.txt @@ -24,3 +24,4 @@ FOREACH(_item ${PLUGIN_SOURCES}) TARGET_LINK_LIBRARIES("${_plugin}" m) ENDIF() ENDFOREACH() +