diff --git a/source/Makefile.mk b/source/Makefile.mk index 00782e90f..79985d8d5 100644 --- a/source/Makefile.mk +++ b/source/Makefile.mk @@ -29,7 +29,7 @@ STRIP ?= strip # -------------------------------------------------------------- -BASE_FLAGS = -Wall -Wextra -fPIC -pipe +BASE_FLAGS = -Wall -Wextra -fPIC -DPIC -pipe BASE_OPTS = -O2 -ffast-math -mtune=generic -msse -mfpmath=sse ifeq ($(RASPPI),true) diff --git a/source/backend/CarlaBackend.hpp b/source/backend/CarlaBackend.hpp index c9a5ffc12..9867f33ae 100644 --- a/source/backend/CarlaBackend.hpp +++ b/source/backend/CarlaBackend.hpp @@ -260,31 +260,32 @@ enum OptionsType { */ OPTION_PREFER_UI_BRIDGES = 5, + /*! + * Make plugin UIs always-on-top.\n + * Default is yes. + */ + OPTION_UIS_ALWAYS_ON_TOP = 6, + #ifdef WANT_DSSI /*! * Use (unofficial) dssi-vst chunks feature.\n * Default is no. * \see PLUGIN_OPTION_USE_CHUNKS */ - OPTION_USE_DSSI_VST_CHUNKS = 6, + OPTION_USE_DSSI_VST_CHUNKS = 7, #endif /*! * Maximum number of parameters allowed.\n * Default is MAX_DEFAULT_PARAMETERS. */ - OPTION_MAX_PARAMETERS = 7, + OPTION_MAX_PARAMETERS = 8, /*! * Timeout value in ms for how much to wait for UI-Bridges to respond.\n * Default is 4000 (4 secs). */ - OPTION_UI_BRIDGES_TIMEOUT = 8, - - /*! - * JACK auto-connect to hardware ports. - */ - OPTION_JACK_AUTOCONNECT = 9, + OPTION_UI_BRIDGES_TIMEOUT = 9, #ifdef WANT_RTAUDIO /*! @@ -734,23 +735,22 @@ struct ParameterRanges { float getFixedValue(const float& value) const noexcept { - if (value < min) + if (value <= min) return min; - else if (value > max) + if (value >= max) return max; return value; } float getNormalizedValue(const float& value) const noexcept { - float newValue = (value - min) / (max - min); - - if (newValue < 0.0f) - newValue = 0.0f; - else if (newValue > 1.0f) - newValue = 1.0f; + const float normValue((value - min) / (max - min)); - return newValue; + if (normValue <= 0.0f) + return 0.0f; + if (normValue >= 1.0f) + return 1.0f; + return normValue; } float getUnnormalizedValue(const float& value) const noexcept diff --git a/source/backend/CarlaEngine.hpp b/source/backend/CarlaEngine.hpp index e8844eaa6..df1d0c3b0 100644 --- a/source/backend/CarlaEngine.hpp +++ b/source/backend/CarlaEngine.hpp @@ -200,12 +200,10 @@ struct EngineEvent { EngineMidiEvent midi; }; -#ifndef DOXYGEN EngineEvent() noexcept { clear(); } -#endif void clear() noexcept { @@ -231,12 +229,10 @@ struct EngineOptions { #endif unsigned int maxParameters; - unsigned int oscUiTimeout; - - bool jackAutoConnect; + unsigned int uiBridgesTimeout; #ifdef WANT_RTAUDIO - unsigned int rtaudioNumberPeriods; + unsigned int rtaudioNumPeriods; unsigned int rtaudioBufferSize; unsigned int rtaudioSampleRate; CarlaString rtaudioDevice; @@ -266,32 +262,29 @@ struct EngineOptions { CarlaString bridge_vstX11; #endif -#ifndef DOXYGEN - EngineOptions() noexcept -# if defined(CARLA_OS_LINUX) + EngineOptions() +#if defined(CARLA_OS_LINUX) : processMode(PROCESS_MODE_MULTIPLE_CLIENTS), transportMode(TRANSPORT_MODE_JACK), -# else +#else : processMode(PROCESS_MODE_CONTINUOUS_RACK), transportMode(TRANSPORT_MODE_INTERNAL), -# endif +#endif forceStereo(false), preferPluginBridges(false), preferUiBridges(true), uisAlwaysOnTop(true), -# ifdef WANT_DSSI +#ifdef WANT_DSSI useDssiVstChunks(false), -# endif +#endif maxParameters(MAX_DEFAULT_PARAMETERS), - oscUiTimeout(4000), - jackAutoConnect(false), -# ifdef WANT_RTAUDIO - rtaudioNumberPeriods(0), + uiBridgesTimeout(4000), +#ifdef WANT_RTAUDIO + rtaudioNumPeriods(2), rtaudioBufferSize(512), rtaudioSampleRate(44100), -# endif - resourceDir() {} #endif + resourceDir() {} }; /*! @@ -309,7 +302,6 @@ struct EngineTimeInfoBBT { double ticksPerBeat; double beatsPerMinute; -#ifndef DOXYGEN EngineTimeInfoBBT() noexcept : bar(0), beat(0), @@ -319,7 +311,6 @@ struct EngineTimeInfoBBT { beatType(0.0f), ticksPerBeat(0.0), beatsPerMinute(0.0) {} -#endif }; /*! @@ -334,12 +325,10 @@ struct EngineTimeInfo { uint32_t valid; EngineTimeInfoBBT bbt; -#ifndef DOXYGEN EngineTimeInfo() noexcept { clear(); } -#endif void clear() noexcept { @@ -349,7 +338,6 @@ struct EngineTimeInfo { valid = 0x0; } -#ifndef DOXYGEN // quick operator, doesn't check all values bool operator==(const EngineTimeInfo& timeInfo) const noexcept { @@ -366,7 +354,6 @@ struct EngineTimeInfo { { return !operator==(timeInfo); } -#endif }; // ----------------------------------------------------------------------- @@ -1192,6 +1179,7 @@ private: // ------------------------------------------------------------------- // Bridge/Controller OSC stuff +public: #ifdef BUILD_BRIDGE void oscSend_bridge_audio_count(const int32_t ins, const int32_t outs, const int32_t total); void oscSend_bridge_midi_count(const int32_t ins, const int32_t outs, const int32_t total); @@ -1213,7 +1201,6 @@ private: void oscSend_bridge_set_chunk_data(const char* const chunkFile); void oscSend_bridge_set_peaks(); #else -public: void oscSend_control_add_plugin_start(const int32_t pluginId, const char* const pluginName); void oscSend_control_add_plugin_end(const int32_t pluginId); void oscSend_control_remove_plugin(const int32_t pluginId); diff --git a/source/backend/CarlaNative.h b/source/backend/CarlaNative.h index 85d52d214..6c67d92dc 100644 --- a/source/backend/CarlaNative.h +++ b/source/backend/CarlaNative.h @@ -30,7 +30,6 @@ extern "C" { * @defgroup CarlaNativeAPI Carla Native API * * The Carla Native API - * * @{ */ @@ -56,11 +55,10 @@ typedef enum { PLUGIN_IS_RTSAFE = 1 << 0, PLUGIN_IS_SYNTH = 1 << 1, PLUGIN_HAS_GUI = 1 << 2, - PLUGIN_USES_GUI_AS_FILE = 1 << 3, - PLUGIN_USES_PANNING = 1 << 4, // uses stereo balance if unset (default) - PLUGIN_USES_SINGLE_THREAD = 1 << 5, - PLUGIN_USES_STATE = 1 << 6, - PLUGIN_USES_STATIC_BUFFERS = 1 << 7 + PLUGIN_USES_PANNING = 1 << 3, // uses stereo balance if unset (default) + PLUGIN_USES_SINGLE_THREAD = 1 << 4, + PLUGIN_USES_STATE = 1 << 5, + PLUGIN_USES_STATIC_BUFFERS = 1 << 6 } PluginHints; typedef enum { diff --git a/source/backend/CarlaNative.hpp b/source/backend/CarlaNative.hpp index c8bcbb9f0..febe1f527 100644 --- a/source/backend/CarlaNative.hpp +++ b/source/backend/CarlaNative.hpp @@ -52,134 +52,102 @@ protected: return pHost; } - const char* getResourceDir() const noexcept + const char* getResourceDir() const { - CARLA_ASSERT(pHost != nullptr); + CARLA_SAFE_ASSERT_RETURN(pHost != nullptr, nullptr); - if (pHost != nullptr) - return pHost->resourceDir; - - return nullptr; + return pHost->resourceDir; } - const char* getUiName() const noexcept + const char* getUiName() const { - CARLA_ASSERT(pHost != nullptr); - - if (pHost != nullptr) - return pHost->uiName; + CARLA_SAFE_ASSERT_RETURN(pHost != nullptr, nullptr); - return nullptr; + return pHost->uiName; } uint32_t getBufferSize() const { - CARLA_ASSERT(pHost != nullptr); - - if (pHost != nullptr) - return pHost->get_buffer_size(pHost->handle); + CARLA_SAFE_ASSERT_RETURN(pHost != nullptr, 0); - return 0; + return pHost->get_buffer_size(pHost->handle); } double getSampleRate() const { - CARLA_ASSERT(pHost != nullptr); - - if (pHost != nullptr) - return pHost->get_sample_rate(pHost->handle); + CARLA_SAFE_ASSERT_RETURN(pHost != nullptr, 0.0); - return 0.0; + return pHost->get_sample_rate(pHost->handle); } bool isOffline() const { - CARLA_ASSERT(pHost != nullptr); - - if (pHost != nullptr) - return pHost->is_offline(pHost->handle); + CARLA_SAFE_ASSERT_RETURN(pHost != nullptr, false); - return false; + return pHost->is_offline(pHost->handle); } const TimeInfo* getTimeInfo() const { - CARLA_ASSERT(pHost != nullptr); + CARLA_SAFE_ASSERT_RETURN(pHost != nullptr, nullptr); - if (pHost != nullptr) - return pHost->get_time_info(pHost->handle); - - return nullptr; + return pHost->get_time_info(pHost->handle); } void writeMidiEvent(const MidiEvent* const event) const { - CARLA_ASSERT(pHost != nullptr); + CARLA_SAFE_ASSERT_RETURN(pHost != nullptr,); - if (pHost != nullptr) - pHost->write_midi_event(pHost->handle, event); + pHost->write_midi_event(pHost->handle, event); } void uiParameterChanged(const uint32_t index, const float value) const { - CARLA_ASSERT(pHost != nullptr); + CARLA_SAFE_ASSERT_RETURN(pHost != nullptr,); - if (pHost != nullptr) - pHost->ui_parameter_changed(pHost->handle, index, value); + pHost->ui_parameter_changed(pHost->handle, index, value); } void uiMidiProgramChanged(const uint8_t channel, const uint32_t bank, const uint32_t program) const { - CARLA_ASSERT(pHost != nullptr); + CARLA_SAFE_ASSERT_RETURN(pHost != nullptr,); - if (pHost != nullptr) - pHost->ui_midi_program_changed(pHost->handle, channel, bank, program); + pHost->ui_midi_program_changed(pHost->handle, channel, bank, program); } void uiCustomDataChanged(const char* const key, const char* const value) const { - CARLA_ASSERT(pHost != nullptr); + CARLA_SAFE_ASSERT_RETURN(pHost != nullptr,); - if (pHost != nullptr) - pHost->ui_custom_data_changed(pHost->handle, key, value); + pHost->ui_custom_data_changed(pHost->handle, key, value); } void uiClosed() const { - CARLA_ASSERT(pHost != nullptr); + CARLA_SAFE_ASSERT_RETURN(pHost != nullptr,); - if (pHost != nullptr) - pHost->ui_closed(pHost->handle); + pHost->ui_closed(pHost->handle); } const char* uiOpenFile(const bool isDir, const char* const title, const char* const filter) const { - CARLA_ASSERT(pHost != nullptr); + CARLA_SAFE_ASSERT_RETURN(pHost != nullptr, nullptr); - if (pHost != nullptr) - return pHost->ui_open_file(pHost->handle, isDir, title, filter); - - return nullptr; + return pHost->ui_open_file(pHost->handle, isDir, title, filter); } const char* uiSaveFile(const bool isDir, const char* const title, const char* const filter) const { - CARLA_ASSERT(pHost != nullptr); - - if (pHost != nullptr) - return pHost->ui_save_file(pHost->handle, isDir, title, filter); + CARLA_SAFE_ASSERT_RETURN(pHost != nullptr, nullptr); - return nullptr; + return pHost->ui_save_file(pHost->handle, isDir, title, filter); } intptr_t hostDispatcher(const HostDispatcherOpcode opcode, const int32_t index, const intptr_t value, void* const ptr, const float opt) const { - CARLA_ASSERT(pHost != nullptr); - - if (pHost != nullptr) - return pHost->dispatcher(pHost->handle, opcode, index, value, ptr, opt); + CARLA_SAFE_ASSERT_RETURN(pHost != nullptr, 0); - return 0; + return pHost->dispatcher(pHost->handle, opcode, index, value, ptr, opt); } // ------------------------------------------------------------------- @@ -192,29 +160,22 @@ protected: virtual const Parameter* getParameterInfo(const uint32_t index) { - CARLA_ASSERT(index < getParameterCount()); + CARLA_SAFE_ASSERT_RETURN(index < getParameterCount(), nullptr); return nullptr; - - // unused - (void)index; } virtual float getParameterValue(const uint32_t index) { - CARLA_ASSERT(index < getParameterCount()); + CARLA_SAFE_ASSERT_RETURN(index < getParameterCount(), 0.0f); return 0.0f; - - // unused - (void)index; } virtual const char* getParameterText(const uint32_t index, const float value) { - CARLA_ASSERT(index < getParameterCount()); + CARLA_SAFE_ASSERT_RETURN(index < getParameterCount(), nullptr); return nullptr; // unused - (void)index; (void)value; } @@ -228,11 +189,8 @@ protected: virtual const MidiProgram* getMidiProgramInfo(const uint32_t index) { - CARLA_ASSERT(index < getMidiProgramCount()); + CARLA_SAFE_ASSERT_RETURN(index < getMidiProgramCount(), nullptr); return nullptr; - - // unused - (void)index; } // ------------------------------------------------------------------- @@ -240,34 +198,27 @@ protected: virtual void setParameterValue(const uint32_t index, const float value) { - CARLA_ASSERT(index < getParameterCount()); + CARLA_SAFE_ASSERT_RETURN(index < getParameterCount(),); return; // unused - (void)index; (void)value; } virtual void setMidiProgram(const uint8_t channel, const uint32_t bank, const uint32_t program) { - CARLA_ASSERT(channel < MAX_MIDI_CHANNELS); + CARLA_SAFE_ASSERT_RETURN(channel < MAX_MIDI_CHANNELS,); return; // unused - (void)channel; (void)bank; (void)program; } virtual void setCustomData(const char* const key, const char* const value) { - CARLA_ASSERT(key != nullptr); - CARLA_ASSERT(value != nullptr); - return; - - // unused - (void)key; - (void)value; + CARLA_SAFE_ASSERT_RETURN(key != nullptr,); + CARLA_SAFE_ASSERT_RETURN(value != nullptr,); } // ------------------------------------------------------------------- @@ -300,34 +251,27 @@ protected: virtual void uiSetParameterValue(const uint32_t index, const float value) { - CARLA_ASSERT(index < getParameterCount()); + CARLA_SAFE_ASSERT_RETURN(index < getParameterCount(),); return; // unused - (void)index; (void)value; } virtual void uiSetMidiProgram(const uint8_t channel, const uint32_t bank, const uint32_t program) { - CARLA_ASSERT(channel < MAX_MIDI_CHANNELS); + CARLA_SAFE_ASSERT_RETURN(channel < MAX_MIDI_CHANNELS,); return; // unused - (void)channel; (void)bank; (void)program; } virtual void uiSetCustomData(const char* const key, const char* const value) { - CARLA_ASSERT(key != nullptr); - CARLA_ASSERT(value != nullptr); - return; - - // unused - (void)key; - (void)value; + CARLA_SAFE_ASSERT_RETURN(key != nullptr,); + CARLA_SAFE_ASSERT_RETURN(value != nullptr,); } // ------------------------------------------------------------------- @@ -340,11 +284,7 @@ protected: virtual void setState(const char* const data) { - CARLA_ASSERT(data != nullptr); - return; - - // unused - (void)data; + CARLA_SAFE_ASSERT_RETURN(data != nullptr,); } // ------------------------------------------------------------------- @@ -405,42 +345,42 @@ public: static void _set_parameter_value(PluginHandle handle, uint32_t index, float value) { - return handlePtr->setParameterValue(index, value); + handlePtr->setParameterValue(index, value); } static void _set_midi_program(PluginHandle handle, uint8_t channel, uint32_t bank, uint32_t program) { - return handlePtr->setMidiProgram(channel, bank, program); + handlePtr->setMidiProgram(channel, bank, program); } static void _set_custom_data(PluginHandle handle, const char* key, const char* value) { - return handlePtr->setCustomData(key, value); + handlePtr->setCustomData(key, value); } static void _ui_show(PluginHandle handle, bool show) { - return handlePtr->uiShow(show); + handlePtr->uiShow(show); } static void _ui_idle(PluginHandle handle) { - return handlePtr->uiIdle(); + handlePtr->uiIdle(); } static void _ui_set_parameter_value(PluginHandle handle, uint32_t index, float value) { - return handlePtr->uiSetParameterValue(index, value); + handlePtr->uiSetParameterValue(index, value); } static void _ui_set_midi_program(PluginHandle handle, uint8_t channel, uint32_t bank, uint32_t program) { - return handlePtr->uiSetMidiProgram(channel, bank, program); + handlePtr->uiSetMidiProgram(channel, bank, program); } static void _ui_set_custom_data(PluginHandle handle, const char* key, const char* value) { - return handlePtr->uiSetCustomData(key, value); + handlePtr->uiSetCustomData(key, value); } static void _activate(PluginHandle handle) @@ -455,7 +395,7 @@ public: static void _process(PluginHandle handle, float** inBuffer, float** outBuffer, const uint32_t frames, uint32_t midiEventCount, const MidiEvent* midiEvents) { - return handlePtr->process(inBuffer, outBuffer, frames, midiEventCount, midiEvents); + handlePtr->process(inBuffer, outBuffer, frames, midiEventCount, midiEvents); } static char* _get_state(PluginHandle handle) diff --git a/source/backend/engine/CarlaEngineInternal.hpp b/source/backend/engine/CarlaEngineInternal.hpp index 94f64e86a..48108beda 100644 --- a/source/backend/engine/CarlaEngineInternal.hpp +++ b/source/backend/engine/CarlaEngineInternal.hpp @@ -15,8 +15,8 @@ * For a full copy of the GNU General Public License see the GPL.txt file */ -#ifndef __CARLA_ENGINE_INTERNAL_HPP__ -#define __CARLA_ENGINE_INTERNAL_HPP__ +#ifndef CARLA_ENGINE_INTERNAL_HPP_INCLUDED +#define CARLA_ENGINE_INTERNAL_HPP_INCLUDED #include "CarlaEngine.hpp" #include "CarlaEngineOsc.hpp" @@ -351,4 +351,4 @@ struct CarlaEngineProtectedData { CARLA_BACKEND_END_NAMESPACE -#endif // __CARLA_ENGINE_INTERNAL_HPP__ +#endif // CARLA_ENGINE_INTERNAL_HPP_INCLUDED diff --git a/source/backend/engine/CarlaEngineOsc.hpp b/source/backend/engine/CarlaEngineOsc.hpp index 67ce9ceae..1f25b4702 100644 --- a/source/backend/engine/CarlaEngineOsc.hpp +++ b/source/backend/engine/CarlaEngineOsc.hpp @@ -15,8 +15,8 @@ * For a full copy of the GNU General Public License see the GPL.txt file */ -#ifndef __CARLA_ENGINE_OSC_HPP__ -#define __CARLA_ENGINE_OSC_HPP__ +#ifndef CARLA_ENGINE_OSC_HPP_INCLUDED +#define CARLA_ENGINE_OSC_HPP_INCLUDED #include "CarlaBackend.hpp" #include "CarlaOscUtils.hpp" @@ -170,4 +170,4 @@ private: CARLA_BACKEND_END_NAMESPACE -#endif // __CARLA_ENGINE_OSC_HPP__ +#endif // CARLA_ENGINE_OSC_HPP_INCLUDED diff --git a/source/backend/engine/CarlaEngineThread.hpp b/source/backend/engine/CarlaEngineThread.hpp index e6974f4fc..eb55f2391 100644 --- a/source/backend/engine/CarlaEngineThread.hpp +++ b/source/backend/engine/CarlaEngineThread.hpp @@ -15,8 +15,8 @@ * For a full copy of the GNU General Public License see the GPL.txt file */ -#ifndef __CARLA_ENGINE_THREAD_HPP__ -#define __CARLA_ENGINE_THREAD_HPP__ +#ifndef CARLA_ENGINE_THREAD_HPP_INCLUDED +#define CARLA_ENGINE_THREAD_HPP_INCLUDED #include "CarlaBackend.hpp" #include "CarlaMutex.hpp" @@ -56,4 +56,4 @@ private: CARLA_BACKEND_END_NAMESPACE -#endif // __CARLA_ENGINE_THREAD_HPP__ +#endif // CARLA_ENGINE_THREAD_HPP_INCLUDED diff --git a/source/backend/engine/distrho/DistrhoPluginInfo.h b/source/backend/engine/distrho/DistrhoPluginInfo.h index 578473b0d..7dd4c095a 100644 --- a/source/backend/engine/distrho/DistrhoPluginInfo.h +++ b/source/backend/engine/distrho/DistrhoPluginInfo.h @@ -15,8 +15,8 @@ * For a full copy of the GNU General Public License see the GPL.txt file */ -#ifndef __DISTRHO_PLUGIN_INFO_H__ -#define __DISTRHO_PLUGIN_INFO_H__ +#ifndef DISTRHO_PLUGIN_INFO_H_INCLUDED +#define DISTRHO_PLUGIN_INFO_H_INCLUDED #define DISTRHO_PLUGIN_NAME "Carla" @@ -35,4 +35,4 @@ #define DISTRHO_UI_EXTERNAL -#endif // __DISTRHO_PLUGIN_INFO_H__ +#endif // DISTRHO_PLUGIN_INFO_H_INCLUDED diff --git a/source/backend/native/3bandeq/DistrhoPlugin3BandEQ.hpp b/source/backend/native/3bandeq/DistrhoPlugin3BandEQ.hpp index be2ec7504..308781640 100644 --- a/source/backend/native/3bandeq/DistrhoPlugin3BandEQ.hpp +++ b/source/backend/native/3bandeq/DistrhoPlugin3BandEQ.hpp @@ -15,8 +15,8 @@ * For a full copy of the license see the LGPL.txt file */ -#ifndef __DISTRHO_PLUGIN_3BANDEQ_HPP__ -#define __DISTRHO_PLUGIN_3BANDEQ_HPP__ +#ifndef DISTRHO_PLUGIN_3BANDEQ_HPP_INCLUDED +#define DISTRHO_PLUGIN_3BANDEQ_HPP_INCLUDED #include "DistrhoPlugin.hpp" @@ -105,4 +105,4 @@ private: END_NAMESPACE_DISTRHO -#endif // __DISTRHO_PLUGIN_3BANDEQ_HPP__ +#endif // DISTRHO_PLUGIN_3BANDEQ_HPP_INCLUDED diff --git a/source/backend/native/3bandeq/DistrhoPluginInfo.h b/source/backend/native/3bandeq/DistrhoPluginInfo.h index 38e472909..44dc1339c 100644 --- a/source/backend/native/3bandeq/DistrhoPluginInfo.h +++ b/source/backend/native/3bandeq/DistrhoPluginInfo.h @@ -14,8 +14,8 @@ * For a full copy of the license see the LGPL.txt file */ -#ifndef __DISTRHO_PLUGIN_INFO_H__ -#define __DISTRHO_PLUGIN_INFO_H__ +#ifndef DISTRHO_PLUGIN_INFO_H_INCLUDED +#define DISTRHO_PLUGIN_INFO_H_INCLUDED #define DISTRHO_PLUGIN_NAME "3 Band EQ" @@ -34,4 +34,4 @@ #define DISTRHO_UI_OPENGL -#endif // __DISTRHO_PLUGIN_INFO_H__ +#endif // DISTRHO_PLUGIN_INFO_H_INCLUDED diff --git a/source/backend/native/3bandeq/DistrhoUI3BandEQ.hpp b/source/backend/native/3bandeq/DistrhoUI3BandEQ.hpp index 13a2a2960..2281c7255 100644 --- a/source/backend/native/3bandeq/DistrhoUI3BandEQ.hpp +++ b/source/backend/native/3bandeq/DistrhoUI3BandEQ.hpp @@ -14,8 +14,8 @@ * For a full copy of the license see the LGPL.txt file */ -#ifndef __DISTRHO_UI_3BANDEQ_HPP__ -#define __DISTRHO_UI_3BANDEQ_HPP__ +#ifndef DISTRHO_UI_3BANDEQ_HPP_INCLUDED +#define DISTRHO_UI_3BANDEQ_HPP_INCLUDED #include "DistrhoUIOpenGL.hpp" @@ -90,4 +90,4 @@ private: END_NAMESPACE_DISTRHO -#endif // __DISTRHO_UI_3BANDEQ_HPP__ +#endif // DISTRHO_UI_3BANDEQ_HPP_INCLUDED diff --git a/source/backend/native/3bandsplitter/DistrhoPlugin3BandSplitter.hpp b/source/backend/native/3bandsplitter/DistrhoPlugin3BandSplitter.hpp index 946ecb5cb..e5e9d2128 100644 --- a/source/backend/native/3bandsplitter/DistrhoPlugin3BandSplitter.hpp +++ b/source/backend/native/3bandsplitter/DistrhoPlugin3BandSplitter.hpp @@ -15,8 +15,8 @@ * For a full copy of the license see the LGPL.txt file */ -#ifndef __DISTRHO_PLUGIN_3BANDSPLITTER_HPP__ -#define __DISTRHO_PLUGIN_3BANDSPLITTER_HPP__ +#ifndef DISTRHO_PLUGIN_3BANDSPLITTER_HPP_INCLUDED +#define DISTRHO_PLUGIN_3BANDSPLITTER_HPP_INCLUDED #include "DistrhoPlugin.hpp" @@ -105,4 +105,4 @@ private: END_NAMESPACE_DISTRHO -#endif // __DISTRHO_PLUGIN_3BANDSPLITTER_HPP__ +#endif // DISTRHO_PLUGIN_3BANDSPLITTER_HPP_INCLUDED diff --git a/source/backend/native/3bandsplitter/DistrhoPluginInfo.h b/source/backend/native/3bandsplitter/DistrhoPluginInfo.h index 91e0ad577..97e007ea8 100644 --- a/source/backend/native/3bandsplitter/DistrhoPluginInfo.h +++ b/source/backend/native/3bandsplitter/DistrhoPluginInfo.h @@ -14,8 +14,8 @@ * For a full copy of the license see the LGPL.txt file */ -#ifndef __DISTRHO_PLUGIN_INFO_H__ -#define __DISTRHO_PLUGIN_INFO_H__ +#ifndef DISTRHO_PLUGIN_INFO_H_INCLUDED +#define DISTRHO_PLUGIN_INFO_H_INCLUDED #define DISTRHO_PLUGIN_NAME "3 Band Splitter" @@ -34,4 +34,4 @@ #define DISTRHO_UI_OPENGL -#endif // __DISTRHO_PLUGIN_INFO_H__ +#endif // DISTRHO_PLUGIN_INFO_H_INCLUDED diff --git a/source/backend/native/3bandsplitter/DistrhoUI3BandSplitter.hpp b/source/backend/native/3bandsplitter/DistrhoUI3BandSplitter.hpp index 797a25164..fa4f5c33b 100644 --- a/source/backend/native/3bandsplitter/DistrhoUI3BandSplitter.hpp +++ b/source/backend/native/3bandsplitter/DistrhoUI3BandSplitter.hpp @@ -14,8 +14,8 @@ * For a full copy of the license see the LGPL.txt file */ -#ifndef __DISTRHO_UI_3BANDSPLITTER_HPP__ -#define __DISTRHO_UI_3BANDSPLITTER_HPP__ +#ifndef DISTRHO_UI_3BANDSPLITTER_HPP_INCLUDED +#define DISTRHO_UI_3BANDSPLITTER_HPP_INCLUDED #include "DistrhoUIOpenGL.hpp" @@ -90,4 +90,4 @@ private: END_NAMESPACE_DISTRHO -#endif // __DISTRHO_UI_3BANDSPLITTER_HPP__ +#endif // DISTRHO_UI_3BANDSPLITTER_HPP_INCLUDED diff --git a/source/backend/native/audio-base.hpp b/source/backend/native/audio-base.hpp index f5bbfe3c8..41c3635df 100644 --- a/source/backend/native/audio-base.hpp +++ b/source/backend/native/audio-base.hpp @@ -15,8 +15,8 @@ * For a full copy of the GNU General Public License see the GPL.txt file */ -#ifndef __AUDIO_BASE_HPP__ -#define __AUDIO_BASE_HPP__ +#ifndef AUDIO_BASE_HPP_INCLUDED +#define AUDIO_BASE_HPP_INCLUDED #include "CarlaMutex.hpp" @@ -386,4 +386,4 @@ private: CarlaMutex fMutex; }; -#endif // __AUDIO_BASE_HPP__ +#endif // AUDIO_BASE_HPP_INCLUDED diff --git a/source/backend/native/midi-base.hpp b/source/backend/native/midi-base.hpp index 3eabc28fa..29d4854dd 100644 --- a/source/backend/native/midi-base.hpp +++ b/source/backend/native/midi-base.hpp @@ -15,8 +15,8 @@ * For a full copy of the GNU General Public License see the GPL.txt file */ -#ifndef __MIDI_BASE_HPP__ -#define __MIDI_BASE_HPP__ +#ifndef MIDI_BASE_HPP_INCLUDED +#define MIDI_BASE_HPP_INCLUDED #include "CarlaMIDI.h" #include "CarlaMutex.hpp" @@ -236,4 +236,4 @@ private: } }; -#endif // __MIDI_BASE_HPP__ +#endif // MIDI_BASE_HPP_INCLUDED diff --git a/source/backend/native/nekobi/DistrhoPluginInfo.h b/source/backend/native/nekobi/DistrhoPluginInfo.h index 3015b13d6..da79fd03f 100644 --- a/source/backend/native/nekobi/DistrhoPluginInfo.h +++ b/source/backend/native/nekobi/DistrhoPluginInfo.h @@ -15,8 +15,8 @@ * For a full copy of the GNU General Public License see the GPL.txt file */ -#ifndef __DISTRHO_PLUGIN_INFO_H__ -#define __DISTRHO_PLUGIN_INFO_H__ +#ifndef DISTRHO_PLUGIN_INFO_H_INCLUDED +#define DISTRHO_PLUGIN_INFO_H_INCLUDED #define DISTRHO_PLUGIN_NAME "Nekobi" @@ -35,4 +35,4 @@ #define DISTRHO_UI_OPENGL -#endif // __DISTRHO_PLUGIN_INFO_H__ +#endif // DISTRHO_PLUGIN_INFO_H_INCLUDED diff --git a/source/backend/native/nekobi/DistrhoPluginNekobi.hpp b/source/backend/native/nekobi/DistrhoPluginNekobi.hpp index 02180fc32..f8a5b5b47 100644 --- a/source/backend/native/nekobi/DistrhoPluginNekobi.hpp +++ b/source/backend/native/nekobi/DistrhoPluginNekobi.hpp @@ -16,8 +16,8 @@ * For a full copy of the GNU General Public License see the GPL.txt file */ -#ifndef __DISTRHO_PLUGIN_3BANDEQ_HPP__ -#define __DISTRHO_PLUGIN_3BANDEQ_HPP__ +#ifndef DISTRHO_PLUGIN_3BANDEQ_HPP_INCLUDED +#define DISTRHO_PLUGIN_3BANDEQ_HPP_INCLUDED #include "DistrhoPlugin.hpp" @@ -112,4 +112,4 @@ private: END_NAMESPACE_DISTRHO -#endif // __DISTRHO_PLUGIN_3BANDEQ_HPP__ +#endif // DISTRHO_PLUGIN_3BANDEQ_HPP_INCLUDED diff --git a/source/backend/native/nekobi/DistrhoUINekobi.hpp b/source/backend/native/nekobi/DistrhoUINekobi.hpp index 3c3184491..a33b7575d 100644 --- a/source/backend/native/nekobi/DistrhoUINekobi.hpp +++ b/source/backend/native/nekobi/DistrhoUINekobi.hpp @@ -15,8 +15,8 @@ * For a full copy of the GNU General Public License see the GPL.txt file */ -#ifndef __DISTRHO_UI_3BANDEQ_HPP__ -#define __DISTRHO_UI_3BANDEQ_HPP__ +#ifndef DISTRHO_UI_3BANDEQ_HPP_INCLUDED +#define DISTRHO_UI_3BANDEQ_HPP_INCLUDED #include "DistrhoUIOpenGL.hpp" @@ -101,4 +101,4 @@ private: END_NAMESPACE_DISTRHO -#endif // __DISTRHO_UI_3BANDEQ_HPP__ +#endif // DISTRHO_UI_3BANDEQ_HPP_INCLUDED diff --git a/source/backend/native/notes/DistrhoPluginInfo.h b/source/backend/native/notes/DistrhoPluginInfo.h index 5c1fd5012..9809728d7 100644 --- a/source/backend/native/notes/DistrhoPluginInfo.h +++ b/source/backend/native/notes/DistrhoPluginInfo.h @@ -15,8 +15,8 @@ * For a full copy of the GNU General Public License see the GPL.txt file */ -#ifndef __DISTRHO_PLUGIN_INFO_H__ -#define __DISTRHO_PLUGIN_INFO_H__ +#ifndef DISTRHO_PLUGIN_INFO_H_INCLUDED +#define DISTRHO_PLUGIN_INFO_H_INCLUDED #define DISTRHO_PLUGIN_NAME "Notes" @@ -35,4 +35,4 @@ #define DISTRHO_UI_QT -#endif // __DISTRHO_PLUGIN_INFO_H__ +#endif // DISTRHO_PLUGIN_INFO_H_INCLUDED diff --git a/source/backend/native/notes/DistrhoPluginNotes.hpp b/source/backend/native/notes/DistrhoPluginNotes.hpp index fe91716f5..a2330f2c6 100644 --- a/source/backend/native/notes/DistrhoPluginNotes.hpp +++ b/source/backend/native/notes/DistrhoPluginNotes.hpp @@ -15,8 +15,8 @@ * For a full copy of the GNU General Public License see the GPL.txt file */ -#ifndef __DISTRHO_PLUGIN_NOTES_HPP__ -#define __DISTRHO_PLUGIN_NOTES_HPP__ +#ifndef DISTRHO_PLUGIN_NOTES_HPP_INCLUDED +#define DISTRHO_PLUGIN_NOTES_HPP_INCLUDED #include "DistrhoPlugin.hpp" @@ -83,4 +83,4 @@ private: END_NAMESPACE_DISTRHO -#endif // __DISTRHO_PLUGIN_NOTES_HPP__ +#endif // DISTRHO_PLUGIN_NOTES_HPP_INCLUDED diff --git a/source/backend/native/notes/DistrhoUINotes.hpp b/source/backend/native/notes/DistrhoUINotes.hpp index 862eacaaa..fdac28f89 100644 --- a/source/backend/native/notes/DistrhoUINotes.hpp +++ b/source/backend/native/notes/DistrhoUINotes.hpp @@ -15,8 +15,8 @@ * For a full copy of the GNU General Public License see the GPL.txt file */ -#ifndef __DISTRHO_UI_NOTES_HPP__ -#define __DISTRHO_UI_NOTES_HPP__ +#ifndef DISTRHO_UI_NOTES_HPP_INCLUDED +#define DISTRHO_UI_NOTES_HPP_INCLUDED #include "DistrhoUIQt.hpp" #include "paramspinbox.hpp" @@ -104,8 +104,6 @@ private: void saveCurrentTextState(); }; -// ------------------------------------------------- - END_NAMESPACE_DISTRHO -#endif // __DISTRHO_UI_NOTES_HPP__ +#endif // DISTRHO_UI_NOTES_HPP_INCLUDED diff --git a/source/backend/native/pingpongpan/DistrhoPluginInfo.h b/source/backend/native/pingpongpan/DistrhoPluginInfo.h index 7eec254ee..be3a9029b 100644 --- a/source/backend/native/pingpongpan/DistrhoPluginInfo.h +++ b/source/backend/native/pingpongpan/DistrhoPluginInfo.h @@ -14,8 +14,8 @@ * For a full copy of the license see the LGPL.txt file */ -#ifndef __DISTRHO_PLUGIN_INFO_H__ -#define __DISTRHO_PLUGIN_INFO_H__ +#ifndef DISTRHO_PLUGIN_INFO_H_INCLUDED +#define DISTRHO_PLUGIN_INFO_H_INCLUDED #define DISTRHO_PLUGIN_NAME "Ping Pong Pan" @@ -34,4 +34,4 @@ #define DISTRHO_UI_OPENGL -#endif // __DISTRHO_PLUGIN_INFO_H__ +#endif // DISTRHO_PLUGIN_INFO_H_INCLUDED diff --git a/source/backend/native/pingpongpan/DistrhoPluginPingPongPan.hpp b/source/backend/native/pingpongpan/DistrhoPluginPingPongPan.hpp index 6d90dc814..79e8fe34c 100644 --- a/source/backend/native/pingpongpan/DistrhoPluginPingPongPan.hpp +++ b/source/backend/native/pingpongpan/DistrhoPluginPingPongPan.hpp @@ -15,8 +15,8 @@ * For a full copy of the license see the LGPL.txt file */ -#ifndef __DISTRHO_PLUGIN_PINGPONGPAN_HPP__ -#define __DISTRHO_PLUGIN_PINGPONGPAN_HPP__ +#ifndef DISTRHO_PLUGIN_PINGPONGPAN_HPP_INCLUDED +#define DISTRHO_PLUGIN_PINGPONGPAN_HPP_INCLUDED #include "DistrhoPlugin.hpp" @@ -96,4 +96,4 @@ private: END_NAMESPACE_DISTRHO -#endif // __DISTRHO_PLUGIN_PINGPONGPAN_HPP__ +#endif // DISTRHO_PLUGIN_PINGPONGPAN_HPP_INCLUDED diff --git a/source/backend/native/pingpongpan/DistrhoUIPingPongPan.hpp b/source/backend/native/pingpongpan/DistrhoUIPingPongPan.hpp index 0f7f3241d..42383d806 100644 --- a/source/backend/native/pingpongpan/DistrhoUIPingPongPan.hpp +++ b/source/backend/native/pingpongpan/DistrhoUIPingPongPan.hpp @@ -14,8 +14,8 @@ * For a full copy of the license see the LGPL.txt file */ -#ifndef __DISTRHO_UI_PINGPONGPAN_HPP__ -#define __DISTRHO_UI_PINGPONGPAN_HPP__ +#ifndef DISTRHO_UI_PINGPONGPAN_HPP_INCLUDED +#define DISTRHO_UI_PINGPONGPAN_HPP_INCLUDED #include "DistrhoUIOpenGL.hpp" @@ -78,8 +78,6 @@ private: ImageButton* fButtonAbout; }; -// ------------------------------------------------- - END_NAMESPACE_DISTRHO -#endif // __DISTRHO_UI_PINGPONGPAN_HPP__ +#endif // DISTRHO_UI_PINGPONGPAN_HPP_INCLUDED diff --git a/source/backend/native/stereoenhancer/DistrhoPluginInfo.h b/source/backend/native/stereoenhancer/DistrhoPluginInfo.h index aebd5de8e..461352ec6 100644 --- a/source/backend/native/stereoenhancer/DistrhoPluginInfo.h +++ b/source/backend/native/stereoenhancer/DistrhoPluginInfo.h @@ -14,8 +14,8 @@ * For a full copy of the license see the LGPL.txt file */ -#ifndef __DISTRHO_PLUGIN_INFO_H__ -#define __DISTRHO_PLUGIN_INFO_H__ +#ifndef DISTRHO_PLUGIN_INFO_H_INCLUDED +#define DISTRHO_PLUGIN_INFO_H_INCLUDED #define DISTRHO_PLUGIN_NAME "Stereo Enhancer" @@ -34,4 +34,4 @@ #define DISTRHO_UI_OPENGL -#endif // __DISTRHO_PLUGIN_INFO_H__ +#endif // DISTRHO_PLUGIN_INFO_H_INCLUDED diff --git a/source/backend/native/stereoenhancer/DistrhoPluginStereoEnhancer.hpp b/source/backend/native/stereoenhancer/DistrhoPluginStereoEnhancer.hpp index a36cf236a..37e7187b1 100644 --- a/source/backend/native/stereoenhancer/DistrhoPluginStereoEnhancer.hpp +++ b/source/backend/native/stereoenhancer/DistrhoPluginStereoEnhancer.hpp @@ -15,8 +15,8 @@ * For a full copy of the license see the LGPL.txt file */ -#ifndef __DISTRHO_PLUGIN_3BANDEQ_HPP__ -#define __DISTRHO_PLUGIN_3BANDEQ_HPP__ +#ifndef DISTRHO_PLUGIN_STEREO_ENHANCER_HPP_INCLUDED +#define DISTRHO_PLUGIN_STEREO_ENHANCER_HPP_INCLUDED #include "DistrhoPlugin.hpp" @@ -103,4 +103,4 @@ private: END_NAMESPACE_DISTRHO -#endif // __DISTRHO_PLUGIN_3BANDEQ_HPP__ +#endif // DISTRHO_PLUGIN_STEREO_ENHANCER_HPP_INCLUDED diff --git a/source/backend/native/stereoenhancer/DistrhoUIStereoEnhancer.hpp b/source/backend/native/stereoenhancer/DistrhoUIStereoEnhancer.hpp index 2ce68b7fe..893153ffb 100644 --- a/source/backend/native/stereoenhancer/DistrhoUIStereoEnhancer.hpp +++ b/source/backend/native/stereoenhancer/DistrhoUIStereoEnhancer.hpp @@ -14,8 +14,8 @@ * For a full copy of the license see the LGPL.txt file */ -#ifndef __DISTRHO_UI_3BANDEQ_HPP__ -#define __DISTRHO_UI_3BANDEQ_HPP__ +#ifndef DISTRHO_UI_STEREO_ENHANCER_HPP_INCLUDED +#define DISTRHO_UI_STEREO_ENHANCER_HPP_INCLUDED #include "DistrhoUIOpenGL.hpp" @@ -78,8 +78,6 @@ private: ImageButton* fButtonAbout; }; -// ------------------------------------------------- - END_NAMESPACE_DISTRHO -#endif // __DISTRHO_UI_3BANDEQ_HPP__ +#endif // DISTRHO_UI_STEREO_ENHANCER_HPP_INCLUDED diff --git a/source/backend/plugin/CarlaPluginGui.hpp b/source/backend/plugin/CarlaPluginGui.hpp index 0dcb19cc5..66479b373 100644 --- a/source/backend/plugin/CarlaPluginGui.hpp +++ b/source/backend/plugin/CarlaPluginGui.hpp @@ -15,8 +15,8 @@ * For a full copy of the GNU General Public License see the GPL.txt file */ -#ifndef __CARLA_PLUGIN_GUI_HPP__ -#define __CARLA_PLUGIN_GUI_HPP__ +#ifndef CARLA_PLUGIN_GUI_HPP_INCLUDED +#define CARLA_PLUGIN_GUI_HPP_INCLUDED #include "CarlaPluginInternal.hpp" @@ -79,4 +79,4 @@ private slots: CARLA_BACKEND_END_NAMESPACE -#endif // __CARLA_PLUGIN_GUI_HPP__ +#endif // CARLA_PLUGIN_GUI_HPP_INCLUDED diff --git a/source/backend/plugin/CarlaPluginInternal.hpp b/source/backend/plugin/CarlaPluginInternal.hpp index 44fd29acf..be9401621 100644 --- a/source/backend/plugin/CarlaPluginInternal.hpp +++ b/source/backend/plugin/CarlaPluginInternal.hpp @@ -12,11 +12,11 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * For a full copy of the GNU General Public License see the GPL.txt file + * For a full copy of the GNU General Public License see the doc/GPL.txt file. */ -#ifndef __CARLA_PLUGIN_INTERNAL_HPP__ -#define __CARLA_PLUGIN_INTERNAL_HPP__ +#ifndef CARLA_PLUGIN_INTERNAL_HPP_INCLUDED +#define CARLA_PLUGIN_INTERNAL_HPP_INCLUDED #include "CarlaPlugin.hpp" #include "CarlaPluginThread.hpp" @@ -806,38 +806,8 @@ struct CarlaPluginProtectedData { void saveSetting(const unsigned int option, const bool yesNo); unsigned int loadSettings(const unsigned int options, const unsigned int availOptions); - - // ------------------------------------------------------------------- - // Static helper functions - - static CarlaEngine* getEngine(CarlaPlugin* const plugin) - { - return plugin->kData->engine; - } - - static CarlaEngineClient* getEngineClient(CarlaPlugin* const plugin) - { - return plugin->kData->client; - } - - static CarlaEngineAudioPort* getAudioInPort(CarlaPlugin* const plugin, const uint32_t index) - { - return plugin->kData->audioIn.ports[index].port; - } - - static CarlaEngineAudioPort* getAudioOutPort(CarlaPlugin* const plugin, const uint32_t index) - { - return plugin->kData->audioOut.ports[index].port; - } - - static bool canRunInRack(CarlaPlugin* const plugin) - { - return (plugin->kData->extraHints & PLUGIN_HINT_CAN_RUN_RACK); - } }; -// ----------------------------------------------------------------------- - CARLA_BACKEND_END_NAMESPACE -#endif // __CARLA_PLUGIN_INTERNAL_HPP__ +#endif // CARLA_PLUGIN_INTERNAL_HPP_INCLUDED diff --git a/source/backend/plugin/CarlaPluginThread.cpp b/source/backend/plugin/CarlaPluginThread.cpp index 45105177e..509851e8d 100644 --- a/source/backend/plugin/CarlaPluginThread.cpp +++ b/source/backend/plugin/CarlaPluginThread.cpp @@ -12,7 +12,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * For a full copy of the GNU General Public License see the GPL.txt file + * For a full copy of the GNU General Public License see the doc/GPL.txt file. */ #include "CarlaPluginThread.hpp" @@ -45,12 +45,12 @@ const char* PluginThreadMode2str(const CarlaPluginThread::Mode mode) } CarlaPluginThread::CarlaPluginThread(CarlaBackend::CarlaEngine* const engine, CarlaBackend::CarlaPlugin* const plugin, const Mode mode) - : kEngine(engine), - kPlugin(plugin), + : fEngine(engine), + fPlugin(plugin), fMode(mode), fProcess(nullptr) { - carla_debug("CarlaPluginThread::CarlaPluginThread(plugin:\"%s\", engine:\"%s\", %s)", plugin->name(), engine->getName(), PluginThreadMode2str(mode)); + carla_debug("CarlaPluginThread::CarlaPluginThread(plugin:\"%s\", engine:\"%s\", %s)", plugin->getName(), engine->getName(), PluginThreadMode2str(mode)); } CarlaPluginThread::~CarlaPluginThread() @@ -99,7 +99,7 @@ void CarlaPluginThread::run() case PLUGIN_THREAD_LV2_GUI: case PLUGIN_THREAD_VST_GUI: fProcess->terminate(); - kEngine->callback(CarlaBackend::CALLBACK_SHOW_GUI, kPlugin->id(), -1, 0, 0.0f, nullptr); + fEngine->callback(CarlaBackend::CALLBACK_SHOW_GUI, fPlugin->getId(), -1, 0, 0.0f, nullptr); return; case PLUGIN_THREAD_BRIDGE: @@ -107,7 +107,7 @@ void CarlaPluginThread::run() } } - QString name(kPlugin->name()); + QString name(fPlugin->getName()); QStringList arguments; if (name.isEmpty()) @@ -119,29 +119,29 @@ void CarlaPluginThread::run() break; case PLUGIN_THREAD_DSSI_GUI: - /* osc-url */ arguments << QString("%1/%2").arg(kEngine->getOscServerPathUDP()).arg(kPlugin->id()); - /* filename */ arguments << kPlugin->filename(); + /* osc-url */ arguments << QString("%1/%2").arg(fEngine->getOscServerPathUDP()).arg(fPlugin->getId()); + /* filename */ arguments << fPlugin->getFilename(); /* label */ arguments << (const char*)fLabel; - /* ui-title */ arguments << QString("%1 (GUI)").arg(kPlugin->name()); + /* ui-title */ arguments << QString("%1 (GUI)").arg(fPlugin->getName()); break; case PLUGIN_THREAD_LV2_GUI: - /* osc-url */ arguments << QString("%1/%2").arg(kEngine->getOscServerPathTCP()).arg(kPlugin->id()); + /* osc-url */ arguments << QString("%1/%2").arg(fEngine->getOscServerPathTCP()).arg(fPlugin->getId()); /* URI */ arguments << (const char*)fLabel; /* ui-URI */ arguments << (const char*)fExtra1; - /* ui-title */ arguments << QString("%1 (GUI)").arg(kPlugin->name()); + /* ui-title */ arguments << QString("%1 (GUI)").arg(fPlugin->getName()); break; case PLUGIN_THREAD_VST_GUI: - /* osc-url */ arguments << QString("%1/%2").arg(kEngine->getOscServerPathTCP()).arg(kPlugin->id()); - /* filename */ arguments << kPlugin->filename(); - /* ui-title */ arguments << QString("%1 (GUI)").arg(kPlugin->name()); + /* osc-url */ arguments << QString("%1/%2").arg(fEngine->getOscServerPathTCP()).arg(fPlugin->getId()); + /* filename */ arguments << fPlugin->getFilename(); + /* ui-title */ arguments << QString("%1 (GUI)").arg(fPlugin->getName()); break; case PLUGIN_THREAD_BRIDGE: - /* osc-url */ arguments << QString("%1/%2").arg(kEngine->getOscServerPathTCP()).arg(kPlugin->id()); + /* osc-url */ arguments << QString("%1/%2").arg(fEngine->getOscServerPathTCP()).arg(fPlugin->getId()); /* stype */ arguments << (const char*)fExtra1; - /* filename */ arguments << kPlugin->filename(); + /* filename */ arguments << fPlugin->getFilename(); /* name */ arguments << name; /* label */ arguments << (const char*)fLabel; /* SHM ids */ arguments << (const char*)fExtra2; @@ -159,20 +159,20 @@ void CarlaPluginThread::run() case PLUGIN_THREAD_DSSI_GUI: case PLUGIN_THREAD_LV2_GUI: case PLUGIN_THREAD_VST_GUI: - if (kPlugin->waitForOscGuiShow()) + if (fPlugin->waitForOscGuiShow()) { fProcess->waitForFinished(-1); if (fProcess->exitCode() == 0) { // Hide - kEngine->callback(CarlaBackend::CALLBACK_SHOW_GUI, kPlugin->id(), 0, 0, 0.0f, nullptr); + fEngine->callback(CarlaBackend::CALLBACK_SHOW_GUI, fPlugin->getId(), 0, 0, 0.0f, nullptr); carla_stdout("CarlaPluginThread::run() - GUI closed"); } else { // Kill - kEngine->callback(CarlaBackend::CALLBACK_SHOW_GUI, kPlugin->id(), -1, 0, 0.0f, nullptr); + fEngine->callback(CarlaBackend::CALLBACK_SHOW_GUI, fPlugin->getId(), -1, 0, 0.0f, nullptr); carla_stderr("CarlaPluginThread::run() - GUI crashed while running"); } } @@ -183,12 +183,12 @@ void CarlaPluginThread::run() if (fProcess->exitCode() != 0 || fProcess->exitStatus() == QProcess::CrashExit) { - kEngine->callback(CarlaBackend::CALLBACK_SHOW_GUI, kPlugin->id(), -1, 0, 0.0f, nullptr); + fEngine->callback(CarlaBackend::CALLBACK_SHOW_GUI, fPlugin->getId(), -1, 0, 0.0f, nullptr); carla_stderr("CarlaPluginThread::run() - GUI crashed while opening"); } else { - kEngine->callback(CarlaBackend::CALLBACK_SHOW_GUI, kPlugin->id(), 0, 0, 0.0f, nullptr); + fEngine->callback(CarlaBackend::CALLBACK_SHOW_GUI, fPlugin->getId(), 0, 0, 0.0f, nullptr); carla_debug("CarlaPluginThread::run() - GUI timeout"); } } @@ -201,10 +201,10 @@ void CarlaPluginThread::run() { carla_stderr("CarlaPluginThread::run() - bridge crashed"); - CarlaString errorString("Plugin '" + CarlaString(kPlugin->name()) + "' has crashed!\n" + CarlaString errorString("Plugin '" + CarlaString(fPlugin->getName()) + "' has crashed!\n" "Saving now will lose its current settings.\n" "Please remove this plugin, and not rely on it from this point."); - kEngine->callback(CarlaBackend::CALLBACK_ERROR, kPlugin->id(), 0, 0, 0.0f, (const char*)errorString); + fEngine->callback(CarlaBackend::CALLBACK_ERROR, fPlugin->getId(), 0, 0, 0.0f, (const char*)errorString); } break; } diff --git a/source/backend/standalone/CarlaStandalone.cpp b/source/backend/standalone/CarlaStandalone.cpp index eef5f22ac..9250bca33 100644 --- a/source/backend/standalone/CarlaStandalone.cpp +++ b/source/backend/standalone/CarlaStandalone.cpp @@ -12,7 +12,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * For a full copy of the GNU General Public License see the GPL.txt file + * For a full copy of the GNU General Public License see the doc/GPL.txt file. */ #include "CarlaStandalone.hpp" @@ -37,12 +37,14 @@ # include #endif -using CarlaBackend::CarlaEngine; -using CarlaBackend::CarlaPlugin; -using CarlaBackend::CallbackFunc; -using CarlaBackend::EngineOptions; -using CarlaBackend::EngineTimeInfo; -using CarlaBackend::LogThread; +namespace CB = CarlaBackend; + +using CB::CarlaEngine; +using CB::CarlaPlugin; +using CB::CallbackFunc; +using CB::EngineOptions; +using CB::EngineTimeInfo; +using CB::LogThread; // ------------------------------------------------------------------------------------------------------------------- // Single, standalone engine @@ -103,7 +105,7 @@ struct CarlaBackendStandalone { if (app != nullptr) return; - // try again, app might be registered now + // try again, app might be registed now app = qApp; if (app != nullptr) @@ -130,7 +132,7 @@ struct CarlaBackendStandalone { app = nullptr; } - CARLA_DECLARE_NON_COPY_STRUCT_WITH_LEAK_DETECTOR(CarlaBackendStandalone) + CARLA_DECLARE_NON_COPY_STRUCT(CarlaBackendStandalone) } standalone; @@ -296,9 +298,9 @@ unsigned int carla_get_internal_plugin_count() #ifdef WANT_NATIVE return static_cast(CarlaPlugin::getNativePluginCount()); -#endif - +#else return 0; +#endif } const CarlaNativePluginInfo* carla_get_internal_plugin_info(unsigned int internalPluginId) @@ -320,15 +322,13 @@ const CarlaNativePluginInfo* carla_get_internal_plugin_info(unsigned int interna info.hints = 0x0; if (nativePlugin->hints & PLUGIN_IS_RTSAFE) - info.hints |= CarlaBackend::PLUGIN_IS_RTSAFE; + info.hints |= CB::PLUGIN_IS_RTSAFE; if (nativePlugin->hints & PLUGIN_IS_SYNTH) - info.hints |= CarlaBackend::PLUGIN_IS_SYNTH; + info.hints |= CB::PLUGIN_IS_SYNTH; if (nativePlugin->hints & PLUGIN_HAS_GUI) - info.hints |= CarlaBackend::PLUGIN_HAS_GUI; - if (nativePlugin->hints & PLUGIN_USES_GUI_AS_FILE) - info.hints |= CarlaBackend::PLUGIN_HAS_GUI_AS_FILE; + info.hints |= CB::PLUGIN_HAS_GUI; if (nativePlugin->hints & PLUGIN_USES_SINGLE_THREAD) - info.hints |= CarlaBackend::PLUGIN_HAS_SINGLE_THREAD; + info.hints |= CB::PLUGIN_HAS_SINGLE_THREAD; info.audioIns = nativePlugin->audioIns; info.audioOuts = nativePlugin->audioOuts; @@ -355,17 +355,17 @@ const CarlaNativePluginInfo* carla_get_internal_plugin_info(unsigned int interna bool carla_engine_init(const char* driverName, const char* clientName) { - carla_debug("carla_engine_init(\"%s\", \"%s\")", driverName, clientName); CARLA_ASSERT(standalone.engine == nullptr); CARLA_ASSERT(driverName != nullptr); CARLA_ASSERT(clientName != nullptr); + carla_debug("carla_engine_init(\"%s\", \"%s\")", driverName, clientName); #ifndef NDEBUG static bool showWarning = true; if (showWarning && standalone.callback != nullptr) { - standalone.callback(standalone.callbackPtr, CarlaBackend::CALLBACK_DEBUG, 0, 0, 0, 0.0f, "Debug builds don't use this, check the console instead"); + standalone.callback(standalone.callbackPtr, CB::CALLBACK_DEBUG, 0, 0, 0, 0.0f, "Debug builds don't use this, check the console instead"); showWarning = false; } #endif @@ -399,49 +399,47 @@ bool carla_engine_init(const char* driverName, const char* clientName) standalone.engine->setCallback(standalone.callback, nullptr); #ifndef BUILD_BRIDGE - standalone.engine->setOption(CarlaBackend::OPTION_PROCESS_MODE, static_cast(standalone.options.processMode), nullptr); -# if 0 // disabled for now - standalone.engine->setOption(CarlaBackend::OPTION_TRANSPORT_MODE, static_cast(standalone.options.transportMode), nullptr); -# endif - standalone.engine->setOption(CarlaBackend::OPTION_FORCE_STEREO, standalone.options.forceStereo ? 1 : 0, nullptr); - standalone.engine->setOption(CarlaBackend::OPTION_PREFER_PLUGIN_BRIDGES, standalone.options.preferPluginBridges ? 1 : 0, nullptr); - standalone.engine->setOption(CarlaBackend::OPTION_PREFER_UI_BRIDGES, standalone.options.preferUiBridges ? 1 : 0, nullptr); -# ifdef WANT_DSSI - standalone.engine->setOption(CarlaBackend::OPTION_USE_DSSI_VST_CHUNKS, standalone.options.useDssiVstChunks ? 1 : 0, nullptr); -# endif - standalone.engine->setOption(CarlaBackend::OPTION_MAX_PARAMETERS, static_cast(standalone.options.maxParameters), nullptr); - standalone.engine->setOption(CarlaBackend::OPTION_OSC_UI_TIMEOUT, static_cast(standalone.options.oscUiTimeout), nullptr); - standalone.engine->setOption(CarlaBackend::OPTION_JACK_AUTOCONNECT, standalone.options.jackAutoConnect ? 1 : 0, nullptr); - standalone.engine->setOption(CarlaBackend::OPTION_JACK_TIMEMASTER, standalone.options.jackTimeMaster ? 1 : 0, nullptr); -# ifdef WANT_RTAUDIO - standalone.engine->setOption(CarlaBackend::OPTION_RTAUDIO_BUFFER_SIZE, static_cast(standalone.options.rtaudioBufferSize), nullptr); - standalone.engine->setOption(CarlaBackend::OPTION_RTAUDIO_SAMPLE_RATE, static_cast(standalone.options.rtaudioSampleRate), nullptr); - standalone.engine->setOption(CarlaBackend::OPTION_RTAUDIO_DEVICE, 0, (const char*)standalone.options.rtaudioDevice); -# endif - standalone.engine->setOption(CarlaBackend::OPTION_PATH_RESOURCES, 0, (const char*)standalone.options.resourceDir); - standalone.engine->setOption(CarlaBackend::OPTION_PATH_BRIDGE_NATIVE, 0, (const char*)standalone.options.bridge_native); - standalone.engine->setOption(CarlaBackend::OPTION_PATH_BRIDGE_POSIX32, 0, (const char*)standalone.options.bridge_posix32); - standalone.engine->setOption(CarlaBackend::OPTION_PATH_BRIDGE_POSIX64, 0, (const char*)standalone.options.bridge_posix64); - standalone.engine->setOption(CarlaBackend::OPTION_PATH_BRIDGE_WIN32, 0, (const char*)standalone.options.bridge_win32); - standalone.engine->setOption(CarlaBackend::OPTION_PATH_BRIDGE_WIN64, 0, (const char*)standalone.options.bridge_win64); -# ifdef WANT_LV2 - standalone.engine->setOption(CarlaBackend::OPTION_PATH_BRIDGE_LV2_GTK2, 0, (const char*)standalone.options.bridge_lv2Gtk2); - standalone.engine->setOption(CarlaBackend::OPTION_PATH_BRIDGE_LV2_GTK3, 0, (const char*)standalone.options.bridge_lv2Gtk3); - standalone.engine->setOption(CarlaBackend::OPTION_PATH_BRIDGE_LV2_QT4, 0, (const char*)standalone.options.bridge_lv2Qt4); - standalone.engine->setOption(CarlaBackend::OPTION_PATH_BRIDGE_LV2_QT5, 0, (const char*)standalone.options.bridge_lv2Qt5); - standalone.engine->setOption(CarlaBackend::OPTION_PATH_BRIDGE_LV2_COCOA, 0, (const char*)standalone.options.bridge_lv2Cocoa); - standalone.engine->setOption(CarlaBackend::OPTION_PATH_BRIDGE_LV2_WINDOWS, 0, (const char*)standalone.options.bridge_lv2Win); - standalone.engine->setOption(CarlaBackend::OPTION_PATH_BRIDGE_LV2_X11, 0, (const char*)standalone.options.bridge_lv2X11); -# endif -# ifdef WANT_VST - standalone.engine->setOption(CarlaBackend::OPTION_PATH_BRIDGE_VST_COCOA, 0, (const char*)standalone.options.bridge_vstCocoa); - standalone.engine->setOption(CarlaBackend::OPTION_PATH_BRIDGE_VST_HWND, 0, (const char*)standalone.options.bridge_vstHWND); - standalone.engine->setOption(CarlaBackend::OPTION_PATH_BRIDGE_VST_X11, 0, (const char*)standalone.options.bridge_vstX11); -# endif + standalone.engine->setOption(CB::OPTION_PROCESS_MODE, static_cast(standalone.options.processMode), nullptr); + standalone.engine->setOption(CB::OPTION_TRANSPORT_MODE, static_cast(standalone.options.transportMode), nullptr); +#endif + standalone.engine->setOption(CB::OPTION_FORCE_STEREO, standalone.options.forceStereo ? 1 : 0, nullptr); + standalone.engine->setOption(CB::OPTION_PREFER_PLUGIN_BRIDGES, standalone.options.preferPluginBridges ? 1 : 0, nullptr); + standalone.engine->setOption(CB::OPTION_PREFER_UI_BRIDGES, standalone.options.preferUiBridges ? 1 : 0, nullptr); + standalone.engine->setOption(CB::OPTION_UIS_ALWAYS_ON_TOP, standalone.options.uisAlwaysOnTop ? 1 : 0, nullptr); +#ifdef WANT_DSSI + standalone.engine->setOption(CB::OPTION_USE_DSSI_VST_CHUNKS, standalone.options.useDssiVstChunks ? 1 : 0, nullptr); +#endif + standalone.engine->setOption(CB::OPTION_MAX_PARAMETERS, static_cast(standalone.options.maxParameters), nullptr); + standalone.engine->setOption(CB::OPTION_UI_BRIDGES_TIMEOUT, static_cast(standalone.options.uiBridgesTimeout), nullptr); +#ifdef WANT_RTAUDIO + standalone.engine->setOption(CB::OPTION_RTAUDIO_NUMBER_PERIODS, static_cast(standalone.options.rtaudioNumPeriods), nullptr); + standalone.engine->setOption(CB::OPTION_RTAUDIO_BUFFER_SIZE, static_cast(standalone.options.rtaudioBufferSize), nullptr); + standalone.engine->setOption(CB::OPTION_RTAUDIO_SAMPLE_RATE, static_cast(standalone.options.rtaudioSampleRate), nullptr); + standalone.engine->setOption(CB::OPTION_RTAUDIO_DEVICE, 0, (const char*)standalone.options.rtaudioDevice); +#endif + standalone.engine->setOption(CB::OPTION_PATH_RESOURCES, 0, (const char*)standalone.options.resourceDir); + standalone.engine->setOption(CB::OPTION_PATH_BRIDGE_NATIVE, 0, (const char*)standalone.options.bridge_native); + standalone.engine->setOption(CB::OPTION_PATH_BRIDGE_POSIX32, 0, (const char*)standalone.options.bridge_posix32); + standalone.engine->setOption(CB::OPTION_PATH_BRIDGE_POSIX64, 0, (const char*)standalone.options.bridge_posix64); + standalone.engine->setOption(CB::OPTION_PATH_BRIDGE_WIN32, 0, (const char*)standalone.options.bridge_win32); + standalone.engine->setOption(CB::OPTION_PATH_BRIDGE_WIN64, 0, (const char*)standalone.options.bridge_win64); +#ifdef WANT_LV2 + standalone.engine->setOption(CB::OPTION_PATH_BRIDGE_LV2_GTK2, 0, (const char*)standalone.options.bridge_lv2Gtk2); + standalone.engine->setOption(CB::OPTION_PATH_BRIDGE_LV2_GTK3, 0, (const char*)standalone.options.bridge_lv2Gtk3); + standalone.engine->setOption(CB::OPTION_PATH_BRIDGE_LV2_QT4, 0, (const char*)standalone.options.bridge_lv2Qt4); + standalone.engine->setOption(CB::OPTION_PATH_BRIDGE_LV2_QT5, 0, (const char*)standalone.options.bridge_lv2Qt5); + standalone.engine->setOption(CB::OPTION_PATH_BRIDGE_LV2_COCOA, 0, (const char*)standalone.options.bridge_lv2Cocoa); + standalone.engine->setOption(CB::OPTION_PATH_BRIDGE_LV2_WINDOWS, 0, (const char*)standalone.options.bridge_lv2Win); + standalone.engine->setOption(CB::OPTION_PATH_BRIDGE_LV2_X11, 0, (const char*)standalone.options.bridge_lv2X11); +#endif +#ifdef WANT_VST + standalone.engine->setOption(CB::OPTION_PATH_BRIDGE_VST_COCOA, 0, (const char*)standalone.options.bridge_vstCocoa); + standalone.engine->setOption(CB::OPTION_PATH_BRIDGE_VST_HWND, 0, (const char*)standalone.options.bridge_vstHWND); + standalone.engine->setOption(CB::OPTION_PATH_BRIDGE_VST_X11, 0, (const char*)standalone.options.bridge_vstX11); +#endif if (standalone.procName.isNotEmpty()) - standalone.engine->setOption(CarlaBackend::OPTION_PROCESS_NAME, 0, (const char*)standalone.procName); -#endif + standalone.engine->setOption(CB::OPTION_PROCESS_NAME, 0, (const char*)standalone.procName); if (standalone.engine->init(clientName)) { @@ -460,8 +458,8 @@ bool carla_engine_init(const char* driverName, const char* clientName) bool carla_engine_close() { - carla_debug("carla_engine_close()"); CARLA_ASSERT(standalone.engine != nullptr); + carla_debug("carla_engine_close()"); if (standalone.engine == nullptr) { @@ -504,8 +502,8 @@ bool carla_is_engine_running() void carla_set_engine_about_to_close() { - carla_debug("carla_set_engine_about_to_close()"); CARLA_ASSERT(standalone.engine != nullptr); + carla_debug("carla_set_engine_about_to_close()"); if (standalone.engine != nullptr) standalone.engine->setAboutToClose(); @@ -526,142 +524,140 @@ void carla_set_engine_callback(CarlaCallbackFunc func, void* ptr) void carla_set_engine_option(CarlaOptionsType option, int value, const char* valueStr) { - carla_debug("carla_set_engine_option(%s, %i, \"%s\")", CarlaBackend::OptionsType2Str(option), value, valueStr); + carla_debug("carla_set_engine_option(%s, %i, \"%s\")", CB::OptionsType2Str(option), value, valueStr); switch (option) { - case CarlaBackend::OPTION_PROCESS_NAME: + case CB::OPTION_PROCESS_NAME: standalone.procName = valueStr; break; - case CarlaBackend::OPTION_PROCESS_MODE: - if (value < CarlaBackend::PROCESS_MODE_SINGLE_CLIENT || value > CarlaBackend::PROCESS_MODE_PATCHBAY) + case CB::OPTION_PROCESS_MODE: + if (value < CB::PROCESS_MODE_SINGLE_CLIENT || value > CB::PROCESS_MODE_PATCHBAY) return carla_stderr2("carla_set_engine_option(OPTION_PROCESS_MODE, %i, \"%s\") - invalid value", value, valueStr); - standalone.options.processMode = static_cast(value); + standalone.options.processMode = static_cast(value); break; - case CarlaBackend::OPTION_TRANSPORT_MODE: -#if 0 // disabled for now - if (value < CarlaBackend::TRANSPORT_MODE_INTERNAL || value > CarlaBackend::TRANSPORT_MODE_JACK) + case CB::OPTION_TRANSPORT_MODE: + if (value < CB::TRANSPORT_MODE_INTERNAL || value > CB::TRANSPORT_MODE_JACK) return carla_stderr2("carla_set_engine_option(OPTION_TRANSPORT_MODE, %i, \"%s\") - invalid value", value, valueStr); - standalone.options.transportMode = static_cast(value); -#endif + standalone.options.transportMode = static_cast(value); break; - case CarlaBackend::OPTION_FORCE_STEREO: + case CB::OPTION_FORCE_STEREO: standalone.options.forceStereo = (value != 0); break; - case CarlaBackend::OPTION_PREFER_PLUGIN_BRIDGES: + case CB::OPTION_PREFER_PLUGIN_BRIDGES: standalone.options.preferPluginBridges = (value != 0); break; - case CarlaBackend::OPTION_PREFER_UI_BRIDGES: + case CB::OPTION_PREFER_UI_BRIDGES: standalone.options.preferUiBridges = (value != 0); break; #ifdef WANT_DSSI - case CarlaBackend::OPTION_USE_DSSI_VST_CHUNKS: + case CB::OPTION_USE_DSSI_VST_CHUNKS: standalone.options.useDssiVstChunks = (value != 0); break; #endif - case CarlaBackend::OPTION_MAX_PARAMETERS: + case CB::OPTION_MAX_PARAMETERS: if (value <= 0) return carla_stderr2("carla_set_engine_option(OPTION_MAX_PARAMETERS, %i, \"%s\") - invalid value", value, valueStr); standalone.options.maxParameters = static_cast(value); break; - case CarlaBackend::OPTION_OSC_UI_TIMEOUT: + case CB::OPTION_OSC_UI_TIMEOUT: if (value <= 0) return carla_stderr2("carla_set_engine_option(OPTION_OSC_UI_TIMEOUT, %i, \"%s\") - invalid value", value, valueStr); standalone.options.oscUiTimeout = static_cast(value); break; - case CarlaBackend::OPTION_JACK_AUTOCONNECT: + case CB::OPTION_JACK_AUTOCONNECT: standalone.options.jackAutoConnect = (value != 0); break; - case CarlaBackend::OPTION_JACK_TIMEMASTER: + case CB::OPTION_JACK_TIMEMASTER: standalone.options.jackTimeMaster = (value != 0); break; #ifdef WANT_RTAUDIO - case CarlaBackend::OPTION_RTAUDIO_BUFFER_SIZE: + case CB::OPTION_RTAUDIO_BUFFER_SIZE: if (value <= 0) return carla_stderr2("carla_set_engine_option(OPTION_RTAUDIO_BUFFER_SIZE, %i, \"%s\") - invalid value", value, valueStr); standalone.options.rtaudioBufferSize = static_cast(value); break; - case CarlaBackend::OPTION_RTAUDIO_SAMPLE_RATE: + case CB::OPTION_RTAUDIO_SAMPLE_RATE: if (value <= 0) return carla_stderr2("carla_set_engine_option(OPTION_RTAUDIO_SAMPLE_RATE, %i, \"%s\") - invalid value", value, valueStr); standalone.options.rtaudioSampleRate = static_cast(value); break; - case CarlaBackend::OPTION_RTAUDIO_DEVICE: + case CB::OPTION_RTAUDIO_DEVICE: standalone.options.rtaudioDevice = valueStr; break; #endif - case CarlaBackend::OPTION_PATH_RESOURCES: + case CB::OPTION_PATH_RESOURCES: standalone.options.resourceDir = valueStr; break; #ifndef BUILD_BRIDGE - case CarlaBackend::OPTION_PATH_BRIDGE_NATIVE: + case CB::OPTION_PATH_BRIDGE_NATIVE: standalone.options.bridge_native = valueStr; break; - case CarlaBackend::OPTION_PATH_BRIDGE_POSIX32: + case CB::OPTION_PATH_BRIDGE_POSIX32: standalone.options.bridge_posix32 = valueStr; break; - case CarlaBackend::OPTION_PATH_BRIDGE_POSIX64: + case CB::OPTION_PATH_BRIDGE_POSIX64: standalone.options.bridge_posix64 = valueStr; break; - case CarlaBackend::OPTION_PATH_BRIDGE_WIN32: + case CB::OPTION_PATH_BRIDGE_WIN32: standalone.options.bridge_win32 = valueStr; break; - case CarlaBackend::OPTION_PATH_BRIDGE_WIN64: + case CB::OPTION_PATH_BRIDGE_WIN64: standalone.options.bridge_win64 = valueStr; break; #endif #ifdef WANT_LV2 - case CarlaBackend::OPTION_PATH_BRIDGE_LV2_GTK2: + case CB::OPTION_PATH_BRIDGE_LV2_GTK2: standalone.options.bridge_lv2Gtk2 = valueStr; break; - case CarlaBackend::OPTION_PATH_BRIDGE_LV2_GTK3: + case CB::OPTION_PATH_BRIDGE_LV2_GTK3: standalone.options.bridge_lv2Gtk3 = valueStr; break; - case CarlaBackend::OPTION_PATH_BRIDGE_LV2_QT4: + case CB::OPTION_PATH_BRIDGE_LV2_QT4: standalone.options.bridge_lv2Qt4 = valueStr; break; - case CarlaBackend::OPTION_PATH_BRIDGE_LV2_QT5: + case CB::OPTION_PATH_BRIDGE_LV2_QT5: standalone.options.bridge_lv2Qt5 = valueStr; break; - case CarlaBackend::OPTION_PATH_BRIDGE_LV2_COCOA: + case CB::OPTION_PATH_BRIDGE_LV2_COCOA: standalone.options.bridge_lv2Cocoa = valueStr; break; - case CarlaBackend::OPTION_PATH_BRIDGE_LV2_WINDOWS: + case CB::OPTION_PATH_BRIDGE_LV2_WINDOWS: standalone.options.bridge_lv2Win = valueStr; break; - case CarlaBackend::OPTION_PATH_BRIDGE_LV2_X11: + case CB::OPTION_PATH_BRIDGE_LV2_X11: standalone.options.bridge_lv2X11 = valueStr; break; #endif #ifdef WANT_VST - case CarlaBackend::OPTION_PATH_BRIDGE_VST_COCOA: + case CB::OPTION_PATH_BRIDGE_VST_COCOA: standalone.options.bridge_vstCocoa = valueStr; break; - case CarlaBackend::OPTION_PATH_BRIDGE_VST_HWND: + case CB::OPTION_PATH_BRIDGE_VST_HWND: standalone.options.bridge_vstHWND = valueStr; break; - case CarlaBackend::OPTION_PATH_BRIDGE_VST_X11: + case CB::OPTION_PATH_BRIDGE_VST_X11: standalone.options.bridge_vstX11 = valueStr; break; #endif @@ -834,7 +830,7 @@ const CarlaTransportInfo* carla_get_transport_info() bool carla_add_plugin(CarlaBinaryType btype, CarlaPluginType ptype, const char* filename, const char* const name, const char* label, const void* extraStuff) { - carla_debug("carla_add_plugin(%s, %s, \"%s\", \"%s\", \"%s\", %p)", CarlaBackend::BinaryType2Str(btype), CarlaBackend::PluginType2Str(ptype), filename, name, label, extraStuff); + carla_debug("carla_add_plugin(%s, %s, \"%s\", \"%s\", \"%s\", %p)", CB::BinaryType2Str(btype), CB::PluginType2Str(ptype), filename, name, label, extraStuff); CARLA_ASSERT(standalone.engine != nullptr); if (standalone.engine != nullptr && standalone.engine->isRunning()) @@ -961,8 +957,8 @@ const CarlaPluginInfo* carla_get_plugin_info(unsigned int pluginId) static CarlaPluginInfo info; // reset - info.type = CarlaBackend::PLUGIN_NONE; - info.category = CarlaBackend::PLUGIN_CATEGORY_NONE; + info.type = CB::PLUGIN_NONE; + info.category = CB::PLUGIN_CATEGORY_NONE; info.hints = 0x0; info.hints = 0x0; info.binary = nullptr; @@ -1324,7 +1320,7 @@ const char* carla_get_chunk_data(unsigned int pluginId) if (CarlaPlugin* const plugin = standalone.engine->getPlugin(pluginId)) { - if (plugin->options() & CarlaBackend::PLUGIN_OPTION_USE_CHUNKS) + if (plugin->options() & CB::PLUGIN_OPTION_USE_CHUNKS) { void* data = nullptr; const int32_t dataSize = plugin->chunkData(&data); @@ -1880,7 +1876,7 @@ void carla_set_chunk_data(unsigned int pluginId, const char* chunkData) if (CarlaPlugin* const plugin = standalone.engine->getPlugin(pluginId)) { - if (plugin->options() & CarlaBackend::PLUGIN_OPTION_USE_CHUNKS) + if (plugin->options() & CB::PLUGIN_OPTION_USE_CHUNKS) return plugin->setChunkData(chunkData); carla_stderr2("carla_set_chunk_data(%i, \"%s\") - plugin does not support chunks", pluginId, chunkData); @@ -2099,7 +2095,7 @@ protected: carla_msleep(100); if (std::strcmp(method, "/nsm/server/announce") == 0 && standalone.callback != nullptr) - standalone.callback(standalone.callbackPtr, CarlaBackend::CALLBACK_NSM_ANNOUNCE, 0, 0, 0, 0.0f, smName); + standalone.callback(standalone.callbackPtr, CB::CALLBACK_NSM_ANNOUNCE, 0, 0, 0, 0.0f, smName); return 0; @@ -2132,7 +2128,7 @@ protected: fIsOpened = false; - standalone.callback(nullptr, CarlaBackend::CALLBACK_NSM_OPEN, 0, 0, 0, 0.0f, data); + standalone.callback(nullptr, CB::CALLBACK_NSM_OPEN, 0, 0, 0, 0.0f, data); // wait max 10 secs to open for (int i=0; i < 100 && ! fIsOpened; ++i) @@ -2167,7 +2163,7 @@ protected: fIsSaved = false; - standalone.callback(nullptr, CarlaBackend::CALLBACK_NSM_SAVE, 0, 0, 0, 0.0f, nullptr); + standalone.callback(nullptr, CB::CALLBACK_NSM_SAVE, 0, 0, 0, 0.0f, nullptr); // wait max 10 secs to save for (int i=0; i < 100 && ! fIsSaved; ++i) @@ -2272,18 +2268,18 @@ bool carla_engine_init_bridge(const char* audioBaseName, const char* controlBase if (standalone.callback != nullptr) standalone.engine->setCallback(standalone.callback, nullptr); - standalone.engine->setOption(CarlaBackend::OPTION_PROCESS_MODE, CarlaBackend::PROCESS_MODE_BRIDGE, nullptr); - standalone.engine->setOption(CarlaBackend::OPTION_TRANSPORT_MODE, CarlaBackend::TRANSPORT_MODE_BRIDGE, nullptr); - standalone.engine->setOption(CarlaBackend::OPTION_PREFER_PLUGIN_BRIDGES, false, nullptr); - standalone.engine->setOption(CarlaBackend::OPTION_PREFER_UI_BRIDGES, false, nullptr); + standalone.engine->setOption(CB::OPTION_PROCESS_MODE, CB::PROCESS_MODE_BRIDGE, nullptr); + standalone.engine->setOption(CB::OPTION_TRANSPORT_MODE, CB::TRANSPORT_MODE_BRIDGE, nullptr); + standalone.engine->setOption(CB::OPTION_PREFER_PLUGIN_BRIDGES, false, nullptr); + standalone.engine->setOption(CB::OPTION_PREFER_UI_BRIDGES, false, nullptr); // TODO - read from environment #if 0 - standalone.engine->setOption(CarlaBackend::OPTION_FORCE_STEREO, standalone.options.forceStereo ? 1 : 0, nullptr); + standalone.engine->setOption(CB::OPTION_FORCE_STEREO, standalone.options.forceStereo ? 1 : 0, nullptr); # ifdef WANT_DSSI - standalone.engine->setOption(CarlaBackend::OPTION_USE_DSSI_VST_CHUNKS, standalone.options.useDssiVstChunks ? 1 : 0, nullptr); + standalone.engine->setOption(CB::OPTION_USE_DSSI_VST_CHUNKS, standalone.options.useDssiVstChunks ? 1 : 0, nullptr); # endif - standalone.engine->setOption(CarlaBackend::OPTION_MAX_PARAMETERS, static_cast(standalone.options.maxParameters), nullptr); + standalone.engine->setOption(CB::OPTION_MAX_PARAMETERS, static_cast(standalone.options.maxParameters), nullptr); #endif if (standalone.engine->init(clientName)) diff --git a/source/bridges/CarlaBridge.hpp b/source/bridges/CarlaBridge.hpp index 2893b60e2..e5e2c612a 100644 --- a/source/bridges/CarlaBridge.hpp +++ b/source/bridges/CarlaBridge.hpp @@ -15,8 +15,8 @@ * For a full copy of the GNU General Public License see the GPL.txt file */ -#ifndef __CARLA_BRIDGE_HPP__ -#define __CARLA_BRIDGE_HPP__ +#ifndef CARLA_BRIDGE_HPP_INCLUDED +#define CARLA_BRIDGE_HPP_INCLUDED #include "CarlaDefines.hpp" @@ -32,4 +32,4 @@ class CarlaBridgeToolkit; CARLA_BRIDGE_END_NAMESPACE -#endif // __CARLA_BRIDGE_HPP__ +#endif // CARLA_BRIDGE_HPP_INCLUDED diff --git a/source/bridges/CarlaBridgeClient.hpp b/source/bridges/CarlaBridgeClient.hpp index 2b069c3d9..6096cb281 100644 --- a/source/bridges/CarlaBridgeClient.hpp +++ b/source/bridges/CarlaBridgeClient.hpp @@ -15,8 +15,8 @@ * For a full copy of the GNU General Public License see the GPL.txt file */ -#ifndef __CARLA_BRIDGE_CLIENT_HPP__ -#define __CARLA_BRIDGE_CLIENT_HPP__ +#ifndef CARLA_BRIDGE_CLIENT_HPP_INCLUDED +#define CARLA_BRIDGE_CLIENT_HPP_INCLUDED #include "CarlaBridgeOsc.hpp" @@ -174,4 +174,4 @@ private: CARLA_BRIDGE_END_NAMESPACE -#endif // __CARLA_BRIDGE_CLIENT_HPP__ +#endif // CARLA_BRIDGE_CLIENT_HPP_INCLUDED diff --git a/source/bridges/CarlaBridgeOsc.hpp b/source/bridges/CarlaBridgeOsc.hpp index d2d5ebc3f..42339e909 100644 --- a/source/bridges/CarlaBridgeOsc.hpp +++ b/source/bridges/CarlaBridgeOsc.hpp @@ -15,8 +15,8 @@ * For a full copy of the GNU General Public License see the GPL.txt file */ -#ifndef __CARLA_BRIDGE_OSC_HPP__ -#define __CARLA_BRIDGE_OSC_HPP__ +#ifndef CARLA_BRIDGE_OSC_HPP_INCLUDED +#define CARLA_BRIDGE_OSC_HPP_INCLUDED #include "CarlaBridge.hpp" #include "CarlaOscUtils.hpp" @@ -138,4 +138,4 @@ private: CARLA_BRIDGE_END_NAMESPACE -#endif // __CARLA_BRIDGE_OSC_HPP__ +#endif // CARLA_BRIDGE_OSC_HPP_INCLUDED diff --git a/source/bridges/CarlaBridgeToolkit.hpp b/source/bridges/CarlaBridgeToolkit.hpp index b88999c5e..f8a225fc1 100644 --- a/source/bridges/CarlaBridgeToolkit.hpp +++ b/source/bridges/CarlaBridgeToolkit.hpp @@ -15,8 +15,8 @@ * For a full copy of the GNU General Public License see the GPL.txt file */ -#ifndef __CARLA_BRIDGE_TOOLKIT_HPP__ -#define __CARLA_BRIDGE_TOOLKIT_HPP__ +#ifndef CARLA_BRIDGE_TOOLKIT_HPP_INCLUDED +#define CARLA_BRIDGE_TOOLKIT_HPP_INCLUDED #include "CarlaBridge.hpp" #include "CarlaJuceUtils.hpp" diff --git a/source/carla_backend.py b/source/carla_backend.py index f343ab579..55b957c91 100644 --- a/source/carla_backend.py +++ b/source/carla_backend.py @@ -203,10 +203,10 @@ OPTION_TRANSPORT_MODE = 2 OPTION_FORCE_STEREO = 3 OPTION_PREFER_PLUGIN_BRIDGES = 4 OPTION_PREFER_UI_BRIDGES = 5 -OPTION_USE_DSSI_VST_CHUNKS = 6 -OPTION_MAX_PARAMETERS = 7 -OPTION_UI_BRIDGES_TIMEOUT = 8 -OPTION_JACK_AUTOCONNECT = 9 +OPTION_UIS_ALWAYS_ON_TOP = 6 +OPTION_USE_DSSI_VST_CHUNKS = 7 +OPTION_MAX_PARAMETERS = 8 +OPTION_UI_BRIDGES_TIMEOUT = 9 OPTION_RTAUDIO_NUMBER_PERIODS = 10 OPTION_RTAUDIO_BUFFER_SIZE = 11 OPTION_RTAUDIO_SAMPLE_RATE = 12 diff --git a/source/includes/CarlaDefines.hpp b/source/includes/CarlaDefines.hpp index 781edce83..533f10a25 100644 --- a/source/includes/CarlaDefines.hpp +++ b/source/includes/CarlaDefines.hpp @@ -109,6 +109,16 @@ # define BINARY_NATIVE BINARY_OTHER #endif +// Define CARLA_DECLARE_NON_COPY_STRUCT +#ifdef CARLA_PROPER_CPP11_SUPPORT +# define CARLA_DECLARE_NON_COPY_STRUCT(StructName) \ + StructName(StructName&) = delete; \ + StructName(const StructName&) = delete; \ + StructName& operator=(const StructName&) = delete; +#else +# define CARLA_DECLARE_NON_COPY_STRUCT(StructName) +#endif + // Define CARLA_SAFE_ASSERT* #define CARLA_SAFE_ASSERT(cond) if (cond) pass(); else carla_assert (#cond, __FILE__, __LINE__); #define CARLA_SAFE_ASSERT_INT(cond, value) if (cond) pass(); else carla_assert_int (#cond, __FILE__, __LINE__, value); diff --git a/source/includes/CarlaMIDI.h b/source/includes/CarlaMIDI.h index 7007f14b5..c3c701778 100644 --- a/source/includes/CarlaMIDI.h +++ b/source/includes/CarlaMIDI.h @@ -28,7 +28,7 @@ #define MIDI_STATUS_POLYPHONIC_AFTERTOUCH 0xA0 // note (0-127), pressure (0-127) #define MIDI_STATUS_CONTROL_CHANGE 0xB0 // see 'Control Change Messages List' #define MIDI_STATUS_PROGRAM_CHANGE 0xC0 // program (0-127), none -#define MIDI_STATUS_AFTERTOUCH 0xD0 // pressure (0-127), none +#define MIDI_STATUS_CHANNEL_PRESSURE 0xD0 // pressure (0-127), none #define MIDI_STATUS_PITCH_WHEEL_CONTROL 0xE0 // LSB (0-127), MSB (0-127) #define MIDI_IS_STATUS_NOTE_OFF(status) (((status) & 0xF0) == MIDI_STATUS_NOTE_OFF) diff --git a/source/includes/dgl b/source/includes/dgl deleted file mode 120000 index 71cc150a3..000000000 --- a/source/includes/dgl +++ /dev/null @@ -1 +0,0 @@ -../libs/distrho/dgl/ \ No newline at end of file diff --git a/source/includes/ladspa_rdf.hpp b/source/includes/ladspa_rdf.hpp index c8cd27279..7959dd426 100644 --- a/source/includes/ladspa_rdf.hpp +++ b/source/includes/ladspa_rdf.hpp @@ -18,7 +18,7 @@ #ifndef LADSPA_RDF_HPP_INCLUDED #define LADSPA_RDF_HPP_INCLUDED -#include "CarlaJuceUtils.hpp" +#include "CarlaDefines.hpp" // Base Types typedef float LADSPA_Data; diff --git a/source/includes/lilv b/source/includes/lilv index bdbf7e2e1..1221c3132 120000 --- a/source/includes/lilv +++ b/source/includes/lilv @@ -1 +1 @@ -../libs/lilv/lilv-0.16.0/lilv \ No newline at end of file +../modules/lilv/lilv-0.16.0/lilv \ No newline at end of file diff --git a/source/includes/lv2_rdf.hpp b/source/includes/lv2_rdf.hpp index 2a053102e..f0e180433 100644 --- a/source/includes/lv2_rdf.hpp +++ b/source/includes/lv2_rdf.hpp @@ -18,7 +18,7 @@ #ifndef LV2_RDF_HPP_INCLUDED #define LV2_RDF_HPP_INCLUDED -#include "CarlaJuceUtils.hpp" +#include "CarlaDefines.hpp" #ifdef CARLA_PROPER_CPP11_SUPPORT # include diff --git a/source/includes/rtmempool b/source/includes/rtmempool deleted file mode 120000 index a4e591dae..000000000 --- a/source/includes/rtmempool +++ /dev/null @@ -1 +0,0 @@ -../libs/rtmempool \ No newline at end of file diff --git a/source/includes/serd b/source/includes/serd deleted file mode 120000 index 5da40bffe..000000000 --- a/source/includes/serd +++ /dev/null @@ -1 +0,0 @@ -../libs/lilv/serd-0.18.2/serd \ No newline at end of file diff --git a/source/includes/sord b/source/includes/sord deleted file mode 120000 index 7c4de9b0f..000000000 --- a/source/includes/sord +++ /dev/null @@ -1 +0,0 @@ -../libs/lilv/sord-0.12.0/sord \ No newline at end of file diff --git a/source/includes/sratom b/source/includes/sratom deleted file mode 120000 index c35efc78d..000000000 --- a/source/includes/sratom +++ /dev/null @@ -1 +0,0 @@ -../libs/lilv/sratom-0.4.2/sratom \ No newline at end of file diff --git a/source/libs/Makefile b/source/libs/Makefile deleted file mode 100644 index 31ba86899..000000000 --- a/source/libs/Makefile +++ /dev/null @@ -1,72 +0,0 @@ -#!/usr/bin/make -f -# Makefile for carla libs # -# ----------------------- # -# Created by falkTX -# - -all: - -# -------------------------------------------------------------- - -dgl: - $(MAKE) -C distrho/dgl - -dgl_%: - $(MAKE) -C distrho/dgl $* - -# -------------------------------------------------------------- - -lilv: - $(MAKE) -C lilv - -lilv_%: - $(MAKE) -C lilv $* - -# -------------------------------------------------------------- - -rtmempool: - $(MAKE) -C rtmempool - -rtmempool_%: - $(MAKE) -C rtmempool $* - -# -------------------------------------------------------------- - -theme: - $(MAKE) -C ../theme - -theme_%: - $(MAKE) -C ../theme $* - -# -------------------------------------------------------------- - -widgets: - $(MAKE) -C ../widgets - -# -------------------------------------------------------------- - -jackbridge-win32: - $(MAKE) -C jackbridge win32 - -jackbridge-win64: - $(MAKE) -C jackbridge win64 - -jackbridge-wine32: - $(MAKE) -C jackbridge wine32 - -jackbridge-wine64: - $(MAKE) -C jackbridge wine64 - -# -------------------------------------------------------------- - -clean: - rm -f *.a *.def *.dll *.dylib *.so - $(MAKE) clean -C distrho/dgl - $(MAKE) clean -C lilv - $(MAKE) clean -C rtmempool - $(MAKE) clean -C ../theme - $(MAKE) clean -C ../widgets - -# -------------------------------------------------------------- - -.PHONY: lilv rtmempool diff --git a/source/libs/distrho/DistrhoPlugin.hpp b/source/modules/distrho/DistrhoPlugin.hpp similarity index 100% rename from source/libs/distrho/DistrhoPlugin.hpp rename to source/modules/distrho/DistrhoPlugin.hpp diff --git a/source/libs/distrho/DistrhoPluginMain.cpp b/source/modules/distrho/DistrhoPluginMain.cpp similarity index 100% rename from source/libs/distrho/DistrhoPluginMain.cpp rename to source/modules/distrho/DistrhoPluginMain.cpp diff --git a/source/libs/distrho/DistrhoUI.hpp b/source/modules/distrho/DistrhoUI.hpp similarity index 100% rename from source/libs/distrho/DistrhoUI.hpp rename to source/modules/distrho/DistrhoUI.hpp diff --git a/source/libs/distrho/DistrhoUIExternal.hpp b/source/modules/distrho/DistrhoUIExternal.hpp similarity index 100% rename from source/libs/distrho/DistrhoUIExternal.hpp rename to source/modules/distrho/DistrhoUIExternal.hpp diff --git a/source/libs/distrho/DistrhoUIMain.cpp b/source/modules/distrho/DistrhoUIMain.cpp similarity index 100% rename from source/libs/distrho/DistrhoUIMain.cpp rename to source/modules/distrho/DistrhoUIMain.cpp diff --git a/source/libs/distrho/DistrhoUIOpenGL.hpp b/source/modules/distrho/DistrhoUIOpenGL.hpp similarity index 100% rename from source/libs/distrho/DistrhoUIOpenGL.hpp rename to source/modules/distrho/DistrhoUIOpenGL.hpp diff --git a/source/libs/distrho/DistrhoUIQt.hpp b/source/modules/distrho/DistrhoUIQt.hpp similarity index 100% rename from source/libs/distrho/DistrhoUIQt.hpp rename to source/modules/distrho/DistrhoUIQt.hpp diff --git a/source/libs/distrho/DistrhoUtils.hpp b/source/modules/distrho/DistrhoUtils.hpp similarity index 100% rename from source/libs/distrho/DistrhoUtils.hpp rename to source/modules/distrho/DistrhoUtils.hpp diff --git a/source/libs/distrho/dgl/App.hpp b/source/modules/distrho/dgl/App.hpp similarity index 100% rename from source/libs/distrho/dgl/App.hpp rename to source/modules/distrho/dgl/App.hpp diff --git a/source/libs/distrho/dgl/Base.hpp b/source/modules/distrho/dgl/Base.hpp similarity index 100% rename from source/libs/distrho/dgl/Base.hpp rename to source/modules/distrho/dgl/Base.hpp diff --git a/source/libs/distrho/dgl/Geometry.hpp b/source/modules/distrho/dgl/Geometry.hpp similarity index 100% rename from source/libs/distrho/dgl/Geometry.hpp rename to source/modules/distrho/dgl/Geometry.hpp diff --git a/source/libs/distrho/dgl/Image.hpp b/source/modules/distrho/dgl/Image.hpp similarity index 100% rename from source/libs/distrho/dgl/Image.hpp rename to source/modules/distrho/dgl/Image.hpp diff --git a/source/libs/distrho/dgl/ImageAboutWindow.hpp b/source/modules/distrho/dgl/ImageAboutWindow.hpp similarity index 100% rename from source/libs/distrho/dgl/ImageAboutWindow.hpp rename to source/modules/distrho/dgl/ImageAboutWindow.hpp diff --git a/source/libs/distrho/dgl/ImageButton.hpp b/source/modules/distrho/dgl/ImageButton.hpp similarity index 100% rename from source/libs/distrho/dgl/ImageButton.hpp rename to source/modules/distrho/dgl/ImageButton.hpp diff --git a/source/libs/distrho/dgl/ImageKnob.hpp b/source/modules/distrho/dgl/ImageKnob.hpp similarity index 100% rename from source/libs/distrho/dgl/ImageKnob.hpp rename to source/modules/distrho/dgl/ImageKnob.hpp diff --git a/source/libs/distrho/dgl/ImageSlider.hpp b/source/modules/distrho/dgl/ImageSlider.hpp similarity index 100% rename from source/libs/distrho/dgl/ImageSlider.hpp rename to source/modules/distrho/dgl/ImageSlider.hpp diff --git a/source/libs/distrho/dgl/Makefile b/source/modules/distrho/dgl/Makefile similarity index 97% rename from source/libs/distrho/dgl/Makefile rename to source/modules/distrho/dgl/Makefile index 96c88b9bb..94025f2e6 100644 --- a/source/libs/distrho/dgl/Makefile +++ b/source/modules/distrho/dgl/Makefile @@ -8,8 +8,8 @@ include ../../../Makefile.mk # -------------------------------------------------------------- -BUILD_C_FLAGS += -fvisibility=hidden -fPIC -BUILD_CXX_FLAGS += -fvisibility=hidden -fPIC -I. +BUILD_C_FLAGS += -I. +BUILD_CXX_FLAGS += -I. OBJS = \ src/App.cpp.o \ diff --git a/source/libs/distrho/dgl/StandaloneWindow.hpp b/source/modules/distrho/dgl/StandaloneWindow.hpp similarity index 100% rename from source/libs/distrho/dgl/StandaloneWindow.hpp rename to source/modules/distrho/dgl/StandaloneWindow.hpp diff --git a/source/libs/distrho/dgl/Widget.hpp b/source/modules/distrho/dgl/Widget.hpp similarity index 100% rename from source/libs/distrho/dgl/Widget.hpp rename to source/modules/distrho/dgl/Widget.hpp diff --git a/source/libs/distrho/dgl/Window.hpp b/source/modules/distrho/dgl/Window.hpp similarity index 100% rename from source/libs/distrho/dgl/Window.hpp rename to source/modules/distrho/dgl/Window.hpp diff --git a/source/libs/distrho/dgl/src/App.cpp b/source/modules/distrho/dgl/src/App.cpp similarity index 100% rename from source/libs/distrho/dgl/src/App.cpp rename to source/modules/distrho/dgl/src/App.cpp diff --git a/source/libs/distrho/dgl/src/AppPrivate.hpp b/source/modules/distrho/dgl/src/AppPrivate.hpp similarity index 100% rename from source/libs/distrho/dgl/src/AppPrivate.hpp rename to source/modules/distrho/dgl/src/AppPrivate.hpp diff --git a/source/libs/distrho/dgl/src/Geometry.cpp b/source/modules/distrho/dgl/src/Geometry.cpp similarity index 100% rename from source/libs/distrho/dgl/src/Geometry.cpp rename to source/modules/distrho/dgl/src/Geometry.cpp diff --git a/source/libs/distrho/dgl/src/Image.cpp b/source/modules/distrho/dgl/src/Image.cpp similarity index 100% rename from source/libs/distrho/dgl/src/Image.cpp rename to source/modules/distrho/dgl/src/Image.cpp diff --git a/source/libs/distrho/dgl/src/ImageAboutWindow.cpp b/source/modules/distrho/dgl/src/ImageAboutWindow.cpp similarity index 100% rename from source/libs/distrho/dgl/src/ImageAboutWindow.cpp rename to source/modules/distrho/dgl/src/ImageAboutWindow.cpp diff --git a/source/libs/distrho/dgl/src/ImageButton.cpp b/source/modules/distrho/dgl/src/ImageButton.cpp similarity index 100% rename from source/libs/distrho/dgl/src/ImageButton.cpp rename to source/modules/distrho/dgl/src/ImageButton.cpp diff --git a/source/libs/distrho/dgl/src/ImageKnob.cpp b/source/modules/distrho/dgl/src/ImageKnob.cpp similarity index 100% rename from source/libs/distrho/dgl/src/ImageKnob.cpp rename to source/modules/distrho/dgl/src/ImageKnob.cpp diff --git a/source/libs/distrho/dgl/src/ImageSlider.cpp b/source/modules/distrho/dgl/src/ImageSlider.cpp similarity index 100% rename from source/libs/distrho/dgl/src/ImageSlider.cpp rename to source/modules/distrho/dgl/src/ImageSlider.cpp diff --git a/source/libs/distrho/dgl/src/Widget.cpp b/source/modules/distrho/dgl/src/Widget.cpp similarity index 100% rename from source/libs/distrho/dgl/src/Widget.cpp rename to source/modules/distrho/dgl/src/Widget.cpp diff --git a/source/libs/distrho/dgl/src/Window.cpp b/source/modules/distrho/dgl/src/Window.cpp similarity index 100% rename from source/libs/distrho/dgl/src/Window.cpp rename to source/modules/distrho/dgl/src/Window.cpp diff --git a/source/libs/distrho/dgl/src/pugl/pugl.h b/source/modules/distrho/dgl/src/pugl/pugl.h similarity index 100% rename from source/libs/distrho/dgl/src/pugl/pugl.h rename to source/modules/distrho/dgl/src/pugl/pugl.h diff --git a/source/libs/distrho/dgl/src/pugl/pugl_internal.h b/source/modules/distrho/dgl/src/pugl/pugl_internal.h similarity index 100% rename from source/libs/distrho/dgl/src/pugl/pugl_internal.h rename to source/modules/distrho/dgl/src/pugl/pugl_internal.h diff --git a/source/libs/distrho/dgl/src/pugl/pugl_osx.m b/source/modules/distrho/dgl/src/pugl/pugl_osx.m similarity index 100% rename from source/libs/distrho/dgl/src/pugl/pugl_osx.m rename to source/modules/distrho/dgl/src/pugl/pugl_osx.m diff --git a/source/libs/distrho/dgl/src/pugl/pugl_osx_extended.h b/source/modules/distrho/dgl/src/pugl/pugl_osx_extended.h similarity index 100% rename from source/libs/distrho/dgl/src/pugl/pugl_osx_extended.h rename to source/modules/distrho/dgl/src/pugl/pugl_osx_extended.h diff --git a/source/libs/distrho/dgl/src/pugl/pugl_osx_extended.m b/source/modules/distrho/dgl/src/pugl/pugl_osx_extended.m similarity index 100% rename from source/libs/distrho/dgl/src/pugl/pugl_osx_extended.m rename to source/modules/distrho/dgl/src/pugl/pugl_osx_extended.m diff --git a/source/libs/distrho/dgl/src/pugl/pugl_win.cpp b/source/modules/distrho/dgl/src/pugl/pugl_win.cpp similarity index 100% rename from source/libs/distrho/dgl/src/pugl/pugl_win.cpp rename to source/modules/distrho/dgl/src/pugl/pugl_win.cpp diff --git a/source/libs/distrho/dgl/src/pugl/pugl_x11.c b/source/modules/distrho/dgl/src/pugl/pugl_x11.c similarity index 100% rename from source/libs/distrho/dgl/src/pugl/pugl_x11.c rename to source/modules/distrho/dgl/src/pugl/pugl_x11.c diff --git a/source/libs/distrho/src/DistrhoDefines.h b/source/modules/distrho/src/DistrhoDefines.h similarity index 100% rename from source/libs/distrho/src/DistrhoDefines.h rename to source/modules/distrho/src/DistrhoDefines.h diff --git a/source/libs/distrho/src/DistrhoPlugin.cpp b/source/modules/distrho/src/DistrhoPlugin.cpp similarity index 100% rename from source/libs/distrho/src/DistrhoPlugin.cpp rename to source/modules/distrho/src/DistrhoPlugin.cpp diff --git a/source/libs/distrho/src/DistrhoPluginInternal.hpp b/source/modules/distrho/src/DistrhoPluginInternal.hpp similarity index 100% rename from source/libs/distrho/src/DistrhoPluginInternal.hpp rename to source/modules/distrho/src/DistrhoPluginInternal.hpp diff --git a/source/libs/distrho/src/DistrhoPluginLADSPA+DSSI.cpp b/source/modules/distrho/src/DistrhoPluginLADSPA+DSSI.cpp similarity index 100% rename from source/libs/distrho/src/DistrhoPluginLADSPA+DSSI.cpp rename to source/modules/distrho/src/DistrhoPluginLADSPA+DSSI.cpp diff --git a/source/libs/distrho/src/DistrhoPluginLV2.cpp b/source/modules/distrho/src/DistrhoPluginLV2.cpp similarity index 100% rename from source/libs/distrho/src/DistrhoPluginLV2.cpp rename to source/modules/distrho/src/DistrhoPluginLV2.cpp diff --git a/source/libs/distrho/src/DistrhoPluginLV2export.cpp b/source/modules/distrho/src/DistrhoPluginLV2export.cpp similarity index 100% rename from source/libs/distrho/src/DistrhoPluginLV2export.cpp rename to source/modules/distrho/src/DistrhoPluginLV2export.cpp diff --git a/source/libs/distrho/src/DistrhoPluginVST.cpp b/source/modules/distrho/src/DistrhoPluginVST.cpp similarity index 100% rename from source/libs/distrho/src/DistrhoPluginVST.cpp rename to source/modules/distrho/src/DistrhoPluginVST.cpp diff --git a/source/libs/distrho/src/DistrhoUI.cpp b/source/modules/distrho/src/DistrhoUI.cpp similarity index 100% rename from source/libs/distrho/src/DistrhoUI.cpp rename to source/modules/distrho/src/DistrhoUI.cpp diff --git a/source/libs/distrho/src/DistrhoUIDSSI.cpp b/source/modules/distrho/src/DistrhoUIDSSI.cpp similarity index 100% rename from source/libs/distrho/src/DistrhoUIDSSI.cpp rename to source/modules/distrho/src/DistrhoUIDSSI.cpp diff --git a/source/libs/distrho/src/DistrhoUIExternal.cpp b/source/modules/distrho/src/DistrhoUIExternal.cpp similarity index 100% rename from source/libs/distrho/src/DistrhoUIExternal.cpp rename to source/modules/distrho/src/DistrhoUIExternal.cpp diff --git a/source/libs/distrho/src/DistrhoUIInternal.hpp b/source/modules/distrho/src/DistrhoUIInternal.hpp similarity index 100% rename from source/libs/distrho/src/DistrhoUIInternal.hpp rename to source/modules/distrho/src/DistrhoUIInternal.hpp diff --git a/source/libs/distrho/src/DistrhoUIOpenGL.cpp b/source/modules/distrho/src/DistrhoUIOpenGL.cpp similarity index 100% rename from source/libs/distrho/src/DistrhoUIOpenGL.cpp rename to source/modules/distrho/src/DistrhoUIOpenGL.cpp diff --git a/source/libs/distrho/src/DistrhoUIQt.cpp b/source/modules/distrho/src/DistrhoUIQt.cpp similarity index 100% rename from source/libs/distrho/src/DistrhoUIQt.cpp rename to source/modules/distrho/src/DistrhoUIQt.cpp diff --git a/source/modules/distrho/src/_todo/DistrhoPluginJACK.cpp b/source/modules/distrho/src/_todo/DistrhoPluginJACK.cpp new file mode 100644 index 000000000..6159e89ed --- /dev/null +++ b/source/modules/distrho/src/_todo/DistrhoPluginJACK.cpp @@ -0,0 +1,365 @@ +/* + * DISTRHO Plugin Toolkit (DPT) + * Copyright (C) 2012-2013 Filipe Coelho + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * For a full copy of the license see the LGPL.txt file + */ + +#ifdef DISTRHO_PLUGIN_TARGET_JACK + +#include "DistrhoDefines.h" + +#if ! DISTRHO_PLUGIN_HAS_UI +# error Standalone JACK mode requires UI +#endif + +#include "DistrhoPluginInternal.h" +#include "DistrhoUIInternal.h" + +#include +#include +#include + +#include +#include +#include +#include + +// ------------------------------------------------- + +START_NAMESPACE_DISTRHO + +class PluginJack : public QMainWindow +{ +public: + PluginJack(jack_client_t* client_) + : QMainWindow(nullptr), + widget(this), + settings("DISTRHO", DISTRHO_PLUGIN_NAME), + ui(this, widget.winId(), setParameterCallback, setStateCallback, nullptr, uiNoteCallback, uiResizeCallback), + client(client_) + { + setCentralWidget(&widget); + setFixedSize(ui.getWidth(), ui.getHeight()); + setWindowTitle(DISTRHO_PLUGIN_NAME); + + if (DISTRHO_PLUGIN_NUM_INPUTS > 0) + { + portsIn = new jack_port_t* [DISTRHO_PLUGIN_NUM_INPUTS]; + + for (int i=0; i < DISTRHO_PLUGIN_NUM_INPUTS; i++) + portsIn[i] = jack_port_register(client, d_string("Audio Input ") + d_string(i+1), JACK_DEFAULT_AUDIO_TYPE, JackPortIsInput, 0); + } + else + portsIn = nullptr; + + if (DISTRHO_PLUGIN_NUM_OUTPUTS > 0) + { + portsOut = new jack_port_t* [DISTRHO_PLUGIN_NUM_OUTPUTS]; + + for (int i=0; i < DISTRHO_PLUGIN_NUM_OUTPUTS; i++) + portsOut[i] = jack_port_register(client, d_string("Audio Output ") + d_string(i+1), JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput, 0); + } + else + portsOut = nullptr; + +#if DISTRHO_PLUGIN_IS_SYNTH + portMidi = jack_port_register(client, "Midi Input", JACK_DEFAULT_MIDI_TYPE, JackPortIsInput, 0); +#endif + + jack_set_process_callback(client, jackProcessCallback, this); + + uiTimer = startTimer(30); + + // load settings + restoreGeometry(settings.value("Global/Geometry", QByteArray()).toByteArray()); + + for (uint32_t i=0; i < plugin.parameterCount(); i++) + { + bool ok; + float value = settings.value(QString("Parameters/%1").arg(i)).toFloat(&ok); + + if (ok) + { + plugin.setParameterValue(i, value); + ui.parameterChanged(i, value); + } + } + +#if DISTRHO_PLUGIN_WANT_STATE + for (uint32_t i=0; i < plugin.stateCount(); i++) + { + const char* key = plugin.stateKey(i); + QString stringValue(settings.value(key).toString()); + + if (! stringValue.isEmpty()) + ui.stateChanged(key, stringValue.toUtf8().constData()); + } +#endif + } + + ~PluginJack() + { + // save settings + settings.setValue("Global/Geometry", saveGeometry()); + + if (uiTimer) + killTimer(uiTimer); + + if (portsIn) + delete[] portsIn; + + if (portsOut) + delete[] portsOut; + } + + // --------------------------------------------- + +protected: + void setParameterValue(uint32_t index, float value) + { + plugin.setParameterValue(index, value); + settings.setValue(QString("Parameters/%1").arg(index), value); + } + +#if DISTRHO_PLUGIN_WANT_STATE + void setState(const char* key, const char* value) + { + plugin.setState(key, value); + settings.setValue(key, value); + } +#endif + +#if DISTRHO_PLUGIN_IS_SYNTH + void uiNote(bool onOff, uint8_t channel, uint8_t note, uint8_t velocity) + { + // TODO + } +#endif + + void uiResize(unsigned int width, unsigned int height) + { + widget.setFixedSize(width, height); + setFixedSize(width, height); + } + + int jackProcess(jack_nframes_t nframes) + { + if (nframes <= 1) + return 1; + + // Check for updated bufferSize + if (nframes != d_lastBufferSize) + { + d_lastBufferSize = nframes; + plugin.setBufferSize(nframes, true); + } + + const float* ins[DISTRHO_PLUGIN_NUM_INPUTS]; + float* outs[DISTRHO_PLUGIN_NUM_OUTPUTS]; + + for (int i=0; i < DISTRHO_PLUGIN_NUM_INPUTS; i++) + ins[i] = (float*)jack_port_get_buffer(portsIn[i], nframes); + + for (int i=0; i < DISTRHO_PLUGIN_NUM_OUTPUTS; i++) + outs[i] = (float*)jack_port_get_buffer(portsOut[i], nframes); + +#if DISTRHO_PLUGIN_IS_SYNTH + uint32_t midiEventCount = 0; + + void* mIn = jack_port_get_buffer(portMidi, nframes); + // TODO + + plugin.run(ins, outs, nframes, midiEventCount, midiEvents); +#else + plugin.run(ins, outs, nframes, 0, nullptr); +#endif + + return 0; + } + + // --------------------------------------------- + + void closeEvent(QCloseEvent* event) + { + QMainWindow::closeEvent(event); + + qApp->quit(); + } + + void timerEvent(QTimerEvent* event) + { + if (event->timerId() == uiTimer) + ui.idle(); + + QMainWindow::timerEvent(event); + } + + // --------------------------------------------- + +private: + // Qt4 stuff + int uiTimer; + QWidget widget; + QSettings settings; + + PluginInternal plugin; + UIInternal ui; + + jack_client_t* const client; + jack_port_t** portsIn; + jack_port_t** portsOut; + +#if DISTRHO_PLUGIN_IS_SYNTH + jack_port_t* portMidi; + MidiEvent midiEvents[MAX_MIDI_EVENTS]; +#endif + + // --------------------------------------------- + // Callbacks + + static void setParameterCallback(void* ptr, uint32_t index, float value) + { + PluginJack* _this_ = (PluginJack*)ptr; + assert(_this_); + + _this_->setParameterValue(index, value); + } + + static void setStateCallback(void* ptr, const char* key, const char* value) + { +#if DISTRHO_PLUGIN_WANT_STATE + PluginJack* _this_ = (PluginJack*)ptr; + assert(_this_); + + _this_->setState(key, value); +#else + Q_UNUSED(ptr); + Q_UNUSED(key); + Q_UNUSED(value); +#endif + } + + static void uiNoteCallback(void* ptr, bool onOff, uint8_t channel, uint8_t note, uint8_t velocity) + { +#if DISTRHO_PLUGIN_IS_SYNTH + PluginJack* _this_ = (PluginJack*)ptr; + assert(_this_); + + _this_->uiNote(onOff, channel, note, velocity); +#else + Q_UNUSED(ptr); + Q_UNUSED(onOff); + Q_UNUSED(channel); + Q_UNUSED(note); + Q_UNUSED(velocity); +#endif + } + + static void uiResizeCallback(void* ptr, unsigned int width, unsigned int height) + { + PluginJack* _this_ = (PluginJack*)ptr; + assert(_this_); + + _this_->uiResize(width, height); + } + + static int jackProcessCallback(jack_nframes_t nframes, void* arg) + { + PluginJack* _this_ = (PluginJack*)arg; + assert(_this_); + + return _this_->jackProcess(nframes); + } +}; + +// ------------------------------------------------- + +END_NAMESPACE_DISTRHO + +// ------------------------------------------------- + +std::string jack_status_get_error_string(const jack_status_t& status) +{ + std::string errorString; + + if (status & JackFailure) + errorString += "Overall operation failed;\n"; + if (status & JackInvalidOption) + errorString += "The operation contained an invalid or unsupported option;\n"; + if (status & JackNameNotUnique) + errorString += "The desired client name was not unique;\n"; + if (status & JackServerStarted) + errorString += "The JACK server was started as a result of this operation;\n"; + if (status & JackServerFailed) + errorString += "Unable to connect to the JACK server;\n"; + if (status & JackServerError) + errorString += "Communication error with the JACK server;\n"; + if (status & JackNoSuchClient) + errorString += "Requested client does not exist;\n"; + if (status & JackLoadFailure) + errorString += "Unable to load internal client;\n"; + if (status & JackInitFailure) + errorString += "Unable to initialize client;\n"; + if (status & JackShmFailure) + errorString += "Unable to access shared memory;\n"; + if (status & JackVersionError) + errorString += "Client's protocol version does not match;\n"; + if (status & JackBackendError) + errorString += "Backend Error;\n"; + if (status & JackClientZombie) + errorString += "Client is being shutdown against its will;\n"; + + if (errorString.size() > 0) + errorString.replace(errorString.size()-2, 2, "."); + + return errorString; +} + +int main(int argc, char* argv[]) +{ + USE_NAMESPACE_DISTRHO + QApplication app(argc, argv, true); + + jack_status_t status; + jack_client_t* client = jack_client_open(DISTRHO_PLUGIN_NAME, JackNullOption, &status); + + if (! client) + { + std::string errorString(jack_status_get_error_string(status)); + QMessageBox::critical(nullptr, app.translate(DISTRHO_PLUGIN_NAME, "Error"), + app.translate(DISTRHO_PLUGIN_NAME, + "Could not connect to JACK, possible reasons:\n" + "%1").arg(QString::fromStdString(errorString))); + return 1; + } + + d_lastBufferSize = jack_get_buffer_size(client); + d_lastSampleRate = jack_get_sample_rate(client); + setLastUiSampleRate(d_lastSampleRate); + + PluginJack plugin(client); + plugin.show(); + + jack_activate(client); + + int ret = app.exec(); + + jack_deactivate(client); + jack_client_close(client); + + return ret; +} + +// ------------------------------------------------- + +#endif // DISTRHO_PLUGIN_TARGET_JACK diff --git a/source/libs/jackbridge/JackBridge.hpp b/source/modules/jackbridge/JackBridge.hpp similarity index 100% rename from source/libs/jackbridge/JackBridge.hpp rename to source/modules/jackbridge/JackBridge.hpp diff --git a/source/libs/jackbridge/JackBridge1.cpp b/source/modules/jackbridge/JackBridge1.cpp similarity index 100% rename from source/libs/jackbridge/JackBridge1.cpp rename to source/modules/jackbridge/JackBridge1.cpp diff --git a/source/libs/jackbridge/JackBridge2.cpp b/source/modules/jackbridge/JackBridge2.cpp similarity index 100% rename from source/libs/jackbridge/JackBridge2.cpp rename to source/modules/jackbridge/JackBridge2.cpp diff --git a/source/libs/jackbridge/Makefile b/source/modules/jackbridge/Makefile similarity index 100% rename from source/libs/jackbridge/Makefile rename to source/modules/jackbridge/Makefile diff --git a/source/libs/lilv/Makefile b/source/modules/lilv/Makefile similarity index 100% rename from source/libs/lilv/Makefile rename to source/modules/lilv/Makefile diff --git a/source/libs/lilv/config/lilv_config.h b/source/modules/lilv/config/lilv_config.h similarity index 100% rename from source/libs/lilv/config/lilv_config.h rename to source/modules/lilv/config/lilv_config.h diff --git a/source/libs/lilv/config/serd_config.h b/source/modules/lilv/config/serd_config.h similarity index 100% rename from source/libs/lilv/config/serd_config.h rename to source/modules/lilv/config/serd_config.h diff --git a/source/libs/lilv/config/sord_config.h b/source/modules/lilv/config/sord_config.h similarity index 100% rename from source/libs/lilv/config/sord_config.h rename to source/modules/lilv/config/sord_config.h diff --git a/source/libs/lilv/config/sratom_config.h b/source/modules/lilv/config/sratom_config.h similarity index 100% rename from source/libs/lilv/config/sratom_config.h rename to source/modules/lilv/config/sratom_config.h diff --git a/source/libs/lilv/custom-patches/fix-mingw-build.patch b/source/modules/lilv/custom-patches/fix-mingw-build.patch similarity index 100% rename from source/libs/lilv/custom-patches/fix-mingw-build.patch rename to source/modules/lilv/custom-patches/fix-mingw-build.patch diff --git a/source/libs/lilv/custom-patches/lilv_ui-features.patch b/source/modules/lilv/custom-patches/lilv_ui-features.patch similarity index 100% rename from source/libs/lilv/custom-patches/lilv_ui-features.patch rename to source/modules/lilv/custom-patches/lilv_ui-features.patch diff --git a/source/libs/lilv/custom-patches/lilvmm_fix-leak.patch b/source/modules/lilv/custom-patches/lilvmm_fix-leak.patch similarity index 100% rename from source/libs/lilv/custom-patches/lilvmm_fix-leak.patch rename to source/modules/lilv/custom-patches/lilvmm_fix-leak.patch diff --git a/source/libs/lilv/lilv-0.16.0/AUTHORS b/source/modules/lilv/lilv-0.16.0/AUTHORS similarity index 100% rename from source/libs/lilv/lilv-0.16.0/AUTHORS rename to source/modules/lilv/lilv-0.16.0/AUTHORS diff --git a/source/libs/lilv/lilv-0.16.0/COPYING b/source/modules/lilv/lilv-0.16.0/COPYING similarity index 100% rename from source/libs/lilv/lilv-0.16.0/COPYING rename to source/modules/lilv/lilv-0.16.0/COPYING diff --git a/source/libs/lilv/lilv-0.16.0/INSTALL b/source/modules/lilv/lilv-0.16.0/INSTALL similarity index 100% rename from source/libs/lilv/lilv-0.16.0/INSTALL rename to source/modules/lilv/lilv-0.16.0/INSTALL diff --git a/source/libs/lilv/lilv-0.16.0/NEWS b/source/modules/lilv/lilv-0.16.0/NEWS similarity index 100% rename from source/libs/lilv/lilv-0.16.0/NEWS rename to source/modules/lilv/lilv-0.16.0/NEWS diff --git a/source/libs/lilv/lilv-0.16.0/PACKAGING b/source/modules/lilv/lilv-0.16.0/PACKAGING similarity index 100% rename from source/libs/lilv/lilv-0.16.0/PACKAGING rename to source/modules/lilv/lilv-0.16.0/PACKAGING diff --git a/source/libs/lilv/lilv-0.16.0/README b/source/modules/lilv/lilv-0.16.0/README similarity index 100% rename from source/libs/lilv/lilv-0.16.0/README rename to source/modules/lilv/lilv-0.16.0/README diff --git a/source/libs/lilv/lilv-0.16.0/bindings/lilv.i b/source/modules/lilv/lilv-0.16.0/bindings/lilv.i similarity index 100% rename from source/libs/lilv/lilv-0.16.0/bindings/lilv.i rename to source/modules/lilv/lilv-0.16.0/bindings/lilv.i diff --git a/source/libs/lilv/lilv-0.16.0/bindings/python/lv2_apply.py b/source/modules/lilv/lilv-0.16.0/bindings/python/lv2_apply.py similarity index 100% rename from source/libs/lilv/lilv-0.16.0/bindings/python/lv2_apply.py rename to source/modules/lilv/lilv-0.16.0/bindings/python/lv2_apply.py diff --git a/source/libs/lilv/lilv-0.16.0/bindings/python/lv2_list.py b/source/modules/lilv/lilv-0.16.0/bindings/python/lv2_list.py similarity index 100% rename from source/libs/lilv/lilv-0.16.0/bindings/python/lv2_list.py rename to source/modules/lilv/lilv-0.16.0/bindings/python/lv2_list.py diff --git a/source/libs/lilv/lilv-0.16.0/doc/layout.xml b/source/modules/lilv/lilv-0.16.0/doc/layout.xml similarity index 100% rename from source/libs/lilv/lilv-0.16.0/doc/layout.xml rename to source/modules/lilv/lilv-0.16.0/doc/layout.xml diff --git a/source/libs/lilv/lilv-0.16.0/doc/lv2info.1 b/source/modules/lilv/lilv-0.16.0/doc/lv2info.1 similarity index 100% rename from source/libs/lilv/lilv-0.16.0/doc/lv2info.1 rename to source/modules/lilv/lilv-0.16.0/doc/lv2info.1 diff --git a/source/libs/lilv/lilv-0.16.0/doc/lv2ls.1 b/source/modules/lilv/lilv-0.16.0/doc/lv2ls.1 similarity index 100% rename from source/libs/lilv/lilv-0.16.0/doc/lv2ls.1 rename to source/modules/lilv/lilv-0.16.0/doc/lv2ls.1 diff --git a/source/libs/lilv/lilv-0.16.0/doc/reference.doxygen.in b/source/modules/lilv/lilv-0.16.0/doc/reference.doxygen.in similarity index 100% rename from source/libs/lilv/lilv-0.16.0/doc/reference.doxygen.in rename to source/modules/lilv/lilv-0.16.0/doc/reference.doxygen.in diff --git a/source/libs/lilv/lilv-0.16.0/doc/style.css b/source/modules/lilv/lilv-0.16.0/doc/style.css similarity index 100% rename from source/libs/lilv/lilv-0.16.0/doc/style.css rename to source/modules/lilv/lilv-0.16.0/doc/style.css diff --git a/source/libs/lilv/lilv-0.16.0/lilv.pc.in b/source/modules/lilv/lilv-0.16.0/lilv.pc.in similarity index 100% rename from source/libs/lilv/lilv-0.16.0/lilv.pc.in rename to source/modules/lilv/lilv-0.16.0/lilv.pc.in diff --git a/source/libs/lilv/lilv-0.16.0/lilv.ttl b/source/modules/lilv/lilv-0.16.0/lilv.ttl similarity index 100% rename from source/libs/lilv/lilv-0.16.0/lilv.ttl rename to source/modules/lilv/lilv-0.16.0/lilv.ttl diff --git a/source/libs/lilv/lilv-0.16.0/lilv/lilv.h b/source/modules/lilv/lilv-0.16.0/lilv/lilv.h similarity index 100% rename from source/libs/lilv/lilv-0.16.0/lilv/lilv.h rename to source/modules/lilv/lilv-0.16.0/lilv/lilv.h diff --git a/source/libs/lilv/lilv-0.16.0/lilv/lilvmm.hpp b/source/modules/lilv/lilv-0.16.0/lilv/lilvmm.hpp similarity index 100% rename from source/libs/lilv/lilv-0.16.0/lilv/lilvmm.hpp rename to source/modules/lilv/lilv-0.16.0/lilv/lilvmm.hpp diff --git a/source/libs/lilv/lilv-0.16.0/src/collections.c b/source/modules/lilv/lilv-0.16.0/src/collections.c similarity index 100% rename from source/libs/lilv/lilv-0.16.0/src/collections.c rename to source/modules/lilv/lilv-0.16.0/src/collections.c diff --git a/source/libs/lilv/lilv-0.16.0/src/instance.c b/source/modules/lilv/lilv-0.16.0/src/instance.c similarity index 100% rename from source/libs/lilv/lilv-0.16.0/src/instance.c rename to source/modules/lilv/lilv-0.16.0/src/instance.c diff --git a/source/libs/lilv/lilv-0.16.0/src/lib.c b/source/modules/lilv/lilv-0.16.0/src/lib.c similarity index 100% rename from source/libs/lilv/lilv-0.16.0/src/lib.c rename to source/modules/lilv/lilv-0.16.0/src/lib.c diff --git a/source/libs/lilv/lilv-0.16.0/src/lilv_internal.h b/source/modules/lilv/lilv-0.16.0/src/lilv_internal.h similarity index 100% rename from source/libs/lilv/lilv-0.16.0/src/lilv_internal.h rename to source/modules/lilv/lilv-0.16.0/src/lilv_internal.h diff --git a/source/libs/lilv/lilv-0.16.0/src/node.c b/source/modules/lilv/lilv-0.16.0/src/node.c similarity index 100% rename from source/libs/lilv/lilv-0.16.0/src/node.c rename to source/modules/lilv/lilv-0.16.0/src/node.c diff --git a/source/libs/lilv/lilv-0.16.0/src/plugin.c b/source/modules/lilv/lilv-0.16.0/src/plugin.c similarity index 100% rename from source/libs/lilv/lilv-0.16.0/src/plugin.c rename to source/modules/lilv/lilv-0.16.0/src/plugin.c diff --git a/source/libs/lilv/lilv-0.16.0/src/pluginclass.c b/source/modules/lilv/lilv-0.16.0/src/pluginclass.c similarity index 100% rename from source/libs/lilv/lilv-0.16.0/src/pluginclass.c rename to source/modules/lilv/lilv-0.16.0/src/pluginclass.c diff --git a/source/libs/lilv/lilv-0.16.0/src/port.c b/source/modules/lilv/lilv-0.16.0/src/port.c similarity index 100% rename from source/libs/lilv/lilv-0.16.0/src/port.c rename to source/modules/lilv/lilv-0.16.0/src/port.c diff --git a/source/libs/lilv/lilv-0.16.0/src/query.c b/source/modules/lilv/lilv-0.16.0/src/query.c similarity index 100% rename from source/libs/lilv/lilv-0.16.0/src/query.c rename to source/modules/lilv/lilv-0.16.0/src/query.c diff --git a/source/libs/lilv/lilv-0.16.0/src/scalepoint.c b/source/modules/lilv/lilv-0.16.0/src/scalepoint.c similarity index 100% rename from source/libs/lilv/lilv-0.16.0/src/scalepoint.c rename to source/modules/lilv/lilv-0.16.0/src/scalepoint.c diff --git a/source/libs/lilv/lilv-0.16.0/src/state.c b/source/modules/lilv/lilv-0.16.0/src/state.c similarity index 100% rename from source/libs/lilv/lilv-0.16.0/src/state.c rename to source/modules/lilv/lilv-0.16.0/src/state.c diff --git a/source/libs/lilv/lilv-0.16.0/src/ui.c b/source/modules/lilv/lilv-0.16.0/src/ui.c similarity index 100% rename from source/libs/lilv/lilv-0.16.0/src/ui.c rename to source/modules/lilv/lilv-0.16.0/src/ui.c diff --git a/source/libs/lilv/lilv-0.16.0/src/util.c b/source/modules/lilv/lilv-0.16.0/src/util.c similarity index 100% rename from source/libs/lilv/lilv-0.16.0/src/util.c rename to source/modules/lilv/lilv-0.16.0/src/util.c diff --git a/source/libs/lilv/lilv-0.16.0/src/world.c b/source/modules/lilv/lilv-0.16.0/src/world.c similarity index 100% rename from source/libs/lilv/lilv-0.16.0/src/world.c rename to source/modules/lilv/lilv-0.16.0/src/world.c diff --git a/source/libs/lilv/lilv-0.16.0/src/zix/common.h b/source/modules/lilv/lilv-0.16.0/src/zix/common.h similarity index 100% rename from source/libs/lilv/lilv-0.16.0/src/zix/common.h rename to source/modules/lilv/lilv-0.16.0/src/zix/common.h diff --git a/source/libs/lilv/lilv-0.16.0/src/zix/tree.c b/source/modules/lilv/lilv-0.16.0/src/zix/tree.c similarity index 100% rename from source/libs/lilv/lilv-0.16.0/src/zix/tree.c rename to source/modules/lilv/lilv-0.16.0/src/zix/tree.c diff --git a/source/libs/lilv/lilv-0.16.0/src/zix/tree.h b/source/modules/lilv/lilv-0.16.0/src/zix/tree.h similarity index 100% rename from source/libs/lilv/lilv-0.16.0/src/zix/tree.h rename to source/modules/lilv/lilv-0.16.0/src/zix/tree.h diff --git a/source/libs/lilv/lilv-0.16.0/test/lilv_test.c b/source/modules/lilv/lilv-0.16.0/test/lilv_test.c similarity index 100% rename from source/libs/lilv/lilv-0.16.0/test/lilv_test.c rename to source/modules/lilv/lilv-0.16.0/test/lilv_test.c diff --git a/source/libs/lilv/lilv-0.16.0/test/manifest.ttl.in b/source/modules/lilv/lilv-0.16.0/test/manifest.ttl.in similarity index 100% rename from source/libs/lilv/lilv-0.16.0/test/manifest.ttl.in rename to source/modules/lilv/lilv-0.16.0/test/manifest.ttl.in diff --git a/source/libs/lilv/lilv-0.16.0/test/test_plugin.c b/source/modules/lilv/lilv-0.16.0/test/test_plugin.c similarity index 100% rename from source/libs/lilv/lilv-0.16.0/test/test_plugin.c rename to source/modules/lilv/lilv-0.16.0/test/test_plugin.c diff --git a/source/libs/lilv/lilv-0.16.0/test/test_plugin.ttl.in b/source/modules/lilv/lilv-0.16.0/test/test_plugin.ttl.in similarity index 100% rename from source/libs/lilv/lilv-0.16.0/test/test_plugin.ttl.in rename to source/modules/lilv/lilv-0.16.0/test/test_plugin.ttl.in diff --git a/source/libs/lilv/lilv-0.16.0/utils/bench.h b/source/modules/lilv/lilv-0.16.0/utils/bench.h similarity index 100% rename from source/libs/lilv/lilv-0.16.0/utils/bench.h rename to source/modules/lilv/lilv-0.16.0/utils/bench.h diff --git a/source/libs/lilv/lilv-0.16.0/utils/lilv-bench.c b/source/modules/lilv/lilv-0.16.0/utils/lilv-bench.c similarity index 100% rename from source/libs/lilv/lilv-0.16.0/utils/lilv-bench.c rename to source/modules/lilv/lilv-0.16.0/utils/lilv-bench.c diff --git a/source/libs/lilv/lilv-0.16.0/utils/lilv.bash_completion b/source/modules/lilv/lilv-0.16.0/utils/lilv.bash_completion similarity index 100% rename from source/libs/lilv/lilv-0.16.0/utils/lilv.bash_completion rename to source/modules/lilv/lilv-0.16.0/utils/lilv.bash_completion diff --git a/source/libs/lilv/lilv-0.16.0/utils/lv2bench.c b/source/modules/lilv/lilv-0.16.0/utils/lv2bench.c similarity index 100% rename from source/libs/lilv/lilv-0.16.0/utils/lv2bench.c rename to source/modules/lilv/lilv-0.16.0/utils/lv2bench.c diff --git a/source/libs/lilv/lilv-0.16.0/utils/lv2info.c b/source/modules/lilv/lilv-0.16.0/utils/lv2info.c similarity index 100% rename from source/libs/lilv/lilv-0.16.0/utils/lv2info.c rename to source/modules/lilv/lilv-0.16.0/utils/lv2info.c diff --git a/source/libs/lilv/lilv-0.16.0/utils/lv2ls.c b/source/modules/lilv/lilv-0.16.0/utils/lv2ls.c similarity index 100% rename from source/libs/lilv/lilv-0.16.0/utils/lv2ls.c rename to source/modules/lilv/lilv-0.16.0/utils/lv2ls.c diff --git a/source/libs/lilv/lilv-0.16.0/utils/uri_table.h b/source/modules/lilv/lilv-0.16.0/utils/uri_table.h similarity index 100% rename from source/libs/lilv/lilv-0.16.0/utils/uri_table.h rename to source/modules/lilv/lilv-0.16.0/utils/uri_table.h diff --git a/source/libs/lilv/lilv-0.16.0/waf b/source/modules/lilv/lilv-0.16.0/waf similarity index 100% rename from source/libs/lilv/lilv-0.16.0/waf rename to source/modules/lilv/lilv-0.16.0/waf diff --git a/source/libs/lilv/lilv-0.16.0/wscript b/source/modules/lilv/lilv-0.16.0/wscript similarity index 100% rename from source/libs/lilv/lilv-0.16.0/wscript rename to source/modules/lilv/lilv-0.16.0/wscript diff --git a/source/libs/lilv/lilv.c b/source/modules/lilv/lilv.c similarity index 100% rename from source/libs/lilv/lilv.c rename to source/modules/lilv/lilv.c diff --git a/source/libs/lilv/serd-0.18.2/AUTHORS b/source/modules/lilv/serd-0.18.2/AUTHORS similarity index 100% rename from source/libs/lilv/serd-0.18.2/AUTHORS rename to source/modules/lilv/serd-0.18.2/AUTHORS diff --git a/source/libs/lilv/serd-0.18.2/COPYING b/source/modules/lilv/serd-0.18.2/COPYING similarity index 100% rename from source/libs/lilv/serd-0.18.2/COPYING rename to source/modules/lilv/serd-0.18.2/COPYING diff --git a/source/libs/lilv/serd-0.18.2/INSTALL b/source/modules/lilv/serd-0.18.2/INSTALL similarity index 100% rename from source/libs/lilv/serd-0.18.2/INSTALL rename to source/modules/lilv/serd-0.18.2/INSTALL diff --git a/source/libs/lilv/serd-0.18.2/NEWS b/source/modules/lilv/serd-0.18.2/NEWS similarity index 100% rename from source/libs/lilv/serd-0.18.2/NEWS rename to source/modules/lilv/serd-0.18.2/NEWS diff --git a/source/libs/lilv/serd-0.18.2/PACKAGING b/source/modules/lilv/serd-0.18.2/PACKAGING similarity index 100% rename from source/libs/lilv/serd-0.18.2/PACKAGING rename to source/modules/lilv/serd-0.18.2/PACKAGING diff --git a/source/libs/lilv/serd-0.18.2/README b/source/modules/lilv/serd-0.18.2/README similarity index 100% rename from source/libs/lilv/serd-0.18.2/README rename to source/modules/lilv/serd-0.18.2/README diff --git a/source/libs/lilv/serd-0.18.2/doc/layout.xml b/source/modules/lilv/serd-0.18.2/doc/layout.xml similarity index 100% rename from source/libs/lilv/serd-0.18.2/doc/layout.xml rename to source/modules/lilv/serd-0.18.2/doc/layout.xml diff --git a/source/libs/lilv/serd-0.18.2/doc/reference.doxygen.in b/source/modules/lilv/serd-0.18.2/doc/reference.doxygen.in similarity index 100% rename from source/libs/lilv/serd-0.18.2/doc/reference.doxygen.in rename to source/modules/lilv/serd-0.18.2/doc/reference.doxygen.in diff --git a/source/libs/lilv/serd-0.18.2/doc/serdi.1 b/source/modules/lilv/serd-0.18.2/doc/serdi.1 similarity index 100% rename from source/libs/lilv/serd-0.18.2/doc/serdi.1 rename to source/modules/lilv/serd-0.18.2/doc/serdi.1 diff --git a/source/libs/lilv/serd-0.18.2/doc/style.css b/source/modules/lilv/serd-0.18.2/doc/style.css similarity index 100% rename from source/libs/lilv/serd-0.18.2/doc/style.css rename to source/modules/lilv/serd-0.18.2/doc/style.css diff --git a/source/libs/lilv/serd-0.18.2/serd.pc.in b/source/modules/lilv/serd-0.18.2/serd.pc.in similarity index 100% rename from source/libs/lilv/serd-0.18.2/serd.pc.in rename to source/modules/lilv/serd-0.18.2/serd.pc.in diff --git a/source/libs/lilv/serd-0.18.2/serd/serd.h b/source/modules/lilv/serd-0.18.2/serd/serd.h similarity index 100% rename from source/libs/lilv/serd-0.18.2/serd/serd.h rename to source/modules/lilv/serd-0.18.2/serd/serd.h diff --git a/source/libs/lilv/serd-0.18.2/src/env.c b/source/modules/lilv/serd-0.18.2/src/env.c similarity index 100% rename from source/libs/lilv/serd-0.18.2/src/env.c rename to source/modules/lilv/serd-0.18.2/src/env.c diff --git a/source/libs/lilv/serd-0.18.2/src/node.c b/source/modules/lilv/serd-0.18.2/src/node.c similarity index 100% rename from source/libs/lilv/serd-0.18.2/src/node.c rename to source/modules/lilv/serd-0.18.2/src/node.c diff --git a/source/libs/lilv/serd-0.18.2/src/reader.c b/source/modules/lilv/serd-0.18.2/src/reader.c similarity index 100% rename from source/libs/lilv/serd-0.18.2/src/reader.c rename to source/modules/lilv/serd-0.18.2/src/reader.c diff --git a/source/libs/lilv/serd-0.18.2/src/serd_internal.h b/source/modules/lilv/serd-0.18.2/src/serd_internal.h similarity index 100% rename from source/libs/lilv/serd-0.18.2/src/serd_internal.h rename to source/modules/lilv/serd-0.18.2/src/serd_internal.h diff --git a/source/libs/lilv/serd-0.18.2/src/serdi.c b/source/modules/lilv/serd-0.18.2/src/serdi.c similarity index 100% rename from source/libs/lilv/serd-0.18.2/src/serdi.c rename to source/modules/lilv/serd-0.18.2/src/serdi.c diff --git a/source/libs/lilv/serd-0.18.2/src/string.c b/source/modules/lilv/serd-0.18.2/src/string.c similarity index 100% rename from source/libs/lilv/serd-0.18.2/src/string.c rename to source/modules/lilv/serd-0.18.2/src/string.c diff --git a/source/libs/lilv/serd-0.18.2/src/uri.c b/source/modules/lilv/serd-0.18.2/src/uri.c similarity index 100% rename from source/libs/lilv/serd-0.18.2/src/uri.c rename to source/modules/lilv/serd-0.18.2/src/uri.c diff --git a/source/libs/lilv/serd-0.18.2/src/writer.c b/source/modules/lilv/serd-0.18.2/src/writer.c similarity index 100% rename from source/libs/lilv/serd-0.18.2/src/writer.c rename to source/modules/lilv/serd-0.18.2/src/writer.c diff --git a/source/libs/lilv/serd-0.18.2/tests/README.txt b/source/modules/lilv/serd-0.18.2/tests/README.txt similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/README.txt rename to source/modules/lilv/serd-0.18.2/tests/README.txt diff --git a/source/libs/lilv/serd-0.18.2/tests/UTF-8.ttl b/source/modules/lilv/serd-0.18.2/tests/UTF-8.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/UTF-8.ttl rename to source/modules/lilv/serd-0.18.2/tests/UTF-8.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/bad-00.ttl b/source/modules/lilv/serd-0.18.2/tests/bad-00.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/bad-00.ttl rename to source/modules/lilv/serd-0.18.2/tests/bad-00.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/bad-01.ttl b/source/modules/lilv/serd-0.18.2/tests/bad-01.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/bad-01.ttl rename to source/modules/lilv/serd-0.18.2/tests/bad-01.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/bad-02.ttl b/source/modules/lilv/serd-0.18.2/tests/bad-02.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/bad-02.ttl rename to source/modules/lilv/serd-0.18.2/tests/bad-02.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/bad-03.ttl b/source/modules/lilv/serd-0.18.2/tests/bad-03.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/bad-03.ttl rename to source/modules/lilv/serd-0.18.2/tests/bad-03.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/bad-04.ttl b/source/modules/lilv/serd-0.18.2/tests/bad-04.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/bad-04.ttl rename to source/modules/lilv/serd-0.18.2/tests/bad-04.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/bad-05.ttl b/source/modules/lilv/serd-0.18.2/tests/bad-05.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/bad-05.ttl rename to source/modules/lilv/serd-0.18.2/tests/bad-05.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/bad-06.ttl b/source/modules/lilv/serd-0.18.2/tests/bad-06.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/bad-06.ttl rename to source/modules/lilv/serd-0.18.2/tests/bad-06.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/bad-07.ttl b/source/modules/lilv/serd-0.18.2/tests/bad-07.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/bad-07.ttl rename to source/modules/lilv/serd-0.18.2/tests/bad-07.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/bad-08.ttl b/source/modules/lilv/serd-0.18.2/tests/bad-08.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/bad-08.ttl rename to source/modules/lilv/serd-0.18.2/tests/bad-08.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/bad-09.ttl b/source/modules/lilv/serd-0.18.2/tests/bad-09.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/bad-09.ttl rename to source/modules/lilv/serd-0.18.2/tests/bad-09.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/bad-10.ttl b/source/modules/lilv/serd-0.18.2/tests/bad-10.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/bad-10.ttl rename to source/modules/lilv/serd-0.18.2/tests/bad-10.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/bad-11.ttl b/source/modules/lilv/serd-0.18.2/tests/bad-11.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/bad-11.ttl rename to source/modules/lilv/serd-0.18.2/tests/bad-11.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/bad-12.ttl b/source/modules/lilv/serd-0.18.2/tests/bad-12.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/bad-12.ttl rename to source/modules/lilv/serd-0.18.2/tests/bad-12.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/bad-13.ttl b/source/modules/lilv/serd-0.18.2/tests/bad-13.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/bad-13.ttl rename to source/modules/lilv/serd-0.18.2/tests/bad-13.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/bad-14.ttl b/source/modules/lilv/serd-0.18.2/tests/bad-14.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/bad-14.ttl rename to source/modules/lilv/serd-0.18.2/tests/bad-14.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/bad-base.ttl b/source/modules/lilv/serd-0.18.2/tests/bad-base.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/bad-base.ttl rename to source/modules/lilv/serd-0.18.2/tests/bad-base.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/bad-blank.ttl b/source/modules/lilv/serd-0.18.2/tests/bad-blank.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/bad-blank.ttl rename to source/modules/lilv/serd-0.18.2/tests/bad-blank.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/bad-datatype.ttl b/source/modules/lilv/serd-0.18.2/tests/bad-datatype.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/bad-datatype.ttl rename to source/modules/lilv/serd-0.18.2/tests/bad-datatype.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/bad-eof-in-blank.ttl b/source/modules/lilv/serd-0.18.2/tests/bad-eof-in-blank.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/bad-eof-in-blank.ttl rename to source/modules/lilv/serd-0.18.2/tests/bad-eof-in-blank.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/bad-eof-in-escape.ttl b/source/modules/lilv/serd-0.18.2/tests/bad-eof-in-escape.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/bad-eof-in-escape.ttl rename to source/modules/lilv/serd-0.18.2/tests/bad-eof-in-escape.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/bad-eof-in-lang-suffix.ttl b/source/modules/lilv/serd-0.18.2/tests/bad-eof-in-lang-suffix.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/bad-eof-in-lang-suffix.ttl rename to source/modules/lilv/serd-0.18.2/tests/bad-eof-in-lang-suffix.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/bad-eof-in-lang.ttl b/source/modules/lilv/serd-0.18.2/tests/bad-eof-in-lang.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/bad-eof-in-lang.ttl rename to source/modules/lilv/serd-0.18.2/tests/bad-eof-in-lang.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/bad-eof-in-list.ttl b/source/modules/lilv/serd-0.18.2/tests/bad-eof-in-list.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/bad-eof-in-list.ttl rename to source/modules/lilv/serd-0.18.2/tests/bad-eof-in-list.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/bad-eof-in-object-list.ttl b/source/modules/lilv/serd-0.18.2/tests/bad-eof-in-object-list.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/bad-eof-in-object-list.ttl rename to source/modules/lilv/serd-0.18.2/tests/bad-eof-in-object-list.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/bad-eof-in-object-list2.ttl b/source/modules/lilv/serd-0.18.2/tests/bad-eof-in-object-list2.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/bad-eof-in-object-list2.ttl rename to source/modules/lilv/serd-0.18.2/tests/bad-eof-in-object-list2.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/bad-eof-in-predicate-list.ttl b/source/modules/lilv/serd-0.18.2/tests/bad-eof-in-predicate-list.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/bad-eof-in-predicate-list.ttl rename to source/modules/lilv/serd-0.18.2/tests/bad-eof-in-predicate-list.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/bad-eof-in-string.ttl b/source/modules/lilv/serd-0.18.2/tests/bad-eof-in-string.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/bad-eof-in-string.ttl rename to source/modules/lilv/serd-0.18.2/tests/bad-eof-in-string.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/bad-eof-in-triple-quote.ttl b/source/modules/lilv/serd-0.18.2/tests/bad-eof-in-triple-quote.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/bad-eof-in-triple-quote.ttl rename to source/modules/lilv/serd-0.18.2/tests/bad-eof-in-triple-quote.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/bad-eof-in-uri.ttl b/source/modules/lilv/serd-0.18.2/tests/bad-eof-in-uri.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/bad-eof-in-uri.ttl rename to source/modules/lilv/serd-0.18.2/tests/bad-eof-in-uri.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/bad-escape.ttl b/source/modules/lilv/serd-0.18.2/tests/bad-escape.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/bad-escape.ttl rename to source/modules/lilv/serd-0.18.2/tests/bad-escape.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/bad-hex-digit.ttl b/source/modules/lilv/serd-0.18.2/tests/bad-hex-digit.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/bad-hex-digit.ttl rename to source/modules/lilv/serd-0.18.2/tests/bad-hex-digit.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/bad-id-clash.ttl b/source/modules/lilv/serd-0.18.2/tests/bad-id-clash.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/bad-id-clash.ttl rename to source/modules/lilv/serd-0.18.2/tests/bad-id-clash.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/bad-lang.ttl b/source/modules/lilv/serd-0.18.2/tests/bad-lang.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/bad-lang.ttl rename to source/modules/lilv/serd-0.18.2/tests/bad-lang.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/bad-list.ttl b/source/modules/lilv/serd-0.18.2/tests/bad-list.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/bad-list.ttl rename to source/modules/lilv/serd-0.18.2/tests/bad-list.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/bad-list2.ttl b/source/modules/lilv/serd-0.18.2/tests/bad-list2.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/bad-list2.ttl rename to source/modules/lilv/serd-0.18.2/tests/bad-list2.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/bad-namespace.ttl b/source/modules/lilv/serd-0.18.2/tests/bad-namespace.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/bad-namespace.ttl rename to source/modules/lilv/serd-0.18.2/tests/bad-namespace.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/bad-ns.ttl b/source/modules/lilv/serd-0.18.2/tests/bad-ns.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/bad-ns.ttl rename to source/modules/lilv/serd-0.18.2/tests/bad-ns.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/bad-num.ttl b/source/modules/lilv/serd-0.18.2/tests/bad-num.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/bad-num.ttl rename to source/modules/lilv/serd-0.18.2/tests/bad-num.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/bad-object.ttl b/source/modules/lilv/serd-0.18.2/tests/bad-object.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/bad-object.ttl rename to source/modules/lilv/serd-0.18.2/tests/bad-object.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/bad-object2.ttl b/source/modules/lilv/serd-0.18.2/tests/bad-object2.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/bad-object2.ttl rename to source/modules/lilv/serd-0.18.2/tests/bad-object2.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/bad-prefix.ttl b/source/modules/lilv/serd-0.18.2/tests/bad-prefix.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/bad-prefix.ttl rename to source/modules/lilv/serd-0.18.2/tests/bad-prefix.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/bad-string.ttl b/source/modules/lilv/serd-0.18.2/tests/bad-string.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/bad-string.ttl rename to source/modules/lilv/serd-0.18.2/tests/bad-string.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/bad-uri-escape.ttl b/source/modules/lilv/serd-0.18.2/tests/bad-uri-escape.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/bad-uri-escape.ttl rename to source/modules/lilv/serd-0.18.2/tests/bad-uri-escape.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/bad-verb.ttl b/source/modules/lilv/serd-0.18.2/tests/bad-verb.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/bad-verb.ttl rename to source/modules/lilv/serd-0.18.2/tests/bad-verb.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/base.out b/source/modules/lilv/serd-0.18.2/tests/base.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/base.out rename to source/modules/lilv/serd-0.18.2/tests/base.out diff --git a/source/libs/lilv/serd-0.18.2/tests/base.ttl b/source/modules/lilv/serd-0.18.2/tests/base.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/base.ttl rename to source/modules/lilv/serd-0.18.2/tests/base.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/manifest-bad.ttl b/source/modules/lilv/serd-0.18.2/tests/manifest-bad.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/manifest-bad.ttl rename to source/modules/lilv/serd-0.18.2/tests/manifest-bad.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/manifest.ttl b/source/modules/lilv/serd-0.18.2/tests/manifest.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/manifest.ttl rename to source/modules/lilv/serd-0.18.2/tests/manifest.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/rdf-schema.out b/source/modules/lilv/serd-0.18.2/tests/rdf-schema.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/rdf-schema.out rename to source/modules/lilv/serd-0.18.2/tests/rdf-schema.out diff --git a/source/libs/lilv/serd-0.18.2/tests/rdf-schema.ttl b/source/modules/lilv/serd-0.18.2/tests/rdf-schema.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/rdf-schema.ttl rename to source/modules/lilv/serd-0.18.2/tests/rdf-schema.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/rdfq-results.out b/source/modules/lilv/serd-0.18.2/tests/rdfq-results.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/rdfq-results.out rename to source/modules/lilv/serd-0.18.2/tests/rdfq-results.out diff --git a/source/libs/lilv/serd-0.18.2/tests/rdfq-results.ttl b/source/modules/lilv/serd-0.18.2/tests/rdfq-results.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/rdfq-results.ttl rename to source/modules/lilv/serd-0.18.2/tests/rdfq-results.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/rdfs-namespace.out b/source/modules/lilv/serd-0.18.2/tests/rdfs-namespace.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/rdfs-namespace.out rename to source/modules/lilv/serd-0.18.2/tests/rdfs-namespace.out diff --git a/source/libs/lilv/serd-0.18.2/tests/rdfs-namespace.ttl b/source/modules/lilv/serd-0.18.2/tests/rdfs-namespace.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/rdfs-namespace.ttl rename to source/modules/lilv/serd-0.18.2/tests/rdfs-namespace.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/serd_test.c b/source/modules/lilv/serd-0.18.2/tests/serd_test.c similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/serd_test.c rename to source/modules/lilv/serd-0.18.2/tests/serd_test.c diff --git a/source/libs/lilv/serd-0.18.2/tests/test-00.out b/source/modules/lilv/serd-0.18.2/tests/test-00.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-00.out rename to source/modules/lilv/serd-0.18.2/tests/test-00.out diff --git a/source/libs/lilv/serd-0.18.2/tests/test-00.ttl b/source/modules/lilv/serd-0.18.2/tests/test-00.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-00.ttl rename to source/modules/lilv/serd-0.18.2/tests/test-00.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/test-01.out b/source/modules/lilv/serd-0.18.2/tests/test-01.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-01.out rename to source/modules/lilv/serd-0.18.2/tests/test-01.out diff --git a/source/libs/lilv/serd-0.18.2/tests/test-01.ttl b/source/modules/lilv/serd-0.18.2/tests/test-01.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-01.ttl rename to source/modules/lilv/serd-0.18.2/tests/test-01.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/test-02.out b/source/modules/lilv/serd-0.18.2/tests/test-02.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-02.out rename to source/modules/lilv/serd-0.18.2/tests/test-02.out diff --git a/source/libs/lilv/serd-0.18.2/tests/test-02.ttl b/source/modules/lilv/serd-0.18.2/tests/test-02.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-02.ttl rename to source/modules/lilv/serd-0.18.2/tests/test-02.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/test-03.out b/source/modules/lilv/serd-0.18.2/tests/test-03.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-03.out rename to source/modules/lilv/serd-0.18.2/tests/test-03.out diff --git a/source/libs/lilv/serd-0.18.2/tests/test-03.ttl b/source/modules/lilv/serd-0.18.2/tests/test-03.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-03.ttl rename to source/modules/lilv/serd-0.18.2/tests/test-03.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/test-04.out b/source/modules/lilv/serd-0.18.2/tests/test-04.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-04.out rename to source/modules/lilv/serd-0.18.2/tests/test-04.out diff --git a/source/libs/lilv/serd-0.18.2/tests/test-04.ttl b/source/modules/lilv/serd-0.18.2/tests/test-04.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-04.ttl rename to source/modules/lilv/serd-0.18.2/tests/test-04.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/test-05.out b/source/modules/lilv/serd-0.18.2/tests/test-05.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-05.out rename to source/modules/lilv/serd-0.18.2/tests/test-05.out diff --git a/source/libs/lilv/serd-0.18.2/tests/test-05.ttl b/source/modules/lilv/serd-0.18.2/tests/test-05.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-05.ttl rename to source/modules/lilv/serd-0.18.2/tests/test-05.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/test-06.out b/source/modules/lilv/serd-0.18.2/tests/test-06.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-06.out rename to source/modules/lilv/serd-0.18.2/tests/test-06.out diff --git a/source/libs/lilv/serd-0.18.2/tests/test-06.ttl b/source/modules/lilv/serd-0.18.2/tests/test-06.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-06.ttl rename to source/modules/lilv/serd-0.18.2/tests/test-06.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/test-07.out b/source/modules/lilv/serd-0.18.2/tests/test-07.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-07.out rename to source/modules/lilv/serd-0.18.2/tests/test-07.out diff --git a/source/libs/lilv/serd-0.18.2/tests/test-07.ttl b/source/modules/lilv/serd-0.18.2/tests/test-07.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-07.ttl rename to source/modules/lilv/serd-0.18.2/tests/test-07.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/test-08.out b/source/modules/lilv/serd-0.18.2/tests/test-08.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-08.out rename to source/modules/lilv/serd-0.18.2/tests/test-08.out diff --git a/source/libs/lilv/serd-0.18.2/tests/test-08.ttl b/source/modules/lilv/serd-0.18.2/tests/test-08.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-08.ttl rename to source/modules/lilv/serd-0.18.2/tests/test-08.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/test-09.out b/source/modules/lilv/serd-0.18.2/tests/test-09.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-09.out rename to source/modules/lilv/serd-0.18.2/tests/test-09.out diff --git a/source/libs/lilv/serd-0.18.2/tests/test-09.ttl b/source/modules/lilv/serd-0.18.2/tests/test-09.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-09.ttl rename to source/modules/lilv/serd-0.18.2/tests/test-09.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/test-10.out b/source/modules/lilv/serd-0.18.2/tests/test-10.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-10.out rename to source/modules/lilv/serd-0.18.2/tests/test-10.out diff --git a/source/libs/lilv/serd-0.18.2/tests/test-10.ttl b/source/modules/lilv/serd-0.18.2/tests/test-10.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-10.ttl rename to source/modules/lilv/serd-0.18.2/tests/test-10.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/test-11.out b/source/modules/lilv/serd-0.18.2/tests/test-11.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-11.out rename to source/modules/lilv/serd-0.18.2/tests/test-11.out diff --git a/source/libs/lilv/serd-0.18.2/tests/test-11.ttl b/source/modules/lilv/serd-0.18.2/tests/test-11.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-11.ttl rename to source/modules/lilv/serd-0.18.2/tests/test-11.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/test-12.out b/source/modules/lilv/serd-0.18.2/tests/test-12.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-12.out rename to source/modules/lilv/serd-0.18.2/tests/test-12.out diff --git a/source/libs/lilv/serd-0.18.2/tests/test-12.ttl b/source/modules/lilv/serd-0.18.2/tests/test-12.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-12.ttl rename to source/modules/lilv/serd-0.18.2/tests/test-12.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/test-13.out b/source/modules/lilv/serd-0.18.2/tests/test-13.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-13.out rename to source/modules/lilv/serd-0.18.2/tests/test-13.out diff --git a/source/libs/lilv/serd-0.18.2/tests/test-13.ttl b/source/modules/lilv/serd-0.18.2/tests/test-13.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-13.ttl rename to source/modules/lilv/serd-0.18.2/tests/test-13.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/test-14.out b/source/modules/lilv/serd-0.18.2/tests/test-14.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-14.out rename to source/modules/lilv/serd-0.18.2/tests/test-14.out diff --git a/source/libs/lilv/serd-0.18.2/tests/test-14.ttl b/source/modules/lilv/serd-0.18.2/tests/test-14.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-14.ttl rename to source/modules/lilv/serd-0.18.2/tests/test-14.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/test-15.out b/source/modules/lilv/serd-0.18.2/tests/test-15.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-15.out rename to source/modules/lilv/serd-0.18.2/tests/test-15.out diff --git a/source/libs/lilv/serd-0.18.2/tests/test-15.ttl b/source/modules/lilv/serd-0.18.2/tests/test-15.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-15.ttl rename to source/modules/lilv/serd-0.18.2/tests/test-15.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/test-16.out b/source/modules/lilv/serd-0.18.2/tests/test-16.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-16.out rename to source/modules/lilv/serd-0.18.2/tests/test-16.out diff --git a/source/libs/lilv/serd-0.18.2/tests/test-16.ttl b/source/modules/lilv/serd-0.18.2/tests/test-16.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-16.ttl rename to source/modules/lilv/serd-0.18.2/tests/test-16.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/test-17.out b/source/modules/lilv/serd-0.18.2/tests/test-17.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-17.out rename to source/modules/lilv/serd-0.18.2/tests/test-17.out diff --git a/source/libs/lilv/serd-0.18.2/tests/test-17.ttl b/source/modules/lilv/serd-0.18.2/tests/test-17.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-17.ttl rename to source/modules/lilv/serd-0.18.2/tests/test-17.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/test-18.out b/source/modules/lilv/serd-0.18.2/tests/test-18.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-18.out rename to source/modules/lilv/serd-0.18.2/tests/test-18.out diff --git a/source/libs/lilv/serd-0.18.2/tests/test-18.ttl b/source/modules/lilv/serd-0.18.2/tests/test-18.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-18.ttl rename to source/modules/lilv/serd-0.18.2/tests/test-18.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/test-19.out b/source/modules/lilv/serd-0.18.2/tests/test-19.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-19.out rename to source/modules/lilv/serd-0.18.2/tests/test-19.out diff --git a/source/libs/lilv/serd-0.18.2/tests/test-19.ttl b/source/modules/lilv/serd-0.18.2/tests/test-19.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-19.ttl rename to source/modules/lilv/serd-0.18.2/tests/test-19.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/test-20.out b/source/modules/lilv/serd-0.18.2/tests/test-20.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-20.out rename to source/modules/lilv/serd-0.18.2/tests/test-20.out diff --git a/source/libs/lilv/serd-0.18.2/tests/test-20.ttl b/source/modules/lilv/serd-0.18.2/tests/test-20.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-20.ttl rename to source/modules/lilv/serd-0.18.2/tests/test-20.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/test-21.out b/source/modules/lilv/serd-0.18.2/tests/test-21.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-21.out rename to source/modules/lilv/serd-0.18.2/tests/test-21.out diff --git a/source/libs/lilv/serd-0.18.2/tests/test-21.ttl b/source/modules/lilv/serd-0.18.2/tests/test-21.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-21.ttl rename to source/modules/lilv/serd-0.18.2/tests/test-21.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/test-22.out b/source/modules/lilv/serd-0.18.2/tests/test-22.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-22.out rename to source/modules/lilv/serd-0.18.2/tests/test-22.out diff --git a/source/libs/lilv/serd-0.18.2/tests/test-22.ttl b/source/modules/lilv/serd-0.18.2/tests/test-22.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-22.ttl rename to source/modules/lilv/serd-0.18.2/tests/test-22.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/test-23.out b/source/modules/lilv/serd-0.18.2/tests/test-23.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-23.out rename to source/modules/lilv/serd-0.18.2/tests/test-23.out diff --git a/source/libs/lilv/serd-0.18.2/tests/test-23.ttl b/source/modules/lilv/serd-0.18.2/tests/test-23.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-23.ttl rename to source/modules/lilv/serd-0.18.2/tests/test-23.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/test-24.out b/source/modules/lilv/serd-0.18.2/tests/test-24.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-24.out rename to source/modules/lilv/serd-0.18.2/tests/test-24.out diff --git a/source/libs/lilv/serd-0.18.2/tests/test-24.ttl b/source/modules/lilv/serd-0.18.2/tests/test-24.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-24.ttl rename to source/modules/lilv/serd-0.18.2/tests/test-24.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/test-25.out b/source/modules/lilv/serd-0.18.2/tests/test-25.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-25.out rename to source/modules/lilv/serd-0.18.2/tests/test-25.out diff --git a/source/libs/lilv/serd-0.18.2/tests/test-25.ttl b/source/modules/lilv/serd-0.18.2/tests/test-25.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-25.ttl rename to source/modules/lilv/serd-0.18.2/tests/test-25.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/test-26.out b/source/modules/lilv/serd-0.18.2/tests/test-26.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-26.out rename to source/modules/lilv/serd-0.18.2/tests/test-26.out diff --git a/source/libs/lilv/serd-0.18.2/tests/test-26.ttl b/source/modules/lilv/serd-0.18.2/tests/test-26.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-26.ttl rename to source/modules/lilv/serd-0.18.2/tests/test-26.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/test-27.out b/source/modules/lilv/serd-0.18.2/tests/test-27.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-27.out rename to source/modules/lilv/serd-0.18.2/tests/test-27.out diff --git a/source/libs/lilv/serd-0.18.2/tests/test-27.ttl b/source/modules/lilv/serd-0.18.2/tests/test-27.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-27.ttl rename to source/modules/lilv/serd-0.18.2/tests/test-27.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/test-29.out b/source/modules/lilv/serd-0.18.2/tests/test-29.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-29.out rename to source/modules/lilv/serd-0.18.2/tests/test-29.out diff --git a/source/libs/lilv/serd-0.18.2/tests/test-29.ttl b/source/modules/lilv/serd-0.18.2/tests/test-29.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-29.ttl rename to source/modules/lilv/serd-0.18.2/tests/test-29.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/test-30.out b/source/modules/lilv/serd-0.18.2/tests/test-30.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-30.out rename to source/modules/lilv/serd-0.18.2/tests/test-30.out diff --git a/source/libs/lilv/serd-0.18.2/tests/test-30.ttl b/source/modules/lilv/serd-0.18.2/tests/test-30.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-30.ttl rename to source/modules/lilv/serd-0.18.2/tests/test-30.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/test-backspace.out b/source/modules/lilv/serd-0.18.2/tests/test-backspace.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-backspace.out rename to source/modules/lilv/serd-0.18.2/tests/test-backspace.out diff --git a/source/libs/lilv/serd-0.18.2/tests/test-backspace.ttl b/source/modules/lilv/serd-0.18.2/tests/test-backspace.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-backspace.ttl rename to source/modules/lilv/serd-0.18.2/tests/test-backspace.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/test-bad-utf8.out b/source/modules/lilv/serd-0.18.2/tests/test-bad-utf8.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-bad-utf8.out rename to source/modules/lilv/serd-0.18.2/tests/test-bad-utf8.out diff --git a/source/libs/lilv/serd-0.18.2/tests/test-bad-utf8.ttl b/source/modules/lilv/serd-0.18.2/tests/test-bad-utf8.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-bad-utf8.ttl rename to source/modules/lilv/serd-0.18.2/tests/test-bad-utf8.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/test-base-query.out b/source/modules/lilv/serd-0.18.2/tests/test-base-query.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-base-query.out rename to source/modules/lilv/serd-0.18.2/tests/test-base-query.out diff --git a/source/libs/lilv/serd-0.18.2/tests/test-base-query.ttl b/source/modules/lilv/serd-0.18.2/tests/test-base-query.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-base-query.ttl rename to source/modules/lilv/serd-0.18.2/tests/test-base-query.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/test-blank-cont.out b/source/modules/lilv/serd-0.18.2/tests/test-blank-cont.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-blank-cont.out rename to source/modules/lilv/serd-0.18.2/tests/test-blank-cont.out diff --git a/source/libs/lilv/serd-0.18.2/tests/test-blank-cont.ttl b/source/modules/lilv/serd-0.18.2/tests/test-blank-cont.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-blank-cont.ttl rename to source/modules/lilv/serd-0.18.2/tests/test-blank-cont.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/test-blank-in-list.out b/source/modules/lilv/serd-0.18.2/tests/test-blank-in-list.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-blank-in-list.out rename to source/modules/lilv/serd-0.18.2/tests/test-blank-in-list.out diff --git a/source/libs/lilv/serd-0.18.2/tests/test-blank-in-list.ttl b/source/modules/lilv/serd-0.18.2/tests/test-blank-in-list.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-blank-in-list.ttl rename to source/modules/lilv/serd-0.18.2/tests/test-blank-in-list.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/test-bom.out b/source/modules/lilv/serd-0.18.2/tests/test-bom.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-bom.out rename to source/modules/lilv/serd-0.18.2/tests/test-bom.out diff --git a/source/libs/lilv/serd-0.18.2/tests/test-bom.ttl b/source/modules/lilv/serd-0.18.2/tests/test-bom.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-bom.ttl rename to source/modules/lilv/serd-0.18.2/tests/test-bom.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/test-cr.out b/source/modules/lilv/serd-0.18.2/tests/test-cr.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-cr.out rename to source/modules/lilv/serd-0.18.2/tests/test-cr.out diff --git a/source/libs/lilv/serd-0.18.2/tests/test-cr.ttl b/source/modules/lilv/serd-0.18.2/tests/test-cr.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-cr.ttl rename to source/modules/lilv/serd-0.18.2/tests/test-cr.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/test-delete.out b/source/modules/lilv/serd-0.18.2/tests/test-delete.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-delete.out rename to source/modules/lilv/serd-0.18.2/tests/test-delete.out diff --git a/source/libs/lilv/serd-0.18.2/tests/test-delete.ttl b/source/modules/lilv/serd-0.18.2/tests/test-delete.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-delete.ttl rename to source/modules/lilv/serd-0.18.2/tests/test-delete.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/test-digit-start-pname.out b/source/modules/lilv/serd-0.18.2/tests/test-digit-start-pname.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-digit-start-pname.out rename to source/modules/lilv/serd-0.18.2/tests/test-digit-start-pname.out diff --git a/source/libs/lilv/serd-0.18.2/tests/test-digit-start-pname.ttl b/source/modules/lilv/serd-0.18.2/tests/test-digit-start-pname.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-digit-start-pname.ttl rename to source/modules/lilv/serd-0.18.2/tests/test-digit-start-pname.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/test-eof-at-page-end.out b/source/modules/lilv/serd-0.18.2/tests/test-eof-at-page-end.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-eof-at-page-end.out rename to source/modules/lilv/serd-0.18.2/tests/test-eof-at-page-end.out diff --git a/source/libs/lilv/serd-0.18.2/tests/test-eof-at-page-end.ttl b/source/modules/lilv/serd-0.18.2/tests/test-eof-at-page-end.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-eof-at-page-end.ttl rename to source/modules/lilv/serd-0.18.2/tests/test-eof-at-page-end.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/test-escapes.out b/source/modules/lilv/serd-0.18.2/tests/test-escapes.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-escapes.out rename to source/modules/lilv/serd-0.18.2/tests/test-escapes.out diff --git a/source/libs/lilv/serd-0.18.2/tests/test-escapes.ttl b/source/modules/lilv/serd-0.18.2/tests/test-escapes.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-escapes.ttl rename to source/modules/lilv/serd-0.18.2/tests/test-escapes.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/test-id.out b/source/modules/lilv/serd-0.18.2/tests/test-id.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-id.out rename to source/modules/lilv/serd-0.18.2/tests/test-id.out diff --git a/source/libs/lilv/serd-0.18.2/tests/test-id.ttl b/source/modules/lilv/serd-0.18.2/tests/test-id.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-id.ttl rename to source/modules/lilv/serd-0.18.2/tests/test-id.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/test-lang.out b/source/modules/lilv/serd-0.18.2/tests/test-lang.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-lang.out rename to source/modules/lilv/serd-0.18.2/tests/test-lang.out diff --git a/source/libs/lilv/serd-0.18.2/tests/test-lang.ttl b/source/modules/lilv/serd-0.18.2/tests/test-lang.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-lang.ttl rename to source/modules/lilv/serd-0.18.2/tests/test-lang.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/test-list-in-blank.out b/source/modules/lilv/serd-0.18.2/tests/test-list-in-blank.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-list-in-blank.out rename to source/modules/lilv/serd-0.18.2/tests/test-list-in-blank.out diff --git a/source/libs/lilv/serd-0.18.2/tests/test-list-in-blank.ttl b/source/modules/lilv/serd-0.18.2/tests/test-list-in-blank.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-list-in-blank.ttl rename to source/modules/lilv/serd-0.18.2/tests/test-list-in-blank.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/test-list-subject.out b/source/modules/lilv/serd-0.18.2/tests/test-list-subject.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-list-subject.out rename to source/modules/lilv/serd-0.18.2/tests/test-list-subject.out diff --git a/source/libs/lilv/serd-0.18.2/tests/test-list-subject.ttl b/source/modules/lilv/serd-0.18.2/tests/test-list-subject.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-list-subject.ttl rename to source/modules/lilv/serd-0.18.2/tests/test-list-subject.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/test-list.out b/source/modules/lilv/serd-0.18.2/tests/test-list.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-list.out rename to source/modules/lilv/serd-0.18.2/tests/test-list.out diff --git a/source/libs/lilv/serd-0.18.2/tests/test-list.ttl b/source/modules/lilv/serd-0.18.2/tests/test-list.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-list.ttl rename to source/modules/lilv/serd-0.18.2/tests/test-list.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/test-long-string.out b/source/modules/lilv/serd-0.18.2/tests/test-long-string.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-long-string.out rename to source/modules/lilv/serd-0.18.2/tests/test-long-string.out diff --git a/source/libs/lilv/serd-0.18.2/tests/test-long-string.ttl b/source/modules/lilv/serd-0.18.2/tests/test-long-string.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-long-string.ttl rename to source/modules/lilv/serd-0.18.2/tests/test-long-string.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/test-no-spaces.out b/source/modules/lilv/serd-0.18.2/tests/test-no-spaces.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-no-spaces.out rename to source/modules/lilv/serd-0.18.2/tests/test-no-spaces.out diff --git a/source/libs/lilv/serd-0.18.2/tests/test-no-spaces.ttl b/source/modules/lilv/serd-0.18.2/tests/test-no-spaces.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-no-spaces.ttl rename to source/modules/lilv/serd-0.18.2/tests/test-no-spaces.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/test-num.out b/source/modules/lilv/serd-0.18.2/tests/test-num.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-num.out rename to source/modules/lilv/serd-0.18.2/tests/test-num.out diff --git a/source/libs/lilv/serd-0.18.2/tests/test-num.ttl b/source/modules/lilv/serd-0.18.2/tests/test-num.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-num.ttl rename to source/modules/lilv/serd-0.18.2/tests/test-num.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/test-out-of-range-unicode.out b/source/modules/lilv/serd-0.18.2/tests/test-out-of-range-unicode.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-out-of-range-unicode.out rename to source/modules/lilv/serd-0.18.2/tests/test-out-of-range-unicode.out diff --git a/source/libs/lilv/serd-0.18.2/tests/test-out-of-range-unicode.ttl b/source/modules/lilv/serd-0.18.2/tests/test-out-of-range-unicode.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-out-of-range-unicode.ttl rename to source/modules/lilv/serd-0.18.2/tests/test-out-of-range-unicode.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/test-prefix.out b/source/modules/lilv/serd-0.18.2/tests/test-prefix.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-prefix.out rename to source/modules/lilv/serd-0.18.2/tests/test-prefix.out diff --git a/source/libs/lilv/serd-0.18.2/tests/test-prefix.ttl b/source/modules/lilv/serd-0.18.2/tests/test-prefix.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-prefix.ttl rename to source/modules/lilv/serd-0.18.2/tests/test-prefix.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/test-pretty.out b/source/modules/lilv/serd-0.18.2/tests/test-pretty.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-pretty.out rename to source/modules/lilv/serd-0.18.2/tests/test-pretty.out diff --git a/source/libs/lilv/serd-0.18.2/tests/test-pretty.ttl b/source/modules/lilv/serd-0.18.2/tests/test-pretty.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-pretty.ttl rename to source/modules/lilv/serd-0.18.2/tests/test-pretty.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/test-rel.out b/source/modules/lilv/serd-0.18.2/tests/test-rel.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-rel.out rename to source/modules/lilv/serd-0.18.2/tests/test-rel.out diff --git a/source/libs/lilv/serd-0.18.2/tests/test-rel.ttl b/source/modules/lilv/serd-0.18.2/tests/test-rel.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-rel.ttl rename to source/modules/lilv/serd-0.18.2/tests/test-rel.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/test-semi-dot.out b/source/modules/lilv/serd-0.18.2/tests/test-semi-dot.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-semi-dot.out rename to source/modules/lilv/serd-0.18.2/tests/test-semi-dot.out diff --git a/source/libs/lilv/serd-0.18.2/tests/test-semi-dot.ttl b/source/modules/lilv/serd-0.18.2/tests/test-semi-dot.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-semi-dot.ttl rename to source/modules/lilv/serd-0.18.2/tests/test-semi-dot.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/test-uri.out b/source/modules/lilv/serd-0.18.2/tests/test-uri.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-uri.out rename to source/modules/lilv/serd-0.18.2/tests/test-uri.out diff --git a/source/libs/lilv/serd-0.18.2/tests/test-uri.ttl b/source/modules/lilv/serd-0.18.2/tests/test-uri.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-uri.ttl rename to source/modules/lilv/serd-0.18.2/tests/test-uri.ttl diff --git a/source/libs/lilv/serd-0.18.2/tests/test-utf8-uri.out b/source/modules/lilv/serd-0.18.2/tests/test-utf8-uri.out similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-utf8-uri.out rename to source/modules/lilv/serd-0.18.2/tests/test-utf8-uri.out diff --git a/source/libs/lilv/serd-0.18.2/tests/test-utf8-uri.ttl b/source/modules/lilv/serd-0.18.2/tests/test-utf8-uri.ttl similarity index 100% rename from source/libs/lilv/serd-0.18.2/tests/test-utf8-uri.ttl rename to source/modules/lilv/serd-0.18.2/tests/test-utf8-uri.ttl diff --git a/source/libs/lilv/serd-0.18.2/waf b/source/modules/lilv/serd-0.18.2/waf similarity index 100% rename from source/libs/lilv/serd-0.18.2/waf rename to source/modules/lilv/serd-0.18.2/waf diff --git a/source/libs/lilv/serd-0.18.2/wscript b/source/modules/lilv/serd-0.18.2/wscript similarity index 100% rename from source/libs/lilv/serd-0.18.2/wscript rename to source/modules/lilv/serd-0.18.2/wscript diff --git a/source/libs/lilv/serd.c b/source/modules/lilv/serd.c similarity index 100% rename from source/libs/lilv/serd.c rename to source/modules/lilv/serd.c diff --git a/source/libs/lilv/sord-0.12.0/AUTHORS b/source/modules/lilv/sord-0.12.0/AUTHORS similarity index 100% rename from source/libs/lilv/sord-0.12.0/AUTHORS rename to source/modules/lilv/sord-0.12.0/AUTHORS diff --git a/source/libs/lilv/sord-0.12.0/COPYING b/source/modules/lilv/sord-0.12.0/COPYING similarity index 100% rename from source/libs/lilv/sord-0.12.0/COPYING rename to source/modules/lilv/sord-0.12.0/COPYING diff --git a/source/libs/lilv/sord-0.12.0/INSTALL b/source/modules/lilv/sord-0.12.0/INSTALL similarity index 100% rename from source/libs/lilv/sord-0.12.0/INSTALL rename to source/modules/lilv/sord-0.12.0/INSTALL diff --git a/source/libs/lilv/sord-0.12.0/NEWS b/source/modules/lilv/sord-0.12.0/NEWS similarity index 100% rename from source/libs/lilv/sord-0.12.0/NEWS rename to source/modules/lilv/sord-0.12.0/NEWS diff --git a/source/libs/lilv/sord-0.12.0/PACKAGING b/source/modules/lilv/sord-0.12.0/PACKAGING similarity index 100% rename from source/libs/lilv/sord-0.12.0/PACKAGING rename to source/modules/lilv/sord-0.12.0/PACKAGING diff --git a/source/libs/lilv/sord-0.12.0/README b/source/modules/lilv/sord-0.12.0/README similarity index 100% rename from source/libs/lilv/sord-0.12.0/README rename to source/modules/lilv/sord-0.12.0/README diff --git a/source/libs/lilv/sord-0.12.0/doc/layout.xml b/source/modules/lilv/sord-0.12.0/doc/layout.xml similarity index 100% rename from source/libs/lilv/sord-0.12.0/doc/layout.xml rename to source/modules/lilv/sord-0.12.0/doc/layout.xml diff --git a/source/libs/lilv/sord-0.12.0/doc/reference.doxygen.in b/source/modules/lilv/sord-0.12.0/doc/reference.doxygen.in similarity index 100% rename from source/libs/lilv/sord-0.12.0/doc/reference.doxygen.in rename to source/modules/lilv/sord-0.12.0/doc/reference.doxygen.in diff --git a/source/libs/lilv/sord-0.12.0/doc/sord_validate.1 b/source/modules/lilv/sord-0.12.0/doc/sord_validate.1 similarity index 100% rename from source/libs/lilv/sord-0.12.0/doc/sord_validate.1 rename to source/modules/lilv/sord-0.12.0/doc/sord_validate.1 diff --git a/source/libs/lilv/sord-0.12.0/doc/sordi.1 b/source/modules/lilv/sord-0.12.0/doc/sordi.1 similarity index 100% rename from source/libs/lilv/sord-0.12.0/doc/sordi.1 rename to source/modules/lilv/sord-0.12.0/doc/sordi.1 diff --git a/source/libs/lilv/sord-0.12.0/doc/style.css b/source/modules/lilv/sord-0.12.0/doc/style.css similarity index 100% rename from source/libs/lilv/sord-0.12.0/doc/style.css rename to source/modules/lilv/sord-0.12.0/doc/style.css diff --git a/source/libs/lilv/sord-0.12.0/sord.pc.in b/source/modules/lilv/sord-0.12.0/sord.pc.in similarity index 100% rename from source/libs/lilv/sord-0.12.0/sord.pc.in rename to source/modules/lilv/sord-0.12.0/sord.pc.in diff --git a/source/libs/lilv/sord-0.12.0/sord/sord.h b/source/modules/lilv/sord-0.12.0/sord/sord.h similarity index 100% rename from source/libs/lilv/sord-0.12.0/sord/sord.h rename to source/modules/lilv/sord-0.12.0/sord/sord.h diff --git a/source/libs/lilv/sord-0.12.0/sord/sordmm.hpp b/source/modules/lilv/sord-0.12.0/sord/sordmm.hpp similarity index 100% rename from source/libs/lilv/sord-0.12.0/sord/sordmm.hpp rename to source/modules/lilv/sord-0.12.0/sord/sordmm.hpp diff --git a/source/libs/lilv/sord-0.12.0/src/sord.c b/source/modules/lilv/sord-0.12.0/src/sord.c similarity index 100% rename from source/libs/lilv/sord-0.12.0/src/sord.c rename to source/modules/lilv/sord-0.12.0/src/sord.c diff --git a/source/libs/lilv/sord-0.12.0/src/sord_internal.h b/source/modules/lilv/sord-0.12.0/src/sord_internal.h similarity index 100% rename from source/libs/lilv/sord-0.12.0/src/sord_internal.h rename to source/modules/lilv/sord-0.12.0/src/sord_internal.h diff --git a/source/libs/lilv/sord-0.12.0/src/sord_test.c b/source/modules/lilv/sord-0.12.0/src/sord_test.c similarity index 100% rename from source/libs/lilv/sord-0.12.0/src/sord_test.c rename to source/modules/lilv/sord-0.12.0/src/sord_test.c diff --git a/source/libs/lilv/sord-0.12.0/src/sord_validate.c b/source/modules/lilv/sord-0.12.0/src/sord_validate.c similarity index 100% rename from source/libs/lilv/sord-0.12.0/src/sord_validate.c rename to source/modules/lilv/sord-0.12.0/src/sord_validate.c diff --git a/source/libs/lilv/sord-0.12.0/src/sordi.c b/source/modules/lilv/sord-0.12.0/src/sordi.c similarity index 100% rename from source/libs/lilv/sord-0.12.0/src/sordi.c rename to source/modules/lilv/sord-0.12.0/src/sordi.c diff --git a/source/libs/lilv/sord-0.12.0/src/sordmm_test.cpp b/source/modules/lilv/sord-0.12.0/src/sordmm_test.cpp similarity index 100% rename from source/libs/lilv/sord-0.12.0/src/sordmm_test.cpp rename to source/modules/lilv/sord-0.12.0/src/sordmm_test.cpp diff --git a/source/libs/lilv/sord-0.12.0/src/syntax.c b/source/modules/lilv/sord-0.12.0/src/syntax.c similarity index 100% rename from source/libs/lilv/sord-0.12.0/src/syntax.c rename to source/modules/lilv/sord-0.12.0/src/syntax.c diff --git a/source/libs/lilv/sord-0.12.0/src/zix/common.h b/source/modules/lilv/sord-0.12.0/src/zix/common.h similarity index 100% rename from source/libs/lilv/sord-0.12.0/src/zix/common.h rename to source/modules/lilv/sord-0.12.0/src/zix/common.h diff --git a/source/libs/lilv/sord-0.12.0/src/zix/digest.c b/source/modules/lilv/sord-0.12.0/src/zix/digest.c similarity index 100% rename from source/libs/lilv/sord-0.12.0/src/zix/digest.c rename to source/modules/lilv/sord-0.12.0/src/zix/digest.c diff --git a/source/libs/lilv/sord-0.12.0/src/zix/digest.h b/source/modules/lilv/sord-0.12.0/src/zix/digest.h similarity index 100% rename from source/libs/lilv/sord-0.12.0/src/zix/digest.h rename to source/modules/lilv/sord-0.12.0/src/zix/digest.h diff --git a/source/libs/lilv/sord-0.12.0/src/zix/hash.c b/source/modules/lilv/sord-0.12.0/src/zix/hash.c similarity index 100% rename from source/libs/lilv/sord-0.12.0/src/zix/hash.c rename to source/modules/lilv/sord-0.12.0/src/zix/hash.c diff --git a/source/libs/lilv/sord-0.12.0/src/zix/hash.h b/source/modules/lilv/sord-0.12.0/src/zix/hash.h similarity index 100% rename from source/libs/lilv/sord-0.12.0/src/zix/hash.h rename to source/modules/lilv/sord-0.12.0/src/zix/hash.h diff --git a/source/libs/lilv/sord-0.12.0/src/zix/tree.c b/source/modules/lilv/sord-0.12.0/src/zix/tree.c similarity index 100% rename from source/libs/lilv/sord-0.12.0/src/zix/tree.c rename to source/modules/lilv/sord-0.12.0/src/zix/tree.c diff --git a/source/libs/lilv/sord-0.12.0/src/zix/tree.h b/source/modules/lilv/sord-0.12.0/src/zix/tree.h similarity index 100% rename from source/libs/lilv/sord-0.12.0/src/zix/tree.h rename to source/modules/lilv/sord-0.12.0/src/zix/tree.h diff --git a/source/libs/lilv/sord-0.12.0/tests/README.txt b/source/modules/lilv/sord-0.12.0/tests/README.txt similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/README.txt rename to source/modules/lilv/sord-0.12.0/tests/README.txt diff --git a/source/libs/lilv/sord-0.12.0/tests/UTF-8.ttl b/source/modules/lilv/sord-0.12.0/tests/UTF-8.ttl similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/UTF-8.ttl rename to source/modules/lilv/sord-0.12.0/tests/UTF-8.ttl diff --git a/source/libs/lilv/sord-0.12.0/tests/manifest.ttl b/source/modules/lilv/sord-0.12.0/tests/manifest.ttl similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/manifest.ttl rename to source/modules/lilv/sord-0.12.0/tests/manifest.ttl diff --git a/source/libs/lilv/sord-0.12.0/tests/rdf-schema.out b/source/modules/lilv/sord-0.12.0/tests/rdf-schema.out similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/rdf-schema.out rename to source/modules/lilv/sord-0.12.0/tests/rdf-schema.out diff --git a/source/libs/lilv/sord-0.12.0/tests/rdf-schema.ttl b/source/modules/lilv/sord-0.12.0/tests/rdf-schema.ttl similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/rdf-schema.ttl rename to source/modules/lilv/sord-0.12.0/tests/rdf-schema.ttl diff --git a/source/libs/lilv/sord-0.12.0/tests/rdfq-results.out b/source/modules/lilv/sord-0.12.0/tests/rdfq-results.out similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/rdfq-results.out rename to source/modules/lilv/sord-0.12.0/tests/rdfq-results.out diff --git a/source/libs/lilv/sord-0.12.0/tests/rdfq-results.ttl b/source/modules/lilv/sord-0.12.0/tests/rdfq-results.ttl similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/rdfq-results.ttl rename to source/modules/lilv/sord-0.12.0/tests/rdfq-results.ttl diff --git a/source/libs/lilv/sord-0.12.0/tests/rdfs-namespace.out b/source/modules/lilv/sord-0.12.0/tests/rdfs-namespace.out similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/rdfs-namespace.out rename to source/modules/lilv/sord-0.12.0/tests/rdfs-namespace.out diff --git a/source/libs/lilv/sord-0.12.0/tests/rdfs-namespace.ttl b/source/modules/lilv/sord-0.12.0/tests/rdfs-namespace.ttl similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/rdfs-namespace.ttl rename to source/modules/lilv/sord-0.12.0/tests/rdfs-namespace.ttl diff --git a/source/libs/lilv/sord-0.12.0/tests/test-00.out b/source/modules/lilv/sord-0.12.0/tests/test-00.out similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-00.out rename to source/modules/lilv/sord-0.12.0/tests/test-00.out diff --git a/source/libs/lilv/sord-0.12.0/tests/test-00.ttl b/source/modules/lilv/sord-0.12.0/tests/test-00.ttl similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-00.ttl rename to source/modules/lilv/sord-0.12.0/tests/test-00.ttl diff --git a/source/libs/lilv/sord-0.12.0/tests/test-01.out b/source/modules/lilv/sord-0.12.0/tests/test-01.out similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-01.out rename to source/modules/lilv/sord-0.12.0/tests/test-01.out diff --git a/source/libs/lilv/sord-0.12.0/tests/test-01.ttl b/source/modules/lilv/sord-0.12.0/tests/test-01.ttl similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-01.ttl rename to source/modules/lilv/sord-0.12.0/tests/test-01.ttl diff --git a/source/libs/lilv/sord-0.12.0/tests/test-02.out b/source/modules/lilv/sord-0.12.0/tests/test-02.out similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-02.out rename to source/modules/lilv/sord-0.12.0/tests/test-02.out diff --git a/source/libs/lilv/sord-0.12.0/tests/test-02.ttl b/source/modules/lilv/sord-0.12.0/tests/test-02.ttl similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-02.ttl rename to source/modules/lilv/sord-0.12.0/tests/test-02.ttl diff --git a/source/libs/lilv/sord-0.12.0/tests/test-03.out b/source/modules/lilv/sord-0.12.0/tests/test-03.out similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-03.out rename to source/modules/lilv/sord-0.12.0/tests/test-03.out diff --git a/source/libs/lilv/sord-0.12.0/tests/test-03.ttl b/source/modules/lilv/sord-0.12.0/tests/test-03.ttl similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-03.ttl rename to source/modules/lilv/sord-0.12.0/tests/test-03.ttl diff --git a/source/libs/lilv/sord-0.12.0/tests/test-04.out b/source/modules/lilv/sord-0.12.0/tests/test-04.out similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-04.out rename to source/modules/lilv/sord-0.12.0/tests/test-04.out diff --git a/source/libs/lilv/sord-0.12.0/tests/test-04.ttl b/source/modules/lilv/sord-0.12.0/tests/test-04.ttl similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-04.ttl rename to source/modules/lilv/sord-0.12.0/tests/test-04.ttl diff --git a/source/libs/lilv/sord-0.12.0/tests/test-05.out b/source/modules/lilv/sord-0.12.0/tests/test-05.out similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-05.out rename to source/modules/lilv/sord-0.12.0/tests/test-05.out diff --git a/source/libs/lilv/sord-0.12.0/tests/test-05.ttl b/source/modules/lilv/sord-0.12.0/tests/test-05.ttl similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-05.ttl rename to source/modules/lilv/sord-0.12.0/tests/test-05.ttl diff --git a/source/libs/lilv/sord-0.12.0/tests/test-06.out b/source/modules/lilv/sord-0.12.0/tests/test-06.out similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-06.out rename to source/modules/lilv/sord-0.12.0/tests/test-06.out diff --git a/source/libs/lilv/sord-0.12.0/tests/test-06.ttl b/source/modules/lilv/sord-0.12.0/tests/test-06.ttl similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-06.ttl rename to source/modules/lilv/sord-0.12.0/tests/test-06.ttl diff --git a/source/libs/lilv/sord-0.12.0/tests/test-07.out b/source/modules/lilv/sord-0.12.0/tests/test-07.out similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-07.out rename to source/modules/lilv/sord-0.12.0/tests/test-07.out diff --git a/source/libs/lilv/sord-0.12.0/tests/test-07.ttl b/source/modules/lilv/sord-0.12.0/tests/test-07.ttl similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-07.ttl rename to source/modules/lilv/sord-0.12.0/tests/test-07.ttl diff --git a/source/libs/lilv/sord-0.12.0/tests/test-08.out b/source/modules/lilv/sord-0.12.0/tests/test-08.out similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-08.out rename to source/modules/lilv/sord-0.12.0/tests/test-08.out diff --git a/source/libs/lilv/sord-0.12.0/tests/test-08.ttl b/source/modules/lilv/sord-0.12.0/tests/test-08.ttl similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-08.ttl rename to source/modules/lilv/sord-0.12.0/tests/test-08.ttl diff --git a/source/libs/lilv/sord-0.12.0/tests/test-09.out b/source/modules/lilv/sord-0.12.0/tests/test-09.out similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-09.out rename to source/modules/lilv/sord-0.12.0/tests/test-09.out diff --git a/source/libs/lilv/sord-0.12.0/tests/test-09.ttl b/source/modules/lilv/sord-0.12.0/tests/test-09.ttl similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-09.ttl rename to source/modules/lilv/sord-0.12.0/tests/test-09.ttl diff --git a/source/libs/lilv/sord-0.12.0/tests/test-10.out b/source/modules/lilv/sord-0.12.0/tests/test-10.out similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-10.out rename to source/modules/lilv/sord-0.12.0/tests/test-10.out diff --git a/source/libs/lilv/sord-0.12.0/tests/test-10.ttl b/source/modules/lilv/sord-0.12.0/tests/test-10.ttl similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-10.ttl rename to source/modules/lilv/sord-0.12.0/tests/test-10.ttl diff --git a/source/libs/lilv/sord-0.12.0/tests/test-11.out b/source/modules/lilv/sord-0.12.0/tests/test-11.out similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-11.out rename to source/modules/lilv/sord-0.12.0/tests/test-11.out diff --git a/source/libs/lilv/sord-0.12.0/tests/test-11.ttl b/source/modules/lilv/sord-0.12.0/tests/test-11.ttl similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-11.ttl rename to source/modules/lilv/sord-0.12.0/tests/test-11.ttl diff --git a/source/libs/lilv/sord-0.12.0/tests/test-12.out b/source/modules/lilv/sord-0.12.0/tests/test-12.out similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-12.out rename to source/modules/lilv/sord-0.12.0/tests/test-12.out diff --git a/source/libs/lilv/sord-0.12.0/tests/test-12.ttl b/source/modules/lilv/sord-0.12.0/tests/test-12.ttl similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-12.ttl rename to source/modules/lilv/sord-0.12.0/tests/test-12.ttl diff --git a/source/libs/lilv/sord-0.12.0/tests/test-13.out b/source/modules/lilv/sord-0.12.0/tests/test-13.out similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-13.out rename to source/modules/lilv/sord-0.12.0/tests/test-13.out diff --git a/source/libs/lilv/sord-0.12.0/tests/test-13.ttl b/source/modules/lilv/sord-0.12.0/tests/test-13.ttl similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-13.ttl rename to source/modules/lilv/sord-0.12.0/tests/test-13.ttl diff --git a/source/libs/lilv/sord-0.12.0/tests/test-14.out b/source/modules/lilv/sord-0.12.0/tests/test-14.out similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-14.out rename to source/modules/lilv/sord-0.12.0/tests/test-14.out diff --git a/source/libs/lilv/sord-0.12.0/tests/test-14.ttl b/source/modules/lilv/sord-0.12.0/tests/test-14.ttl similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-14.ttl rename to source/modules/lilv/sord-0.12.0/tests/test-14.ttl diff --git a/source/libs/lilv/sord-0.12.0/tests/test-15.out b/source/modules/lilv/sord-0.12.0/tests/test-15.out similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-15.out rename to source/modules/lilv/sord-0.12.0/tests/test-15.out diff --git a/source/libs/lilv/sord-0.12.0/tests/test-15.ttl b/source/modules/lilv/sord-0.12.0/tests/test-15.ttl similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-15.ttl rename to source/modules/lilv/sord-0.12.0/tests/test-15.ttl diff --git a/source/libs/lilv/sord-0.12.0/tests/test-16.out b/source/modules/lilv/sord-0.12.0/tests/test-16.out similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-16.out rename to source/modules/lilv/sord-0.12.0/tests/test-16.out diff --git a/source/libs/lilv/sord-0.12.0/tests/test-16.ttl b/source/modules/lilv/sord-0.12.0/tests/test-16.ttl similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-16.ttl rename to source/modules/lilv/sord-0.12.0/tests/test-16.ttl diff --git a/source/libs/lilv/sord-0.12.0/tests/test-17.out b/source/modules/lilv/sord-0.12.0/tests/test-17.out similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-17.out rename to source/modules/lilv/sord-0.12.0/tests/test-17.out diff --git a/source/libs/lilv/sord-0.12.0/tests/test-17.ttl b/source/modules/lilv/sord-0.12.0/tests/test-17.ttl similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-17.ttl rename to source/modules/lilv/sord-0.12.0/tests/test-17.ttl diff --git a/source/libs/lilv/sord-0.12.0/tests/test-18.out b/source/modules/lilv/sord-0.12.0/tests/test-18.out similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-18.out rename to source/modules/lilv/sord-0.12.0/tests/test-18.out diff --git a/source/libs/lilv/sord-0.12.0/tests/test-18.ttl b/source/modules/lilv/sord-0.12.0/tests/test-18.ttl similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-18.ttl rename to source/modules/lilv/sord-0.12.0/tests/test-18.ttl diff --git a/source/libs/lilv/sord-0.12.0/tests/test-19.out b/source/modules/lilv/sord-0.12.0/tests/test-19.out similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-19.out rename to source/modules/lilv/sord-0.12.0/tests/test-19.out diff --git a/source/libs/lilv/sord-0.12.0/tests/test-19.ttl b/source/modules/lilv/sord-0.12.0/tests/test-19.ttl similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-19.ttl rename to source/modules/lilv/sord-0.12.0/tests/test-19.ttl diff --git a/source/libs/lilv/sord-0.12.0/tests/test-20.out b/source/modules/lilv/sord-0.12.0/tests/test-20.out similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-20.out rename to source/modules/lilv/sord-0.12.0/tests/test-20.out diff --git a/source/libs/lilv/sord-0.12.0/tests/test-20.ttl b/source/modules/lilv/sord-0.12.0/tests/test-20.ttl similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-20.ttl rename to source/modules/lilv/sord-0.12.0/tests/test-20.ttl diff --git a/source/libs/lilv/sord-0.12.0/tests/test-21.out b/source/modules/lilv/sord-0.12.0/tests/test-21.out similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-21.out rename to source/modules/lilv/sord-0.12.0/tests/test-21.out diff --git a/source/libs/lilv/sord-0.12.0/tests/test-21.ttl b/source/modules/lilv/sord-0.12.0/tests/test-21.ttl similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-21.ttl rename to source/modules/lilv/sord-0.12.0/tests/test-21.ttl diff --git a/source/libs/lilv/sord-0.12.0/tests/test-22.out b/source/modules/lilv/sord-0.12.0/tests/test-22.out similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-22.out rename to source/modules/lilv/sord-0.12.0/tests/test-22.out diff --git a/source/libs/lilv/sord-0.12.0/tests/test-22.ttl b/source/modules/lilv/sord-0.12.0/tests/test-22.ttl similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-22.ttl rename to source/modules/lilv/sord-0.12.0/tests/test-22.ttl diff --git a/source/libs/lilv/sord-0.12.0/tests/test-23.out b/source/modules/lilv/sord-0.12.0/tests/test-23.out similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-23.out rename to source/modules/lilv/sord-0.12.0/tests/test-23.out diff --git a/source/libs/lilv/sord-0.12.0/tests/test-23.ttl b/source/modules/lilv/sord-0.12.0/tests/test-23.ttl similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-23.ttl rename to source/modules/lilv/sord-0.12.0/tests/test-23.ttl diff --git a/source/libs/lilv/sord-0.12.0/tests/test-24.out b/source/modules/lilv/sord-0.12.0/tests/test-24.out similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-24.out rename to source/modules/lilv/sord-0.12.0/tests/test-24.out diff --git a/source/libs/lilv/sord-0.12.0/tests/test-24.ttl b/source/modules/lilv/sord-0.12.0/tests/test-24.ttl similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-24.ttl rename to source/modules/lilv/sord-0.12.0/tests/test-24.ttl diff --git a/source/libs/lilv/sord-0.12.0/tests/test-25.out b/source/modules/lilv/sord-0.12.0/tests/test-25.out similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-25.out rename to source/modules/lilv/sord-0.12.0/tests/test-25.out diff --git a/source/libs/lilv/sord-0.12.0/tests/test-25.ttl b/source/modules/lilv/sord-0.12.0/tests/test-25.ttl similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-25.ttl rename to source/modules/lilv/sord-0.12.0/tests/test-25.ttl diff --git a/source/libs/lilv/sord-0.12.0/tests/test-26.out b/source/modules/lilv/sord-0.12.0/tests/test-26.out similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-26.out rename to source/modules/lilv/sord-0.12.0/tests/test-26.out diff --git a/source/libs/lilv/sord-0.12.0/tests/test-26.ttl b/source/modules/lilv/sord-0.12.0/tests/test-26.ttl similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-26.ttl rename to source/modules/lilv/sord-0.12.0/tests/test-26.ttl diff --git a/source/libs/lilv/sord-0.12.0/tests/test-27.out b/source/modules/lilv/sord-0.12.0/tests/test-27.out similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-27.out rename to source/modules/lilv/sord-0.12.0/tests/test-27.out diff --git a/source/libs/lilv/sord-0.12.0/tests/test-27.ttl b/source/modules/lilv/sord-0.12.0/tests/test-27.ttl similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-27.ttl rename to source/modules/lilv/sord-0.12.0/tests/test-27.ttl diff --git a/source/libs/lilv/sord-0.12.0/tests/test-29.out b/source/modules/lilv/sord-0.12.0/tests/test-29.out similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-29.out rename to source/modules/lilv/sord-0.12.0/tests/test-29.out diff --git a/source/libs/lilv/sord-0.12.0/tests/test-29.ttl b/source/modules/lilv/sord-0.12.0/tests/test-29.ttl similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-29.ttl rename to source/modules/lilv/sord-0.12.0/tests/test-29.ttl diff --git a/source/libs/lilv/sord-0.12.0/tests/test-30.out b/source/modules/lilv/sord-0.12.0/tests/test-30.out similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-30.out rename to source/modules/lilv/sord-0.12.0/tests/test-30.out diff --git a/source/libs/lilv/sord-0.12.0/tests/test-30.ttl b/source/modules/lilv/sord-0.12.0/tests/test-30.ttl similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-30.ttl rename to source/modules/lilv/sord-0.12.0/tests/test-30.ttl diff --git a/source/libs/lilv/sord-0.12.0/tests/test-id.out b/source/modules/lilv/sord-0.12.0/tests/test-id.out similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-id.out rename to source/modules/lilv/sord-0.12.0/tests/test-id.out diff --git a/source/libs/lilv/sord-0.12.0/tests/test-id.ttl b/source/modules/lilv/sord-0.12.0/tests/test-id.ttl similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-id.ttl rename to source/modules/lilv/sord-0.12.0/tests/test-id.ttl diff --git a/source/libs/lilv/sord-0.12.0/tests/test-lang.out b/source/modules/lilv/sord-0.12.0/tests/test-lang.out similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-lang.out rename to source/modules/lilv/sord-0.12.0/tests/test-lang.out diff --git a/source/libs/lilv/sord-0.12.0/tests/test-lang.ttl b/source/modules/lilv/sord-0.12.0/tests/test-lang.ttl similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-lang.ttl rename to source/modules/lilv/sord-0.12.0/tests/test-lang.ttl diff --git a/source/libs/lilv/sord-0.12.0/tests/test-num.out b/source/modules/lilv/sord-0.12.0/tests/test-num.out similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-num.out rename to source/modules/lilv/sord-0.12.0/tests/test-num.out diff --git a/source/libs/lilv/sord-0.12.0/tests/test-num.ttl b/source/modules/lilv/sord-0.12.0/tests/test-num.ttl similarity index 100% rename from source/libs/lilv/sord-0.12.0/tests/test-num.ttl rename to source/modules/lilv/sord-0.12.0/tests/test-num.ttl diff --git a/source/libs/lilv/sord-0.12.0/waf b/source/modules/lilv/sord-0.12.0/waf similarity index 100% rename from source/libs/lilv/sord-0.12.0/waf rename to source/modules/lilv/sord-0.12.0/waf diff --git a/source/libs/lilv/sord-0.12.0/wscript b/source/modules/lilv/sord-0.12.0/wscript similarity index 100% rename from source/libs/lilv/sord-0.12.0/wscript rename to source/modules/lilv/sord-0.12.0/wscript diff --git a/source/libs/lilv/sord.c b/source/modules/lilv/sord.c similarity index 100% rename from source/libs/lilv/sord.c rename to source/modules/lilv/sord.c diff --git a/source/libs/lilv/sratom-0.4.2/COPYING b/source/modules/lilv/sratom-0.4.2/COPYING similarity index 100% rename from source/libs/lilv/sratom-0.4.2/COPYING rename to source/modules/lilv/sratom-0.4.2/COPYING diff --git a/source/libs/lilv/sratom-0.4.2/NEWS b/source/modules/lilv/sratom-0.4.2/NEWS similarity index 100% rename from source/libs/lilv/sratom-0.4.2/NEWS rename to source/modules/lilv/sratom-0.4.2/NEWS diff --git a/source/libs/lilv/sratom-0.4.2/README b/source/modules/lilv/sratom-0.4.2/README similarity index 100% rename from source/libs/lilv/sratom-0.4.2/README rename to source/modules/lilv/sratom-0.4.2/README diff --git a/source/libs/lilv/sratom-0.4.2/doc/layout.xml b/source/modules/lilv/sratom-0.4.2/doc/layout.xml similarity index 100% rename from source/libs/lilv/sratom-0.4.2/doc/layout.xml rename to source/modules/lilv/sratom-0.4.2/doc/layout.xml diff --git a/source/libs/lilv/sratom-0.4.2/doc/reference.doxygen.in b/source/modules/lilv/sratom-0.4.2/doc/reference.doxygen.in similarity index 100% rename from source/libs/lilv/sratom-0.4.2/doc/reference.doxygen.in rename to source/modules/lilv/sratom-0.4.2/doc/reference.doxygen.in diff --git a/source/libs/lilv/sratom-0.4.2/doc/style.css b/source/modules/lilv/sratom-0.4.2/doc/style.css similarity index 100% rename from source/libs/lilv/sratom-0.4.2/doc/style.css rename to source/modules/lilv/sratom-0.4.2/doc/style.css diff --git a/source/libs/lilv/sratom-0.4.2/sratom.pc.in b/source/modules/lilv/sratom-0.4.2/sratom.pc.in similarity index 100% rename from source/libs/lilv/sratom-0.4.2/sratom.pc.in rename to source/modules/lilv/sratom-0.4.2/sratom.pc.in diff --git a/source/libs/lilv/sratom-0.4.2/sratom/sratom.h b/source/modules/lilv/sratom-0.4.2/sratom/sratom.h similarity index 100% rename from source/libs/lilv/sratom-0.4.2/sratom/sratom.h rename to source/modules/lilv/sratom-0.4.2/sratom/sratom.h diff --git a/source/libs/lilv/sratom-0.4.2/src/sratom.c b/source/modules/lilv/sratom-0.4.2/src/sratom.c similarity index 100% rename from source/libs/lilv/sratom-0.4.2/src/sratom.c rename to source/modules/lilv/sratom-0.4.2/src/sratom.c diff --git a/source/libs/lilv/sratom-0.4.2/tests/sratom_test.c b/source/modules/lilv/sratom-0.4.2/tests/sratom_test.c similarity index 100% rename from source/libs/lilv/sratom-0.4.2/tests/sratom_test.c rename to source/modules/lilv/sratom-0.4.2/tests/sratom_test.c diff --git a/source/libs/lilv/sratom-0.4.2/waf b/source/modules/lilv/sratom-0.4.2/waf similarity index 100% rename from source/libs/lilv/sratom-0.4.2/waf rename to source/modules/lilv/sratom-0.4.2/waf diff --git a/source/libs/lilv/sratom-0.4.2/wscript b/source/modules/lilv/sratom-0.4.2/wscript similarity index 100% rename from source/libs/lilv/sratom-0.4.2/wscript rename to source/modules/lilv/sratom-0.4.2/wscript diff --git a/source/libs/lilv/sratom.c b/source/modules/lilv/sratom.c similarity index 100% rename from source/libs/lilv/sratom.c rename to source/modules/lilv/sratom.c diff --git a/source/libs/rtmempool/Makefile b/source/modules/rtmempool/Makefile similarity index 81% rename from source/libs/rtmempool/Makefile rename to source/modules/rtmempool/Makefile index 1a5f999f9..95faed010 100644 --- a/source/libs/rtmempool/Makefile +++ b/source/modules/rtmempool/Makefile @@ -8,8 +8,7 @@ include ../../Makefile.mk # -------------------------------------------------------------- -BUILD_C_FLAGS += -pthread -BUILD_C_FLAGS += -I. -I../../includes +BUILD_C_FLAGS += -I. -I../../includes -pthread ifeq ($(CARLA_PLUGIN_SUPPORT),true) BUILD_C_FLAGS += -DWANT_LV2 @@ -60,20 +59,20 @@ win64: ../rtmempool.win64.a # -------------------------------------------------------------- -rtmempool.c.o: rtmempool.c +%.c.o: %.c $(CC) $< $(BUILD_C_FLAGS) -c -o $@ -rtmempool.c.posix32.o: rtmempool.c +%.c.posix32.o: %.c $(CC) $< $(BUILD_C_FLAGS) $(32BIT_FLAGS) -c -o $@ -rtmempool.c.posix64.o: rtmempool.c +%.c.posix64.o: %.c $(CC) $< $(BUILD_C_FLAGS) $(64BIT_FLAGS) -c -o $@ -rtmempool.c.win32.o: rtmempool.c - $(CC) $< $(BUILD_C_FLAGS) -DPTW32_STATIC_LIB $(32BIT_FLAGS) -c -o $@ +%.c.win32.o: %.c + $(CC) $< $(BUILD_C_FLAGS) $(32BIT_FLAGS) -c -o $@ -rtmempool.c.win64.o: rtmempool.c - $(CC) $< $(BUILD_C_FLAGS) -DPTW32_STATIC_LIB $(64BIT_FLAGS) -c -o $@ +%.c.win64.o: %.c + $(CC) $< $(BUILD_C_FLAGS) $(64BIT_FLAGS) -c -o $@ # -------------------------------------------------------------- diff --git a/source/libs/rtmempool/list.h b/source/modules/rtmempool/list.h similarity index 100% rename from source/libs/rtmempool/list.h rename to source/modules/rtmempool/list.h diff --git a/source/libs/rtmempool/rtmempool-lv2.h b/source/modules/rtmempool/rtmempool-lv2.h similarity index 100% rename from source/libs/rtmempool/rtmempool-lv2.h rename to source/modules/rtmempool/rtmempool-lv2.h diff --git a/source/libs/rtmempool/rtmempool.c b/source/modules/rtmempool/rtmempool.c similarity index 100% rename from source/libs/rtmempool/rtmempool.c rename to source/modules/rtmempool/rtmempool.c diff --git a/source/libs/rtmempool/rtmempool.h b/source/modules/rtmempool/rtmempool.h similarity index 100% rename from source/libs/rtmempool/rtmempool.h rename to source/modules/rtmempool/rtmempool.h diff --git a/source/theme/CarlaStyle.cpp b/source/modules/theme/CarlaStyle.cpp similarity index 100% rename from source/theme/CarlaStyle.cpp rename to source/modules/theme/CarlaStyle.cpp diff --git a/source/theme/CarlaStyle.hpp b/source/modules/theme/CarlaStyle.hpp similarity index 96% rename from source/theme/CarlaStyle.hpp rename to source/modules/theme/CarlaStyle.hpp index 2f64766f0..55733fadd 100644 --- a/source/theme/CarlaStyle.hpp +++ b/source/modules/theme/CarlaStyle.hpp @@ -16,8 +16,8 @@ * For a full copy of the GNU General Public License see the GPL3.txt file */ -#ifndef __CARLA_STYLE_HPP__ -#define __CARLA_STYLE_HPP__ +#ifndef CARLA_STYLE_HPP_INCLUDED +#define CARLA_STYLE_HPP_INCLUDED #include "CarlaDefines.hpp" @@ -89,4 +89,4 @@ public: QStringList keys() const; }; -#endif // __CARLA_STYLE_HPP__ +#endif // CARLA_STYLE_HPP_INCLUDED diff --git a/source/theme/CarlaStyleAnimations.hpp b/source/modules/theme/CarlaStyleAnimations.hpp similarity index 96% rename from source/theme/CarlaStyleAnimations.hpp rename to source/modules/theme/CarlaStyleAnimations.hpp index 88a28a0d2..b7d974acd 100644 --- a/source/theme/CarlaStyleAnimations.hpp +++ b/source/modules/theme/CarlaStyleAnimations.hpp @@ -16,8 +16,8 @@ * For a full copy of the GNU General Public License see the GPL3.txt file */ -#ifndef __CARLA_STYLE_ANIMATIONS_HPP__ -#define __CARLA_STYLE_ANIMATIONS_HPP__ +#ifndef CARLA_STYLE_ANIMATIONS_HPP_INCLUDED +#define CARLA_STYLE_ANIMATIONS_HPP_INCLUDED #include "CarlaStyle.hpp" @@ -181,4 +181,4 @@ private: mutable int _step; }; -#endif // __CARLA_STYLE_ANIMATIONS_HPP__ +#endif // CARLA_STYLE_ANIMATIONS_HPP_INCLUDED diff --git a/source/theme/CarlaStylePrivate.hpp b/source/modules/theme/CarlaStylePrivate.hpp similarity index 97% rename from source/theme/CarlaStylePrivate.hpp rename to source/modules/theme/CarlaStylePrivate.hpp index 9e594dda8..0570ecbda 100644 --- a/source/theme/CarlaStylePrivate.hpp +++ b/source/modules/theme/CarlaStylePrivate.hpp @@ -16,8 +16,8 @@ * For a full copy of the GNU General Public License see the GPL3.txt file */ -#ifndef __CARLA_STYLE_PRIVATE_HPP__ -#define __CARLA_STYLE_PRIVATE_HPP__ +#ifndef CARLA_STYLE_PRIVATE_HPP_INCLUDED +#define CARLA_STYLE_PRIVATE_HPP_INCLUDED #include "CarlaStyle.hpp" #include "CarlaStyleAnimations.hpp" @@ -157,4 +157,4 @@ private slots: } }; -#endif // __CARLA_STYLE_PRIVATE_HPP__ +#endif // CARLA_STYLE_PRIVATE_HPP_INCLUDED diff --git a/source/theme/Makefile b/source/modules/theme/Makefile similarity index 100% rename from source/theme/Makefile rename to source/modules/theme/Makefile diff --git a/source/utils/CarlaBackendUtils.hpp b/source/modules/utils/CarlaBackendUtils.hpp similarity index 99% rename from source/utils/CarlaBackendUtils.hpp rename to source/modules/utils/CarlaBackendUtils.hpp index 7c1cfc55f..8025e9166 100644 --- a/source/utils/CarlaBackendUtils.hpp +++ b/source/modules/utils/CarlaBackendUtils.hpp @@ -210,6 +210,8 @@ const char* OptionsType2Str(const OptionsType type) return "OPTION_PREFER_PLUGIN_BRIDGES"; case OPTION_PREFER_UI_BRIDGES: return "OPTION_PREFER_UI_BRIDGES"; + case OPTION_UIS_ALWAYS_ON_TOP: + return "OPTION_UIS_ALWAYS_ON_TOP"; #ifdef WANT_DSSI case OPTION_USE_DSSI_VST_CHUNKS: return "OPTION_USE_DSSI_VST_CHUNKS"; @@ -218,8 +220,6 @@ const char* OptionsType2Str(const OptionsType type) return "OPTION_MAX_PARAMETERS"; case OPTION_UI_BRIDGES_TIMEOUT: return "OPTION_UI_BRIDGES_TIMEOUT"; - case OPTION_JACK_AUTOCONNECT: - return "OPTION_JACK_AUTOCONNECT"; #ifdef WANT_RTAUDIO case OPTION_RTAUDIO_NUMBER_PERIODS: return "OPTION_RTAUDIO_NUMBER_PERIODS"; diff --git a/source/utils/CarlaBridgeUtils.hpp b/source/modules/utils/CarlaBridgeUtils.hpp similarity index 97% rename from source/utils/CarlaBridgeUtils.hpp rename to source/modules/utils/CarlaBridgeUtils.hpp index 004d3702a..271e2f351 100644 --- a/source/utils/CarlaBridgeUtils.hpp +++ b/source/modules/utils/CarlaBridgeUtils.hpp @@ -16,13 +16,11 @@ * For a full copy of the GNU General Public License see the GPL.txt file */ -#ifndef __CARLA_BRIDGE_UTILS_HPP__ -#define __CARLA_BRIDGE_UTILS_HPP__ +#ifndef CARLA_BRIDGE_UTILS_HPP_INCLUDED +#define CARLA_BRIDGE_UTILS_HPP_INCLUDED #include "CarlaRingBuffer.hpp" -// ----------------------------------------------------------------------- - enum PluginBridgeInfoType { kPluginBridgeAudioCount = 0, kPluginBridgeMidiCount, @@ -170,4 +168,4 @@ const char* PluginBridgeOpcode2str(const PluginBridgeOpcode opcode) return nullptr; } -#endif // __CARLA_BRIDGE_UTILS_HPP__ +#endif // CARLA_BRIDGE_UTILS_HPP_INCLUDED diff --git a/source/utils/CarlaJuceUtils.hpp b/source/modules/utils/CarlaJuceUtils.hpp similarity index 97% rename from source/utils/CarlaJuceUtils.hpp rename to source/modules/utils/CarlaJuceUtils.hpp index f333f9bac..22c943565 100644 --- a/source/utils/CarlaJuceUtils.hpp +++ b/source/modules/utils/CarlaJuceUtils.hpp @@ -35,12 +35,6 @@ private: \ CARLA_DECLARE_NON_COPYABLE(ClassName) \ CARLA_LEAK_DETECTOR(ClassName) -/** struct versions of the above. */ -#define CARLA_DECLARE_NON_COPY_STRUCT(StructName) \ - StructName(StructName&) = delete; \ - StructName(const StructName&) = delete; \ - StructName& operator=(const StructName&) = delete; - /** This macro can be added to class definitions to disable the use of new/delete to allocate the object on the heap, forcing it to only be used as a stack or member variable. */ @@ -56,12 +50,6 @@ private: \ #define CARLA_JOIN_MACRO_HELPER(a, b) a ## b #define CARLA_JOIN_MACRO(item1, item2) CARLA_JOIN_MACRO_HELPER (item1, item2) -/** Remove unsupported macros */ -#ifndef CARLA_PROPER_CPP11_SUPPORT -# undef CARLA_DECLARE_NON_COPY_STRUCT -# define CARLA_DECLARE_NON_COPY_STRUCT(...) -#endif - //============================================================================== /** Embedding an instance of this class inside another class can be used as a low-overhead diff --git a/source/utils/CarlaLadspaUtils.hpp b/source/modules/utils/CarlaLadspaUtils.hpp similarity index 98% rename from source/utils/CarlaLadspaUtils.hpp rename to source/modules/utils/CarlaLadspaUtils.hpp index 1f02ebe34..2f6bb02da 100644 --- a/source/utils/CarlaLadspaUtils.hpp +++ b/source/modules/utils/CarlaLadspaUtils.hpp @@ -15,8 +15,8 @@ * For a full copy of the GNU General Public License see the GPL.txt file */ -#ifndef __CARLA_LADSPA_UTILS_HPP__ -#define __CARLA_LADSPA_UTILS_HPP__ +#ifndef CARLA_LADSPA_UTILS_HPP_INCLUDED +#define CARLA_LADSPA_UTILS_HPP_INCLUDED #include "CarlaUtils.hpp" @@ -205,4 +205,4 @@ LADSPA_Data get_default_ladspa_port_value(const LADSPA_PortRangeHintDescriptor h return def; } -#endif // __CARLA_LADSPA_UTILS_HPP__ +#endif // CARLA_LADSPA_UTILS_HPP_INCLUDED diff --git a/source/utils/CarlaLibUtils.hpp b/source/modules/utils/CarlaLibUtils.hpp similarity index 95% rename from source/utils/CarlaLibUtils.hpp rename to source/modules/utils/CarlaLibUtils.hpp index 4a8b4ef22..b9a5e8ab6 100644 --- a/source/utils/CarlaLibUtils.hpp +++ b/source/modules/utils/CarlaLibUtils.hpp @@ -15,8 +15,8 @@ * For a full copy of the GNU General Public License see the GPL.txt file */ -#ifndef __CARLA_LIB_UTILS_HPP__ -#define __CARLA_LIB_UTILS_HPP__ +#ifndef CARLA_LIB_UTILS_HPP_INCLUDED +#define CARLA_LIB_UTILS_HPP_INCLUDED #include "CarlaUtils.hpp" @@ -95,4 +95,4 @@ const char* lib_error(const char* const filename) #endif } -#endif // __CARLA_LIB_UTILS_HPP__ +#endif // CARLA_LIB_UTILS_HPP_INCLUDED diff --git a/source/utils/CarlaLogThread.hpp b/source/modules/utils/CarlaLogThread.hpp similarity index 96% rename from source/utils/CarlaLogThread.hpp rename to source/modules/utils/CarlaLogThread.hpp index 7e676856e..ee45a824c 100644 --- a/source/utils/CarlaLogThread.hpp +++ b/source/modules/utils/CarlaLogThread.hpp @@ -15,8 +15,8 @@ * For a full copy of the GNU General Public License see the GPL.txt file */ -#ifndef __CARLA_LOG_THREAD_HPP__ -#define __CARLA_LOG_THREAD_HPP__ +#ifndef CARLA_LOG_THREAD_HPP_INCLUDED +#define CARLA_LOG_THREAD_HPP_INCLUDED #include "CarlaBackend.hpp" #include "CarlaUtils.hpp" @@ -137,4 +137,4 @@ private: CARLA_BACKEND_END_NAMESPACE -#endif // __CARLA_LOG_THREAD_HPP__ +#endif // CARLA_LOG_THREAD_HPP_INCLUDED diff --git a/source/utils/CarlaLv2Utils.hpp b/source/modules/utils/CarlaLv2Utils.hpp similarity index 99% rename from source/utils/CarlaLv2Utils.hpp rename to source/modules/utils/CarlaLv2Utils.hpp index a74e2a3b0..de0226c9f 100644 --- a/source/utils/CarlaLv2Utils.hpp +++ b/source/modules/utils/CarlaLv2Utils.hpp @@ -15,8 +15,8 @@ * For a full copy of the GNU General Public License see the GPL.txt file */ -#ifndef __CARLA_LV2_UTILS_HPP__ -#define __CARLA_LV2_UTILS_HPP__ +#ifndef CARLA_LV2_UTILS_HPP_INCLUDED +#define CARLA_LV2_UTILS_HPP_INCLUDED #include "CarlaJuceUtils.hpp" @@ -1372,6 +1372,4 @@ bool is_lv2_ui_feature_supported(const LV2_URI uri) return false; } -// ------------------------------------------------- - -#endif // __CARLA_LV2_UTILS_HPP__ +#endif // CARLA_LV2_UTILS_HPP_INCLUDED diff --git a/source/utils/CarlaMutex.hpp b/source/modules/utils/CarlaMutex.hpp similarity index 100% rename from source/utils/CarlaMutex.hpp rename to source/modules/utils/CarlaMutex.hpp diff --git a/source/utils/CarlaOscUtils.hpp b/source/modules/utils/CarlaOscUtils.hpp similarity index 100% rename from source/utils/CarlaOscUtils.hpp rename to source/modules/utils/CarlaOscUtils.hpp diff --git a/source/utils/CarlaRingBuffer.hpp b/source/modules/utils/CarlaRingBuffer.hpp similarity index 97% rename from source/utils/CarlaRingBuffer.hpp rename to source/modules/utils/CarlaRingBuffer.hpp index 7d47c6cc0..403a0c51b 100644 --- a/source/utils/CarlaRingBuffer.hpp +++ b/source/modules/utils/CarlaRingBuffer.hpp @@ -16,8 +16,8 @@ * For a full copy of the GNU General Public License see the GPL.txt file */ -#ifndef __CARLA_RING_BUFFER_HPP__ -#define __CARLA_RING_BUFFER_HPP__ +#ifndef CARLA_RING_BUFFER_HPP_INCLUDED +#define CARLA_RING_BUFFER_HPP_INCLUDED #include "CarlaJuceUtils.hpp" @@ -254,6 +254,4 @@ private: } }; -// ------------------------------------------------- - -#endif // __CARLA_RING_BUFFER_HPP__ +#endif // CARLA_RING_BUFFER_HPP_INCLUDED diff --git a/source/utils/CarlaShmUtils.hpp b/source/modules/utils/CarlaShmUtils.hpp similarity index 96% rename from source/utils/CarlaShmUtils.hpp rename to source/modules/utils/CarlaShmUtils.hpp index 4afcb1636..b11158ede 100644 --- a/source/utils/CarlaShmUtils.hpp +++ b/source/modules/utils/CarlaShmUtils.hpp @@ -15,8 +15,8 @@ * For a full copy of the GNU General Public License see the GPL.txt file */ -#ifndef __CARLA_SHM_UTILS_HPP__ -#define __CARLA_SHM_UTILS_HPP__ +#ifndef CARLA_SHM_UTILS_HPP_INCLUDED +#define CARLA_SHM_UTILS_HPP_INCLUDED #include "CarlaUtils.hpp" @@ -204,6 +204,4 @@ void carla_shm_unmap(shm_t& shm, T*& value) value = nullptr; } -// ------------------------------------------------- - -#endif // __CARLA_SHM_UTILS_HPP__ +#endif // CARLA_SHM_UTILS_HPP_INCLUDED diff --git a/source/utils/CarlaStateUtils.hpp b/source/modules/utils/CarlaStateUtils.hpp similarity index 99% rename from source/utils/CarlaStateUtils.hpp rename to source/modules/utils/CarlaStateUtils.hpp index 60de38e7a..67f974681 100644 --- a/source/utils/CarlaStateUtils.hpp +++ b/source/modules/utils/CarlaStateUtils.hpp @@ -15,8 +15,8 @@ * For a full copy of the GNU General Public License see the GPL.txt file */ -#ifndef __CARLA_STATE_UTILS_HPP__ -#define __CARLA_STATE_UTILS_HPP__ +#ifndef CARLA_STATE_UTILS_HPP_INCLUDED +#define CARLA_STATE_UTILS_HPP_INCLUDED #include "CarlaBackendUtils.hpp" #include "CarlaMIDI.h" @@ -630,8 +630,6 @@ void fillXmlStringFromSaveState(QString& content, const SaveState& saveState) content += " \n"; } -// ------------------------------------------------- - CARLA_BACKEND_END_NAMESPACE -#endif // __CARLA_STATE_UTILS_HPP__ +#endif // CARLA_STATE_UTILS_HPP_INCLUDED diff --git a/source/utils/CarlaString.hpp b/source/modules/utils/CarlaString.hpp similarity index 97% rename from source/utils/CarlaString.hpp rename to source/modules/utils/CarlaString.hpp index c39fec372..4f06d0ea7 100644 --- a/source/utils/CarlaString.hpp +++ b/source/modules/utils/CarlaString.hpp @@ -50,7 +50,7 @@ public: explicit CarlaString(const int value) { char strBuf[0xff+1]; - carla_fill(strBuf, 0xff+1, '\0'); + carla_zeroChar(strBuf, 0xff+1); std::snprintf(strBuf, 0xff, "%d", value); _init(); @@ -60,7 +60,7 @@ public: explicit CarlaString(const unsigned int value, const bool hexadecimal = false) { char strBuf[0xff+1]; - carla_fill(strBuf, 0xff+1, '\0'); + carla_zeroChar(strBuf, 0xff+1); std::snprintf(strBuf, 0xff, hexadecimal ? "0x%x" : "%u", value); _init(); @@ -70,7 +70,7 @@ public: explicit CarlaString(const long int value) { char strBuf[0xff+1]; - carla_fill(strBuf, 0xff+1, '\0'); + carla_zeroChar(strBuf, 0xff+1); std::snprintf(strBuf, 0xff, "%ld", value); _init(); @@ -80,7 +80,7 @@ public: explicit CarlaString(const unsigned long int value, const bool hexadecimal = false) { char strBuf[0xff+1]; - carla_fill(strBuf, 0xff+1, '\0'); + carla_zeroChar(strBuf, 0xff+1); std::snprintf(strBuf, 0xff, hexadecimal ? "0x%lx" : "%lu", value); _init(); @@ -90,7 +90,7 @@ public: explicit CarlaString(const float value) { char strBuf[0xff+1]; - carla_fill(strBuf, 0xff+1, '\0'); + carla_zeroChar(strBuf, 0xff+1); std::snprintf(strBuf, 0xff, "%f", value); _init(); @@ -100,7 +100,7 @@ public: explicit CarlaString(const double value) { char strBuf[0xff+1]; - carla_fill(strBuf, 0xff+1, '\0'); + carla_zeroChar(strBuf, 0xff+1); std::snprintf(strBuf, 0xff, "%g", value); _init(); diff --git a/source/utils/CarlaUtils.hpp b/source/modules/utils/CarlaUtils.hpp similarity index 93% rename from source/utils/CarlaUtils.hpp rename to source/modules/utils/CarlaUtils.hpp index bb41217c1..bdcb25c26 100644 --- a/source/utils/CarlaUtils.hpp +++ b/source/modules/utils/CarlaUtils.hpp @@ -205,7 +205,7 @@ const char* carla_strdup(const char* const strBuf) char* const buffer = new char[bufferLen+1]; if (strBuf != nullptr && bufferLen > 0) - std::strcpy(buffer, strBuf); + std::strncpy(buffer, strBuf, bufferLen); buffer[bufferLen] = '\0'; @@ -215,7 +215,7 @@ const char* carla_strdup(const char* const strBuf) static inline const char* carla_strdup_free(char* const strBuf) { - const char* const buffer = carla_strdup(strBuf); + const char* const buffer(carla_strdup(strBuf)); std::free(strBuf); return buffer; } @@ -341,16 +341,31 @@ void carla_copyFloat(float* const dataDst, float* const dataSrc, const size_t si std::memcpy(dataDst, dataSrc, size*sizeof(float)); } +static inline +void carla_zeroChar(char* const data, const size_t size) +{ + CARLA_SAFE_ASSERT_RETURN(data != nullptr,); + CARLA_SAFE_ASSERT_RETURN(size > 0,); + + std::memset(data, 0, size*sizeof(char)); +} + static inline void carla_zeroDouble(double* const data, const size_t size) { - carla_fill(data, size, 0.0); + CARLA_SAFE_ASSERT_RETURN(data != nullptr,); + CARLA_SAFE_ASSERT_RETURN(size > 0,); + + std::memset(data, 0, size*sizeof(double)); } static inline void carla_zeroFloat(float* const data, const size_t size) { - carla_fill(data, size, 0.0f); + CARLA_SAFE_ASSERT_RETURN(data != nullptr,); + CARLA_SAFE_ASSERT_RETURN(size > 0,); + + std::memset(data, 0, size*sizeof(float)); } #if defined(CARLA_OS_MAC) && ! defined(DISTRHO_OS_MAC) @@ -393,7 +408,7 @@ void carla_zeroStruct(T* const structure, const size_t count) CARLA_SAFE_ASSERT_RETURN(structure != nullptr,); CARLA_SAFE_ASSERT_RETURN(count != 0,); - std::memset(structure, 0, sizeof(T)*count); + std::memset(structure, 0, count*sizeof(T)); } #endif // CARLA_UTILS_HPP_INCLUDED diff --git a/source/utils/CarlaVstUtils.hpp b/source/modules/utils/CarlaVstUtils.hpp similarity index 98% rename from source/utils/CarlaVstUtils.hpp rename to source/modules/utils/CarlaVstUtils.hpp index d68996873..76ba9f0d5 100644 --- a/source/utils/CarlaVstUtils.hpp +++ b/source/modules/utils/CarlaVstUtils.hpp @@ -15,8 +15,8 @@ * For a full copy of the GNU General Public License see the GPL.txt file */ -#ifndef __CARLA_VST_UTILS_HPP__ -#define __CARLA_VST_UTILS_HPP__ +#ifndef CARLA_VST_UTILS_HPP_INCLUDED +#define CARLA_VST_UTILS_HPP_INCLUDED #include "CarlaUtils.hpp" @@ -453,6 +453,4 @@ const char* vstMasterOpcode2str(const int32_t opcode) } } -// ------------------------------------------------- - -#endif // __CARLA_VST_UTILS_HPP__ +#endif // CARLA_VST_UTILS_HPP_INCLUDED diff --git a/source/utils/Lv2AtomQueue.hpp b/source/modules/utils/Lv2AtomQueue.hpp similarity index 97% rename from source/utils/Lv2AtomQueue.hpp rename to source/modules/utils/Lv2AtomQueue.hpp index c8ffac0e6..c6ad10250 100644 --- a/source/utils/Lv2AtomQueue.hpp +++ b/source/modules/utils/Lv2AtomQueue.hpp @@ -15,8 +15,8 @@ * For a full copy of the GNU General Public License see the GPL.txt file */ -#ifndef __LV2_ATOM_QUEUE_HPP__ -#define __LV2_ATOM_QUEUE_HPP__ +#ifndef LV2_ATOM_QUEUE_HPP_INCLUDED +#define LV2_ATOM_QUEUE_HPP_INCLUDED #include "CarlaLv2Utils.hpp" #include "CarlaMutex.hpp" @@ -191,4 +191,4 @@ private: CarlaMutex fMutex; }; -#endif // __LV2_ATOM_QUEUE_HPP__ +#endif // LV2_ATOM_QUEUE_HPP_INCLUDED diff --git a/source/utils/RtList.hpp b/source/modules/utils/RtList.hpp similarity index 89% rename from source/utils/RtList.hpp rename to source/modules/utils/RtList.hpp index 7d1cab23c..b08027b96 100644 --- a/source/utils/RtList.hpp +++ b/source/modules/utils/RtList.hpp @@ -49,7 +49,7 @@ protected: }; List() - : kDataSize(sizeof(Data)), + : fDataSize(sizeof(Data)), fCount(0) { _init(); @@ -64,22 +64,22 @@ public: class Itenerator { public: Itenerator(const k_list_head* queue) - : kQueue(queue), + : fData(nullptr), fEntry(queue->next), fEntry2(fEntry->next), - fData(nullptr) + fQueue(queue) { - CARLA_ASSERT(kQueue != nullptr); CARLA_ASSERT(fEntry != nullptr); CARLA_ASSERT(fEntry2 != nullptr); + CARLA_ASSERT(fQueue != nullptr); } - bool valid() + bool valid() const noexcept { - return (fEntry != kQueue); + return (fEntry != fQueue); } - void next() + void next() noexcept { fEntry = fEntry2; fEntry2 = fEntry->next; @@ -88,15 +88,15 @@ public: T& operator*() { fData = list_entry(fEntry, Data, siblings); - CARLA_ASSERT(fData != nullptr); + CARLA_SAFE_ASSERT_RETURN(fData != nullptr, nullptr); return fData->value; } private: - const k_list_head* const kQueue; + Data* fData; k_list_head* fEntry; k_list_head* fEntry2; - Data* fData; + const k_list_head* const fQueue; friend class List; }; @@ -123,12 +123,12 @@ public: _init(); } - size_t count() const + size_t count() const noexcept { return fCount; } - bool isEmpty() const + bool isEmpty() const noexcept { return (fCount == 0); } @@ -318,7 +318,7 @@ public: } protected: - const size_t kDataSize; + const size_t fDataSize; size_t fCount; k_list_head fQueue; @@ -326,7 +326,7 @@ protected: virtual void _deallocate(Data* const dataPtr) = 0; private: - void _init() + void _init() noexcept { fCount = 0; INIT_LIST_HEAD(&fQueue); @@ -340,14 +340,11 @@ private: k_list_head* const entry = first ? fQueue.next : fQueue.prev; Data* const data = list_entry(entry, Data, siblings); - CARLA_ASSERT(data != nullptr); - - if (data == nullptr) - return _getEmpty(); + CARLA_SAFE_ASSERT_RETURN(data != nullptr, _getEmpty()); T& ret = data->value; - if (data != nullptr && remove) + if (remove) { --fCount; list_del(entry); @@ -359,18 +356,12 @@ private: T& _getEmpty() { - static T value; - static bool reset = true; - - if (reset) - { - reset = false; - carla_zeroStruct(value); - } - - return value; + carla_zeroStruct(fFallbackValue); + return fFallbackValue; } + T fFallbackValue; + LIST_DECLARATIONS(List) }; @@ -389,7 +380,7 @@ public: public: Pool(const size_t minPreallocated, const size_t maxPreallocated) : fHandle(nullptr), - kDataSize(sizeof(typename List::Data)) + fDataSize(sizeof(typename List::Data)) { resize(minPreallocated, maxPreallocated); } @@ -426,23 +417,23 @@ public: fHandle = nullptr; } - rtsafe_memory_pool_create(&fHandle, nullptr, kDataSize, minPreallocated, maxPreallocated); + rtsafe_memory_pool_create(&fHandle, nullptr, fDataSize, minPreallocated, maxPreallocated); CARLA_ASSERT(fHandle != nullptr); } - bool operator==(const Pool& pool) const + bool operator==(const Pool& pool) const noexcept { - return (fHandle == pool.fHandle && kDataSize == pool.kDataSize); + return (fHandle == pool.fHandle && fDataSize == pool.fDataSize); } - bool operator!=(const Pool& pool) const + bool operator!=(const Pool& pool) const noexcept { - return (fHandle != pool.fHandle || kDataSize != pool.kDataSize); + return (fHandle != pool.fHandle || fDataSize != pool.fDataSize); } private: RtMemPool_Handle fHandle; - const size_t kDataSize; + const size_t fDataSize; }; // ------------------------------------------------------------------- @@ -516,9 +507,11 @@ private: return (typename List::Data*)fMemPool.allocate_sleepy(); } - void _deallocate(typename List::Data* const dataPtr) override + void _deallocate(typename List::Data*& dataPtr) override { + CARLA_ASSERT(dataPtr != nullptr); fMemPool.deallocate(dataPtr); + dataPtr = nullptr; } LIST_DECLARATIONS(RtList) @@ -542,13 +535,14 @@ public: private: typename List::Data* _allocate() override { - return (typename List::Data*)std::malloc(this->kDataSize); + return (typename List::Data*)std::malloc(this->fDataSize); } - void _deallocate(typename List::Data* const dataPtr) override + void _deallocate(typename List::Data*& dataPtr) override { CARLA_ASSERT(dataPtr != nullptr); std::free(dataPtr); + dataPtr = nullptr; } LIST_DECLARATIONS(NonRtList) @@ -575,10 +569,11 @@ private: return new typename List::Data; } - void _deallocate(typename List::Data* const dataPtr) override + void _deallocate(typename List::Data*& dataPtr) override { CARLA_ASSERT(dataPtr != nullptr); delete dataPtr; + dataPtr = nullptr; } LIST_DECLARATIONS(NonRtListNew) diff --git a/source/widgets/Makefile b/source/modules/widgets/Makefile similarity index 100% rename from source/widgets/Makefile rename to source/modules/widgets/Makefile diff --git a/source/widgets/canvaspreviewframe.py b/source/modules/widgets/canvaspreviewframe.py similarity index 100% rename from source/widgets/canvaspreviewframe.py rename to source/modules/widgets/canvaspreviewframe.py diff --git a/source/widgets/clickablelabel.py b/source/modules/widgets/clickablelabel.py similarity index 100% rename from source/widgets/clickablelabel.py rename to source/modules/widgets/clickablelabel.py diff --git a/source/widgets/digitalpeakmeter.cpp b/source/modules/widgets/digitalpeakmeter.cpp similarity index 100% rename from source/widgets/digitalpeakmeter.cpp rename to source/modules/widgets/digitalpeakmeter.cpp diff --git a/source/widgets/digitalpeakmeter.hpp b/source/modules/widgets/digitalpeakmeter.hpp similarity index 100% rename from source/widgets/digitalpeakmeter.hpp rename to source/modules/widgets/digitalpeakmeter.hpp diff --git a/source/widgets/digitalpeakmeter.py b/source/modules/widgets/digitalpeakmeter.py similarity index 100% rename from source/widgets/digitalpeakmeter.py rename to source/modules/widgets/digitalpeakmeter.py diff --git a/source/widgets/ledbutton.cpp b/source/modules/widgets/ledbutton.cpp similarity index 100% rename from source/widgets/ledbutton.cpp rename to source/modules/widgets/ledbutton.cpp diff --git a/source/widgets/ledbutton.hpp b/source/modules/widgets/ledbutton.hpp similarity index 100% rename from source/widgets/ledbutton.hpp rename to source/modules/widgets/ledbutton.hpp diff --git a/source/widgets/ledbutton.py b/source/modules/widgets/ledbutton.py similarity index 100% rename from source/widgets/ledbutton.py rename to source/modules/widgets/ledbutton.py diff --git a/source/widgets/paramspinbox.cpp b/source/modules/widgets/paramspinbox.cpp similarity index 100% rename from source/widgets/paramspinbox.cpp rename to source/modules/widgets/paramspinbox.cpp diff --git a/source/widgets/paramspinbox.hpp b/source/modules/widgets/paramspinbox.hpp similarity index 100% rename from source/widgets/paramspinbox.hpp rename to source/modules/widgets/paramspinbox.hpp diff --git a/source/widgets/paramspinbox.py b/source/modules/widgets/paramspinbox.py similarity index 100% rename from source/widgets/paramspinbox.py rename to source/modules/widgets/paramspinbox.py diff --git a/source/widgets/pixmapbutton.py b/source/modules/widgets/pixmapbutton.py similarity index 100% rename from source/widgets/pixmapbutton.py rename to source/modules/widgets/pixmapbutton.py diff --git a/source/widgets/pixmapdial.cpp b/source/modules/widgets/pixmapdial.cpp similarity index 100% rename from source/widgets/pixmapdial.cpp rename to source/modules/widgets/pixmapdial.cpp diff --git a/source/widgets/pixmapdial.hpp b/source/modules/widgets/pixmapdial.hpp similarity index 100% rename from source/widgets/pixmapdial.hpp rename to source/modules/widgets/pixmapdial.hpp diff --git a/source/widgets/pixmapdial.py b/source/modules/widgets/pixmapdial.py similarity index 100% rename from source/widgets/pixmapdial.py rename to source/modules/widgets/pixmapdial.py diff --git a/source/widgets/pixmapkeyboard.cpp b/source/modules/widgets/pixmapkeyboard.cpp similarity index 100% rename from source/widgets/pixmapkeyboard.cpp rename to source/modules/widgets/pixmapkeyboard.cpp diff --git a/source/widgets/pixmapkeyboard.hpp b/source/modules/widgets/pixmapkeyboard.hpp similarity index 100% rename from source/widgets/pixmapkeyboard.hpp rename to source/modules/widgets/pixmapkeyboard.hpp diff --git a/source/widgets/pixmapkeyboard.py b/source/modules/widgets/pixmapkeyboard.py similarity index 100% rename from source/widgets/pixmapkeyboard.py rename to source/modules/widgets/pixmapkeyboard.py diff --git a/source/tests/ANSI.cpp b/source/tests/ANSI.cpp index f2b0aa405..68eb812c7 100644 --- a/source/tests/ANSI.cpp +++ b/source/tests/ANSI.cpp @@ -18,32 +18,43 @@ #undef NDEBUG #define DEBUG -// includes (part1) +// includes #include "CarlaDefines.hpp" #include "CarlaMIDI.h" - -// Carla common utils -#include "CarlaUtils.hpp" - -// Carla misc utils imported from Juce source code -#include "CarlaJuceUtils.hpp" - -// includes (part2) #include "ladspa_rdf.hpp" #include "lv2_rdf.hpp" // Carla Backend API #include "CarlaBackend.hpp" +// Carla utils (part 1/3) +#include "CarlaUtils.hpp" +#include "CarlaJuceUtils.hpp" + +// Carla utils (part 2/3) +#include "CarlaMutex.hpp" +#include "CarlaRingBuffer.hpp" +#include "CarlaString.hpp" +#include "Lv2AtomQueue.hpp" +#include "RtList.hpp" + +// Carla utils (part 3/3) +#include "CarlaBackendUtils.hpp" +#include "CarlaBridgeUtils.hpp" +#include "CarlaLadspaUtils.hpp" +#include "CarlaLibUtils.hpp" +#include "CarlaLv2Utils.hpp" +#include "CarlaOscUtils.hpp" +#include "CarlaShmUtils.hpp" +#include "CarlaStateUtils.hpp" +#include "CarlaVstUtils.hpp" + // Carla Native Plugin API #include "CarlaNative.h" // Carla Native Plugin API (C++) #include "CarlaNative.hpp" -// Carla String -#include "CarlaString.hpp" - // Carla Plugin API #include "CarlaPlugin.hpp" @@ -53,33 +64,13 @@ // Carla Standalone API #include "CarlaStandalone.hpp" -// Carla Plugin Thread -#include "CarlaPluginThread.hpp" - -// Carla Backend utils -#include "CarlaBackendUtils.hpp" - -// Carla OSC utils -#include "CarlaOscUtils.hpp" - -// Carla Mutex -#include "CarlaMutex.hpp" - -// RT List -#include "RtList.hpp" - -// Carla Plugin -// #include "CarlaPluginInternal.hpp" +// // Carla Plugin +// #include "plugin/CarlaPluginThread.hpp" +// #include "plugin/CarlaPluginInternal.hpp" -//#include "standalone/CarlaStandalone.cpp" +// #include "standalone/CarlaStandalone.cpp" -// #include "CarlaBridgeUtils.hpp" -// #include "CarlaLadspaUtils.hpp" -// #include "CarlaLibUtils.hpp" -// #include "CarlaLv2Utils.hpp" -// #include "CarlaShmUtils.hpp" -// #include "CarlaStateUtils.hpp" -// #include "CarlaVstUtils.hpp" +namespace CB = CarlaBackend; int safe_assert_return_test(bool test) { @@ -111,7 +102,6 @@ int main() // Carla Backend API { - namespace CB = CarlaBackend; CB::BinaryType a = CB::BINARY_NONE; CB::PluginType b = CB::PLUGIN_NONE; CB::PluginCategory c = CB::PLUGIN_CATEGORY_NONE;