diff options
author | David Robillard <d@drobilla.net> | 2009-05-29 03:48:09 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2009-05-29 03:48:09 +0000 |
commit | 90386cd6f49e2e9bfb11e7596ae6ce3ac51dfe16 (patch) | |
tree | e9d47b4de18f266691b13d63e58fedcdba398bc4 /src/client/HTTPEngineSender.cpp | |
parent | 5245a25bafec9372d07c346457d473cfa76724df (diff) | |
download | ingen-90386cd6f49e2e9bfb11e7596ae6ce3ac51dfe16.tar.gz ingen-90386cd6f49e2e9bfb11e7596ae6ce3ac51dfe16.tar.bz2 ingen-90386cd6f49e2e9bfb11e7596ae6ce3ac51dfe16.zip |
Fix reconnecting to engine via various protocols (inferred from user URI) in GUI.
Separate HTTP client receiver and sender sanely.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2048 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/client/HTTPEngineSender.cpp')
-rw-r--r-- | src/client/HTTPEngineSender.cpp | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/src/client/HTTPEngineSender.cpp b/src/client/HTTPEngineSender.cpp index abf51a56..1d0cd846 100644 --- a/src/client/HTTPEngineSender.cpp +++ b/src/client/HTTPEngineSender.cpp @@ -21,6 +21,7 @@ #include "redlandmm/Model.hpp" #include "module/World.hpp" #include "HTTPEngineSender.hpp" +#include "HTTPClientReceiver.hpp" using namespace std; @@ -46,15 +47,11 @@ HTTPEngineSender::~HTTPEngineSender() soup_session_abort(_session); } - void HTTPEngineSender::attach(int32_t ping_id, bool block) { - /*SoupMessage *msg; - msg = soup_message_new ("GET", _engine_url.c_str()); - int status = soup_session_send_message (_session, msg); - cout << "STATUS: " << status << endl; - cout << "RESPONSE: " << msg->response_body->data << endl;*/ + SoupMessage* msg = soup_message_new ("GET", _engine_url.c_str()); + HTTPClientReceiver::send(msg); } @@ -70,6 +67,8 @@ HTTPEngineSender::attach(int32_t ping_id, bool block) void HTTPEngineSender::register_client(ClientInterface* client) { + /*SoupMessage* msg = soup_message_new("GET", (_engine_url.str() + "/stream").c_str()); + HTTPClientReceiver::send(msg);*/ } @@ -83,6 +82,8 @@ HTTPEngineSender::unregister_client(const URI& uri) void HTTPEngineSender::load_plugins() { + SoupMessage* msg = soup_message_new("GET", (_engine_url.str() + "/plugins").c_str()); + HTTPClientReceiver::send(msg); } @@ -108,12 +109,6 @@ HTTPEngineSender::quit() // Object commands -void -HTTPEngineSender::message_callback(SoupSession* session, SoupMessage* msg, void* ptr) -{ - cerr << "HTTP CALLBACK" << endl; -} - void HTTPEngineSender::put(const URI& uri, @@ -216,30 +211,39 @@ HTTPEngineSender::set_property(const URI& subject, void HTTPEngineSender::ping() { + SoupMessage* msg = soup_message_new("GET", ""); + HTTPClientReceiver::send(msg); } void HTTPEngineSender::get(const URI& uri) { + SoupMessage* msg = soup_message_new("GET", uri.c_str()); + HTTPClientReceiver::send(msg); } void HTTPEngineSender::request_property(const URI& object_path, const URI& key) { + cerr << "HTTP REQUEST PROPERTY" << endl; } void HTTPEngineSender::request_plugins() { + SoupMessage* msg = soup_message_new("GET", (_engine_url.str() + "/plugins").c_str()); + HTTPClientReceiver::send(msg); } void HTTPEngineSender::request_all_objects() { + SoupMessage* msg = soup_message_new("GET", (_engine_url.str() + "/patch").c_str()); + HTTPClientReceiver::send(msg); } |