From a4fc3b7ba76ad845ad5afe211afdca9eee97554b Mon Sep 17 00:00:00 2001 From: falkTX Date: Sat, 16 Mar 2013 14:49:24 +0000 Subject: [PATCH] Fix build --- source/backend/plugin/FluidSynthPlugin.cpp | 1 - source/bridges/CarlaBridgeUI-LV2.cpp | 4 ++-- source/bridges/Makefile | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/source/backend/plugin/FluidSynthPlugin.cpp b/source/backend/plugin/FluidSynthPlugin.cpp index 798d6421d..4e0b48170 100644 --- a/source/backend/plugin/FluidSynthPlugin.cpp +++ b/source/backend/plugin/FluidSynthPlugin.cpp @@ -962,7 +962,6 @@ public: { if (processSingle(outBuffer, time - timeOffset, timeOffset)) { - startTime = 0; timeOffset = time; if (kData->midiprog.current >= 0 && kData->midiprog.count > 0 && kData->ctrlChannel >= 0 && kData->ctrlChannel < 16) diff --git a/source/bridges/CarlaBridgeUI-LV2.cpp b/source/bridges/CarlaBridgeUI-LV2.cpp index 751b42a1c..94184ef93 100644 --- a/source/bridges/CarlaBridgeUI-LV2.cpp +++ b/source/bridges/CarlaBridgeUI-LV2.cpp @@ -28,7 +28,7 @@ extern "C" { #include #include -Lv2WorldClass lv2World; +Lv2WorldClass gLv2World; CARLA_BRIDGE_START_NAMESPACE @@ -338,7 +338,7 @@ public: // ----------------------------------------------------------------- // get plugin from lv2_rdf (lilv) - lv2World.init(); + gLv2World.init(); rdf_descriptor = lv2_rdf_new(pluginURI); if (! rdf_descriptor) diff --git a/source/bridges/Makefile b/source/bridges/Makefile index 2133e08ff..72d9a3951 100644 --- a/source/bridges/Makefile +++ b/source/bridges/Makefile @@ -36,7 +36,7 @@ BUILD_PLUGIN_FLAGS += -I../backend/engine -I../backend/plugin -I../libs BUILD_PLUGIN_FLAGS += $(QT_UI_FLAGS) $(shell pkg-config --cflags QtXml) LINK_PLUGIN_FLAGS = $(LINK_FLAGS) -LINK_PLUGIN_FLAGS += $(QT_UI_FLAGS) $(shell pkg-config --libs QtXml) -lpthread +LINK_PLUGIN_FLAGS += $(QT_UI_LIBS) $(shell pkg-config --libs QtXml) -lpthread # -------------------------------------------------------------- # Plugin bridges (POSIX)