|
Line
Link Here
|
| 0 |
-- a/lib-src/libnyquist/nyquist/nyqstk/include/Stk.h |
0 |
++ b/lib-src/libnyquist/nyquist/nyqstk/include/Stk.h |
|
Lines 46-52
typedef uint64_t uintmax_t;
Link Here
|
| 46 |
*/ |
46 |
*/ |
| 47 |
#endif |
47 |
#endif |
| 48 |
|
48 |
|
| 49 |
#include <stddef.h> |
49 |
#include <cstddef> |
|
|
50 |
#include <cstdint> |
| 50 |
#include <string> |
51 |
#include <string> |
| 51 |
#include <iostream> |
52 |
#include <iostream> |
| 52 |
#include <sstream> |
53 |
#include <sstream> |
|
Lines 355-364
Link Here
|
| 355 |
typedef signed int SINT32; |
356 |
typedef signed int SINT32; |
| 356 |
typedef float FLOAT32; |
357 |
typedef float FLOAT32; |
| 357 |
typedef double FLOAT64; |
358 |
typedef double FLOAT64; |
| 358 |
// added by RBD |
|
|
| 359 |
#ifdef __linux__ |
| 360 |
#define intptr_t long |
| 361 |
#endif |
| 362 |
|
359 |
|
| 363 |
// The default sampling rate. |
360 |
// The default sampling rate. |
| 364 |
const StkFloat SRATE = 44100.0; |
361 |
const StkFloat SRATE = 44100.0; |
| 365 |
-- a/src/effects/LoadEffects.cpp |
362 |
++ b/src/effects/LoadEffects.cpp |
|
Lines 154-162
void BuiltinEffectsModule::AutoRegisterPlugins(PluginManagerInterface & pm)
Link Here
|
| 154 |
if (rediscoverAll || |
154 |
if (rediscoverAll || |
| 155 |
!pm.IsPluginRegistered(path, &pair.second->name.Msgid()) |
155 |
!pm.IsPluginRegistered(path, &pair.second->name.Msgid()) |
| 156 |
){ |
156 |
){ |
| 157 |
DiscoverPluginsAtPath(path, ignoredErrMsg, [&](PluginProvider *provider, ComponentInterface *ident) |
157 |
DiscoverPluginsAtPath(path, ignoredErrMsg, [&](PluginProvider *provider, ComponentInterface *ident) -> const PluginID& |
| 158 |
{ |
158 |
{ |
| 159 |
const auto pluginId = PluginManagerInterface::DefaultRegistrationCallback(provider, ident); |
159 |
const auto& pluginId = PluginManagerInterface::DefaultRegistrationCallback(provider, ident); |
| 160 |
if(pair.second->excluded) |
160 |
if(pair.second->excluded) |
| 161 |
PluginManager::Get().EnablePlugin(pluginId, false); |
161 |
PluginManager::Get().EnablePlugin(pluginId, false); |
| 162 |
return pluginId; |
162 |
return pluginId; |
| 163 |
-- a/libraries/lib-module-manager/PluginHost.cpp |
163 |
++ b/libraries/lib-module-manager/PluginHost.cpp |
|
Lines 37-47
namespace
Link Here
|
| 37 |
TranslatableString errorMessage{}; |
37 |
TranslatableString errorMessage{}; |
| 38 |
auto validator = provider->MakeValidator(); |
38 |
auto validator = provider->MakeValidator(); |
| 39 |
auto numPlugins = provider->DiscoverPluginsAtPath( |
39 |
auto numPlugins = provider->DiscoverPluginsAtPath( |
| 40 |
pluginPath, errorMessage, [&](PluginProvider *provider, ComponentInterface *ident) |
40 |
pluginPath, errorMessage, [&](PluginProvider *provider, ComponentInterface *ident) -> const PluginID& |
| 41 |
{ |
41 |
{ |
| 42 |
//Workaround: use DefaultRegistrationCallback to create all descriptors for us |
42 |
//Workaround: use DefaultRegistrationCallback to create all descriptors for us |
| 43 |
//and then put a copy into result |
43 |
//and then put a copy into result |
| 44 |
auto id = PluginManager::DefaultRegistrationCallback(provider, ident); |
44 |
auto& id = PluginManager::DefaultRegistrationCallback(provider, ident); |
| 45 |
if(const auto ptr = PluginManager::Get().GetPlugin(id)) |
45 |
if(const auto ptr = PluginManager::Get().GetPlugin(id)) |
| 46 |
{ |
46 |
{ |
| 47 |
auto desc = *ptr; |
47 |
auto desc = *ptr; |
