diff options
author | David Robillard <d@drobilla.net> | 2007-08-01 03:20:35 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2007-08-01 03:20:35 +0000 |
commit | 9cd4eddfb41c4573d4acd4f625572c4cdff50497 (patch) | |
tree | b9ebf2ecd19ddc5033c891edf17fae01a61ef438 /src/libs/engine/events | |
parent | 22395ab7d817dec53e2c2fff07de6d88db70492e (diff) | |
download | ingen-9cd4eddfb41c4573d4acd4f625572c4cdff50497.tar.gz ingen-9cd4eddfb41c4573d4acd4f625572c4cdff50497.tar.bz2 ingen-9cd4eddfb41c4573d4acd4f625572c4cdff50497.zip |
More SWIGification. Engine->Client calls/messages implemented... and segfault somewhere in Python :/ .
git-svn-id: http://svn.drobilla.net/lad/ingen@664 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/libs/engine/events')
-rw-r--r-- | src/libs/engine/events/RegisterClientEvent.cpp | 2 | ||||
-rw-r--r-- | src/libs/engine/events/RegisterClientEvent.hpp | 6 | ||||
-rw-r--r-- | src/libs/engine/events/RequestAllObjectsEvent.cpp | 2 | ||||
-rw-r--r-- | src/libs/engine/events/RequestAllObjectsEvent.hpp | 2 | ||||
-rw-r--r-- | src/libs/engine/events/RequestMetadataEvent.cpp | 2 | ||||
-rw-r--r-- | src/libs/engine/events/RequestMetadataEvent.hpp | 10 | ||||
-rw-r--r-- | src/libs/engine/events/RequestObjectEvent.cpp | 6 | ||||
-rw-r--r-- | src/libs/engine/events/RequestObjectEvent.hpp | 6 | ||||
-rw-r--r-- | src/libs/engine/events/RequestPluginEvent.hpp | 6 | ||||
-rw-r--r-- | src/libs/engine/events/RequestPluginsEvent.hpp | 4 | ||||
-rw-r--r-- | src/libs/engine/events/RequestPortValueEvent.hpp | 8 |
11 files changed, 27 insertions, 27 deletions
diff --git a/src/libs/engine/events/RegisterClientEvent.cpp b/src/libs/engine/events/RegisterClientEvent.cpp index ac2dbbc3..ac38d88c 100644 --- a/src/libs/engine/events/RegisterClientEvent.cpp +++ b/src/libs/engine/events/RegisterClientEvent.cpp @@ -27,7 +27,7 @@ RegisterClientEvent::RegisterClientEvent(Engine& engine, SharedPtr<Shared::Responder> responder, SampleCount timestamp, const string& uri, - SharedPtr<ClientInterface> client) + ClientInterface* client) : QueuedEvent(engine, responder, timestamp) , _uri(uri) , _client(client) diff --git a/src/libs/engine/events/RegisterClientEvent.hpp b/src/libs/engine/events/RegisterClientEvent.hpp index 90528956..a653a8bd 100644 --- a/src/libs/engine/events/RegisterClientEvent.hpp +++ b/src/libs/engine/events/RegisterClientEvent.hpp @@ -39,14 +39,14 @@ public: SharedPtr<Shared::Responder> responder, SampleCount timestamp, const string& uri, - SharedPtr<ClientInterface> client); + ClientInterface* client); void pre_process(); void post_process(); private: - string _uri; - SharedPtr<ClientInterface> _client; + string _uri; + ClientInterface* _client; }; diff --git a/src/libs/engine/events/RequestAllObjectsEvent.cpp b/src/libs/engine/events/RequestAllObjectsEvent.cpp index 4b068536..d82b6779 100644 --- a/src/libs/engine/events/RequestAllObjectsEvent.cpp +++ b/src/libs/engine/events/RequestAllObjectsEvent.cpp @@ -49,7 +49,7 @@ RequestAllObjectsEvent::post_process() // Everything is a child of the root patch, so this sends it all Patch* root = _engine.object_store()->find_patch("/"); if (root) - ObjectSender::send_patch(_client.get(), root, true); + ObjectSender::send_patch(_client, root, true); } else { _responder->respond_error("Unable to find client to send all objects"); diff --git a/src/libs/engine/events/RequestAllObjectsEvent.hpp b/src/libs/engine/events/RequestAllObjectsEvent.hpp index 91dfefc3..016e35c7 100644 --- a/src/libs/engine/events/RequestAllObjectsEvent.hpp +++ b/src/libs/engine/events/RequestAllObjectsEvent.hpp @@ -42,7 +42,7 @@ public: void post_process(); private: - SharedPtr<ClientInterface> _client; + ClientInterface* _client; }; diff --git a/src/libs/engine/events/RequestMetadataEvent.cpp b/src/libs/engine/events/RequestMetadataEvent.cpp index 9540d738..fa0ecafb 100644 --- a/src/libs/engine/events/RequestMetadataEvent.cpp +++ b/src/libs/engine/events/RequestMetadataEvent.cpp @@ -33,7 +33,7 @@ RequestMetadataEvent::RequestMetadataEvent(Engine& engine, SharedPtr<Shared::Res _path(node_path), _key(key), _object(NULL), - _client(SharedPtr<ClientInterface>()) + _client(NULL) { } diff --git a/src/libs/engine/events/RequestMetadataEvent.hpp b/src/libs/engine/events/RequestMetadataEvent.hpp index ed33e4af..db41fd32 100644 --- a/src/libs/engine/events/RequestMetadataEvent.hpp +++ b/src/libs/engine/events/RequestMetadataEvent.hpp @@ -44,11 +44,11 @@ public: void post_process(); private: - string _path; - string _key; - Raul::Atom _value; - GraphObject* _object; - SharedPtr<ClientInterface> _client; + string _path; + string _key; + Raul::Atom _value; + GraphObject* _object; + ClientInterface* _client; }; diff --git a/src/libs/engine/events/RequestObjectEvent.cpp b/src/libs/engine/events/RequestObjectEvent.cpp index 745b10c1..f8343df0 100644 --- a/src/libs/engine/events/RequestObjectEvent.cpp +++ b/src/libs/engine/events/RequestObjectEvent.cpp @@ -68,21 +68,21 @@ RequestObjectEvent::post_process() Patch* const patch = dynamic_cast<Patch*>(_object); if (patch) { _responder->respond_ok(); - ObjectSender::send_patch(_client.get(), patch, true); + ObjectSender::send_patch(_client, patch, true); return; } Node* const node = dynamic_cast<Node*>(_object); if (node) { _responder->respond_ok(); - ObjectSender::send_node(_client.get(), node, true); + ObjectSender::send_node(_client, node, true); return; } Port* const port = dynamic_cast<Port*>(_object); if (port) { _responder->respond_ok(); - ObjectSender::send_port(_client.get(), port); + ObjectSender::send_port(_client, port); return; } diff --git a/src/libs/engine/events/RequestObjectEvent.hpp b/src/libs/engine/events/RequestObjectEvent.hpp index 6731182a..58f7d73e 100644 --- a/src/libs/engine/events/RequestObjectEvent.hpp +++ b/src/libs/engine/events/RequestObjectEvent.hpp @@ -45,9 +45,9 @@ public: void post_process(); private: - string _path; - GraphObject* _object; - SharedPtr<ClientInterface> _client; + string _path; + GraphObject* _object; + ClientInterface* _client; }; diff --git a/src/libs/engine/events/RequestPluginEvent.hpp b/src/libs/engine/events/RequestPluginEvent.hpp index 26e5a8fa..8c927ed5 100644 --- a/src/libs/engine/events/RequestPluginEvent.hpp +++ b/src/libs/engine/events/RequestPluginEvent.hpp @@ -45,9 +45,9 @@ public: void post_process(); private: - string _uri; - const Plugin* _plugin; - SharedPtr<ClientInterface> _client; + string _uri; + const Plugin* _plugin; + ClientInterface* _client; }; diff --git a/src/libs/engine/events/RequestPluginsEvent.hpp b/src/libs/engine/events/RequestPluginsEvent.hpp index fae8bf94..489478e4 100644 --- a/src/libs/engine/events/RequestPluginsEvent.hpp +++ b/src/libs/engine/events/RequestPluginsEvent.hpp @@ -45,8 +45,8 @@ public: void post_process(); private: - SharedPtr<ClientInterface> _client; - std::list<Plugin*> _plugins; + ClientInterface* _client; + std::list<Plugin*> _plugins; }; diff --git a/src/libs/engine/events/RequestPortValueEvent.hpp b/src/libs/engine/events/RequestPortValueEvent.hpp index 1a20b90f..da843947 100644 --- a/src/libs/engine/events/RequestPortValueEvent.hpp +++ b/src/libs/engine/events/RequestPortValueEvent.hpp @@ -45,10 +45,10 @@ public: void post_process(); private: - string _port_path; - Port* _port; - Sample _value; - SharedPtr<ClientInterface> _client; + string _port_path; + Port* _port; + Sample _value; + ClientInterface* _client; }; |