diff options
Diffstat (limited to 'src/server')
35 files changed, 100 insertions, 105 deletions
diff --git a/src/server/ClientBroadcaster.cpp b/src/server/ClientBroadcaster.cpp index 1a55d355..26658eb6 100644 --- a/src/server/ClientBroadcaster.cpp +++ b/src/server/ClientBroadcaster.cpp @@ -18,7 +18,7 @@ #include <cassert> #include <unistd.h> #include "raul/log.hpp" -#include "ingen/ClientInterface.hpp" +#include "ingen/Interface.hpp" #include "ClientBroadcaster.hpp" #include "PluginImpl.hpp" #include "ConnectionImpl.hpp" @@ -37,7 +37,7 @@ namespace Server { /** Register a client to receive messages over the notification band. */ void -ClientBroadcaster::register_client(const URI& uri, ClientInterface* client) +ClientBroadcaster::register_client(const URI& uri, Interface* client) { Glib::Mutex::Lock lock(_clients_mutex); Clients::iterator i = _clients.find(uri); @@ -72,7 +72,7 @@ ClientBroadcaster::unregister_client(const URI& uri) /** Looks up the client with the given source @a uri (which is used as the * unique identifier for registered clients). */ -ClientInterface* +Interface* ClientBroadcaster::client(const URI& uri) { Glib::Mutex::Lock lock(_clients_mutex); @@ -94,7 +94,7 @@ ClientBroadcaster::send_plugins(const NodeFactory::Plugins& plugins) } void -ClientBroadcaster::send_plugins_to(ClientInterface* client, const NodeFactory::Plugins& plugins) +ClientBroadcaster::send_plugins_to(Interface* client, const NodeFactory::Plugins& plugins) { client->bundle_begin(); diff --git a/src/server/ClientBroadcaster.hpp b/src/server/ClientBroadcaster.hpp index b004433b..ee356702 100644 --- a/src/server/ClientBroadcaster.hpp +++ b/src/server/ClientBroadcaster.hpp @@ -26,7 +26,7 @@ #include "raul/SharedPtr.hpp" -#include "ingen/ClientInterface.hpp" +#include "ingen/Interface.hpp" #include "NodeFactory.hpp" @@ -44,21 +44,21 @@ class ConnectionImpl; /** Broadcaster for all clients. * - * This is a ClientInterface that forwards all messages to all registered + * This is an Interface that forwards all messages to all registered * clients (for updating all clients on state changes in the engine). * * \ingroup engine */ -class ClientBroadcaster : public ClientInterface +class ClientBroadcaster : public Interface { public: - void register_client(const Raul::URI& uri, ClientInterface* client); + void register_client(const Raul::URI& uri, Interface* client); bool unregister_client(const Raul::URI& uri); - ClientInterface* client(const Raul::URI& uri); + Interface* client(const Raul::URI& uri); void send_plugins(const NodeFactory::Plugins& plugin_list); - void send_plugins_to(ClientInterface*, const NodeFactory::Plugins& plugin_list); + void send_plugins_to(Interface*, const NodeFactory::Plugins& plugin_list); void send_object(const GraphObjectImpl* p, bool recursive); @@ -67,8 +67,6 @@ public: for (Clients::const_iterator i = _clients.begin(); i != _clients.end(); ++i) \ (*i).second->msg(__VA_ARGS__) - // CommonInterface - void bundle_begin() { BROADCAST(bundle_begin); } void bundle_end() { BROADCAST(bundle_end); } @@ -114,16 +112,17 @@ public: BROADCAST(set_property, subject, predicate, value); } - // ClientInterface - Raul::URI uri() const { return "http://drobilla.net/ns/ingen#broadcaster"; } ///< N/A + void set_response_id(int32_t id) {} ///< N/A + void ping() {} ///< N/A + void get(const Raul::URI& uri) {} ///< N/A void response(int32_t id, Status status) {} ///< N/A void error(const std::string& msg) { BROADCAST(error, msg); } private: - typedef std::map<Raul::URI, ClientInterface*> Clients; + typedef std::map<Raul::URI, Interface*> Clients; Glib::Mutex _clients_mutex; Clients _clients; diff --git a/src/server/Engine.cpp b/src/server/Engine.cpp index 89062d4a..3d5e981b 100644 --- a/src/server/Engine.cpp +++ b/src/server/Engine.cpp @@ -241,7 +241,7 @@ Engine::process_events(ProcessContext& context) } void -Engine::register_client(const Raul::URI& uri, ClientInterface* client) +Engine::register_client(const Raul::URI& uri, Interface* client) { _broadcaster->register_client(uri, client); } diff --git a/src/server/Engine.hpp b/src/server/Engine.hpp index 64f874c2..d1ac04f1 100644 --- a/src/server/Engine.hpp +++ b/src/server/Engine.hpp @@ -26,6 +26,7 @@ #include "raul/SharedPtr.hpp" #include "ingen/EngineBase.hpp" +#include "ingen/Interface.hpp" namespace Raul { class Maid; } @@ -76,7 +77,7 @@ public: virtual void process_events(ProcessContext& context); - virtual void register_client(const Raul::URI& uri, ClientInterface* client); + virtual void register_client(const Raul::URI& uri, Interface* client); virtual bool unregister_client(const Raul::URI& uri); diff --git a/src/server/Event.cpp b/src/server/Event.cpp index 95d0d052..258eff3f 100644 --- a/src/server/Event.cpp +++ b/src/server/Event.cpp @@ -15,7 +15,7 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "ingen/ClientInterface.hpp" +#include "ingen/Interface.hpp" #include "Driver.hpp" #include "Engine.hpp" diff --git a/src/server/Event.hpp b/src/server/Event.hpp index 8bb1d8aa..b933a8ca 100644 --- a/src/server/Event.hpp +++ b/src/server/Event.hpp @@ -24,14 +24,12 @@ #include "raul/Path.hpp" #include "raul/SharedPtr.hpp" +#include "ingen/Interface.hpp" #include "ingen/Status.hpp" #include "types.hpp" namespace Ingen { - -class ClientInterface; - namespace Server { class Engine; @@ -82,7 +80,7 @@ public: void respond(Status status); protected: - Event(Engine& engine, ClientInterface* client, int32_t id, FrameTime time) + Event(Engine& engine, Interface* client, int32_t id, FrameTime time) : _engine(engine) , _request_client(client) , _request_id(id) @@ -105,7 +103,7 @@ protected: Engine& _engine; Raul::AtomicPtr<Event> _next; - ClientInterface* _request_client; + Interface* _request_client; int32_t _request_id; FrameTime _time; Status _status; diff --git a/src/server/ObjectSender.cpp b/src/server/ObjectSender.cpp index 9eac2911..39217ae4 100644 --- a/src/server/ObjectSender.cpp +++ b/src/server/ObjectSender.cpp @@ -16,7 +16,7 @@ */ #include "ObjectSender.hpp" -#include "ingen/ClientInterface.hpp" +#include "ingen/Interface.hpp" #include "ingen/shared/LV2URIMap.hpp" #include "ingen/shared/URIs.hpp" #include "EngineStore.hpp" @@ -35,7 +35,7 @@ namespace Ingen { namespace Server { void -ObjectSender::send_object(ClientInterface* client, +ObjectSender::send_object(Interface* client, const GraphObjectImpl* object, bool recursive) { @@ -59,7 +59,7 @@ ObjectSender::send_object(ClientInterface* client, } void -ObjectSender::send_patch(ClientInterface* client, const PatchImpl* patch, bool recursive, bool bundle) +ObjectSender::send_patch(Interface* client, const PatchImpl* patch, bool recursive, bool bundle) { if (bundle) client->bundle_begin(); @@ -98,7 +98,7 @@ ObjectSender::send_patch(ClientInterface* client, const PatchImpl* patch, bool r /** Sends a node or a patch */ void -ObjectSender::send_node(ClientInterface* client, const NodeImpl* node, bool recursive, bool bundle) +ObjectSender::send_node(Interface* client, const NodeImpl* node, bool recursive, bool bundle) { PluginImpl* const plugin = node->plugin_impl(); @@ -128,7 +128,7 @@ ObjectSender::send_node(ClientInterface* client, const NodeImpl* node, bool recu } void -ObjectSender::send_port(ClientInterface* client, const PortImpl* port, bool bundle) +ObjectSender::send_port(Interface* client, const PortImpl* port, bool bundle) { assert(port); diff --git a/src/server/ObjectSender.hpp b/src/server/ObjectSender.hpp index a743c6d5..9c4a65c6 100644 --- a/src/server/ObjectSender.hpp +++ b/src/server/ObjectSender.hpp @@ -20,7 +20,7 @@ namespace Ingen { -class ClientInterface; +class Interface; namespace Server { @@ -30,33 +30,33 @@ class NodeImpl; class PortImpl; class PluginImpl; -/** Utility class for sending GraphObjects to clients through ClientInterface. +/** Utility class for sending GraphObjects to clients via Interface. * - * While ClientInterface is the direct low level message-based interface + * While Interface is the direct low level message-based interface * (protocol), this is used from the engine to easily send proper Objects * with these messages (which is done in a few different parts of the code). * - * Basically a serialiser, except to calls on ClientInterface rather than + * Basically a serialiser, except to calls on Interface rather than * eg a byte stream. */ class ObjectSender { public: - static void send_object(ClientInterface* client, + static void send_object(Interface* client, const GraphObjectImpl* object, bool recursive); private: - static void send_patch(ClientInterface* client, + static void send_patch(Interface* client, const PatchImpl* patch, bool recursive, - bool bundle=true); - static void send_node(ClientInterface* client, + bool bundle = true); + static void send_node(Interface* client, const NodeImpl* node, bool recursive, - bool bundle=true); - static void send_port(ClientInterface* client, + bool bundle = true); + static void send_port(Interface* client, const PortImpl* port, - bool bundle=true); + bool bundle = true); }; } // namespace Server diff --git a/src/server/ServerInterfaceImpl.cpp b/src/server/ServerInterfaceImpl.cpp index 1bd388ec..b5c6f3fc 100644 --- a/src/server/ServerInterfaceImpl.cpp +++ b/src/server/ServerInterfaceImpl.cpp @@ -69,7 +69,6 @@ ServerInterfaceImpl::set_response_id(int32_t id) if (!_request_client) { // Kludge _request_client = _engine.broadcaster()->client( "http://drobilla.net/ns/ingen#internal"); - std::cerr << "SET REQUEST CLIENT " << (void*)_request_client << std::endl; } _request_id = id; } diff --git a/src/server/ServerInterfaceImpl.hpp b/src/server/ServerInterfaceImpl.hpp index e3dcabad..ef9042bf 100644 --- a/src/server/ServerInterfaceImpl.hpp +++ b/src/server/ServerInterfaceImpl.hpp @@ -22,8 +22,7 @@ #include <string> #include <memory> #include "raul/SharedPtr.hpp" -#include "ingen/ClientInterface.hpp" -#include "ingen/ServerInterface.hpp" +#include "ingen/Interface.hpp" #include "ingen/Resource.hpp" #include "EventSource.hpp" #include "types.hpp" @@ -35,7 +34,7 @@ class Engine; /** A queued (preprocessed) event source / interface. * - * This is the bridge between the ServerInterface presented to the client, and + * This is the bridge between the Interface presented to the client, and * the EventSource that needs to be presented to the Driver. * * Responses occur through the event mechanism (which notified clients in @@ -44,7 +43,7 @@ class Engine; * are successful. */ class ServerInterfaceImpl : public EventSource, - public ServerInterface + public Interface { public: ServerInterfaceImpl(Engine& engine); @@ -54,11 +53,9 @@ public: virtual void set_response_id(int32_t id); - // Bundles virtual void bundle_begin(); - virtual void bundle_end(); - // CommonInterface object commands + virtual void bundle_end(); virtual void put(const Raul::URI& path, const Resource::Properties& properties, @@ -83,20 +80,21 @@ public: virtual void del(const Raul::URI& uri); - // ServerInterface object commands - virtual void disconnect_all(const Raul::Path& parent_patch_path, const Raul::Path& path); - // Requests virtual void ping(); + virtual void get(const Raul::URI& uri); + virtual void response(int32_t id, Status status) {} ///< N/A + virtual void error(const std::string& msg) {} ///< N/A + protected: - ClientInterface* _request_client; - int32_t _request_id; - Engine& _engine; - bool _in_bundle; ///< True iff a bundle is currently being received + Interface* _request_client; + int32_t _request_id; + Engine& _engine; + bool _in_bundle; ///< True iff a bundle is currently being received private: SampleCount now() const; diff --git a/src/server/events/Connect.cpp b/src/server/events/Connect.cpp index 0cdd78dd..f5641bac 100644 --- a/src/server/events/Connect.cpp +++ b/src/server/events/Connect.cpp @@ -43,12 +43,12 @@ namespace Ingen { namespace Server { namespace Events { -Connect::Connect(Engine& engine, - ClientInterface* client, - int32_t id, - SampleCount timestamp, - const Path& src_port_path, - const Path& dst_port_path) +Connect::Connect(Engine& engine, + Interface* client, + int32_t id, + SampleCount timestamp, + const Path& src_port_path, + const Path& dst_port_path) : Event(engine, client, id, timestamp) , _src_port_path(src_port_path) , _dst_port_path(dst_port_path) diff --git a/src/server/events/Connect.hpp b/src/server/events/Connect.hpp index c1218865..ca972d33 100644 --- a/src/server/events/Connect.hpp +++ b/src/server/events/Connect.hpp @@ -50,7 +50,7 @@ class Connect : public Event { public: Connect(Engine& engine, - ClientInterface* client, + Interface* client, int32_t id, SampleCount timestamp, const Raul::Path& src_port_path, diff --git a/src/server/events/CreateNode.cpp b/src/server/events/CreateNode.cpp index f043a321..d74b0b6c 100644 --- a/src/server/events/CreateNode.cpp +++ b/src/server/events/CreateNode.cpp @@ -42,7 +42,7 @@ namespace Server { namespace Events { CreateNode::CreateNode(Engine& engine, - ClientInterface* client, + Interface* client, int32_t id, SampleCount timestamp, const Path& path, diff --git a/src/server/events/CreateNode.hpp b/src/server/events/CreateNode.hpp index 0a89ba02..31e10dbd 100644 --- a/src/server/events/CreateNode.hpp +++ b/src/server/events/CreateNode.hpp @@ -42,7 +42,7 @@ class CreateNode : public Event { public: CreateNode(Engine& engine, - ClientInterface* client, + Interface* client, int32_t id, SampleCount timestamp, const Raul::Path& node_path, diff --git a/src/server/events/CreatePatch.cpp b/src/server/events/CreatePatch.cpp index 4f85be8d..a5072689 100644 --- a/src/server/events/CreatePatch.cpp +++ b/src/server/events/CreatePatch.cpp @@ -37,7 +37,7 @@ namespace Server { namespace Events { CreatePatch::CreatePatch(Engine& engine, - ClientInterface* client, + Interface* client, int32_t id, SampleCount timestamp, const Raul::Path& path, diff --git a/src/server/events/CreatePatch.hpp b/src/server/events/CreatePatch.hpp index 66a81c20..858210c5 100644 --- a/src/server/events/CreatePatch.hpp +++ b/src/server/events/CreatePatch.hpp @@ -37,7 +37,7 @@ class CreatePatch : public Event { public: CreatePatch(Engine& engine, - ClientInterface* client, + Interface* client, int32_t id, SampleCount timestamp, const Raul::Path& path, diff --git a/src/server/events/CreatePort.cpp b/src/server/events/CreatePort.cpp index 39aed9d2..6fa4a6bf 100644 --- a/src/server/events/CreatePort.cpp +++ b/src/server/events/CreatePort.cpp @@ -41,7 +41,7 @@ namespace Server { namespace Events { CreatePort::CreatePort(Engine& engine, - ClientInterface* client, + Interface* client, int32_t id, SampleCount timestamp, const Raul::Path& path, diff --git a/src/server/events/CreatePort.hpp b/src/server/events/CreatePort.hpp index fec23f0d..331a1252 100644 --- a/src/server/events/CreatePort.hpp +++ b/src/server/events/CreatePort.hpp @@ -43,7 +43,7 @@ class CreatePort : public Event { public: CreatePort(Engine& engine, - ClientInterface* client, + Interface* client, int32_t id, SampleCount timestamp, const Raul::Path& path, diff --git a/src/server/events/Deactivate.hpp b/src/server/events/Deactivate.hpp index 33264795..c6a74845 100644 --- a/src/server/events/Deactivate.hpp +++ b/src/server/events/Deactivate.hpp @@ -33,7 +33,7 @@ class Deactivate : public Event { public: Deactivate(Engine& engine, - ClientInterface* client, + Interface* client, int32_t id, SampleCount timestamp) : Event(engine, client, id, timestamp) diff --git a/src/server/events/Delete.cpp b/src/server/events/Delete.cpp index 7138a40d..34796baf 100644 --- a/src/server/events/Delete.cpp +++ b/src/server/events/Delete.cpp @@ -36,7 +36,7 @@ namespace Server { namespace Events { Delete::Delete(Engine& engine, - ClientInterface* client, + Interface* client, int32_t id, FrameTime time, const Raul::URI& uri) diff --git a/src/server/events/Delete.hpp b/src/server/events/Delete.hpp index c85d6982..f8416bc8 100644 --- a/src/server/events/Delete.hpp +++ b/src/server/events/Delete.hpp @@ -59,7 +59,7 @@ class Delete : public Event { public: Delete(Engine& engine, - ClientInterface* client, + Interface* client, int32_t id, FrameTime timestamp, const Raul::URI& uri); diff --git a/src/server/events/Disconnect.cpp b/src/server/events/Disconnect.cpp index 81528d7c..b2e55adc 100644 --- a/src/server/events/Disconnect.cpp +++ b/src/server/events/Disconnect.cpp @@ -43,7 +43,7 @@ namespace Server { namespace Events { Disconnect::Disconnect(Engine& engine, - ClientInterface* client, + Interface* client, int32_t id, SampleCount timestamp, const Raul::Path& src_port_path, diff --git a/src/server/events/Disconnect.hpp b/src/server/events/Disconnect.hpp index 726f5a98..24c6a863 100644 --- a/src/server/events/Disconnect.hpp +++ b/src/server/events/Disconnect.hpp @@ -47,7 +47,7 @@ class Disconnect : public Event { public: Disconnect(Engine& engine, - ClientInterface* client, + Interface* client, int32_t id, SampleCount timestamp, const Raul::Path& src_port_path, diff --git a/src/server/events/DisconnectAll.cpp b/src/server/events/DisconnectAll.cpp index 1538c93b..667b5a64 100644 --- a/src/server/events/DisconnectAll.cpp +++ b/src/server/events/DisconnectAll.cpp @@ -44,12 +44,12 @@ namespace Ingen { namespace Server { namespace Events { -DisconnectAll::DisconnectAll(Engine& engine, - ClientInterface* client, - int32_t id, - SampleCount timestamp, - const Path& parent_path, - const Path& node_path) +DisconnectAll::DisconnectAll(Engine& engine, + Interface* client, + int32_t id, + SampleCount timestamp, + const Path& parent_path, + const Path& node_path) : Event(engine, client, id, timestamp) , _parent_path(parent_path) , _path(node_path) diff --git a/src/server/events/DisconnectAll.hpp b/src/server/events/DisconnectAll.hpp index e3cd2490..65db2d90 100644 --- a/src/server/events/DisconnectAll.hpp +++ b/src/server/events/DisconnectAll.hpp @@ -45,7 +45,7 @@ class DisconnectAll : public Event { public: DisconnectAll(Engine& engine, - ClientInterface* client, + Interface* client, int32_t id, SampleCount timestamp, const Raul::Path& parent, diff --git a/src/server/events/Get.cpp b/src/server/events/Get.cpp index 605e392a..404cd981 100644 --- a/src/server/events/Get.cpp +++ b/src/server/events/Get.cpp @@ -15,7 +15,7 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "ingen/ClientInterface.hpp" +#include "ingen/Interface.hpp" #include "ClientBroadcaster.hpp" #include "Driver.hpp" @@ -31,11 +31,11 @@ namespace Ingen { namespace Server { namespace Events { -Get::Get(Engine& engine, - ClientInterface* client, - int32_t id, - SampleCount timestamp, - const URI& uri) +Get::Get(Engine& engine, + Interface* client, + int32_t id, + SampleCount timestamp, + const URI& uri) : Event(engine, client, id, timestamp) , _uri(uri) , _object(NULL) diff --git a/src/server/events/Get.hpp b/src/server/events/Get.hpp index 919db0f9..45b7bcd7 100644 --- a/src/server/events/Get.hpp +++ b/src/server/events/Get.hpp @@ -40,7 +40,7 @@ class Get : public Event { public: Get(Engine& engine, - ClientInterface* client, + Interface* client, int32_t id, SampleCount timestamp, const Raul::URI& uri); diff --git a/src/server/events/Move.cpp b/src/server/events/Move.cpp index 878f21f0..5f3fbff2 100644 --- a/src/server/events/Move.cpp +++ b/src/server/events/Move.cpp @@ -34,12 +34,12 @@ namespace Ingen { namespace Server { namespace Events { -Move::Move(Engine& engine, - ClientInterface* client, - int32_t id, - SampleCount timestamp, - const Path& path, - const Path& new_path) +Move::Move(Engine& engine, + Interface* client, + int32_t id, + SampleCount timestamp, + const Path& path, + const Path& new_path) : Event(engine, client, id, timestamp) , _old_path(path) , _new_path(new_path) diff --git a/src/server/events/Move.hpp b/src/server/events/Move.hpp index 4a167656..b67e9672 100644 --- a/src/server/events/Move.hpp +++ b/src/server/events/Move.hpp @@ -46,7 +46,7 @@ class Move : public Event { public: Move(Engine& engine, - ClientInterface* client, + Interface* client, int32_t id, SampleCount timestamp, const Raul::Path& old_path, diff --git a/src/server/events/Ping.hpp b/src/server/events/Ping.hpp index 4a2a13dc..de24b643 100644 --- a/src/server/events/Ping.hpp +++ b/src/server/events/Ping.hpp @@ -36,10 +36,10 @@ namespace Events { class Ping : public Event { public: - Ping(Engine& engine, - ClientInterface* client, - int32_t id, - SampleCount timestamp) + Ping(Engine& engine, + Interface* client, + int32_t id, + SampleCount timestamp) : Event(engine, client, id, timestamp) {} diff --git a/src/server/events/SetMetadata.cpp b/src/server/events/SetMetadata.cpp index 5b2391bd..e2621fae 100644 --- a/src/server/events/SetMetadata.cpp +++ b/src/server/events/SetMetadata.cpp @@ -53,7 +53,7 @@ namespace Events { typedef Resource::Properties Properties; SetMetadata::SetMetadata(Engine& engine, - ClientInterface* client, + Interface* client, int32_t id, SampleCount timestamp, bool create, diff --git a/src/server/events/SetMetadata.hpp b/src/server/events/SetMetadata.hpp index bcc3ab4f..71ac7414 100644 --- a/src/server/events/SetMetadata.hpp +++ b/src/server/events/SetMetadata.hpp @@ -70,7 +70,7 @@ class SetMetadata : public Event { public: SetMetadata(Engine& engine, - ClientInterface* client, + Interface* client, int32_t id, SampleCount timestamp, bool create, diff --git a/src/server/events/SetPortValue.cpp b/src/server/events/SetPortValue.cpp index 30478f5f..ecf9416e 100644 --- a/src/server/events/SetPortValue.cpp +++ b/src/server/events/SetPortValue.cpp @@ -47,7 +47,7 @@ namespace Server { namespace Events { SetPortValue::SetPortValue(Engine& engine, - ClientInterface* client, + Interface* client, int32_t id, bool queued, SampleCount timestamp, @@ -63,7 +63,7 @@ SetPortValue::SetPortValue(Engine& engine, /** Internal */ SetPortValue::SetPortValue(Engine& engine, - ClientInterface* client, + Interface* client, int32_t id, SampleCount timestamp, PortImpl* port, diff --git a/src/server/events/SetPortValue.hpp b/src/server/events/SetPortValue.hpp index 71764568..cf992fcf 100644 --- a/src/server/events/SetPortValue.hpp +++ b/src/server/events/SetPortValue.hpp @@ -44,7 +44,7 @@ class SetPortValue : public Event { public: SetPortValue(Engine& engine, - ClientInterface* client, + Interface* client, int32_t id, bool queued, SampleCount timestamp, @@ -52,7 +52,7 @@ public: const Raul::Atom& value); SetPortValue(Engine& engine, - ClientInterface* client, + Interface* client, int32_t id, SampleCount timestamp, PortImpl* port, diff --git a/src/server/ingen_lv2.cpp b/src/server/ingen_lv2.cpp index fa38b035..3e9366ae 100644 --- a/src/server/ingen_lv2.cpp +++ b/src/server/ingen_lv2.cpp @@ -30,7 +30,7 @@ #include "lv2/lv2plug.in/ns/ext/state/state.h" #include "lv2/lv2plug.in/ns/ext/urid/urid.h" -#include "ingen/ServerInterface.hpp" +#include "ingen/Interface.hpp" #include "ingen/serialisation/Parser.hpp" #include "ingen/serialisation/Serialiser.hpp" #include "ingen/shared/Configuration.hpp" @@ -416,7 +416,7 @@ ingen_cleanup(LV2_Handle instance) { IngenPlugin* me = (IngenPlugin*)instance; me->world->set_local_engine(SharedPtr<Ingen::Server::Engine>()); - me->world->set_engine(SharedPtr<Ingen::ServerInterface>()); + me->world->set_engine(SharedPtr<Ingen::Interface>()); delete me->world; free(instance); } |