mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2024-10-02 04:52:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed macOS/clang compile.

Browse Source
This commit is contained in:
Casey Langen 2017-02-14 21:03:48 -08:00
parent 9c6e136c79
commit 6f38f2585f
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/plugin/PluginFactory.cpp
View File

@ -53,7 +53,7 @@ typedef musik::core::sdk::IPlugin* STDCALL(CallGetPlugin);
static void closeNativeHandle(void* dll) { FreeLibrary((HMODULE)dll); }
#else
typedef musik::core::sdk::IPlugin* (*CallGetPlugin)();
static void closeNativeHandle(void* dll) { dclose(dll); }
static void closeNativeHandle(void* dll) { dlclose(dll); }
#endif
PluginFactory& PluginFactory::Instance() {

14
src/core/plugin/PluginFactory.h
View File

@ -71,7 +71,7 @@ namespace musik { namespace core {
};
template <class T, class D> void QueryInterface(
const char* functionName,
const std::string& functionName,
std::function<void(std::shared_ptr<T>, const std::string&)> handler)
{
std::unique_lock<std::mutex> lock(this->mutex);
@ -82,9 +82,9 @@ namespace musik { namespace core {
if (functionName == "GetPlugin" || prefs->GetBool(descriptor->key.c_str(), true)) { /* enabled */
PluginInterfaceCall funcPtr =
#ifdef WIN32
(PluginInterfaceCall) GetProcAddress((HMODULE)(descriptor->nativeHandle), functionName);
(PluginInterfaceCall) GetProcAddress((HMODULE)(descriptor->nativeHandle), functionName.c_str());
#else
(PluginInterfaceCall)dlsym(descriptor->nativeHandle, functionName);
(PluginInterfaceCall)dlsym(descriptor->nativeHandle, functionName.c_str());
#endif
if (funcPtr) {
T* result = funcPtr();
@ -97,7 +97,7 @@ namespace musik { namespace core {
}
}
template <class T, class D> std::vector<std::shared_ptr<T> > QueryInterface(const char* functionName) {
template <class T, class D> std::vector<std::shared_ptr<T> > QueryInterface(const std::string& functionName) {
std::vector<std::shared_ptr<T> > plugins;
QueryInterface<T, D>(
@ -110,7 +110,7 @@ namespace musik { namespace core {
}
template <class T> void QueryFunction(
const char* functionName,
const std::string& functionName,
std::function<void(musik::core::sdk::IPlugin*, T)> handler)
{
std::unique_lock<std::mutex> lock(this->mutex);
@ -119,9 +119,9 @@ namespace musik { namespace core {
if (prefs->GetBool(descriptor->key.c_str(), true)) { /* if enabled by prefs */
T funcPtr =
#ifdef WIN32
(T) GetProcAddress((HMODULE)(descriptor->nativeHandle), functionName);
(T) GetProcAddress((HMODULE)(descriptor->nativeHandle), functionName.c_str());
#else
(T)dlsym(descriptor->nativeHandle, functionName);
(T)dlsym(descriptor->nativeHandle, functionName.c_str());
#endif
if (funcPtr) {
handler(descriptor->plugin, funcPtr);