From c91f85658548f77c92372369bed9a0065c353f34 Mon Sep 17 00:00:00 2001 From: falkTX Date: Sat, 26 Sep 2020 14:18:08 +0100 Subject: [PATCH] A few more GCC4 compat fixes Signed-off-by: falkTX --- source/backend/plugin/CarlaPluginJack.cpp | 12 ++++++------ .../processors/juce_AudioProcessor.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/source/backend/plugin/CarlaPluginJack.cpp b/source/backend/plugin/CarlaPluginJack.cpp index 23d95ce54..b7d2f28d2 100644 --- a/source/backend/plugin/CarlaPluginJack.cpp +++ b/source/backend/plugin/CarlaPluginJack.cpp @@ -143,7 +143,7 @@ public: const EngineOptions& options(kEngine->getOptions()); CarlaString binaryDir(options.binaryDir); #ifdef HAVE_LIBLO - const int sessionManager = fSetupLabel[4] - '0'; + const int sessionManager = fSetupLabel[4U] - '0'; #endif CarlaString ret; @@ -192,7 +192,7 @@ protected: if ((announced || fProject.path.isEmpty()) && fProject.init(kPlugin->getName(), kEngine->getCurrentProjectFolder(), - &fSetupLabel[6])) + &fSetupLabel[6U])) { carla_stdout("Sending open signal %s %s %s", 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 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; lo_send_from(fOscClientAddress, fOscServer, LO_TT_IMMEDIATE, "/reply", "ssss", @@ -316,7 +316,7 @@ protected: fOscClientAddress = nullptr; } - const int sessionManager = fSetupLabel[4] - '0'; + const int sessionManager = fSetupLabel[4U] - '0'; if (sessionManager == LIBJACK_SESSION_MANAGER_NSM) { @@ -328,7 +328,7 @@ protected: } #endif - const bool externalProcess = ((fSetupLabel[5] - '0') & LIBJACK_FLAG_EXTERNAL_START) + const bool externalProcess = ((fSetupLabel[5U] - '0') & LIBJACK_FLAG_EXTERNAL_START) && ! kEngine->isLoadingProject(); if (! externalProcess) @@ -1763,7 +1763,7 @@ public: // remove unprintable characters if needed if (fSetupHints & LIBJACK_FLAG_EXTERNAL_START) - fInfo.setupLabel[5] = static_cast('0' + (fSetupHints ^ LIBJACK_FLAG_EXTERNAL_START)); + fInfo.setupLabel[5U] = static_cast('0' + (fSetupHints ^ LIBJACK_FLAG_EXTERNAL_START)); // --------------------------------------------------------------- // set options diff --git a/source/modules/juce_audio_processors/processors/juce_AudioProcessor.h b/source/modules/juce_audio_processors/processors/juce_AudioProcessor.h index e183a8802..ab9e8a7d6 100644 --- a/source/modules/juce_audio_processors/processors/juce_AudioProcessor.h +++ b/source/modules/juce_audio_processors/processors/juce_AudioProcessor.h @@ -1191,7 +1191,7 @@ public: 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 //==============================================================================