From 629fb50716083c71146340de97eb8651679ca9fb Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 31 Jul 2012 00:14:50 +0000 Subject: Merge Ingen::Shared namespace into Ingen namespace and core libingen library. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4579 a436a847-0d15-0410-975c-d299462d15a1 --- src/server/ingen_jack.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/server/ingen_jack.cpp') diff --git a/src/server/ingen_jack.cpp b/src/server/ingen_jack.cpp index 415a57a2..6019d1d8 100644 --- a/src/server/ingen_jack.cpp +++ b/src/server/ingen_jack.cpp @@ -16,9 +16,9 @@ #include -#include "ingen/shared/Configuration.hpp" -#include "ingen/shared/Module.hpp" -#include "ingen/shared/World.hpp" +#include "ingen/Configuration.hpp" +#include "ingen/Module.hpp" +#include "ingen/World.hpp" #include "raul/Configuration.hpp" #include "raul/log.hpp" @@ -28,8 +28,8 @@ using namespace std; using namespace Ingen; -struct IngenJackModule : public Ingen::Shared::Module { - void load(Ingen::Shared::World* world) { +struct IngenJackModule : public Ingen::Module { + void load(Ingen::World* world) { if (((Server::Engine*)world->engine().get())->driver()) { Raul::warn << "Engine already has a driver" << std::endl; return; @@ -49,7 +49,7 @@ struct IngenJackModule : public Ingen::Shared::Module { extern "C" { -Ingen::Shared::Module* +Ingen::Module* ingen_module_load() { return new IngenJackModule(); -- cgit v1.2.1