summaryrefslogtreecommitdiffstats
path: root/src/client
diff options
context:
space:
mode:
Diffstat (limited to 'src/client')
-rw-r--r--src/client/ClientStore.cpp2
-rw-r--r--src/client/ClientStore.hpp6
-rw-r--r--src/client/HTTPEngineSender.cpp4
-rw-r--r--src/client/HTTPEngineSender.hpp8
-rw-r--r--src/client/OSCEngineSender.cpp4
-rw-r--r--src/client/OSCEngineSender.hpp8
-rw-r--r--src/client/PluginModel.hpp2
-rw-r--r--src/client/PluginUI.hpp2
-rw-r--r--src/client/ThreadedSigClientInterface.hpp2
-rw-r--r--src/client/ingen_client.cpp8
10 files changed, 23 insertions, 23 deletions
diff --git a/src/client/ClientStore.cpp b/src/client/ClientStore.cpp
index 48fa0d1e..e647c130 100644
--- a/src/client/ClientStore.cpp
+++ b/src/client/ClientStore.cpp
@@ -43,7 +43,7 @@ using namespace Shared;
namespace Client {
ClientStore::ClientStore(SharedPtr<Shared::LV2URIMap> uris,
- SharedPtr<EngineInterface> engine,
+ SharedPtr<ServerInterface> engine,
SharedPtr<SigClientInterface> emitter)
: _uris(uris)
, _engine(engine)
diff --git a/src/client/ClientStore.hpp b/src/client/ClientStore.hpp
index d904cbf2..a5a3cbc1 100644
--- a/src/client/ClientStore.hpp
+++ b/src/client/ClientStore.hpp
@@ -26,7 +26,7 @@
#include <sigc++/sigc++.h>
-#include "ingen/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
#include "raul/Path.hpp"
#include "raul/PathTable.hpp"
#include "raul/TableImpl.hpp"
@@ -57,7 +57,7 @@ class ClientStore : public Shared::Store
public:
ClientStore(
SharedPtr<Shared::LV2URIMap> uris,
- SharedPtr<EngineInterface> engine=SharedPtr<EngineInterface>(),
+ SharedPtr<ServerInterface> engine=SharedPtr<ServerInterface>(),
SharedPtr<SigClientInterface> emitter=SharedPtr<SigClientInterface>());
SharedPtr<PluginModel> plugin(const Raul::URI& uri);
@@ -127,7 +127,7 @@ private:
const Raul::Path& dst_port_path);
SharedPtr<Shared::LV2URIMap> _uris;
- SharedPtr<EngineInterface> _engine;
+ SharedPtr<ServerInterface> _engine;
SharedPtr<SigClientInterface> _emitter;
SharedPtr<Plugins> _plugins; ///< Map, keyed by plugin URI
diff --git a/src/client/HTTPEngineSender.cpp b/src/client/HTTPEngineSender.cpp
index d9b477a6..96b6a6cf 100644
--- a/src/client/HTTPEngineSender.cpp
+++ b/src/client/HTTPEngineSender.cpp
@@ -58,13 +58,13 @@ HTTPEngineSender::attach(int32_t ping_id, bool block)
HTTPClientReceiver::send(msg);
}
-/* *** EngineInterface implementation below here *** */
+/* *** ServerInterface implementation below here *** */
/** Register with the engine via HTTP.
*
* Note that this does not actually use 'key', since the engine creates
* it's own key for HTTP clients (namely the incoming URL), for NAT
- * traversal. It is a parameter to remain compatible with EngineInterface.
+ * traversal. It is a parameter to remain compatible with ServerInterface.
*/
void
HTTPEngineSender::register_client(ClientInterface* client)
diff --git a/src/client/HTTPEngineSender.hpp b/src/client/HTTPEngineSender.hpp
index 75e2a2f7..27c34a51 100644
--- a/src/client/HTTPEngineSender.hpp
+++ b/src/client/HTTPEngineSender.hpp
@@ -25,7 +25,7 @@
#include "raul/Path.hpp"
#include "sord/sordmm.hpp"
-#include "ingen/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
typedef struct _SoupSession SoupSession;
@@ -39,12 +39,12 @@ class HTTPClientReceiver;
/* HTTP (via libsoup) interface to the engine.
*
- * Clients can use this opaquely as an EngineInterface to control the engine
+ * Clients can use this opaquely as an ServerInterface to control the engine
* over HTTP (whether over a network or not).
*
* \ingroup IngenClient
*/
-class HTTPEngineSender : public EngineInterface
+class HTTPEngineSender : public ServerInterface
{
public:
HTTPEngineSender(Shared::World* world, const Raul::URI& engine_url);
@@ -60,7 +60,7 @@ public:
void attach(int32_t ping_id, bool block);
- /* *** EngineInterface implementation below here *** */
+ /* *** ServerInterface implementation below here *** */
void enable() { _enabled = true; }
void disable() { _enabled = false; }
diff --git a/src/client/OSCEngineSender.cpp b/src/client/OSCEngineSender.cpp
index 51e6f8c9..9c3b836c 100644
--- a/src/client/OSCEngineSender.cpp
+++ b/src/client/OSCEngineSender.cpp
@@ -78,13 +78,13 @@ OSCEngineSender::attach(int32_t ping_id, bool block)
this->ping();
}
-/* *** EngineInterface implementation below here *** */
+/* *** ServerInterface implementation below here *** */
/** Register with the engine via OSC.
*
* Note that this does not actually use 'client', since the engine creates
* it's own key for OSC clients (namely the incoming URL), for NAT
- * traversal. It is a parameter to remain compatible with EngineInterface.
+ * traversal. It is a parameter to remain compatible with ServerInterface.
*/
void
OSCEngineSender::register_client(ClientInterface* client)
diff --git a/src/client/OSCEngineSender.hpp b/src/client/OSCEngineSender.hpp
index 041a16b8..a29694fb 100644
--- a/src/client/OSCEngineSender.hpp
+++ b/src/client/OSCEngineSender.hpp
@@ -25,7 +25,7 @@
#include <lo/lo.h>
-#include "ingen/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
#include "shared/OSCSender.hpp"
namespace Ingen {
@@ -34,12 +34,12 @@ namespace Client {
/* OSC (via liblo) interface to the engine.
*
- * Clients can use this opaquely as an EngineInterface* to control the engine
+ * Clients can use this opaquely as an ServerInterface* to control the engine
* over OSC (whether over a network or not, etc).
*
* \ingroup IngenClient
*/
-class OSCEngineSender : public EngineInterface, public Shared::OSCSender {
+class OSCEngineSender : public ServerInterface, public Shared::OSCSender {
public:
OSCEngineSender(const Raul::URI& engine_url,
size_t max_packet_size);
@@ -61,7 +61,7 @@ public:
void attach(int32_t ping_id, bool block);
- /* *** EngineInterface implementation below here *** */
+ /* *** ServerInterface implementation below here *** */
void enable() { _enabled = true; }
void disable() { _enabled = false; }
diff --git a/src/client/PluginModel.hpp b/src/client/PluginModel.hpp
index f03edd94..0d72af12 100644
--- a/src/client/PluginModel.hpp
+++ b/src/client/PluginModel.hpp
@@ -30,7 +30,7 @@
#ifdef HAVE_SLV2
#include "slv2/slv2.h"
#endif
-#include "ingen/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
#include "ingen/Plugin.hpp"
#include "shared/World.hpp"
#include "shared/ResourceImpl.hpp"
diff --git a/src/client/PluginUI.hpp b/src/client/PluginUI.hpp
index 266756e9..e07da923 100644
--- a/src/client/PluginUI.hpp
+++ b/src/client/PluginUI.hpp
@@ -25,7 +25,7 @@
namespace Ingen {
-class EngineInterface;
+class ServerInterface;
namespace Shared { class World; }
diff --git a/src/client/ThreadedSigClientInterface.hpp b/src/client/ThreadedSigClientInterface.hpp
index 87c2f1a5..4fe85209 100644
--- a/src/client/ThreadedSigClientInterface.hpp
+++ b/src/client/ThreadedSigClientInterface.hpp
@@ -32,7 +32,7 @@ typedef sigc::slot<void> Closure;
namespace Ingen {
-class EngineInterface;
+class ServerInterface;
namespace Client {
diff --git a/src/client/ingen_client.cpp b/src/client/ingen_client.cpp
index 93b00e59..dc4d7f20 100644
--- a/src/client/ingen_client.cpp
+++ b/src/client/ingen_client.cpp
@@ -29,23 +29,23 @@
using namespace Ingen;
#ifdef HAVE_LIBLO
-SharedPtr<Ingen::EngineInterface>
+SharedPtr<Ingen::ServerInterface>
new_osc_interface(Ingen::Shared::World* world, const std::string& url)
{
Client::OSCEngineSender* oes = Client::OSCEngineSender::create(
url, world->conf()->option("packet-size").get_int32());
oes->attach(rand(), true);
- return SharedPtr<EngineInterface>(oes);
+ return SharedPtr<ServerInterface>(oes);
}
#endif
#ifdef HAVE_SOUP
-SharedPtr<Ingen::EngineInterface>
+SharedPtr<Ingen::ServerInterface>
new_http_interface(Ingen::Shared::World* world, const std::string& url)
{
Client::HTTPEngineSender* hes = new Client::HTTPEngineSender(world, url);
hes->attach(rand(), true);
- return SharedPtr<EngineInterface>(hes);
+ return SharedPtr<ServerInterface>(hes);
}
#endif
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-04 21:14:41 +0000