Browse Source

Fix some gcc-7 warnings

tags/1.9.8
falkTX 8 years ago
parent
commit
1c529be20b
8 changed files with 44 additions and 9 deletions
  1. +1
    -1
      source/backend/engine/CarlaEngine.cpp
  2. +1
    -1
      source/backend/plugin/CarlaPluginLV2.cpp
  3. +16
    -0
      source/backend/plugin/CarlaPluginLinuxSampler.cpp
  4. +16
    -2
      source/includes/linuxsampler/EngineFactory.h
  5. +1
    -3
      source/interposer/libjack.cpp
  6. +1
    -1
      source/native-plugins/distrho-kars/DistrhoPluginKars.cpp
  7. +1
    -1
      source/native-plugins/midi-pattern.cpp
  8. +7
    -0
      source/theme/CarlaStyle.cpp

+ 1
- 1
source/backend/engine/CarlaEngine.cpp View File

@@ -2127,7 +2127,7 @@ bool CarlaEngine::loadProjectInternal(juce::XmlDocument& xmlDoc)
case PLUGIN_SF2: case PLUGIN_SF2:
if (CarlaString(stateSave.label).endsWith(" (16 outs)")) if (CarlaString(stateSave.label).endsWith(" (16 outs)"))
extraStuff = kTrue; extraStuff = kTrue;
// nobreak
// fall through
case PLUGIN_LADSPA: case PLUGIN_LADSPA:
case PLUGIN_DSSI: case PLUGIN_DSSI:
case PLUGIN_VST2: case PLUGIN_VST2:


+ 1
- 1
source/backend/plugin/CarlaPluginLV2.cpp View File

@@ -1550,7 +1550,7 @@ public:
break; break;
case CarlaPipeServerLV2::UiHide: case CarlaPipeServerLV2::UiHide:
fPipeServer.stopPipeServer(2000); fPipeServer.stopPipeServer(2000);
// nobreak
// fall through
case CarlaPipeServerLV2::UiCrashed: case CarlaPipeServerLV2::UiCrashed:
pData->transientTryCounter = 0; pData->transientTryCounter = 0;
pData->engine->callback(ENGINE_CALLBACK_UI_STATE_CHANGED, pData->id, 0, 0, 0.0f, nullptr); pData->engine->callback(ENGINE_CALLBACK_UI_STATE_CHANGED, pData->id, 0, 0, 0.0f, nullptr);


+ 16
- 0
source/backend/plugin/CarlaPluginLinuxSampler.cpp View File

@@ -33,8 +33,24 @@


#include "juce_core/juce_core.h" #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 <linuxsampler/Sampler.h> #include <linuxsampler/Sampler.h>


#if defined(__clang__)
# pragma clang diagnostic pop
#elif defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
# pragma GCC diagnostic pop
#endif

// ----------------------------------------------------------------------- // -----------------------------------------------------------------------


