Browse Source

A few more GCC4 compat fixes

Signed-off-by: falkTX <falktx@falktx.com>
tags/v2.3.0-RC1
falkTX 4 years ago
parent
commit
c91f856585
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
2 changed files with 7 additions and 7 deletions
  1. +6
    -6
      source/backend/plugin/CarlaPluginJack.cpp
  2. +1
    -1
      source/modules/juce_audio_processors/processors/juce_AudioProcessor.h

+ 6
- 6
source/backend/plugin/CarlaPluginJack.cpp View File

@@ -143,7 +143,7 @@ public:
const EngineOptions& options(kEngine->getOptions()); const EngineOptions& options(kEngine->getOptions());
CarlaString binaryDir(options.binaryDir); CarlaString binaryDir(options.binaryDir);
#ifdef HAVE_LIBLO #ifdef HAVE_LIBLO
const int sessionManager = fSetupLabel[4] - '0';
const int sessionManager = fSetupLabel[4U] - '0';
#endif #endif


CarlaString ret; CarlaString ret;
@@ -192,7 +192,7 @@ protected:


if ((announced || fProject.path.isEmpty()) && fProject.init(kPlugin->getName(), if ((announced || fProject.path.isEmpty()) && fProject.init(kPlugin->getName(),
kEngine->getCurrentProjectFolder(), kEngine->getCurrentProjectFolder(),
&fSetupLabel[6]))
&fSetupLabel[6U]))
{ {
carla_stdout("Sending open signal %s %s %s", carla_stdout("Sending open signal %s %s %s",
fProject.path.buffer(), fProject.display.buffer(), fProject.clientName.buffer()); fProject.path.buffer(), fProject.display.buffer(), fProject.clientName.buffer());
@@ -232,7 +232,7 @@ protected:
static const char* const message = "Howdy, what took you so long?"; static const char* const message = "Howdy, what took you so long?";
static const char* const smName = "Carla"; static const char* const smName = "Carla";


const char* const features = ((fSetupLabel[5] - '0') & LIBJACK_FLAG_CONTROL_WINDOW)
const char* const features = ((fSetupLabel[5U] - '0') & LIBJACK_FLAG_CONTROL_WINDOW)
? featuresG : featuresN; ? featuresG : featuresN;


lo_send_from(fOscClientAddress, fOscServer, LO_TT_IMMEDIATE, "/reply", "ssss", lo_send_from(fOscClientAddress, fOscServer, LO_TT_IMMEDIATE, "/reply", "ssss",
@@ -316,7 +316,7 @@ protected:
fOscClientAddress = nullptr; fOscClientAddress = nullptr;
} }


const int sessionManager = fSetupLabel[4] - '0';
const int sessionManager = fSetupLabel[4U] - '0';


if (sessionManager == LIBJACK_SESSION_MANAGER_NSM) if (sessionManager == LIBJACK_SESSION_MANAGER_NSM)
{ {
@@ -328,7 +328,7 @@ protected:
} }
#endif #endif


const bool externalProcess = ((fSetupLabel[5] - '0') & LIBJACK_FLAG_EXTERNAL_START)
const bool externalProcess = ((fSetupLabel[5U] - '0') & LIBJACK_FLAG_EXTERNAL_START)
&& ! kEngine->isLoadingProject(); && ! kEngine->isLoadingProject();


if (! externalProcess) if (! externalProcess)
@@ -1763,7 +1763,7 @@ public:


// remove unprintable characters if needed // remove unprintable characters if needed
if (fSetupHints & LIBJACK_FLAG_EXTERNAL_START) if (fSetupHints & LIBJACK_FLAG_EXTERNAL_START)
fInfo.setupLabel[5] = static_cast<char>('0' + (fSetupHints ^ LIBJACK_FLAG_EXTERNAL_START));
fInfo.setupLabel[5U] = static_cast<char>('0' + (fSetupHints ^ LIBJACK_FLAG_EXTERNAL_START));


// --------------------------------------------------------------- // ---------------------------------------------------------------
// set options // set options


+ 1
- 1
source/modules/juce_audio_processors/processors/juce_AudioProcessor.h View File

@@ -1191,7 +1191,7 @@ public:
String xMeterID, yMeterID; String xMeterID, yMeterID;
}; };
virtual CurveData getResponseCurve (CurveData::Type /*curveType*/) const { return {}; }
virtual CurveData getResponseCurve (CurveData::Type /*curveType*/) const { return CurveData(); }
#if ! JUCE_AUDIOPROCESSOR_NO_GUI #if ! JUCE_AUDIOPROCESSOR_NO_GUI
//============================================================================== //==============================================================================


Loading…
Cancel
Save