Browse Source

Initializing juce is not needed for carla-vst linux build

Signed-off-by: falkTX <falktx@falktx.com>
tags/v2.2.0-RC1
falkTX 4 years ago
parent
commit
7555310048
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
4 changed files with 8 additions and 8 deletions
  1. +1
    -1
      .travis/script-linux-juce-strict.sh
  2. +1
    -1
      .travis/script-linux-strict.sh
  3. +3
    -3
      source/plugin/carla-lv2.cpp
  4. +3
    -3
      source/plugin/carla-vst.cpp

+ 1
- 1
.travis/script-linux-juce-strict.sh View File

@@ -17,7 +17,7 @@ make distclean >/dev/null
make USING_JUCE=true features make USING_JUCE=true features


# Build things that we skip strict tests for # 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_basics posix32
make USING_JUCE=true -C source/modules/juce_audio_devices posix32 make USING_JUCE=true -C source/modules/juce_audio_devices posix32
make USING_JUCE=true -C source/modules/juce_audio_processors posix32 make USING_JUCE=true -C source/modules/juce_audio_processors posix32


+ 1
- 1
.travis/script-linux-strict.sh View File

@@ -17,7 +17,7 @@ make distclean >/dev/null
make USING_JUCE=false features make USING_JUCE=false features


# Build things that we skip strict tests for # 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 make USING_JUCE=false -C source/modules/water posix32


# Build native stuff # Build native stuff


+ 3
- 3
source/plugin/carla-lv2.cpp View File

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


#ifdef USING_JUCE
#if defined(USING_JUCE) && (defined(CARLA_OS_MAC) || defined(CARLA_OS_WIN))
juce::SharedResourcePointer<juce::ScopedJuceInitialiser_GUI> fJuceInitialiser; juce::SharedResourcePointer<juce::ScopedJuceInitialiser_GUI> fJuceInitialiser;
#endif #endif




+ 3
- 3
source/plugin/carla-vst.cpp View File

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


#ifdef USING_JUCE
#if defined(USING_JUCE) && (defined(CARLA_OS_MAC) || defined(CARLA_OS_WIN))
juce::SharedResourcePointer<juce::ScopedJuceInitialiser_GUI> fJuceInitialiser; juce::SharedResourcePointer<juce::ScopedJuceInitialiser_GUI> fJuceInitialiser;
#endif #endif




Loading…
Cancel
Save