summaryrefslogtreecommitdiffstats
path: root/src/server/internals
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2019-03-08 10:53:07 +0100
committerDavid Robillard <d@drobilla.net>2019-03-09 00:43:43 +0100
commit20af728fdf07478b5a146370b59f902a70b85a68 (patch)
tree1763151b88d201c9d56984480cd42b4c3b2068a7 /src/server/internals
parent11fe15cd9187c393cbb7df9f04ba96abc3fbcc9a (diff)
downloadingen-20af728fdf07478b5a146370b59f902a70b85a68.tar.gz
ingen-20af728fdf07478b5a146370b59f902a70b85a68.tar.bz2
ingen-20af728fdf07478b5a146370b59f902a70b85a68.zip
Clean up includes and forward declarations
Diffstat (limited to 'src/server/internals')
-rw-r--r--src/server/internals/BlockDelay.cpp18
-rw-r--r--src/server/internals/Controller.cpp17
-rw-r--r--src/server/internals/Controller.hpp2
-rw-r--r--src/server/internals/Note.cpp21
-rw-r--r--src/server/internals/Note.hpp2
-rw-r--r--src/server/internals/Time.cpp10
-rw-r--r--src/server/internals/Trigger.cpp15
-rw-r--r--src/server/internals/Trigger.hpp2
8 files changed, 51 insertions, 36 deletions
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 {