From 8738b6ecd1e68a8ae937fa825ced8e3bc822c5c2 Mon Sep 17 00:00:00 2001 From: falkTX Date: Fri, 30 May 2014 23:27:41 +0100 Subject: [PATCH] Misc cleanup --- source/backend/CarlaBackend.h | 6 +++--- source/backend/CarlaEngine.hpp | 10 ++-------- source/backend/CarlaPlugin.hpp | 10 ++-------- source/backend/plugin/CarlaPluginThread.cpp | 8 ++++---- source/backend/plugin/CarlaPluginThread.hpp | 6 +++--- source/backend/plugin/CarlaPluginUi.cpp | 2 +- source/includes/CarlaDefines.h | 8 ++++---- 7 files changed, 19 insertions(+), 31 deletions(-) diff --git a/source/backend/CarlaBackend.h b/source/backend/CarlaBackend.h index cad6c66e9..7de1474b2 100644 --- a/source/backend/CarlaBackend.h +++ b/source/backend/CarlaBackend.h @@ -870,12 +870,12 @@ typedef enum { * @param value1 Port Id * @param value3 New port value */ - ENGINE_CALLBACK_PATCHBAY_PORT_VALUE_CHANGED = 26, + ENGINE_CALLBACK_PATCHBAY_PORT_VALUE_CHANGED = 26, // TODO /*! * A patchbay connection has been added. * @param pluginId Connection Id - * @param valueStr Out group, port plus in group and port, in "og:op:ig:ip" syntax. + * @param valueStr Out group and port plus in group and port, in "og:op:ig:ip" syntax. */ ENGINE_CALLBACK_PATCHBAY_CONNECTION_ADDED = 27, @@ -1252,7 +1252,7 @@ typedef struct { /*! * Currently mapped MIDI CC.\n * A value lower than 0 means invalid or unused.\n - * Maximum allowed value is 95 (0x5F). + * Maximum allowed value is 95 (0x5F). - FIXME */ int16_t midiCC; diff --git a/source/backend/CarlaEngine.hpp b/source/backend/CarlaEngine.hpp index 6bc08bc70..90e970a79 100644 --- a/source/backend/CarlaEngine.hpp +++ b/source/backend/CarlaEngine.hpp @@ -618,12 +618,6 @@ protected: // ----------------------------------------------------------------------- -/*! - * Protected data used in CarlaEngine and subclasses.\n - * Non-engine code MUST NEVER have direct access to this. - */ -struct CarlaEngineProtectedData; - /*! * Carla Engine. * \note This is a virtual class for all available engine types available in Carla. @@ -1040,8 +1034,8 @@ protected: /*! * Internal data, for CarlaEngine subclasses only. */ - CarlaEngineProtectedData* const pData; - friend struct CarlaEngineProtectedData; + struct ProtectedData; + ProtectedData* const pData; // ------------------------------------------------------------------- // Internal stuff diff --git a/source/backend/CarlaPlugin.hpp b/source/backend/CarlaPlugin.hpp index df66870ef..e0cca6d2a 100644 --- a/source/backend/CarlaPlugin.hpp +++ b/source/backend/CarlaPlugin.hpp @@ -51,12 +51,6 @@ class CarlaEngineAudioPort; */ struct SaveState; -/*! - * Protected data used in CarlaPlugin and subclasses.\n - * Non-plugin code MUST NEVER have direct access to this. - */ -struct CarlaPluginProtectedData; - // ----------------------------------------------------------------------- /*! @@ -884,8 +878,8 @@ protected: /*! * Internal data, for CarlaPlugin subclasses only. */ - CarlaPluginProtectedData* const pData; - friend struct CarlaPluginProtectedData; + struct ProtectedData; + ProtectedData* const pData; // ------------------------------------------------------------------- // Helper classes diff --git a/source/backend/plugin/CarlaPluginThread.cpp b/source/backend/plugin/CarlaPluginThread.cpp index cae4f3cd6..b34b54706 100644 --- a/source/backend/plugin/CarlaPluginThread.cpp +++ b/source/backend/plugin/CarlaPluginThread.cpp @@ -26,7 +26,7 @@ CARLA_BACKEND_START_NAMESPACE #ifdef DEBUG static inline -const char* PluginThreadMode2str(const CarlaPluginThread::Mode mode) +const char* PluginThreadMode2str(const CarlaPluginThread::Mode mode) noexcept { switch (mode) { @@ -47,7 +47,7 @@ const char* PluginThreadMode2str(const CarlaPluginThread::Mode mode) } #endif -CarlaPluginThread::CarlaPluginThread(CarlaBackend::CarlaEngine* const engine, CarlaBackend::CarlaPlugin* const plugin, const Mode mode) +CarlaPluginThread::CarlaPluginThread(CarlaBackend::CarlaEngine* const engine, CarlaBackend::CarlaPlugin* const plugin, const Mode mode) noexcept : CarlaThread("CarlaPluginThread"), fEngine(engine), fPlugin(plugin), @@ -68,7 +68,7 @@ CarlaPluginThread::~CarlaPluginThread() } } -void CarlaPluginThread::setMode(const CarlaPluginThread::Mode mode) +void CarlaPluginThread::setMode(const CarlaPluginThread::Mode mode) noexcept { CARLA_SAFE_ASSERT(! isThreadRunning()); carla_debug("CarlaPluginThread::setMode(%s)", PluginThreadMode2str(mode)); @@ -76,7 +76,7 @@ void CarlaPluginThread::setMode(const CarlaPluginThread::Mode mode) fMode = mode; } -void CarlaPluginThread::setOscData(const char* const binary, const char* const label, const char* const extra1, const char* const extra2) +void CarlaPluginThread::setOscData(const char* const binary, const char* const label, const char* const extra1, const char* const extra2) noexcept { CARLA_SAFE_ASSERT(! isThreadRunning()); carla_debug("CarlaPluginThread::setOscData(\"%s\", \"%s\", \"%s\", \"%s\")", binary, label, extra1, extra2); diff --git a/source/backend/plugin/CarlaPluginThread.hpp b/source/backend/plugin/CarlaPluginThread.hpp index a92e92063..83e0a240b 100644 --- a/source/backend/plugin/CarlaPluginThread.hpp +++ b/source/backend/plugin/CarlaPluginThread.hpp @@ -42,11 +42,11 @@ public: PLUGIN_THREAD_BRIDGE }; - CarlaPluginThread(CarlaEngine* const engine, CarlaPlugin* const plugin, const Mode mode = PLUGIN_THREAD_NULL); + CarlaPluginThread(CarlaEngine* const engine, CarlaPlugin* const plugin, const Mode mode = PLUGIN_THREAD_NULL) noexcept; ~CarlaPluginThread() override; - void setMode(const CarlaPluginThread::Mode mode); - void setOscData(const char* const binary, const char* const label, const char* const extra1="", const char* const extra2=""); + void setMode(const CarlaPluginThread::Mode mode) noexcept; + void setOscData(const char* const binary, const char* const label, const char* const extra1="", const char* const extra2="") noexcept; uintptr_t getPid() const; diff --git a/source/backend/plugin/CarlaPluginUi.cpp b/source/backend/plugin/CarlaPluginUi.cpp index 71c4f37a6..8f18dd546 100644 --- a/source/backend/plugin/CarlaPluginUi.cpp +++ b/source/backend/plugin/CarlaPluginUi.cpp @@ -256,7 +256,7 @@ bool CarlaPluginUi::tryTransientWinIdMatch(const uintptr_t pid, const char* cons if (*(ulong*)pidData == static_cast(pid)) { - CARLA_SAFE_ASSERT_RETURN(lastGoodWindow == window || lastGoodWindow == 0, true); + CARLA_SAFE_ASSERT_RETURN(lastGoodWindow == window || lastGoodWindow == 0, true); lastGoodWindow = window; carla_stdout("Match found using pid"); break; diff --git a/source/includes/CarlaDefines.h b/source/includes/CarlaDefines.h index ea21d9bd3..a2630248d 100644 --- a/source/includes/CarlaDefines.h +++ b/source/includes/CarlaDefines.h @@ -15,8 +15,8 @@ * For a full copy of the GNU General Public License see the doc/GPL.txt file. */ -#ifndef CARLA_DEFINES_HPP_INCLUDED -#define CARLA_DEFINES_HPP_INCLUDED +#ifndef CARLA_DEFINES_H_INCLUDED +#define CARLA_DEFINES_H_INCLUDED /* IDE Helper */ #ifndef REAL_BUILD @@ -121,7 +121,7 @@ # define BINARY_NATIVE BINARY_WIN32 # endif #else -# warning Unknown binary native +# warning Unknown native binary type # define BINARY_NATIVE BINARY_OTHER #endif @@ -232,4 +232,4 @@ typedef unsigned long int ulong; typedef unsigned short int ushort; typedef unsigned int uint; -#endif /* CARLA_DEFINES_HPP_INCLUDED */ +#endif /* CARLA_DEFINES_H_INCLUDED */