diff options
| author | David Robillard <d@drobilla.net> | 2012-03-16 04:13:23 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2012-03-16 04:13:23 +0000 |
| commit | 9da093217352daa1fb61a6f2daf5195640e286a7 (patch) | |
| tree | fb3489c04451dc14a61170ba2418123727414340 /src/osc | |
| parent | 119468f621a59d86da10bedf75c4427b70f9d370 (diff) | |
| download | ingen-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/osc')
| -rw-r--r-- | src/osc/OSCClientReceiver.hpp | 2 | ||||
| -rw-r--r-- | src/osc/OSCClientSender.cpp | 2 | ||||
| -rw-r--r-- | src/osc/OSCClientSender.hpp | 2 | ||||
| -rw-r--r-- | src/osc/OSCEngineReceiver.cpp | 3 | ||||
| -rw-r--r-- | src/osc/OSCEngineSender.hpp | 6 |
5 files changed, 7 insertions, 8 deletions
diff --git a/src/osc/OSCClientReceiver.hpp b/src/osc/OSCClientReceiver.hpp index c3effb10..9c7d6d44 100644 --- a/src/osc/OSCClientReceiver.hpp +++ b/src/osc/OSCClientReceiver.hpp @@ -23,7 +23,7 @@ #include <boost/utility.hpp> #include <lo/lo.h> -#include "ingen/ClientInterface.hpp" +#include "ingen/Interface.hpp" #include "raul/Deletable.hpp" #include "raul/SharedPtr.hpp" diff --git a/src/osc/OSCClientSender.cpp b/src/osc/OSCClientSender.cpp index 5a50ddf3..037ae989 100644 --- a/src/osc/OSCClientSender.cpp +++ b/src/osc/OSCClientSender.cpp @@ -22,7 +22,7 @@ #include "raul/AtomLiblo.hpp" #include "raul/Path.hpp" -#include "ingen/ClientInterface.hpp" +#include "ingen/Interface.hpp" #include "OSCClientSender.hpp" diff --git a/src/osc/OSCClientSender.hpp b/src/osc/OSCClientSender.hpp index ffb7323b..75682006 100644 --- a/src/osc/OSCClientSender.hpp +++ b/src/osc/OSCClientSender.hpp @@ -23,7 +23,7 @@ #include <lo/lo.h> -#include "ingen/ClientInterface.hpp" +#include "ingen/Interface.hpp" #include "ingen/GraphObject.hpp" #include "OSCSender.hpp" diff --git a/src/osc/OSCEngineReceiver.cpp b/src/osc/OSCEngineReceiver.cpp index b75d76a4..8b7b89c6 100644 --- a/src/osc/OSCEngineReceiver.cpp +++ b/src/osc/OSCEngineReceiver.cpp @@ -28,8 +28,7 @@ #include "raul/log.hpp" #include "ingen_config.h" -#include "ingen/ClientInterface.hpp" -#include "ingen/ServerInterface.hpp" +#include "ingen/Interface.hpp" #include "../server/ClientBroadcaster.hpp" #include "../server/Engine.hpp" diff --git a/src/osc/OSCEngineSender.hpp b/src/osc/OSCEngineSender.hpp index ff74fb4a..fef60991 100644 --- a/src/osc/OSCEngineSender.hpp +++ b/src/osc/OSCEngineSender.hpp @@ -26,7 +26,7 @@ #include "raul/Deletable.hpp" -#include "ingen/ServerInterface.hpp" +#include "ingen/Interface.hpp" #include "OSCSender.hpp" @@ -36,12 +36,12 @@ namespace Client { /* OSC (via liblo) interface to the engine. * - * Clients can use this opaquely as an ServerInterface* to control the engine + * Clients can use this opaquely as an Interface* to control the engine * over OSC (whether over a network or not, etc). * * \ingroup IngenClient */ -class OSCEngineSender : public ServerInterface, public Shared::OSCSender { +class OSCEngineSender : public Interface, public Shared::OSCSender { public: OSCEngineSender(const Raul::URI& engine_url, size_t max_packet_size, |