Changeset 2504

Timestamp:

02/25/10 22:01:18 (7 months ago)

Author:

drobilla

Message:

Remove request_plugins from EngineInterface? (and RequestPlugins? event from engine), replacing with get of magic URI "ingen:plugins".

Location:

trunk/ingen/src

Files:

• client/HTTPEngineSender.cpp (modified) (1 diff)
• client/HTTPEngineSender.hpp (modified) (1 diff)
• client/OSCEngineSender.cpp (modified) (1 diff)
• client/OSCEngineSender.hpp (modified) (1 diff)
• common/interface/EngineInterface.hpp (modified) (1 diff)
• engine/events.hpp (modified) (1 diff)
• engine/events/Get.cpp (modified) (2 diffs)
• engine/events/Get.hpp (modified) (2 diffs)
• engine/events/RequestPlugins.cpp (deleted)
• engine/events/RequestPlugins.hpp (deleted)
• engine/OSCEngineReceiver.cpp (modified) (2 diffs)
• engine/OSCEngineReceiver.hpp (modified) (1 diff)
• engine/QueuedEngineInterface.cpp (modified) (1 diff)
• engine/QueuedEngineInterface.hpp (modified) (1 diff)
• engine/wscript (modified) (1 diff)
• gui/ConnectWindow.cpp (modified) (1 diff)
• ingen/main.cpp (modified) (1 diff)

trunk/ingen/src/client/HTTPEngineSender.cpp

@@ -225 +225 @@
 
 
-void
-HTTPEngineSender::request_plugins()
-{
-        SoupMessage* msg = soup_message_new("GET", (_engine_url.str() + "/plugins").c_str());
-        HTTPClientReceiver::send(msg);
-}
-
-
 } // namespace Client
 } // namespace Ingen

trunk/ingen/src/client/HTTPEngineSender.hpp

@@ -110 +110 @@
         void get(const Raul::URI& uri);
         void request_property(const Raul::URI& path, const Raul::URI& key);
-        void request_plugins();
 
 protected:

trunk/ingen/src/client/OSCEngineSender.cpp

@@ -262 +262 @@
 
 
-void
-OSCEngineSender::request_plugins()
-{
-        send("/request_plugins", "i", next_id(), LO_ARGS_END);
-}
-
-
 } // namespace Client
 } // namespace Ingen

trunk/ingen/src/client/OSCEngineSender.hpp

@@ -107 +107 @@
         void get(const Raul::URI& uri);
         void request_property(const Raul::URI& path, const Raul::URI& key);
-        void request_plugins();
 
 protected:

trunk/ingen/src/common/interface/EngineInterface.hpp

@@ -67 +67 @@
         virtual void request_property(const Raul::URI& uri,
                                       const Raul::URI& key) = 0;
-
-        virtual void request_plugins() = 0;
 };
 

trunk/ingen/src/engine/events.hpp

@@ -37 +37 @@
 #include "events/RegisterClient.hpp"
 #include "events/RequestMetadata.hpp"
-#include "events/RequestPlugins.hpp"
 #include "events/SetMetadata.hpp"
 #include "events/SetPortValue.hpp"

trunk/ingen/src/engine/events/Get.cpp

@@ -50 +50 @@
 Get::pre_process()
 {
-        if (Path::is_valid(_uri.str()))
+        if (_uri == "ingen:plugins") {
+                _plugins = _engine.node_factory()->plugins();
+        } else if (Path::is_valid(_uri.str())) {
                 _object = _engine.engine_store()->find_object(Path(_uri.str()));
-        else
+        } else {
                 _plugin = _engine.node_factory()->plugin(_uri);
+        }
 
         QueuedEvent::pre_process();
@@ -60 +63 @@
 
 void
-Get::execute(ProcessContext& context)
-{
-        QueuedEvent::execute(context);
-        assert(_time >= context.start() && _time <= context.end());
-}
-
-
-void
 Get::post_process()
 {
-        if (!_object && !_plugin) {
+        if (_uri == "ingen:plugins") {
+                _request->respond_ok();
+                _engine.broadcaster()->send_plugins_to(_request->client(), _plugins);
+        } else if (!_object && !_plugin) {
                 _request->respond_error("Unable to find object requested.");
         } else if (_request->client()) {

trunk/ingen/src/engine/events/Get.hpp

@@ -20 +20 @@
 
 #include "QueuedEvent.hpp"
+#include "NodeFactory.hpp"
 #include "types.hpp"
 
@@ -44 +45 @@
 
         void pre_process();
-        void execute(ProcessContext& context);
         void post_process();
 
 private:
-        const Raul::URI   _uri;
-        GraphObjectImpl*  _object;
-        const PluginImpl* _plugin;
+        const Raul::URI      _uri;
+        GraphObjectImpl*     _object;
+        const PluginImpl*    _plugin;
+        NodeFactory::Plugins _plugins;
 };
 

trunk/ingen/src/engine/OSCEngineReceiver.cpp

@@ -113 +113 @@
         lo_server_add_method(_server, "/request_property", "iss", request_property_cb, this);
         lo_server_add_method(_server, "/get", "is", get_cb, this);
-        lo_server_add_method(_server, "/request_plugins", "i", request_plugins_cb, this);
-        lo_server_add_method(_server, "/request_all_objects", "i", request_all_objects_cb, this);
 
         lo_server_add_method(_server, NULL, NULL, unknown_cb, NULL);
@@ -634 +632 @@
 
 
-/** \page engine_osc_namespace
- * <h2>/request_plugins</h2>
- * \arg \b response-id (integer)
- *
- * Request the engine send a list of all known plugins.
- */
-int
-OSCEngineReceiver::_request_plugins_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg)
-{
-        request_plugins();
-        return 0;
-}
-
-
-
 //  Static Callbacks //
 

trunk/ingen/src/engine/OSCEngineReceiver.hpp

@@ -113 +113 @@
         LO_HANDLER(property_set);
         LO_HANDLER(request_property);
-        LO_HANDLER(request_plugins);
-        LO_HANDLER(request_all_objects);
 
         lo_server _server;

trunk/ingen/src/engine/QueuedEngineInterface.cpp

@@ -265 +265 @@
 
 
-void
-QueuedEngineInterface::request_plugins()
-{
-        push_queued(new Events::RequestPlugins(_engine, _request, now()));
-}
-
-
 } // namespace Ingen

trunk/ingen/src/engine/QueuedEngineInterface.hpp

@@ -103 +103 @@
         virtual void get(const Raul::URI& uri);
         virtual void request_property(const Raul::URI& object_path, const Raul::URI& key);
-        virtual void request_plugins();
 
 protected:

trunk/ingen/src/engine/wscript

@@ -49 +49 @@
                 events/RegisterClient.cpp
                 events/RequestMetadata.cpp
-                events/RequestPlugins.cpp
                 events/SendBinding.cpp
                 events/SendPortActivity.cpp

trunk/ingen/src/gui/ConnectWindow.cpp

@@ -463 +463 @@
                 }
         } else if (_connect_stage == 4) {
-                App::instance().engine()->request_plugins();
+                App::instance().engine()->get("ingen:plugins");
                 hide();
                 if (_widgets_loaded)

trunk/ingen/src/ingen/main.cpp

@@ -219 +219 @@
                         engine_interface->load_plugins();
                         if (conf.option("gui").get_bool())
-                                engine_interface->request_plugins();
+                                engine_interface->get("ingen:plugins");
                         world->parser->parse_document(
                                         world, engine_interface.get(), uri, data_path, parent, symbol);