diff options
author | David Robillard <d@drobilla.net> | 2011-11-24 18:06:52 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2011-11-24 18:06:52 +0000 |
commit | 833c93cbde3c7829091a34204435b995a2f5e387 (patch) | |
tree | bc03ad4c27c78118098072a55f5566042eb80243 /src/http/HTTPEngineSender.cpp | |
parent | 998fc10a1f8358b455960ecafee9910a0ea906d3 (diff) | |
download | ingen-833c93cbde3c7829091a34204435b995a2f5e387.tar.gz ingen-833c93cbde3c7829091a34204435b995a2f5e387.tar.bz2 ingen-833c93cbde3c7829091a34204435b995a2f5e387.zip |
Remove client from world.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3619 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/http/HTTPEngineSender.cpp')
-rw-r--r-- | src/http/HTTPEngineSender.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/http/HTTPEngineSender.cpp b/src/http/HTTPEngineSender.cpp index 43a3d44c..674b2674 100644 --- a/src/http/HTTPEngineSender.cpp +++ b/src/http/HTTPEngineSender.cpp @@ -39,12 +39,13 @@ namespace Client { HTTPEngineSender::HTTPEngineSender(World* world, const URI& engine_url, SharedPtr<Raul::Deletable> receiver) - : _receiver(receiver) + : _receiver(PtrCast<HTTPClientReceiver>(receiver)) , _world(*world->rdf_world()) , _engine_url(engine_url) , _id(0) , _enabled(true) { + assert(_receiver); _session = soup_session_sync_new(); } @@ -57,8 +58,9 @@ void HTTPEngineSender::attach(int32_t ping_id, bool block) { LOG(debug) << "Attaching to " << _engine_url << endl; - SoupMessage* msg = soup_message_new ("GET", _engine_url.c_str()); - HTTPClientReceiver::send(msg); + SoupMessage* msg = soup_message_new("GET", _engine_url.c_str()); + soup_session_queue_message(_session, msg, + HTTPClientReceiver::message_callback, _receiver.get()); } /* *** ServerInterface implementation below here *** */ @@ -175,7 +177,7 @@ HTTPEngineSender::ping() void HTTPEngineSender::get(const URI& uri) { - if (!Raul::Path::is_path(uri) && uri.scheme() != "http") { + if (!Raul::Path::is_path(uri) && uri.scheme() != "http" && uri.scheme() != "ingen") { LOG(warn) << "Ignoring GET of non-HTTP URI " << uri << endl; return; } @@ -186,7 +188,9 @@ HTTPEngineSender::get(const URI& uri) cout << "Get " << request_uri << endl; LOG(debug) << "Get " << request_uri << endl; SoupMessage* msg = soup_message_new("GET", request_uri.c_str()); - HTTPClientReceiver::send(msg); + soup_session_queue_message(_session, msg, + HTTPClientReceiver::message_callback, _receiver.get()); + } } // namespace Client |