From 2238842f9419c5cee8be74b3d4cb4ede8e816f16 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 8 Jan 2011 19:51:22 +0000 Subject: Clean up code (cpplint). git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2800 a436a847-0d15-0410-975c-d299462d15a1 --- src/engine/ConnectionImpl.cpp | 1 - src/engine/DuplexPort.cpp | 11 +++++++---- src/engine/Engine.cpp | 1 - src/engine/GraphObjectImpl.cpp | 2 ++ src/engine/HTTPEngineReceiver.cpp | 2 +- src/engine/InternalPlugin.cpp | 1 + src/engine/JackDriver.cpp | 11 +++++++---- src/engine/JackDriver.hpp | 6 +++++- src/engine/LADSPANode.cpp | 1 + src/engine/LADSPAPlugin.cpp | 1 + src/engine/LV2Node.cpp | 10 +++++++--- src/engine/LV2Plugin.cpp | 9 ++++++--- src/engine/MessageContext.cpp | 2 +- src/engine/NodeFactory.cpp | 1 + src/engine/OSCClientSender.cpp | 8 ++++++-- src/engine/OSCEngineReceiver.cpp | 2 +- src/engine/PatchImpl.cpp | 1 + src/engine/QueuedEngineInterface.cpp | 11 +++++++---- src/engine/ingen_lv2.cpp | 27 +++++++++++++++++---------- src/engine/util.hpp | 3 +++ 20 files changed, 75 insertions(+), 36 deletions(-) (limited to 'src') diff --git a/src/engine/ConnectionImpl.cpp b/src/engine/ConnectionImpl.cpp index 6c899796..f58a8723 100644 --- a/src/engine/ConnectionImpl.cpp +++ b/src/engine/ConnectionImpl.cpp @@ -26,7 +26,6 @@ #include "Engine.hpp" #include "EventBuffer.hpp" #include "InputPort.hpp" -#include "InputPort.hpp" #include "MessageContext.hpp" #include "OutputPort.hpp" #include "PortImpl.hpp" diff --git a/src/engine/DuplexPort.cpp b/src/engine/DuplexPort.cpp index 97ee4d22..315583f0 100644 --- a/src/engine/DuplexPort.cpp +++ b/src/engine/DuplexPort.cpp @@ -17,14 +17,17 @@ #include #include +#include + #include "shared/LV2URIMap.hpp" -#include "util.hpp" -#include "DuplexPort.hpp" + #include "ConnectionImpl.hpp" -#include "OutputPort.hpp" +#include "DuplexPort.hpp" +#include "EventBuffer.hpp" #include "NodeImpl.hpp" +#include "OutputPort.hpp" #include "ProcessContext.hpp" -#include "EventBuffer.hpp" +#include "util.hpp" using namespace std; diff --git a/src/engine/Engine.cpp b/src/engine/Engine.cpp index bedd6438..74c9b12b 100644 --- a/src/engine/Engine.cpp +++ b/src/engine/Engine.cpp @@ -42,7 +42,6 @@ #include "NodeFactory.hpp" #include "PatchImpl.hpp" #include "PostProcessor.hpp" -#include "PostProcessor.hpp" #include "ProcessContext.hpp" #include "ProcessSlave.hpp" #include "QueuedEngineInterface.hpp" diff --git a/src/engine/GraphObjectImpl.cpp b/src/engine/GraphObjectImpl.cpp index 83d19896..87a9a844 100644 --- a/src/engine/GraphObjectImpl.cpp +++ b/src/engine/GraphObjectImpl.cpp @@ -15,6 +15,8 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include + #include "GraphObjectImpl.hpp" #include "PatchImpl.hpp" #include "EngineStore.hpp" diff --git a/src/engine/HTTPEngineReceiver.cpp b/src/engine/HTTPEngineReceiver.cpp index 6308341b..d2106c13 100644 --- a/src/engine/HTTPEngineReceiver.cpp +++ b/src/engine/HTTPEngineReceiver.cpp @@ -155,7 +155,7 @@ HTTPEngineReceiver::message_callback(SoupServer* server, SoupMessage* msg, const // Respond with port number of stream for client const int port = client->listen_port(); char buf[32]; - snprintf(buf, 32, "%d", port); + snprintf(buf, sizeof(buf), "%d", port); soup_message_set_status(msg, SOUP_STATUS_OK); soup_message_set_response(msg, mime_type, SOUP_MEMORY_COPY, buf, strlen(buf)); return; diff --git a/src/engine/InternalPlugin.cpp b/src/engine/InternalPlugin.cpp index 72463610..30202e4c 100644 --- a/src/engine/InternalPlugin.cpp +++ b/src/engine/InternalPlugin.cpp @@ -16,6 +16,7 @@ */ #include +#include #include "shared/LV2URIMap.hpp" #include "internals/Controller.hpp" #include "internals/Delay.hpp" diff --git a/src/engine/JackDriver.cpp b/src/engine/JackDriver.cpp index 3e546c46..638217fc 100644 --- a/src/engine/JackDriver.cpp +++ b/src/engine/JackDriver.cpp @@ -16,12 +16,13 @@ */ #include +#include + #include + #include "raul/log.hpp" #include "raul/List.hpp" -#include "module/World.hpp" -#include "shared/LV2Features.hpp" -#include "shared/LV2URIMap.hpp" + #include "AudioBuffer.hpp" #include "ControlBindings.hpp" #include "DuplexPort.hpp" @@ -29,7 +30,6 @@ #include "Event.hpp" #include "EventBuffer.hpp" #include "EventSource.hpp" -#include "EventSource.hpp" #include "JackDriver.hpp" #include "MessageContext.hpp" #include "PatchImpl.hpp" @@ -39,6 +39,9 @@ #include "QueuedEvent.hpp" #include "ThreadManager.hpp" #include "ingen-config.h" +#include "module/World.hpp" +#include "shared/LV2Features.hpp" +#include "shared/LV2URIMap.hpp" #include "tuning.hpp" #include "util.hpp" diff --git a/src/engine/JackDriver.hpp b/src/engine/JackDriver.hpp index b3184f59..1d47a8fc 100644 --- a/src/engine/JackDriver.hpp +++ b/src/engine/JackDriver.hpp @@ -18,14 +18,18 @@ #ifndef INGEN_ENGINE_JACKAUDIODRIVER_HPP #define INGEN_ENGINE_JACKAUDIODRIVER_HPP +#include + #include #include + #include "raul/AtomicInt.hpp" #include "raul/List.hpp" #include "raul/Semaphore.hpp" #include "raul/Thread.hpp" -#include "Driver.hpp" + #include "Buffer.hpp" +#include "Driver.hpp" #include "ProcessContext.hpp" namespace Raul { class Path; } diff --git a/src/engine/LADSPANode.cpp b/src/engine/LADSPANode.cpp index ff6221f1..60bf2bdf 100644 --- a/src/engine/LADSPANode.cpp +++ b/src/engine/LADSPANode.cpp @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include "shared/LV2URIMap.hpp" diff --git a/src/engine/LADSPAPlugin.cpp b/src/engine/LADSPAPlugin.cpp index f9c72a14..9b43b28c 100644 --- a/src/engine/LADSPAPlugin.cpp +++ b/src/engine/LADSPAPlugin.cpp @@ -16,6 +16,7 @@ */ #include +#include #include #include #include "shared/LV2URIMap.hpp" diff --git a/src/engine/LV2Node.cpp b/src/engine/LV2Node.cpp index 26ad0b77..ee6bf4ed 100644 --- a/src/engine/LV2Node.cpp +++ b/src/engine/LV2Node.cpp @@ -15,22 +15,26 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include #include #include + +#include #include +#include + #include "raul/log.hpp" #include "raul/Maid.hpp" #include "raul/Array.hpp" + #include "AudioBuffer.hpp" +#include "EventBuffer.hpp" #include "InputPort.hpp" #include "LV2Node.hpp" #include "LV2Plugin.hpp" #include "LV2URIMap.hpp" -#include "EventBuffer.hpp" +#include "MessageContext.hpp" #include "OutputPort.hpp" #include "ProcessContext.hpp" -#include "MessageContext.hpp" using namespace std; using namespace Raul; diff --git a/src/engine/LV2Plugin.cpp b/src/engine/LV2Plugin.cpp index b3672197..80d2b443 100644 --- a/src/engine/LV2Plugin.cpp +++ b/src/engine/LV2Plugin.cpp @@ -16,14 +16,17 @@ */ #include +#include #include + #include "redlandmm/World.hpp" + #include "shared/LV2URIMap.hpp" -#include "LV2Plugin.hpp" +#include "Driver.hpp" +#include "Engine.hpp" #include "LV2Node.hpp" +#include "LV2Plugin.hpp" #include "NodeImpl.hpp" -#include "Engine.hpp" -#include "Driver.hpp" using namespace std; using namespace Raul; diff --git a/src/engine/MessageContext.cpp b/src/engine/MessageContext.cpp index 541f457f..c1fbe5c5 100644 --- a/src/engine/MessageContext.cpp +++ b/src/engine/MessageContext.cpp @@ -15,6 +15,7 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include #include "lv2/lv2plug.in/ns/ext/contexts/contexts.h" #include "raul/log.hpp" #include "ConnectionImpl.hpp" @@ -23,7 +24,6 @@ #include "NodeImpl.hpp" #include "PatchImpl.hpp" #include "PortImpl.hpp" -#include "PortImpl.hpp" #include "ProcessContext.hpp" #include "ThreadManager.hpp" diff --git a/src/engine/NodeFactory.cpp b/src/engine/NodeFactory.cpp index 8af8fe12..9ee32c12 100644 --- a/src/engine/NodeFactory.cpp +++ b/src/engine/NodeFactory.cpp @@ -16,6 +16,7 @@ */ #include +#include #include #include #include diff --git a/src/engine/OSCClientSender.cpp b/src/engine/OSCClientSender.cpp index d46afd89..22f9d41f 100644 --- a/src/engine/OSCClientSender.cpp +++ b/src/engine/OSCClientSender.cpp @@ -15,17 +15,21 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include #include + +#include +#include + #include "raul/log.hpp" #include "raul/AtomLiblo.hpp" -#include "interface/ClientInterface.hpp" + #include "EngineStore.hpp" #include "NodeImpl.hpp" #include "OSCClientSender.hpp" #include "PatchImpl.hpp" #include "PluginImpl.hpp" #include "PortImpl.hpp" +#include "interface/ClientInterface.hpp" #include "util.hpp" using namespace std; diff --git a/src/engine/OSCEngineReceiver.cpp b/src/engine/OSCEngineReceiver.cpp index c4eca6db..50dcb78f 100644 --- a/src/engine/OSCEngineReceiver.cpp +++ b/src/engine/OSCEngineReceiver.cpp @@ -60,7 +60,7 @@ OSCEngineReceiver::OSCEngineReceiver(Engine& engine, size_t queue_size, uint16_t _receive_thread = new ReceiveThread(*this); char port_str[6]; - snprintf(port_str, 6, "%u", port); + snprintf(port_str, sizeof(port_str), "%u", port); _server = lo_server_new(port_str, error_cb); #ifdef ENABLE_AVAHI diff --git a/src/engine/PatchImpl.cpp b/src/engine/PatchImpl.cpp index f9aa3b2a..c5f91ba5 100644 --- a/src/engine/PatchImpl.cpp +++ b/src/engine/PatchImpl.cpp @@ -17,6 +17,7 @@ #include #include +#include #include "raul/log.hpp" #include "module/World.hpp" #include "shared/LV2URIMap.hpp" diff --git a/src/engine/QueuedEngineInterface.cpp b/src/engine/QueuedEngineInterface.cpp index d3062aa6..3984ca39 100644 --- a/src/engine/QueuedEngineInterface.cpp +++ b/src/engine/QueuedEngineInterface.cpp @@ -15,13 +15,16 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include + #include "raul/log.hpp" -#include "QueuedEngineInterface.hpp" -#include "tuning.hpp" + +#include "Driver.hpp" +#include "Engine.hpp" #include "EventSource.hpp" +#include "QueuedEngineInterface.hpp" #include "events.hpp" -#include "Engine.hpp" -#include "Driver.hpp" +#include "tuning.hpp" #define LOG(s) s << "[QueuedEngineInterface] " diff --git a/src/engine/ingen_lv2.cpp b/src/engine/ingen_lv2.cpp index c0385387..1c5db44c 100644 --- a/src/engine/ingen_lv2.cpp +++ b/src/engine/ingen_lv2.cpp @@ -16,20 +16,20 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include #include -#include + +#include +#include #include -#include +#include + #include "lv2/lv2plug.in/ns/lv2core/lv2.h" -#include "ingen-config.h" -#include "raul/log.hpp" -#include "raul/Thread.hpp" + #include "raul/SharedPtr.hpp" -#include "interface/EngineInterface.hpp" -#include "module/World.hpp" -#include "module/ingen_module.hpp" -#include "shared/runtime_paths.hpp" -#include "shared/Configuration.hpp" +#include "raul/Thread.hpp" +#include "raul/log.hpp" + #include "engine/AudioBuffer.hpp" #include "engine/Driver.hpp" #include "engine/Engine.hpp" @@ -38,7 +38,14 @@ #include "engine/ProcessContext.hpp" #include "engine/QueuedEngineInterface.hpp" #include "engine/ThreadManager.hpp" +#include "interface/EngineInterface.hpp" +#include "module/World.hpp" +#include "module/ingen_module.hpp" #include "serialisation/Parser.hpp" +#include "shared/Configuration.hpp" +#include "shared/runtime_paths.hpp" + +#include "ingen-config.h" using namespace Ingen; diff --git a/src/engine/util.hpp b/src/engine/util.hpp index d0a46efd..34157504 100644 --- a/src/engine/util.hpp +++ b/src/engine/util.hpp @@ -19,8 +19,11 @@ #define INGEN_ENGINE_UTIL_HPP #include +#include + #include "raul/log.hpp" #include "raul/Path.hpp" + #include "ingen-config.h" #include -- cgit v1.2.1