mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2025-02-11 18:40:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed macOS (and probably Linux) compile.

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/contrib/alsaout/AlsaOut.h
View File

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

12
src/contrib/alsaout/alsaout_plugin.cpp
View File

@ -33,10 +33,22 @@
//////////////////////////////////////////////////////////////////////////////
#include "pch.h"
#include <core/sdk/constants.h>
#include <core/sdk/IPlugin.h>
#include <core/sdk/IOutput.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() {
return new AlsaOut();
}

4
src/contrib/coreaudioout/CoreAudioOut.h
View File

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

21
src/contrib/coreaudioout/coreaudioout_plugin.cpp
View File

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

4
src/contrib/pulseout/PulseOut.h
View File

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

14
src/contrib/pulseout/pulseout_plugin.cpp
View File

@ -33,12 +33,24 @@
//////////////////////////////////////////////////////////////////////////////
#include "pch.h"
#include <core/sdk/constants.h>
#include <core/sdk/IPlugin.h>
#include <core/sdk/IOutput.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() {
return new PulseOut();
return new PulsePlugin();
}
extern "C" musik::core::sdk::IOutput* GetAudioOutput() {

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

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