diff --git a/source/backend/engine/CarlaEngine.cpp b/source/backend/engine/CarlaEngine.cpp index 147ef3dbe..67d9462d4 100644 --- a/source/backend/engine/CarlaEngine.cpp +++ b/source/backend/engine/CarlaEngine.cpp @@ -2127,7 +2127,7 @@ bool CarlaEngine::loadProjectInternal(juce::XmlDocument& xmlDoc) case PLUGIN_SF2: if (CarlaString(stateSave.label).endsWith(" (16 outs)")) extraStuff = kTrue; - // nobreak + // fall through case PLUGIN_LADSPA: case PLUGIN_DSSI: case PLUGIN_VST2: diff --git a/source/backend/plugin/CarlaPluginLV2.cpp b/source/backend/plugin/CarlaPluginLV2.cpp index 02d255032..8aa57e9ec 100644 --- a/source/backend/plugin/CarlaPluginLV2.cpp +++ b/source/backend/plugin/CarlaPluginLV2.cpp @@ -1550,7 +1550,7 @@ public: break; case CarlaPipeServerLV2::UiHide: fPipeServer.stopPipeServer(2000); - // nobreak + // fall through case CarlaPipeServerLV2::UiCrashed: pData->transientTryCounter = 0; pData->engine->callback(ENGINE_CALLBACK_UI_STATE_CHANGED, pData->id, 0, 0, 0.0f, nullptr); diff --git a/source/backend/plugin/CarlaPluginLinuxSampler.cpp b/source/backend/plugin/CarlaPluginLinuxSampler.cpp index ce843ef50..9f2e16373 100644 --- a/source/backend/plugin/CarlaPluginLinuxSampler.cpp +++ b/source/backend/plugin/CarlaPluginLinuxSampler.cpp @@ -33,8 +33,24 @@ #include "juce_core/juce_core.h" +// ----------------------------------------------------------------------- + +#if defined(__clang__) +# pragma clang diagnostic push +# pragma clang diagnostic ignored "-Wdeprecated" +#elif defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wdeprecated" +#endif + #include +#if defined(__clang__) +# pragma clang diagnostic pop +#elif defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) +# pragma GCC diagnostic pop +#endif + // ----------------------------------------------------------------------- namespace LinuxSampler { diff --git a/source/includes/linuxsampler/EngineFactory.h b/source/includes/linuxsampler/EngineFactory.h index 8e01470d0..46cfe033c 100644 --- a/source/includes/linuxsampler/EngineFactory.h +++ b/source/includes/linuxsampler/EngineFactory.h @@ -21,11 +21,19 @@ #ifndef __LS_ENGINEFACTORY_H__ #define __LS_ENGINEFACTORY_H__ -#include - #include #include +#if defined(__clang__) +# pragma clang diagnostic push +# pragma clang diagnostic ignored "-Wdeprecated" +#elif defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wdeprecated" +#endif + +#include + namespace LinuxSampler { class EngineFactory { @@ -43,4 +51,10 @@ protected: } // namespace LinuxSampler +#if defined(__clang__) +# pragma clang diagnostic pop +#elif defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) +# pragma GCC diagnostic pop +#endif + #endif // __LS_ENGINEFACTORY_H__ diff --git a/source/interposer/libjack.cpp b/source/interposer/libjack.cpp index 1728779ca..8102fd221 100644 --- a/source/interposer/libjack.cpp +++ b/source/interposer/libjack.cpp @@ -1064,7 +1064,7 @@ int jack_activate(jack_client_t* client) } CARLA_EXPORT -int jack_deactivate(jack_client_t* client) +int jack_deactivate(jack_client_t* /*client*/) { carla_stdout("CarlaJackClient :: %s", __FUNCTION__); @@ -1636,8 +1636,6 @@ int jack_port_connected(const jack_port_t*) CARLA_EXPORT const char* JACK_METADATA_PRETTY_NAME; - -CARLA_EXPORT const char* JACK_METADATA_PRETTY_NAME = "http://jackaudio.org/metadata/pretty-name"; // jack_ringbuffer_create diff --git a/source/native-plugins/distrho-kars/DistrhoPluginKars.cpp b/source/native-plugins/distrho-kars/DistrhoPluginKars.cpp index e7ba94ed9..1d2ce6135 100644 --- a/source/native-plugins/distrho-kars/DistrhoPluginKars.cpp +++ b/source/native-plugins/distrho-kars/DistrhoPluginKars.cpp @@ -111,7 +111,7 @@ void DistrhoPluginKars::run(const float**, float** outputs, uint32_t frames, con fNotes[note].velocity = velo; break; } - // nobreak + // fall through case 0x80: note = data[1]; DISTRHO_SAFE_ASSERT_BREAK(note < 128); // kMaxNotes diff --git a/source/native-plugins/midi-pattern.cpp b/source/native-plugins/midi-pattern.cpp index f65365188..3f802f766 100644 --- a/source/native-plugins/midi-pattern.cpp +++ b/source/native-plugins/midi-pattern.cpp @@ -198,7 +198,7 @@ protected: fTimeSigNum = 2; else fTimeSigNum = 1; - // nobreak + // fall through case kParameterMeasures: fMaxTicks = 48.0*fTimeSigNum*fParameters[kParameterMeasures] /2; // FIXME: why /2 ? break; diff --git a/source/theme/CarlaStyle.cpp b/source/theme/CarlaStyle.cpp index 867671709..728f34b63 100644 --- a/source/theme/CarlaStyle.cpp +++ b/source/theme/CarlaStyle.cpp @@ -1373,6 +1373,7 @@ void CarlaStyle::drawControl(ControlElement element, const QStyleOption *option, painter->restore(); return; } + break; case CE_SizeGrip: painter->save(); { @@ -3681,11 +3682,13 @@ QRect CarlaStyle::subControlRect(ComplexControl control, const QStyleOptionCompl case SC_TitleBarContextHelpButton: if (tb->titleBarFlags & Qt::WindowContextHelpButtonHint) offset += delta; + // fall through case SC_TitleBarMinButton: if (!isMinimized && (tb->titleBarFlags & Qt::WindowMinimizeButtonHint)) offset += delta; else if (sc == SC_TitleBarMinButton) break; + // fall through case SC_TitleBarNormalButton: if (isMinimized && (tb->titleBarFlags & Qt::WindowMinimizeButtonHint)) offset += delta; @@ -3693,21 +3696,25 @@ QRect CarlaStyle::subControlRect(ComplexControl control, const QStyleOptionCompl offset += delta; else if (sc == SC_TitleBarNormalButton) break; + // fall through case SC_TitleBarMaxButton: if (!isMaximized && (tb->titleBarFlags & Qt::WindowMaximizeButtonHint)) offset += delta; else if (sc == SC_TitleBarMaxButton) break; + // fall through case SC_TitleBarShadeButton: if (!isMinimized && (tb->titleBarFlags & Qt::WindowShadeButtonHint)) offset += delta; else if (sc == SC_TitleBarShadeButton) break; + // fall through case SC_TitleBarUnshadeButton: if (isMinimized && (tb->titleBarFlags & Qt::WindowShadeButtonHint)) offset += delta; else if (sc == SC_TitleBarUnshadeButton) break; + // fall through case SC_TitleBarCloseButton: if (tb->titleBarFlags & Qt::WindowSystemMenuHint) offset += delta;