summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/ingen/AtomForge.hpp2
-rw-r--r--include/ingen/DataAccess.hpp2
-rw-r--r--include/ingen/EngineBase.hpp2
-rw-r--r--include/ingen/InstanceAccess.hpp2
-rw-r--r--include/ingen/Interface.hpp2
-rw-r--r--include/ingen/LV2Features.hpp2
-rw-r--r--include/ingen/Log.hpp2
-rw-r--r--include/ingen/Node.hpp2
-rw-r--r--include/ingen/Serialiser.hpp2
-rw-r--r--include/ingen/SocketReader.hpp2
-rw-r--r--include/ingen/SocketWriter.hpp2
-rw-r--r--include/ingen/Store.hpp2
-rw-r--r--include/ingen/Tee.hpp2
-rw-r--r--include/ingen/URIMap.hpp2
-rw-r--r--include/ingen/World.hpp2
-rw-r--r--include/ingen/client/ArcModel.hpp2
-rw-r--r--include/ingen/client/BlockModel.hpp2
-rw-r--r--include/ingen/client/ClientStore.hpp2
-rw-r--r--include/ingen/client/GraphModel.hpp2
-rw-r--r--include/ingen/client/ObjectModel.hpp2
-rw-r--r--include/ingen/client/PluginModel.hpp2
-rw-r--r--include/ingen/client/PluginUI.hpp2
-rw-r--r--include/ingen/client/PortModel.hpp2
-rw-r--r--include/ingen/memory.hpp (renamed from include/ingen/types.hpp)8
-rw-r--r--src/Serialiser.cpp2
-rw-r--r--src/gui/App.hpp2
-rw-r--r--src/gui/Arc.hpp2
-rw-r--r--src/gui/BreadCrumbs.hpp2
-rw-r--r--src/gui/ConnectWindow.hpp2
-rw-r--r--src/gui/GraphBox.hpp2
-rw-r--r--src/gui/GraphCanvas.hpp2
-rw-r--r--src/gui/GraphView.hpp2
-rw-r--r--src/gui/GraphWindow.hpp2
-rw-r--r--src/gui/LoadGraphWindow.hpp2
-rw-r--r--src/gui/LoadPluginWindow.hpp2
-rw-r--r--src/gui/NewSubgraphWindow.hpp2
-rw-r--r--src/gui/NodeMenu.hpp2
-rw-r--r--src/gui/NodeModule.hpp2
-rw-r--r--src/gui/ObjectMenu.hpp2
-rw-r--r--src/gui/PluginMenu.hpp2
-rw-r--r--src/gui/Port.hpp2
-rw-r--r--src/gui/PortMenu.cpp2
-rw-r--r--src/gui/PortMenu.hpp2
-rw-r--r--src/gui/PropertiesWindow.hpp2
-rw-r--r--src/gui/RDFS.hpp2
-rw-r--r--src/gui/RenameWindow.hpp2
-rw-r--r--src/gui/SubgraphModule.hpp2
-rw-r--r--src/gui/WindowFactory.hpp2
-rw-r--r--src/gui/ingen_gui_lv2.cpp2
-rw-r--r--src/ingen/ingen.cpp2
-rw-r--r--src/server/BlockFactory.hpp2
-rw-r--r--src/server/Broadcaster.hpp2
-rw-r--r--src/server/Buffer.hpp2
-rw-r--r--src/server/ClientUpdate.cpp2
-rw-r--r--src/server/CompiledGraph.hpp2
-rw-r--r--src/server/ControlBindings.hpp2
-rw-r--r--src/server/DuplexPort.cpp2
-rw-r--r--src/server/Engine.cpp2
-rw-r--r--src/server/Engine.hpp2
-rw-r--r--src/server/Event.hpp2
-rw-r--r--src/server/EventWriter.hpp2
-rw-r--r--src/server/GraphImpl.hpp2
-rw-r--r--src/server/InputPort.hpp2
-rw-r--r--src/server/JackDriver.hpp2
-rw-r--r--src/server/RunContext.hpp2
-rw-r--r--src/server/Worker.cpp2
-rw-r--r--src/server/Worker.hpp2
-rw-r--r--src/server/events/CreateGraph.hpp2
-rw-r--r--src/server/ingen_lv2.cpp2
-rw-r--r--src/server/ingen_portaudio.cpp2
-rw-r--r--tests/ingen_bench.cpp2
-rw-r--r--tests/ingen_test.cpp2
72 files changed, 75 insertions, 75 deletions
diff --git a/include/ingen/AtomForge.hpp b/include/ingen/AtomForge.hpp
index 24e42186..ac8d15aa 100644
--- a/include/ingen/AtomForge.hpp
+++ b/include/ingen/AtomForge.hpp
@@ -17,7 +17,7 @@
#ifndef INGEN_ATOMFORGE_HPP
#define INGEN_ATOMFORGE_HPP
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "lv2/atom/atom.h"
#include "lv2/atom/forge.h"
#include "lv2/atom/util.h"
diff --git a/include/ingen/DataAccess.hpp b/include/ingen/DataAccess.hpp
index acea8bd3..b06c8dec 100644
--- a/include/ingen/DataAccess.hpp
+++ b/include/ingen/DataAccess.hpp
@@ -21,7 +21,7 @@
#include "ingen/Node.hpp"
#include "ingen/Store.hpp"
#include "ingen/World.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "lilv/lilv.h"
#include "lv2/core/lv2.h"
#include "lv2/data-access/data-access.h"
diff --git a/include/ingen/EngineBase.hpp b/include/ingen/EngineBase.hpp
index 36742601..f74612ac 100644
--- a/include/ingen/EngineBase.hpp
+++ b/include/ingen/EngineBase.hpp
@@ -18,7 +18,7 @@
#define INGEN_ENGINEBASE_HPP
#include "ingen/ingen.h"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include <chrono>
#include <cstddef>
diff --git a/include/ingen/InstanceAccess.hpp b/include/ingen/InstanceAccess.hpp
index 782161f1..4d67d8db 100644
--- a/include/ingen/InstanceAccess.hpp
+++ b/include/ingen/InstanceAccess.hpp
@@ -21,7 +21,7 @@
#include "ingen/Node.hpp"
#include "ingen/Store.hpp"
#include "ingen/World.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "lilv/lilv.h"
#include "lv2/core/lv2.h"
diff --git a/include/ingen/Interface.hpp b/include/ingen/Interface.hpp
index 6ce12c6a..8a87af8b 100644
--- a/include/ingen/Interface.hpp
+++ b/include/ingen/Interface.hpp
@@ -26,7 +26,7 @@
#include "ingen/Resource.hpp"
#include "ingen/Status.hpp"
#include "ingen/ingen.h"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include <cstdint>
#include <string>
diff --git a/include/ingen/LV2Features.hpp b/include/ingen/LV2Features.hpp
index 75d5b377..ae201bf6 100644
--- a/include/ingen/LV2Features.hpp
+++ b/include/ingen/LV2Features.hpp
@@ -18,7 +18,7 @@
#define INGEN_LV2FEATURES_HPP
#include "ingen/ingen.h"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "lv2/core/lv2.h"
#include "raul/Noncopyable.hpp"
diff --git a/include/ingen/Log.hpp b/include/ingen/Log.hpp
index d668e873..96f03ae2 100644
--- a/include/ingen/Log.hpp
+++ b/include/ingen/Log.hpp
@@ -20,7 +20,7 @@
#include "ingen/LV2Features.hpp"
#include "ingen/fmt.hpp"
#include "ingen/ingen.h"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "lv2/core/lv2.h"
#include "lv2/log/log.h"
#include "lv2/urid/urid.h"
diff --git a/include/ingen/Node.hpp b/include/ingen/Node.hpp
index 148a9103..fd96d628 100644
--- a/include/ingen/Node.hpp
+++ b/include/ingen/Node.hpp
@@ -19,8 +19,8 @@
#include "ingen/Resource.hpp"
#include "ingen/ingen.h"
+#include "ingen/memory.hpp"
#include "ingen/paths.hpp"
-#include "ingen/types.hpp"
#include "lilv/lilv.h"
#include <cstdint>
diff --git a/include/ingen/Serialiser.hpp b/include/ingen/Serialiser.hpp
index 1ac5c151..7311d6ce 100644
--- a/include/ingen/Serialiser.hpp
+++ b/include/ingen/Serialiser.hpp
@@ -20,7 +20,7 @@
#include "ingen/FilePath.hpp"
#include "ingen/Properties.hpp"
#include "ingen/ingen.h"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "sord/sordmm.hpp"
#include <string>
diff --git a/include/ingen/SocketReader.hpp b/include/ingen/SocketReader.hpp
index 85d1adc0..c9bc2a21 100644
--- a/include/ingen/SocketReader.hpp
+++ b/include/ingen/SocketReader.hpp
@@ -18,7 +18,7 @@
#define INGEN_SOCKETREADER_HPP
#include "ingen/ingen.h"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "serd/serd.h"
#include "sord/sord.h"
diff --git a/include/ingen/SocketWriter.hpp b/include/ingen/SocketWriter.hpp
index a5c651ef..458520a3 100644
--- a/include/ingen/SocketWriter.hpp
+++ b/include/ingen/SocketWriter.hpp
@@ -20,7 +20,7 @@
#include "ingen/Message.hpp"
#include "ingen/TurtleWriter.hpp"
#include "ingen/ingen.h"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include <cstddef>
diff --git a/include/ingen/Store.hpp b/include/ingen/Store.hpp
index 1aa90936..fd801b02 100644
--- a/include/ingen/Store.hpp
+++ b/include/ingen/Store.hpp
@@ -18,7 +18,7 @@
#define INGEN_STORE_HPP
#include "ingen/ingen.h"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "raul/Deletable.hpp"
#include "raul/Noncopyable.hpp"
#include "raul/Path.hpp"
diff --git a/include/ingen/Tee.hpp b/include/ingen/Tee.hpp
index 0a560f5c..a56f4dfe 100644
--- a/include/ingen/Tee.hpp
+++ b/include/ingen/Tee.hpp
@@ -19,7 +19,7 @@
#include "ingen/Interface.hpp"
#include "ingen/Message.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include <cstddef>
#include <mutex>
diff --git a/include/ingen/URIMap.hpp b/include/ingen/URIMap.hpp
index 890917f1..cfd6d6d8 100644
--- a/include/ingen/URIMap.hpp
+++ b/include/ingen/URIMap.hpp
@@ -19,7 +19,7 @@
#include "ingen/LV2Features.hpp"
#include "ingen/ingen.h"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "lv2/core/lv2.h"
#include "lv2/urid/urid.h"
#include "raul/Noncopyable.hpp"
diff --git a/include/ingen/World.hpp b/include/ingen/World.hpp
index e06c0a18..5c056ef7 100644
--- a/include/ingen/World.hpp
+++ b/include/ingen/World.hpp
@@ -18,7 +18,7 @@
#define INGEN_WORLD_HPP
#include "ingen/ingen.h"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "lv2/log/log.h"
#include "lv2/urid/urid.h"
#include "raul/Noncopyable.hpp"
diff --git a/include/ingen/client/ArcModel.hpp b/include/ingen/client/ArcModel.hpp
index e42dd7bd..582314ca 100644
--- a/include/ingen/client/ArcModel.hpp
+++ b/include/ingen/client/ArcModel.hpp
@@ -20,7 +20,7 @@
#include "ingen/Arc.hpp"
#include "ingen/client/PortModel.hpp"
#include "ingen/ingen.h"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "raul/Path.hpp"
#include <cassert>
diff --git a/include/ingen/client/BlockModel.hpp b/include/ingen/client/BlockModel.hpp
index 5e17d31d..ac034242 100644
--- a/include/ingen/client/BlockModel.hpp
+++ b/include/ingen/client/BlockModel.hpp
@@ -21,7 +21,7 @@
#include "ingen/client/ObjectModel.hpp"
#include "ingen/client/PluginModel.hpp"
#include "ingen/ingen.h"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include <algorithm>
#include <cstdint>
diff --git a/include/ingen/client/ClientStore.hpp b/include/ingen/client/ClientStore.hpp
index 54eaf373..77042109 100644
--- a/include/ingen/client/ClientStore.hpp
+++ b/include/ingen/client/ClientStore.hpp
@@ -23,7 +23,7 @@
#include "ingen/URI.hpp"
#include "ingen/client/signal.hpp"
#include "ingen/ingen.h"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "raul/Path.hpp"
#include <map>
diff --git a/include/ingen/client/GraphModel.hpp b/include/ingen/client/GraphModel.hpp
index 2248e7e3..190c08eb 100644
--- a/include/ingen/client/GraphModel.hpp
+++ b/include/ingen/client/GraphModel.hpp
@@ -22,7 +22,7 @@
#include "ingen/client/BlockModel.hpp"
#include "ingen/client/signal.hpp"
#include "ingen/ingen.h"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include <cstdint>
diff --git a/include/ingen/client/ObjectModel.hpp b/include/ingen/client/ObjectModel.hpp
index 39729377..a1e603f6 100644
--- a/include/ingen/client/ObjectModel.hpp
+++ b/include/ingen/client/ObjectModel.hpp
@@ -26,7 +26,7 @@
#include "ingen/URIs.hpp"
#include "ingen/client/signal.hpp"
#include "ingen/ingen.h"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "raul/Path.hpp"
#include "raul/Symbol.hpp"
diff --git a/include/ingen/client/PluginModel.hpp b/include/ingen/client/PluginModel.hpp
index 8afcd38f..9c5acc78 100644
--- a/include/ingen/client/PluginModel.hpp
+++ b/include/ingen/client/PluginModel.hpp
@@ -22,7 +22,7 @@
#include "ingen/World.hpp"
#include "ingen/client/signal.hpp"
#include "ingen/ingen.h"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "lilv/lilv.h"
#include "raul/Symbol.hpp"
#include "sord/sordmm.hpp"
diff --git a/include/ingen/client/PluginUI.hpp b/include/ingen/client/PluginUI.hpp
index 70ff7274..89c951c3 100644
--- a/include/ingen/client/PluginUI.hpp
+++ b/include/ingen/client/PluginUI.hpp
@@ -22,7 +22,7 @@
#include "ingen/LV2Features.hpp"
#include "ingen/Resource.hpp"
#include "ingen/ingen.h"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "lilv/lilv.h"
#include "suil/suil.h"
diff --git a/include/ingen/client/PortModel.hpp b/include/ingen/client/PortModel.hpp
index c386dff0..46034b2f 100644
--- a/include/ingen/client/PortModel.hpp
+++ b/include/ingen/client/PortModel.hpp
@@ -19,7 +19,7 @@
#include "ingen/client/ObjectModel.hpp"
#include "ingen/ingen.h"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "lv2/core/lv2.h"
#include "lv2/port-props/port-props.h"
diff --git a/include/ingen/types.hpp b/include/ingen/memory.hpp
index 2962d16a..dd56ac4b 100644
--- a/include/ingen/types.hpp
+++ b/include/ingen/memory.hpp
@@ -1,6 +1,6 @@
/*
This file is part of Ingen.
- Copyright 2007-2015 David Robillard <http://drobilla.net/>
+ Copyright 2007-2020 David Robillard <http://drobilla.net/>
Ingen is free software: you can redistribute it and/or modify it under the
terms of the GNU Affero General Public License as published by the Free
@@ -14,8 +14,8 @@
along with Ingen. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef INGEN_TYPES_HPP
-#define INGEN_TYPES_HPP
+#ifndef INGEN_MEMORY_HPP
+#define INGEN_MEMORY_HPP
#include "raul/Maid.hpp"
@@ -51,4 +51,4 @@ make_unique(Args&&... args)
} // namespace ingen
-#endif // INGEN_TYPES_HPP
+#endif // INGEN_MEMORY_HPP
diff --git a/src/Serialiser.cpp b/src/Serialiser.cpp
index 6632a2e7..2ab0f039 100644
--- a/src/Serialiser.cpp
+++ b/src/Serialiser.cpp
@@ -29,8 +29,8 @@
#include "ingen/URIs.hpp"
#include "ingen/World.hpp"
#include "ingen/filesystem.hpp"
+#include "ingen/memory.hpp"
#include "ingen/runtime_paths.hpp"
-#include "ingen/types.hpp"
#include "lv2/core/lv2.h"
#include "lv2/state/state.h"
#include "lv2/ui/ui.h"
diff --git a/src/gui/App.hpp b/src/gui/App.hpp
index 2e45880d..0b504361 100644
--- a/src/gui/App.hpp
+++ b/src/gui/App.hpp
@@ -23,7 +23,7 @@
#include "ingen/Status.hpp"
#include "ingen/World.hpp"
#include "ingen/ingen.h"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "lilv/lilv.h"
#include "raul/Deletable.hpp"
diff --git a/src/gui/Arc.hpp b/src/gui/Arc.hpp
index 7e33384b..a20c4e5f 100644
--- a/src/gui/Arc.hpp
+++ b/src/gui/Arc.hpp
@@ -18,7 +18,7 @@
#define INGEN_GUI_ARC_HPP
#include "ganv/Edge.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include <cassert>
diff --git a/src/gui/BreadCrumbs.hpp b/src/gui/BreadCrumbs.hpp
index 803a72f4..d62a7ee0 100644
--- a/src/gui/BreadCrumbs.hpp
+++ b/src/gui/BreadCrumbs.hpp
@@ -21,7 +21,7 @@
#include "ingen/Message.hpp"
#include "ingen/client/GraphModel.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "raul/Path.hpp"
#include <gtkmm/box.h>
diff --git a/src/gui/ConnectWindow.hpp b/src/gui/ConnectWindow.hpp
index 481e4d83..f350e97d 100644
--- a/src/gui/ConnectWindow.hpp
+++ b/src/gui/ConnectWindow.hpp
@@ -20,7 +20,7 @@
#include "Window.hpp"
#include "ingen/Message.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "lilv/lilv.h"
#include <gtkmm/builder.h>
diff --git a/src/gui/GraphBox.hpp b/src/gui/GraphBox.hpp
index 7978d573..e2a1ce98 100644
--- a/src/gui/GraphBox.hpp
+++ b/src/gui/GraphBox.hpp
@@ -29,7 +29,7 @@
#include <gtkmm/statusbar.h>
#include "ingen/ingen.h"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "Window.hpp"
diff --git a/src/gui/GraphCanvas.hpp b/src/gui/GraphCanvas.hpp
index 9e6c4760..658e0f96 100644
--- a/src/gui/GraphCanvas.hpp
+++ b/src/gui/GraphCanvas.hpp
@@ -23,7 +23,7 @@
#include "ganv/Module.hpp"
#include "ingen/Node.hpp"
#include "ingen/client/ArcModel.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "lilv/lilv.h"
#include "raul/Path.hpp"
diff --git a/src/gui/GraphView.hpp b/src/gui/GraphView.hpp
index fc7356f3..0a4a6d21 100644
--- a/src/gui/GraphView.hpp
+++ b/src/gui/GraphView.hpp
@@ -17,7 +17,7 @@
#ifndef INGEN_GUI_GRAPHVIEW_HPP
#define INGEN_GUI_GRAPHVIEW_HPP
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include <gtkmm/box.h>
#include <gtkmm/builder.h>
diff --git a/src/gui/GraphWindow.hpp b/src/gui/GraphWindow.hpp
index cca283d3..795f0925 100644
--- a/src/gui/GraphWindow.hpp
+++ b/src/gui/GraphWindow.hpp
@@ -20,7 +20,7 @@
#include "GraphBox.hpp"
#include "Window.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include <gtkmm/builder.h>
diff --git a/src/gui/LoadGraphWindow.hpp b/src/gui/LoadGraphWindow.hpp
index 03b96f72..7b26eb7d 100644
--- a/src/gui/LoadGraphWindow.hpp
+++ b/src/gui/LoadGraphWindow.hpp
@@ -18,7 +18,7 @@
#define INGEN_GUI_LOADGRAPHWINDOW_HPP
#include "ingen/Node.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include <gtkmm/builder.h>
#include <gtkmm/button.h>
diff --git a/src/gui/LoadPluginWindow.hpp b/src/gui/LoadPluginWindow.hpp
index f65dfff5..b9cfaf28 100644
--- a/src/gui/LoadPluginWindow.hpp
+++ b/src/gui/LoadPluginWindow.hpp
@@ -21,7 +21,7 @@
#include "ingen/Node.hpp"
#include "ingen/client/ClientStore.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "ingen_config.h"
#include <gtkmm/builder.h>
diff --git a/src/gui/NewSubgraphWindow.hpp b/src/gui/NewSubgraphWindow.hpp
index 2d249cf3..69c35d05 100644
--- a/src/gui/NewSubgraphWindow.hpp
+++ b/src/gui/NewSubgraphWindow.hpp
@@ -20,7 +20,7 @@
#include "Window.hpp"
#include "ingen/Node.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include <gtkmm/builder.h>
#include <gtkmm/button.h>
diff --git a/src/gui/NodeMenu.hpp b/src/gui/NodeMenu.hpp
index 8bc820e8..a997e03f 100644
--- a/src/gui/NodeMenu.hpp
+++ b/src/gui/NodeMenu.hpp
@@ -20,7 +20,7 @@
#include "ObjectMenu.hpp"
#include "ingen/client/BlockModel.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include <gtkmm/builder.h>
#include <gtkmm/menu.h>
diff --git a/src/gui/NodeModule.hpp b/src/gui/NodeModule.hpp
index 81067fbd..d4b845cf 100644
--- a/src/gui/NodeModule.hpp
+++ b/src/gui/NodeModule.hpp
@@ -18,7 +18,7 @@
#define INGEN_GUI_NODEMODULE_HPP
#include "ganv/Module.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "Port.hpp"
diff --git a/src/gui/ObjectMenu.hpp b/src/gui/ObjectMenu.hpp
index 22eef74b..8714917e 100644
--- a/src/gui/ObjectMenu.hpp
+++ b/src/gui/ObjectMenu.hpp
@@ -18,7 +18,7 @@
#define INGEN_GUI_OBJECTMENU_HPP
#include "ingen/client/ObjectModel.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include <gtkmm/builder.h>
#include <gtkmm/checkmenuitem.h>
diff --git a/src/gui/PluginMenu.hpp b/src/gui/PluginMenu.hpp
index 6c7aa6b0..a701de74 100644
--- a/src/gui/PluginMenu.hpp
+++ b/src/gui/PluginMenu.hpp
@@ -18,7 +18,7 @@
#define INGEN_GUI_PLUGINMENU_HPP
#include "ingen/World.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "lilv/lilv.h"
#include <gtkmm/menu.h>
diff --git a/src/gui/Port.hpp b/src/gui/Port.hpp
index ce1224ab..72b91b2e 100644
--- a/src/gui/Port.hpp
+++ b/src/gui/Port.hpp
@@ -18,7 +18,7 @@
#define INGEN_GUI_PORT_HPP
#include "ganv/Port.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include <gtkmm/menu.h>
diff --git a/src/gui/PortMenu.cpp b/src/gui/PortMenu.cpp
index 2fc8ec2e..fc25e1c1 100644
--- a/src/gui/PortMenu.cpp
+++ b/src/gui/PortMenu.cpp
@@ -22,7 +22,7 @@
#include "ingen/Interface.hpp"
#include "ingen/client/GraphModel.hpp"
#include "ingen/client/PortModel.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include <memory>
#include <string>
diff --git a/src/gui/PortMenu.hpp b/src/gui/PortMenu.hpp
index 26298e76..8cb069f7 100644
--- a/src/gui/PortMenu.hpp
+++ b/src/gui/PortMenu.hpp
@@ -20,7 +20,7 @@
#include "ObjectMenu.hpp"
#include "ingen/client/PortModel.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include <gtkmm/builder.h>
#include <gtkmm/menu.h>
diff --git a/src/gui/PropertiesWindow.hpp b/src/gui/PropertiesWindow.hpp
index 81e29ae1..015c0a93 100644
--- a/src/gui/PropertiesWindow.hpp
+++ b/src/gui/PropertiesWindow.hpp
@@ -20,7 +20,7 @@
#include "Window.hpp"
#include "ingen/client/BlockModel.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include <gtkmm/alignment.h>
#include <gtkmm/box.h>
diff --git a/src/gui/RDFS.hpp b/src/gui/RDFS.hpp
index a8d161cb..d2812bc0 100644
--- a/src/gui/RDFS.hpp
+++ b/src/gui/RDFS.hpp
@@ -18,7 +18,7 @@
#define INGEN_GUI_RDF_HPP
#include "ingen/URI.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "lilv/lilv.h"
#include <map>
diff --git a/src/gui/RenameWindow.hpp b/src/gui/RenameWindow.hpp
index 3b50f04e..2ea2d897 100644
--- a/src/gui/RenameWindow.hpp
+++ b/src/gui/RenameWindow.hpp
@@ -20,7 +20,7 @@
#include "Window.hpp"
#include "ingen/client/ObjectModel.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include <gtkmm/builder.h>
#include <gtkmm/button.h>
diff --git a/src/gui/SubgraphModule.hpp b/src/gui/SubgraphModule.hpp
index 24b63a27..1571c2ee 100644
--- a/src/gui/SubgraphModule.hpp
+++ b/src/gui/SubgraphModule.hpp
@@ -17,7 +17,7 @@
#ifndef INGEN_GUI_SUBGRAPHMODULE_HPP
#define INGEN_GUI_SUBGRAPHMODULE_HPP
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "GraphPortModule.hpp"
#include "NodeModule.hpp"
diff --git a/src/gui/WindowFactory.hpp b/src/gui/WindowFactory.hpp
index e6eeb449..77d84ac6 100644
--- a/src/gui/WindowFactory.hpp
+++ b/src/gui/WindowFactory.hpp
@@ -18,7 +18,7 @@
#define INGEN_GUI_WINDOWFACTORY_HPP
#include "ingen/Node.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include <cstddef>
#include <map>
diff --git a/src/gui/ingen_gui_lv2.cpp b/src/gui/ingen_gui_lv2.cpp
index ce33f2ac..c90efa4b 100644
--- a/src/gui/ingen_gui_lv2.cpp
+++ b/src/gui/ingen_gui_lv2.cpp
@@ -30,9 +30,9 @@
#include "ingen/client/GraphModel.hpp"
#include "ingen/client/SigClientInterface.hpp"
#include "ingen/ingen.h"
+#include "ingen/memory.hpp"
#include "ingen/paths.hpp"
#include "ingen/runtime_paths.hpp"
-#include "ingen/types.hpp"
#include "lv2/atom/atom.h"
#include "lv2/atom/util.h"
#include "lv2/core/lv2.h"
diff --git a/src/ingen/ingen.cpp b/src/ingen/ingen.cpp
index 3a1ebc8f..948e80dd 100644
--- a/src/ingen/ingen.cpp
+++ b/src/ingen/ingen.cpp
@@ -20,9 +20,9 @@
#include "ingen/Log.hpp"
#include "ingen/Parser.hpp"
#include "ingen/World.hpp"
+#include "ingen/memory.hpp"
#include "ingen/paths.hpp"
#include "ingen/runtime_paths.hpp"
-#include "ingen/types.hpp"
#include "ingen_config.h"
#include "raul/Path.hpp"
#include "raul/Symbol.hpp"
diff --git a/src/server/BlockFactory.hpp b/src/server/BlockFactory.hpp
index 234a20fa..aff2e9f4 100644
--- a/src/server/BlockFactory.hpp
+++ b/src/server/BlockFactory.hpp
@@ -18,7 +18,7 @@
#define INGEN_ENGINE_BLOCKFACTORY_HPP
#include "ingen/URI.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "raul/Noncopyable.hpp"
#include <map>
diff --git a/src/server/Broadcaster.hpp b/src/server/Broadcaster.hpp
index 1a45a83d..c766ceed 100644
--- a/src/server/Broadcaster.hpp
+++ b/src/server/Broadcaster.hpp
@@ -22,7 +22,7 @@
#include "ingen/Interface.hpp"
#include "ingen/Message.hpp"
#include "ingen/URI.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "raul/Noncopyable.hpp"
#include <atomic>
diff --git a/src/server/Buffer.hpp b/src/server/Buffer.hpp
index 7593900e..b1ec1c68 100644
--- a/src/server/Buffer.hpp
+++ b/src/server/Buffer.hpp
@@ -24,7 +24,7 @@
#include "ingen/URIs.hpp"
#include "ingen/ingen.h"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "lv2/atom/atom.h"
#include "lv2/urid/urid.h"
diff --git a/src/server/ClientUpdate.cpp b/src/server/ClientUpdate.cpp
index 0c0f9203..f0eaa1bf 100644
--- a/src/server/ClientUpdate.cpp
+++ b/src/server/ClientUpdate.cpp
@@ -29,7 +29,7 @@
#include "ingen/Interface.hpp"
#include "ingen/Node.hpp"
#include "ingen/URIs.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include <algorithm>
#include <cstddef>
diff --git a/src/server/CompiledGraph.hpp b/src/server/CompiledGraph.hpp
index d2815bff..9a06a7c9 100644
--- a/src/server/CompiledGraph.hpp
+++ b/src/server/CompiledGraph.hpp
@@ -19,7 +19,7 @@
#include "Task.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "raul/Maid.hpp"
#include "raul/Noncopyable.hpp"
diff --git a/src/server/ControlBindings.hpp b/src/server/ControlBindings.hpp
index 92128cb6..f465775b 100644
--- a/src/server/ControlBindings.hpp
+++ b/src/server/ControlBindings.hpp
@@ -19,7 +19,7 @@
#include "BufferRef.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "lv2/atom/forge.h"
#include "raul/Maid.hpp"
diff --git a/src/server/DuplexPort.cpp b/src/server/DuplexPort.cpp
index 7ba466a7..ec33459b 100644
--- a/src/server/DuplexPort.cpp
+++ b/src/server/DuplexPort.cpp
@@ -29,7 +29,7 @@
#include "ingen/Node.hpp"
#include "ingen/Properties.hpp"
#include "ingen/URIs.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "raul/Array.hpp"
#include <algorithm>
diff --git a/src/server/Engine.cpp b/src/server/Engine.cpp
index cfe9757a..fb600644 100644
--- a/src/server/Engine.cpp
+++ b/src/server/Engine.cpp
@@ -48,7 +48,7 @@
#include "ingen/Tee.hpp"
#include "ingen/URIs.hpp"
#include "ingen/World.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "lv2/buf-size/buf-size.h"
#include "lv2/state/state.h"
#include "raul/Maid.hpp"
diff --git a/src/server/Engine.hpp b/src/server/Engine.hpp
index 9162f12f..08ecac98 100644
--- a/src/server/Engine.hpp
+++ b/src/server/Engine.hpp
@@ -25,7 +25,7 @@
#include "ingen/EngineBase.hpp"
#include "ingen/Properties.hpp"
#include "ingen/ingen.h"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include <chrono>
#include <condition_variable>
diff --git a/src/server/Event.hpp b/src/server/Event.hpp
index 8fc71be1..93c175b8 100644
--- a/src/server/Event.hpp
+++ b/src/server/Event.hpp
@@ -22,7 +22,7 @@
#include "ingen/Interface.hpp"
#include "ingen/Node.hpp"
#include "ingen/Status.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "raul/Deletable.hpp"
#include "raul/Noncopyable.hpp"
#include "raul/Path.hpp"
diff --git a/src/server/EventWriter.hpp b/src/server/EventWriter.hpp
index f0499f10..3bf1d03b 100644
--- a/src/server/EventWriter.hpp
+++ b/src/server/EventWriter.hpp
@@ -23,7 +23,7 @@
#include "ingen/Interface.hpp"
#include "ingen/Message.hpp"
#include "ingen/URI.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
namespace ingen {
namespace server {
diff --git a/src/server/GraphImpl.hpp b/src/server/GraphImpl.hpp
index 0ca5b8dd..455e9c8a 100644
--- a/src/server/GraphImpl.hpp
+++ b/src/server/GraphImpl.hpp
@@ -21,7 +21,7 @@
#include "DuplexPort.hpp"
#include "ThreadManager.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "lv2/urid/urid.h"
#include <cassert>
diff --git a/src/server/InputPort.hpp b/src/server/InputPort.hpp
index dfe8b92a..ad8b10a4 100644
--- a/src/server/InputPort.hpp
+++ b/src/server/InputPort.hpp
@@ -22,7 +22,7 @@
#include "PortType.hpp"
#include "types.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "lv2/urid/urid.h"
#include <boost/intrusive/options.hpp>
diff --git a/src/server/JackDriver.hpp b/src/server/JackDriver.hpp
index ecaaec5f..34d25f65 100644
--- a/src/server/JackDriver.hpp
+++ b/src/server/JackDriver.hpp
@@ -21,7 +21,7 @@
#include "EnginePort.hpp"
#include "ingen_config.h"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "lv2/atom/forge.h"
#include "raul/Semaphore.hpp"
diff --git a/src/server/RunContext.hpp b/src/server/RunContext.hpp
index 7859d545..cf2bfe10 100644
--- a/src/server/RunContext.hpp
+++ b/src/server/RunContext.hpp
@@ -17,7 +17,7 @@
#ifndef INGEN_ENGINE_RUNCONTEXT_HPP
#define INGEN_ENGINE_RUNCONTEXT_HPP
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "types.hpp"
#include "lv2/urid/urid.h"
diff --git a/src/server/Worker.cpp b/src/server/Worker.cpp
index 8e6bcb26..69f9eec6 100644
--- a/src/server/Worker.cpp
+++ b/src/server/Worker.cpp
@@ -21,7 +21,7 @@
#include "LV2Block.hpp"
#include "ingen/Log.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "lv2/worker/worker.h"
#include <cstdlib>
diff --git a/src/server/Worker.hpp b/src/server/Worker.hpp
index 2e4a965f..ae7e9f1e 100644
--- a/src/server/Worker.hpp
+++ b/src/server/Worker.hpp
@@ -18,7 +18,7 @@
#define INGEN_ENGINE_WORKER_HPP
#include "ingen/LV2Features.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "lv2/worker/worker.h"
#include "raul/RingBuffer.hpp"
#include "raul/Semaphore.hpp"
diff --git a/src/server/events/CreateGraph.hpp b/src/server/events/CreateGraph.hpp
index 4ab3f4af..b755d8f2 100644
--- a/src/server/events/CreateGraph.hpp
+++ b/src/server/events/CreateGraph.hpp
@@ -21,7 +21,7 @@
#include "CompiledGraph.hpp"
#include "Event.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include <cstdint>
#include <list>
diff --git a/src/server/ingen_lv2.cpp b/src/server/ingen_lv2.cpp
index a38be08b..9b66fe7c 100644
--- a/src/server/ingen_lv2.cpp
+++ b/src/server/ingen_lv2.cpp
@@ -43,8 +43,8 @@
#include "ingen/URIs.hpp"
#include "ingen/World.hpp"
#include "ingen/ingen.h"
+#include "ingen/memory.hpp"
#include "ingen/runtime_paths.hpp"
-#include "ingen/types.hpp"
#include "lv2/atom/atom.h"
#include "lv2/atom/util.h"
#include "lv2/buf-size/buf-size.h"
diff --git a/src/server/ingen_portaudio.cpp b/src/server/ingen_portaudio.cpp
index 81f6e65c..f5d95fb0 100644
--- a/src/server/ingen_portaudio.cpp
+++ b/src/server/ingen_portaudio.cpp
@@ -20,7 +20,7 @@
#include "ingen/Log.hpp"
#include "ingen/Module.hpp"
#include "ingen/World.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
namespace ingen { namespace server { class Driver; } }
diff --git a/tests/ingen_bench.cpp b/tests/ingen_bench.cpp
index 49a52d54..126b7e13 100644
--- a/tests/ingen_bench.cpp
+++ b/tests/ingen_bench.cpp
@@ -21,8 +21,8 @@
#include "ingen/Forge.hpp"
#include "ingen/Parser.hpp"
#include "ingen/World.hpp"
+#include "ingen/memory.hpp"
#include "ingen/runtime_paths.hpp"
-#include "ingen/types.hpp"
#include <chrono>
#include <cstdint>
diff --git a/tests/ingen_test.cpp b/tests/ingen_test.cpp
index 3e33bfd4..fbcc5cc0 100644
--- a/tests/ingen_test.cpp
+++ b/tests/ingen_test.cpp
@@ -34,8 +34,8 @@
#include "ingen/World.hpp"
#include "ingen/filesystem.hpp"
#include "ingen/fmt.hpp"
+#include "ingen/memory.hpp"
#include "ingen/runtime_paths.hpp"
-#include "ingen/types.hpp"
#include "raul/Path.hpp"
#include "serd/serd.h"
#include "sord/sordmm.hpp"