diff options
Diffstat (limited to 'src/server')
112 files changed, 884 insertions, 613 deletions
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 <http://www.gnu.org/licenses/>. */ -#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 <algorithm> +#include <cassert> +#include <string> 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 <cstdlib> - -#include <boost/intrusive/slist.hpp> +#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 <boost/intrusive/slist_hook.hpp> + +#include <cstdint> 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 <http://www.gnu.org/licenses/>. */ -#include <cstdlib> +#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 <algorithm> +#include <cstdint> +#include <utility> +#include <vector> 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 <map> -#include <set> - -#include "ingen/World.hpp" +#include "ingen/URI.hpp" #include "ingen/types.hpp" #include "raul/Noncopyable.hpp" +#include <map> +#include <set> + 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 <http://www.gnu.org/licenses/>. */ -#include <cassert> -#include <cstdint> - -#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 <cassert> +#include <cstdint> +#include <initializer_list> +#include <string> + 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 <set> - -#include <boost/intrusive/slist.hpp> -#include <boost/optional.hpp> - -#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 <boost/intrusive/slist_hook.hpp> +#include <boost/optional/optional.hpp> + +#include <cstdint> +#include <set> + 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 <http://www.gnu.org/licenses/>. */ -#include <utility> - -#include "ingen/Interface.hpp" - #include "Broadcaster.hpp" + #include "PluginImpl.hpp" #include "BlockFactory.hpp" +#include "ingen/Interface.hpp" + +#include <cstddef> +#include <utility> + 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 <atomic> -#include <list> -#include <mutex> -#include <set> -#include <string> +#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 <atomic> +#include <mutex> +#include <set> 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 <cmath> +#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 <algorithm> #include <cstdint> +#include <cstdio> +#include <cstdlib> #include <cstring> #include <new> @@ -25,18 +40,6 @@ # include <xmmintrin.h> #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 <atomic> -#include <cassert> +#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 <atomic> +#include <cassert> +#include <cstddef> +#include <cstdint> 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 <http://www.gnu.org/licenses/>. */ +#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 <algorithm> 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 <atomic> -#include <map> -#include <mutex> - -#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 <atomic> +#include <mutex> +#include <cstdint> + 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 <boost/intrusive_ptr.hpp> - #include "ingen/ingen.h" +#include <boost/intrusive_ptr.hpp> + 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 <http://www.gnu.org/licenses/>. */ -#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 <algorithm> +#include <cstddef> +#include <cstdint> +#include <utility> 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 <string> -#include <vector> - +#include "ingen/Properties.hpp" #include "ingen/Resource.hpp" +#include "ingen/URI.hpp" #include "raul/Path.hpp" +#include <string> +#include <vector> + 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 <http://www.gnu.org/licenses/>. */ -#include <algorithm> +#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 <algorithm> +#include <cassert> +#include <cstdint> +#include <cstdio> +#include <utility> 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 <functional> -#include <set> -#include <vector> +#include "Task.hpp" #include "ingen/types.hpp" #include "raul/Maid.hpp" #include "raul/Noncopyable.hpp" -#include "Task.hpp" +#include <cstddef> +#include <set> +#include <string> 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 <http://www.gnu.org/licenses/>. */ -#include <cmath> +#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 <cmath> +#include <cstring> +#include <string> 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 <atomic> -#include <cstdint> -#include <vector> - -#include <boost/intrusive/options.hpp> -#include <boost/intrusive/set.hpp> +#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 <boost/intrusive/options.hpp> +#include <boost/intrusive/set.hpp> +#include <boost/intrusive/set_hook.hpp> + +#include <atomic> +#include <cstdint> +#include <utility> +#include <vector> + +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 <boost/intrusive/slist.hpp> - #include "Driver.hpp" #include "Engine.hpp" +#include <boost/intrusive/slist.hpp> + 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 <http://www.gnu.org/licenses/>. */ -#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 <algorithm> +#include <map> +#include <utility> 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 <boost/intrusive/slist.hpp> - -#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 <boost/intrusive/slist_hook.hpp> + +#include <cstddef> +#include <cstdint> + +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 <http://www.gnu.org/licenses/>. */ -#include "ingen_config.h" - -#include <sys/mman.h> - -#include <limits> -#include <thread> - -#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 <algorithm> +#include <cmath> +#include <cstdint> +#include <cstdio> +#include <limits> +#include <thread> +#include <utility> + 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 <chrono> -#include <condition_variable> -#include <mutex> -#include <random> +#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 <chrono> +#include <condition_variable> +#include <cstddef> +#include <cstdint> +#include <mutex> +#include <random> +#include <vector> 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 <boost/intrusive/slist.hpp> -#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 <atomic> - -#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 <atomic> 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 <http://www.gnu.org/licenses/>. */ -#include <boost/variant/apply_visitor.hpp> - -#include "ingen/URIs.hpp" +#include "EventWriter.hpp" #include "Engine.hpp" -#include "EventWriter.hpp" #include "events.hpp" +#include <boost/variant/apply_visitor.hpp> + 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 <memory> -#include <string> +#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 <http://www.gnu.org/licenses/>. */ -#include <cassert> -#include <unordered_map> - -#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 <cassert> +#include <cstddef> +#include <map> +#include <unordered_map> + 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 <cstdlib> - -#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 <cassert> +#include <cstdint> +#include <memory> +#include <utility> +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 <string> #include "PluginImpl.hpp" +#include <string> + 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 <http://www.gnu.org/licenses/>. */ -#include <cstdlib> -#include <cassert> - -#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 <cstdlib> +#include <cassert> + 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 <cassert> -#include <cstdlib> +#include "ArcImpl.hpp" +#include "PortImpl.hpp" +#include "PortType.hpp" +#include "types.hpp" +#include "ingen/types.hpp" +#include "lv2/urid/urid.h" + +#include <boost/intrusive/options.hpp> #include <boost/intrusive/slist.hpp> -#include "ingen/types.hpp" +#include <cstdint> +#include <cstdlib> -#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 <http://www.gnu.org/licenses/>. */ +#include "InternalBlock.hpp" + #include "Buffer.hpp" #include "Engine.hpp" -#include "InternalBlock.hpp" #include "InternalPlugin.hpp" #include "PortImpl.hpp" +#include <cstddef> +#include <cstdint> + 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 <http://www.gnu.org/licenses/>. */ -#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 <http://www.gnu.org/licenses/>. */ +#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 <cstdlib> -#include <string> +#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 <jack/midiport.h> #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 <cassert> +#include <chrono> +#include <cstdlib> +#include <cstring> +#include <mutex> +#include <string> +#include <utility> 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 <string> -#include <atomic> +#include "ingen/types.hpp" +#include "lv2/atom/forge.h" +#include "raul/Semaphore.hpp" #include <jack/jack.h> #include <jack/thread.h> @@ -29,12 +32,10 @@ #include <jack/session.h> #endif -#include "ingen/types.hpp" -#include "lv2/atom/forge.h" -#include "raul/Semaphore.hpp" - -#include "Driver.hpp" -#include "EnginePort.hpp" +#include <atomic> +#include <cstddef> +#include <cstdint> +#include <string> 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 <http://www.gnu.org/licenses/>. */ -#include <cassert> -#include <cmath> -#include <cstdint> - -#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 <algorithm> +#include <cassert> +#include <cmath> +#include <cstdint> +#include <string> +#include <utility> + 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 <mutex> +#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 <boost/intrusive/slist.hpp> + +#include <cstdint> +#include <cstdlib> +#include <cstring> +#include <mutex> 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 <http://www.gnu.org/licenses/>. */ -#include <string> +#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 <cstdlib> +#include <string> 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 <cstdlib> +#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 <cmath> +#include <cstdint> +#include <limits> + 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 <http://www.gnu.org/licenses/>. */ -#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 <map> +#include <utility> + +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 <cassert> -#include <cstddef> -#include <map> - #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 <cstdint> 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 <cstdlib> - #include "ingen/Resource.hpp" #include "raul/Symbol.hpp" +#include <cstdlib> + 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 <http://www.gnu.org/licenses/>. */ -#include "ingen_config.h" - -#include <cstdlib> -#include <string> - -#include <portaudio.h> - -#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 <portaudio.h> + +#include <cstdio> +#include <cstring> +#include <string> 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 <atomic> -#include <memory> -#include <string> - -#include <portaudio.h> - +#include "ingen/URI.hpp" +#include "lv2/atom/forge.h" #include "raul/Semaphore.hpp" -#include "lv2/atom/forge.h" +#include <portaudio.h> -#include "Driver.hpp" -#include "EnginePort.hpp" +#include <atomic> +#include <cstddef> +#include <cstdint> +#include <memory> 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 <http://www.gnu.org/licenses/>. */ -#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 <algorithm> +#include <cassert> +#include <cstdio> +#include <utility> + 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 <cstdlib> - -#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 <atomic> +#include <cstdint> +#include <cstdlib> 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 <cassert> - #include "lv2/atom/atom.h" #include "lv2/core/lv2.h" +#include <cassert> + 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 <http://www.gnu.org/licenses/>. */ -#include <cassert> +#include "PostProcessor.hpp" #include "Engine.hpp" #include "Event.hpp" -#include "PostProcessor.hpp" -#include "RunContext.hpp" + +#include <cassert> 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 <atomic> +#include "types.hpp" #include "ingen/ingen.h" -#include "types.hpp" +#include <atomic> 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 <unordered_set> - +#include "CompiledGraph.hpp" #include "GraphImpl.hpp" +#include <unordered_set> + 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 <http://www.gnu.org/licenses/>. */ -#include <stdexcept> - -#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 <cassert> +#include <cstdint> +#include <cstdio> + 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 <atomic> -#include <thread> -#include <mutex> +#include "Event.hpp" #include "raul/Semaphore.hpp" +#include <atomic> +#include <chrono> +#include <cstddef> +#include <mutex> +#include <thread> + 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 <http://www.gnu.org/licenses/>. */ -#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 <cerrno> +#include <cstring> +#include <pthread.h> +#include <sched.h> + 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 <cstdint> -#include <thread> +#include "ingen/types.hpp" +#include "types.hpp" #include "lv2/urid/urid.h" #include "raul/RingBuffer.hpp" -#include "ingen/types.hpp" -#include "types.hpp" +#include <cstdint> +#include <thread> 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 <http://www.gnu.org/licenses/>. */ -#include <poll.h> -#include <signal.h> -#include <sys/stat.h> -#include <unistd.h> +#include "SocketListener.hpp" -#include <cerrno> -#include <sstream> -#include <string> -#include <thread> +#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 <cerrno> +#include <cstdint> +#include <cstdlib> +#include <cstring> +#include <poll.h> +#include <signal.h> +#include <sstream> +#include <string> +#include <sys/stat.h> +#include <thread> +#include <unistd.h> 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 <http://www.gnu.org/licenses/>. */ +#include "raul/Socket.hpp" + #include <memory> #include <thread> -#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 <http://www.gnu.org/licenses/>. */ -#include "BlockImpl.hpp" #include "Task.hpp" +#include "BlockImpl.hpp" +#include "RunContext.hpp" + +#include "raul/Path.hpp" + +#include <cstddef> + 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 <deque> #include <functional> #include <memory> -#include <ostream> +#include <string> +#include <utility> 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 <cassert> +#include "util.hpp" #include "ingen/ingen.h" -#include "util.hpp" +#include <cassert> 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 <http://www.gnu.org/licenses/>. */ -#include <ctime> +#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 <ctime> +#include <iterator> +#include <memory> #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 <ctime> -#include <deque> - #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 <cstdint> +#include <cstdio> +#include <cstdlib> +#include <cstring> +#include <ctime> +#include <deque> + 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 <http://www.gnu.org/licenses/>. */ -#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 <cstdlib> 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 <thread> - #include "ingen/LV2Features.hpp" #include "ingen/types.hpp" #include "lv2/worker/worker.h" #include "raul/RingBuffer.hpp" #include "raul/Semaphore.hpp" +#include <cstdint> +#include <thread> + 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 <http://www.gnu.org/licenses/>. */ -#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 <cassert> +#include <mutex> +#include <utility> + 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 <typename T> 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 <http://www.gnu.org/licenses/>. */ -#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 <mutex> +#include <string> +#include <utility> 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 <list> - -#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 <http://www.gnu.org/licenses/>. */ -#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 <utility> + 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 <cstdint> + 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 <http://www.gnu.org/licenses/>. */ -#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 <utility> + 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 <list> +#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 <cstdint> +#include <list> 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 <http://www.gnu.org/licenses/>. */ -#include <utility> - -#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 <cassert> +#include <utility> + 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 <boost/optional.hpp> +#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 <boost/optional/optional.hpp> + +#include <cstdint> 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 <http://www.gnu.org/licenses/>. */ -#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 <cassert> +#include <cstddef> +#include <mutex> +#include <string> + 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 <map> -#include <vector> - -#include "ingen/Store.hpp" - -#include "CompiledGraph.hpp" #include "ControlBindings.hpp" #include "Event.hpp" #include "GraphImpl.hpp" -namespace Raul { -template<typename T> class Array; -} +#include "ingen/Store.hpp" + +#include <cstdint> +#include <map> +#include <utility> +#include <vector> 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 <http://www.gnu.org/licenses/>. */ -#include <vector> -#include <thread> - -#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 <mutex> +#include <set> +#include <string> +#include <utility> +#include <vector> 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 <vector> - -#include <boost/optional.hpp> - -#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 <boost/optional/optional.hpp> +#include <algorithm> +#include <cstdint> +#include <vector> + +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 <http://www.gnu.org/licenses/>. */ -#include <set> - -#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 <cassert> +#include <cstdint> +#include <mutex> +#include <set> +#include <string> +#include <utility> 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 <typename T> 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 <http://www.gnu.org/licenses/>. */ -#include <set> - -#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 <mutex> +#include <set> +#include <utility> + 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 <list> - -#include "raul/Path.hpp" - #include "CompiledGraph.hpp" #include "Disconnect.hpp" #include "Event.hpp" +#include "raul/Path.hpp" + +#include <list> + 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 <http://www.gnu.org/licenses/>. */ -#include <utility> - -#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 <cstdint> +#include <mutex> + 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 <vector> - #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 <http://www.gnu.org/licenses/>. */ +#include "events/Mark.hpp" + #include "Engine.hpp" #include "PreProcessContext.hpp" #include "UndoStack.hpp" -#include "events/Mark.hpp" + +#include <utility> 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 <map> + 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 <mutex> + 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 <http://www.gnu.org/licenses/>. */ -#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 <cassert> 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 <cstdint> + 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 <http://www.gnu.org/licenses/>. */ -#include "ingen/AtomReader.hpp" +#include "Undo.hpp" #include "Engine.hpp" #include "EventWriter.hpp" -#include "Undo.hpp" + +#include "ingen/AtomReader.hpp" + +#include <deque> 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 <http://www.gnu.org/licenses/>. */ -#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 <http://www.gnu.org/licenses/>. */ -#include <string> +#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 <string> 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 <http://www.gnu.org/licenses/>. */ -#include <cstdlib> -#include <string> -#include <thread> -#include <vector> - -#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 <algorithm> +#include <cstdint> +#include <cstdlib> +#include <cstring> +#include <memory> +#include <mutex> +#include <set> +#include <string> +#include <thread> +#include <utility> +#include <vector> #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 <http://www.gnu.org/licenses/>. */ -#include <string> +#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 <http://www.gnu.org/licenses/>. */ -#include <climits> - -#include <cmath> - -#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 <http://www.gnu.org/licenses/>. */ -#include <cmath> - -#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 <cassert> +#include <cmath> +#include <initializer_list> + 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 <cstdint> + 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 <http://www.gnu.org/licenses/>. */ -#include <cmath> +#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 <cassert> +#include <cmath> +#include <utility> // #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 <cstdint> + 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 <http://www.gnu.org/licenses/>. */ -#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 <http://www.gnu.org/licenses/>. */ -#include <cmath> - -#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 <cassert> +#include <cmath> + 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 <cstdint> + 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 <http://www.gnu.org/licenses/>. */ -#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 <cstdint> 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 <cstdlib> +#include "ingen_config.h" #include "ingen/Log.hpp" #include "raul/Path.hpp" -#include "ingen_config.h" - -#include <fenv.h> #ifdef __SSE__ #include <xmmintrin.h> #endif +#include <fenv.h> +#include <cstdlib> + #ifdef __clang__ # define REALTIME __attribute__((annotate("realtime"))) #else |