From 2a1a01f173e91419c5e08c7913d2acc559b9e66e Mon Sep 17 00:00:00 2001 From: Cyrille Favreau Date: Fri, 7 Jul 2017 11:17:16 +0200 Subject: [PATCH] Fixed ZeroEQ unsubsription of camera event --- plugins/extensions/plugins/ZeroEQPlugin.cpp | 15 +-------------- plugins/extensions/plugins/ZeroEQPlugin.h | 4 ---- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/plugins/extensions/plugins/ZeroEQPlugin.cpp b/plugins/extensions/plugins/ZeroEQPlugin.cpp index 06ec5b8407..5c361260e4 100644 --- a/plugins/extensions/plugins/ZeroEQPlugin.cpp +++ b/plugins/extensions/plugins/ZeroEQPlugin.cpp @@ -110,7 +110,7 @@ void ZeroEQPlugin::_onChangeEngine() servus::Serializable::DeserializedCallback()); if (_httpServer) - _httpServer->remove(cam); + _httpServer->remove(ENDPOINT_CAMERA); _requests.erase(::brayns::v1::Camera::ZEROBUF_TYPE_IDENTIFIER()); @@ -165,19 +165,6 @@ ::zeroeq::http::Server* ZeroEQPlugin::operator->() return _httpServer.get(); } -void ZeroEQPlugin::handle(servus::Serializable& object) -{ - if (_httpServer) - _httpServer->handle(object); - _subscriber.subscribe(object); - _requests[object.getTypeIdentifier()] = [&] { - return _publisher.publish(object); - }; - - // publish updates from HTTP to subscribers, e.g. livreGUI - object.registerDeserializedCallback([&] { _publisher.publish(object); }); -} - void ZeroEQPlugin::_setupHTTPServer() { const strings& arguments = diff --git a/plugins/extensions/plugins/ZeroEQPlugin.h b/plugins/extensions/plugins/ZeroEQPlugin.h index 168c5f7e26..db08c866f2 100644 --- a/plugins/extensions/plugins/ZeroEQPlugin.h +++ b/plugins/extensions/plugins/ZeroEQPlugin.h @@ -61,10 +61,6 @@ class ZeroEQPlugin : public ExtensionPlugin BRAYNS_API bool operator!() const; BRAYNS_API::zeroeq::http::Server* operator->(); - /** Handle the given objects in subscriber, publisher (via request) and HTTP - * server. */ - BRAYNS_API void handle(servus::Serializable& object); - private: /** * @brief Initializes HTTP server