summaryrefslogtreecommitdiffstats
path: root/src/server
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2012-05-11 04:55:56 +0000
committerDavid Robillard <d@drobilla.net>2012-05-11 04:55:56 +0000
commite64eabe64ee966364bc5f6704c5227687ea309d8 (patch)
treea62c6044a1b4cc4f070958dfaf29f16231a7c2d8 /src/server
parent908a001ea84dcf3a1204746d110068454c637119 (diff)
downloadingen-e64eabe64ee966364bc5f6704c5227687ea309d8.tar.gz
ingen-e64eabe64ee966364bc5f6704c5227687ea309d8.tar.bz2
ingen-e64eabe64ee966364bc5f6704c5227687ea309d8.zip
Move Forge to the appropriate namespace.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4350 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/server')
-rw-r--r--src/server/BufferFactory.cpp2
-rw-r--r--src/server/BufferFactory.hpp6
-rw-r--r--src/server/Engine.cpp2
-rw-r--r--src/server/LV2Node.cpp2
-rw-r--r--src/server/Notification.cpp2
-rw-r--r--src/server/PortImpl.cpp2
-rw-r--r--src/server/ingen_lv2.cpp2
7 files changed, 9 insertions, 9 deletions
diff --git a/src/server/BufferFactory.cpp b/src/server/BufferFactory.cpp
index f43fa7a4..cc02ba08 100644
--- a/src/server/BufferFactory.cpp
+++ b/src/server/BufferFactory.cpp
@@ -45,7 +45,7 @@ BufferFactory::~BufferFactory()
free_list(_free_object.get());
}
-Ingen::Forge&
+Shared::Forge&
BufferFactory::forge()
{
return _engine.world()->forge();
diff --git a/src/server/BufferFactory.hpp b/src/server/BufferFactory.hpp
index 04b9bf9d..84fb813d 100644
--- a/src/server/BufferFactory.hpp
+++ b/src/server/BufferFactory.hpp
@@ -58,9 +58,9 @@ public:
void set_block_length(SampleCount block_length);
- Forge& forge();
- Shared::URIs& uris() { return _uris; }
- Engine& engine() { return _engine; }
+ Shared::Forge& forge();
+ Shared::URIs& uris() { return _uris; }
+ Engine& engine() { return _engine; }
private:
friend class Buffer;
diff --git a/src/server/Engine.cpp b/src/server/Engine.cpp
index 8029e607..fde08f15 100644
--- a/src/server/Engine.cpp
+++ b/src/server/Engine.cpp
@@ -150,7 +150,7 @@ Engine::activate()
_message_context->Thread::start();
const Ingen::Shared::URIs& uris = world()->uris();
- Ingen::Forge& forge = world()->forge();
+ Shared::Forge& forge = world()->forge();
// Create root patch
if (!_root_patch) {
diff --git a/src/server/LV2Node.cpp b/src/server/LV2Node.cpp
index f1bf2d3d..de714aa7 100644
--- a/src/server/LV2Node.cpp
+++ b/src/server/LV2Node.cpp
@@ -142,7 +142,7 @@ LV2Node::instantiate(BufferFactory& bufs)
const Ingen::Shared::URIs& uris = bufs.uris();
SharedPtr<LV2Info> info = _lv2_plugin->lv2_info();
const LilvPlugin* plug = _lv2_plugin->lilv_plugin();
- Ingen::Forge& forge = bufs.forge();
+ Ingen::Shared::Forge& forge = bufs.forge();
uint32_t num_ports = lilv_plugin_get_num_ports(plug);
assert(num_ports > 0);
diff --git a/src/server/Notification.cpp b/src/server/Notification.cpp
index b4c55da1..c95311c9 100644
--- a/src/server/Notification.cpp
+++ b/src/server/Notification.cpp
@@ -29,7 +29,7 @@ Notification::post_process(Notification& note,
Engine& engine)
{
const Ingen::Shared::URIs& uris = engine.world()->uris();
- Ingen::Forge& forge = engine.world()->forge();
+ Ingen::Shared::Forge& forge = engine.world()->forge();
switch (note.type) {
case PORT_VALUE:
engine.broadcaster()->set_property(note.port->path(),
diff --git a/src/server/PortImpl.cpp b/src/server/PortImpl.cpp
index 1e5cc11c..e18ced10 100644
--- a/src/server/PortImpl.cpp
+++ b/src/server/PortImpl.cpp
@@ -216,7 +216,7 @@ PortImpl::clear_buffers()
void
PortImpl::broadcast_value(Context& context, bool force)
{
- Ingen::Forge& forge = context.engine().world()->forge();
+ Shared::Forge& forge = context.engine().world()->forge();
Notification::Type ntype = Notification::PORT_VALUE;
Raul::Atom val;
switch (_type.symbol()) {
diff --git a/src/server/ingen_lv2.cpp b/src/server/ingen_lv2.cpp
index d6602173..0de22ed3 100644
--- a/src/server/ingen_lv2.cpp
+++ b/src/server/ingen_lv2.cpp
@@ -329,7 +329,7 @@ private:
};
struct IngenPlugin {
- Ingen::Forge forge;
+ Ingen::Shared::Forge forge;
Ingen::Shared::World* world;
MainThread* main;
LV2_URID_Map* map;