summaryrefslogtreecommitdiffstats
path: root/ingen
diff options
context:
space:
mode:
Diffstat (limited to 'ingen')
-rw-r--r--ingen/ClientInterface.hpp3
-rw-r--r--ingen/EngineBase.hpp16
-rw-r--r--ingen/ServerInterface.hpp11
-rw-r--r--ingen/client/ClientStore.hpp2
-rw-r--r--ingen/client/SigClientInterface.hpp4
-rw-r--r--ingen/client/ThreadedSigClientInterface.hpp37
-rw-r--r--ingen/shared/URIs.hpp1
7 files changed, 37 insertions, 37 deletions
diff --git a/ingen/ClientInterface.hpp b/ingen/ClientInterface.hpp
index 0bed231c..d59e25b5 100644
--- a/ingen/ClientInterface.hpp
+++ b/ingen/ClientInterface.hpp
@@ -44,9 +44,6 @@ public:
virtual void response(int32_t id, Status status) = 0;
virtual void error(const std::string& msg) = 0;
-
- virtual void activity(const Raul::Path& path,
- const Raul::Atom& value) = 0;
};
} // namespace Ingen
diff --git a/ingen/EngineBase.hpp b/ingen/EngineBase.hpp
index 80d1c789..a0fba00f 100644
--- a/ingen/EngineBase.hpp
+++ b/ingen/EngineBase.hpp
@@ -18,8 +18,12 @@
#ifndef INGEN_ENGINE_BASE_HPP
#define INGEN_ENGINE_BASE_HPP
+#include "raul/URI.hpp"
+
namespace Ingen {
+class ClientInterface;
+
/**
The engine which executes the process graph.
@@ -60,6 +64,18 @@ public:
caller should cease calling main_iteration() and stop the engine.
*/
virtual bool main_iteration() = 0;
+
+ /**
+ Register a client to receive updates about engine changes.
+ */
+ virtual void register_client(const Raul::URI& uri,
+ ClientInterface* client) = 0;
+
+ /**
+ Unregister a client.
+ */
+ virtual bool unregister_client(const Raul::URI& uri) = 0;
+
};
} // namespace Ingen
diff --git a/ingen/ServerInterface.hpp b/ingen/ServerInterface.hpp
index 25016416..dade9658 100644
--- a/ingen/ServerInterface.hpp
+++ b/ingen/ServerInterface.hpp
@@ -36,13 +36,10 @@ class ServerInterface : public CommonInterface
public:
virtual ~ServerInterface() {}
- // Responses
- virtual void respond_to(ClientInterface* client, int32_t id) = 0;
- virtual void disable_responses() = 0;
-
- // Client registration
- virtual void register_client(ClientInterface* client) = 0;
- virtual void unregister_client(const Raul::URI& uri) = 0;
+ /** Set the ID to use to respond to the next message.
+ * Setting the ID to -1 will disable responses.
+ */
+ virtual void set_response_id(int32_t id) = 0;
// Requests
virtual void ping() = 0;
diff --git a/ingen/client/ClientStore.hpp b/ingen/client/ClientStore.hpp
index b6042086..e29723ae 100644
--- a/ingen/client/ClientStore.hpp
+++ b/ingen/client/ClientStore.hpp
@@ -125,8 +125,6 @@ private:
void bundle_end() {}
// Slots for SigClientInterface signals
- void activity(const Raul::Path& path, const Raul::Atom& value);
-
bool attempt_connection(const Raul::Path& src_port_path,
const Raul::Path& dst_port_path);
diff --git a/ingen/client/SigClientInterface.hpp b/ingen/client/SigClientInterface.hpp
index 559d1b15..db59be9d 100644
--- a/ingen/client/SigClientInterface.hpp
+++ b/ingen/client/SigClientInterface.hpp
@@ -60,7 +60,6 @@ public:
INGEN_SIGNAL(variable_change, void, Raul::URI, Raul::URI, Raul::Atom)
INGEN_SIGNAL(property_change, void, Raul::URI, Raul::URI, Raul::Atom)
INGEN_SIGNAL(port_value, void, Raul::Path, Raul::Atom)
- INGEN_SIGNAL(activity, void, Raul::Path, Raul::Atom)
/** Fire pending signals. Only does anything on derived classes (that may queue) */
virtual bool emit_signals() { return false; }
@@ -110,9 +109,6 @@ protected:
void set_property(const Raul::URI& subject, const Raul::URI& key, const Raul::Atom& value)
{ EMIT(property_change, subject, key, value); }
-
- void activity(const Raul::Path& port_path, const Raul::Atom& value)
- { EMIT(activity, port_path, value); }
};
} // namespace Client
diff --git a/ingen/client/ThreadedSigClientInterface.hpp b/ingen/client/ThreadedSigClientInterface.hpp
index 6ded560e..2a33eae8 100644
--- a/ingen/client/ThreadedSigClientInterface.hpp
+++ b/ingen/client/ThreadedSigClientInterface.hpp
@@ -65,7 +65,6 @@ public:
, variable_change_slot(_signal_variable_change.make_slot())
, property_change_slot(_signal_property_change.make_slot())
, port_value_slot(_signal_port_value.make_slot())
- , activity_slot(_signal_activity.make_slot())
{}
virtual Raul::URI uri() const { return "http://drobilla.net/ns/ingen#internal"; }
@@ -110,9 +109,6 @@ public:
void set_property(const Raul::URI& subject, const Raul::URI& key, const Raul::Atom& value)
{ push_sig(sigc::bind(property_change_slot, subject, key, value)); }
- void activity(const Raul::Path& port_path, const Raul::Atom& value)
- { push_sig(sigc::bind(activity_slot, port_path, value)); }
-
/** Process all queued events - Called from GTK thread to emit signals. */
bool emit_signals();
@@ -124,25 +120,24 @@ private:
Raul::SRSWQueue<Closure> _sigs;
- sigc::slot<void> bundle_begin_slot;
- sigc::slot<void> bundle_end_slot;
- sigc::slot<void, int32_t, Status> response_slot;
- sigc::slot<void, std::string> error_slot;
- sigc::slot<void, Raul::URI, Raul::URI, Raul::Symbol> new_plugin_slot;
- sigc::slot<void, Raul::Path, Raul::URI, uint32_t, bool> new_port_slot;
+ sigc::slot<void> bundle_begin_slot;
+ sigc::slot<void> bundle_end_slot;
+ sigc::slot<void, int32_t, Status> response_slot;
+ sigc::slot<void, std::string> error_slot;
+ sigc::slot<void, Raul::URI, Raul::URI, Raul::Symbol> new_plugin_slot;
+ sigc::slot<void, Raul::Path, Raul::URI, uint32_t, bool> new_port_slot;
sigc::slot<void, Raul::URI, Resource::Properties,
- Resource::Graph> put_slot;
+ Resource::Graph> put_slot;
sigc::slot<void, Raul::URI, Resource::Properties,
- Resource::Properties> delta_slot;
- sigc::slot<void, Raul::Path, Raul::Path> connection_slot;
- sigc::slot<void, Raul::URI> object_deleted_slot;
- sigc::slot<void, Raul::Path, Raul::Path> object_moved_slot;
- sigc::slot<void, Raul::URI, Raul::URI> disconnection_slot;
- sigc::slot<void, Raul::Path, Raul::Path> disconnect_all_slot;
- sigc::slot<void, Raul::URI, Raul::URI, Raul::Atom> variable_change_slot;
- sigc::slot<void, Raul::URI, Raul::URI, Raul::Atom> property_change_slot;
- sigc::slot<void, Raul::Path, Raul::Atom> port_value_slot;
- sigc::slot<void, Raul::Path, Raul::Atom> activity_slot;
+ Resource::Properties> delta_slot;
+ sigc::slot<void, Raul::Path, Raul::Path> connection_slot;
+ sigc::slot<void, Raul::URI> object_deleted_slot;
+ sigc::slot<void, Raul::Path, Raul::Path> object_moved_slot;
+ sigc::slot<void, Raul::URI, Raul::URI> disconnection_slot;
+ sigc::slot<void, Raul::Path, Raul::Path> disconnect_all_slot;
+ sigc::slot<void, Raul::URI, Raul::URI, Raul::Atom> variable_change_slot;
+ sigc::slot<void, Raul::URI, Raul::URI, Raul::Atom> property_change_slot;
+ sigc::slot<void, Raul::Path, Raul::Atom> port_value_slot;
};
} // namespace Client
diff --git a/ingen/shared/URIs.hpp b/ingen/shared/URIs.hpp
index b3d8d301..a99e45d0 100644
--- a/ingen/shared/URIs.hpp
+++ b/ingen/shared/URIs.hpp
@@ -60,6 +60,7 @@ public:
const Quark ingen_Node;
const Quark ingen_Patch;
const Quark ingen_Port;
+ const Quark ingen_activity;
const Quark ingen_broadcast;
const Quark ingen_controlBinding;
const Quark ingen_document;
generated by cgit v1.2.1 (git 2.18.0) at 2024-04-24 17:33:48 +0000