Fix more build errors

LMMS · Nov 7, 2024 · 1b3b091 · 1b3b091
1 parent 0dec314
commit 1b3b091
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 14 deletions.
diff --git a/include/ClapAudioPorts.h b/include/ClapAudioPorts.h
@@ -47,7 +47,7 @@ namespace lmms
 class ClapAudioBuffer
 {
 public:
-	ClapAudioBuffer(std::uint32_t channels, std::uint32_t frames)
+	ClapAudioBuffer(std::uint32_t channels, fpp_t frames)
 		: m_channels{channels}
 		, m_frames{frames}
 	{
@@ -99,7 +99,7 @@ class ClapAudioBuffer
 	}
 
 	std::uint32_t m_channels;
-	std::uint32_t m_frames;
+	fpp_t m_frames;
 	float** m_data = nullptr;
 };
 

diff --git a/include/ClapExtension.h b/include/ClapExtension.h
@@ -32,6 +32,7 @@
 #include <string_view>
 #include <clap/plugin.h>
 
+#include "lmms_export.h"
 #include "NoCopyNoMove.h"
 
 namespace lmms
@@ -43,7 +44,7 @@ class ClapLog;
 namespace detail
 {
 
-class ClapExtensionHelper : public NoCopyNoMove
+class LMMS_EXPORT ClapExtensionHelper : public NoCopyNoMove
 {
 public:
 	ClapExtensionHelper(ClapInstance* instance)
@@ -109,7 +110,7 @@ class ClapExtensionHelper : public NoCopyNoMove
  * Template for extensions with both a host and plugin side
  */
 template<class HostExt, class PluginExt = void>
-class ClapExtension : public detail::ClapExtensionHelper
+class LMMS_EXPORT ClapExtension : public detail::ClapExtensionHelper
 {
 public:
 	using detail::ClapExtensionHelper::ClapExtensionHelper;
@@ -219,7 +220,7 @@ class ClapExtension : public detail::ClapExtensionHelper
  * Template for host-only extensions
 */
 template<class HostExt>
-class ClapExtension<HostExt, void> : public detail::ClapExtensionHelper
+class LMMS_EXPORT ClapExtension<HostExt, void> : public detail::ClapExtensionHelper
 {
 public:
 	using detail::ClapExtensionHelper::ClapExtensionHelper;

diff --git a/plugins/ClapEffect/ClapEffect.cpp b/plugins/ClapEffect/ClapEffect.cpp
@@ -105,8 +105,6 @@ auto ClapEffect::processImpl(SampleFrame* buf, const fpp_t frames) -> ProcessSta
 	{
 		buf[f][0] = dry * buf[f][0] + wet * leftSamples[f][0];
 		buf[f][1] = dry * buf[f][1] + wet * rightSamples[f][1];
-		auto left = static_cast<double>(buf[f][0]);
-		auto right = static_cast<double>(buf[f][1]);
 	}
 
 	return ProcessStatus::ContinueIfNotQuiet;

diff --git a/src/core/clap/ClapInstance.cpp b/src/core/clap/ClapInstance.cpp
@@ -31,12 +31,7 @@
 #include <QDomElement>
 #include <algorithm>
 #include <cassert>
-
-#ifdef __MINGW32__
-#include <mingw.thread.h>
-#else
 #include <thread>
-#endif
 
 #include "AudioEngine.h"
 #include "ClapManager.h"

diff --git a/src/core/clap/ClapManager.cpp b/src/core/clap/ClapManager.cpp
@@ -214,8 +214,8 @@ void ClapManager::loadClapFiles(const UniquePaths& searchPaths)
 	const auto startTime = std::chrono::steady_clock::now();
 
 	// Search `searchPaths` for files (or macOS bundles) with ".clap" extension
-	int totalClapFiles = 0;
-	int totalPlugins = 0;
+	std::size_t totalClapFiles = 0;
+	std::size_t totalPlugins = 0;
 	for (const auto& path : searchPaths)
 	{
 		for (const auto& entry : std::filesystem::recursive_directory_iterator{path})