Browse Source

Fix build

tags/1.9.4
falkTX 11 years ago
parent
commit
4c1bd35856
6 changed files with 19 additions and 10 deletions
  1. +1
    -1
      source/backend/engine/CarlaEngineBridge.cpp
  2. +1
    -1
      source/backend/plugin/BridgePlugin.cpp
  3. +1
    -1
      source/bridges/CarlaBridgeUI-LV2.cpp
  4. +7
    -6
      source/bridges/Makefile
  5. +1
    -1
      source/utils/CarlaBridgeUtils.hpp
  6. +8
    -0
      source/utils/CarlaRingBuffer.hpp

+ 1
- 1
source/backend/engine/CarlaEngineBridge.cpp View File

@@ -82,7 +82,7 @@ struct BridgeAudioPool {
}
};

struct BridgeControl : public RingBufferControl {
struct BridgeControl : public RingBufferControl<StackPackedRingBuffer> {
CarlaString filename;
BridgeShmControl* data;
shm_t shm;


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

@@ -151,7 +151,7 @@ struct BridgeAudioPool {
}
};

struct BridgeControl : public RingBufferControl<StackRingBuffer> {
struct BridgeControl : public RingBufferControl<StackPackedRingBuffer> {
CarlaString filename;
BridgeShmControl* data;
shm_t shm;


+ 1
- 1
source/bridges/CarlaBridgeUI-LV2.cpp View File

@@ -273,7 +273,7 @@ public:
fFeatures[kFeatureIdUridUnmap]->URI = LV2_URID__unmap;
fFeatures[kFeatureIdUridUnmap]->data = uridUnmapFt;

fFeatures[kFeatureIdUiIdle]->URI = LV2_UI__idle;
fFeatures[kFeatureIdUiIdle]->URI = LV2_UI__idleInterface;
fFeatures[kFeatureIdUiIdle]->data = nullptr;

fFeatures[kFeatureIdUiFixedSize]->URI = LV2_UI__fixedSize;


+ 7
- 6
source/bridges/Makefile View File

@@ -160,12 +160,12 @@ LINK_UI_VST_X11_FLAGS = $(LINK_UI_FLAGS) $(QT5_UI_LIBS)
TARGETS = native

ifeq ($(CARLA_PLUGIN_SUPPORT),true)
ifeq ($(HAVE_GTK2),true)
TARGETS += ui_lv2-gtk2
endif
ifeq ($(HAVE_GTK3),true)
TARGETS += ui_lv2-gtk3
endif
# ifeq ($(HAVE_GTK2),true)
# TARGETS += ui_lv2-gtk2
# endif
# ifeq ($(HAVE_GTK3),true)
# TARGETS += ui_lv2-gtk3
# endif
ifeq ($(HAVE_QT4),true)
TARGETS += ui_lv2-qt4
else
@@ -387,6 +387,7 @@ 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 \


+ 1
- 1
source/utils/CarlaBridgeUtils.hpp View File

@@ -79,7 +79,7 @@ struct BridgeShmControl {
void* runClient;
char _padClient[32];
};
StackRingBuffer ringBuffer;
StackPackedRingBuffer ringBuffer;
} POST_PACKED_STRUCTURE;

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


+ 8
- 0
source/utils/CarlaRingBuffer.hpp View File

@@ -51,6 +51,14 @@ struct StackRingBuffer {
char buf[size];
};

PRE_PACKED_STRUCTURE
struct StackPackedRingBuffer {
static const uint32_t size = 2048;
int32_t head, tail, written;
bool invalidateCommit;
char buf[size];
} POST_PACKED_STRUCTURE;

// -----------------------------------------------------------------------
// RingBufferControl templated class



Loading…
Cancel
Save