From da618852b67d64f5fed686234f5a626c33812c87 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 16 Apr 2011 21:50:14 +0000 Subject: Add EngineBase, a pure virtual public interface for the engine. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3155 a436a847-0d15-0410-975c-d299462d15a1 --- src/shared/World.cpp | 7 ++++--- src/shared/World.hpp | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'src/shared') diff --git a/src/shared/World.cpp b/src/shared/World.cpp index f869dc33..38c08340 100644 --- a/src/shared/World.cpp +++ b/src/shared/World.cpp @@ -25,6 +25,7 @@ #endif #include "raul/log.hpp" #include "sord/sordmm.hpp" +#include "ingen/EngineBase.hpp" #include "shared/runtime_paths.hpp" #include "shared/LV2Features.hpp" #include "shared/LV2URIMap.hpp" @@ -172,7 +173,7 @@ public: Sord::World* rdf_world; SharedPtr uris; SharedPtr engine; - SharedPtr local_engine; + SharedPtr local_engine; SharedPtr serialiser; SharedPtr parser; SharedPtr store; @@ -191,7 +192,7 @@ World::~World() delete _impl; } -void World::set_local_engine(SharedPtr e) { _impl->local_engine = e; } +void World::set_local_engine(SharedPtr e) { _impl->local_engine = e; } void World::set_engine(SharedPtr e) { _impl->engine = e; } void World::set_serialiser(SharedPtr s) { _impl->serialiser = s; } void World::set_parser(SharedPtr p) { _impl->parser = p; } @@ -200,7 +201,7 @@ void World::set_conf(Raul::Configuration* c) { _impl->conf int& World::argc() { return _impl->argc; } char**& World::argv() { return _impl->argv; } -SharedPtr World::local_engine() { return _impl->local_engine; } +SharedPtr World::local_engine() { return _impl->local_engine; } SharedPtr World::engine() { return _impl->engine; } SharedPtr World::serialiser() { return _impl->serialiser; } SharedPtr World::parser() { return _impl->parser; } diff --git a/src/shared/World.hpp b/src/shared/World.hpp index 233ae83a..4a07d4f6 100644 --- a/src/shared/World.hpp +++ b/src/shared/World.hpp @@ -35,7 +35,7 @@ namespace Sord { class World; } namespace Ingen { -class Engine; +class EngineBase; namespace Serialisation { class Serialiser; class Parser; } @@ -76,13 +76,13 @@ public: virtual bool run(const std::string& mime_type, const std::string& filename); - virtual void set_local_engine(SharedPtr e); + virtual void set_local_engine(SharedPtr e); virtual void set_engine(SharedPtr e); virtual void set_serialiser(SharedPtr s); virtual void set_parser(SharedPtr p); virtual void set_store(SharedPtr s); - virtual SharedPtr local_engine(); + virtual SharedPtr local_engine(); virtual SharedPtr engine(); virtual SharedPtr serialiser(); virtual SharedPtr parser(); -- cgit v1.2.1