diff --git a/source/Makefile.deps b/source/Makefile.deps index 68723ba35..5892b6d32 100644 --- a/source/Makefile.deps +++ b/source/Makefile.deps @@ -37,6 +37,8 @@ CARLA_SHM_UTILS_HPP = $(CWD)/utils/CarlaShmUtils.hpp $(CARLA_UTILS_HPP) # utils (base classes) CARLA_MUTEX_HPP = $(CWD)/utils/CarlaMutex.hpp $(CARLA_UTILS_HPP) +CARLA_PLUGIN_UI_HPP = $(CWD)/utils/CarlaPluginUI.hpp $(CARLA_UTILS_HPP) +CARLA_PLUGIN_UI_CPP = $(CWD)/utils/CarlaPluginUI.cpp $(CARLA_PLUGIN_UI_HPP) CARLA_RING_BUFFER_HPP = $(CWD)/utils/CarlaRingBuffer.hpp $(CARLA_MATH_UTILS_HPP) CARLA_STRING_HPP = $(CWD)/utils/CarlaString.hpp $(CARLA_JUCE_UTILS_HPP) CARLA_THREAD_HPP = $(CWD)/utils/CarlaThread.hpp $(CARLA_MUTEX_HPP) $(CARLA_STRING_HPP) @@ -98,7 +100,7 @@ CARLA_ENGINE_GRAPH_CPP_DEPS = $(CARLA_ENGINE_GRAPH_HPP) $(CARLA_ENGINE_INTERN CARLA_ENGINE_INTERNAL_CPP_DEPS = $(CARLA_ENGINE_INTERNAL_HPP) $(CARLA_PLUGIN_HPP) CARLA_ENGINE_JACK_CPP_DEPS = $(CARLA_ENGINE_INTERNAL_HPP) $(CARLA_PLUGIN_HPP) $(CARLA_BACKEND_UTILS_HPP) $(CARLA_ENGINE_UTILS_HPP) $(CARLA_MATH_UTILS_HPP) $(CARLA_MIDI_H) $(CARLA_PATCHBAY_UTILS_HPP) $(JACK_BRIDGE_HPP) CARLA_ENGINE_JUCE_CPP_DEPS = $(CARLA_ENGINE_GRAPH_HPP) $(CARLA_ENGINE_INTERNAL_HPP) $(CARLA_BACKEND_UTILS_HPP) $(CARLA_STRING_LIST_HPP) $(RT_LINKED_LIST_HPP) -CARLA_ENGINE_NATIVE_CPP_DEPS = $(CARLA_ENGINE_INTERNAL_HPP) $(CARLA_PLUGIN_HPP) $(CARLA_BACKEND_UTILS_HPP) $(CARLA_BINARY_UTILS_HPP) $(CARLA_MATH_UTILS_HPP) $(CARLA_STATE_UTILS_HPP) $(CARLA_EXTERNAL_UI_HPP) $(CARLA_NATIVE_HPP) $(CARLA_DSSI_UTILS_CPP) $(CARLA_STATE_UTILS_CPP) +CARLA_ENGINE_NATIVE_CPP_DEPS = $(CARLA_ENGINE_INTERNAL_HPP) $(CARLA_PLUGIN_HPP) $(CARLA_BACKEND_UTILS_HPP) $(CARLA_BINARY_UTILS_HPP) $(CARLA_MATH_UTILS_HPP) $(CARLA_STATE_UTILS_HPP) $(CARLA_EXTERNAL_UI_HPP) $(CARLA_NATIVE_HPP) $(CARLA_PLUGIN_UI_CPP) $(CARLA_DSSI_UTILS_CPP) $(CARLA_STATE_UTILS_CPP) CARLA_ENGINE_OSC_CPP_DEPS = $(CARLA_ENGINE_HPP) $(CARLA_ENGINE_OSC_HPP) $(CARLA_PLUGIN_HPP) $(CARLA_BRIDGE_UTILS_HPP) $(CARLA_MIDI_H) CARLA_ENGINE_OSC_SEND_CPP_DEPS = $(CARLA_BACKEND_UTILS_HPP) $(CARLA_ENGINE_INTERNAL_HPP) $(CARLA_MIDI_H) CARLA_ENGINE_PORTS_CPP_DEPS = $(CARLA_ENGINE_UTILS_HPP) $(CARLA_MATH_UTILS_HPP) $(CARLA_MIDI_H) @@ -107,11 +109,16 @@ CARLA_ENGINE_THREAD_CPP_DEPS = $(CARLA_ENGINE_HPP) $(CARLA_ENGINE_THREAD_HPP) CARLA_ENGINE_CPP = $(CWD)/backend/engine/CarlaEngine.cpp $(CARLA_ENGINE_CPP_DEPS) CARLA_ENGINE_BRIDGE_CPP = $(CWD)/backend/engine/CarlaEngineBridge.cpp $(CARLA_ENGINE_CPP_BRIDGE_DEPS) +CARLA_ENGINE_CLIENT_CPP = $(CWD)/backend/engine/CarlaEngineClient.cpp $(CARLA_ENGINE_CPP_CLIENT_DEPS) +CARLA_ENGINE_DATA_CPP = $(CWD)/backend/engine/CarlaEngineData.cpp $(CARLA_ENGINE_CPP_DATA_DEPS) +CARLA_ENGINE_GRAPH_CPP = $(CWD)/backend/engine/CarlaEngineGraph.cpp $(CARLA_ENGINE_CPP_GRAPH_DEPS) CARLA_ENGINE_INTERNAL_CPP = $(CWD)/backend/engine/CarlaEngineInternal.cpp $(CARLA_ENGINE_CPP_INTERNAL_DEPS) CARLA_ENGINE_JACK_CPP = $(CWD)/backend/engine/CarlaEngineJack.cpp $(CARLA_ENGINE_CPP_JACK_DEPS) CARLA_ENGINE_JUCE_CPP = $(CWD)/backend/engine/CarlaEngineJuce.cpp $(CARLA_ENGINE_CPP_JUCE_DEPS) CARLA_ENGINE_NATIVE_CPP = $(CWD)/backend/engine/CarlaEngineNative.cpp $(CARLA_ENGINE_CPP_NATIVE_DEPS) CARLA_ENGINE_OSC_CPP = $(CWD)/backend/engine/CarlaEngineOsc.cpp $(CARLA_ENGINE_CPP_OSC_DEPS) +CARLA_ENGINE_OSC_SEND_CPP = $(CWD)/backend/engine/CarlaEngineOscSend.cpp $(CARLA_ENGINE_CPP_OSC_SEND_DEPS) +CARLA_ENGINE_PORTS_CPP = $(CWD)/backend/engine/CarlaEnginePorts.cpp $(CARLA_ENGINE_CPP_PORTS_DEPS) CARLA_ENGINE_RTAUDIO_CPP = $(CWD)/backend/engine/CarlaEngineRtAudio.cpp $(CARLA_ENGINE_CPP_RTAUDIO_DEPS) CARLA_ENGINE_THREAD_CPP = $(CWD)/backend/engine/CarlaEngineThread.cpp $(CARLA_ENGINE_CPP_THREAD_DEPS) @@ -119,7 +126,6 @@ CARLA_ENGINE_THREAD_CPP = $(CWD)/backend/engine/CarlaEngineThread.cpp $ # backend/plugin CARLA_PLUGIN_THREAD_HPP = $(CWD)/backend/plugin/CarlaPluginThread.hpp $(CARLA_BACKEND_H) $(CARLA_THREAD_HPP) -CARLA_PLUGIN_UI_HPP = $(CWD)/backend/plugin/CarlaPluginUi.hpp $(CARLA_UTILS_HPP) CARLA_PLUGIN_INTERNAL_HPP = $(CWD)/backend/plugin/CarlaPluginInternal.hpp $(CARLA_PLUGIN_HPP) $(CARLA_PLUGIN_THREAD_HPP) $(CARLA_OSC_UTILS_HPP) $(CARLA_STATE_UTILS_HPP) $(CARLA_MUTEX_HPP) $(RT_LINKED_LIST_HPP) $(CARLA_MIDI_H) AU_PLUGIN_CPP_DEPS = $(CARLA_PLUGIN_HPP) $(CARLA_ENGINE_HPP) $(CARLA_UTILS_HPP) @@ -127,7 +133,6 @@ BRIDGE_PLUGIN_CPP_DEPS = $(CARLA_PLUGIN_INTERNAL_HPP) $(CARLA_ENGINE_HPP CARLA_PLUGIN_CPP_DEPS = $(CARLA_PLUGIN_INTERNAL_HPP) $(CARLA_ENGINE_HPP) $(CARLA_BACKEND_UTILS_HPP) $(CARLA_MATH_UTILS_HPP) $(CARLA_PLUGIN_UI_HPP) CARLA_PLUGIN_INTERNAL_CPP_DEPS = $(CARLA_PLUGIN_INTERNAL_HPP) $(CARLA_ENGINE_HPP) $(CARLA_LIB_COUNTER_HPP) $(CARLA_MATH_UTILS_HPP) CARLA_PLUGIN_THREAD_CPP_DEPS = $(CARLA_PLUGIN_HPP) $(CARLA_PLUGIN_THREAD_HPP) $(CARLA_ENGINE_HPP) -CARLA_PLUGIN_UI_CPP_DEPS = $(CARLA_PLUGIN_UI_HPP) CSOUND_PLUGIN_CPP_DEPS = $(CARLA_PLUGIN_INTERNAL_HPP) $(CARLA_ENGINE_HPP) DSSI_PLUGIN_CPP_DEPS = $(CARLA_PLUGIN_INTERNAL_HPP) $(CARLA_ENGINE_HPP) $(CARLA_DSSI_UTILS_HPP) $(CARLA_MATH_UTILS_HPP) FLUIDSYNTH_PLUGIN_CPP_DEPS = $(CARLA_PLUGIN_INTERNAL_HPP) $(CARLA_ENGINE_HPP) $(CARLA_MATH_UTILS_HPP) @@ -145,7 +150,6 @@ BRIDGE_PLUGIN_CPP = $(CWD)/backend/plugin/BridgePlugin.cpp $ CARLA_PLUGIN_CPP = $(CWD)/backend/plugin/CarlaPlugin.cpp $(CARLA_PLUGIN_CPP_DEPS) CARLA_PLUGIN_INTERNAL_CPP = $(CWD)/backend/plugin/CarlaPluginInternal.cpp $(CARLA_PLUGIN_INTERNAL_CPP_DEPS) CARLA_PLUGIN_THREAD_CPP = $(CWD)/backend/plugin/CarlaPluginThread.cpp $(CARLA_PLUGIN_THREAD_CPP_DEPS) -CARLA_PLUGIN_UI_CPP = $(CWD)/backend/plugin/CarlaPluginUi.cpp $(CARLA_PLUGIN_UI_CPP_DEPS) CSOUND_PLUGIN_CPP = $(CWD)/backend/plugin/CsoundPlugin.cpp $(CSOUND_PLUGIN_CPP_DEPS) DSSI_PLUGIN_CPP = $(CWD)/backend/plugin/DssiPlugin.cpp $(DSSI_PLUGIN_CPP_DEPS) FLUIDSYNTH_PLUGIN_CPP = $(CWD)/backend/plugin/FluidSynthPlugin.cpp $(FLUIDSYNTH_PLUGIN_CPP_DEPS) @@ -161,7 +165,7 @@ VST3_PLUGIN_CPP = $(CWD)/backend/plugin/Vst3Plugin.cpp $ # ---------------------------------------------------------------------------------------------------------------------------- # backend/standalone -CARLA_STANDALONE_CPP_DEPS = $(CARLA_HOST_H) $(CARLA_MIDI_H) $(CARLA_NATIVE_H) $(CARLA_ENGINE_HPP) $(CARLA_PLUGIN_HPP) $(CARLA_BACKEND_UTILS_HPP) $(CARLA_OSC_UTILS_HPP) $(CARLA_DSSI_UTILS_CPP) $(CARLA_STATE_UTILS_CPP) -CARLA_STANDALONE_CPP = $(CWD)/backend/standalone/CarlaStandalone.cpp $(CARLA_STANDALONE_CPP_DEPS) +CARLA_STANDALONE_CPP_DEPS = $(CARLA_HOST_H) $(CARLA_MIDI_H) $(CARLA_NATIVE_H) $(CARLA_ENGINE_HPP) $(CARLA_PLUGIN_HPP) $(CARLA_BACKEND_UTILS_HPP) $(CARLA_OSC_UTILS_HPP) +CARLA_STANDALONE_CPP = $(CWD)/backend/standalone/CarlaStandalone.cpp $(CARLA_STANDALONE_CPP_DEPS) $(CARLA_PLUGIN_UI_CPP) $(CARLA_DSSI_UTILS_CPP) $(CARLA_STATE_UTILS_CPP) # ---------------------------------------------------------------------------------------------------------------------------- diff --git a/source/backend/CarlaStandalone.cpp b/source/backend/CarlaStandalone.cpp index c3e0d1787..e94a1d711 100644 --- a/source/backend/CarlaStandalone.cpp +++ b/source/backend/CarlaStandalone.cpp @@ -2268,6 +2268,7 @@ const char* carla_get_host_osc_url_udp() // ------------------------------------------------------------------------------------------------------------------- +#include "CarlaPluginUI.cpp" #include "CarlaDssiUtils.cpp" #include "CarlaStateUtils.cpp" diff --git a/source/backend/engine/CarlaEngineNative.cpp b/source/backend/engine/CarlaEngineNative.cpp index 63d35b1aa..0e6cb2042 100644 --- a/source/backend/engine/CarlaEngineNative.cpp +++ b/source/backend/engine/CarlaEngineNative.cpp @@ -1673,6 +1673,7 @@ const EngineDriverDeviceInfo* CarlaEngine::getRtAudioDeviceInfo(const uint, cons CARLA_BACKEND_END_NAMESPACE +#include "CarlaPluginUI.cpp" #include "CarlaDssiUtils.cpp" #include "CarlaStateUtils.cpp" diff --git a/source/backend/plugin/CarlaPlugin.cpp b/source/backend/plugin/CarlaPlugin.cpp index 5161f2c4b..e216fce35 100644 --- a/source/backend/plugin/CarlaPlugin.cpp +++ b/source/backend/plugin/CarlaPlugin.cpp @@ -20,7 +20,7 @@ #include "CarlaBackendUtils.hpp" #include "CarlaMathUtils.hpp" -#include "CarlaPluginUi.hpp" +#include "CarlaPluginUI.hpp" #include diff --git a/source/backend/plugin/Lv2Plugin.cpp b/source/backend/plugin/Lv2Plugin.cpp index 10168f1e5..7aa96c103 100644 --- a/source/backend/plugin/Lv2Plugin.cpp +++ b/source/backend/plugin/Lv2Plugin.cpp @@ -25,7 +25,7 @@ #include "CarlaLv2Utils.hpp" #include "CarlaBase64Utils.hpp" -#include "CarlaPluginUi.hpp" +#include "CarlaPluginUI.hpp" #include "Lv2AtomRingBuffer.hpp" #include "../engine/CarlaEngineOsc.hpp" diff --git a/source/backend/plugin/Makefile b/source/backend/plugin/Makefile index 6a3c85c2a..1b460980a 100644 --- a/source/backend/plugin/Makefile +++ b/source/backend/plugin/Makefile @@ -12,7 +12,6 @@ OBJS = \ CarlaPlugin.cpp.o \ CarlaPluginInternal.cpp.o \ CarlaPluginThread.cpp.o \ - CarlaPluginUi.cpp.o \ NativePlugin.cpp.o \ BridgePlugin.cpp.o \ LadspaPlugin.cpp.o \ @@ -58,9 +57,6 @@ CarlaPluginInternal.cpp.o: CarlaPluginInternal.cpp $(CARLA_PLUGIN_INTERNAL_CPP_D CarlaPluginThread.cpp.o: CarlaPluginThread.cpp $(CARLA_PLUGIN_THREAD_CPP_DEPS) $(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ -CarlaPluginUi.cpp.o: CarlaPluginUi.cpp $(CARLA_PLUGIN_UI_CPP_DEPS) - $(CXX) $< $(BUILD_CXX_FLAGS) $(X11_FLAGS) -c -o $@ - NativePlugin.cpp.o: NativePlugin.cpp $(NATIVE_PLUGIN_CPP_DEPS) $(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ diff --git a/source/backend/plugin/VstPlugin.cpp b/source/backend/plugin/VstPlugin.cpp index e7221dde6..3cb15be3d 100644 --- a/source/backend/plugin/VstPlugin.cpp +++ b/source/backend/plugin/VstPlugin.cpp @@ -28,7 +28,7 @@ #include "CarlaBase64Utils.hpp" #include "CarlaMathUtils.hpp" -#include "CarlaPluginUi.hpp" +#include "CarlaPluginUI.hpp" #include "juce_core.h" diff --git a/source/bridges/Makefile b/source/bridges/Makefile index b2508eb41..7c6edb0ea 100644 --- a/source/bridges/Makefile +++ b/source/bridges/Makefile @@ -392,7 +392,6 @@ OBJS_NATIVE += \ ../backend/plugin/CarlaPlugin__native.o \ ../backend/plugin/CarlaPluginInternal__native.o \ ../backend/plugin/CarlaPluginThread__native.o \ - ../backend/plugin/CarlaPluginUi__native.o \ ../backend/plugin/NativePlugin__native.o \ ../backend/plugin/LadspaPlugin__native.o \ ../backend/plugin/DssiPlugin__native.o \ @@ -458,7 +457,6 @@ OBJS_POSIX32 += \ ../backend/plugin/CarlaPlugin__posix32.o \ ../backend/plugin/CarlaPluginInternal__posix32.o \ ../backend/plugin/CarlaPluginThread__posix32.o \ - ../backend/plugin/CarlaPluginUi__posix32.o \ ../backend/plugin/LadspaPlugin__posix32.o \ ../backend/plugin/DssiPlugin__posix32.o \ ../backend/plugin/Lv2Plugin__posix32.o \ @@ -518,7 +516,6 @@ OBJS_POSIX64 += \ ../backend/plugin/CarlaPlugin__posix64.o \ ../backend/plugin/CarlaPluginInternal__posix64.o \ ../backend/plugin/CarlaPluginThread__posix64.o \ - ../backend/plugin/CarlaPluginUi__posix64.o \ ../backend/plugin/LadspaPlugin__posix64.o \ ../backend/plugin/DssiPlugin__posix64.o \ ../backend/plugin/Lv2Plugin__posix64.o \ @@ -578,7 +575,6 @@ OBJS_WIN32 += \ ../backend/plugin/CarlaPlugin__win32.o \ ../backend/plugin/CarlaPluginInternal__win32.o \ ../backend/plugin/CarlaPluginThread__win32.o \ - ../backend/plugin/CarlaPluginUi__win32.o \ ../backend/plugin/LadspaPlugin__win32.o \ ../backend/plugin/DssiPlugin__win32.o \ ../backend/plugin/Lv2Plugin__win32.o \ @@ -635,7 +631,6 @@ OBJS_WIN64 += \ ../backend/plugin/CarlaPlugin__win64.o \ ../backend/plugin/CarlaPluginInternal__win64.o \ ../backend/plugin/CarlaPluginThread__win64.o \ - ../backend/plugin/CarlaPluginUi__win64.o \ ../backend/plugin/LadspaPlugin__win64.o \ ../backend/plugin/DssiPlugin__win64.o \ ../backend/plugin/Lv2Plugin__win64.o \ diff --git a/source/backend/plugin/CarlaPluginUi.cpp b/source/utils/CarlaPluginUI.cpp similarity index 99% rename from source/backend/plugin/CarlaPluginUi.cpp rename to source/utils/CarlaPluginUI.cpp index 9c4c232c8..121582783 100644 --- a/source/backend/plugin/CarlaPluginUi.cpp +++ b/source/utils/CarlaPluginUI.cpp @@ -15,7 +15,7 @@ * For a full copy of the GNU General Public License see the doc/GPL.txt file. */ -#include "CarlaPluginUi.hpp" +#include "CarlaPluginUI.hpp" #ifdef HAVE_X11 # include @@ -25,7 +25,7 @@ #endif #ifdef HAVE_X11 -# include "CarlaPluginUi_X11Icon.hpp" +# include "CarlaPluginUI_X11Icon.hpp" // ----------------------------------------------------- // X11 diff --git a/source/backend/plugin/CarlaPluginUi.hpp b/source/utils/CarlaPluginUI.hpp similarity index 100% rename from source/backend/plugin/CarlaPluginUi.hpp rename to source/utils/CarlaPluginUI.hpp diff --git a/source/backend/plugin/CarlaPluginUi_X11Icon.hpp b/source/utils/CarlaPluginUI_X11Icon.hpp similarity index 100% rename from source/backend/plugin/CarlaPluginUi_X11Icon.hpp rename to source/utils/CarlaPluginUI_X11Icon.hpp