summaryrefslogtreecommitdiffstats
path: root/src/server/ingen_engine.cpp
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2012-07-31 00:14:50 +0000
committerDavid Robillard <d@drobilla.net>2012-07-31 00:14:50 +0000
commit629fb50716083c71146340de97eb8651679ca9fb (patch)
tree9c5f25fdfd24f3cdb89924062f291a6647580878 /src/server/ingen_engine.cpp
parent6297b8805c95dd1831ee9a0b9639ae41d00a1473 (diff)
downloadingen-629fb50716083c71146340de97eb8651679ca9fb.tar.gz
ingen-629fb50716083c71146340de97eb8651679ca9fb.tar.bz2
ingen-629fb50716083c71146340de97eb8651679ca9fb.zip
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
Diffstat (limited to 'src/server/ingen_engine.cpp')
-rw-r--r--src/server/ingen_engine.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/server/ingen_engine.cpp b/src/server/ingen_engine.cpp
index 6e5665cb..3a0d4324 100644
--- a/src/server/ingen_engine.cpp
+++ b/src/server/ingen_engine.cpp
@@ -14,16 +14,16 @@
along with Ingen. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "ingen/shared/Module.hpp"
-#include "ingen/shared/World.hpp"
+#include "ingen/Module.hpp"
+#include "ingen/World.hpp"
#include "Engine.hpp"
#include "EventWriter.hpp"
#include "util.hpp"
using namespace Ingen;
-struct IngenEngineModule : public Ingen::Shared::Module {
- virtual void load(Ingen::Shared::World* world) {
+struct IngenEngineModule : public Ingen::Module {
+ virtual void load(Ingen::World* world) {
Server::set_denormal_flags();
SharedPtr<Server::Engine> engine(new Server::Engine(world));
world->set_engine(engine);
@@ -36,7 +36,7 @@ struct IngenEngineModule : public Ingen::Shared::Module {
extern "C" {
-Ingen::Shared::Module*
+Ingen::Module*
ingen_module_load()
{
return new IngenEngineModule();