namespace LinuxSampler { namespace LinuxSampler {


+ 16
- 2
source/includes/linuxsampler/EngineFactory.h View File

@@ -21,11 +21,19 @@
#ifndef __LS_ENGINEFACTORY_H__ #ifndef __LS_ENGINEFACTORY_H__
#define __LS_ENGINEFACTORY_H__ #define __LS_ENGINEFACTORY_H__


#include <linuxsampler/engines/Engine.h>

#include <set> #include <set>
#include <vector> #include <vector>


#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 <linuxsampler/engines/Engine.h>

namespace LinuxSampler { namespace LinuxSampler {


class EngineFactory { class EngineFactory {
@@ -43,4 +51,10 @@ protected:


} // namespace LinuxSampler } // 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__ #endif // __LS_ENGINEFACTORY_H__

+ 1
- 3
source/interposer/libjack.cpp View File

@@ -1064,7 +1064,7 @@ int jack_activate(jack_client_t* client)
} }


CARLA_EXPORT CARLA_EXPORT
int jack_deactivate(jack_client_t* client)
int jack_deactivate(jack_client_t* /*client*/)
{ {
carla_stdout("CarlaJackClient :: %s", __FUNCTION__); carla_stdout("CarlaJackClient :: %s", __FUNCTION__);


@@ -1636,8 +1636,6 @@ int jack_port_connected(const jack_port_t*)


CARLA_EXPORT CARLA_EXPORT
const char* JACK_METADATA_PRETTY_NAME; const char* JACK_METADATA_PRETTY_NAME;

CARLA_EXPORT
const char* JACK_METADATA_PRETTY_NAME = "http://jackaudio.org/metadata/pretty-name"; const char* JACK_METADATA_PRETTY_NAME = "http://jackaudio.org/metadata/pretty-name";


// jack_ringbuffer_create // jack_ringbuffer_create


+ 1
- 1
source/native-plugins/distrho-kars/DistrhoPluginKars.cpp View File

@@ -111,7 +111,7 @@ void DistrhoPluginKars::run(const float**, float** outputs, uint32_t frames, con
fNotes[note].velocity = velo; fNotes[note].velocity = velo;
break; break;
} }
// nobreak
// fall through
case 0x80: case 0x80:
note = data[1]; note = data[1];
DISTRHO_SAFE_ASSERT_BREAK(note < 128); // kMaxNotes DISTRHO_SAFE_ASSERT_BREAK(note < 128); // kMaxNotes


+ 1
- 1
source/native-plugins/midi-pattern.cpp View File

@@ -198,7 +198,7 @@ protected:
fTimeSigNum = 2; fTimeSigNum = 2;
else else
fTimeSigNum = 1; fTimeSigNum = 1;
// nobreak
// fall through
case kParameterMeasures: case kParameterMeasures:
fMaxTicks = 48.0*fTimeSigNum*fParameters[kParameterMeasures] /2; // FIXME: why /2 ? fMaxTicks = 48.0*fTimeSigNum*fParameters[kParameterMeasures] /2; // FIXME: why /2 ?
break; break;


+ 7
- 0
source/theme/CarlaStyle.cpp View File

@@ -1373,6 +1373,7 @@ void CarlaStyle::drawControl(ControlElement element, const QStyleOption *option,
painter->restore(); painter->restore();
return; return;
} }
break;
case CE_SizeGrip: case CE_SizeGrip:
painter->save(); painter->save();
{ {
@@ -3681,11 +3682,13 @@ QRect CarlaStyle::subControlRect(ComplexControl control, const QStyleOptionCompl
case SC_TitleBarContextHelpButton: case SC_TitleBarContextHelpButton:
if (tb->titleBarFlags & Qt::WindowContextHelpButtonHint) if (tb->titleBarFlags & Qt::WindowContextHelpButtonHint)
offset += delta; offset += delta;
// fall through
case SC_TitleBarMinButton: case SC_TitleBarMinButton:
if (!isMinimized && (tb->titleBarFlags & Qt::WindowMinimizeButtonHint)) if (!isMinimized && (tb->titleBarFlags & Qt::WindowMinimizeButtonHint))
offset += delta; offset += delta;
else if (sc == SC_TitleBarMinButton) else if (sc == SC_TitleBarMinButton)
break; break;
// fall through
case SC_TitleBarNormalButton: case SC_TitleBarNormalButton:
if (isMinimized && (tb->titleBarFlags & Qt::WindowMinimizeButtonHint)) if (isMinimized && (tb->titleBarFlags & Qt::WindowMinimizeButtonHint))
offset += delta; offset += delta;
@@ -3693,21 +3696,25 @@ QRect CarlaStyle::subControlRect(ComplexControl control, const QStyleOptionCompl
offset += delta; offset += delta;
else if (sc == SC_TitleBarNormalButton) else if (sc == SC_TitleBarNormalButton)
break; break;
// fall through
case SC_TitleBarMaxButton: case SC_TitleBarMaxButton:
if (!isMaximized && (tb->titleBarFlags & Qt::WindowMaximizeButtonHint)) if (!isMaximized && (tb->titleBarFlags & Qt::WindowMaximizeButtonHint))
offset += delta; offset += delta;
else if (sc == SC_TitleBarMaxButton) else if (sc == SC_TitleBarMaxButton)
break; break;
// fall through
case SC_TitleBarShadeButton: case SC_TitleBarShadeButton:
if (!isMinimized && (tb->titleBarFlags & Qt::WindowShadeButtonHint)) if (!isMinimized && (tb->titleBarFlags & Qt::WindowShadeButtonHint))
offset += delta; offset += delta;
else if (sc == SC_TitleBarShadeButton) else if (sc == SC_TitleBarShadeButton)
break; break;
// fall through
case SC_TitleBarUnshadeButton: case SC_TitleBarUnshadeButton:
if (isMinimized && (tb->titleBarFlags & Qt::WindowShadeButtonHint)) if (isMinimized && (tb->titleBarFlags & Qt::WindowShadeButtonHint))
offset += delta; offset += delta;
else if (sc == SC_TitleBarUnshadeButton) else if (sc == SC_TitleBarUnshadeButton)
break; break;
// fall through
case SC_TitleBarCloseButton: case SC_TitleBarCloseButton:
if (tb->titleBarFlags & Qt::WindowSystemMenuHint) if (tb->titleBarFlags & Qt::WindowSystemMenuHint)
offset += delta; offset += delta;


Loading…
Cancel
Save