falkTX
/
Carla
mirror of https://github.com/falkTX/Carla
1
0
Fork 0
Code Releases 42 Activity
Browse Source

Move some files

tags/1.9.4
falkTX 10 years ago
parent
a0248a3aa5
commit
11339a3d73
11 changed files with 17 additions and 20 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +10
    -6
      source/Makefile.deps
  2. +1
    -0
      source/backend/CarlaStandalone.cpp
  3. +1
    -0
      source/backend/engine/CarlaEngineNative.cpp
  4. +1
    -1
      source/backend/plugin/CarlaPlugin.cpp
  5. +1
    -1
      source/backend/plugin/Lv2Plugin.cpp
  6. +0
    -4
      source/backend/plugin/Makefile
  7. +1
    -1
      source/backend/plugin/VstPlugin.cpp
  8. +0
    -5
      source/bridges/Makefile
  9. +2
    -2
      source/utils/CarlaPluginUI.cpp
  10. +0
    -0
      source/utils/CarlaPluginUI.hpp
  11. +0
    -0
      source/utils/CarlaPluginUI_X11Icon.hpp

+ 10
- 6
source/Makefile.deps View File

@@ -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)

# ----------------------------------------------------------------------------------------------------------------------------

+ 1
- 0
source/backend/CarlaStandalone.cpp View File

@@ -2268,6 +2268,7 @@ const char* carla_get_host_osc_url_udp()

// -------------------------------------------------------------------------------------------------------------------

#include "CarlaPluginUI.cpp"
#include "CarlaDssiUtils.cpp"
#include "CarlaStateUtils.cpp"



+ 1
- 0
source/backend/engine/CarlaEngineNative.cpp View File

@@ -1673,6 +1673,7 @@ const EngineDriverDeviceInfo* CarlaEngine::getRtAudioDeviceInfo(const uint, cons

CARLA_BACKEND_END_NAMESPACE

#include "CarlaPluginUI.cpp"
#include "CarlaDssiUtils.cpp"
#include "CarlaStateUtils.cpp"



+ 1
- 1
source/backend/plugin/CarlaPlugin.cpp View File

@@ -20,7 +20,7 @@

#include "CarlaBackendUtils.hpp"
#include "CarlaMathUtils.hpp"
#include "CarlaPluginUi.hpp"
#include "CarlaPluginUI.hpp"

#include <ctime>



+ 1
- 1
source/backend/plugin/Lv2Plugin.cpp View File

@@ -25,7 +25,7 @@
#include "CarlaLv2Utils.hpp"

#include "CarlaBase64Utils.hpp"
#include "CarlaPluginUi.hpp"
#include "CarlaPluginUI.hpp"
#include "Lv2AtomRingBuffer.hpp"

#include "../engine/CarlaEngineOsc.hpp"


+ 0
- 4
source/backend/plugin/Makefile View File

@@ -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 $@



+ 1
- 1
source/backend/plugin/VstPlugin.cpp View File

@@ -28,7 +28,7 @@

#include "CarlaBase64Utils.hpp"
#include "CarlaMathUtils.hpp"
#include "CarlaPluginUi.hpp"
#include "CarlaPluginUI.hpp"

#include "juce_core.h"



+ 0
- 5
source/bridges/Makefile View File

@@ -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 \


source/backend/plugin/CarlaPluginUi.cpp → source/utils/CarlaPluginUI.cpp View File

@@ -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 <sys/types.h>
@@ -25,7 +25,7 @@
#endif

#ifdef HAVE_X11
# include "CarlaPluginUi_X11Icon.hpp"
# include "CarlaPluginUI_X11Icon.hpp"

// -----------------------------------------------------
// X11

source/backend/plugin/CarlaPluginUi.hpp → source/utils/CarlaPluginUI.hpp View File


source/backend/plugin/CarlaPluginUi_X11Icon.hpp → source/utils/CarlaPluginUI_X11Icon.hpp View File


Write Preview
Loading…
Cancel
Save