From 20af728fdf07478b5a146370b59f902a70b85a68 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 8 Mar 2019 10:53:07 +0100 Subject: Clean up includes and forward declarations --- ingen/Atom.hpp | 8 ++--- ingen/AtomForgeSink.hpp | 8 ++--- ingen/AtomReader.hpp | 8 ++--- ingen/AtomSink.hpp | 4 +-- ingen/AtomWriter.hpp | 4 +-- ingen/ClashAvoider.hpp | 5 +-- ingen/Clock.hpp | 4 +-- ingen/Configuration.hpp | 14 ++++---- ingen/DataAccess.hpp | 7 ++-- ingen/EngineBase.hpp | 6 ++-- ingen/FilePath.hpp | 8 ++--- ingen/Forge.hpp | 8 ++--- ingen/InstanceAccess.hpp | 5 ++- ingen/Interface.hpp | 6 ++-- ingen/LV2Features.hpp | 7 ++-- ingen/Log.hpp | 11 ++----- ingen/Message.hpp | 10 +++--- ingen/Module.hpp | 4 +-- ingen/Node.hpp | 10 +++--- ingen/Parser.hpp | 14 ++++---- ingen/Properties.hpp | 6 ++-- ingen/QueuedInterface.hpp | 6 ++-- ingen/Resource.hpp | 5 ++- ingen/Serialiser.hpp | 5 ++- ingen/SocketReader.hpp | 4 +-- ingen/SocketWriter.hpp | 7 ++-- ingen/Store.hpp | 9 +++-- ingen/StreamWriter.hpp | 4 +-- ingen/Tee.hpp | 8 ++--- ingen/TurtleWriter.hpp | 7 ++-- ingen/URI.hpp | 12 ++++--- ingen/URIMap.hpp | 13 ++++---- ingen/World.hpp | 6 ++-- ingen/client/ArcModel.hpp | 9 +++-- ingen/client/BlockModel.hpp | 13 ++++---- ingen/client/ClientStore.hpp | 15 ++++++--- ingen/client/GraphModel.hpp | 5 +++ ingen/client/ObjectModel.hpp | 17 ++++------ ingen/client/PluginModel.hpp | 9 +++-- ingen/client/PluginUI.hpp | 9 +++-- ingen/client/PortModel.hpp | 6 ++-- ingen/client/SigClientInterface.hpp | 9 +++-- ingen/filesystem.hpp | 17 +++++----- ingen/paths.hpp | 6 ++-- ingen/runtime_paths.hpp | 6 ++-- ingen/types.hpp | 4 +-- src/AtomReader.cpp | 19 ++++++++--- src/AtomWriter.cpp | 25 ++++++++++---- src/ClashAvoider.cpp | 16 +++++---- src/Configuration.cpp | 22 ++++++++----- src/FilePath.cpp | 4 +++ src/Forge.cpp | 8 +++-- src/LV2Features.cpp | 4 +-- src/Log.cpp | 10 ++++-- src/Parser.cpp | 22 ++++++++++--- src/Resource.cpp | 7 ++-- src/Serialiser.cpp | 26 ++++++++++----- src/SocketReader.cpp | 18 ++++++---- src/SocketWriter.cpp | 12 ++++--- src/Store.cpp | 10 ++++-- src/StreamWriter.cpp | 4 ++- src/TurtleWriter.cpp | 2 ++ src/URI.cpp | 5 +-- src/URIMap.cpp | 8 +++-- src/URIs.cpp | 4 +-- src/World.cpp | 24 +++++++++----- src/client/BlockModel.cpp | 12 ++++--- src/client/ClientStore.cpp | 10 ++++-- src/client/GraphModel.cpp | 7 ++-- src/client/ObjectModel.cpp | 8 ++++- src/client/PluginModel.cpp | 18 +++++----- src/client/PluginUI.cpp | 7 +++- src/client/PortModel.cpp | 3 ++ src/client/ingen_client.cpp | 1 - src/gui/App.cpp | 46 +++++++++++++------------- src/gui/App.hpp | 14 ++++---- src/gui/Arc.cpp | 1 + src/gui/Arc.hpp | 4 +-- src/gui/BreadCrumbs.cpp | 10 +++--- src/gui/BreadCrumbs.hpp | 16 +++++---- src/gui/ConnectWindow.cpp | 22 ++++++------- src/gui/ConnectWindow.hpp | 16 ++++++--- src/gui/GraphBox.cpp | 31 +++++++++-------- src/gui/GraphCanvas.cpp | 44 ++++++++++++------------- src/gui/GraphCanvas.hpp | 11 +++---- src/gui/GraphPortModule.cpp | 18 +++++----- src/gui/GraphPortModule.hpp | 4 +-- src/gui/GraphTreeWindow.hpp | 4 +-- src/gui/GraphView.cpp | 12 +++---- src/gui/GraphView.hpp | 7 ++-- src/gui/GraphWindow.hpp | 10 +++--- src/gui/LoadGraphWindow.cpp | 22 +++++++------ src/gui/LoadGraphWindow.hpp | 8 +++-- src/gui/LoadPluginWindow.cpp | 23 ++++++------- src/gui/LoadPluginWindow.hpp | 16 ++++----- src/gui/MessagesWindow.cpp | 10 ++++-- src/gui/MessagesWindow.hpp | 13 +++++--- src/gui/NewSubgraphWindow.cpp | 10 +++--- src/gui/NewSubgraphWindow.hpp | 10 +++--- src/gui/NodeMenu.cpp | 23 ++++++++----- src/gui/NodeMenu.hpp | 9 ++--- src/gui/NodeModule.cpp | 32 +++++++++--------- src/gui/ObjectMenu.cpp | 11 ++++--- src/gui/ObjectMenu.hpp | 7 ++-- src/gui/PluginMenu.cpp | 2 ++ src/gui/PluginMenu.hpp | 13 ++++---- src/gui/Port.cpp | 23 ++++++------- src/gui/Port.hpp | 9 ++--- src/gui/PortMenu.cpp | 9 ++--- src/gui/PortMenu.hpp | 8 ++--- src/gui/PropertiesWindow.cpp | 23 +++++++------ src/gui/PropertiesWindow.hpp | 12 ++++--- src/gui/RDFS.cpp | 2 ++ src/gui/RDFS.hpp | 7 ++-- src/gui/RenameWindow.cpp | 8 ++--- src/gui/RenameWindow.hpp | 10 +++--- src/gui/Style.cpp | 17 +++++----- src/gui/SubgraphModule.cpp | 13 ++++---- src/gui/ThreadedLoader.cpp | 9 ++--- src/gui/ThreadedLoader.hpp | 21 +++++++----- src/gui/URIEntry.cpp | 6 ++-- src/gui/URIEntry.hpp | 6 +++- src/gui/WidgetFactory.cpp | 8 +++-- src/gui/WidgetFactory.hpp | 7 ++-- src/gui/Window.hpp | 1 + src/gui/WindowFactory.cpp | 14 ++++---- src/gui/WindowFactory.hpp | 5 +-- src/gui/ingen_gui_lv2.cpp | 21 ++++++++++-- src/ingen/ingen.cpp | 26 ++++++++------- src/runtime_paths.cpp | 16 ++++----- src/server/ArcImpl.cpp | 15 +++++---- src/server/ArcImpl.hpp | 16 ++++----- src/server/BlockFactory.cpp | 18 ++++++---- src/server/BlockFactory.hpp | 11 ++++--- src/server/BlockImpl.cpp | 16 +++++---- src/server/BlockImpl.hpp | 28 ++++++++-------- src/server/Broadcaster.cpp | 10 +++--- src/server/Broadcaster.hpp | 13 ++++---- src/server/Buffer.cpp | 29 ++++++++-------- src/server/Buffer.hpp | 23 ++++++++----- src/server/BufferFactory.cpp | 10 ++++-- src/server/BufferFactory.hpp | 17 ++++------ src/server/BufferRef.hpp | 4 +-- src/server/ClientUpdate.cpp | 19 +++++++++-- src/server/ClientUpdate.hpp | 8 +++-- src/server/CompiledGraph.cpp | 15 ++++++--- src/server/CompiledGraph.hpp | 8 ++--- src/server/ControlBindings.cpp | 24 ++++++++++---- src/server/ControlBindings.hpp | 24 +++++++++----- src/server/DirectDriver.hpp | 4 +-- src/server/Driver.hpp | 4 +-- src/server/DuplexPort.cpp | 18 ++++++++-- src/server/DuplexPort.hpp | 25 +++++++++++--- src/server/Engine.cpp | 49 ++++++++++++++------------- src/server/Engine.hpp | 15 +++++---- src/server/EnginePort.hpp | 4 +-- src/server/Event.hpp | 11 +++---- src/server/EventWriter.cpp | 7 ++-- src/server/EventWriter.hpp | 10 +++--- src/server/GraphImpl.cpp | 20 ++++++----- src/server/GraphImpl.hpp | 17 +++++----- src/server/GraphPlugin.hpp | 3 +- src/server/InputPort.cpp | 18 ++++++---- src/server/InputPort.hpp | 21 ++++++++---- src/server/InternalBlock.cpp | 6 +++- src/server/InternalPlugin.cpp | 9 ++--- src/server/InternalPlugin.hpp | 7 ++++ src/server/JackDriver.cpp | 43 +++++++++++++----------- src/server/JackDriver.hpp | 17 +++++----- src/server/LV2Block.cpp | 39 +++++++++++----------- src/server/LV2Block.hpp | 17 +++++++--- src/server/LV2Plugin.cpp | 11 ++++--- src/server/LV2Plugin.hpp | 11 ++++--- src/server/LV2ResizeFeature.hpp | 6 ++-- src/server/Load.hpp | 4 +++ src/server/NodeImpl.cpp | 13 +++++++- src/server/NodeImpl.hpp | 12 +++---- src/server/PluginImpl.hpp | 4 +-- src/server/PortAudioDriver.cpp | 34 ++++++++----------- src/server/PortAudioDriver.hpp | 27 ++++++++------- src/server/PortImpl.cpp | 19 +++++++---- src/server/PortImpl.hpp | 14 ++++---- src/server/PortType.hpp | 4 +-- src/server/PostProcessor.cpp | 8 +++-- src/server/PostProcessor.hpp | 4 +-- src/server/PreProcessContext.hpp | 5 +-- src/server/PreProcessor.cpp | 16 +++++---- src/server/PreProcessor.hpp | 11 ++++--- src/server/RunContext.cpp | 16 ++++++--- src/server/RunContext.hpp | 8 ++--- src/server/SocketListener.cpp | 28 ++++++++-------- src/server/SocketListener.hpp | 4 +-- src/server/SocketServer.hpp | 8 +++-- src/server/Task.cpp | 8 ++++- src/server/Task.hpp | 3 +- src/server/ThreadManager.hpp | 4 +-- src/server/UndoStack.cpp | 8 +++-- src/server/UndoStack.hpp | 11 +++++-- src/server/Worker.cpp | 10 +++--- src/server/Worker.hpp | 5 +-- src/server/events/Connect.cpp | 12 ++++--- src/server/events/Connect.hpp | 6 ---- src/server/events/Copy.cpp | 17 ++++++---- src/server/events/Copy.hpp | 6 +--- src/server/events/CreateBlock.cpp | 17 ++++++---- src/server/events/CreateBlock.hpp | 4 +-- src/server/events/CreateGraph.cpp | 16 +++++---- src/server/events/CreateGraph.hpp | 10 +++--- src/server/events/CreatePort.cpp | 22 ++++++++----- src/server/events/CreatePort.hpp | 13 ++++---- src/server/events/Delete.cpp | 18 +++++++--- src/server/events/Delete.hpp | 18 ++++------ src/server/events/Delta.cpp | 26 ++++++++++----- src/server/events/Delta.hpp | 19 +++++------ src/server/events/Disconnect.cpp | 18 ++++++---- src/server/events/Disconnect.hpp | 11 ++----- src/server/events/DisconnectAll.cpp | 17 ++++++---- src/server/events/DisconnectAll.hpp | 8 ++--- src/server/events/Get.cpp | 16 +++++---- src/server/events/Get.hpp | 2 -- src/server/events/Mark.cpp | 5 ++- src/server/events/Mark.hpp | 4 +++ src/server/events/Move.cpp | 2 ++ src/server/events/Move.hpp | 4 +-- src/server/events/SetPortValue.cpp | 14 +++++--- src/server/events/SetPortValue.hpp | 6 ++-- src/server/events/Undo.cpp | 7 ++-- src/server/ingen_engine.cpp | 5 +-- src/server/ingen_jack.cpp | 7 ++-- src/server/ingen_lv2.cpp | 66 ++++++++++++++++++++++++------------- src/server/ingen_portaudio.cpp | 10 +++--- src/server/internals/BlockDelay.cpp | 18 +++++----- src/server/internals/Controller.cpp | 17 ++++++---- src/server/internals/Controller.hpp | 2 ++ src/server/internals/Note.cpp | 21 ++++++------ src/server/internals/Note.hpp | 2 ++ src/server/internals/Time.cpp | 10 +++--- src/server/internals/Trigger.cpp | 15 +++++---- src/server/internals/Trigger.hpp | 2 ++ src/server/mix.cpp | 5 +-- src/server/mix.hpp | 3 -- src/server/util.hpp | 8 ++--- tests/TestClient.hpp | 4 +-- tests/ingen_bench.cpp | 16 ++++----- tests/ingen_test.cpp | 32 +++++++++--------- tests/test_utils.hpp | 2 -- tests/tst_FilePath.cpp | 9 +++-- wscript | 4 +-- 248 files changed, 1743 insertions(+), 1265 deletions(-) diff --git a/ingen/Atom.hpp b/ingen/Atom.hpp index 86528ea1..f028088d 100644 --- a/ingen/Atom.hpp +++ b/ingen/Atom.hpp @@ -17,16 +17,16 @@ #ifndef INGEN_ATOM_HPP #define INGEN_ATOM_HPP +#include "ingen/ingen.h" +#include "lv2/atom/atom.h" +#include "lv2/urid/urid.h" + #include #include #include #include #include -#include "ingen/ingen.h" -#include "lv2/atom/atom.h" -#include "lv2/urid/urid.h" - namespace ingen { /** diff --git a/ingen/AtomForgeSink.hpp b/ingen/AtomForgeSink.hpp index ed8b0b8b..04799986 100644 --- a/ingen/AtomForgeSink.hpp +++ b/ingen/AtomForgeSink.hpp @@ -17,15 +17,15 @@ #ifndef INGEN_ATOMFORGESINK_HPP #define INGEN_ATOMFORGESINK_HPP +#include "lv2/atom/atom.h" +#include "lv2/atom/forge.h" +#include "lv2/atom/util.h" + #include #include #include #include -#include "lv2/atom/atom.h" -#include "lv2/atom/forge.h" -#include "lv2/atom/util.h" - namespace ingen { /** A resizing sink for LV2_Atom_Forge. */ diff --git a/ingen/AtomReader.hpp b/ingen/AtomReader.hpp index 79a08288..44f7d31f 100644 --- a/ingen/AtomReader.hpp +++ b/ingen/AtomReader.hpp @@ -17,15 +17,15 @@ #ifndef INGEN_ATOMREADER_HPP #define INGEN_ATOMREADER_HPP -#include - -#include - #include "ingen/AtomSink.hpp" #include "ingen/Resource.hpp" #include "ingen/ingen.h" #include "lv2/atom/atom.h" +#include + +#include + namespace Raul { class Path; } diff --git a/ingen/AtomSink.hpp b/ingen/AtomSink.hpp index 70c7f730..395eba54 100644 --- a/ingen/AtomSink.hpp +++ b/ingen/AtomSink.hpp @@ -17,11 +17,11 @@ #ifndef INGEN_ATOMSINK_HPP #define INGEN_ATOMSINK_HPP -#include - #include "ingen/ingen.h" #include "lv2/atom/atom.h" +#include + namespace ingen { /** A sink for LV2 Atoms. diff --git a/ingen/AtomWriter.hpp b/ingen/AtomWriter.hpp index bb6ab921..ee27436d 100644 --- a/ingen/AtomWriter.hpp +++ b/ingen/AtomWriter.hpp @@ -17,8 +17,6 @@ #ifndef INGEN_ATOMWRITER_HPP #define INGEN_ATOMWRITER_HPP -#include - #include "ingen/AtomForgeSink.hpp" #include "ingen/Interface.hpp" #include "ingen/Message.hpp" @@ -28,6 +26,8 @@ #include "lv2/atom/forge.h" #include "lv2/urid/urid.h" +#include + namespace Raul { class Path; } namespace ingen { diff --git a/ingen/ClashAvoider.hpp b/ingen/ClashAvoider.hpp index 6032351a..d8fce196 100644 --- a/ingen/ClashAvoider.hpp +++ b/ingen/ClashAvoider.hpp @@ -17,11 +17,12 @@ #ifndef INGEN_CLASHAVOIDER_HPP #define INGEN_CLASHAVOIDER_HPP -#include - #include "ingen/ingen.h" #include "raul/Path.hpp" +#include +#include + namespace ingen { class Store; diff --git a/ingen/Clock.hpp b/ingen/Clock.hpp index e746bde5..ac940fab 100644 --- a/ingen/Clock.hpp +++ b/ingen/Clock.hpp @@ -17,8 +17,6 @@ #ifndef INGEN_ENGINE_CLOCK_HPP #define INGEN_ENGINE_CLOCK_HPP -#include - #ifdef __MACH__ # include # include @@ -27,6 +25,8 @@ # include #endif +#include + namespace ingen { class Clock { diff --git a/ingen/Configuration.hpp b/ingen/Configuration.hpp index 65b08529..5a1085fe 100644 --- a/ingen/Configuration.hpp +++ b/ingen/Configuration.hpp @@ -17,20 +17,20 @@ #ifndef INGEN_CONFIGURATION_HPP #define INGEN_CONFIGURATION_HPP -#include -#include -#include -#include -#include - #include "ingen/Atom.hpp" +#include "ingen/FilePath.hpp" #include "ingen/ingen.h" #include "lv2/urid/urid.h" #include "raul/Exception.hpp" +#include +#include +#include +#include +#include + namespace ingen { -class FilePath; class Forge; class URIMap; diff --git a/ingen/DataAccess.hpp b/ingen/DataAccess.hpp index 662b04e9..a0c9fdf7 100644 --- a/ingen/DataAccess.hpp +++ b/ingen/DataAccess.hpp @@ -17,19 +17,18 @@ #ifndef INGEN_ENGINE_DATAACCESS_HPP #define INGEN_ENGINE_DATAACCESS_HPP -#include -#include - #include "ingen/LV2Features.hpp" #include "ingen/Node.hpp" #include "ingen/Store.hpp" #include "ingen/World.hpp" #include "ingen/types.hpp" #include "lilv/lilv.h" - #include "lv2/core/lv2.h" #include "lv2/data-access/data-access.h" +#include +#include + namespace ingen { struct DataAccess : public ingen::LV2Features::Feature diff --git a/ingen/EngineBase.hpp b/ingen/EngineBase.hpp index aa3d5573..7b3239f1 100644 --- a/ingen/EngineBase.hpp +++ b/ingen/EngineBase.hpp @@ -17,13 +17,13 @@ #ifndef INGEN_ENGINEBASE_HPP #define INGEN_ENGINEBASE_HPP +#include "ingen/ingen.h" +#include "ingen/types.hpp" + #include #include #include -#include "ingen/ingen.h" -#include "ingen/types.hpp" - namespace ingen { class Interface; diff --git a/ingen/FilePath.hpp b/ingen/FilePath.hpp index c174f15b..57cd47be 100644 --- a/ingen/FilePath.hpp +++ b/ingen/FilePath.hpp @@ -17,12 +17,12 @@ #ifndef INGEN_FILE_PATH_HPP #define INGEN_FILE_PATH_HPP -#include -#include -#include - #include +#include +#include +#include + #if defined(_WIN32) && !defined(__CYGWIN__) #define USE_WINDOWS_FILE_PATHS 1 #endif diff --git a/ingen/Forge.hpp b/ingen/Forge.hpp index 139211e4..b414a6ab 100644 --- a/ingen/Forge.hpp +++ b/ingen/Forge.hpp @@ -17,14 +17,14 @@ #ifndef INGEN_FORGE_HPP #define INGEN_FORGE_HPP -#include -#include -#include - #include "ingen/Atom.hpp" #include "ingen/ingen.h" #include "lv2/atom/forge.h" +#include +#include +#include + namespace ingen { class URIMap; diff --git a/ingen/InstanceAccess.hpp b/ingen/InstanceAccess.hpp index 27ae0d4e..52b48b3f 100644 --- a/ingen/InstanceAccess.hpp +++ b/ingen/InstanceAccess.hpp @@ -17,17 +17,16 @@ #ifndef INGEN_ENGINE_INSTANCEACCESS_HPP #define INGEN_ENGINE_INSTANCEACCESS_HPP -#include - #include "ingen/LV2Features.hpp" #include "ingen/Node.hpp" #include "ingen/Store.hpp" #include "ingen/World.hpp" #include "ingen/types.hpp" #include "lilv/lilv.h" - #include "lv2/core/lv2.h" +#include + namespace ingen { struct InstanceAccess : public ingen::LV2Features::Feature diff --git a/ingen/Interface.hpp b/ingen/Interface.hpp index 2af4eb76..981b7dd5 100644 --- a/ingen/Interface.hpp +++ b/ingen/Interface.hpp @@ -21,9 +21,6 @@ #ifndef INGEN_INTERFACE_HPP #define INGEN_INTERFACE_HPP -#include -#include - #include "ingen/Message.hpp" #include "ingen/Properties.hpp" #include "ingen/Resource.hpp" @@ -31,6 +28,9 @@ #include "ingen/ingen.h" #include "ingen/types.hpp" +#include +#include + namespace Raul { class Path; } diff --git a/ingen/LV2Features.hpp b/ingen/LV2Features.hpp index db5d530f..9508bd82 100644 --- a/ingen/LV2Features.hpp +++ b/ingen/LV2Features.hpp @@ -17,15 +17,14 @@ #ifndef INGEN_LV2FEATURES_HPP #define INGEN_LV2FEATURES_HPP -#include -#include -#include - #include "ingen/ingen.h" #include "ingen/types.hpp" #include "lv2/core/lv2.h" #include "raul/Noncopyable.hpp" +#include +#include + namespace ingen { class Node; diff --git a/ingen/Log.hpp b/ingen/Log.hpp index 000afcbe..3cc7de20 100644 --- a/ingen/Log.hpp +++ b/ingen/Log.hpp @@ -17,16 +17,10 @@ #ifndef INGEN_LOG_HPP #define INGEN_LOG_HPP -#include -#include -#include -#include - -#include - #include "ingen/LV2Features.hpp" #include "ingen/fmt.hpp" #include "ingen/ingen.h" +#include "ingen/types.hpp" #include "lv2/core/lv2.h" #include "lv2/log/log.h" #include "lv2/urid/urid.h" @@ -35,6 +29,7 @@ #include #include #include +#include namespace ingen { @@ -107,6 +102,6 @@ private: bool _trace; }; -} // namespace ingen +} // namespace ingen #endif // INGEN_LOG_HPP diff --git a/ingen/Message.hpp b/ingen/Message.hpp index d4423a2e..09444d4a 100644 --- a/ingen/Message.hpp +++ b/ingen/Message.hpp @@ -17,17 +17,17 @@ #ifndef INGEN_MESSAGE_HPP #define INGEN_MESSAGE_HPP -#include -#include - -#include - #include "ingen/Atom.hpp" #include "ingen/Properties.hpp" #include "ingen/Resource.hpp" #include "ingen/Status.hpp" #include "raul/Path.hpp" +#include + +#include +#include + namespace ingen { struct BundleBegin diff --git a/ingen/Module.hpp b/ingen/Module.hpp index 17f7b10b..88f4afcd 100644 --- a/ingen/Module.hpp +++ b/ingen/Module.hpp @@ -17,12 +17,12 @@ #ifndef INGEN_MODULE_HPP #define INGEN_MODULE_HPP -#include - #include "ingen/FilePath.hpp" #include "ingen/Library.hpp" #include "ingen/ingen.h" +#include + namespace ingen { class World; diff --git a/ingen/Node.hpp b/ingen/Node.hpp index 90a6e53f..038627b0 100644 --- a/ingen/Node.hpp +++ b/ingen/Node.hpp @@ -17,17 +17,17 @@ #ifndef INGEN_NODE_HPP #define INGEN_NODE_HPP -#include -#include -#include -#include - #include "ingen/Resource.hpp" #include "ingen/ingen.h" #include "ingen/paths.hpp" #include "ingen/types.hpp" #include "lilv/lilv.h" +#include +#include +#include +#include + namespace Raul { class Path; class Symbol; diff --git a/ingen/Parser.hpp b/ingen/Parser.hpp index 574305df..acaf3b90 100644 --- a/ingen/Parser.hpp +++ b/ingen/Parser.hpp @@ -17,12 +17,6 @@ #ifndef INGEN_PARSER_HPP #define INGEN_PARSER_HPP -#include -#include -#include - -#include - #include "ingen/FilePath.hpp" #include "ingen/Properties.hpp" #include "ingen/URI.hpp" @@ -30,6 +24,14 @@ #include "raul/Path.hpp" #include "raul/Symbol.hpp" +#include + +#include +#include +#include + +namespace Raul { class Path; } +namespace Raul { class Symbol; } namespace Sord { class World; } namespace ingen { diff --git a/ingen/Properties.hpp b/ingen/Properties.hpp index d3237cd2..6f1a8494 100644 --- a/ingen/Properties.hpp +++ b/ingen/Properties.hpp @@ -17,13 +17,13 @@ #ifndef INGEN_PROPERTIES_HPP #define INGEN_PROPERTIES_HPP +#include "ingen/Atom.hpp" +#include "ingen/URIs.hpp" + #include #include #include -#include "ingen/Atom.hpp" -#include "ingen/URIs.hpp" - namespace ingen { /** A property value (an Atom with a context). */ diff --git a/ingen/QueuedInterface.hpp b/ingen/QueuedInterface.hpp index 5c413a42..f45dd3da 100644 --- a/ingen/QueuedInterface.hpp +++ b/ingen/QueuedInterface.hpp @@ -17,12 +17,12 @@ #ifndef INGEN_ENGINE_QUEUEDINTERFACE_HPP #define INGEN_ENGINE_QUEUEDINTERFACE_HPP -#include -#include - #include "ingen/Interface.hpp" #include "ingen/Message.hpp" +#include +#include + namespace ingen { /** Stores all messages and emits them to a sink on demand. diff --git a/ingen/Resource.hpp b/ingen/Resource.hpp index 94d92e12..eb624e07 100644 --- a/ingen/Resource.hpp +++ b/ingen/Resource.hpp @@ -17,15 +17,14 @@ #ifndef INGEN_RESOURCE_HPP #define INGEN_RESOURCE_HPP -#include -#include - #include "ingen/Properties.hpp" #include "ingen/URI.hpp" #include "ingen/URIs.hpp" #include "ingen/ingen.h" #include "raul/Deletable.hpp" +#include + namespace ingen { class Atom; diff --git a/ingen/Serialiser.hpp b/ingen/Serialiser.hpp index c4598f12..11297ff9 100644 --- a/ingen/Serialiser.hpp +++ b/ingen/Serialiser.hpp @@ -17,14 +17,13 @@ #ifndef INGEN_SERIALISER_HPP #define INGEN_SERIALISER_HPP -#include -#include - #include "ingen/Properties.hpp" #include "ingen/ingen.h" #include "ingen/types.hpp" #include "sord/sordmm.hpp" +#include + namespace Raul { class Path; } namespace ingen { diff --git a/ingen/SocketReader.hpp b/ingen/SocketReader.hpp index f55f5676..3c3c5f3c 100644 --- a/ingen/SocketReader.hpp +++ b/ingen/SocketReader.hpp @@ -17,13 +17,13 @@ #ifndef INGEN_SOCKET_READER_HPP #define INGEN_SOCKET_READER_HPP -#include - #include "ingen/ingen.h" #include "ingen/types.hpp" #include "serd/serd.h" #include "sord/sord.h" +#include + namespace Raul { class Socket; } namespace ingen { diff --git a/ingen/SocketWriter.hpp b/ingen/SocketWriter.hpp index c4ed7b51..2424fe24 100644 --- a/ingen/SocketWriter.hpp +++ b/ingen/SocketWriter.hpp @@ -17,11 +17,12 @@ #ifndef INGEN_SOCKET_WRITER_HPP #define INGEN_SOCKET_WRITER_HPP -#include -#include - +#include "ingen/Message.hpp" #include "ingen/TurtleWriter.hpp" #include "ingen/ingen.h" +#include "ingen/types.hpp" + +#include namespace Raul { class Socket; diff --git a/ingen/Store.hpp b/ingen/Store.hpp index 0607eefa..cf412ce6 100644 --- a/ingen/Store.hpp +++ b/ingen/Store.hpp @@ -17,17 +17,16 @@ #ifndef INGEN_STORE_HPP #define INGEN_STORE_HPP -#include -#include -#include -#include - #include "ingen/ingen.h" #include "ingen/types.hpp" #include "raul/Deletable.hpp" #include "raul/Noncopyable.hpp" #include "raul/Path.hpp" +#include +#include +#include + namespace Raul { class Symbol; } namespace ingen { diff --git a/ingen/StreamWriter.hpp b/ingen/StreamWriter.hpp index 9059ccdc..56603b92 100644 --- a/ingen/StreamWriter.hpp +++ b/ingen/StreamWriter.hpp @@ -17,12 +17,12 @@ #ifndef INGEN_STREAMWRITER_HPP #define INGEN_STREAMWRITER_HPP -#include - #include "ingen/ingen.h" #include "ingen/ColorContext.hpp" #include "ingen/TurtleWriter.hpp" +#include + namespace ingen { class URI; diff --git a/ingen/Tee.hpp b/ingen/Tee.hpp index 37c0870c..cee8c59e 100644 --- a/ingen/Tee.hpp +++ b/ingen/Tee.hpp @@ -17,15 +17,15 @@ #ifndef INGEN_ENGINE_TEE_HPP #define INGEN_ENGINE_TEE_HPP +#include "ingen/Interface.hpp" +#include "ingen/Message.hpp" +#include "ingen/types.hpp" + #include #include #include #include -#include "ingen/Interface.hpp" -#include "ingen/Message.hpp" -#include "ingen/types.hpp" - namespace ingen { /** Interface that forwards all calls to several sinks. */ diff --git a/ingen/TurtleWriter.hpp b/ingen/TurtleWriter.hpp index 6e21072f..2ee027ae 100644 --- a/ingen/TurtleWriter.hpp +++ b/ingen/TurtleWriter.hpp @@ -17,16 +17,17 @@ #ifndef INGEN_TURTLE_WRITER_HPP #define INGEN_TURTLE_WRITER_HPP -#include -#include - #include "ingen/AtomSink.hpp" #include "ingen/AtomWriter.hpp" +#include "ingen/URI.hpp" #include "ingen/ingen.h" #include "lv2/atom/atom.h" #include "serd/serd.h" #include "sratom/sratom.h" +#include +#include + namespace ingen { class URIMap; diff --git a/ingen/URI.hpp b/ingen/URI.hpp index 128155e7..91096ba0 100644 --- a/ingen/URI.hpp +++ b/ingen/URI.hpp @@ -17,16 +17,18 @@ #ifndef INGEN_URI_HPP #define INGEN_URI_HPP -#include -#include - -#include - #include "ingen/FilePath.hpp" #include "ingen/ingen.h" #include "serd/serd.h" #include "sord/sordmm.hpp" +#include + +#include +#include +#include +#include + namespace ingen { class INGEN_API URI diff --git a/ingen/URIMap.hpp b/ingen/URIMap.hpp index f1825439..a3b9f219 100644 --- a/ingen/URIMap.hpp +++ b/ingen/URIMap.hpp @@ -17,13 +17,6 @@ #ifndef INGEN_URIMAP_HPP #define INGEN_URIMAP_HPP -#include -#include -#include -#include -#include -#include - #include "ingen/LV2Features.hpp" #include "ingen/ingen.h" #include "ingen/types.hpp" @@ -31,6 +24,12 @@ #include "lv2/urid/urid.h" #include "raul/Noncopyable.hpp" +#include +#include +#include +#include +#include + namespace ingen { class Log; diff --git a/ingen/World.hpp b/ingen/World.hpp index d895b742..c8d69c5b 100644 --- a/ingen/World.hpp +++ b/ingen/World.hpp @@ -17,15 +17,15 @@ #ifndef INGEN_WORLD_HPP #define INGEN_WORLD_HPP -#include -#include - #include "ingen/ingen.h" #include "ingen/types.hpp" #include "lv2/log/log.h" #include "lv2/urid/urid.h" #include "raul/Noncopyable.hpp" +#include +#include + typedef struct LilvWorldImpl LilvWorld; namespace Sord { class World; } diff --git a/ingen/client/ArcModel.hpp b/ingen/client/ArcModel.hpp index 3016266e..e42dd7bd 100644 --- a/ingen/client/ArcModel.hpp +++ b/ingen/client/ArcModel.hpp @@ -17,14 +17,13 @@ #ifndef INGEN_CLIENT_ARCMODEL_HPP #define INGEN_CLIENT_ARCMODEL_HPP -#include - -#include "ingen/types.hpp" -#include "raul/Path.hpp" - #include "ingen/Arc.hpp" #include "ingen/client/PortModel.hpp" #include "ingen/ingen.h" +#include "ingen/types.hpp" +#include "raul/Path.hpp" + +#include namespace ingen { namespace client { diff --git a/ingen/client/BlockModel.hpp b/ingen/client/BlockModel.hpp index 4dfd35d7..6b9881c5 100644 --- a/ingen/client/BlockModel.hpp +++ b/ingen/client/BlockModel.hpp @@ -17,17 +17,17 @@ #ifndef INGEN_CLIENT_BLOCKMODEL_HPP #define INGEN_CLIENT_BLOCKMODEL_HPP -#include -#include -#include - #include "ingen/Node.hpp" #include "ingen/client/ObjectModel.hpp" #include "ingen/client/PluginModel.hpp" -#include "ingen/client/PortModel.hpp" #include "ingen/ingen.h" #include "ingen/types.hpp" +#include +#include +#include +#include + namespace Raul { class Path; } namespace ingen { @@ -36,8 +36,7 @@ class URIs; namespace client { -class PluginModel; -class ClientStore; +class PortModel; /** Block model class, used by the client to store engine's state. * diff --git a/ingen/client/ClientStore.hpp b/ingen/client/ClientStore.hpp index 0d7cb185..5cb097e8 100644 --- a/ingen/client/ClientStore.hpp +++ b/ingen/client/ClientStore.hpp @@ -17,23 +17,28 @@ #ifndef INGEN_CLIENT_CLIENTSTORE_HPP #define INGEN_CLIENT_CLIENTSTORE_HPP -#include -#include -#include - #include "ingen/Interface.hpp" +#include "ingen/Message.hpp" #include "ingen/Store.hpp" +#include "ingen/URI.hpp" #include "ingen/client/signal.hpp" #include "ingen/ingen.h" #include "ingen/types.hpp" #include "raul/Path.hpp" -namespace Raul { class Atom; } +#include + +namespace Raul { +class Path; +class Atom; +} namespace ingen { +class Atom; class Log; class Node; +class Resource; class URIs; namespace client { diff --git a/ingen/client/GraphModel.hpp b/ingen/client/GraphModel.hpp index 659ded9e..8713b6a9 100644 --- a/ingen/client/GraphModel.hpp +++ b/ingen/client/GraphModel.hpp @@ -17,10 +17,15 @@ #ifndef INGEN_CLIENT_GRAPHMODEL_HPP #define INGEN_CLIENT_GRAPHMODEL_HPP +#include "ingen/Node.hpp" +#include "ingen/URIs.hpp" #include "ingen/client/BlockModel.hpp" +#include "ingen/client/signal.hpp" #include "ingen/ingen.h" #include "ingen/types.hpp" +#include + namespace ingen { namespace client { diff --git a/ingen/client/ObjectModel.hpp b/ingen/client/ObjectModel.hpp index 0c517ccf..94906dec 100644 --- a/ingen/client/ObjectModel.hpp +++ b/ingen/client/ObjectModel.hpp @@ -21,26 +21,21 @@ #ifndef INGEN_CLIENT_OBJECTMODEL_HPP #define INGEN_CLIENT_OBJECTMODEL_HPP -#include -#include -#include - -#include "ingen/types.hpp" -#include "raul/Path.hpp" - #include "ingen/Node.hpp" -#include "ingen/Resource.hpp" +#include "ingen/URI.hpp" +#include "ingen/URIs.hpp" #include "ingen/client/signal.hpp" #include "ingen/ingen.h" +#include "ingen/types.hpp" +#include "raul/Path.hpp" +#include "raul/Symbol.hpp" namespace ingen { -class URIs; +class Atom; namespace client { -class ClientStore; - /** Base class for all Node models (BlockModel, GraphModel, PortModel). * * There are no non-const public methods intentionally, models are not allowed diff --git a/ingen/client/PluginModel.hpp b/ingen/client/PluginModel.hpp index 08a0fec9..468816aa 100644 --- a/ingen/client/PluginModel.hpp +++ b/ingen/client/PluginModel.hpp @@ -17,11 +17,6 @@ #ifndef INGEN_CLIENT_PLUGINMODEL_HPP #define INGEN_CLIENT_PLUGINMODEL_HPP -#include -#include -#include -#include - #include "ingen/Forge.hpp" #include "ingen/Resource.hpp" #include "ingen/World.hpp" @@ -32,6 +27,10 @@ #include "raul/Symbol.hpp" #include "sord/sordmm.hpp" +#include +#include +#include + namespace ingen { class URIs; diff --git a/ingen/client/PluginUI.hpp b/ingen/client/PluginUI.hpp index f17c8f61..b80c4527 100644 --- a/ingen/client/PluginUI.hpp +++ b/ingen/client/PluginUI.hpp @@ -17,17 +17,22 @@ #ifndef INGEN_CLIENT_PLUGINUI_HPP #define INGEN_CLIENT_PLUGINUI_HPP -#include +#include "signal.hpp" #include "ingen/LV2Features.hpp" +#include "ingen/Resource.hpp" #include "ingen/ingen.h" #include "ingen/types.hpp" #include "lilv/lilv.h" #include "suil/suil.h" +#include +#include + namespace ingen { -class Interface; +class Atom; +class URI; class World; namespace client { diff --git a/ingen/client/PortModel.hpp b/ingen/client/PortModel.hpp index fcb46c4f..4aa033d1 100644 --- a/ingen/client/PortModel.hpp +++ b/ingen/client/PortModel.hpp @@ -17,15 +17,15 @@ #ifndef INGEN_CLIENT_PORTMODEL_HPP #define INGEN_CLIENT_PORTMODEL_HPP -#include -#include - #include "ingen/client/ObjectModel.hpp" #include "ingen/ingen.h" #include "ingen/types.hpp" #include "lv2/core/lv2.h" #include "lv2/port-props/port-props.h" +#include +#include + namespace Raul { class Path; } namespace ingen { diff --git a/ingen/client/SigClientInterface.hpp b/ingen/client/SigClientInterface.hpp index 461a7470..e9c8cd0e 100644 --- a/ingen/client/SigClientInterface.hpp +++ b/ingen/client/SigClientInterface.hpp @@ -17,14 +17,13 @@ #ifndef INGEN_CLIENT_SIGCLIENTINTERFACE_HPP #define INGEN_CLIENT_SIGCLIENTINTERFACE_HPP -#include -#include - -#include "raul/Path.hpp" - #include "ingen/Interface.hpp" #include "ingen/client/signal.hpp" #include "ingen/ingen.h" +#include "raul/Path.hpp" + +#include +#include namespace ingen { namespace client { diff --git a/ingen/filesystem.hpp b/ingen/filesystem.hpp index 4b8e2b11..5156eb79 100644 --- a/ingen/filesystem.hpp +++ b/ingen/filesystem.hpp @@ -20,14 +20,7 @@ #define _BSD_SOURCE 1 #define _DEFAULT_SOURCE 1 -#include -#include -#include -#include -#include - -#include -#include +#include "ingen/FilePath.hpp" #ifdef _WIN32 # include @@ -36,7 +29,13 @@ # define mkdir(path, flags) _mkdir(path) #endif -#include "ingen/FilePath.hpp" +#include +#include +#include +#include +#include +#include +#include /* A minimal subset of the std::filesystem API from C++17. */ diff --git a/ingen/paths.hpp b/ingen/paths.hpp index 4f46b69a..05496114 100644 --- a/ingen/paths.hpp +++ b/ingen/paths.hpp @@ -17,12 +17,12 @@ #ifndef INGEN_PATHS_HPP #define INGEN_PATHS_HPP -#include -#include - #include "ingen/URI.hpp" #include "raul/Path.hpp" +#include +#include + namespace ingen { inline URI main_uri() { return URI("ingen:/main"); } diff --git a/ingen/runtime_paths.hpp b/ingen/runtime_paths.hpp index 361ab6af..2575efa1 100644 --- a/ingen/runtime_paths.hpp +++ b/ingen/runtime_paths.hpp @@ -17,12 +17,12 @@ #ifndef INGEN_RUNTIME_PATHS_HPP #define INGEN_RUNTIME_PATHS_HPP -#include -#include - #include "ingen/ingen.h" #include "ingen/FilePath.hpp" +#include +#include + namespace ingen { extern const char search_path_separator; diff --git a/ingen/types.hpp b/ingen/types.hpp index 98f700f5..b6461799 100644 --- a/ingen/types.hpp +++ b/ingen/types.hpp @@ -17,11 +17,11 @@ #ifndef INGEN_TYPES_HPP #define INGEN_TYPES_HPP +#include "raul/Maid.hpp" + #include #include -#include "raul/Maid.hpp" - namespace ingen { template diff --git a/src/AtomReader.cpp b/src/AtomReader.cpp index 71d88a84..821b52a1 100644 --- a/src/AtomReader.cpp +++ b/src/AtomReader.cpp @@ -14,18 +14,29 @@ along with Ingen. If not, see . */ -#include -#include - +#include "ingen/Atom.hpp" #include "ingen/AtomReader.hpp" #include "ingen/Interface.hpp" #include "ingen/Log.hpp" #include "ingen/Message.hpp" -#include "ingen/Node.hpp" +#include "ingen/Properties.hpp" +#include "ingen/Resource.hpp" +#include "ingen/Status.hpp" +#include "ingen/URI.hpp" #include "ingen/URIMap.hpp" +#include "ingen/URIs.hpp" +#include "ingen/paths.hpp" +#include "lv2/atom/atom.h" #include "lv2/atom/util.h" +#include "lv2/urid/urid.h" #include "raul/Path.hpp" +#include + +#include +#include +#include + namespace ingen { AtomReader::AtomReader(URIMap& map, URIs& uris, Log& log, Interface& iface) diff --git a/src/AtomWriter.cpp b/src/AtomWriter.cpp index 9c7da98e..d7982cb0 100644 --- a/src/AtomWriter.cpp +++ b/src/AtomWriter.cpp @@ -47,19 +47,30 @@ * manipulating data in this model which resemble HTTP methods. */ -#include -#include -#include - -#include - +#include "ingen/Atom.hpp" +#include "ingen/AtomForgeSink.hpp" #include "ingen/AtomSink.hpp" #include "ingen/AtomWriter.hpp" -#include "ingen/Node.hpp" +#include "ingen/Message.hpp" +#include "ingen/Properties.hpp" +#include "ingen/Resource.hpp" +#include "ingen/URI.hpp" #include "ingen/URIMap.hpp" +#include "ingen/URIs.hpp" +#include "ingen/paths.hpp" +#include "lv2/atom/forge.h" +#include "lv2/urid/urid.h" #include "raul/Path.hpp" #include "serd/serd.h" +#include + +#include +#include +#include +#include +#include + namespace ingen { AtomWriter::AtomWriter(URIMap& map, URIs& uris, AtomSink& sink) diff --git a/src/ClashAvoider.cpp b/src/ClashAvoider.cpp index dbcc1a7e..5ae1f004 100644 --- a/src/ClashAvoider.cpp +++ b/src/ClashAvoider.cpp @@ -14,19 +14,23 @@ along with Ingen. If not, see . */ +#include "ingen/ClashAvoider.hpp" +#include "ingen/Store.hpp" +#include "ingen/URI.hpp" +#include "ingen/paths.hpp" +#include "raul/Path.hpp" +#include "raul/Symbol.hpp" + +#include + #include #include #include +#include #include #include #include -#include - -#include "ingen/ClashAvoider.hpp" -#include "ingen/Store.hpp" -#include "ingen/paths.hpp" - namespace ingen { ClashAvoider::ClashAvoider(const Store& store) diff --git a/src/Configuration.cpp b/src/Configuration.cpp index 003480ea..a79a2bf7 100644 --- a/src/Configuration.cpp +++ b/src/Configuration.cpp @@ -14,23 +14,29 @@ along with Ingen. If not, see . */ -#include -#include -#include -#include -#include -#include - #include "ingen/Configuration.hpp" #include "ingen/Forge.hpp" -#include "ingen/Log.hpp" #include "ingen/URIMap.hpp" #include "ingen/filesystem.hpp" +#include "ingen/fmt.hpp" #include "ingen/ingen.h" #include "ingen/runtime_paths.hpp" +#include "serd/serd.h" +#include "sord/sord.h" #include "sord/sordmm.hpp" #include "sratom/sratom.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + namespace ingen { Configuration::Configuration(Forge& forge) diff --git a/src/FilePath.cpp b/src/FilePath.cpp index 897dea7d..c015d2ee 100644 --- a/src/FilePath.cpp +++ b/src/FilePath.cpp @@ -16,6 +16,10 @@ #include "ingen/FilePath.hpp" +#include +#include +#include + namespace ingen { template diff --git a/src/Forge.cpp b/src/Forge.cpp index 9ac406fc..00194ce9 100644 --- a/src/Forge.cpp +++ b/src/Forge.cpp @@ -14,12 +14,14 @@ along with Ingen. If not, see . */ -#include - #include "ingen/Forge.hpp" #include "ingen/URI.hpp" #include "ingen/URIMap.hpp" -#include "lv2/atom/atom.h" +#include "lv2/atom/forge.h" +#include "lv2/urid/urid.h" + +#include +#include namespace ingen { diff --git a/src/LV2Features.cpp b/src/LV2Features.cpp index dbe8f540..460bc46a 100644 --- a/src/LV2Features.cpp +++ b/src/LV2Features.cpp @@ -14,10 +14,10 @@ along with Ingen. If not, see . */ -#include - #include "ingen/LV2Features.hpp" +#include + namespace ingen { void diff --git a/src/Log.cpp b/src/Log.cpp index c325a8ed..1fb3ff24 100644 --- a/src/Log.cpp +++ b/src/Log.cpp @@ -14,13 +14,17 @@ along with Ingen. If not, see . */ -#include - #include "ingen/Log.hpp" + +#include "ingen/ColorContext.hpp" #include "ingen/Node.hpp" #include "ingen/URIs.hpp" #include "ingen/World.hpp" -#include "ingen/ColorContext.hpp" +#include "lv2/log/log.h" +#include "raul/Path.hpp" + +#include +#include namespace ingen { diff --git a/src/Parser.cpp b/src/Parser.cpp index caebc5f1..cda039eb 100644 --- a/src/Parser.cpp +++ b/src/Parser.cpp @@ -14,17 +14,15 @@ along with Ingen. If not, see . */ -#include -#include -#include -#include +#include "ingen/Parser.hpp" #include "ingen/Atom.hpp" #include "ingen/AtomForgeSink.hpp" #include "ingen/Forge.hpp" #include "ingen/Interface.hpp" #include "ingen/Log.hpp" -#include "ingen/Parser.hpp" +#include "ingen/Properties.hpp" +#include "ingen/Resource.hpp" #include "ingen/URI.hpp" #include "ingen/URIMap.hpp" #include "ingen/URIs.hpp" @@ -32,10 +30,24 @@ #include "ingen/filesystem.hpp" #include "ingen/paths.hpp" #include "lv2/atom/atom.h" +#include "lv2/atom/forge.h" +#include "lv2/core/lv2.h" +#include "lv2/urid/urid.h" +#include "raul/Path.hpp" +#include "raul/Symbol.hpp" #include "serd/serd.h" +#include "sord/sord.h" #include "sord/sordmm.hpp" #include "sratom/sratom.h" +#include +#include +#include +#include +#include +#include +#include + #define NS_RDF "http://www.w3.org/1999/02/22-rdf-syntax-ns#" #define NS_RDFS "http://www.w3.org/2000/01/rdf-schema#" diff --git a/src/Resource.cpp b/src/Resource.cpp index 86403388..40f5fb4f 100644 --- a/src/Resource.cpp +++ b/src/Resource.cpp @@ -14,14 +14,15 @@ along with Ingen. If not, see . */ -#include -#include +#include "ingen/Resource.hpp" #include "ingen/Atom.hpp" #include "ingen/Forge.hpp" -#include "ingen/Resource.hpp" #include "ingen/URIs.hpp" +#include +#include + namespace ingen { bool diff --git a/src/Serialiser.cpp b/src/Serialiser.cpp index fb78162f..8184429e 100644 --- a/src/Serialiser.cpp +++ b/src/Serialiser.cpp @@ -14,22 +14,15 @@ along with Ingen. If not, see . */ -#include -#include -#include -#include -#include -#include -#include +#include "ingen/Serialiser.hpp" #include "ingen/Arc.hpp" +#include "ingen/Atom.hpp" #include "ingen/FilePath.hpp" #include "ingen/Forge.hpp" -#include "ingen/Interface.hpp" #include "ingen/Log.hpp" #include "ingen/Node.hpp" #include "ingen/Resource.hpp" -#include "ingen/Serialiser.hpp" #include "ingen/Store.hpp" #include "ingen/URI.hpp" #include "ingen/URIMap.hpp" @@ -37,12 +30,27 @@ #include "ingen/World.hpp" #include "ingen/filesystem.hpp" #include "ingen/runtime_paths.hpp" +#include "ingen/types.hpp" +#include "lv2/core/lv2.h" #include "lv2/state/state.h" #include "lv2/ui/ui.h" +#include "lv2/urid/urid.h" #include "raul/Path.hpp" +#include "raul/Symbol.hpp" +#include "serd/serd.h" +#include "sord/sord.h" #include "sord/sordmm.hpp" #include "sratom/sratom.h" +#include +#include +#include +#include +#include +#include +#include +#include + namespace ingen { struct Serialiser::Impl { diff --git a/src/SocketReader.cpp b/src/SocketReader.cpp index 0cbb63af..21859339 100644 --- a/src/SocketReader.cpp +++ b/src/SocketReader.cpp @@ -14,22 +14,28 @@ along with Ingen. If not, see . */ -#include -#include - -#include +#include "ingen/SocketReader.hpp" #include "ingen/AtomForgeSink.hpp" #include "ingen/AtomReader.hpp" -#include "ingen/Interface.hpp" #include "ingen/Log.hpp" -#include "ingen/SocketReader.hpp" #include "ingen/URIMap.hpp" #include "ingen/World.hpp" +#include "lv2/atom/forge.h" +#include "lv2/urid/urid.h" #include "raul/Socket.hpp" #include "sord/sordmm.hpp" #include "sratom/sratom.h" +#include +#include +#include +#include +#include +#include +#include +#include + namespace ingen { SocketReader::SocketReader(ingen::World& world, diff --git a/src/SocketWriter.cpp b/src/SocketWriter.cpp index e927666c..83895701 100644 --- a/src/SocketWriter.cpp +++ b/src/SocketWriter.cpp @@ -14,14 +14,16 @@ along with Ingen. If not, see . */ -#include -#include -#include +#include "ingen/SocketWriter.hpp" + +#include "ingen/URI.hpp" +#include "raul/Socket.hpp" #include -#include "ingen/SocketWriter.hpp" -#include "raul/Socket.hpp" +#include +#include +#include #ifndef MSG_NOSIGNAL # define MSG_NOSIGNAL 0 diff --git a/src/Store.cpp b/src/Store.cpp index 0bbeea30..5d729a02 100644 --- a/src/Store.cpp +++ b/src/Store.cpp @@ -14,10 +14,16 @@ along with Ingen. If not, see . */ -#include +#include "ingen/Store.hpp" #include "ingen/Node.hpp" -#include "ingen/Store.hpp" +#include "raul/Path.hpp" +#include "raul/Symbol.hpp" + +#include +#include +#include +#include namespace ingen { diff --git a/src/StreamWriter.cpp b/src/StreamWriter.cpp index 631369b6..d8a93a0b 100644 --- a/src/StreamWriter.cpp +++ b/src/StreamWriter.cpp @@ -14,9 +14,11 @@ along with Ingen. If not, see . */ -#include "ingen/ColorContext.hpp" #include "ingen/StreamWriter.hpp" +#include "ingen/ColorContext.hpp" +#include "ingen/URI.hpp" + namespace ingen { StreamWriter::StreamWriter(URIMap& map, diff --git a/src/TurtleWriter.cpp b/src/TurtleWriter.cpp index 9bceaa06..c1878791 100644 --- a/src/TurtleWriter.cpp +++ b/src/TurtleWriter.cpp @@ -15,7 +15,9 @@ */ #include "ingen/TurtleWriter.hpp" + #include "ingen/URIMap.hpp" +#include "lv2/atom/atom.h" #define USTR(s) ((const uint8_t*)(s)) diff --git a/src/URI.cpp b/src/URI.cpp index 8f71b70c..7e3e1dba 100644 --- a/src/URI.cpp +++ b/src/URI.cpp @@ -14,10 +14,11 @@ along with Ingen. If not, see . */ -#include +#include "ingen/URI.hpp" #include "ingen/FilePath.hpp" -#include "ingen/URI.hpp" + +#include namespace ingen { diff --git a/src/URIMap.cpp b/src/URIMap.cpp index 46ca0108..c7d82c4b 100644 --- a/src/URIMap.cpp +++ b/src/URIMap.cpp @@ -14,11 +14,15 @@ along with Ingen. If not, see . */ -#include +#include "ingen/URIMap.hpp" #include "ingen/Log.hpp" #include "ingen/URI.hpp" -#include "ingen/URIMap.hpp" +#include "lv2/urid/urid.h" + +#include +#include +#include namespace ingen { diff --git a/src/URIs.cpp b/src/URIs.cpp index 90f351b1..7cd94165 100644 --- a/src/URIs.cpp +++ b/src/URIs.cpp @@ -14,9 +14,9 @@ along with Ingen. If not, see . */ -#include "ingen/Forge.hpp" -#include "ingen/URIMap.hpp" #include "ingen/URIs.hpp" + +#include "ingen/Forge.hpp" #include "ingen/ingen.h" #include "lv2/atom/atom.h" #include "lv2/buf-size/buf-size.h" diff --git a/src/World.cpp b/src/World.cpp index 338d6864..b967de2f 100644 --- a/src/World.cpp +++ b/src/World.cpp @@ -14,39 +14,45 @@ along with Ingen. If not, see . */ -#include -#include -#include -#include -#include +#include "ingen/World.hpp" +#include "ingen/Atom.hpp" #include "ingen/Configuration.hpp" #include "ingen/DataAccess.hpp" #include "ingen/EngineBase.hpp" +#include "ingen/FilePath.hpp" #include "ingen/Forge.hpp" #include "ingen/InstanceAccess.hpp" #include "ingen/LV2Features.hpp" +#include "ingen/Library.hpp" #include "ingen/Log.hpp" #include "ingen/Module.hpp" #include "ingen/Parser.hpp" #include "ingen/Serialiser.hpp" +#include "ingen/URI.hpp" #include "ingen/URIMap.hpp" #include "ingen/URIs.hpp" -#include "ingen/World.hpp" #include "ingen/filesystem.hpp" #include "ingen/ingen.h" #include "ingen/runtime_paths.hpp" #include "lilv/lilv.h" +#include "lv2/log/log.h" #include "sord/sordmm.hpp" +#include +#include +#include +#include +#include +#include +#include +#include + using std::string; namespace ingen { -class EngineBase; class Interface; -class Parser; -class Serialiser; class Store; /** Load a dynamic module from the default path. diff --git a/src/client/BlockModel.cpp b/src/client/BlockModel.cpp index a15674d4..4cee9ac0 100644 --- a/src/client/BlockModel.cpp +++ b/src/client/BlockModel.cpp @@ -14,13 +14,17 @@ along with Ingen. If not, see . */ -#include -#include -#include - #include "ingen/client/BlockModel.hpp" + #include "ingen/URIs.hpp" #include "ingen/World.hpp" +#include "ingen/client/PortModel.hpp" + +#include +#include +#include +#include +#include namespace ingen { namespace client { diff --git a/src/client/ClientStore.cpp b/src/client/ClientStore.cpp index 1f71bf61..6aadcf2a 100644 --- a/src/client/ClientStore.cpp +++ b/src/client/ClientStore.cpp @@ -14,18 +14,24 @@ along with Ingen. If not, see . */ -#include +#include "ingen/client/ClientStore.hpp" #include "ingen/Log.hpp" #include "ingen/client/ArcModel.hpp" #include "ingen/client/BlockModel.hpp" -#include "ingen/client/ClientStore.hpp" #include "ingen/client/GraphModel.hpp" #include "ingen/client/ObjectModel.hpp" #include "ingen/client/PluginModel.hpp" #include "ingen/client/PortModel.hpp" #include "ingen/client/SigClientInterface.hpp" +#include + +#include +#include +#include +#include + namespace ingen { namespace client { diff --git a/src/client/GraphModel.cpp b/src/client/GraphModel.cpp index 31947ba7..8999ace8 100644 --- a/src/client/GraphModel.cpp +++ b/src/client/GraphModel.cpp @@ -14,13 +14,16 @@ along with Ingen. If not, see . */ -#include +#include "ingen/client/GraphModel.hpp" #include "ingen/URIs.hpp" #include "ingen/client/ArcModel.hpp" #include "ingen/client/BlockModel.hpp" #include "ingen/client/ClientStore.hpp" -#include "ingen/client/GraphModel.hpp" + +#include +#include +#include namespace ingen { namespace client { diff --git a/src/client/ObjectModel.cpp b/src/client/ObjectModel.cpp index 65dd1a37..ff7ab88b 100644 --- a/src/client/ObjectModel.cpp +++ b/src/client/ObjectModel.cpp @@ -14,9 +14,15 @@ along with Ingen. If not, see . */ +#include "ingen/client/ObjectModel.hpp" + #include "ingen/Node.hpp" #include "ingen/URIs.hpp" -#include "ingen/client/ObjectModel.hpp" + +#include +#include +#include +#include namespace ingen { namespace client { diff --git a/src/client/PluginModel.cpp b/src/client/PluginModel.cpp index 1770022e..f0e3c3a0 100644 --- a/src/client/PluginModel.cpp +++ b/src/client/PluginModel.cpp @@ -14,20 +14,22 @@ along with Ingen. If not, see . */ -#include -#include - -#include - -#include "raul/Path.hpp" +#include "ingen/client/PluginModel.hpp" #include "ingen/Atom.hpp" #include "ingen/client/GraphModel.hpp" -#include "ingen/client/PluginModel.hpp" #include "ingen/client/PluginUI.hpp" - +#include "raul/Path.hpp" #include "ingen_config.h" +#include + +#include +#include +#include +#include +#include + using std::string; namespace ingen { diff --git a/src/client/PluginUI.cpp b/src/client/PluginUI.cpp index c093ad47..a997d716 100644 --- a/src/client/PluginUI.cpp +++ b/src/client/PluginUI.cpp @@ -14,15 +14,20 @@ along with Ingen. If not, see . */ +#include "ingen/client/PluginUI.hpp" + #include "ingen/Interface.hpp" #include "ingen/Log.hpp" #include "ingen/URIs.hpp" #include "ingen/client/BlockModel.hpp" -#include "ingen/client/PluginUI.hpp" #include "ingen/client/PortModel.hpp" #include "lv2/atom/atom.h" #include "lv2/ui/ui.h" +#include +#include +#include + namespace ingen { namespace client { diff --git a/src/client/PortModel.cpp b/src/client/PortModel.cpp index f83e043b..79a3527a 100644 --- a/src/client/PortModel.cpp +++ b/src/client/PortModel.cpp @@ -17,6 +17,9 @@ #include "ingen/client/BlockModel.hpp" #include "ingen/client/PortModel.hpp" +#include +#include + namespace ingen { namespace client { diff --git a/src/client/ingen_client.cpp b/src/client/ingen_client.cpp index e56f42e4..f76fae0b 100644 --- a/src/client/ingen_client.cpp +++ b/src/client/ingen_client.cpp @@ -16,7 +16,6 @@ #include "ingen/Module.hpp" #include "ingen/World.hpp" - #include "ingen_config.h" struct IngenClientModule : public ingen::Module { diff --git a/src/gui/App.cpp b/src/gui/App.cpp index b9b7f7dc..dfa34998 100644 --- a/src/gui/App.cpp +++ b/src/gui/App.cpp @@ -14,14 +14,22 @@ along with Ingen. If not, see . */ -#include -#include -#include -#include +#include "App.hpp" -#include -#include -#include +#include "ConnectWindow.hpp" +#include "GraphTreeWindow.hpp" +#include "GraphWindow.hpp" +#include "LoadPluginWindow.hpp" +#include "MessagesWindow.hpp" +#include "NodeModule.hpp" +#include "Port.hpp" +#include "RDFS.hpp" +#include "Style.hpp" +#include "SubgraphModule.hpp" +#include "ThreadedLoader.hpp" +#include "WidgetFactory.hpp" +#include "WindowFactory.hpp" +#include "rgba.hpp" #include "ganv/Edge.hpp" #include "ingen/Configuration.hpp" @@ -34,27 +42,21 @@ #include "ingen/client/ClientStore.hpp" #include "ingen/client/GraphModel.hpp" #include "ingen/client/ObjectModel.hpp" +#include "ingen/client/PortModel.hpp" #include "ingen/client/SigClientInterface.hpp" #include "ingen/runtime_paths.hpp" #include "lilv/lilv.h" #include "raul/Path.hpp" #include "suil/suil.h" -#include "App.hpp" -#include "ConnectWindow.hpp" -#include "GraphTreeWindow.hpp" -#include "GraphWindow.hpp" -#include "LoadPluginWindow.hpp" -#include "MessagesWindow.hpp" -#include "NodeModule.hpp" -#include "Port.hpp" -#include "RDFS.hpp" -#include "Style.hpp" -#include "SubgraphModule.hpp" -#include "ThreadedLoader.hpp" -#include "WidgetFactory.hpp" -#include "WindowFactory.hpp" -#include "rgba.hpp" +#include +#include +#include + +#include +#include +#include +#include namespace Raul { class Deletable; } diff --git a/src/gui/App.hpp b/src/gui/App.hpp index 1aa5cbc1..47352f50 100644 --- a/src/gui/App.hpp +++ b/src/gui/App.hpp @@ -17,13 +17,6 @@ #ifndef INGEN_GUI_APP_HPP #define INGEN_GUI_APP_HPP -#include -#include - -#include -#include -#include - #include "ingen/Atom.hpp" #include "ingen/Message.hpp" #include "ingen/Resource.hpp" @@ -34,6 +27,13 @@ #include "lilv/lilv.h" #include "raul/Deletable.hpp" +#include +#include +#include + +#include +#include + namespace ingen { class Interface; diff --git a/src/gui/Arc.cpp b/src/gui/Arc.cpp index 339a1248..d811bd22 100644 --- a/src/gui/Arc.cpp +++ b/src/gui/Arc.cpp @@ -15,6 +15,7 @@ */ #include "Arc.hpp" + #include "ingen/client/ArcModel.hpp" #include "ingen/client/BlockModel.hpp" diff --git a/src/gui/Arc.hpp b/src/gui/Arc.hpp index 4eedde88..453985fc 100644 --- a/src/gui/Arc.hpp +++ b/src/gui/Arc.hpp @@ -17,11 +17,11 @@ #ifndef INGEN_GUI_ARC_HPP #define INGEN_GUI_ARC_HPP -#include - #include "ganv/Edge.hpp" #include "ingen/types.hpp" +#include + namespace ingen { namespace client { class ArcModel; } diff --git a/src/gui/BreadCrumbs.cpp b/src/gui/BreadCrumbs.cpp index 2d2c535e..33b2c4b3 100644 --- a/src/gui/BreadCrumbs.cpp +++ b/src/gui/BreadCrumbs.cpp @@ -14,15 +14,15 @@ along with Ingen. If not, see . */ -#include -#include +#include "BreadCrumbs.hpp" -#include +#include "App.hpp" #include "ingen/client/SigClientInterface.hpp" -#include "App.hpp" -#include "BreadCrumbs.hpp" +#include + +#include namespace ingen { namespace gui { diff --git a/src/gui/BreadCrumbs.hpp b/src/gui/BreadCrumbs.hpp index 35c97fd0..63872a78 100644 --- a/src/gui/BreadCrumbs.hpp +++ b/src/gui/BreadCrumbs.hpp @@ -17,18 +17,20 @@ #ifndef INGEN_GUI_BREADCRUMBS_HPP #define INGEN_GUI_BREADCRUMBS_HPP -#include +#include "GraphView.hpp" + +#include "ingen/Message.hpp" +#include "ingen/client/GraphModel.hpp" +#include "ingen/types.hpp" +#include "raul/Path.hpp" #include #include #include -#include "raul/Path.hpp" - -#include "ingen/client/GraphModel.hpp" -#include "ingen/types.hpp" - -#include "GraphView.hpp" +#include +#include +#include namespace ingen { namespace gui { diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp index 369331e2..1468290f 100644 --- a/src/gui/ConnectWindow.cpp +++ b/src/gui/ConnectWindow.cpp @@ -14,15 +14,10 @@ along with Ingen. If not, see . */ -#include -#include -#include -#include - -#include -#include +#include "ConnectWindow.hpp" -#include "raul/Process.hpp" +#include "App.hpp" +#include "WindowFactory.hpp" #include "ingen/Configuration.hpp" #include "ingen/EngineBase.hpp" @@ -36,10 +31,15 @@ #include "ingen/client/SigClientInterface.hpp" #include "ingen/client/SocketClient.hpp" #include "ingen_config.h" +#include "raul/Process.hpp" -#include "App.hpp" -#include "ConnectWindow.hpp" -#include "WindowFactory.hpp" +#include +#include +#include + +#include +#include +#include using namespace ingen::client; diff --git a/src/gui/ConnectWindow.hpp b/src/gui/ConnectWindow.hpp index 093fafc0..882e0142 100644 --- a/src/gui/ConnectWindow.hpp +++ b/src/gui/ConnectWindow.hpp @@ -17,6 +17,12 @@ #ifndef INGEN_GUI_CONNECTWINDOW_HPP #define INGEN_GUI_CONNECTWINDOW_HPP +#include "Window.hpp" + +#include "ingen/Message.hpp" +#include "ingen/types.hpp" +#include "lilv/lilv.h" + #include #include #include @@ -26,12 +32,14 @@ #include #include -#include "ingen/types.hpp" -#include "lilv/lilv.h" - -#include "Window.hpp" +#include +#include namespace ingen { + +class Interface; +class World; + namespace gui { class App; diff --git a/src/gui/GraphBox.cpp b/src/gui/GraphBox.cpp index a201eca8..d248d0a7 100644 --- a/src/gui/GraphBox.cpp +++ b/src/gui/GraphBox.cpp @@ -14,22 +14,6 @@ along with Ingen. If not, see . */ -#include -#include -#include - -#include -#include -#include -#include - -#include "ingen/Configuration.hpp" -#include "ingen/Interface.hpp" -#include "ingen/Log.hpp" -#include "ingen/fmt.hpp" -#include "ingen/client/ClientStore.hpp" -#include "ingen/client/GraphModel.hpp" - #include "App.hpp" #include "BreadCrumbs.hpp" #include "ConnectWindow.hpp" @@ -47,10 +31,25 @@ #include "WindowFactory.hpp" #include "ingen_config.h" +#include "ingen/Configuration.hpp" +#include "ingen/Interface.hpp" +#include "ingen/Log.hpp" +#include "ingen/client/ClientStore.hpp" +#include "ingen/client/GraphModel.hpp" +#include "ingen/fmt.hpp" + +#include +#include +#include +#include #ifdef HAVE_WEBKIT #include #endif +#include +#include +#include + namespace ingen { using namespace client; diff --git a/src/gui/GraphCanvas.cpp b/src/gui/GraphCanvas.cpp index 986fefdc..d10d569b 100644 --- a/src/gui/GraphCanvas.cpp +++ b/src/gui/GraphCanvas.cpp @@ -14,14 +14,20 @@ along with Ingen. If not, see . */ -#include -#include -#include -#include -#include - -#include -#include +#include "App.hpp" +#include "Arc.hpp" +#include "GraphCanvas.hpp" +#include "GraphPortModule.hpp" +#include "GraphWindow.hpp" +#include "LoadPluginWindow.hpp" +#include "NewSubgraphWindow.hpp" +#include "NodeModule.hpp" +#include "PluginMenu.hpp" +#include "Port.hpp" +#include "SubgraphModule.hpp" +#include "ThreadedLoader.hpp" +#include "WidgetFactory.hpp" +#include "WindowFactory.hpp" #include "ganv/Canvas.hpp" #include "ganv/Circle.hpp" @@ -38,20 +44,14 @@ #include "ingen/ingen.h" #include "lv2/atom/atom.h" -#include "App.hpp" -#include "Arc.hpp" -#include "GraphCanvas.hpp" -#include "GraphPortModule.hpp" -#include "GraphWindow.hpp" -#include "LoadPluginWindow.hpp" -#include "NewSubgraphWindow.hpp" -#include "NodeModule.hpp" -#include "PluginMenu.hpp" -#include "Port.hpp" -#include "SubgraphModule.hpp" -#include "ThreadedLoader.hpp" -#include "WidgetFactory.hpp" -#include "WindowFactory.hpp" +#include +#include + +#include +#include +#include +#include +#include using std::string; diff --git a/src/gui/GraphCanvas.hpp b/src/gui/GraphCanvas.hpp index 509b0a4a..613c03da 100644 --- a/src/gui/GraphCanvas.hpp +++ b/src/gui/GraphCanvas.hpp @@ -17,20 +17,19 @@ #ifndef INGEN_GUI_GRAPHCANVAS_HPP #define INGEN_GUI_GRAPHCANVAS_HPP -#include -#include -#include - -#include "lilv/lilv.h" +#include "NodeModule.hpp" #include "ganv/Canvas.hpp" #include "ganv/Module.hpp" #include "ingen/Node.hpp" #include "ingen/client/ArcModel.hpp" #include "ingen/types.hpp" +#include "lilv/lilv.h" #include "raul/Path.hpp" -#include "NodeModule.hpp" +#include +#include +#include namespace ingen { diff --git a/src/gui/GraphPortModule.cpp b/src/gui/GraphPortModule.cpp index a1ea6ce2..ffca1834 100644 --- a/src/gui/GraphPortModule.cpp +++ b/src/gui/GraphPortModule.cpp @@ -14,15 +14,6 @@ along with Ingen. If not, see . */ -#include -#include -#include - -#include "ingen/Configuration.hpp" -#include "ingen/Interface.hpp" -#include "ingen/client/BlockModel.hpp" -#include "ingen/client/GraphModel.hpp" - #include "App.hpp" #include "Style.hpp" #include "GraphCanvas.hpp" @@ -34,6 +25,15 @@ #include "WidgetFactory.hpp" #include "WindowFactory.hpp" +#include "ingen/Configuration.hpp" +#include "ingen/Interface.hpp" +#include "ingen/client/BlockModel.hpp" +#include "ingen/client/GraphModel.hpp" + +#include +#include +#include + namespace ingen { using namespace client; diff --git a/src/gui/GraphPortModule.hpp b/src/gui/GraphPortModule.hpp index 548b7267..6400b327 100644 --- a/src/gui/GraphPortModule.hpp +++ b/src/gui/GraphPortModule.hpp @@ -17,11 +17,11 @@ #ifndef INGEN_GUI_GRAPHPORTMODULE_HPP #define INGEN_GUI_GRAPHPORTMODULE_HPP -#include +#include "Port.hpp" #include "ganv/Module.hpp" -#include "Port.hpp" +#include namespace Raul { class Atom; } diff --git a/src/gui/GraphTreeWindow.hpp b/src/gui/GraphTreeWindow.hpp index 0df5d01c..eb5a5f78 100644 --- a/src/gui/GraphTreeWindow.hpp +++ b/src/gui/GraphTreeWindow.hpp @@ -17,13 +17,13 @@ #ifndef INGEN_GUI_GRAPHTREEWINDOW_HPP #define INGEN_GUI_GRAPHTREEWINDOW_HPP +#include "Window.hpp" + #include #include #include #include -#include "Window.hpp" - namespace Raul { class Path; } namespace ingen { diff --git a/src/gui/GraphView.cpp b/src/gui/GraphView.cpp index 42e19344..9e39ef7c 100644 --- a/src/gui/GraphView.cpp +++ b/src/gui/GraphView.cpp @@ -14,12 +14,6 @@ along with Ingen. If not, see . */ -#include -#include - -#include "ingen/Interface.hpp" -#include "ingen/client/GraphModel.hpp" - #include "App.hpp" #include "LoadPluginWindow.hpp" #include "NewSubgraphWindow.hpp" @@ -28,6 +22,12 @@ #include "GraphView.hpp" #include "WidgetFactory.hpp" +#include "ingen/Interface.hpp" +#include "ingen/client/GraphModel.hpp" + +#include +#include + namespace ingen { using namespace client; diff --git a/src/gui/GraphView.hpp b/src/gui/GraphView.hpp index 57a210a3..8c62ba3d 100644 --- a/src/gui/GraphView.hpp +++ b/src/gui/GraphView.hpp @@ -17,6 +17,8 @@ #ifndef INGEN_GUI_GRAPHVIEW_HPP #define INGEN_GUI_GRAPHVIEW_HPP +#include "ingen/types.hpp" + #include #include #include @@ -26,12 +28,13 @@ #include #include -#include "ingen/types.hpp" - namespace Raul { class Atom; } namespace ingen { +class Atom; +class URI; + namespace client { class PortModel; class MetadataModel; diff --git a/src/gui/GraphWindow.hpp b/src/gui/GraphWindow.hpp index bdcda312..e3d30d4c 100644 --- a/src/gui/GraphWindow.hpp +++ b/src/gui/GraphWindow.hpp @@ -17,14 +17,14 @@ #ifndef INGEN_GUI_GRAPH_WINDOW_HPP #define INGEN_GUI_GRAPH_WINDOW_HPP -#include - -#include +#include "GraphBox.hpp" +#include "Window.hpp" #include "ingen/types.hpp" -#include "GraphBox.hpp" -#include "Window.hpp" +#include + +#include namespace ingen { diff --git a/src/gui/LoadGraphWindow.cpp b/src/gui/LoadGraphWindow.cpp index d5ffa16e..fb1dc9ff 100644 --- a/src/gui/LoadGraphWindow.cpp +++ b/src/gui/LoadGraphWindow.cpp @@ -14,12 +14,12 @@ along with Ingen. If not, see . */ -#include -#include -#include +#include "LoadGraphWindow.hpp" -#include -#include +#include "App.hpp" +#include "GraphView.hpp" +#include "Style.hpp" +#include "ThreadedLoader.hpp" #include "ingen/Configuration.hpp" #include "ingen/Interface.hpp" @@ -28,11 +28,13 @@ #include "ingen/client/GraphModel.hpp" #include "ingen/runtime_paths.hpp" -#include "App.hpp" -#include "GraphView.hpp" -#include "LoadGraphWindow.hpp" -#include "Style.hpp" -#include "ThreadedLoader.hpp" +#include +#include + +#include +#include +#include +#include namespace ingen { diff --git a/src/gui/LoadGraphWindow.hpp b/src/gui/LoadGraphWindow.hpp index 03cb8c05..32d435ad 100644 --- a/src/gui/LoadGraphWindow.hpp +++ b/src/gui/LoadGraphWindow.hpp @@ -17,6 +17,9 @@ #ifndef INGEN_GUI_LOADGRAPHWINDOW_HPP #define INGEN_GUI_LOADGRAPHWINDOW_HPP +#include "ingen/Node.hpp" +#include "ingen/types.hpp" + #include #include #include @@ -25,15 +28,14 @@ #include #include -#include "ingen/Node.hpp" -#include "ingen/types.hpp" - namespace ingen { namespace client { class GraphModel; } namespace gui { +class App; + /** 'Load Graph' Window. * * Loaded from XML as a derived object. diff --git a/src/gui/LoadPluginWindow.cpp b/src/gui/LoadPluginWindow.cpp index 743c0f11..bb84f96f 100644 --- a/src/gui/LoadPluginWindow.cpp +++ b/src/gui/LoadPluginWindow.cpp @@ -14,25 +14,22 @@ along with Ingen. If not, see . */ -#include - -#include - -#include -#include - -#include "ingen/Interface.hpp" -#include "ingen/client/ClientStore.hpp" -#include "ingen/client/GraphModel.hpp" - #include "App.hpp" -#include "LoadPluginWindow.hpp" #include "GraphCanvas.hpp" #include "GraphView.hpp" #include "GraphWindow.hpp" - +#include "LoadPluginWindow.hpp" #include "ingen_config.h" +#include "ingen/Interface.hpp" +#include "ingen/client/ClientStore.hpp" +#include "ingen/client/GraphModel.hpp" + +#include +#include +#include +#include + using std::string; namespace ingen { diff --git a/src/gui/LoadPluginWindow.hpp b/src/gui/LoadPluginWindow.hpp index 0e6226c9..ddd0b427 100644 --- a/src/gui/LoadPluginWindow.hpp +++ b/src/gui/LoadPluginWindow.hpp @@ -17,8 +17,12 @@ #ifndef INGEN_GUI_LOADPLUGINWINDOW_HPP #define INGEN_GUI_LOADPLUGINWINDOW_HPP -#include -#include +#include "Window.hpp" + +#include "ingen/Node.hpp" +#include "ingen/client/ClientStore.hpp" +#include "ingen/types.hpp" +#include "ingen_config.h" #include #include @@ -26,12 +30,8 @@ #include #include -#include "ingen/Node.hpp" -#include "ingen/client/ClientStore.hpp" -#include "ingen/types.hpp" -#include "ingen_config.h" - -#include "Window.hpp" +#include +#include namespace ingen { diff --git a/src/gui/MessagesWindow.cpp b/src/gui/MessagesWindow.cpp index 2b980a53..84d29679 100644 --- a/src/gui/MessagesWindow.cpp +++ b/src/gui/MessagesWindow.cpp @@ -14,12 +14,16 @@ along with Ingen. If not, see . */ -#include +#include "MessagesWindow.hpp" + +#include "App.hpp" #include "ingen/URIs.hpp" -#include "App.hpp" -#include "MessagesWindow.hpp" +#include +#include +#include +#include namespace ingen { namespace gui { diff --git a/src/gui/MessagesWindow.hpp b/src/gui/MessagesWindow.hpp index fae6c2c3..add87455 100644 --- a/src/gui/MessagesWindow.hpp +++ b/src/gui/MessagesWindow.hpp @@ -17,16 +17,19 @@ #ifndef INGEN_GUI_MESSAGESWINDOW_HPP #define INGEN_GUI_MESSAGESWINDOW_HPP -#include -#include -#include +#include "Window.hpp" + +#include "lv2/log/log.h" #include #include #include -#include "lv2/log/log.h" -#include "Window.hpp" +#include +#include +#include +#include +#include namespace ingen { namespace gui { diff --git a/src/gui/NewSubgraphWindow.cpp b/src/gui/NewSubgraphWindow.cpp index 4f8197f2..228bd91c 100644 --- a/src/gui/NewSubgraphWindow.cpp +++ b/src/gui/NewSubgraphWindow.cpp @@ -14,15 +14,17 @@ along with Ingen. If not, see . */ -#include +#include "NewSubgraphWindow.hpp" + +#include "App.hpp" +#include "GraphView.hpp" #include "ingen/Interface.hpp" #include "ingen/client/ClientStore.hpp" #include "ingen/client/GraphModel.hpp" -#include "App.hpp" -#include "NewSubgraphWindow.hpp" -#include "GraphView.hpp" +#include +#include namespace ingen { namespace gui { diff --git a/src/gui/NewSubgraphWindow.hpp b/src/gui/NewSubgraphWindow.hpp index 403faa42..2d249cf3 100644 --- a/src/gui/NewSubgraphWindow.hpp +++ b/src/gui/NewSubgraphWindow.hpp @@ -17,17 +17,17 @@ #ifndef INGEN_GUI_NEWSUBGRAPHWINDOW_HPP #define INGEN_GUI_NEWSUBGRAPHWINDOW_HPP +#include "Window.hpp" + +#include "ingen/Node.hpp" +#include "ingen/types.hpp" + #include #include #include #include #include -#include "ingen/Node.hpp" -#include "ingen/types.hpp" - -#include "Window.hpp" - namespace ingen { namespace client { class GraphModel; } diff --git a/src/gui/NodeMenu.cpp b/src/gui/NodeMenu.cpp index 45f1e7cd..e2478592 100644 --- a/src/gui/NodeMenu.cpp +++ b/src/gui/NodeMenu.cpp @@ -14,24 +14,29 @@ along with Ingen. If not, see . */ -#include +#include "NodeMenu.hpp" -#include -#include -#include -#include +#include "App.hpp" +#include "WidgetFactory.hpp" +#include "WindowFactory.hpp" #include "ingen/Interface.hpp" #include "ingen/Log.hpp" #include "ingen/URIMap.hpp" #include "ingen/client/BlockModel.hpp" #include "ingen/client/PluginModel.hpp" +#include "ingen/client/PortModel.hpp" #include "lv2/presets/presets.h" -#include "App.hpp" -#include "NodeMenu.hpp" -#include "WidgetFactory.hpp" -#include "WindowFactory.hpp" +#include +#include +#include +#include +#include + +#include +#include +#include namespace ingen { diff --git a/src/gui/NodeMenu.hpp b/src/gui/NodeMenu.hpp index fd4962a9..2a3268b4 100644 --- a/src/gui/NodeMenu.hpp +++ b/src/gui/NodeMenu.hpp @@ -17,15 +17,16 @@ #ifndef INGEN_GUI_NODEMENU_HPP #define INGEN_GUI_NODEMENU_HPP -#include +#include "ObjectMenu.hpp" + +#include "ingen/client/BlockModel.hpp" +#include "ingen/types.hpp" #include #include #include -#include "ObjectMenu.hpp" -#include "ingen/client/BlockModel.hpp" -#include "ingen/types.hpp" +#include namespace ingen { namespace gui { diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp index abb9e970..b514b6ae 100644 --- a/src/gui/NodeModule.cpp +++ b/src/gui/NodeModule.cpp @@ -14,27 +14,12 @@ along with Ingen. If not, see . */ -#include -#include - -#include - -#include "lv2/atom/util.h" - -#include "ingen/Atom.hpp" -#include "ingen/Configuration.hpp" -#include "ingen/Interface.hpp" -#include "ingen/Log.hpp" -#include "ingen/client/BlockModel.hpp" -#include "ingen/client/GraphModel.hpp" -#include "ingen/client/PluginModel.hpp" -#include "ingen/client/PluginUI.hpp" +#include "NodeModule.hpp" #include "App.hpp" #include "GraphCanvas.hpp" #include "GraphWindow.hpp" #include "NodeMenu.hpp" -#include "NodeModule.hpp" #include "Port.hpp" #include "RenameWindow.hpp" #include "Style.hpp" @@ -43,6 +28,21 @@ #include "WindowFactory.hpp" #include "ingen_config.h" +#include "ingen/Atom.hpp" +#include "ingen/Configuration.hpp" +#include "ingen/Interface.hpp" +#include "ingen/Log.hpp" +#include "ingen/client/BlockModel.hpp" +#include "ingen/client/GraphModel.hpp" +#include "ingen/client/PluginModel.hpp" +#include "ingen/client/PluginUI.hpp" +#include "lv2/atom/util.h" + +#include + +#include +#include + namespace ingen { using namespace client; diff --git a/src/gui/ObjectMenu.cpp b/src/gui/ObjectMenu.cpp index 7c81adf2..7a523f4e 100644 --- a/src/gui/ObjectMenu.cpp +++ b/src/gui/ObjectMenu.cpp @@ -14,16 +14,17 @@ along with Ingen. If not, see . */ -#include +#include "ObjectMenu.hpp" + +#include "App.hpp" +#include "WidgetFactory.hpp" +#include "WindowFactory.hpp" #include "ingen/Forge.hpp" #include "ingen/Interface.hpp" #include "ingen/client/ObjectModel.hpp" -#include "App.hpp" -#include "ObjectMenu.hpp" -#include "WidgetFactory.hpp" -#include "WindowFactory.hpp" +#include namespace ingen { diff --git a/src/gui/ObjectMenu.hpp b/src/gui/ObjectMenu.hpp index b0a0cc10..22eef74b 100644 --- a/src/gui/ObjectMenu.hpp +++ b/src/gui/ObjectMenu.hpp @@ -17,17 +17,18 @@ #ifndef INGEN_GUI_OBJECTMENU_HPP #define INGEN_GUI_OBJECTMENU_HPP +#include "ingen/client/ObjectModel.hpp" +#include "ingen/types.hpp" + #include #include #include #include -#include "ingen/client/ObjectModel.hpp" -#include "ingen/types.hpp" - namespace ingen { namespace gui { +class App; class ObjectControlWindow; class ObjectPropertiesWindow; class GraphCanvas; diff --git a/src/gui/PluginMenu.cpp b/src/gui/PluginMenu.cpp index 49ee059d..0090aff1 100644 --- a/src/gui/PluginMenu.cpp +++ b/src/gui/PluginMenu.cpp @@ -18,6 +18,8 @@ #include "ingen/Log.hpp" #include "ingen/client/PluginModel.hpp" +#include + namespace ingen { namespace gui { diff --git a/src/gui/PluginMenu.hpp b/src/gui/PluginMenu.hpp index e4343ed7..284331d6 100644 --- a/src/gui/PluginMenu.hpp +++ b/src/gui/PluginMenu.hpp @@ -17,16 +17,17 @@ #ifndef INGEN_GUI_PLUGINMENU_HPP #define INGEN_GUI_PLUGINMENU_HPP -#include -#include -#include - -#include - #include "ingen/World.hpp" #include "ingen/types.hpp" #include "lilv/lilv.h" +#include + +#include +#include +#include +#include + namespace ingen { namespace client { class PluginModel; } diff --git a/src/gui/Port.cpp b/src/gui/Port.cpp index 82db9a0a..14f87fc1 100644 --- a/src/gui/Port.cpp +++ b/src/gui/Port.cpp @@ -14,20 +14,10 @@ along with Ingen. If not, see . */ -#include -#include - -#include "ganv/Module.hpp" -#include "ingen/Configuration.hpp" -#include "ingen/Interface.hpp" -#include "ingen/Log.hpp" -#include "ingen/URIMap.hpp" -#include "ingen/client/GraphModel.hpp" -#include "ingen/client/PortModel.hpp" +#include "Port.hpp" #include "App.hpp" #include "GraphWindow.hpp" -#include "Port.hpp" #include "PortMenu.hpp" #include "RDFS.hpp" #include "Style.hpp" @@ -36,6 +26,17 @@ #include "ingen_config.h" #include "rgba.hpp" +#include "ganv/Module.hpp" +#include "ingen/Configuration.hpp" +#include "ingen/Interface.hpp" +#include "ingen/Log.hpp" +#include "ingen/URIMap.hpp" +#include "ingen/client/GraphModel.hpp" +#include "ingen/client/PortModel.hpp" + +#include +#include + using namespace ingen::client; namespace ingen { diff --git a/src/gui/Port.hpp b/src/gui/Port.hpp index d88f3f9d..c95c93ef 100644 --- a/src/gui/Port.hpp +++ b/src/gui/Port.hpp @@ -17,13 +17,13 @@ #ifndef INGEN_GUI_PORT_HPP #define INGEN_GUI_PORT_HPP -#include -#include +#include "ganv/Port.hpp" +#include "ingen/types.hpp" #include -#include "ganv/Port.hpp" -#include "ingen/types.hpp" +#include +#include namespace Raul { class Atom; @@ -32,6 +32,7 @@ class Atom; namespace ingen { class URI; +class Atom; namespace client { class PortModel; } diff --git a/src/gui/PortMenu.cpp b/src/gui/PortMenu.cpp index 3a5b510d..ff3d2571 100644 --- a/src/gui/PortMenu.cpp +++ b/src/gui/PortMenu.cpp @@ -14,16 +14,17 @@ along with Ingen. If not, see . */ -#include +#include "PortMenu.hpp" + +#include "App.hpp" +#include "WindowFactory.hpp" #include "ingen/Interface.hpp" #include "ingen/client/GraphModel.hpp" #include "ingen/client/PortModel.hpp" #include "ingen/types.hpp" -#include "App.hpp" -#include "PortMenu.hpp" -#include "WindowFactory.hpp" +#include namespace ingen { diff --git a/src/gui/PortMenu.hpp b/src/gui/PortMenu.hpp index 60084223..26298e76 100644 --- a/src/gui/PortMenu.hpp +++ b/src/gui/PortMenu.hpp @@ -17,14 +17,14 @@ #ifndef INGEN_GUI_PORTMENU_HPP #define INGEN_GUI_PORTMENU_HPP -#include -#include -#include +#include "ObjectMenu.hpp" #include "ingen/client/PortModel.hpp" #include "ingen/types.hpp" -#include "ObjectMenu.hpp" +#include +#include +#include namespace ingen { namespace gui { diff --git a/src/gui/PropertiesWindow.cpp b/src/gui/PropertiesWindow.cpp index ba25d69b..ee257843 100644 --- a/src/gui/PropertiesWindow.cpp +++ b/src/gui/PropertiesWindow.cpp @@ -14,12 +14,10 @@ along with Ingen. If not, see . */ -#include -#include -#include - -#include -#include +#include "App.hpp" +#include "PropertiesWindow.hpp" +#include "RDFS.hpp" +#include "URIEntry.hpp" #include "ingen/Interface.hpp" #include "ingen/Log.hpp" @@ -28,10 +26,15 @@ #include "ingen/client/BlockModel.hpp" #include "ingen/client/PluginModel.hpp" -#include "App.hpp" -#include "PropertiesWindow.hpp" -#include "RDFS.hpp" -#include "URIEntry.hpp" +#include +#include + +#include +#include +#include +#include +#include +#include namespace ingen { diff --git a/src/gui/PropertiesWindow.hpp b/src/gui/PropertiesWindow.hpp index c1c3eee4..c847da20 100644 --- a/src/gui/PropertiesWindow.hpp +++ b/src/gui/PropertiesWindow.hpp @@ -17,7 +17,10 @@ #ifndef INGEN_GUI_PROPERTIES_WINDOW_HPP #define INGEN_GUI_PROPERTIES_WINDOW_HPP -#include +#include "Window.hpp" + +#include "ingen/client/BlockModel.hpp" +#include "ingen/types.hpp" #include #include @@ -29,10 +32,9 @@ #include #include -#include "ingen/client/BlockModel.hpp" -#include "ingen/types.hpp" - -#include "Window.hpp" +#include +#include +#include namespace ingen { diff --git a/src/gui/RDFS.cpp b/src/gui/RDFS.cpp index 80cc24f1..0b4a4e62 100644 --- a/src/gui/RDFS.cpp +++ b/src/gui/RDFS.cpp @@ -23,6 +23,8 @@ #include "RDFS.hpp" +#include + namespace ingen { namespace gui { namespace rdfs { diff --git a/src/gui/RDFS.hpp b/src/gui/RDFS.hpp index ee1133f5..4e9a8ab1 100644 --- a/src/gui/RDFS.hpp +++ b/src/gui/RDFS.hpp @@ -17,13 +17,14 @@ #ifndef INGEN_GUI_RDF_HPP #define INGEN_GUI_RDF_HPP +#include "ingen/URI.hpp" +#include "ingen/types.hpp" +#include "lilv/lilv.h" + #include #include #include -#include "ingen/types.hpp" -#include "lilv/lilv.h" - namespace ingen { class World; diff --git a/src/gui/RenameWindow.cpp b/src/gui/RenameWindow.cpp index 33516c2d..8c5e9edb 100644 --- a/src/gui/RenameWindow.cpp +++ b/src/gui/RenameWindow.cpp @@ -14,8 +14,9 @@ along with Ingen. If not, see . */ -#include -#include +#include "RenameWindow.hpp" + +#include "App.hpp" #include "ingen/Forge.hpp" #include "ingen/Interface.hpp" @@ -23,8 +24,7 @@ #include "ingen/client/ObjectModel.hpp" #include "lv2/core/lv2.h" -#include "App.hpp" -#include "RenameWindow.hpp" +#include namespace ingen { diff --git a/src/gui/RenameWindow.hpp b/src/gui/RenameWindow.hpp index 89d90f26..3b50f04e 100644 --- a/src/gui/RenameWindow.hpp +++ b/src/gui/RenameWindow.hpp @@ -17,15 +17,15 @@ #ifndef INGEN_GUI_RENAMEWINDOW_HPP #define INGEN_GUI_RENAMEWINDOW_HPP -#include -#include -#include -#include +#include "Window.hpp" #include "ingen/client/ObjectModel.hpp" #include "ingen/types.hpp" -#include "Window.hpp" +#include +#include +#include +#include namespace ingen { namespace gui { diff --git a/src/gui/Style.cpp b/src/gui/Style.cpp index 3a122e45..81c9da2f 100644 --- a/src/gui/Style.cpp +++ b/src/gui/Style.cpp @@ -14,11 +14,10 @@ along with Ingen. If not, see . */ -#include -#include -#include -#include -#include +#include "Style.hpp" + +#include "App.hpp" +#include "Port.hpp" #include "ganv/Port.hpp" #include "ingen/Log.hpp" @@ -26,9 +25,11 @@ #include "ingen/client/PluginModel.hpp" #include "ingen/client/PortModel.hpp" -#include "App.hpp" -#include "Style.hpp" -#include "Port.hpp" +#include +#include +#include +#include +#include namespace ingen { namespace gui { diff --git a/src/gui/SubgraphModule.cpp b/src/gui/SubgraphModule.cpp index 9c836644..52c37787 100644 --- a/src/gui/SubgraphModule.cpp +++ b/src/gui/SubgraphModule.cpp @@ -14,20 +14,21 @@ along with Ingen. If not, see . */ -#include -#include - -#include "ingen/Interface.hpp" -#include "ingen/client/GraphModel.hpp" +#include "SubgraphModule.hpp" #include "App.hpp" #include "NodeModule.hpp" #include "GraphCanvas.hpp" #include "GraphWindow.hpp" #include "Port.hpp" -#include "SubgraphModule.hpp" #include "WindowFactory.hpp" +#include "ingen/Interface.hpp" +#include "ingen/client/GraphModel.hpp" + +#include +#include + namespace ingen { using namespace client; diff --git a/src/gui/ThreadedLoader.cpp b/src/gui/ThreadedLoader.cpp index c9d30c31..9d87fba5 100644 --- a/src/gui/ThreadedLoader.cpp +++ b/src/gui/ThreadedLoader.cpp @@ -14,16 +14,17 @@ along with Ingen. If not, see . */ -#include -#include +#include "ThreadedLoader.hpp" + +#include "App.hpp" #include "ingen/Log.hpp" #include "ingen/Module.hpp" #include "ingen/World.hpp" #include "ingen/client/GraphModel.hpp" -#include "App.hpp" -#include "ThreadedLoader.hpp" +#include +#include using boost::optional; diff --git a/src/gui/ThreadedLoader.hpp b/src/gui/ThreadedLoader.hpp index 70e13fce..c1e97b6e 100644 --- a/src/gui/ThreadedLoader.hpp +++ b/src/gui/ThreadedLoader.hpp @@ -17,27 +17,30 @@ #ifndef INGEN_GUI_THREADEDLOADER_HPP #define INGEN_GUI_THREADEDLOADER_HPP -#include - -#include -#include -#include -#include - -#include - #include "ingen/FilePath.hpp" #include "ingen/Interface.hpp" #include "ingen/Parser.hpp" #include "ingen/Serialiser.hpp" #include "raul/Semaphore.hpp" +#include +#include + +#include +#include +#include +#include + namespace ingen { class URI; +namespace client { class GraphModel; } + namespace gui { +class App; + /** Thread for loading graph files. * * This is a seperate thread so it can send all the loading message without diff --git a/src/gui/URIEntry.cpp b/src/gui/URIEntry.cpp index 0004839f..9d5249e8 100644 --- a/src/gui/URIEntry.cpp +++ b/src/gui/URIEntry.cpp @@ -14,11 +14,13 @@ along with Ingen. If not, see . */ -#include +#include "URIEntry.hpp" #include "App.hpp" #include "RDFS.hpp" -#include "URIEntry.hpp" + +#include +#include namespace ingen { namespace gui { diff --git a/src/gui/URIEntry.hpp b/src/gui/URIEntry.hpp index 247c4a6d..535f0805 100644 --- a/src/gui/URIEntry.hpp +++ b/src/gui/URIEntry.hpp @@ -17,12 +17,16 @@ #ifndef INGEN_GUI_URI_ENTRY_HPP #define INGEN_GUI_URI_ENTRY_HPP +#include "ingen/URI.hpp" +#include "lilv/lilv.h" + #include #include #include #include -#include "lilv/lilv.h" +#include +#include namespace ingen { namespace gui { diff --git a/src/gui/WidgetFactory.cpp b/src/gui/WidgetFactory.cpp index a2a83a6f..3a71425d 100644 --- a/src/gui/WidgetFactory.cpp +++ b/src/gui/WidgetFactory.cpp @@ -14,13 +14,15 @@ along with Ingen. If not, see . */ -#include -#include +#include "WidgetFactory.hpp" #include "ingen/Log.hpp" #include "ingen/runtime_paths.hpp" -#include "WidgetFactory.hpp" +#include +#include +#include +#include namespace ingen { namespace gui { diff --git a/src/gui/WidgetFactory.hpp b/src/gui/WidgetFactory.hpp index e640e2a7..0a9ea4c3 100644 --- a/src/gui/WidgetFactory.hpp +++ b/src/gui/WidgetFactory.hpp @@ -17,10 +17,13 @@ #ifndef INGEN_GUI_GLADEFACTORY_HPP #define INGEN_GUI_GLADEFACTORY_HPP +#include +#include +#include + #include -#include -#include +namespace Gtk { class Builder; } namespace ingen { namespace gui { diff --git a/src/gui/Window.hpp b/src/gui/Window.hpp index 5f839578..5f49bc10 100644 --- a/src/gui/Window.hpp +++ b/src/gui/Window.hpp @@ -17,6 +17,7 @@ #ifndef INGEN_GUI_WINDOW_HPP #define INGEN_GUI_WINDOW_HPP +#include #include #include diff --git a/src/gui/WindowFactory.cpp b/src/gui/WindowFactory.cpp index 06c8266a..d85987f0 100644 --- a/src/gui/WindowFactory.cpp +++ b/src/gui/WindowFactory.cpp @@ -14,12 +14,6 @@ along with Ingen. If not, see . */ -#include -#include - -#include "ingen/Log.hpp" -#include "ingen/client/GraphModel.hpp" - #include "App.hpp" #include "LoadGraphWindow.hpp" #include "LoadPluginWindow.hpp" @@ -31,6 +25,14 @@ #include "WidgetFactory.hpp" #include "WindowFactory.hpp" +#include "ingen/Log.hpp" +#include "ingen/client/GraphModel.hpp" + +#include +#include +#include +#include + namespace ingen { using namespace client; diff --git a/src/gui/WindowFactory.hpp b/src/gui/WindowFactory.hpp index 4e71c7cf..1b6201af 100644 --- a/src/gui/WindowFactory.hpp +++ b/src/gui/WindowFactory.hpp @@ -17,11 +17,12 @@ #ifndef INGEN_GUI_WINDOWFACTORY_HPP #define INGEN_GUI_WINDOWFACTORY_HPP -#include - #include "ingen/Node.hpp" #include "ingen/types.hpp" +#include +#include + namespace ingen { namespace client { diff --git a/src/gui/ingen_gui_lv2.cpp b/src/gui/ingen_gui_lv2.cpp index f89e0436..4817e9ae 100644 --- a/src/gui/ingen_gui_lv2.cpp +++ b/src/gui/ingen_gui_lv2.cpp @@ -14,20 +14,37 @@ along with Ingen. If not, see . */ +#include "App.hpp" +#include "GraphBox.hpp" + #include "ingen/AtomReader.hpp" #include "ingen/AtomSink.hpp" #include "ingen/AtomWriter.hpp" +#include "ingen/Forge.hpp" +#include "ingen/Interface.hpp" +#include "ingen/Properties.hpp" +#include "ingen/URI.hpp" +#include "ingen/URIs.hpp" #include "ingen/World.hpp" #include "ingen/client/ClientStore.hpp" #include "ingen/client/GraphModel.hpp" #include "ingen/client/SigClientInterface.hpp" #include "ingen/ingen.h" +#include "ingen/paths.hpp" #include "ingen/runtime_paths.hpp" #include "ingen/types.hpp" +#include "lv2/atom/atom.h" +#include "lv2/atom/util.h" +#include "lv2/core/lv2.h" +#include "lv2/core/lv2.h" +#include "lv2/log/log.h" #include "lv2/ui/ui.h" +#include "lv2/urid/urid.h" +#include "lv2/urid/urid.h" +#include "raul/Path.hpp" -#include "App.hpp" -#include "GraphBox.hpp" +#include +#include #define INGEN_LV2_UI_URI INGEN_NS "GraphUIGtk2" diff --git a/src/ingen/ingen.cpp b/src/ingen/ingen.cpp index e5503715..15544c10 100644 --- a/src/ingen/ingen.cpp +++ b/src/ingen/ingen.cpp @@ -14,18 +14,6 @@ along with Ingen. If not, see . */ -#include - -#include -#include -#include -#include -#include - -#include "raul/Path.hpp" - -#include "ingen_config.h" - #include "ingen/Configuration.hpp" #include "ingen/EngineBase.hpp" #include "ingen/Interface.hpp" @@ -35,10 +23,24 @@ #include "ingen/paths.hpp" #include "ingen/runtime_paths.hpp" #include "ingen/types.hpp" +#include "ingen_config.h" +#include "raul/Path.hpp" +#include "raul/Symbol.hpp" + #ifdef HAVE_SOCKET #include "ingen/client/SocketClient.hpp" #endif +#include +#include +#include +#include +#include +#include +#include +#include +#include + using namespace std; using namespace ingen; diff --git a/src/runtime_paths.cpp b/src/runtime_paths.cpp index 15b83084..6e42381f 100644 --- a/src/runtime_paths.cpp +++ b/src/runtime_paths.cpp @@ -14,19 +14,17 @@ along with Ingen. If not, see . */ -#include -#include -#include -#include -#include - -#include - #include "ingen/runtime_paths.hpp" -#include "ingen/FilePath.hpp" +#include "ingen/FilePath.hpp" #include "ingen_config.h" +#include +#include +#include +#include +#include + namespace ingen { static FilePath bundle_path; diff --git a/src/server/ArcImpl.cpp b/src/server/ArcImpl.cpp index ffdddb8e..591c1391 100644 --- a/src/server/ArcImpl.cpp +++ b/src/server/ArcImpl.cpp @@ -14,17 +14,20 @@ along with Ingen. If not, see . */ -#include "ingen/URIs.hpp" -#include "lv2/atom/util.h" - #include "ArcImpl.hpp" -#include "BlockImpl.hpp" + #include "Buffer.hpp" #include "BufferFactory.hpp" -#include "Engine.hpp" #include "InputPort.hpp" -#include "OutputPort.hpp" #include "PortImpl.hpp" +#include "PortType.hpp" + +#include "ingen/URIs.hpp" +#include "raul/Path.hpp" + +#include +#include +#include namespace ingen { namespace server { diff --git a/src/server/ArcImpl.hpp b/src/server/ArcImpl.hpp index 54f88749..1f42d3a5 100644 --- a/src/server/ArcImpl.hpp +++ b/src/server/ArcImpl.hpp @@ -17,22 +17,22 @@ #ifndef INGEN_ENGINE_ARC_IMPL_HPP #define INGEN_ENGINE_ARC_IMPL_HPP -#include - -#include +#include "BufferRef.hpp" #include "ingen/Arc.hpp" -#include "lv2/atom/atom.h" -#include "raul/Deletable.hpp" +#include "raul/Noncopyable.hpp" +#include "raul/Path.hpp" -#include "BufferRef.hpp" -#include "RunContext.hpp" +#include + +#include namespace ingen { namespace server { -class PortImpl; class InputPort; +class PortImpl; +class RunContext; /** Represents a single inbound connection for an InputPort. * diff --git a/src/server/BlockFactory.cpp b/src/server/BlockFactory.cpp index d5a8e2d3..b6ad442e 100644 --- a/src/server/BlockFactory.cpp +++ b/src/server/BlockFactory.cpp @@ -14,23 +14,29 @@ along with Ingen. If not, see . */ -#include +#include "BlockFactory.hpp" -#include "lilv/lilv.h" +#include "InternalPlugin.hpp" +#include "LV2Plugin.hpp" +#include "PluginImpl.hpp" +#include "PortType.hpp" +#include "ThreadManager.hpp" #include "ingen/LV2Features.hpp" #include "ingen/Log.hpp" +#include "ingen/URIs.hpp" #include "ingen/World.hpp" #include "internals/BlockDelay.hpp" #include "internals/Controller.hpp" #include "internals/Note.hpp" #include "internals/Time.hpp" #include "internals/Trigger.hpp" +#include "lilv/lilv.h" -#include "BlockFactory.hpp" -#include "InternalPlugin.hpp" -#include "LV2Plugin.hpp" -#include "ThreadManager.hpp" +#include +#include +#include +#include namespace ingen { namespace server { diff --git a/src/server/BlockFactory.hpp b/src/server/BlockFactory.hpp index cac9a1d1..8eafaea5 100644 --- a/src/server/BlockFactory.hpp +++ b/src/server/BlockFactory.hpp @@ -17,14 +17,17 @@ #ifndef INGEN_ENGINE_BLOCKFACTORY_HPP #define INGEN_ENGINE_BLOCKFACTORY_HPP -#include -#include - -#include "ingen/World.hpp" +#include "ingen/URI.hpp" #include "ingen/types.hpp" #include "raul/Noncopyable.hpp" +#include +#include + namespace ingen { + +class World; + namespace server { class PluginImpl; diff --git a/src/server/BlockImpl.cpp b/src/server/BlockImpl.cpp index 17462ab4..263e6fce 100644 --- a/src/server/BlockImpl.cpp +++ b/src/server/BlockImpl.cpp @@ -14,20 +14,24 @@ along with Ingen. If not, see . */ -#include -#include - -#include "raul/Array.hpp" +#include "BlockImpl.hpp" #include "Buffer.hpp" -#include "Engine.hpp" -#include "BlockImpl.hpp" #include "GraphImpl.hpp" #include "PluginImpl.hpp" #include "PortImpl.hpp" #include "RunContext.hpp" #include "ThreadManager.hpp" +#include "raul/Array.hpp" +#include "raul/Maid.hpp" +#include "raul/Symbol.hpp" + +#include +#include +#include +#include + namespace ingen { namespace server { diff --git a/src/server/BlockImpl.hpp b/src/server/BlockImpl.hpp index 34045b6d..608bfc3e 100644 --- a/src/server/BlockImpl.hpp +++ b/src/server/BlockImpl.hpp @@ -17,30 +17,32 @@ #ifndef INGEN_ENGINE_BLOCKIMPL_HPP #define INGEN_ENGINE_BLOCKIMPL_HPP -#include - -#include -#include - -#include "lilv/lilv.h" - -#include "raul/Array.hpp" - #include "BufferRef.hpp" #include "NodeImpl.hpp" -#include "PluginImpl.hpp" #include "PortType.hpp" -#include "RunContext.hpp" #include "types.hpp" +#include "ingen/Node.hpp" +#include "ingen/Properties.hpp" +#include "ingen/Resource.hpp" +#include "ingen/URI.hpp" +#include "lilv/lilv.h" +#include "lv2/urid/urid.h" +#include "raul/Array.hpp" + +#include +#include + +#include +#include + namespace Raul { -class Maid; +class Symbol; } namespace ingen { namespace server { -class Buffer; class BufferFactory; class Engine; class GraphImpl; diff --git a/src/server/Broadcaster.cpp b/src/server/Broadcaster.cpp index aac28d53..779145df 100644 --- a/src/server/Broadcaster.cpp +++ b/src/server/Broadcaster.cpp @@ -14,14 +14,16 @@ along with Ingen. If not, see . */ -#include - -#include "ingen/Interface.hpp" - #include "Broadcaster.hpp" + #include "PluginImpl.hpp" #include "BlockFactory.hpp" +#include "ingen/Interface.hpp" + +#include +#include + namespace ingen { namespace server { diff --git a/src/server/Broadcaster.hpp b/src/server/Broadcaster.hpp index 1d5dd16e..f03c0abb 100644 --- a/src/server/Broadcaster.hpp +++ b/src/server/Broadcaster.hpp @@ -17,16 +17,17 @@ #ifndef INGEN_ENGINE_BROADCASTER_HPP #define INGEN_ENGINE_BROADCASTER_HPP -#include -#include -#include -#include -#include +#include "BlockFactory.hpp" #include "ingen/Interface.hpp" +#include "ingen/Message.hpp" +#include "ingen/URI.hpp" #include "ingen/types.hpp" +#include "raul/Noncopyable.hpp" -#include "BlockFactory.hpp" +#include +#include +#include namespace ingen { namespace server { diff --git a/src/server/Buffer.cpp b/src/server/Buffer.cpp index eef594a3..2fa5c387 100644 --- a/src/server/Buffer.cpp +++ b/src/server/Buffer.cpp @@ -16,8 +16,23 @@ #define __STDC_LIMIT_MACROS 1 -#include +#include "Buffer.hpp" + +#include "BufferFactory.hpp" +#include "Engine.hpp" +#include "RunContext.hpp" + +#include "ingen/Atom.hpp" +#include "ingen/Log.hpp" +#include "ingen/URIs.hpp" +#include "ingen_config.h" +#include "lv2/atom/atom.h" +#include "lv2/atom/util.h" + +#include #include +#include +#include #include #include @@ -25,18 +40,6 @@ # include #endif -#include "ingen/URIMap.hpp" -#include "ingen/URIs.hpp" -#include "ingen/World.hpp" -#include "ingen_config.h" -#include "lv2/atom/util.h" -#include "ingen/Log.hpp" - -#include "Buffer.hpp" -#include "BufferFactory.hpp" -#include "Engine.hpp" -#include "RunContext.hpp" - namespace ingen { namespace server { diff --git a/src/server/Buffer.hpp b/src/server/Buffer.hpp index d9b4e7ad..61123c43 100644 --- a/src/server/Buffer.hpp +++ b/src/server/Buffer.hpp @@ -17,24 +17,29 @@ #ifndef INGEN_ENGINE_BUFFER_HPP #define INGEN_ENGINE_BUFFER_HPP -#include -#include +#include "BufferFactory.hpp" +#include "BufferRef.hpp" +#include "PortType.hpp" +#include "types.hpp" -#include "ingen/types.hpp" +#include "ingen/Atom.hpp" +#include "ingen/URIs.hpp" #include "ingen/ingen.h" +#include "ingen/types.hpp" #include "lv2/atom/atom.h" #include "lv2/urid/urid.h" -#include "raul/Deletable.hpp" -#include "BufferFactory.hpp" -#include "PortType.hpp" -#include "types.hpp" +#include +#include +#include +#include namespace ingen { + +class Atom; + namespace server { -class BufferFactory; -class Engine; class RunContext; class INGEN_API Buffer diff --git a/src/server/BufferFactory.cpp b/src/server/BufferFactory.cpp index d9847e3a..8d921dab 100644 --- a/src/server/BufferFactory.cpp +++ b/src/server/BufferFactory.cpp @@ -14,13 +14,17 @@ along with Ingen. If not, see . */ +#include "BufferFactory.hpp" + +#include "Buffer.hpp" +#include "Engine.hpp" + #include "ingen/Log.hpp" #include "ingen/URIs.hpp" #include "ingen/World.hpp" +#include "lv2/atom/atom.h" -#include "Buffer.hpp" -#include "BufferFactory.hpp" -#include "Engine.hpp" +#include namespace ingen { namespace server { diff --git a/src/server/BufferFactory.hpp b/src/server/BufferFactory.hpp index e8f05864..eafec0b8 100644 --- a/src/server/BufferFactory.hpp +++ b/src/server/BufferFactory.hpp @@ -17,29 +17,26 @@ #ifndef INGEN_ENGINE_BUFFERFACTORY_HPP #define INGEN_ENGINE_BUFFERFACTORY_HPP -#include -#include -#include - -#include "ingen/Atom.hpp" -#include "ingen/Forge.hpp" #include "ingen/URIs.hpp" #include "ingen/ingen.h" -#include "ingen/types.hpp" -#include "raul/RingBuffer.hpp" +#include "lv2/urid/urid.h" #include "BufferRef.hpp" -#include "PortType.hpp" #include "types.hpp" +#include +#include +#include + namespace Raul { class Maid; } namespace ingen { -class URIs; +class Forge; namespace server { +class Buffer; class Engine; class INGEN_API BufferFactory { diff --git a/src/server/BufferRef.hpp b/src/server/BufferRef.hpp index f3a2ef5c..c168601c 100644 --- a/src/server/BufferRef.hpp +++ b/src/server/BufferRef.hpp @@ -17,10 +17,10 @@ #ifndef INGEN_ENGINE_BUFFER_REF_HPP #define INGEN_ENGINE_BUFFER_REF_HPP -#include - #include "ingen/ingen.h" +#include + namespace ingen { namespace server { diff --git a/src/server/ClientUpdate.cpp b/src/server/ClientUpdate.cpp index 3273c399..26f45ef1 100644 --- a/src/server/ClientUpdate.cpp +++ b/src/server/ClientUpdate.cpp @@ -14,14 +14,27 @@ along with Ingen. If not, see . */ -#include "ingen/Interface.hpp" -#include "ingen/URIs.hpp" +#include "ClientUpdate.hpp" #include "BlockImpl.hpp" #include "BufferFactory.hpp" -#include "ClientUpdate.hpp" #include "GraphImpl.hpp" +#include "PluginImpl.hpp" #include "PortImpl.hpp" +#include "PortType.hpp" + +#include "ingen/Arc.hpp" +#include "ingen/Atom.hpp" +#include "ingen/Forge.hpp" +#include "ingen/Interface.hpp" +#include "ingen/Node.hpp" +#include "ingen/URIs.hpp" +#include "ingen/types.hpp" + +#include +#include +#include +#include namespace ingen { namespace server { diff --git a/src/server/ClientUpdate.hpp b/src/server/ClientUpdate.hpp index 514997a1..57848e62 100644 --- a/src/server/ClientUpdate.hpp +++ b/src/server/ClientUpdate.hpp @@ -17,12 +17,14 @@ #ifndef INGEN_ENGINE_CLIENTUPDATE_HPP #define INGEN_ENGINE_CLIENTUPDATE_HPP -#include -#include - +#include "ingen/Properties.hpp" #include "ingen/Resource.hpp" +#include "ingen/URI.hpp" #include "raul/Path.hpp" +#include +#include + namespace ingen { class Interface; diff --git a/src/server/CompiledGraph.cpp b/src/server/CompiledGraph.cpp index dec5fdaf..1e0c4048 100644 --- a/src/server/CompiledGraph.cpp +++ b/src/server/CompiledGraph.cpp @@ -14,17 +14,22 @@ along with Ingen. If not, see . */ -#include +#include "CompiledGraph.hpp" + +#include "Engine.hpp" +#include "GraphImpl.hpp" +#include "ThreadManager.hpp" #include "ingen/ColorContext.hpp" #include "ingen/Configuration.hpp" #include "ingen/Log.hpp" #include "ingen/World.hpp" -#include "CompiledGraph.hpp" -#include "Engine.hpp" -#include "GraphImpl.hpp" -#include "ThreadManager.hpp" +#include +#include +#include +#include +#include namespace ingen { namespace server { diff --git a/src/server/CompiledGraph.hpp b/src/server/CompiledGraph.hpp index 664fea85..5cf12a10 100644 --- a/src/server/CompiledGraph.hpp +++ b/src/server/CompiledGraph.hpp @@ -17,15 +17,15 @@ #ifndef INGEN_ENGINE_COMPILEDGRAPH_HPP #define INGEN_ENGINE_COMPILEDGRAPH_HPP -#include -#include -#include +#include "Task.hpp" #include "ingen/types.hpp" #include "raul/Maid.hpp" #include "raul/Noncopyable.hpp" -#include "Task.hpp" +#include +#include +#include namespace ingen { namespace server { diff --git a/src/server/ControlBindings.cpp b/src/server/ControlBindings.cpp index 4a38715a..4e40afab 100644 --- a/src/server/ControlBindings.cpp +++ b/src/server/ControlBindings.cpp @@ -14,21 +14,31 @@ along with Ingen. If not, see . */ -#include +#include "ControlBindings.hpp" + +#include "Buffer.hpp" +#include "BufferFactory.hpp" +#include "Engine.hpp" +#include "PortImpl.hpp" +#include "RunContext.hpp" +#include "ThreadManager.hpp" +#include "ingen/Atom.hpp" +#include "ingen/Forge.hpp" #include "ingen/Log.hpp" #include "ingen/URIMap.hpp" #include "ingen/URIs.hpp" #include "ingen/World.hpp" +#include "lv2/atom/atom.h" +#include "lv2/atom/forge.h" #include "lv2/atom/util.h" #include "lv2/midi/midi.h" +#include "lv2/urid/urid.h" +#include "raul/Path.hpp" -#include "Buffer.hpp" -#include "ControlBindings.hpp" -#include "Engine.hpp" -#include "PortImpl.hpp" -#include "RunContext.hpp" -#include "ThreadManager.hpp" +#include +#include +#include namespace ingen { namespace server { diff --git a/src/server/ControlBindings.hpp b/src/server/ControlBindings.hpp index ea170f81..9ac08a7a 100644 --- a/src/server/ControlBindings.hpp +++ b/src/server/ControlBindings.hpp @@ -17,24 +17,30 @@ #ifndef INGEN_ENGINE_CONTROLBINDINGS_HPP #define INGEN_ENGINE_CONTROLBINDINGS_HPP -#include -#include -#include - -#include -#include +#include "BufferRef.hpp" -#include "ingen/Atom.hpp" #include "ingen/types.hpp" #include "lv2/atom/forge.h" #include "raul/Maid.hpp" -#include "raul/Path.hpp" -#include "BufferFactory.hpp" +#include +#include +#include + +#include +#include +#include +#include + +namespace Raul { class Path; } namespace ingen { + +class Atom; + namespace server { +class Buffer; class Engine; class RunContext; class PortImpl; diff --git a/src/server/DirectDriver.hpp b/src/server/DirectDriver.hpp index b3d49af0..945761e6 100644 --- a/src/server/DirectDriver.hpp +++ b/src/server/DirectDriver.hpp @@ -17,11 +17,11 @@ #ifndef INGEN_ENGINE_DIRECT_DRIVER_HPP #define INGEN_ENGINE_DIRECT_DRIVER_HPP -#include - #include "Driver.hpp" #include "Engine.hpp" +#include + namespace ingen { namespace server { diff --git a/src/server/Driver.hpp b/src/server/Driver.hpp index 76040395..4da04a55 100644 --- a/src/server/Driver.hpp +++ b/src/server/Driver.hpp @@ -17,11 +17,11 @@ #ifndef INGEN_ENGINE_DRIVER_HPP #define INGEN_ENGINE_DRIVER_HPP -#include "raul/Noncopyable.hpp" - #include "DuplexPort.hpp" #include "EnginePort.hpp" +#include "raul/Noncopyable.hpp" + namespace Raul { class Path; } namespace ingen { diff --git a/src/server/DuplexPort.cpp b/src/server/DuplexPort.cpp index 2823da05..22c7d29c 100644 --- a/src/server/DuplexPort.cpp +++ b/src/server/DuplexPort.cpp @@ -14,13 +14,27 @@ along with Ingen. If not, see . */ -#include "ingen/URIs.hpp" +#include "DuplexPort.hpp" #include "Buffer.hpp" +#include "BufferFactory.hpp" +#include "BufferRef.hpp" #include "Driver.hpp" -#include "DuplexPort.hpp" #include "Engine.hpp" #include "GraphImpl.hpp" +#include "NodeImpl.hpp" + +#include "ingen/Atom.hpp" +#include "ingen/Forge.hpp" +#include "ingen/Node.hpp" +#include "ingen/Properties.hpp" +#include "ingen/URIs.hpp" +#include "ingen/types.hpp" +#include "raul/Array.hpp" + +#include +#include +#include namespace ingen { namespace server { diff --git a/src/server/DuplexPort.hpp b/src/server/DuplexPort.hpp index 0edd487f..5b2c1e9e 100644 --- a/src/server/DuplexPort.hpp +++ b/src/server/DuplexPort.hpp @@ -17,15 +17,32 @@ #ifndef INGEN_ENGINE_DUPLEXPORT_HPP #define INGEN_ENGINE_DUPLEXPORT_HPP -#include - -#include "BufferRef.hpp" #include "InputPort.hpp" +#include "PortImpl.hpp" +#include "PortType.hpp" +#include "types.hpp" + +#include "ingen/URI.hpp" +#include "lv2/urid/urid.h" + +#include + +#include +#include + +namespace Raul { class Symbol; } namespace ingen { + +class Atom; +class Properties; + namespace server { -class BlockImpl; +class BufferFactory; +class Engine; +class GraphImpl; +class RunContext; /** A duplex Port (both an input and output port on a Graph) * diff --git a/src/server/Engine.cpp b/src/server/Engine.cpp index 5ab5e490..f93c7fe5 100644 --- a/src/server/Engine.cpp +++ b/src/server/Engine.cpp @@ -14,27 +14,7 @@ along with Ingen. If not, see . */ -#include "ingen_config.h" - -#include - -#include -#include - -#include "lv2/buf-size/buf-size.h" -#include "lv2/state/state.h" - -#include "events/CreateGraph.hpp" -#include "ingen/AtomReader.hpp" -#include "ingen/Configuration.hpp" -#include "ingen/Log.hpp" -#include "ingen/Store.hpp" -#include "ingen/StreamWriter.hpp" -#include "ingen/Tee.hpp" -#include "ingen/URIs.hpp" -#include "ingen/World.hpp" -#include "ingen/types.hpp" -#include "raul/Maid.hpp" +#include "Engine.hpp" #include "BlockFactory.hpp" #include "Broadcaster.hpp" @@ -42,22 +22,45 @@ #include "ControlBindings.hpp" #include "DirectDriver.hpp" #include "Driver.hpp" -#include "Engine.hpp" #include "Event.hpp" #include "EventWriter.hpp" #include "GraphImpl.hpp" #include "LV2Options.hpp" #include "PostProcessor.hpp" -#include "PreProcessContext.hpp" #include "PreProcessor.hpp" #include "RunContext.hpp" #include "ThreadManager.hpp" #include "UndoStack.hpp" #include "Worker.hpp" +#include "events/CreateGraph.hpp" +#include "ingen_config.h" + #ifdef HAVE_SOCKET #include "SocketListener.hpp" #endif +#include "ingen/AtomReader.hpp" +#include "ingen/Configuration.hpp" +#include "ingen/Forge.hpp" +#include "ingen/Log.hpp" +#include "ingen/Store.hpp" +#include "ingen/StreamWriter.hpp" +#include "ingen/Tee.hpp" +#include "ingen/URIs.hpp" +#include "ingen/World.hpp" +#include "ingen/types.hpp" +#include "lv2/buf-size/buf-size.h" +#include "lv2/state/state.h" +#include "raul/Maid.hpp" + +#include +#include +#include +#include +#include +#include +#include + namespace ingen { namespace server { diff --git a/src/server/Engine.hpp b/src/server/Engine.hpp index 35030d47..2c2277f8 100644 --- a/src/server/Engine.hpp +++ b/src/server/Engine.hpp @@ -17,10 +17,8 @@ #ifndef INGEN_ENGINE_ENGINE_HPP #define INGEN_ENGINE_ENGINE_HPP -#include -#include -#include -#include +#include "Event.hpp" +#include "Load.hpp" #include "ingen/Clock.hpp" #include "ingen/EngineBase.hpp" @@ -28,8 +26,13 @@ #include "ingen/ingen.h" #include "ingen/types.hpp" -#include "Event.hpp" -#include "Load.hpp" +#include +#include +#include +#include +#include +#include +#include namespace Raul { class Maid; diff --git a/src/server/EnginePort.hpp b/src/server/EnginePort.hpp index 294bf45a..33e0e29c 100644 --- a/src/server/EnginePort.hpp +++ b/src/server/EnginePort.hpp @@ -17,13 +17,13 @@ #ifndef INGEN_ENGINE_ENGINE_PORT_HPP #define INGEN_ENGINE_ENGINE_PORT_HPP +#include "DuplexPort.hpp" + #include "raul/Deletable.hpp" #include "raul/Noncopyable.hpp" #include -#include "DuplexPort.hpp" - namespace ingen { namespace server { diff --git a/src/server/Event.hpp b/src/server/Event.hpp index 9cd97a35..1bd61187 100644 --- a/src/server/Event.hpp +++ b/src/server/Event.hpp @@ -17,18 +17,17 @@ #ifndef INGEN_ENGINE_EVENT_HPP #define INGEN_ENGINE_EVENT_HPP -#include - -#include "raul/Deletable.hpp" -#include "raul/Noncopyable.hpp" -#include "raul/Path.hpp" +#include "types.hpp" #include "ingen/Interface.hpp" #include "ingen/Node.hpp" #include "ingen/Status.hpp" #include "ingen/types.hpp" +#include "raul/Deletable.hpp" +#include "raul/Noncopyable.hpp" +#include "raul/Path.hpp" -#include "types.hpp" +#include namespace ingen { namespace server { diff --git a/src/server/EventWriter.cpp b/src/server/EventWriter.cpp index 695be88e..c7db23ee 100644 --- a/src/server/EventWriter.cpp +++ b/src/server/EventWriter.cpp @@ -14,14 +14,13 @@ along with Ingen. If not, see . */ -#include - -#include "ingen/URIs.hpp" +#include "EventWriter.hpp" #include "Engine.hpp" -#include "EventWriter.hpp" #include "events.hpp" +#include + namespace ingen { namespace server { diff --git a/src/server/EventWriter.hpp b/src/server/EventWriter.hpp index aad15a76..85aa6f70 100644 --- a/src/server/EventWriter.hpp +++ b/src/server/EventWriter.hpp @@ -17,16 +17,14 @@ #ifndef INGEN_ENGINE_EVENTWRITER_HPP #define INGEN_ENGINE_EVENTWRITER_HPP -#include -#include +#include "Event.hpp" +#include "types.hpp" #include "ingen/Interface.hpp" -#include "ingen/Resource.hpp" +#include "ingen/Message.hpp" +#include "ingen/URI.hpp" #include "ingen/types.hpp" -#include "Event.hpp" -#include "types.hpp" - namespace ingen { namespace server { diff --git a/src/server/GraphImpl.cpp b/src/server/GraphImpl.cpp index d2d49119..75f4cc01 100644 --- a/src/server/GraphImpl.cpp +++ b/src/server/GraphImpl.cpp @@ -14,24 +14,28 @@ along with Ingen. If not, see . */ -#include -#include - -#include "ingen/Log.hpp" -#include "ingen/URIs.hpp" -#include "ingen/World.hpp" -#include "raul/Maid.hpp" +#include "GraphImpl.hpp" #include "ArcImpl.hpp" #include "BlockImpl.hpp" #include "BufferFactory.hpp" +#include "CompiledGraph.hpp" #include "DuplexPort.hpp" #include "Engine.hpp" -#include "GraphImpl.hpp" #include "GraphPlugin.hpp" #include "PortImpl.hpp" #include "ThreadManager.hpp" +#include "ingen/Forge.hpp" +#include "ingen/URIs.hpp" +#include "ingen/World.hpp" +#include "raul/Maid.hpp" + +#include +#include +#include +#include + namespace ingen { namespace server { diff --git a/src/server/GraphImpl.hpp b/src/server/GraphImpl.hpp index 384566bf..73724c3f 100644 --- a/src/server/GraphImpl.hpp +++ b/src/server/GraphImpl.hpp @@ -17,21 +17,20 @@ #ifndef INGEN_ENGINE_GRAPHIMPL_HPP #define INGEN_ENGINE_GRAPHIMPL_HPP -#include - -#include "ingen/ingen.h" - #include "BlockImpl.hpp" -#include "CompiledGraph.hpp" #include "DuplexPort.hpp" -#include "PluginImpl.hpp" -#include "PortType.hpp" #include "ThreadManager.hpp" -namespace ingen { +#include "ingen/types.hpp" -class Arc; +#include +#include +#include +#include +namespace raul { class Maid; } + +namespace ingen { namespace server { class ArcImpl; diff --git a/src/server/GraphPlugin.hpp b/src/server/GraphPlugin.hpp index ef741587..89aca7f4 100644 --- a/src/server/GraphPlugin.hpp +++ b/src/server/GraphPlugin.hpp @@ -17,9 +17,10 @@ #ifndef INGEN_ENGINE_GRAPHPLUGIN_HPP #define INGEN_ENGINE_GRAPHPLUGIN_HPP -#include #include "PluginImpl.hpp" +#include + namespace ingen { namespace server { diff --git a/src/server/InputPort.cpp b/src/server/InputPort.cpp index 76382270..093546e1 100644 --- a/src/server/InputPort.cpp +++ b/src/server/InputPort.cpp @@ -14,22 +14,26 @@ along with Ingen. If not, see . */ -#include -#include - -#include "ingen/Log.hpp" -#include "ingen/URIs.hpp" +#include "InputPort.hpp" #include "ArcImpl.hpp" #include "BlockImpl.hpp" #include "Buffer.hpp" #include "BufferFactory.hpp" -#include "Engine.hpp" +#include "BufferRef.hpp" #include "GraphImpl.hpp" -#include "InputPort.hpp" +#include "NodeImpl.hpp" #include "RunContext.hpp" #include "mix.hpp" +#include "ingen/Atom.hpp" +#include "ingen/Node.hpp" +#include "ingen/URIs.hpp" +#include "raul/Array.hpp" + +#include +#include + namespace ingen { namespace server { diff --git a/src/server/InputPort.hpp b/src/server/InputPort.hpp index edb2a3a7..550a787d 100644 --- a/src/server/InputPort.hpp +++ b/src/server/InputPort.hpp @@ -17,21 +17,30 @@ #ifndef INGEN_ENGINE_INPUTPORT_HPP #define INGEN_ENGINE_INPUTPORT_HPP -#include -#include +#include "ArcImpl.hpp" +#include "PortImpl.hpp" +#include "PortType.hpp" +#include "types.hpp" +#include "ingen/types.hpp" +#include "lv2/urid/urid.h" + +#include #include -#include "ingen/types.hpp" +#include +#include -#include "ArcImpl.hpp" -#include "PortImpl.hpp" +namespace Raul { class Symbol; } namespace ingen { + +class Atom; + namespace server { -class ArcImpl; class BlockImpl; +class BufferFactory; class RunContext; /** An input port on a Block or Graph. diff --git a/src/server/InternalBlock.cpp b/src/server/InternalBlock.cpp index cf57e6b2..a1f5b5b1 100644 --- a/src/server/InternalBlock.cpp +++ b/src/server/InternalBlock.cpp @@ -14,12 +14,16 @@ along with Ingen. If not, see . */ +#include "InternalBlock.hpp" + #include "Buffer.hpp" #include "Engine.hpp" -#include "InternalBlock.hpp" #include "InternalPlugin.hpp" #include "PortImpl.hpp" +#include +#include + namespace ingen { namespace server { diff --git a/src/server/InternalPlugin.cpp b/src/server/InternalPlugin.cpp index 49590b24..f7c847b2 100644 --- a/src/server/InternalPlugin.cpp +++ b/src/server/InternalPlugin.cpp @@ -14,15 +14,16 @@ along with Ingen. If not, see . */ -#include "ingen/URIs.hpp" -#include "internals/Controller.hpp" +#include "InternalPlugin.hpp" + +#include "Engine.hpp" #include "internals/BlockDelay.hpp" +#include "internals/Controller.hpp" #include "internals/Note.hpp" #include "internals/Time.hpp" #include "internals/Trigger.hpp" -#include "Engine.hpp" -#include "InternalPlugin.hpp" +#include "ingen/URIs.hpp" namespace ingen { namespace server { diff --git a/src/server/InternalPlugin.hpp b/src/server/InternalPlugin.hpp index a6998040..438e9f2b 100644 --- a/src/server/InternalPlugin.hpp +++ b/src/server/InternalPlugin.hpp @@ -17,6 +17,8 @@ #ifndef INGEN_ENGINE_INTERNALPLUGIN_HPP #define INGEN_ENGINE_INTERNALPLUGIN_HPP +#include "ingen/URI.hpp" +#include "lilv/lilv.h" #include "raul/Symbol.hpp" #include "PluginImpl.hpp" @@ -24,10 +26,15 @@ #define NS_INTERNALS "http://drobilla.net/ns/ingen-internals#" namespace ingen { + +class URIs; + namespace server { class BlockImpl; class BufferFactory; +class Engine; +class GraphImpl; /** Implementation of an Internal plugin. */ diff --git a/src/server/JackDriver.cpp b/src/server/JackDriver.cpp index 6e3ca9d6..537bd855 100644 --- a/src/server/JackDriver.cpp +++ b/src/server/JackDriver.cpp @@ -14,10 +14,25 @@ along with Ingen. If not, see . */ +#include "JackDriver.hpp" + +#include "Buffer.hpp" +#include "DuplexPort.hpp" +#include "Engine.hpp" +#include "GraphImpl.hpp" +#include "PortImpl.hpp" +#include "ThreadManager.hpp" #include "ingen_config.h" +#include "util.hpp" -#include -#include +#include "ingen/Configuration.hpp" +#include "ingen/LV2Features.hpp" +#include "ingen/Log.hpp" +#include "ingen/URI.hpp" +#include "ingen/URIMap.hpp" +#include "ingen/World.hpp" +#include "ingen/fmt.hpp" +#include "lv2/atom/util.h" #include #ifdef INGEN_JACK_SESSION @@ -29,23 +44,13 @@ #include "jackey.h" #endif -#include "ingen/Configuration.hpp" -#include "ingen/LV2Features.hpp" -#include "ingen/Log.hpp" -#include "ingen/URI.hpp" -#include "ingen/URIMap.hpp" -#include "ingen/World.hpp" -#include "ingen/fmt.hpp" -#include "lv2/atom/util.h" - -#include "Buffer.hpp" -#include "DuplexPort.hpp" -#include "Engine.hpp" -#include "GraphImpl.hpp" -#include "JackDriver.hpp" -#include "PortImpl.hpp" -#include "ThreadManager.hpp" -#include "util.hpp" +#include +#include +#include +#include +#include +#include +#include typedef jack_default_audio_sample_t jack_sample_t; diff --git a/src/server/JackDriver.hpp b/src/server/JackDriver.hpp index c9307623..6b64500e 100644 --- a/src/server/JackDriver.hpp +++ b/src/server/JackDriver.hpp @@ -17,10 +17,13 @@ #ifndef INGEN_ENGINE_JACKAUDIODRIVER_HPP #define INGEN_ENGINE_JACKAUDIODRIVER_HPP +#include "Driver.hpp" +#include "EnginePort.hpp" #include "ingen_config.h" -#include -#include +#include "ingen/types.hpp" +#include "lv2/atom/forge.h" +#include "raul/Semaphore.hpp" #include #include @@ -29,12 +32,10 @@ #include #endif -#include "ingen/types.hpp" -#include "lv2/atom/forge.h" -#include "raul/Semaphore.hpp" - -#include "Driver.hpp" -#include "EnginePort.hpp" +#include +#include +#include +#include namespace Raul { class Path; } diff --git a/src/server/LV2Block.cpp b/src/server/LV2Block.cpp index 54280b5e..1e6706dc 100644 --- a/src/server/LV2Block.cpp +++ b/src/server/LV2Block.cpp @@ -14,26 +14,6 @@ along with Ingen. If not, see . */ -#include -#include -#include - -#include "lv2/morph/morph.h" -#include "lv2/presets/presets.h" -#include "lv2/options/options.h" -#include "lv2/resize-port/resize-port.h" -#include "lv2/state/state.h" - -#include "raul/Maid.hpp" -#include "raul/Array.hpp" - -#include "ingen/FilePath.hpp" -#include "ingen/Log.hpp" -#include "ingen/URI.hpp" -#include "ingen/URIMap.hpp" -#include "ingen/URIs.hpp" -#include "ingen/World.hpp" - #include "Buffer.hpp" #include "Engine.hpp" #include "GraphImpl.hpp" @@ -45,6 +25,25 @@ #include "RunContext.hpp" #include "Worker.hpp" +#include "ingen/FilePath.hpp" +#include "ingen/Forge.hpp" +#include "ingen/Log.hpp" +#include "ingen/URI.hpp" +#include "ingen/URIMap.hpp" +#include "ingen/URIs.hpp" +#include "ingen/World.hpp" +#include "lv2/options/options.h" +#include "lv2/state/state.h" +#include "raul/Array.hpp" +#include "raul/Maid.hpp" + +#include +#include +#include +#include +#include +#include + namespace ingen { namespace server { diff --git a/src/server/LV2Block.hpp b/src/server/LV2Block.hpp index 912d84b1..9c99126d 100644 --- a/src/server/LV2Block.hpp +++ b/src/server/LV2Block.hpp @@ -17,16 +17,23 @@ #ifndef INGEN_ENGINE_LV2BLOCK_HPP #define INGEN_ENGINE_LV2BLOCK_HPP -#include +#include "BufferRef.hpp" +#include "BlockImpl.hpp" +#include "types.hpp" +#include "ingen/LV2Features.hpp" #include "lilv/lilv.h" #include "lv2/worker/worker.h" +#include "raul/Array.hpp" #include "raul/Maid.hpp" +#include "raul/Noncopyable.hpp" -#include "BufferRef.hpp" -#include "BlockImpl.hpp" -#include "ingen/LV2Features.hpp" -#include "types.hpp" +#include + +#include +#include +#include +#include namespace ingen { namespace server { diff --git a/src/server/LV2Plugin.cpp b/src/server/LV2Plugin.cpp index 9152ab99..3411fef8 100644 --- a/src/server/LV2Plugin.cpp +++ b/src/server/LV2Plugin.cpp @@ -14,17 +14,18 @@ along with Ingen. If not, see . */ -#include +#include "LV2Plugin.hpp" + +#include "Engine.hpp" +#include "LV2Block.hpp" #include "ingen/Forge.hpp" #include "ingen/Log.hpp" #include "ingen/URIs.hpp" #include "ingen/World.hpp" -#include "lv2/presets/presets.h" -#include "Engine.hpp" -#include "LV2Block.hpp" -#include "LV2Plugin.hpp" +#include +#include namespace ingen { namespace server { diff --git a/src/server/LV2Plugin.hpp b/src/server/LV2Plugin.hpp index da4ce23c..f8cf1dc8 100644 --- a/src/server/LV2Plugin.hpp +++ b/src/server/LV2Plugin.hpp @@ -17,12 +17,11 @@ #ifndef INGEN_ENGINE_LV2PLUGIN_HPP #define INGEN_ENGINE_LV2PLUGIN_HPP -#include +#include "PluginImpl.hpp" -#include "ingen/types.hpp" +#include "ingen/URI.hpp" #include "lilv/lilv.h" - -#include "PluginImpl.hpp" +#include "raul/Symbol.hpp" namespace ingen { @@ -30,8 +29,10 @@ class World; namespace server { -class GraphImpl; class BlockImpl; +class BufferFactory; +class Engine; +class GraphImpl; /** Implementation of an LV2 plugin (loaded shared library). */ diff --git a/src/server/LV2ResizeFeature.hpp b/src/server/LV2ResizeFeature.hpp index 24ac7cd4..1bd93ee0 100644 --- a/src/server/LV2ResizeFeature.hpp +++ b/src/server/LV2ResizeFeature.hpp @@ -17,13 +17,13 @@ #ifndef INGEN_ENGINE_LV2RESIZEFEATURE_HPP #define INGEN_ENGINE_LV2RESIZEFEATURE_HPP -#include "ingen/LV2Features.hpp" -#include "lv2/resize-port/resize-port.h" - #include "BlockImpl.hpp" #include "Buffer.hpp" #include "PortImpl.hpp" +#include "ingen/LV2Features.hpp" +#include "lv2/resize-port/resize-port.h" + namespace ingen { namespace server { diff --git a/src/server/Load.hpp b/src/server/Load.hpp index b94a8fed..2d806684 100644 --- a/src/server/Load.hpp +++ b/src/server/Load.hpp @@ -17,6 +17,10 @@ #ifndef INGEN_ENGINE_LOAD_HPP #define INGEN_ENGINE_LOAD_HPP +#include +#include +#include + namespace ingen { namespace server { diff --git a/src/server/NodeImpl.cpp b/src/server/NodeImpl.cpp index a28d7baf..47d4a990 100644 --- a/src/server/NodeImpl.cpp +++ b/src/server/NodeImpl.cpp @@ -14,10 +14,21 @@ along with Ingen. If not, see . */ -#include "GraphImpl.hpp" #include "NodeImpl.hpp" + +#include "BlockImpl.hpp" +#include "GraphImpl.hpp" #include "ThreadManager.hpp" +#include "ingen/Atom.hpp" +#include "ingen/Properties.hpp" +#include "raul/Path.hpp" + +#include +#include + +namespace Raul { class Symbol; } + namespace ingen { namespace server { diff --git a/src/server/NodeImpl.hpp b/src/server/NodeImpl.hpp index 0ac889e0..1b73e792 100644 --- a/src/server/NodeImpl.hpp +++ b/src/server/NodeImpl.hpp @@ -17,19 +17,17 @@ #ifndef INGEN_ENGINE_NODEIMPL_HPP #define INGEN_ENGINE_NODEIMPL_HPP -#include -#include -#include - #include "ingen/Node.hpp" -#include "ingen/Resource.hpp" -#include "raul/Deletable.hpp" +#include "ingen/URI.hpp" +#include "ingen/paths.hpp" #include "raul/Path.hpp" +#include "raul/Symbol.hpp" -namespace Raul { class Maid; } +#include namespace ingen { +class Atom; class URIs; namespace server { diff --git a/src/server/PluginImpl.hpp b/src/server/PluginImpl.hpp index fd1fcc66..6ef6fe22 100644 --- a/src/server/PluginImpl.hpp +++ b/src/server/PluginImpl.hpp @@ -17,11 +17,11 @@ #ifndef INGEN_ENGINE_PLUGINIMPL_HPP #define INGEN_ENGINE_PLUGINIMPL_HPP -#include - #include "ingen/Resource.hpp" #include "raul/Symbol.hpp" +#include + namespace ingen { class URIs; diff --git a/src/server/PortAudioDriver.cpp b/src/server/PortAudioDriver.cpp index 2bc230a4..38b04842 100644 --- a/src/server/PortAudioDriver.cpp +++ b/src/server/PortAudioDriver.cpp @@ -14,29 +14,23 @@ along with Ingen. If not, see . */ -#include "ingen_config.h" - -#include -#include - -#include - -#include "ingen/Configuration.hpp" -#include "ingen/LV2Features.hpp" -#include "ingen/Log.hpp" -#include "ingen/URIMap.hpp" -#include "ingen/World.hpp" -#include "lv2/atom/util.h" - -#include "Buffer.hpp" #include "DuplexPort.hpp" #include "Engine.hpp" -#include "GraphImpl.hpp" -#include "PortAudioDriver.hpp" -#include "PortImpl.hpp" #include "FrameTimer.hpp" -#include "ThreadManager.hpp" -#include "util.hpp" +#include "PortAudioDriver.hpp" +#include "PortType.hpp" +#include "RunContext.hpp" +#include "ingen/Atom.hpp" +#include "ingen/Configuration.hpp" +#include "ingen/URIs.hpp" +#include "ingen/World.hpp" +#include "raul/Path.hpp" + +#include + +#include +#include +#include namespace ingen { namespace server { diff --git a/src/server/PortAudioDriver.hpp b/src/server/PortAudioDriver.hpp index e50cc8a6..f65fc871 100644 --- a/src/server/PortAudioDriver.hpp +++ b/src/server/PortAudioDriver.hpp @@ -17,32 +17,35 @@ #ifndef INGEN_ENGINE_PORTAUDIODRIVER_HPP #define INGEN_ENGINE_PORTAUDIODRIVER_HPP +#include "Driver.hpp" +#include "EnginePort.hpp" #include "ingen_config.h" +#include "types.hpp" -#include -#include -#include - -#include - +#include "ingen/URI.hpp" +#include "lv2/atom/forge.h" #include "raul/Semaphore.hpp" -#include "lv2/atom/forge.h" +#include -#include "Driver.hpp" -#include "EnginePort.hpp" +#include +#include +#include +#include namespace Raul { class Path; } namespace ingen { + +class Atom; + namespace server { +class Buffer; class DuplexPort; class Engine; -class GraphImpl; -class PortAudioDriver; -class PortImpl; class FrameTimer; +class RunContext; class PortAudioDriver : public Driver { diff --git a/src/server/PortImpl.cpp b/src/server/PortImpl.cpp index 00676a8a..604836cd 100644 --- a/src/server/PortImpl.cpp +++ b/src/server/PortImpl.cpp @@ -14,20 +14,27 @@ along with Ingen. If not, see . */ -#include "ingen/URIs.hpp" -#include "ingen/World.hpp" -#include "lv2/atom/util.h" -#include "raul/Array.hpp" -#include "raul/Maid.hpp" +#include "PortImpl.hpp" #include "BlockImpl.hpp" #include "Buffer.hpp" #include "BufferFactory.hpp" #include "Engine.hpp" -#include "PortImpl.hpp" #include "PortType.hpp" #include "ThreadManager.hpp" +#include "ingen/Forge.hpp" +#include "ingen/URIs.hpp" +#include "ingen/World.hpp" +#include "lv2/atom/util.h" +#include "raul/Array.hpp" +#include "raul/Maid.hpp" + +#include +#include +#include +#include + namespace ingen { namespace server { diff --git a/src/server/PortImpl.hpp b/src/server/PortImpl.hpp index d9b81a16..2fb377b0 100644 --- a/src/server/PortImpl.hpp +++ b/src/server/PortImpl.hpp @@ -17,25 +17,23 @@ #ifndef INGEN_ENGINE_PORTIMPL_HPP #define INGEN_ENGINE_PORTIMPL_HPP -#include - -#include "ingen/Atom.hpp" -#include "raul/Array.hpp" - #include "BufferRef.hpp" #include "NodeImpl.hpp" #include "PortType.hpp" #include "RunContext.hpp" #include "types.hpp" -namespace Raul { class Maid; } +#include "ingen/Atom.hpp" +#include "raul/Array.hpp" + +#include +#include +#include namespace ingen { namespace server { class BlockImpl; -class BufferFactory; -class RunContext; /** A port (input or output) on a Block. * diff --git a/src/server/PortType.hpp b/src/server/PortType.hpp index d5fd0238..c711ad79 100644 --- a/src/server/PortType.hpp +++ b/src/server/PortType.hpp @@ -17,11 +17,11 @@ #ifndef INGEN_INTERFACE_PORTTYPE_HPP #define INGEN_INTERFACE_PORTTYPE_HPP -#include - #include "lv2/atom/atom.h" #include "lv2/core/lv2.h" +#include + namespace ingen { /** The type of a port. diff --git a/src/server/PostProcessor.cpp b/src/server/PostProcessor.cpp index 70be6f7b..6edafa7f 100644 --- a/src/server/PostProcessor.cpp +++ b/src/server/PostProcessor.cpp @@ -14,16 +14,18 @@ along with Ingen. If not, see . */ -#include +#include "PostProcessor.hpp" #include "Engine.hpp" #include "Event.hpp" -#include "PostProcessor.hpp" -#include "RunContext.hpp" + +#include namespace ingen { namespace server { +class PreProcessContext; + class Sentinel : public Event { public: Sentinel(Engine& engine) : Event(engine) {} diff --git a/src/server/PostProcessor.hpp b/src/server/PostProcessor.hpp index affb343f..2733b209 100644 --- a/src/server/PostProcessor.hpp +++ b/src/server/PostProcessor.hpp @@ -17,11 +17,11 @@ #ifndef INGEN_ENGINE_POSTPROCESSOR_HPP #define INGEN_ENGINE_POSTPROCESSOR_HPP -#include +#include "types.hpp" #include "ingen/ingen.h" -#include "types.hpp" +#include namespace ingen { namespace server { diff --git a/src/server/PreProcessContext.hpp b/src/server/PreProcessContext.hpp index 1cfa1931..1d4b428a 100644 --- a/src/server/PreProcessContext.hpp +++ b/src/server/PreProcessContext.hpp @@ -17,10 +17,11 @@ #ifndef INGEN_ENGINE_PREPROCESSCONTEXT_HPP #define INGEN_ENGINE_PREPROCESSCONTEXT_HPP -#include - +#include "CompiledGraph.hpp" #include "GraphImpl.hpp" +#include + namespace Raul { class Maid; } namespace ingen { diff --git a/src/server/PreProcessor.cpp b/src/server/PreProcessor.cpp index 55f5de8e..14f8e241 100644 --- a/src/server/PreProcessor.cpp +++ b/src/server/PreProcessor.cpp @@ -14,22 +14,24 @@ along with Ingen. If not, see . */ -#include - -#include "ingen/AtomSink.hpp" -#include "ingen/AtomWriter.hpp" -#include "ingen/Configuration.hpp" -#include "ingen/World.hpp" +#include "PreProcessor.hpp" #include "Engine.hpp" #include "Event.hpp" #include "PostProcessor.hpp" #include "PreProcessContext.hpp" -#include "PreProcessor.hpp" #include "RunContext.hpp" #include "ThreadManager.hpp" #include "UndoStack.hpp" +#include "ingen/AtomWriter.hpp" +#include "ingen/Configuration.hpp" +#include "ingen/World.hpp" + +#include +#include +#include + namespace ingen { namespace server { diff --git a/src/server/PreProcessor.hpp b/src/server/PreProcessor.hpp index 9ee20255..8d15c0a6 100644 --- a/src/server/PreProcessor.hpp +++ b/src/server/PreProcessor.hpp @@ -17,17 +17,20 @@ #ifndef INGEN_ENGINE_PREPROCESSOR_HPP #define INGEN_ENGINE_PREPROCESSOR_HPP -#include -#include -#include +#include "Event.hpp" #include "raul/Semaphore.hpp" +#include +#include +#include +#include +#include + namespace ingen { namespace server { class Engine; -class Event; class PostProcessor; class RunContext; diff --git a/src/server/RunContext.cpp b/src/server/RunContext.cpp index 7087b5ab..0eabb1ee 100644 --- a/src/server/RunContext.cpp +++ b/src/server/RunContext.cpp @@ -14,17 +14,25 @@ along with Ingen. If not, see . */ -#include "ingen/Forge.hpp" -#include "ingen/Log.hpp" -#include "ingen/URIMap.hpp" +#include "RunContext.hpp" #include "Broadcaster.hpp" #include "BufferFactory.hpp" #include "Engine.hpp" #include "PortImpl.hpp" -#include "RunContext.hpp" #include "Task.hpp" +#include "ingen/Forge.hpp" +#include "ingen/Log.hpp" +#include "ingen/URIMap.hpp" +#include "ingen/World.hpp" +#include "raul/RingBuffer.hpp" + +#include +#include +#include +#include + namespace ingen { namespace server { diff --git a/src/server/RunContext.hpp b/src/server/RunContext.hpp index 3a317af3..9190d172 100644 --- a/src/server/RunContext.hpp +++ b/src/server/RunContext.hpp @@ -17,14 +17,14 @@ #ifndef INGEN_ENGINE_RUNCONTEXT_HPP #define INGEN_ENGINE_RUNCONTEXT_HPP -#include -#include +#include "ingen/types.hpp" +#include "types.hpp" #include "lv2/urid/urid.h" #include "raul/RingBuffer.hpp" -#include "ingen/types.hpp" -#include "types.hpp" +#include +#include namespace ingen { namespace server { diff --git a/src/server/SocketListener.cpp b/src/server/SocketListener.cpp index 849adcad..76596e55 100644 --- a/src/server/SocketListener.cpp +++ b/src/server/SocketListener.cpp @@ -14,27 +14,27 @@ along with Ingen. If not, see . */ -#include -#include -#include -#include +#include "SocketListener.hpp" -#include -#include -#include -#include +#include "SocketServer.hpp" +#include "../server/Engine.hpp" #include "ingen/Configuration.hpp" #include "ingen/Log.hpp" -#include "ingen/Module.hpp" #include "ingen/World.hpp" #include "raul/Socket.hpp" -#include "../server/Engine.hpp" -#include "../server/EventWriter.hpp" - -#include "SocketListener.hpp" -#include "SocketServer.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace ingen { namespace server { diff --git a/src/server/SocketListener.hpp b/src/server/SocketListener.hpp index b3b5931e..21070c23 100644 --- a/src/server/SocketListener.hpp +++ b/src/server/SocketListener.hpp @@ -14,11 +14,11 @@ along with Ingen. If not, see . */ +#include "raul/Socket.hpp" + #include #include -#include "raul/Socket.hpp" - namespace ingen { namespace server { diff --git a/src/server/SocketServer.hpp b/src/server/SocketServer.hpp index bd285e6e..f3f02a26 100644 --- a/src/server/SocketServer.hpp +++ b/src/server/SocketServer.hpp @@ -17,14 +17,18 @@ #ifndef INGEN_SERVER_SOCKET_SERVER_HPP #define INGEN_SERVER_SOCKET_SERVER_HPP +#include "EventWriter.hpp" + +#include "Engine.hpp" + +#include "ingen/Configuration.hpp" #include "ingen/SocketReader.hpp" #include "ingen/SocketWriter.hpp" #include "ingen/StreamWriter.hpp" #include "ingen/Tee.hpp" +#include "ingen/World.hpp" #include "raul/Socket.hpp" -#include "EventWriter.hpp" - namespace ingen { namespace server { diff --git a/src/server/Task.cpp b/src/server/Task.cpp index 63f3ef34..0d76a43f 100644 --- a/src/server/Task.cpp +++ b/src/server/Task.cpp @@ -14,9 +14,15 @@ along with Ingen. If not, see . */ -#include "BlockImpl.hpp" #include "Task.hpp" +#include "BlockImpl.hpp" +#include "RunContext.hpp" + +#include "raul/Path.hpp" + +#include + namespace ingen { namespace server { diff --git a/src/server/Task.hpp b/src/server/Task.hpp index 97a6101c..a2e3e86a 100644 --- a/src/server/Task.hpp +++ b/src/server/Task.hpp @@ -22,7 +22,8 @@ #include #include #include -#include +#include +#include namespace ingen { namespace server { diff --git a/src/server/ThreadManager.hpp b/src/server/ThreadManager.hpp index bf14a423..17f2c6ff 100644 --- a/src/server/ThreadManager.hpp +++ b/src/server/ThreadManager.hpp @@ -17,11 +17,11 @@ #ifndef INGEN_ENGINE_THREADMANAGER_HPP #define INGEN_ENGINE_THREADMANAGER_HPP -#include +#include "util.hpp" #include "ingen/ingen.h" -#include "util.hpp" +#include namespace ingen { namespace server { diff --git a/src/server/UndoStack.cpp b/src/server/UndoStack.cpp index 77b4706f..fc5c1bf6 100644 --- a/src/server/UndoStack.cpp +++ b/src/server/UndoStack.cpp @@ -14,16 +14,20 @@ along with Ingen. If not, see . */ -#include +#include "UndoStack.hpp" #include "ingen/URIMap.hpp" #include "ingen/URIs.hpp" +#include "lv2/atom/atom.h" #include "lv2/atom/util.h" #include "lv2/patch/patch.h" +#include "lv2/urid/urid.h" #include "serd/serd.h" #include "sratom/sratom.h" -#include "UndoStack.hpp" +#include +#include +#include #define NS_RDF (const uint8_t*)"http://www.w3.org/1999/02/22-rdf-syntax-ns#" diff --git a/src/server/UndoStack.hpp b/src/server/UndoStack.hpp index 6f0ac192..04021b99 100644 --- a/src/server/UndoStack.hpp +++ b/src/server/UndoStack.hpp @@ -17,15 +17,20 @@ #ifndef INGEN_ENGINE_UNDOSTACK_HPP #define INGEN_ENGINE_UNDOSTACK_HPP -#include -#include - #include "ingen/AtomSink.hpp" #include "ingen/ingen.h" #include "lv2/atom/atom.h" +#include "lv2/atom/util.h" #include "serd/serd.h" #include "sratom/sratom.h" +#include +#include +#include +#include +#include +#include + namespace ingen { class URIMap; diff --git a/src/server/Worker.cpp b/src/server/Worker.cpp index 65ce7727..67200365 100644 --- a/src/server/Worker.cpp +++ b/src/server/Worker.cpp @@ -14,14 +14,16 @@ along with Ingen. If not, see . */ -#include "ingen/LV2Features.hpp" -#include "ingen/Log.hpp" -#include "lv2/worker/worker.h" +#include "Worker.hpp" #include "Engine.hpp" #include "GraphImpl.hpp" #include "LV2Block.hpp" -#include "Worker.hpp" + +#include "ingen/Log.hpp" +#include "lv2/worker/worker.h" + +#include namespace ingen { namespace server { diff --git a/src/server/Worker.hpp b/src/server/Worker.hpp index cea6ee62..2e4a965f 100644 --- a/src/server/Worker.hpp +++ b/src/server/Worker.hpp @@ -17,14 +17,15 @@ #ifndef INGEN_ENGINE_WORKER_HPP #define INGEN_ENGINE_WORKER_HPP -#include - #include "ingen/LV2Features.hpp" #include "ingen/types.hpp" #include "lv2/worker/worker.h" #include "raul/RingBuffer.hpp" #include "raul/Semaphore.hpp" +#include +#include + namespace ingen { class Log; diff --git a/src/server/events/Connect.cpp b/src/server/events/Connect.cpp index 99a90a49..1ce8f5a1 100644 --- a/src/server/events/Connect.cpp +++ b/src/server/events/Connect.cpp @@ -14,14 +14,11 @@ along with Ingen. If not, see . */ -#include "ingen/Store.hpp" -#include "raul/Maid.hpp" -#include "raul/Path.hpp" +#include "Connect.hpp" #include "ArcImpl.hpp" #include "Broadcaster.hpp" #include "BufferFactory.hpp" -#include "Connect.hpp" #include "Engine.hpp" #include "GraphImpl.hpp" #include "InputPort.hpp" @@ -30,6 +27,13 @@ #include "internals/BlockDelay.hpp" #include "types.hpp" +#include "ingen/Store.hpp" +#include "raul/Maid.hpp" + +#include +#include +#include + namespace ingen { namespace server { namespace events { diff --git a/src/server/events/Connect.hpp b/src/server/events/Connect.hpp index 16ea8bc9..625fa39d 100644 --- a/src/server/events/Connect.hpp +++ b/src/server/events/Connect.hpp @@ -17,17 +17,11 @@ #ifndef INGEN_EVENTS_CONNECT_HPP #define INGEN_EVENTS_CONNECT_HPP -#include "raul/Path.hpp" - #include "CompiledGraph.hpp" #include "Event.hpp" #include "PortImpl.hpp" #include "types.hpp" -namespace Raul { -template class Array; -} - namespace ingen { namespace server { diff --git a/src/server/events/Copy.cpp b/src/server/events/Copy.cpp index 8c23568b..9fa3deed 100644 --- a/src/server/events/Copy.cpp +++ b/src/server/events/Copy.cpp @@ -14,18 +14,23 @@ along with Ingen. If not, see . */ -#include "ingen/Parser.hpp" -#include "ingen/Serialiser.hpp" -#include "ingen/Store.hpp" -#include "raul/Path.hpp" +#include "events/Copy.hpp" #include "BlockImpl.hpp" #include "Broadcaster.hpp" #include "Engine.hpp" -#include "EnginePort.hpp" #include "GraphImpl.hpp" #include "PreProcessContext.hpp" -#include "events/Copy.hpp" + +#include "ingen/Parser.hpp" +#include "ingen/Serialiser.hpp" +#include "ingen/Store.hpp" +#include "ingen/World.hpp" +#include "raul/Path.hpp" + +#include +#include +#include namespace ingen { namespace server { diff --git a/src/server/events/Copy.hpp b/src/server/events/Copy.hpp index f31fe4d4..86a95e9c 100644 --- a/src/server/events/Copy.hpp +++ b/src/server/events/Copy.hpp @@ -17,11 +17,6 @@ #ifndef INGEN_EVENTS_COPY_HPP #define INGEN_EVENTS_COPY_HPP -#include - -#include "ingen/Store.hpp" -#include "raul/Path.hpp" - #include "CompiledGraph.hpp" #include "Event.hpp" @@ -29,6 +24,7 @@ namespace ingen { namespace server { class BlockImpl; +class Engine; class GraphImpl; namespace events { diff --git a/src/server/events/CreateBlock.cpp b/src/server/events/CreateBlock.cpp index c193a8b5..e1991b5f 100644 --- a/src/server/events/CreateBlock.cpp +++ b/src/server/events/CreateBlock.cpp @@ -14,23 +14,26 @@ along with Ingen. If not, see . */ -#include "ingen/Forge.hpp" -#include "ingen/Store.hpp" -#include "ingen/URIs.hpp" -#include "raul/Maid.hpp" -#include "raul/Path.hpp" +#include "CreateBlock.hpp" #include "BlockFactory.hpp" #include "BlockImpl.hpp" #include "Broadcaster.hpp" -#include "CreateBlock.hpp" #include "Engine.hpp" #include "GraphImpl.hpp" #include "PluginImpl.hpp" -#include "PortImpl.hpp" #include "PreProcessContext.hpp" #include "LV2Block.hpp" +#include "ingen/Forge.hpp" +#include "ingen/Store.hpp" +#include "ingen/URIs.hpp" +#include "ingen/World.hpp" +#include "raul/Maid.hpp" +#include "raul/Path.hpp" + +#include + namespace ingen { namespace server { namespace events { diff --git a/src/server/events/CreateBlock.hpp b/src/server/events/CreateBlock.hpp index 02bfeda7..bf34f6e2 100644 --- a/src/server/events/CreateBlock.hpp +++ b/src/server/events/CreateBlock.hpp @@ -17,12 +17,12 @@ #ifndef INGEN_EVENTS_CREATEBLOCK_HPP #define INGEN_EVENTS_CREATEBLOCK_HPP -#include "ingen/Resource.hpp" - #include "ClientUpdate.hpp" #include "CompiledGraph.hpp" #include "Event.hpp" +#include + namespace ingen { namespace server { diff --git a/src/server/events/CreateGraph.cpp b/src/server/events/CreateGraph.cpp index 5bb66a46..e2dffc61 100644 --- a/src/server/events/CreateGraph.cpp +++ b/src/server/events/CreateGraph.cpp @@ -14,19 +14,23 @@ along with Ingen. If not, see . */ -#include "ingen/Forge.hpp" -#include "ingen/Store.hpp" -#include "ingen/URIs.hpp" -#include "raul/Maid.hpp" -#include "raul/Path.hpp" +#include "events/CreateGraph.hpp" #include "Broadcaster.hpp" #include "Engine.hpp" #include "GraphImpl.hpp" #include "PreProcessContext.hpp" -#include "events/CreateGraph.hpp" #include "events/CreatePort.hpp" +#include "ingen/Forge.hpp" +#include "ingen/Store.hpp" +#include "ingen/URIs.hpp" +#include "ingen/World.hpp" +#include "raul/Maid.hpp" +#include "raul/Path.hpp" + +#include + namespace ingen { namespace server { namespace events { diff --git a/src/server/events/CreateGraph.hpp b/src/server/events/CreateGraph.hpp index 565a3278..6ea07957 100644 --- a/src/server/events/CreateGraph.hpp +++ b/src/server/events/CreateGraph.hpp @@ -17,14 +17,14 @@ #ifndef INGEN_EVENTS_CREATEGRAPH_HPP #define INGEN_EVENTS_CREATEGRAPH_HPP -#include +#include "ClientUpdate.hpp" +#include "CompiledGraph.hpp" +#include "Event.hpp" -#include "ingen/Resource.hpp" #include "ingen/types.hpp" -#include "CompiledGraph.hpp" -#include "Event.hpp" -#include "events/Get.hpp" +#include +#include namespace ingen { namespace server { diff --git a/src/server/events/CreatePort.cpp b/src/server/events/CreatePort.cpp index c27a8ac6..f463eb4f 100644 --- a/src/server/events/CreatePort.cpp +++ b/src/server/events/CreatePort.cpp @@ -14,24 +14,28 @@ along with Ingen. If not, see . */ -#include - -#include "ingen/Atom.hpp" -#include "ingen/Store.hpp" -#include "ingen/URIMap.hpp" -#include "ingen/URIs.hpp" -#include "raul/Array.hpp" -#include "raul/Path.hpp" +#include "CreatePort.hpp" #include "Broadcaster.hpp" #include "BufferFactory.hpp" -#include "CreatePort.hpp" #include "Driver.hpp" #include "DuplexPort.hpp" #include "Engine.hpp" #include "GraphImpl.hpp" #include "PortImpl.hpp" +#include "ingen/Atom.hpp" +#include "ingen/Forge.hpp" +#include "ingen/Store.hpp" +#include "ingen/URIMap.hpp" +#include "ingen/URIs.hpp" +#include "ingen/World.hpp" +#include "raul/Array.hpp" +#include "raul/Path.hpp" + +#include +#include + namespace ingen { namespace server { namespace events { diff --git a/src/server/events/CreatePort.hpp b/src/server/events/CreatePort.hpp index 6c760d29..9c5bb396 100644 --- a/src/server/events/CreatePort.hpp +++ b/src/server/events/CreatePort.hpp @@ -17,16 +17,16 @@ #ifndef INGEN_EVENTS_CREATEPORT_HPP #define INGEN_EVENTS_CREATEPORT_HPP -#include +#include "BlockImpl.hpp" +#include "Event.hpp" +#include "PortType.hpp" -#include "ingen/Resource.hpp" #include "lv2/urid/urid.h" -#include "raul/Array.hpp" #include "raul/Path.hpp" -#include "BlockImpl.hpp" -#include "Event.hpp" -#include "PortType.hpp" +#include + +#include namespace ingen { namespace server { @@ -34,7 +34,6 @@ namespace server { class DuplexPort; class EnginePort; class GraphImpl; -class PortImpl; namespace events { diff --git a/src/server/events/Delete.cpp b/src/server/events/Delete.cpp index f6168c9c..0b46f3f4 100644 --- a/src/server/events/Delete.cpp +++ b/src/server/events/Delete.cpp @@ -14,23 +14,31 @@ along with Ingen. If not, see . */ -#include "ingen/Store.hpp" -#include "raul/Maid.hpp" -#include "raul/Path.hpp" +#include "Delete.hpp" #include "BlockImpl.hpp" #include "Broadcaster.hpp" +#include "BufferFactory.hpp" #include "ControlBindings.hpp" -#include "Delete.hpp" #include "DisconnectAll.hpp" #include "Driver.hpp" #include "Engine.hpp" #include "EnginePort.hpp" #include "GraphImpl.hpp" -#include "PluginImpl.hpp" #include "PortImpl.hpp" #include "PreProcessContext.hpp" +#include "ingen/Forge.hpp" +#include "ingen/Store.hpp" +#include "ingen/World.hpp" +#include "raul/Maid.hpp" +#include "raul/Path.hpp" + +#include +#include +#include +#include + namespace ingen { namespace server { namespace events { diff --git a/src/server/events/Delete.hpp b/src/server/events/Delete.hpp index 4925a856..14acac83 100644 --- a/src/server/events/Delete.hpp +++ b/src/server/events/Delete.hpp @@ -17,27 +17,23 @@ #ifndef INGEN_EVENTS_DELETE_HPP #define INGEN_EVENTS_DELETE_HPP -#include -#include - -#include "ingen/Store.hpp" - -#include "CompiledGraph.hpp" #include "ControlBindings.hpp" #include "Event.hpp" #include "GraphImpl.hpp" -namespace Raul { -template class Array; -} +#include "ingen/Store.hpp" + +#include +#include +#include +#include namespace ingen { namespace server { -class BlockImpl; +class CompiledGraph; class DuplexPort; class EnginePort; -class PortImpl; namespace events { diff --git a/src/server/events/Delta.cpp b/src/server/events/Delta.cpp index 982b1141..f5928c12 100644 --- a/src/server/events/Delta.cpp +++ b/src/server/events/Delta.cpp @@ -14,30 +14,38 @@ along with Ingen. If not, see . */ -#include -#include - -#include "ingen/Log.hpp" -#include "ingen/Store.hpp" -#include "ingen/URIs.hpp" -#include "raul/Maid.hpp" +#include "Delta.hpp" #include "Broadcaster.hpp" #include "ControlBindings.hpp" #include "CreateBlock.hpp" #include "CreateGraph.hpp" #include "CreatePort.hpp" -#include "Delta.hpp" #include "Engine.hpp" #include "GraphImpl.hpp" #include "PluginImpl.hpp" #include "PortImpl.hpp" #include "PortType.hpp" #include "SetPortValue.hpp" -#include "events/Get.hpp" + +#include "ingen/Forge.hpp" +#include "ingen/Log.hpp" +#include "ingen/Store.hpp" +#include "ingen/URIs.hpp" +#include "ingen/World.hpp" +#include "raul/Maid.hpp" + +#include +#include +#include +#include +#include namespace ingen { namespace server { + +class PreProcessContext; + namespace events { Delta::Delta(Engine& engine, diff --git a/src/server/events/Delta.hpp b/src/server/events/Delta.hpp index 0fda067a..dcc265f8 100644 --- a/src/server/events/Delta.hpp +++ b/src/server/events/Delta.hpp @@ -17,23 +17,22 @@ #ifndef INGEN_EVENTS_DELTA_HPP #define INGEN_EVENTS_DELTA_HPP -#include - -#include - -#include "lilv/lilv.h" - -#include "CompiledGraph.hpp" +#include "ClientUpdate.hpp" #include "ControlBindings.hpp" #include "Event.hpp" -#include "PluginImpl.hpp" -namespace ingen { +#include "lilv/lilv.h" -class Resource; +#include +#include +#include +#include + +namespace ingen { namespace server { +class CompiledGraph; class Engine; class GraphImpl; class RunContext; diff --git a/src/server/events/Disconnect.cpp b/src/server/events/Disconnect.cpp index 3abf23e4..349fb6ae 100644 --- a/src/server/events/Disconnect.cpp +++ b/src/server/events/Disconnect.cpp @@ -14,11 +14,7 @@ along with Ingen. If not, see . */ -#include - -#include "ingen/Store.hpp" -#include "raul/Maid.hpp" -#include "raul/Path.hpp" +#include "events/Disconnect.hpp" #include "ArcImpl.hpp" #include "Broadcaster.hpp" @@ -31,7 +27,17 @@ #include "PreProcessContext.hpp" #include "RunContext.hpp" #include "ThreadManager.hpp" -#include "events/Disconnect.hpp" + +#include "ingen/Store.hpp" +#include "raul/Maid.hpp" +#include "raul/Path.hpp" + +#include +#include +#include +#include +#include +#include namespace ingen { namespace server { diff --git a/src/server/events/Disconnect.hpp b/src/server/events/Disconnect.hpp index 566a7721..15872ba5 100644 --- a/src/server/events/Disconnect.hpp +++ b/src/server/events/Disconnect.hpp @@ -17,23 +17,16 @@ #ifndef INGEN_EVENTS_DISCONNECT_HPP #define INGEN_EVENTS_DISCONNECT_HPP -#include "raul/Path.hpp" - -#include "BufferFactory.hpp" #include "CompiledGraph.hpp" #include "Event.hpp" -#include "GraphImpl.hpp" +#include "PortImpl.hpp" #include "types.hpp" -namespace Raul { -template class Array; -} - namespace ingen { namespace server { +class ArcImpl; class InputPort; -class PortImpl; namespace events { diff --git a/src/server/events/DisconnectAll.cpp b/src/server/events/DisconnectAll.cpp index e21fad4d..9c949480 100644 --- a/src/server/events/DisconnectAll.cpp +++ b/src/server/events/DisconnectAll.cpp @@ -14,12 +14,7 @@ along with Ingen. If not, see . */ -#include - -#include "ingen/Store.hpp" -#include "raul/Array.hpp" -#include "raul/Maid.hpp" -#include "raul/Path.hpp" +#include "events/DisconnectAll.hpp" #include "ArcImpl.hpp" #include "BlockImpl.hpp" @@ -30,9 +25,17 @@ #include "PortImpl.hpp" #include "PreProcessContext.hpp" #include "events/Disconnect.hpp" -#include "events/DisconnectAll.hpp" #include "util.hpp" +#include "ingen/Store.hpp" +#include "raul/Array.hpp" +#include "raul/Maid.hpp" +#include "raul/Path.hpp" + +#include +#include +#include + namespace ingen { namespace server { namespace events { diff --git a/src/server/events/DisconnectAll.hpp b/src/server/events/DisconnectAll.hpp index aca5fbce..8aa63d2b 100644 --- a/src/server/events/DisconnectAll.hpp +++ b/src/server/events/DisconnectAll.hpp @@ -17,14 +17,14 @@ #ifndef INGEN_EVENTS_DISCONNECTALL_HPP #define INGEN_EVENTS_DISCONNECTALL_HPP -#include - -#include "raul/Path.hpp" - #include "CompiledGraph.hpp" #include "Disconnect.hpp" #include "Event.hpp" +#include "raul/Path.hpp" + +#include + namespace ingen { namespace server { diff --git a/src/server/events/Get.cpp b/src/server/events/Get.cpp index 6074ea27..167f5f91 100644 --- a/src/server/events/Get.cpp +++ b/src/server/events/Get.cpp @@ -14,21 +14,25 @@ along with Ingen. If not, see . */ -#include - -#include "ingen/Interface.hpp" -#include "ingen/Node.hpp" -#include "ingen/Store.hpp" +#include "Get.hpp" #include "BlockImpl.hpp" #include "Broadcaster.hpp" #include "BufferFactory.hpp" #include "Engine.hpp" -#include "Get.hpp" #include "GraphImpl.hpp" #include "PluginImpl.hpp" #include "PortImpl.hpp" +#include "ingen/Forge.hpp" +#include "ingen/Interface.hpp" +#include "ingen/Node.hpp" +#include "ingen/Store.hpp" +#include "ingen/World.hpp" + +#include +#include + namespace ingen { namespace server { namespace events { diff --git a/src/server/events/Get.hpp b/src/server/events/Get.hpp index 9598010c..b23c7294 100644 --- a/src/server/events/Get.hpp +++ b/src/server/events/Get.hpp @@ -17,8 +17,6 @@ #ifndef INGEN_EVENTS_GET_HPP #define INGEN_EVENTS_GET_HPP -#include - #include "BlockFactory.hpp" #include "ClientUpdate.hpp" #include "Event.hpp" diff --git a/src/server/events/Mark.cpp b/src/server/events/Mark.cpp index be943533..4f9b1261 100644 --- a/src/server/events/Mark.cpp +++ b/src/server/events/Mark.cpp @@ -14,10 +14,13 @@ along with Ingen. If not, see . */ +#include "events/Mark.hpp" + #include "Engine.hpp" #include "PreProcessContext.hpp" #include "UndoStack.hpp" -#include "events/Mark.hpp" + +#include namespace ingen { namespace server { diff --git a/src/server/events/Mark.hpp b/src/server/events/Mark.hpp index 076b67dd..33aedcd6 100644 --- a/src/server/events/Mark.hpp +++ b/src/server/events/Mark.hpp @@ -19,10 +19,14 @@ #include "Event.hpp" +#include + namespace ingen { namespace server { +class CompiledGraph; class Engine; +class GraphImpl; namespace events { diff --git a/src/server/events/Move.cpp b/src/server/events/Move.cpp index 1890dc5f..c7478898 100644 --- a/src/server/events/Move.cpp +++ b/src/server/events/Move.cpp @@ -25,6 +25,8 @@ #include "GraphImpl.hpp" #include "events/Move.hpp" +#include + namespace ingen { namespace server { namespace events { diff --git a/src/server/events/Move.hpp b/src/server/events/Move.hpp index 510fcfce..327b31b9 100644 --- a/src/server/events/Move.hpp +++ b/src/server/events/Move.hpp @@ -17,11 +17,11 @@ #ifndef INGEN_EVENTS_MOVE_HPP #define INGEN_EVENTS_MOVE_HPP +#include "Event.hpp" + #include "ingen/Store.hpp" #include "raul/Path.hpp" -#include "Event.hpp" - namespace ingen { namespace server { diff --git a/src/server/events/SetPortValue.cpp b/src/server/events/SetPortValue.cpp index 4c879682..9193f876 100644 --- a/src/server/events/SetPortValue.cpp +++ b/src/server/events/SetPortValue.cpp @@ -14,10 +14,7 @@ along with Ingen. If not, see . */ -#include "ingen/LV2Features.hpp" -#include "ingen/Store.hpp" -#include "ingen/URIs.hpp" -#include "ingen/World.hpp" +#include "SetPortValue.hpp" #include "BlockImpl.hpp" #include "Broadcaster.hpp" @@ -26,7 +23,14 @@ #include "Engine.hpp" #include "PortImpl.hpp" #include "RunContext.hpp" -#include "SetPortValue.hpp" + +#include "ingen/Forge.hpp" +#include "ingen/LV2Features.hpp" +#include "ingen/Store.hpp" +#include "ingen/URIs.hpp" +#include "ingen/World.hpp" + +#include namespace ingen { namespace server { diff --git a/src/server/events/SetPortValue.hpp b/src/server/events/SetPortValue.hpp index 4fe42659..1e7c7250 100644 --- a/src/server/events/SetPortValue.hpp +++ b/src/server/events/SetPortValue.hpp @@ -17,13 +17,15 @@ #ifndef INGEN_EVENTS_SETPORTVALUE_HPP #define INGEN_EVENTS_SETPORTVALUE_HPP -#include "ingen/Atom.hpp" - #include "BufferRef.hpp" #include "ControlBindings.hpp" #include "Event.hpp" #include "types.hpp" +#include "ingen/Atom.hpp" + +#include + namespace ingen { namespace server { diff --git a/src/server/events/Undo.cpp b/src/server/events/Undo.cpp index 0c307e85..3a3bdbe2 100644 --- a/src/server/events/Undo.cpp +++ b/src/server/events/Undo.cpp @@ -14,11 +14,14 @@ along with Ingen. If not, see . */ -#include "ingen/AtomReader.hpp" +#include "Undo.hpp" #include "Engine.hpp" #include "EventWriter.hpp" -#include "Undo.hpp" + +#include "ingen/AtomReader.hpp" + +#include namespace ingen { namespace server { diff --git a/src/server/ingen_engine.cpp b/src/server/ingen_engine.cpp index 5125efd9..fba2e434 100644 --- a/src/server/ingen_engine.cpp +++ b/src/server/ingen_engine.cpp @@ -14,12 +14,13 @@ along with Ingen. If not, see . */ -#include "ingen/Module.hpp" -#include "ingen/World.hpp" #include "Engine.hpp" #include "EventWriter.hpp" #include "util.hpp" +#include "ingen/Module.hpp" +#include "ingen/World.hpp" + using namespace ingen; struct IngenEngineModule : public ingen::Module { diff --git a/src/server/ingen_jack.cpp b/src/server/ingen_jack.cpp index c1846e43..37aa9c7b 100644 --- a/src/server/ingen_jack.cpp +++ b/src/server/ingen_jack.cpp @@ -14,17 +14,16 @@ along with Ingen. If not, see . */ -#include +#include "JackDriver.hpp" +#include "Engine.hpp" #include "ingen/Atom.hpp" #include "ingen/Configuration.hpp" -#include "ingen/Configuration.hpp" #include "ingen/Log.hpp" #include "ingen/Module.hpp" #include "ingen/World.hpp" -#include "JackDriver.hpp" -#include "Engine.hpp" +#include using namespace ingen; diff --git a/src/server/ingen_lv2.cpp b/src/server/ingen_lv2.cpp index 25ead48e..625f87c6 100644 --- a/src/server/ingen_lv2.cpp +++ b/src/server/ingen_lv2.cpp @@ -14,44 +14,66 @@ along with Ingen. If not, see . */ -#include -#include -#include -#include - -#include "lv2/atom/util.h" -#include "lv2/buf-size/buf-size.h" -#include "lv2/log/log.h" -#include "lv2/log/logger.h" -#include "lv2/options/options.h" -#include "lv2/state/state.h" -#include "lv2/urid/urid.h" -#include "lv2/core/lv2.h" +#include "Buffer.hpp" +#include "BufferRef.hpp" +#include "Driver.hpp" +#include "DuplexPort.hpp" +#include "Engine.hpp" +#include "EnginePort.hpp" +#include "PortType.hpp" +#include "PostProcessor.hpp" +#include "RunContext.hpp" +#include "ThreadManager.hpp" +#include "types.hpp" #include "ingen/AtomReader.hpp" +#include "ingen/AtomSink.hpp" #include "ingen/AtomWriter.hpp" #include "ingen/Configuration.hpp" +#include "ingen/EngineBase.hpp" +#include "ingen/FilePath.hpp" +#include "ingen/Forge.hpp" #include "ingen/Interface.hpp" #include "ingen/Log.hpp" +#include "ingen/Node.hpp" #include "ingen/Parser.hpp" #include "ingen/Serialiser.hpp" #include "ingen/Store.hpp" #include "ingen/URI.hpp" +#include "ingen/URIs.hpp" #include "ingen/World.hpp" #include "ingen/ingen.h" #include "ingen/runtime_paths.hpp" #include "ingen/types.hpp" +#include "lv2/atom/atom.h" +#include "lv2/atom/atom.h" +#include "lv2/atom/util.h" +#include "lv2/buf-size/buf-size.h" +#include "lv2/core/lv2.h" +#include "lv2/log/log.h" +#include "lv2/log/logger.h" +#include "lv2/options/options.h" +#include "lv2/state/state.h" +#include "lv2/urid/urid.h" +#include "raul/Maid.hpp" +#include "raul/Path.hpp" +#include "raul/RingBuffer.hpp" #include "raul/Semaphore.hpp" +#include "raul/Symbol.hpp" +#include "serd/serd.h" +#include "sord/sordmm.hpp" -#include "Buffer.hpp" -#include "Driver.hpp" -#include "Engine.hpp" -#include "EnginePort.hpp" -#include "EventWriter.hpp" -#include "GraphImpl.hpp" -#include "PostProcessor.hpp" -#include "RunContext.hpp" -#include "ThreadManager.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #define NS_RDF "http://www.w3.org/1999/02/22-rdf-syntax-ns#" #define NS_RDFS "http://www.w3.org/2000/01/rdf-schema#" diff --git a/src/server/ingen_portaudio.cpp b/src/server/ingen_portaudio.cpp index 5b930b1a..f4e633d0 100644 --- a/src/server/ingen_portaudio.cpp +++ b/src/server/ingen_portaudio.cpp @@ -14,17 +14,15 @@ along with Ingen. If not, see . */ -#include +#include "PortAudioDriver.hpp" +#include "Engine.hpp" -#include "ingen/Atom.hpp" -#include "ingen/Configuration.hpp" -#include "ingen/Configuration.hpp" #include "ingen/Log.hpp" #include "ingen/Module.hpp" #include "ingen/World.hpp" +#include "ingen/types.hpp" -#include "PortAudioDriver.hpp" -#include "Engine.hpp" +namespace ingen { namespace server { class Driver; } } using namespace ingen; diff --git a/src/server/internals/BlockDelay.cpp b/src/server/internals/BlockDelay.cpp index 5c7ad147..0176c9b1 100644 --- a/src/server/internals/BlockDelay.cpp +++ b/src/server/internals/BlockDelay.cpp @@ -14,23 +14,23 @@ along with Ingen. If not, see . */ -#include - -#include - -#include "ingen/URIs.hpp" -#include "raul/Array.hpp" -#include "raul/Maid.hpp" +#include "internals/BlockDelay.hpp" #include "Buffer.hpp" #include "InputPort.hpp" #include "InternalPlugin.hpp" #include "OutputPort.hpp" -#include "RunContext.hpp" -#include "internals/BlockDelay.hpp" + +#include "ingen/Forge.hpp" +#include "ingen/URIs.hpp" +#include "raul/Array.hpp" +#include "raul/Maid.hpp" namespace ingen { namespace server { + +class RunContext; + namespace internals { InternalPlugin* BlockDelayNode::internal_plugin(URIs& uris) { diff --git a/src/server/internals/Controller.cpp b/src/server/internals/Controller.cpp index 4b5735d7..b8738e1e 100644 --- a/src/server/internals/Controller.cpp +++ b/src/server/internals/Controller.cpp @@ -14,13 +14,6 @@ along with Ingen. If not, see . */ -#include - -#include "ingen/URIs.hpp" -#include "internals/Controller.hpp" -#include "lv2/atom/util.h" -#include "lv2/midi/midi.h" - #include "Buffer.hpp" #include "Engine.hpp" #include "InputPort.hpp" @@ -30,6 +23,16 @@ #include "RunContext.hpp" #include "util.hpp" +#include "ingen/Forge.hpp" +#include "ingen/URIs.hpp" +#include "internals/Controller.hpp" +#include "lv2/atom/util.h" +#include "lv2/midi/midi.h" + +#include +#include +#include + namespace ingen { namespace server { namespace internals { diff --git a/src/server/internals/Controller.hpp b/src/server/internals/Controller.hpp index d138e690..0a62b235 100644 --- a/src/server/internals/Controller.hpp +++ b/src/server/internals/Controller.hpp @@ -19,6 +19,8 @@ #include "InternalBlock.hpp" +#include + namespace ingen { namespace server { diff --git a/src/server/internals/Note.cpp b/src/server/internals/Note.cpp index 9d39f345..cfc0c157 100644 --- a/src/server/internals/Note.cpp +++ b/src/server/internals/Note.cpp @@ -14,23 +14,24 @@ along with Ingen. If not, see . */ -#include +#include "internals/Note.hpp" + +#include "Buffer.hpp" +#include "InputPort.hpp" +#include "InternalPlugin.hpp" +#include "OutputPort.hpp" +#include "RunContext.hpp" +#include "ingen/Forge.hpp" #include "ingen/URIs.hpp" #include "lv2/atom/util.h" #include "lv2/midi/midi.h" #include "raul/Array.hpp" #include "raul/Maid.hpp" -#include "Buffer.hpp" -#include "GraphImpl.hpp" -#include "InputPort.hpp" -#include "InternalPlugin.hpp" -#include "OutputPort.hpp" -#include "RunContext.hpp" -#include "ingen_config.h" -#include "internals/Note.hpp" -#include "util.hpp" +#include +#include +#include // #define NOTE_DEBUG 1 diff --git a/src/server/internals/Note.hpp b/src/server/internals/Note.hpp index fb935179..2911f55b 100644 --- a/src/server/internals/Note.hpp +++ b/src/server/internals/Note.hpp @@ -20,6 +20,8 @@ #include "InternalBlock.hpp" #include "types.hpp" +#include + namespace ingen { namespace server { diff --git a/src/server/internals/Time.cpp b/src/server/internals/Time.cpp index c35aa02b..3b6f12ba 100644 --- a/src/server/internals/Time.cpp +++ b/src/server/internals/Time.cpp @@ -14,9 +14,7 @@ along with Ingen. If not, see . */ -#include "ingen/URIs.hpp" -#include "lv2/atom/util.h" -#include "lv2/midi/midi.h" +#include "internals/Time.hpp" #include "Buffer.hpp" #include "Driver.hpp" @@ -24,9 +22,13 @@ #include "InternalPlugin.hpp" #include "OutputPort.hpp" #include "RunContext.hpp" -#include "internals/Time.hpp" #include "util.hpp" +#include "ingen/Forge.hpp" +#include "ingen/URIs.hpp" +#include "lv2/atom/util.h" +#include "lv2/midi/midi.h" + namespace ingen { namespace server { namespace internals { diff --git a/src/server/internals/Trigger.cpp b/src/server/internals/Trigger.cpp index 793e508d..4ceae3c8 100644 --- a/src/server/internals/Trigger.cpp +++ b/src/server/internals/Trigger.cpp @@ -14,11 +14,7 @@ along with Ingen. If not, see . */ -#include - -#include "ingen/URIs.hpp" -#include "lv2/atom/util.h" -#include "lv2/midi/midi.h" +#include "internals/Trigger.hpp" #include "Buffer.hpp" #include "Engine.hpp" @@ -27,9 +23,16 @@ #include "OutputPort.hpp" #include "RunContext.hpp" #include "ingen_config.h" -#include "internals/Trigger.hpp" #include "util.hpp" +#include "ingen/Forge.hpp" +#include "ingen/URIs.hpp" +#include "lv2/atom/util.h" +#include "lv2/midi/midi.h" + +#include +#include + namespace ingen { namespace server { namespace internals { diff --git a/src/server/internals/Trigger.hpp b/src/server/internals/Trigger.hpp index 98d50f2c..0508b615 100644 --- a/src/server/internals/Trigger.hpp +++ b/src/server/internals/Trigger.hpp @@ -19,6 +19,8 @@ #include "InternalBlock.hpp" +#include + namespace ingen { namespace server { diff --git a/src/server/mix.cpp b/src/server/mix.cpp index 065e3efc..5f77eda2 100644 --- a/src/server/mix.cpp +++ b/src/server/mix.cpp @@ -14,11 +14,12 @@ along with Ingen. If not, see . */ -#include "lv2/atom/util.h" +#include "mix.hpp" #include "Buffer.hpp" #include "RunContext.hpp" -#include "mix.hpp" + +#include "lv2/atom/util.h" namespace ingen { namespace server { diff --git a/src/server/mix.hpp b/src/server/mix.hpp index 7df76595..1878200c 100644 --- a/src/server/mix.hpp +++ b/src/server/mix.hpp @@ -20,9 +20,6 @@ #include namespace ingen { - -class URIs; - namespace server { class Buffer; diff --git a/src/server/util.hpp b/src/server/util.hpp index 07a7f350..34e2ee79 100644 --- a/src/server/util.hpp +++ b/src/server/util.hpp @@ -17,18 +17,18 @@ #ifndef INGEN_ENGINE_UTIL_HPP #define INGEN_ENGINE_UTIL_HPP -#include +#include "ingen_config.h" #include "ingen/Log.hpp" #include "raul/Path.hpp" -#include "ingen_config.h" - -#include #ifdef __SSE__ #include #endif +#include +#include + #ifdef __clang__ # define REALTIME __attribute__((annotate("realtime"))) #else diff --git a/tests/TestClient.hpp b/tests/TestClient.hpp index b234d7c2..e76e4aa5 100644 --- a/tests/TestClient.hpp +++ b/tests/TestClient.hpp @@ -17,11 +17,11 @@ #ifndef INGEN_TESTCLIENT_HPP #define INGEN_TESTCLIENT_HPP -#include - #include "ingen/Interface.hpp" #include "ingen/Log.hpp" +#include + using namespace ingen; class TestClient : public ingen::Interface diff --git a/tests/ingen_bench.cpp b/tests/ingen_bench.cpp index 1a0d84ca..99abee97 100644 --- a/tests/ingen_bench.cpp +++ b/tests/ingen_bench.cpp @@ -14,23 +14,23 @@ along with Ingen. If not, see . */ -#include -#include -#include -#include - +#include "ingen/Atom.hpp" #include "ingen/Clock.hpp" #include "ingen/Configuration.hpp" #include "ingen/EngineBase.hpp" #include "ingen/Forge.hpp" -#include "ingen/Interface.hpp" #include "ingen/Parser.hpp" #include "ingen/World.hpp" #include "ingen/runtime_paths.hpp" #include "ingen/types.hpp" -#include "TestClient.hpp" -#include "ingen_config.h" +#include +#include +#include +#include +#include +#include +#include using namespace std; using namespace ingen; diff --git a/tests/ingen_test.cpp b/tests/ingen_test.cpp index cd86985f..fc114fb1 100644 --- a/tests/ingen_test.cpp +++ b/tests/ingen_test.cpp @@ -14,39 +14,39 @@ along with Ingen. If not, see . */ -#include - -#include -#include -#include - -#include - -#include "raul/Path.hpp" - -#include "serd/serd.h" -#include "sord/sordmm.hpp" -#include "sratom/sratom.h" - +#include "TestClient.hpp" #include "ingen_config.h" +#include "ingen/Atom.hpp" +#include "ingen/AtomForgeSink.hpp" #include "ingen/AtomReader.hpp" #include "ingen/AtomWriter.hpp" #include "ingen/Configuration.hpp" -#include "ingen/Configuration.hpp" #include "ingen/EngineBase.hpp" +#include "ingen/FilePath.hpp" #include "ingen/Interface.hpp" #include "ingen/Parser.hpp" #include "ingen/Properties.hpp" #include "ingen/Serialiser.hpp" #include "ingen/Store.hpp" +#include "ingen/URI.hpp" #include "ingen/URIMap.hpp" #include "ingen/World.hpp" #include "ingen/filesystem.hpp" +#include "ingen/fmt.hpp" #include "ingen/runtime_paths.hpp" #include "ingen/types.hpp" +#include "raul/Path.hpp" +#include "serd/serd.h" +#include "sord/sordmm.hpp" +#include "sratom/sratom.h" -#include "TestClient.hpp" +#include +#include +#include +#include +#include +#include using namespace std; using namespace ingen; diff --git a/tests/test_utils.hpp b/tests/test_utils.hpp index c8271325..48e3a588 100644 --- a/tests/test_utils.hpp +++ b/tests/test_utils.hpp @@ -18,8 +18,6 @@ #include -using ingen::fmt; - #define EXPECT_TRUE(value) \ if (!(value)) { \ std::cerr << fmt("error: %1%:%2%: !%3%\n", \ diff --git a/tests/tst_FilePath.cpp b/tests/tst_FilePath.cpp index ec0fe593..768371fe 100644 --- a/tests/tst_FilePath.cpp +++ b/tests/tst_FilePath.cpp @@ -14,12 +14,17 @@ along with Ingen. If not, see . */ -#include +#include "test_utils.hpp" #include "ingen/FilePath.hpp" -#include "test_utils.hpp" +#include "ingen/fmt.hpp" + +#include + +#include using ingen::FilePath; +using ingen::fmt; int main(int, char**) diff --git a/wscript b/wscript index a8aa19ca..e79bf9a1 100644 --- a/wscript +++ b/wscript @@ -43,7 +43,7 @@ def options(ctx): def configure(conf): autowaf.display_header('Ingen Configuration') - autowaf.set_line_just(conf, 45) + autowaf.set_line_just(conf, 47) conf.load('compiler_cxx', cache=True) conf.load('lv2', cache=True) if not Options.options.no_python: @@ -55,7 +55,7 @@ def configure(conf): conf.check_cxx(header_name='boost/format.hpp') conf.check_cxx(header_name='boost/intrusive/slist.hpp') conf.check_cxx(header_name='boost/intrusive_ptr.hpp') - conf.check_cxx(header_name='boost/optional.hpp') + conf.check_cxx(header_name='boost/optional/optional.hpp') conf.check_cxx(header_name='boost/variant.hpp') conf.check_cxx(msg='Checking for thread_local keyword', mandatory=False, -- cgit v1.2.1