summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/client/HTTPEngineSender.cpp10
-rw-r--r--src/client/HTTPEngineSender.hpp1
-rw-r--r--src/client/OSCEngineSender.cpp8
-rw-r--r--src/client/OSCEngineSender.hpp1
-rw-r--r--src/common/interface/EngineInterface.hpp2
-rw-r--r--src/engine/OSCEngineReceiver.cpp13
-rw-r--r--src/engine/QueuedEngineInterface.cpp7
-rw-r--r--src/engine/QueuedEngineInterface.hpp1
-rw-r--r--src/engine/events.hpp1
-rw-r--r--src/engine/events/Get.cpp2
-rw-r--r--src/engine/events/RequestAllObjects.cpp62
-rw-r--r--src/engine/events/RequestAllObjects.hpp44
-rw-r--r--src/engine/wscript1
-rw-r--r--src/gui/ConnectWindow.cpp2
14 files changed, 2 insertions, 153 deletions
diff --git a/src/client/HTTPEngineSender.cpp b/src/client/HTTPEngineSender.cpp
index f7400252..65631067 100644
--- a/src/client/HTTPEngineSender.cpp
+++ b/src/client/HTTPEngineSender.cpp
@@ -232,16 +232,6 @@ HTTPEngineSender::request_plugins()
}
-void
-HTTPEngineSender::request_all_objects()
-{
- SoupMessage* msg = soup_message_new("GET", (_engine_url.str() + "/patch").c_str());
- HTTPClientReceiver::send(msg);
-}
-
-
-
} // namespace Client
} // namespace Ingen
-
diff --git a/src/client/HTTPEngineSender.hpp b/src/client/HTTPEngineSender.hpp
index 6c7f7ed3..7d3c4e39 100644
--- a/src/client/HTTPEngineSender.hpp
+++ b/src/client/HTTPEngineSender.hpp
@@ -110,7 +110,6 @@ public:
void get(const Raul::URI& uri);
void request_property(const Raul::URI& path, const Raul::URI& key);
void request_plugins();
- void request_all_objects();
protected:
SoupSession* _session;
diff --git a/src/client/OSCEngineSender.cpp b/src/client/OSCEngineSender.cpp
index 8600ec44..6d3132df 100644
--- a/src/client/OSCEngineSender.cpp
+++ b/src/client/OSCEngineSender.cpp
@@ -268,14 +268,6 @@ OSCEngineSender::request_plugins()
}
-void
-OSCEngineSender::request_all_objects()
-{
- send("/request_all_objects", "i", next_id(), LO_ARGS_END);
-}
-
-
} // namespace Client
} // namespace Ingen
-
diff --git a/src/client/OSCEngineSender.hpp b/src/client/OSCEngineSender.hpp
index 538acad9..2383b88a 100644
--- a/src/client/OSCEngineSender.hpp
+++ b/src/client/OSCEngineSender.hpp
@@ -107,7 +107,6 @@ public:
void get(const Raul::URI& uri);
void request_property(const Raul::URI& path, const Raul::URI& key);
void request_plugins();
- void request_all_objects();
protected:
const Raul::URI _engine_url;
diff --git a/src/common/interface/EngineInterface.hpp b/src/common/interface/EngineInterface.hpp
index d4efac11..4b706c01 100644
--- a/src/common/interface/EngineInterface.hpp
+++ b/src/common/interface/EngineInterface.hpp
@@ -68,8 +68,6 @@ public:
const Raul::URI& key) = 0;
virtual void request_plugins() = 0;
-
- virtual void request_all_objects() = 0;
};
diff --git a/src/engine/OSCEngineReceiver.cpp b/src/engine/OSCEngineReceiver.cpp
index 4f7f0ebe..4f834719 100644
--- a/src/engine/OSCEngineReceiver.cpp
+++ b/src/engine/OSCEngineReceiver.cpp
@@ -647,19 +647,6 @@ OSCEngineReceiver::_request_plugins_cb(const char* path, const char* types, lo_a
}
-/** \page engine_osc_namespace
- * <h2>/request_all_objects</h2>
- * \arg \b response-id (integer)
- *
- * Requests all information about all known objects.
- */
-int
-OSCEngineReceiver::_request_all_objects_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg)
-{
- request_all_objects();
- return 0;
-}
-
// Static Callbacks //
diff --git a/src/engine/QueuedEngineInterface.cpp b/src/engine/QueuedEngineInterface.cpp
index 138970ee..4276e5d7 100644
--- a/src/engine/QueuedEngineInterface.cpp
+++ b/src/engine/QueuedEngineInterface.cpp
@@ -271,11 +271,4 @@ QueuedEngineInterface::request_plugins()
}
-void
-QueuedEngineInterface::request_all_objects()
-{
- push_queued(new Events::RequestAllObjects(_engine, _request, now()));
-}
-
-
} // namespace Ingen
diff --git a/src/engine/QueuedEngineInterface.hpp b/src/engine/QueuedEngineInterface.hpp
index beaccb13..617458ab 100644
--- a/src/engine/QueuedEngineInterface.hpp
+++ b/src/engine/QueuedEngineInterface.hpp
@@ -103,7 +103,6 @@ public:
virtual void get(const Raul::URI& uri);
virtual void request_property(const Raul::URI& object_path, const Raul::URI& key);
virtual void request_plugins();
- virtual void request_all_objects();
protected:
virtual void disable_responses();
diff --git a/src/engine/events.hpp b/src/engine/events.hpp
index 54fb63c7..58d6f63e 100644
--- a/src/engine/events.hpp
+++ b/src/engine/events.hpp
@@ -35,7 +35,6 @@
#include "events/Note.hpp"
#include "events/Ping.hpp"
#include "events/RegisterClient.hpp"
-#include "events/RequestAllObjects.hpp"
#include "events/RequestMetadata.hpp"
#include "events/RequestPlugins.hpp"
#include "events/SetMetadata.hpp"
diff --git a/src/engine/events/Get.cpp b/src/engine/events/Get.cpp
index 214bb33d..05aa2f90 100644
--- a/src/engine/events/Get.cpp
+++ b/src/engine/events/Get.cpp
@@ -74,7 +74,7 @@ Get::post_process()
} else if (_request->client()) {
_request->respond_ok();
if (_object)
- _request->client()->put(_uri, _object->properties());
+ ObjectSender::send_object(_request->client(), _object, true);
else if (_plugin)
_request->client()->put(_uri, _plugin->properties());
} else {
diff --git a/src/engine/events/RequestAllObjects.cpp b/src/engine/events/RequestAllObjects.cpp
deleted file mode 100644
index 98119e07..00000000
--- a/src/engine/events/RequestAllObjects.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-/* This file is part of Ingen.
- * Copyright (C) 2007-2009 Dave Robillard <http://drobilla.net>
- *
- * Ingen is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later
- * version.
- *
- * Ingen is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "events/RequestAllObjects.hpp"
-#include "Request.hpp"
-#include "Engine.hpp"
-#include "ObjectSender.hpp"
-#include "ClientBroadcaster.hpp"
-#include "EngineStore.hpp"
-#include "PatchImpl.hpp"
-
-namespace Ingen {
-namespace Events {
-
-
-RequestAllObjects::RequestAllObjects(Engine& engine, SharedPtr<Request> request, SampleCount timestamp)
-: QueuedEvent(engine, request, timestamp)
-{
-}
-
-
-void
-RequestAllObjects::pre_process()
-{
- QueuedEvent::pre_process();
-}
-
-
-void
-RequestAllObjects::post_process()
-{
- if (_request->client()) {
- _request->respond_ok();
-
- // Everything is a child of the root patch, so this sends it all
- PatchImpl* root = _engine.engine_store()->find_patch("/");
- if (root && _request->client())
- ObjectSender::send_object(_request->client(), root, true);
-
- } else {
- _request->respond_error("Unable to find client to send all objects");
- }
-}
-
-
-} // namespace Ingen
-} // namespace Events
-
diff --git a/src/engine/events/RequestAllObjects.hpp b/src/engine/events/RequestAllObjects.hpp
deleted file mode 100644
index d7970e12..00000000
--- a/src/engine/events/RequestAllObjects.hpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/* This file is part of Ingen.
- * Copyright (C) 2007-2009 Dave Robillard <http://drobilla.net>
- *
- * Ingen is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later
- * version.
- *
- * Ingen is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef INGEN_EVENTS_REQUESTALLOBJECTS_HPP
-#define INGEN_EVENTS_REQUESTALLOBJECTS_HPP
-
-#include "QueuedEvent.hpp"
-
-namespace Ingen {
-namespace Events {
-
-
-/** A request from a client to send notification of all objects (ie refresh).
- *
- * \ingroup engine
- */
-class RequestAllObjects : public QueuedEvent
-{
-public:
- RequestAllObjects(Engine& engine, SharedPtr<Request> request, SampleCount timestamp);
-
- void pre_process();
- void post_process();
-};
-
-
-} // namespace Ingen
-} // namespace Events
-
-#endif // INGEN_EVENTS_REQUESTALLOBJECTS_HPP
diff --git a/src/engine/wscript b/src/engine/wscript
index 39ac47d5..28777708 100644
--- a/src/engine/wscript
+++ b/src/engine/wscript
@@ -47,7 +47,6 @@ def build(bld):
events/Move.cpp
events/Note.cpp
events/RegisterClient.cpp
- events/RequestAllObjects.cpp
events/RequestMetadata.cpp
events/RequestPlugins.cpp
events/SendBinding.cpp
diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp
index 281fa274..0d8c8e76 100644
--- a/src/gui/ConnectWindow.cpp
+++ b/src/gui/ConnectWindow.cpp
@@ -445,7 +445,7 @@ ConnectWindow::gtk_callback()
}
}
} else if (_connect_stage == 2) {
- App::instance().engine()->request_all_objects();
+ App::instance().engine()->get(Path("/"));
if (_widgets_loaded)
_progress_label->set_text(string("Requesting root patch..."));
++_connect_stage;
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-27 10:20:22 +0000