mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2025-01-30 06:32:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added some missing exported symbols.

Browse Source
This commit is contained in:
casey langen 2023-01-10 20:28:10 -08:00
parent 57f43057c9
commit fdd5a5bbb7
14 changed files with 149 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/musikcore/audio/Buffer.h
View File

@ -71,7 +71,7 @@ namespace musik { namespace core { namespace audio {
EXPORT void CopyFormat(Buffer* fromBuffer) noexcept;
private:
void ResizeBuffer();
EXPORT void ResizeBuffer();
float *buffer;
long samples;

6
src/musikcore/audio/Crossfader.h
View File

@ -75,12 +75,12 @@ namespace musik { namespace core { namespace audio {
EXPORT void Drain();
private:
void ThreadLoop();
EXPORT void ThreadLoop();
virtual void ProcessMessage(
EXPORT virtual void ProcessMessage(
musik::core::runtime::IMessage &message);
virtual void OnPlayerDestroying(musik::core::audio::Player* player);
EXPORT virtual void OnPlayerDestroying(musik::core::audio::Player* player);
struct FadeContext {
std::shared_ptr<musik::core::sdk::IOutput> output;

8
src/musikcore/config.h
View File

@ -42,9 +42,13 @@
#include <musikcore/support/NarrowCast.h>
#include <musikcore/support/DeleteDefaults.h>
#ifndef mcsdk_export
#ifndef EXPORT
#ifdef WIN32
#define EXPORT __declspec(dllexport)
#ifdef EXPORT_SYMBOLS
#define EXPORT __declspec(dllexport)
#else
#define EXPORT __declspec(dllimport)
#endif
#else
#define EXPORT
#endif

2
src/musikcore/i18n/Locale.h
View File

@ -70,7 +70,7 @@ namespace musik { namespace core { namespace i18n {
private:
DELETE_COPY_AND_ASSIGNMENT_DEFAULTS(Locale)
Locale() noexcept;
EXPORT Locale() noexcept;
std::vector<std::string> locales;
std::shared_ptr<musik::core::Preferences> prefs;

2
src/musikcore/library/query/AlbumListQuery.h
View File

@ -44,7 +44,7 @@ namespace musik { namespace core { namespace library { namespace query {
class AlbumListQuery : public musik::core::library::query::QueryBase {
public:
EXPORT static const std::string kQueryName;
static EXPORT const std::string kQueryName;
DELETE_COPY_AND_ASSIGNMENT_DEFAULTS(AlbumListQuery)

2
src/musikcore/library/query/util/SdkWrappers.h
View File

@ -151,7 +151,7 @@ namespace musik { namespace core { namespace library { namespace query {
}
template <typename T>
EXPORT std::vector<T> Map(std::function<T(const SdkValue::Shared&)> fun) const {
std::vector<T> Map(std::function<T(const SdkValue::Shared&)> fun) const {
std::vector<T> result;
for (size_t i = 0; i < values->size(); i++) {
result.push_back(fun(values->at(i)));

2
src/musikcore/library/query/util/Serialization.h
View File

@ -93,7 +93,7 @@ namespace musik { namespace core { namespace library { namespace query {
const musik::core::sdk::ITrackList& input);
template <typename SetType, typename DataType>
EXPORT void JsonArrayToSet(const nlohmann::json& input, SetType& output) {
void JsonArrayToSet(const nlohmann::json& input, SetType& output) {
for (auto& value : input) {
output.insert(value.get<DataType>());
}

58
src/musikcore/library/track/IndexerTrack.h
View File

@ -44,45 +44,45 @@ namespace musik { namespace core {
class IndexerTrack: public Track {
public:
IndexerTrack(int64_t trackId);
virtual ~IndexerTrack();
EXPORT IndexerTrack(int64_t trackId);
EXPORT virtual ~IndexerTrack();
/* ITagStore */
void SetValue(const char* metakey, const char* value) override;
void ClearValue(const char* metakey) override;
bool Contains(const char* metakey) override;
void SetThumbnail(const char *data, long size) override;
bool ContainsThumbnail() override;
void SetReplayGain(const musik::core::sdk::ReplayGain& replayGain) override;
EXPORT void SetValue(const char* metakey, const char* value) override;
EXPORT void ClearValue(const char* metakey) override;
EXPORT bool Contains(const char* metakey) override;
EXPORT void SetThumbnail(const char *data, long size) override;
EXPORT bool ContainsThumbnail() override;
EXPORT void SetReplayGain(const musik::core::sdk::ReplayGain& replayGain) override;
/* ITrack */
std::string GetString(const char* metakey) override;
int GetString(const char* key, char* dst, int size) override;
long long GetInt64(const char* key, long long defaultValue = 0LL) override;
int GetInt32(const char* key, unsigned int defaultValue = 0) override;
double GetDouble(const char* key, double defaultValue = 0.0f) override;
std::string Uri() override;
int Uri(char* dst, int size) override;
musik::core::sdk::ReplayGain GetReplayGain() override;
musik::core::sdk::MetadataState GetMetadataState() override;
EXPORT std::string GetString(const char* metakey) override;
EXPORT int GetString(const char* key, char* dst, int size) override;
EXPORT long long GetInt64(const char* key, long long defaultValue = 0LL) override;
EXPORT int GetInt32(const char* key, unsigned int defaultValue = 0) override;
EXPORT double GetDouble(const char* key, double defaultValue = 0.0f) override;
EXPORT std::string Uri() override;
EXPORT int Uri(char* dst, int size) override;
EXPORT musik::core::sdk::ReplayGain GetReplayGain() override;
EXPORT musik::core::sdk::MetadataState GetMetadataState() override;
MetadataIteratorRange GetValues(const char* metakey) override;
MetadataIteratorRange GetAllValues() override;
TrackPtr Copy() override;
int64_t GetId() override;
void SetId(int64_t trackId) noexcept override { this->trackId = trackId; }
void SetMetadataState(musik::core::sdk::MetadataState state) override;
EXPORT MetadataIteratorRange GetValues(const char* metakey) override;
EXPORT MetadataIteratorRange GetAllValues() override;
EXPORT TrackPtr Copy() override;
EXPORT int64_t GetId() override;
EXPORT void SetId(int64_t trackId) noexcept override { this->trackId = trackId; }
EXPORT void SetMetadataState(musik::core::sdk::MetadataState state) override;
bool NeedsToBeIndexed(
EXPORT bool NeedsToBeIndexed(
const std::filesystem::path &file,
db::Connection &dbConnection);
bool Save(
EXPORT bool Save(
db::Connection &dbConnection,
std::string libraryDirectory);
static void OnIndexerStarted(db::Connection &dbConnection);
static void OnIndexerFinished(db::Connection &dbConnection);
static EXPORT void OnIndexerStarted(db::Connection &dbConnection);
static EXPORT void OnIndexerFinished(db::Connection &dbConnection);
protected:
friend class Indexer;
@ -94,8 +94,8 @@ namespace musik { namespace core {
private:
class InternalMetadata {
public:
InternalMetadata();
~InternalMetadata();
EXPORT InternalMetadata();
EXPORT ~InternalMetadata();
Track::MetadataMap metadata;
std::shared_ptr<musik::core::sdk::ReplayGain> replayGain;

52
src/musikcore/library/track/LibraryTrack.h
View File

@ -45,40 +45,40 @@ namespace musik { namespace core {
class LibraryTrack: public Track {
public:
LibraryTrack() noexcept;
LibraryTrack(int64_t id, int libraryId);
LibraryTrack(int64_t id, musik::core::ILibraryPtr library);
virtual ~LibraryTrack();
EXPORT LibraryTrack() noexcept;
EXPORT LibraryTrack(int64_t id, int libraryId);
EXPORT LibraryTrack(int64_t id, musik::core::ILibraryPtr library);
EXPORT virtual ~LibraryTrack();
int LibraryId() noexcept override;
EXPORT int LibraryId() noexcept override;
int64_t GetId() noexcept override;
void SetId(int64_t id) noexcept override { this->id = id; }
EXPORT int64_t GetId() noexcept override;
EXPORT void SetId(int64_t id) noexcept override { this->id = id; }
std::string GetString(const char* metakey) override;
std::string Uri() override;
EXPORT std::string GetString(const char* metakey) override;
EXPORT std::string Uri() override;
/* ITagStore */
void SetValue(const char* metakey, const char* value) override;
void ClearValue(const char* metakey) override;
bool Contains(const char* metakey) override;
void SetThumbnail(const char* data, long size) override;
bool ContainsThumbnail() override;
void SetReplayGain(const musik::core::sdk::ReplayGain& replayGain) override;
EXPORT void SetValue(const char* metakey, const char* value) override;
EXPORT void ClearValue(const char* metakey) override;
EXPORT bool Contains(const char* metakey) override;
EXPORT void SetThumbnail(const char* data, long size) override;
EXPORT bool ContainsThumbnail() override;
EXPORT void SetReplayGain(const musik::core::sdk::ReplayGain& replayGain) override;
/* ITrack */
long long GetInt64(const char* key, long long defaultValue = 0LL) override;
int GetInt32(const char* key, unsigned int defaultValue = 0) override;
double GetDouble(const char* key, double defaultValue = 0.0f) override;
int GetString(const char* key, char* dst, int size) override;
int Uri(char* dst, int size) override;
musik::core::sdk::ReplayGain GetReplayGain() noexcept override;
musik::core::sdk::MetadataState GetMetadataState() noexcept override;
void SetMetadataState(musik::core::sdk::MetadataState state) noexcept override;
EXPORT long long GetInt64(const char* key, long long defaultValue = 0LL) override;
EXPORT int GetInt32(const char* key, unsigned int defaultValue = 0) override;
EXPORT double GetDouble(const char* key, double defaultValue = 0.0f) override;
EXPORT int GetString(const char* key, char* dst, int size) override;
EXPORT int Uri(char* dst, int size) override;
EXPORT musik::core::sdk::ReplayGain GetReplayGain() noexcept override;
EXPORT musik::core::sdk::MetadataState GetMetadataState() noexcept override;
EXPORT void SetMetadataState(musik::core::sdk::MetadataState state) noexcept override;
MetadataIteratorRange GetValues(const char* metakey) override;
MetadataIteratorRange GetAllValues() noexcept override;
TrackPtr Copy() override;
EXPORT MetadataIteratorRange GetValues(const char* metakey) override;
EXPORT MetadataIteratorRange GetAllValues() noexcept override;
EXPORT TrackPtr Copy() override;
private:
int64_t id;

76
src/musikcore/library/track/Track.h
View File

@ -55,72 +55,72 @@ namespace musik { namespace core {
typedef std::multimap<std::string, std::string> MetadataMap;
typedef std::pair<MetadataMap::iterator, MetadataMap::iterator> MetadataIteratorRange;
virtual musik::core::ILibraryPtr Library() noexcept;
virtual int LibraryId() noexcept;
EXPORT virtual musik::core::ILibraryPtr Library() noexcept;
EXPORT virtual int LibraryId() noexcept;
/* ITrack is a ready only interface; we use the ITagStore interface
for writing. we replicate the interface here, and have TagStore pass
through to us */
virtual void SetValue(const char* key, const char* value) = 0;
virtual void ClearValue(const char* key) = 0;
virtual void SetThumbnail(const char* data, long size) = 0;
virtual bool Contains(const char* key) = 0;
virtual bool ContainsThumbnail() = 0;
virtual void SetReplayGain(const musik::core::sdk::ReplayGain& replayGain) = 0;
EXPORT virtual void SetValue(const char* key, const char* value) = 0;
EXPORT virtual void ClearValue(const char* key) = 0;
EXPORT virtual void SetThumbnail(const char* data, long size) = 0;
EXPORT virtual bool Contains(const char* key) = 0;
EXPORT virtual bool ContainsThumbnail() = 0;
EXPORT virtual void SetReplayGain(const musik::core::sdk::ReplayGain& replayGain) = 0;
/* IResource */
int64_t GetId() override;
Class GetClass() override;
const char* GetType() override;
EXPORT int64_t GetId() override;
EXPORT Class GetClass() override;
EXPORT const char* GetType() override;
/* IValue */
size_t GetValue(char* dst, size_t size) override;
EXPORT size_t GetValue(char* dst, size_t size) override;
/* IMap */
void Release() noexcept override;
int GetString(const char* key, char* dst, int size) override = 0;
long long GetInt64(const char* key, long long defaultValue = 0LL) override = 0;
int GetInt32(const char* key, unsigned int defaultValue = 0) override = 0;
double GetDouble(const char* key, double defaultValue = 0.0f) override = 0;
EXPORT void Release() noexcept override;
EXPORT int GetString(const char* key, char* dst, int size) override = 0;
EXPORT long long GetInt64(const char* key, long long defaultValue = 0LL) override = 0;
EXPORT int GetInt32(const char* key, unsigned int defaultValue = 0) override = 0;
EXPORT double GetDouble(const char* key, double defaultValue = 0.0f) override = 0;
/* ITrack */
void Retain() noexcept override;
int Uri(char* dst, int size) override = 0;
EXPORT void Retain() noexcept override;
EXPORT int Uri(char* dst, int size) override = 0;
/* implementation specific */
virtual void SetId(int64_t id) = 0;
virtual std::string GetString(const char* metakey) = 0;
virtual std::string Uri() = 0;
virtual MetadataIteratorRange GetValues(const char* metakey) = 0;
virtual MetadataIteratorRange GetAllValues() = 0;
virtual TrackPtr Copy() = 0;
virtual void SetMetadataState(musik::core::sdk::MetadataState state) = 0;
EXPORT virtual void SetId(int64_t id) = 0;
EXPORT virtual std::string GetString(const char* metakey) = 0;
EXPORT virtual std::string Uri() = 0;
EXPORT virtual MetadataIteratorRange GetValues(const char* metakey) = 0;
EXPORT virtual MetadataIteratorRange GetAllValues() = 0;
EXPORT virtual TrackPtr Copy() = 0;
EXPORT virtual void SetMetadataState(musik::core::sdk::MetadataState state) = 0;
/* for SDK interop */
ITrack* GetSdkValue();
EXPORT ITrack* GetSdkValue();
};
class TagStore : public musik::core::sdk::ITagStore {
public:
DELETE_CLASS_DEFAULTS(TagStore)
TagStore(TrackPtr track) noexcept;
TagStore(Track& track);
EXPORT TagStore(TrackPtr track) noexcept;
EXPORT TagStore(Track& track);
virtual ~TagStore() noexcept { }
EXPORT virtual ~TagStore() noexcept { }
template <typename T> T As() {
return dynamic_cast<T>(track.get());
}
void Retain() noexcept override;
void Release() noexcept override;
void SetValue(const char* key, const char* value) override;
void ClearValue(const char* key) override;
bool Contains(const char* key) override;
bool ContainsThumbnail() override;
void SetThumbnail(const char* data, long size) override;
void SetReplayGain(const musik::core::sdk::ReplayGain& replayGain) override;
EXPORT void Retain() noexcept override;
EXPORT void Release() noexcept override;
EXPORT void SetValue(const char* key, const char* value) override;
EXPORT void ClearValue(const char* key) override;
EXPORT bool Contains(const char* key) override;
EXPORT bool ContainsThumbnail() override;
EXPORT void SetThumbnail(const char* data, long size) override;
EXPORT void SetReplayGain(const musik::core::sdk::ReplayGain& replayGain) override;
private:
TrackPtr track;

52
src/musikcore/library/track/TrackList.h
View File

@ -55,39 +55,39 @@ namespace musik { namespace core {
public:
mutable sigslot::signal3<const TrackList*, size_t, size_t> WindowCached;
TrackList(ILibraryPtr library);
TrackList(TrackList* other);
TrackList(std::shared_ptr<TrackList> other);
TrackList(ILibraryPtr library, const int64_t* trackIds, size_t trackIdCount);
EXPORT TrackList(ILibraryPtr library);
EXPORT TrackList(TrackList* other);
EXPORT TrackList(std::shared_ptr<TrackList> other);
EXPORT TrackList(ILibraryPtr library, const int64_t* trackIds, size_t trackIdCount);
/* ITrackList */
size_t Count() const noexcept override;
int64_t GetId(size_t index) const override;
int IndexOf(int64_t id) const override;
musik::core::sdk::ITrack* GetTrack(size_t index) const override;
void Release() noexcept override { /* not used now */ }
EXPORT size_t Count() const noexcept override;
EXPORT int64_t GetId(size_t index) const override;
EXPORT int IndexOf(int64_t id) const override;
EXPORT musik::core::sdk::ITrack* GetTrack(size_t index) const override;
EXPORT void Release() noexcept override { /* not used now */ }
/* TrackListEditor passes through to us */
void Add(const int64_t id);
bool Insert(int64_t id, size_t index);
bool Swap(size_t index1, size_t index2);
bool Move(size_t from, size_t to);
bool Delete(size_t index);
void Clear() noexcept;
void Shuffle();
EXPORT void Add(const int64_t id);
EXPORT bool Insert(int64_t id, size_t index);
EXPORT bool Swap(size_t index1, size_t index2);
EXPORT bool Move(size_t from, size_t to);
EXPORT bool Delete(size_t index);
EXPORT void Clear() noexcept;
EXPORT void Shuffle();
/* implementation specific */
TrackPtr Get(size_t index, bool async = false) const;
TrackPtr GetWithTimeout(size_t index, size_t timeoutMs) const;
void ClearCache() noexcept;
void Swap(TrackList& list) noexcept;
void CopyFrom(const TrackList& from);
void CopyTo(TrackList& to);
void CacheWindow(size_t from, size_t to, bool async) const;
void SetCacheWindowSize(size_t size);
const std::vector<int64_t> GetIds() const { return ids; };
EXPORT TrackPtr Get(size_t index, bool async = false) const;
EXPORT TrackPtr GetWithTimeout(size_t index, size_t timeoutMs) const;
EXPORT void ClearCache() noexcept;
EXPORT void Swap(TrackList& list) noexcept;
EXPORT void CopyFrom(const TrackList& from);
EXPORT void CopyTo(TrackList& to);
EXPORT void CacheWindow(size_t from, size_t to, bool async) const;
EXPORT void SetCacheWindowSize(size_t size);
EXPORT const std::vector<int64_t> GetIds() const { return ids; };
musik::core::sdk::ITrackList* GetSdkValue();
EXPORT musik::core::sdk::ITrackList* GetSdkValue();
private:
struct QueryWindow {

24
src/musikcore/musikcore.vcxproj
View File

@ -252,7 +252,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>./;../;../3rdparty/include/;../3rdparty/win32_include;../3rdparty/asio/asio/include/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;_DEBUG;_CRT_SECURE_NO_DEPRECATE;MCSDK_DEFINE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;EXPORT_SYMBOLS;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;_DEBUG;_CRT_SECURE_NO_DEPRECATE;MCSDK_DEFINE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@ -273,7 +273,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>./;../;../3rdparty/include/;../3rdparty/win32_include;../3rdparty/asio/asio/include/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;_DEBUG;_CRT_SECURE_NO_DEPRECATE;MCSDK_DEFINE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;EXPORT_SYMBOLS;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;_DEBUG;_CRT_SECURE_NO_DEPRECATE;MCSDK_DEFINE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@ -298,7 +298,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>./;../;../3rdparty/include/;../3rdparty/win32_include;../3rdparty/asio/asio/include/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;_DEBUG;_CRT_SECURE_NO_DEPRECATE;MCSDK_DEFINE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;EXPORT_SYMBOLS;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;_DEBUG;_CRT_SECURE_NO_DEPRECATE;MCSDK_DEFINE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@ -319,7 +319,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>./;../;../3rdparty/include/;../3rdparty/win32_include;../3rdparty/asio/asio/include/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;_DEBUG;_CRT_SECURE_NO_DEPRECATE;MCSDK_DEFINE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;EXPORT_SYMBOLS;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;_DEBUG;_CRT_SECURE_NO_DEPRECATE;MCSDK_DEFINE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
@ -343,7 +343,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>./;../;../3rdparty/include/;../3rdparty/win32_include;../3rdparty/asio/asio/include/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;_DEBUG;_CRT_SECURE_NO_DEPRECATE;MCSDK_DEFINE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;EXPORT_SYMBOLS;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;_DEBUG;_CRT_SECURE_NO_DEPRECATE;MCSDK_DEFINE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
@ -367,7 +367,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>./;../;../3rdparty/include/;../3rdparty/win32_include;../3rdparty/asio/asio/include/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;_DEBUG;_CRT_SECURE_NO_DEPRECATE;MCSDK_DEFINE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;EXPORT_SYMBOLS;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;_DEBUG;_CRT_SECURE_NO_DEPRECATE;MCSDK_DEFINE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
@ -390,7 +390,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>./;../;../3rdparty/include/;../3rdparty/win32_include;../3rdparty/asio/asio/include/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;_CRT_SECURE_NO_DEPRECATE;MCSDK_DEFINE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>NDEBUG;WIN32;EXPORT_SYMBOLS;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;_CRT_SECURE_NO_DEPRECATE;MCSDK_DEFINE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>pch.hpp</PrecompiledHeaderFile>
@ -413,7 +413,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>./;../;../3rdparty/include/;../3rdparty/win32_include;../3rdparty/asio/asio/include/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;_CRT_SECURE_NO_DEPRECATE;MCSDK_DEFINE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>NDEBUG;WIN32;EXPORT_SYMBOLS;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;_CRT_SECURE_NO_DEPRECATE;MCSDK_DEFINE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>pch.hpp</PrecompiledHeaderFile>
@ -440,7 +440,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>./;../;../3rdparty/include/;../3rdparty/win32_include;../3rdparty/asio/asio/include/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;_CRT_SECURE_NO_DEPRECATE;MCSDK_DEFINE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>NDEBUG;WIN32;EXPORT_SYMBOLS;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;_CRT_SECURE_NO_DEPRECATE;MCSDK_DEFINE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>pch.hpp</PrecompiledHeaderFile>
@ -463,7 +463,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>./;../;../3rdparty/include/;../3rdparty/win32_include;../3rdparty/asio/asio/include/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;_CRT_SECURE_NO_DEPRECATE;MCSDK_DEFINE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>NDEBUG;WIN32;EXPORT_SYMBOLS;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;_CRT_SECURE_NO_DEPRECATE;MCSDK_DEFINE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>pch.hpp</PrecompiledHeaderFile>
@ -486,7 +486,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>./;../;../3rdparty/include/;../3rdparty/win32_include;../3rdparty/asio/asio/include/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;_CRT_SECURE_NO_DEPRECATE;MCSDK_DEFINE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>NDEBUG;WIN32;EXPORT_SYMBOLS;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;_CRT_SECURE_NO_DEPRECATE;MCSDK_DEFINE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>pch.hpp</PrecompiledHeaderFile>
@ -513,7 +513,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>./;../;../3rdparty/include/;../3rdparty/win32_include;../3rdparty/asio/asio/include/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;_CRT_SECURE_NO_DEPRECATE;MCSDK_DEFINE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>NDEBUG;WIN32;EXPORT_SYMBOLS;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;_CRT_SECURE_NO_DEPRECATE;MCSDK_DEFINE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>pch.hpp</PrecompiledHeaderFile>

6
src/musikcore/plugin/PluginFactory.h
View File

@ -70,7 +70,7 @@ namespace musik { namespace core {
}
};
template <class T, class D> EXPORT void QueryInterface(
template <class T, class D> void QueryInterface(
const std::string& functionName,
std::function<void(musik::core::sdk::IPlugin*, std::shared_ptr<T>, const std::string&)> handler)
{
@ -97,7 +97,7 @@ namespace musik { namespace core {
}
}
template <class T, class D> std::vector<std::shared_ptr<T>> EXPORT QueryInterface(const std::string& 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>(
@ -113,7 +113,7 @@ namespace musik { namespace core {
return plugins;
}
template <class T> EXPORT void QueryFunction(
template <class T> void QueryFunction(
const std::string& functionName,
std::function<void(musik::core::sdk::IPlugin*, T)> handler)
{

2
src/musikcore/support/ThreadGroup.h
View File

@ -97,7 +97,7 @@ namespace musik { namespace core {
}
template<typename F>
EXPORT std::thread* create_thread(F threadfunc)
std::thread* create_thread(F threadfunc)
{
std::lock_guard<std::shared_mutex> guard(m);
std::unique_ptr<std::thread> new_thread(new std::thread(threadfunc));