LADI
/
carla
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Initializing juce is not needed for carla-vst linux build 

Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2020-04-22 07:42:12 +01:00
parent 720b9e36c5
commit 7555310048
No known key found for this signature in database
GPG Key ID: CDBAA37ABC74FBA0
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis/script-linux-juce-strict.sh
View File

@ -17,7 +17,7 @@ make distclean >/dev/null
make USING_JUCE=true features
# Build things that we skip strict tests for
make USING_JUCE=true 3rd frontend
make USING_JUCE=true 3rd frontend plugin-wine
make USING_JUCE=true -C source/modules/juce_audio_basics posix32
make USING_JUCE=true -C source/modules/juce_audio_devices posix32
make USING_JUCE=true -C source/modules/juce_audio_processors posix32

2
.travis/script-linux-strict.sh
View File

@ -17,7 +17,7 @@ make distclean >/dev/null
make USING_JUCE=false features
# Build things that we skip strict tests for
make USING_JUCE=false 3rd frontend
make USING_JUCE=false 3rd frontend plugin-wine
make USING_JUCE=false -C source/modules/water posix32
# Build native stuff

6
source/plugin/carla-lv2.cpp
View File

@ -23,7 +23,7 @@
#include "CarlaPipeUtils.hpp"
#include "CarlaString.hpp"
#ifdef USING_JUCE
#if defined(USING_JUCE) && (defined(CARLA_OS_MAC) || defined(CARLA_OS_WIN))
# if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wconversion"
@ -69,7 +69,7 @@ public:
#endif
kIgnoreParameters(std::strncmp(desc->label, "carla", 5) == 0),
fMidiEventCount(0),
#ifdef USING_JUCE
#if defined(USING_JUCE) && (defined(CARLA_OS_MAC) || defined(CARLA_OS_WIN))
fJuceInitialiser(),
#endif
fLoadedFile(),
@ -855,7 +855,7 @@ private:
uint32_t fMidiEventCount;
NativeMidiEvent fMidiEvents[kMaxMidiEvents];
#ifdef USING_JUCE
#if defined(USING_JUCE) && (defined(CARLA_OS_MAC) || defined(CARLA_OS_WIN))
juce::SharedResourcePointer<juce::ScopedJuceInitialiser_GUI> fJuceInitialiser;
#endif

6
source/plugin/carla-vst.cpp
View File

@ -42,7 +42,7 @@
#include "CarlaMathUtils.hpp"
#include "CarlaVstUtils.hpp"
#ifdef USING_JUCE
#if defined(USING_JUCE) && (defined(CARLA_OS_MAC) || defined(CARLA_OS_WIN))
# if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wconversion"
@ -98,7 +98,7 @@ public:
fUiLauncher(nullptr),
fHostType(kHostTypeNull),
fMidiOutEvents(),
#ifdef USING_JUCE
#if defined(USING_JUCE) && (defined(CARLA_OS_MAC) || defined(CARLA_OS_WIN))
fJuceInitialiser(),
#endif
fStateChunk(nullptr)
@ -865,7 +865,7 @@ private:
CARLA_DECLARE_NON_COPY_STRUCT(FixedVstEvents);
} fMidiOutEvents;
#ifdef USING_JUCE
#if defined(USING_JUCE) && (defined(CARLA_OS_MAC) || defined(CARLA_OS_WIN))
juce::SharedResourcePointer<juce::ScopedJuceInitialiser_GUI> fJuceInitialiser;
#endif