diff options
42 files changed, 35 insertions, 153 deletions
diff --git a/src/gui/WindowFactory.cpp b/src/gui/WindowFactory.cpp index 2454a726..6042a190 100644 --- a/src/gui/WindowFactory.cpp +++ b/src/gui/WindowFactory.cpp @@ -28,7 +28,6 @@ #include "RenameWindow.hpp" #include "WidgetFactory.hpp" #include "WindowFactory.hpp" -#include "ingen_config.h" using namespace std; diff --git a/src/gui/WindowFactory.hpp b/src/gui/WindowFactory.hpp index 2bf36e85..0712c656 100644 --- a/src/gui/WindowFactory.hpp +++ b/src/gui/WindowFactory.hpp @@ -22,8 +22,6 @@ #include "ingen/GraphObject.hpp" #include "raul/SharedPtr.hpp" -namespace Raul { class Path; } - namespace Ingen { namespace Client { @@ -43,7 +41,6 @@ class PatchBox; class PatchView; class PatchWindow; class RenameWindow; -class UploadPatchWindow; /** Manager/Factory for all windows. * diff --git a/src/gui/ingen_gui_lv2.cpp b/src/gui/ingen_gui_lv2.cpp index f7510f62..cead2acb 100644 --- a/src/gui/ingen_gui_lv2.cpp +++ b/src/gui/ingen_gui_lv2.cpp @@ -20,7 +20,6 @@ #include "ingen/shared/AtomReader.hpp" #include "ingen/shared/AtomSink.hpp" #include "ingen/shared/AtomWriter.hpp" -#include "ingen/shared/Configuration.hpp" #include "ingen/shared/World.hpp" #include "ingen/shared/runtime_paths.hpp" #include "lv2/lv2plug.in/ns/extensions/ui/ui.h" diff --git a/src/ingen/main.cpp b/src/ingen/main.cpp index e8cfbcd8..abf8aa51 100644 --- a/src/ingen/main.cpp +++ b/src/ingen/main.cpp @@ -20,22 +20,14 @@ #include <iostream> #include <string> -#include <boost/optional.hpp> - -#include <glibmm/convert.h> -#include <glibmm/miscutils.h> #include <glibmm/thread.h> #include <glibmm/timer.h> #include "raul/Configuration.hpp" #include "raul/Path.hpp" #include "raul/SharedPtr.hpp" -#include "raul/Thread.hpp" #include "raul/log.hpp" -#include "serd/serd.h" -#include "sord/sordmm.hpp" - #include "ingen_config.h" #include "ingen/EngineBase.hpp" diff --git a/src/serialisation/Serialiser.cpp b/src/serialisation/Serialiser.cpp index 6a674eb5..4d715f7a 100644 --- a/src/serialisation/Serialiser.cpp +++ b/src/serialisation/Serialiser.cpp @@ -14,12 +14,10 @@ along with Ingen. If not, see <http://www.gnu.org/licenses/>. */ -#include <algorithm> #include <cassert> -#include <cmath> #include <cstdlib> -#include <cstring> #include <string> +#include <utility> #include <glib.h> #include <glib/gstdio.h> @@ -34,15 +32,14 @@ #include "ingen/Patch.hpp" #include "ingen/Plugin.hpp" #include "ingen/Port.hpp" +#include "ingen/Resource.hpp" #include "ingen/serialisation/Serialiser.hpp" -#include "ingen/shared/ResourceImpl.hpp" #include "ingen/shared/Store.hpp" #include "ingen/shared/URIMap.hpp" #include "ingen/shared/URIs.hpp" #include "ingen/shared/World.hpp" #include "lv2/lv2plug.in/ns/ext/state/state.h" #include "lv2/lv2plug.in/ns/extensions/ui/ui.h" -#include "raul/Atom.hpp" #include "raul/Path.hpp" #include "raul/log.hpp" #include "sord/sordmm.hpp" diff --git a/src/server/AudioBuffer.cpp b/src/server/AudioBuffer.cpp index a3c87fea..740e780c 100644 --- a/src/server/AudioBuffer.cpp +++ b/src/server/AudioBuffer.cpp @@ -14,16 +14,13 @@ along with Ingen. If not, see <http://www.gnu.org/licenses/>. */ -#include <stdlib.h> #include <assert.h> +#include <stddef.h> +#include <stdint.h> -#include "ingen/shared/LV2Features.hpp" #include "lv2/lv2plug.in/ns/ext/atom/atom.h" -#include "raul/SharedPtr.hpp" -#include "raul/log.hpp" #include "AudioBuffer.hpp" -#include "ProcessContext.hpp" using namespace std; diff --git a/src/server/Broadcaster.cpp b/src/server/Broadcaster.cpp index d65c48ac..aa7b7aae 100644 --- a/src/server/Broadcaster.cpp +++ b/src/server/Broadcaster.cpp @@ -14,17 +14,15 @@ along with Ingen. If not, see <http://www.gnu.org/licenses/>. */ -#include <cassert> -#include <unistd.h> +#include <utility> +#include <glibmm/thread.h> #include "ingen/Interface.hpp" #include "raul/log.hpp" #include "Broadcaster.hpp" -#include "EdgeImpl.hpp" -#include "EngineStore.hpp" #include "PluginImpl.hpp" -#include "util.hpp" +#include "NodeFactory.hpp" #define LOG(s) (s("[Broadcaster] ")) diff --git a/src/server/Buffer.cpp b/src/server/Buffer.cpp index 30a0781c..85fe727c 100644 --- a/src/server/Buffer.cpp +++ b/src/server/Buffer.cpp @@ -16,12 +16,12 @@ #define __STDC_LIMIT_MACROS 1 +#include <assert.h> #include <stdint.h> #include <string.h> -#include <algorithm> +#include <new> -#include "ingen/shared/LV2Features.hpp" #include "ingen/shared/URIMap.hpp" #include "ingen/shared/URIs.hpp" #include "ingen/shared/World.hpp" diff --git a/src/server/BufferFactory.cpp b/src/server/BufferFactory.cpp index a11f1c35..2bcf8201 100644 --- a/src/server/BufferFactory.cpp +++ b/src/server/BufferFactory.cpp @@ -14,8 +14,6 @@ along with Ingen. If not, see <http://www.gnu.org/licenses/>. */ -#include <algorithm> - #include "ingen/shared/URIs.hpp" #include "raul/log.hpp" @@ -23,7 +21,6 @@ #include "BufferFactory.hpp" #include "Driver.hpp" #include "Engine.hpp" -#include "ThreadManager.hpp" namespace Ingen { namespace Server { diff --git a/src/server/ControlBindings.cpp b/src/server/ControlBindings.cpp index a9c0c546..82b15408 100644 --- a/src/server/ControlBindings.cpp +++ b/src/server/ControlBindings.cpp @@ -16,8 +16,6 @@ #include <math.h> -#include <algorithm> - #include "ingen/shared/URIs.hpp" #include "ingen/shared/World.hpp" #include "lv2/lv2plug.in/ns/ext/atom/util.h" diff --git a/src/server/DuplexPort.cpp b/src/server/DuplexPort.cpp index ca555e60..6d332ad6 100644 --- a/src/server/DuplexPort.cpp +++ b/src/server/DuplexPort.cpp @@ -14,18 +14,13 @@ along with Ingen. If not, see <http://www.gnu.org/licenses/>. */ -#include <cstdlib> -#include <cassert> #include <string> #include "ingen/shared/URIs.hpp" #include "Buffer.hpp" #include "DuplexPort.hpp" -#include "NodeImpl.hpp" #include "OutputPort.hpp" -#include "ProcessContext.hpp" -#include "util.hpp" using namespace std; @@ -48,7 +43,6 @@ DuplexPort::DuplexPort(BufferFactory& bufs, , OutputPort(bufs, parent, name, index, poly, type, buffer_type, value, buffer_size) , _is_output(is_output) { - assert(PortImpl::_parent == parent); set_property(bufs.uris().ingen_polyphonic, bufs.forge().make(polyphonic)); } diff --git a/src/server/EdgeImpl.cpp b/src/server/EdgeImpl.cpp index 50e69ec9..46d45f27 100644 --- a/src/server/EdgeImpl.cpp +++ b/src/server/EdgeImpl.cpp @@ -14,14 +14,10 @@ along with Ingen. If not, see <http://www.gnu.org/licenses/>. */ -#include <algorithm> - #include "ingen/shared/URIs.hpp" #include "lv2/lv2plug.in/ns/ext/atom/util.h" -#include "raul/Maid.hpp" #include "raul/log.hpp" -#include "AudioBuffer.hpp" #include "BufferFactory.hpp" #include "EdgeImpl.hpp" #include "Engine.hpp" @@ -30,9 +26,6 @@ #include "NodeImpl.hpp" #include "OutputPort.hpp" #include "PortImpl.hpp" -#include "ProcessContext.hpp" -#include "mix.hpp" -#include "util.hpp" namespace Ingen { namespace Server { diff --git a/src/server/Engine.cpp b/src/server/Engine.cpp index ead11895..c5a7bddd 100644 --- a/src/server/Engine.cpp +++ b/src/server/Engine.cpp @@ -15,18 +15,14 @@ */ #include <sys/mman.h> -#include <unistd.h> #include "events/CreatePort.hpp" #include "ingen/shared/Configuration.hpp" -#include "ingen/shared/LV2Features.hpp" #include "ingen/shared/Store.hpp" #include "ingen/shared/URIs.hpp" #include "ingen/shared/World.hpp" -#include "raul/Deletable.hpp" #include "raul/Maid.hpp" #include "raul/SharedPtr.hpp" -#include "raul/log.hpp" #include "Broadcaster.hpp" #include "BufferFactory.hpp" diff --git a/src/server/EngineStore.cpp b/src/server/EngineStore.cpp index a492c471..35ae6d83 100644 --- a/src/server/EngineStore.cpp +++ b/src/server/EngineStore.cpp @@ -15,9 +15,7 @@ */ #include <utility> -#include <vector> #include "raul/log.hpp" -#include "raul/List.hpp" #include "raul/PathTable.hpp" #include "raul/TableImpl.hpp" #include "EngineStore.hpp" diff --git a/src/server/EventWriter.cpp b/src/server/EventWriter.cpp index a6482a38..f0a2f100 100644 --- a/src/server/EventWriter.cpp +++ b/src/server/EventWriter.cpp @@ -14,14 +14,8 @@ along with Ingen. If not, see <http://www.gnu.org/licenses/>. */ -#include <string> - -#include "raul/log.hpp" - #include "ingen/shared/URIs.hpp" -#include "Broadcaster.hpp" -#include "Driver.hpp" #include "Engine.hpp" #include "EventWriter.hpp" #include "events.hpp" diff --git a/src/server/GraphObjectImpl.cpp b/src/server/GraphObjectImpl.cpp index 8310b670..901be3eb 100644 --- a/src/server/GraphObjectImpl.cpp +++ b/src/server/GraphObjectImpl.cpp @@ -18,7 +18,6 @@ #include "GraphObjectImpl.hpp" #include "PatchImpl.hpp" -#include "EngineStore.hpp" #include "ThreadManager.hpp" using namespace std; diff --git a/src/server/InputPort.cpp b/src/server/InputPort.cpp index 8cb6415b..2510edfa 100644 --- a/src/server/InputPort.cpp +++ b/src/server/InputPort.cpp @@ -19,7 +19,6 @@ #include "ingen/Patch.hpp" -#include "AudioBuffer.hpp" #include "BufferFactory.hpp" #include "EdgeImpl.hpp" #include "Engine.hpp" @@ -28,10 +27,8 @@ #include "Notification.hpp" #include "OutputPort.hpp" #include "ProcessContext.hpp" -#include "ThreadManager.hpp" #include "ingen/shared/URIs.hpp" #include "mix.hpp" -#include "util.hpp" using namespace std; diff --git a/src/server/LV2Info.cpp b/src/server/LV2Info.cpp index 5355b11b..6e5d046a 100644 --- a/src/server/LV2Info.cpp +++ b/src/server/LV2Info.cpp @@ -17,7 +17,6 @@ #define __STDC_LIMIT_MACROS 1 #include <assert.h> -#include <stdint.h> #include "lv2/lv2plug.in/ns/ext/atom/atom.h" diff --git a/src/server/LV2Node.cpp b/src/server/LV2Node.cpp index 2e2631ac..91c1d2d1 100644 --- a/src/server/LV2Node.cpp +++ b/src/server/LV2Node.cpp @@ -14,7 +14,6 @@ along with Ingen. If not, see <http://www.gnu.org/licenses/>. */ -#include <float.h> #include <stdint.h> #include <cassert> @@ -35,7 +34,6 @@ #include "InputPort.hpp" #include "LV2Node.hpp" #include "LV2Plugin.hpp" -#include "MessageContext.hpp" #include "OutputPort.hpp" #include "ProcessContext.hpp" diff --git a/src/server/LV2Plugin.cpp b/src/server/LV2Plugin.cpp index d05690b9..9280d520 100644 --- a/src/server/LV2Plugin.cpp +++ b/src/server/LV2Plugin.cpp @@ -14,19 +14,14 @@ along with Ingen. If not, see <http://www.gnu.org/licenses/>. */ -#include <cassert> #include <string> -#include <glibmm.h> #include "ingen/shared/URIs.hpp" -#include "raul/log.hpp" -#include "sord/sordmm.hpp" #include "Driver.hpp" #include "Engine.hpp" #include "LV2Node.hpp" #include "LV2Plugin.hpp" -#include "NodeImpl.hpp" using namespace std; diff --git a/src/server/MessageContext.cpp b/src/server/MessageContext.cpp index d67437ca..3a4f9742 100644 --- a/src/server/MessageContext.cpp +++ b/src/server/MessageContext.cpp @@ -15,15 +15,12 @@ */ #include <algorithm> -#include "lv2/lv2plug.in/ns/ext/worker/worker.h" + #include "raul/log.hpp" -#include "EdgeImpl.hpp" + #include "Engine.hpp" #include "MessageContext.hpp" #include "NodeImpl.hpp" -#include "PatchImpl.hpp" -#include "PortImpl.hpp" -#include "ProcessContext.hpp" #include "ThreadManager.hpp" using namespace std; diff --git a/src/server/NodeFactory.cpp b/src/server/NodeFactory.cpp index 7bcb4088..c0b4d1e9 100644 --- a/src/server/NodeFactory.cpp +++ b/src/server/NodeFactory.cpp @@ -14,17 +14,11 @@ along with Ingen. If not, see <http://www.gnu.org/licenses/>. */ -#include <float.h> -#include <math.h> #include <stdlib.h> #include <string> -#include <glibmm/miscutils.h> - #include "lilv/lilv.h" -#include "raul/log.hpp" -#include "sord/sordmm.hpp" #include "internals/Controller.hpp" #include "internals/Delay.hpp" @@ -32,12 +26,9 @@ #include "internals/Trigger.hpp" #include "ingen/shared/World.hpp" -#include "Engine.hpp" #include "InternalPlugin.hpp" -#include "LV2Node.hpp" #include "LV2Plugin.hpp" #include "NodeFactory.hpp" -#include "PatchImpl.hpp" #include "ThreadManager.hpp" using namespace std; diff --git a/src/server/NodeImpl.cpp b/src/server/NodeImpl.cpp index 25a51565..a260f6ca 100644 --- a/src/server/NodeImpl.cpp +++ b/src/server/NodeImpl.cpp @@ -17,20 +17,16 @@ #include <assert.h> #include <stdint.h> -#include "lv2/lv2plug.in/ns/ext/worker/worker.h" #include "raul/Array.hpp" -#include "raul/List.hpp" #include "AudioBuffer.hpp" #include "Engine.hpp" -#include "EngineStore.hpp" #include "NodeImpl.hpp" #include "PatchImpl.hpp" #include "PluginImpl.hpp" #include "PortImpl.hpp" #include "ProcessContext.hpp" #include "ThreadManager.hpp" -#include "util.hpp" using namespace std; diff --git a/src/server/OutputPort.cpp b/src/server/OutputPort.cpp index f1f3dfd7..56da75d9 100644 --- a/src/server/OutputPort.cpp +++ b/src/server/OutputPort.cpp @@ -21,7 +21,6 @@ #include "Engine.hpp" #include "NodeImpl.hpp" #include "OutputPort.hpp" -#include "ProcessContext.hpp" #include "ingen/shared/URIs.hpp" using namespace std; diff --git a/src/server/PatchImpl.cpp b/src/server/PatchImpl.cpp index bd12f78a..de1fe43f 100644 --- a/src/server/PatchImpl.cpp +++ b/src/server/PatchImpl.cpp @@ -15,7 +15,6 @@ */ #include <cassert> -#include <cmath> #include <string> #include "ingen/shared/URIs.hpp" @@ -23,7 +22,6 @@ #include "raul/log.hpp" #include "EdgeImpl.hpp" -#include "Driver.hpp" #include "DuplexPort.hpp" #include "Engine.hpp" #include "NodeImpl.hpp" diff --git a/src/server/PortImpl.cpp b/src/server/PortImpl.cpp index 27d56bfc..ce4a0b5a 100644 --- a/src/server/PortImpl.cpp +++ b/src/server/PortImpl.cpp @@ -15,7 +15,6 @@ */ #include "ingen/shared/URIs.hpp" -#include "lv2/lv2plug.in/ns/ext/worker/worker.h" #include "raul/Array.hpp" #include "raul/Maid.hpp" diff --git a/src/server/PostProcessor.cpp b/src/server/PostProcessor.cpp index cb8566d5..3604ace1 100644 --- a/src/server/PostProcessor.cpp +++ b/src/server/PostProcessor.cpp @@ -16,15 +16,11 @@ #include <assert.h> -#include "raul/log.hpp" - -#include "Driver.hpp" #include "Engine.hpp" #include "Event.hpp" #include "Notification.hpp" #include "PostProcessor.hpp" #include "ProcessContext.hpp" -#include "ThreadManager.hpp" using namespace std; diff --git a/src/server/ProcessContext.cpp b/src/server/ProcessContext.cpp index 78f6d50e..66dbcb19 100644 --- a/src/server/ProcessContext.cpp +++ b/src/server/ProcessContext.cpp @@ -14,6 +14,7 @@ along with Ingen. If not, see <http://www.gnu.org/licenses/>. */ +#include "Engine.hpp" #include "ProcessContext.hpp" #include "ProcessSlave.hpp" diff --git a/src/server/ProcessContext.hpp b/src/server/ProcessContext.hpp index e10bbce8..9e0115e6 100644 --- a/src/server/ProcessContext.hpp +++ b/src/server/ProcessContext.hpp @@ -20,7 +20,6 @@ #include <vector> #include "Context.hpp" -#include "types.hpp" namespace Ingen { namespace Server { diff --git a/src/server/ProcessSlave.cpp b/src/server/ProcessSlave.cpp index 5be40bb5..83a8956f 100644 --- a/src/server/ProcessSlave.cpp +++ b/src/server/ProcessSlave.cpp @@ -14,9 +14,10 @@ along with Ingen. If not, see <http://www.gnu.org/licenses/>. */ -#include "ProcessSlave.hpp" -#include "NodeImpl.hpp" #include "CompiledPatch.hpp" +#include "NodeImpl.hpp" +#include "ProcessSlave.hpp" +#include "ThreadManager.hpp" using namespace std; diff --git a/src/server/ProcessSlave.hpp b/src/server/ProcessSlave.hpp index f3b514ca..742e9141 100644 --- a/src/server/ProcessSlave.hpp +++ b/src/server/ProcessSlave.hpp @@ -17,20 +17,18 @@ #ifndef INGEN_ENGINE_PROCESSSLAVE_HPP #define INGEN_ENGINE_PROCESSSLAVE_HPP -#include "raul/Array.hpp" +#include <stdint.h> + #include "raul/AtomicInt.hpp" #include "raul/Slave.hpp" - -#include "Driver.hpp" -#include "Engine.hpp" -#include "ProcessContext.hpp" -#include "ThreadManager.hpp" +#include "raul/log.hpp" namespace Ingen { namespace Server { -class NodeImpl; class CompiledPatch; +class Engine; +class ProcessContext; class ProcessSlave : protected Raul::Slave { public: diff --git a/src/server/events/Connect.cpp b/src/server/events/Connect.cpp index 92d89d35..d4df3e68 100644 --- a/src/server/events/Connect.cpp +++ b/src/server/events/Connect.cpp @@ -14,9 +14,6 @@ along with Ingen. If not, see <http://www.gnu.org/licenses/>. */ -#include <string> - -#include <boost/format.hpp> #include <glibmm/thread.h> #include "raul/Maid.hpp" @@ -25,14 +22,12 @@ #include "Broadcaster.hpp" #include "Connect.hpp" #include "EdgeImpl.hpp" -#include "DuplexPort.hpp" #include "Engine.hpp" #include "EngineStore.hpp" #include "InputPort.hpp" #include "OutputPort.hpp" #include "PatchImpl.hpp" #include "PortImpl.hpp" -#include "ProcessContext.hpp" #include "types.hpp" namespace Ingen { diff --git a/src/server/events/Connect.hpp b/src/server/events/Connect.hpp index a5799f77..a4bad5e8 100644 --- a/src/server/events/Connect.hpp +++ b/src/server/events/Connect.hpp @@ -20,9 +20,8 @@ #include "raul/Path.hpp" #include "Event.hpp" -#include "InputPort.hpp" -#include "PatchImpl.hpp" #include "types.hpp" +#include "BufferRef.hpp" namespace Raul { template <typename T> class Array; diff --git a/src/server/events/CreateNode.cpp b/src/server/events/CreateNode.cpp index f52e20a1..9b3cdd89 100644 --- a/src/server/events/CreateNode.cpp +++ b/src/server/events/CreateNode.cpp @@ -17,8 +17,6 @@ #include "ingen/shared/URIs.hpp" #include "raul/Maid.hpp" #include "raul/Path.hpp" -#include "raul/log.hpp" -#include "sord/sordmm.hpp" #include "Broadcaster.hpp" #include "CreateNode.hpp" diff --git a/src/server/events/CreatePatch.cpp b/src/server/events/CreatePatch.cpp index b802d066..9d1280e1 100644 --- a/src/server/events/CreatePatch.cpp +++ b/src/server/events/CreatePatch.cpp @@ -23,9 +23,7 @@ #include "Driver.hpp" #include "Engine.hpp" #include "EngineStore.hpp" -#include "NodeImpl.hpp" #include "PatchImpl.hpp" -#include "PluginImpl.hpp" namespace Ingen { namespace Server { diff --git a/src/server/events/Delete.hpp b/src/server/events/Delete.hpp index 4316763f..80051336 100644 --- a/src/server/events/Delete.hpp +++ b/src/server/events/Delete.hpp @@ -24,13 +24,11 @@ namespace Raul { template<typename T> class Array; -template<typename T> class ListNode; } namespace Ingen { namespace Server { -class GraphObjectImpl; class NodeImpl; class PortImpl; class EnginePort; diff --git a/src/server/events/Delta.cpp b/src/server/events/Delta.cpp index 34e9d63d..5f6af4a4 100644 --- a/src/server/events/Delta.cpp +++ b/src/server/events/Delta.cpp @@ -14,17 +14,12 @@ along with Ingen. If not, see <http://www.gnu.org/licenses/>. */ -#include <string> #include <vector> #include <glibmm/thread.h> -#include <boost/format.hpp> - -#include "raul/log.hpp" #include "raul/Maid.hpp" -#include "ingen/shared/URIMap.hpp" #include "ingen/shared/URIs.hpp" #include "Broadcaster.hpp" @@ -33,7 +28,6 @@ #include "CreatePatch.hpp" #include "CreatePort.hpp" #include "Delta.hpp" -#include "Driver.hpp" #include "Engine.hpp" #include "EngineStore.hpp" #include "GraphObjectImpl.hpp" diff --git a/src/server/events/Delta.hpp b/src/server/events/Delta.hpp index 935dcfac..bedba5ca 100644 --- a/src/server/events/Delta.hpp +++ b/src/server/events/Delta.hpp @@ -23,14 +23,17 @@ #include "ControlBindings.hpp" #include "Event.hpp" -#include "ingen/shared/ResourceImpl.hpp" namespace Ingen { + +namespace Shared { class ResourceImpl; } + namespace Server { -class GraphObjectImpl; -class PatchImpl; class CompiledPatch; +class Engine; +class PatchImpl; +class ProcessContext; namespace Events { diff --git a/src/shared/LV2Features.cpp b/src/shared/LV2Features.cpp index 1bfd3936..24b3f6fa 100644 --- a/src/shared/LV2Features.cpp +++ b/src/shared/LV2Features.cpp @@ -17,7 +17,6 @@ #include <cstdlib> #include "ingen/shared/LV2Features.hpp" -#include "ingen/shared/URIMap.hpp" using namespace std; diff --git a/src/shared/URIMap.cpp b/src/shared/URIMap.cpp index e8c7fbbc..be99db99 100644 --- a/src/shared/URIMap.cpp +++ b/src/shared/URIMap.cpp @@ -14,18 +14,11 @@ along with Ingen. If not, see <http://www.gnu.org/licenses/>. */ -#define __STDC_LIMIT_MACROS 1 - -#include <assert.h> #include <stdint.h> #include <glib.h> -#include <boost/shared_ptr.hpp> - #include "ingen/shared/URIMap.hpp" -#include "lv2/lv2plug.in/ns/ext/atom/atom.h" -#include "raul/log.hpp" using namespace std; diff --git a/src/shared/URIs.cpp b/src/shared/URIs.cpp index 2c44c826..277946d5 100644 --- a/src/shared/URIs.cpp +++ b/src/shared/URIs.cpp @@ -14,24 +14,12 @@ along with Ingen. If not, see <http://www.gnu.org/licenses/>. */ -#define __STDC_LIMIT_MACROS 1 - -#include <assert.h> -#include <stdint.h> - -#include <glib.h> - -#include <boost/shared_ptr.hpp> - #include "ingen/shared/URIMap.hpp" #include "ingen/shared/URIs.hpp" #include "lv2/lv2plug.in/ns/ext/atom/atom.h" #include "lv2/lv2plug.in/ns/ext/midi/midi.h" #include "lv2/lv2plug.in/ns/ext/patch/patch.h" #include "lv2/lv2plug.in/ns/lv2core/lv2.h" -#include "raul/log.hpp" - -using namespace std; namespace Ingen { namespace Shared { diff --git a/src/shared/World.cpp b/src/shared/World.cpp index 608a8409..05a941e9 100644 --- a/src/shared/World.cpp +++ b/src/shared/World.cpp @@ -21,8 +21,6 @@ #include <glibmm/miscutils.h> #include <glibmm/module.h> -#include "ingen/EngineBase.hpp" -#include "ingen/Interface.hpp" #include "ingen/shared/Configuration.hpp" #include "ingen/shared/LV2Features.hpp" #include "ingen/shared/Module.hpp" @@ -31,7 +29,6 @@ #include "ingen/shared/World.hpp" #include "ingen/shared/runtime_paths.hpp" #include "lilv/lilv.h" -#include "raul/Atom.hpp" #include "raul/log.hpp" #include "sord/sordmm.hpp" @@ -40,8 +37,16 @@ using namespace std; namespace Ingen { + +class EngineBase; +class Interface; + +namespace Serialisation { class Parser; class Serialiser; } + namespace Shared { +class Store; + /** Load a dynamic module from the default path. * * This will check in the directories specified in the environment variable |