Fixed macOS (and probably Linux) compile.

This commit is contained in:
Casey Langen 2017-01-02 00:15:00 -08:00
parent cb4156dbac
commit e1bcd3b0f2
7 changed files with 42 additions and 18 deletions

View File

@ -49,9 +49,7 @@ class AlsaOut : public musik::core::sdk::IOutput {
virtual ~AlsaOut(); virtual ~AlsaOut();
/* IPlugin */ /* IPlugin */
virtual const char* Name() { return "AlsaOut IOutput"; } virtual const char* Name() { return "AlsaOut"; }
virtual const char* Version() { return "0.3"; }
virtual const char* Author() { return "Julian Cromarty, clangen"; }
/* IOutput */ /* IOutput */
virtual void Destroy(); virtual void Destroy();

View File

@ -33,10 +33,22 @@
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
#include "pch.h" #include "pch.h"
#include <core/sdk/constants.h>
#include <core/sdk/IPlugin.h> #include <core/sdk/IPlugin.h>
#include <core/sdk/IOutput.h> #include <core/sdk/IOutput.h>
#include "AlsaOut.h" #include "AlsaOut.h"
class PulsePlugin : public musik::core::sdk::IPlugin {
public:
virtual void Destroy() { delete this; }
virtual const char* Name() { return "AlsaOut IOutput"; }
virtual const char* Version() { return "0.3"; }
virtual const char* Author() { return "Julian Cromarty, clangen"; }
virtual int SdkVersion() { return musik::core::sdk::SdkVersion; }
};
extern "C" musik::core::sdk::IPlugin* GetPlugin() { extern "C" musik::core::sdk::IPlugin* GetPlugin() {
return new AlsaOut(); return new AlsaOut();
} }

View File

@ -55,9 +55,7 @@ class CoreAudioOut : public musik::core::sdk::IOutput {
virtual ~CoreAudioOut(); virtual ~CoreAudioOut();
/* IPlugin */ /* IPlugin */
const char* Name() { return "CoreAudio IOutput"; }; virtual const char* Name() { return "CoreAudio"; }
const char* Version() { return "0.3"; };
const char* Author() { return "clangen"; };
/* IOutput */ /* IOutput */
virtual void Destroy(); virtual void Destroy();

View File

@ -32,20 +32,25 @@
// //
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
#include <core/sdk/constants.h>
#include <core/sdk/IPlugin.h> #include <core/sdk/IPlugin.h>
#include <core/sdk/IOutput.h> #include <core/sdk/IOutput.h>
#include "CoreAudioOut.h" #include "CoreAudioOut.h"
#ifdef WIN32 class CoreAudioPlugin : public musik::core::sdk::IPlugin {
#define DLLEXPORT __declspec(dllexport) public:
#else virtual void Destroy() { delete this; }
#define DLLEXPORT virtual const char* Name() { return "CoreAudio IOutput"; }
#endif virtual const char* Version() { return "0.3"; }
virtual const char* Author() { return "clangen"; }
virtual int SdkVersion() { return musik::core::sdk::SdkVersion; }
};
extern "C" DLLEXPORT musik::core::sdk::IPlugin* GetPlugin() { extern "C" musik::core::sdk::IPlugin* GetPlugin() {
return new CoreAudioOut(); return new CoreAudioPlugin();
} }
extern "C" DLLEXPORT musik::core::sdk::IOutput* GetAudioOutput() { extern "C" musik::core::sdk::IOutput* GetAudioOutput() {
return new CoreAudioOut(); return new CoreAudioOut();
} }

View File

@ -45,9 +45,7 @@ class PulseOut : public musik::core::sdk::IOutput {
virtual ~PulseOut(); virtual ~PulseOut();
/* IPlugin */ /* IPlugin */
virtual const char* Name() { return "PulseAudio IOutput"; } virtual const char* Name() { return "PulseAudio"; }
virtual const char* Version() { return "0.3"; }
virtual const char* Author() { return "clangen"; }
/* IOutput */ /* IOutput */
virtual void Destroy(); virtual void Destroy();

View File

@ -33,12 +33,24 @@
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
#include "pch.h" #include "pch.h"
#include <core/sdk/constants.h>
#include <core/sdk/IPlugin.h> #include <core/sdk/IPlugin.h>
#include <core/sdk/IOutput.h> #include <core/sdk/IOutput.h>
#include "PulseOut.h" #include "PulseOut.h"
class PulsePlugin : public musik::core::sdk::IPlugin {
public:
virtual void Destroy() { delete this; }
virtual const char* Name() { return "PulseAudio IOutput"; }
virtual const char* Version() { return "0.3"; }
virtual const char* Author() { return "clangen"; }
virtual int SdkVersion() { return musik::core::sdk::SdkVersion; }
};
extern "C" musik::core::sdk::IPlugin* GetPlugin() { extern "C" musik::core::sdk::IPlugin* GetPlugin() {
return new PulseOut(); return new PulsePlugin();
} }
extern "C" musik::core::sdk::IOutput* GetAudioOutput() { extern "C" musik::core::sdk::IOutput* GetAudioOutput() {

View File

@ -164,6 +164,7 @@ void PluginFactory::LoadPlugins() {
} }
else { else {
dlclose(dll); dlclose(dll);
}
} }
else { else {
dlclose(dll); dlclose(dll);