summaryrefslogtreecommitdiffstats
path: root/src/server/events
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2017-02-17 19:23:12 +0100
committerDavid Robillard <d@drobilla.net>2017-02-18 19:38:13 +0100
commit2754f232613dca72c2f964d092569faf1a176c80 (patch)
tree6a8966ca56acd74a42c691be5d900d221ceb348d /src/server/events
parentfa6bb9afe8fcf2b0b8348495b9c4e1d6425136f0 (diff)
downloadingen-2754f232613dca72c2f964d092569faf1a176c80.tar.gz
ingen-2754f232613dca72c2f964d092569faf1a176c80.tar.bz2
ingen-2754f232613dca72c2f964d092569faf1a176c80.zip
Reduce Driver coupling
Diffstat (limited to 'src/server/events')
-rw-r--r--src/server/events/Copy.cpp1
-rw-r--r--src/server/events/CreateBlock.cpp1
-rw-r--r--src/server/events/CreateGraph.cpp3
-rw-r--r--src/server/events/Get.cpp5
-rw-r--r--src/server/events/SetPortValue.cpp1
5 files changed, 3 insertions, 8 deletions
diff --git a/src/server/events/Copy.cpp b/src/server/events/Copy.cpp
index 1f7ca708..53f62958 100644
--- a/src/server/events/Copy.cpp
+++ b/src/server/events/Copy.cpp
@@ -21,7 +21,6 @@
#include "BlockImpl.hpp"
#include "Broadcaster.hpp"
-#include "Driver.hpp"
#include "Engine.hpp"
#include "EnginePort.hpp"
#include "GraphImpl.hpp"
diff --git a/src/server/events/CreateBlock.cpp b/src/server/events/CreateBlock.cpp
index 0b4cbae3..eb696c6b 100644
--- a/src/server/events/CreateBlock.cpp
+++ b/src/server/events/CreateBlock.cpp
@@ -23,7 +23,6 @@
#include "BlockImpl.hpp"
#include "Broadcaster.hpp"
#include "CreateBlock.hpp"
-#include "Driver.hpp"
#include "Engine.hpp"
#include "GraphImpl.hpp"
#include "PluginImpl.hpp"
diff --git a/src/server/events/CreateGraph.cpp b/src/server/events/CreateGraph.cpp
index 891ca33c..304656af 100644
--- a/src/server/events/CreateGraph.cpp
+++ b/src/server/events/CreateGraph.cpp
@@ -20,7 +20,6 @@
#include "raul/Path.hpp"
#include "Broadcaster.hpp"
-#include "Driver.hpp"
#include "Engine.hpp"
#include "GraphImpl.hpp"
#include "PreProcessContext.hpp"
@@ -155,7 +154,7 @@ CreateGraph::pre_process(PreProcessContext& ctx)
} else {
// Create a new graph
_graph = new GraphImpl(_engine, symbol, ext_poly, _parent,
- _engine.driver()->sample_rate(), int_poly);
+ _engine.sample_rate(), int_poly);
_graph->add_property(uris.rdf_type, uris.ingen_Graph.urid);
_graph->add_property(uris.rdf_type,
Property(uris.ingen_Block,
diff --git a/src/server/events/Get.cpp b/src/server/events/Get.cpp
index baa9b16e..5988f0e0 100644
--- a/src/server/events/Get.cpp
+++ b/src/server/events/Get.cpp
@@ -23,7 +23,6 @@
#include "BlockImpl.hpp"
#include "Broadcaster.hpp"
#include "BufferFactory.hpp"
-#include "Driver.hpp"
#include "Engine.hpp"
#include "Get.hpp"
#include "GraphImpl.hpp"
@@ -93,9 +92,9 @@ Get::post_process()
_request_client->put(
Raul::URI("ingen:/engine"),
{ { uris.param_sampleRate,
- uris.forge.make(int32_t(_engine.driver()->sample_rate())) },
+ uris.forge.make(int32_t(_engine.sample_rate())) },
{ uris.bufsz_maxBlockLength,
- uris.forge.make(int32_t(_engine.driver()->block_length())) },
+ uris.forge.make(int32_t(_engine.block_length())) },
{ uris.ingen_numThreads,
uris.forge.make(int32_t(_engine.n_threads())) } });
} else {
diff --git a/src/server/events/SetPortValue.cpp b/src/server/events/SetPortValue.cpp
index ff0827e4..b8c23605 100644
--- a/src/server/events/SetPortValue.cpp
+++ b/src/server/events/SetPortValue.cpp
@@ -23,7 +23,6 @@
#include "Broadcaster.hpp"
#include "Buffer.hpp"
#include "ControlBindings.hpp"
-#include "Driver.hpp"
#include "Engine.hpp"
#include "PortImpl.hpp"
#include "RunContext.hpp"