Fixed ZeroEQ unsubsription of camera event

BlueBrain · Jul 7, 2017 · 2a1a01f · 2a1a01f
1 parent c607b62
commit 2a1a01f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 18 deletions.
diff --git 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
@@ -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