fly/flightgear
1
0
Fork 0
Code Activity

Update from SimGear API change

Browse source 
- support new HTTP cancellation API
This commit is contained in:
James Turner 2016-04-14 09:33:20 +01:00
parent 56374621c5
commit 7a36b96790
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/Scripting/NasalHTTP.cxx
View file

@ -77,6 +77,15 @@ static naRef f_http_load(const nasal::CallContext& ctx)
return ctx.to_nasal( requireHTTPClient(ctx.c).client()->load(url) ); return ctx.to_nasal( requireHTTPClient(ctx.c).client()->load(url) );
} }
static naRef f_request_abort(simgear::HTTP::Request&, const nasal::CallContext& ctx)
{
// we need a request_ptr for cancel, not a reference. So extract
// the me object from the context directly.
simgear::HTTP::Request_ptr req = ctx.from_nasal<simgear::HTTP::Request_ptr>(ctx.me);
requireHTTPClient(ctx.c).client()->cancelRequest(req);
return naNil();
}
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
naRef initNasalHTTP(naRef globals, naContext c) naRef initNasalHTTP(naRef globals, naContext c)
{ {
@ -93,7 +102,7 @@ naRef initNasalHTTP(naRef globals, naContext c)
.member("status", &Request::responseCode) .member("status", &Request::responseCode)
.member("reason", &Request::responseReason) .member("reason", &Request::responseReason)
.member("readyState", &Request::readyState) .member("readyState", &Request::readyState)
.method("abort", static_cast<void (Request::*)()>(&Request::abort)) .method("abort", f_request_abort)
.method("done", static_cast<HTTPCallback>(&Request::done)) .method("done", static_cast<HTTPCallback>(&Request::done))
.method("fail", static_cast<HTTPCallback>(&Request::fail)) .method("fail", static_cast<HTTPCallback>(&Request::fail))
.method("always", static_cast<HTTPCallback>(&Request::always)); .method("always", static_cast<HTTPCallback>(&Request::always));