summaryrefslogtreecommitdiffstats
path: root/src/client
diff options
context:
space:
mode:
Diffstat (limited to 'src/client')
-rw-r--r--src/client/ClientStore.cpp1
-rw-r--r--src/client/ClientStore.hpp4
-rw-r--r--src/client/ConnectionModel.hpp19
-rw-r--r--src/client/OSCClientReceiver.hpp11
-rw-r--r--src/client/OSCEngineSender.hpp1
-rw-r--r--src/client/ObjectModel.hpp9
-rw-r--r--src/client/PatchModel.hpp7
-rw-r--r--src/client/SigClientInterface.hpp8
-rw-r--r--src/client/signal.hpp2
9 files changed, 24 insertions, 38 deletions
diff --git a/src/client/ClientStore.cpp b/src/client/ClientStore.cpp
index 492529a0..681893bb 100644
--- a/src/client/ClientStore.cpp
+++ b/src/client/ClientStore.cpp
@@ -21,6 +21,7 @@
#include "shared/LV2URIMap.hpp"
#include "ClientStore.hpp"
+#include "ConnectionModel.hpp"
#include "NodeModel.hpp"
#include "ObjectModel.hpp"
#include "PatchModel.hpp"
diff --git a/src/client/ClientStore.hpp b/src/client/ClientStore.hpp
index a01a9dc6..011bb38c 100644
--- a/src/client/ClientStore.hpp
+++ b/src/client/ClientStore.hpp
@@ -24,8 +24,6 @@
#include "raul/SharedPtr.hpp"
-#include <sigc++/sigc++.h>
-
#include "ingen/ServerInterface.hpp"
#include "raul/Path.hpp"
#include "raul/PathTable.hpp"
@@ -54,7 +52,7 @@ class SigClientInterface;
*/
class ClientStore : public Shared::Store
, public CommonInterface
- , public sigc::trackable {
+ , public INGEN_TRACKABLE {
public:
ClientStore(
SharedPtr<Shared::LV2URIMap> uris,
diff --git a/src/client/ConnectionModel.hpp b/src/client/ConnectionModel.hpp
index bc2f56e5..9a51d309 100644
--- a/src/client/ConnectionModel.hpp
+++ b/src/client/ConnectionModel.hpp
@@ -19,25 +19,20 @@
#define INGEN_CLIENT_CONNECTIONMODEL_HPP
#include <cassert>
-#include <string>
-#include <list>
+
#include "raul/Path.hpp"
#include "raul/SharedPtr.hpp"
+
#include "ingen/Connection.hpp"
-#include "PortModel.hpp"
+
+#include "client/PortModel.hpp"
namespace Ingen {
namespace Client {
class ClientStore;
-/** Class to represent a port->port connection in the engine.
- *
- * This can either have pointers to the connection ports' models, or just
- * paths as strings. The engine passes just strings (by necessity), but
- * clients can set the pointers then they don't have to worry about port
- * renaming, as the connections will always return the port's path, even
- * if it changes.
+/** Class to represent a port->port connections in the engine.
*
* \ingroup IngenClient
*/
@@ -47,8 +42,8 @@ public:
SharedPtr<PortModel> src_port() const { return _src_port; }
SharedPtr<PortModel> dst_port() const { return _dst_port; }
- const Raul::Path src_port_path() const { return _src_port->path(); }
- const Raul::Path dst_port_path() const { return _dst_port->path(); }
+ const Raul::Path& src_port_path() const { return _src_port->path(); }
+ const Raul::Path& dst_port_path() const { return _dst_port->path(); }
private:
friend class ClientStore;
diff --git a/src/client/OSCClientReceiver.hpp b/src/client/OSCClientReceiver.hpp
index e3fda0fa..c685f969 100644
--- a/src/client/OSCClientReceiver.hpp
+++ b/src/client/OSCClientReceiver.hpp
@@ -38,16 +38,7 @@ int _##name##_cb (LO_HANDLER_ARGS);\
inline static int name##_cb(LO_HANDLER_ARGS, void* osc_listener)\
{ return ((OSCClientReceiver*)osc_listener)->_##name##_cb(path, types, argv, argc, msg); }
-/** Callbacks for "notification band" OSC messages.
- *
- * Receives all notification of engine state, but not replies on the "control
- * band". See OSC namespace documentation for details.
- *
- * Right now this class and Comm share the same lo_server_thread and the barrier
- * between them is a bit odd, but eventually this class will be able to listen
- * on a completely different port (ie have it's own lo_server_thread) to allow
- * things like listening to the notification band over TCP while sending commands
- * on the control band over UDP.
+/** Client-side receiver for OSC messages from the engine.
*
* \ingroup IngenClient
*/
diff --git a/src/client/OSCEngineSender.hpp b/src/client/OSCEngineSender.hpp
index a29694fb..a50de0f3 100644
--- a/src/client/OSCEngineSender.hpp
+++ b/src/client/OSCEngineSender.hpp
@@ -18,7 +18,6 @@
#ifndef INGEN_CLIENT_OSCENGINESENDER_HPP
#define INGEN_CLIENT_OSCENGINESENDER_HPP
-#include <stdbool.h>
#include <stddef.h>
#include <string>
diff --git a/src/client/ObjectModel.hpp b/src/client/ObjectModel.hpp
index bcba2242..18f013fa 100644
--- a/src/client/ObjectModel.hpp
+++ b/src/client/ObjectModel.hpp
@@ -18,16 +18,17 @@
#ifndef INGEN_CLIENT_OBJECTMODEL_HPP
#define INGEN_CLIENT_OBJECTMODEL_HPP
-#include <cstdlib>
#include <algorithm>
#include <cassert>
-#include <boost/utility.hpp>
+#include <cstdlib>
+
#include "raul/Path.hpp"
-#include "raul/URI.hpp"
#include "raul/SharedPtr.hpp"
+#include "raul/URI.hpp"
+
+#include "client/signal.hpp"
#include "ingen/GraphObject.hpp"
#include "shared/ResourceImpl.hpp"
-#include "client/signal.hpp"
namespace Ingen {
diff --git a/src/client/PatchModel.hpp b/src/client/PatchModel.hpp
index dbd54c03..1b9e4a48 100644
--- a/src/client/PatchModel.hpp
+++ b/src/client/PatchModel.hpp
@@ -18,13 +18,11 @@
#ifndef INGEN_CLIENT_PATCHMODEL_HPP
#define INGEN_CLIENT_PATCHMODEL_HPP
-#include <cassert>
#include "raul/SharedPtr.hpp"
+
#include "ingen/Patch.hpp"
#include "NodeModel.hpp"
-#include "ConnectionModel.hpp"
-
namespace Ingen {
class Port;
@@ -32,6 +30,7 @@ class Port;
namespace Client {
class ClientStore;
+class ConnectionModel;
/** Client's model of a patch.
*
@@ -47,10 +46,8 @@ public:
SharedPtr<ConnectionModel> get_connection(const Ingen::Port* src_port,
const Ingen::Port* dst_port);
- //uint32_t poly() const { return _poly; }
bool enabled() const;
bool polyphonic() const;
-
uint32_t internal_poly() const;
/** "editable" = arranging,connecting,adding,deleting,etc
diff --git a/src/client/SigClientInterface.hpp b/src/client/SigClientInterface.hpp
index 7409688a..116ec0dc 100644
--- a/src/client/SigClientInterface.hpp
+++ b/src/client/SigClientInterface.hpp
@@ -18,10 +18,12 @@
#ifndef INGEN_CLIENT_SIGCLIENTINTERFACE_HPP
#define INGEN_CLIENT_SIGCLIENTINTERFACE_HPP
-#include <inttypes.h>
+#include <stdint.h>
+
#include "raul/Path.hpp"
-#include "ingen/ClientInterface.hpp"
+
#include "client/signal.hpp"
+#include "ingen/ClientInterface.hpp"
namespace Ingen {
namespace Client {
@@ -35,7 +37,7 @@ namespace Client {
* documentation for ClientInterface for meanings of signal parameters.
*/
class SigClientInterface : public Ingen::ClientInterface,
- public sigc::trackable
+ public INGEN_TRACKABLE
{
public:
SigClientInterface() {}
diff --git a/src/client/signal.hpp b/src/client/signal.hpp
index 46718163..f40c6a57 100644
--- a/src/client/signal.hpp
+++ b/src/client/signal.hpp
@@ -27,4 +27,6 @@ public: \
sigc::signal<__VA_ARGS__> signal_##name() const { return _signal_##name; } \
sigc::signal<__VA_ARGS__>& signal_##name() { return _signal_##name; }
+#define INGEN_TRACKABLE sigc::trackable
+
#endif // INGEN_CLIENT_SIGNAL_HPP