summaryrefslogtreecommitdiffstats
path: root/src/server/events
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2012-03-16 04:13:23 +0000
committerDavid Robillard <d@drobilla.net>2012-03-16 04:13:23 +0000
commit9da093217352daa1fb61a6f2daf5195640e286a7 (patch)
treefb3489c04451dc14a61170ba2418123727414340 /src/server/events
parent119468f621a59d86da10bedf75c4427b70f9d370 (diff)
downloadingen-9da093217352daa1fb61a6f2daf5195640e286a7.tar.gz
ingen-9da093217352daa1fb61a6f2daf5195640e286a7.tar.bz2
ingen-9da093217352daa1fb61a6f2daf5195640e286a7.zip
Merge ClientInterface and ServerInterface.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4067 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/server/events')
-rw-r--r--src/server/events/Connect.cpp12
-rw-r--r--src/server/events/Connect.hpp2
-rw-r--r--src/server/events/CreateNode.cpp2
-rw-r--r--src/server/events/CreateNode.hpp2
-rw-r--r--src/server/events/CreatePatch.cpp2
-rw-r--r--src/server/events/CreatePatch.hpp2
-rw-r--r--src/server/events/CreatePort.cpp2
-rw-r--r--src/server/events/CreatePort.hpp2
-rw-r--r--src/server/events/Deactivate.hpp2
-rw-r--r--src/server/events/Delete.cpp2
-rw-r--r--src/server/events/Delete.hpp2
-rw-r--r--src/server/events/Disconnect.cpp2
-rw-r--r--src/server/events/Disconnect.hpp2
-rw-r--r--src/server/events/DisconnectAll.cpp12
-rw-r--r--src/server/events/DisconnectAll.hpp2
-rw-r--r--src/server/events/Get.cpp12
-rw-r--r--src/server/events/Get.hpp2
-rw-r--r--src/server/events/Move.cpp12
-rw-r--r--src/server/events/Move.hpp2
-rw-r--r--src/server/events/Ping.hpp8
-rw-r--r--src/server/events/SetMetadata.cpp2
-rw-r--r--src/server/events/SetMetadata.hpp2
-rw-r--r--src/server/events/SetPortValue.cpp4
-rw-r--r--src/server/events/SetPortValue.hpp4
24 files changed, 49 insertions, 49 deletions
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,
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-28 16:16:12 +0000