From 9da093217352daa1fb61a6f2daf5195640e286a7 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 16 Mar 2012 04:13:23 +0000 Subject: Merge ClientInterface and ServerInterface. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4067 a436a847-0d15-0410-975c-d299462d15a1 --- src/gui/App.cpp | 4 ++-- src/gui/App.hpp | 5 ++--- src/gui/ConnectWindow.cpp | 9 ++++----- src/gui/ConnectWindow.hpp | 2 +- src/gui/ControlPanel.cpp | 2 +- src/gui/Controls.cpp | 2 +- src/gui/LoadPatchWindow.cpp | 2 +- src/gui/LoadPluginWindow.cpp | 2 +- src/gui/NewSubpatchWindow.cpp | 2 +- src/gui/NodeControlWindow.cpp | 2 +- src/gui/NodeMenu.cpp | 2 +- src/gui/NodeModule.cpp | 2 +- src/gui/ObjectMenu.cpp | 2 +- src/gui/PatchCanvas.cpp | 2 +- src/gui/PatchPortModule.cpp | 2 +- src/gui/PatchTreeWindow.cpp | 2 +- src/gui/PatchView.cpp | 2 +- src/gui/PatchWindow.cpp | 2 +- src/gui/Port.cpp | 2 +- src/gui/PortMenu.cpp | 2 +- src/gui/PortPropertiesWindow.cpp | 2 +- src/gui/RenameWindow.cpp | 2 +- src/gui/SubpatchModule.cpp | 2 +- src/gui/ThreadedLoader.cpp | 2 +- src/gui/ThreadedLoader.hpp | 14 +++++++------- 25 files changed, 36 insertions(+), 38 deletions(-) (limited to 'src/gui') diff --git a/src/gui/App.cpp b/src/gui/App.cpp index 5ef4575d..620aceb4 100644 --- a/src/gui/App.cpp +++ b/src/gui/App.cpp @@ -22,7 +22,7 @@ #include #include "ganv/Edge.hpp" -#include "ingen/ServerInterface.hpp" +#include "ingen/Interface.hpp" #include "ingen/EngineBase.hpp" #include "ingen/client/ClientStore.hpp" #include "ingen/client/ObjectModel.hpp" @@ -187,7 +187,7 @@ App::detach() _loader.reset(); _store.reset(); _client.reset(); - _world->set_engine(SharedPtr()); + _world->set_engine(SharedPtr()); } } diff --git a/src/gui/App.hpp b/src/gui/App.hpp index 9953a993..6f2cd592 100644 --- a/src/gui/App.hpp +++ b/src/gui/App.hpp @@ -32,8 +32,7 @@ #include "ingen/shared/World.hpp" namespace Ingen { - class ClientInterface; - class ServerInterface; + class Interface; class Port; namespace Shared { class World; @@ -103,7 +102,7 @@ public: Glib::RefPtr icon_from_path(const std::string& path, int size); Raul::Forge& forge() const { return _world->forge(); } - SharedPtr engine() const { return _world->engine(); } + SharedPtr engine() const { return _world->engine(); } SharedPtr client() const { return _client; } SharedPtr store() const { return _store; } SharedPtr loader() const { return _loader; } diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp index 2d1516cd..12f2173a 100644 --- a/src/gui/ConnectWindow.cpp +++ b/src/gui/ConnectWindow.cpp @@ -23,7 +23,7 @@ #include "ingen_config.h" #include "ingen/EngineBase.hpp" -#include "ingen/ServerInterface.hpp" +#include "ingen/Interface.hpp" #include "ingen/client/ClientStore.hpp" #include "ingen/client/PatchModel.hpp" #include "ingen/client/ThreadedSigClientInterface.hpp" @@ -75,7 +75,7 @@ ConnectWindow::start(App& app, Ingen::Shared::World* world) } void -ConnectWindow::set_connected_to(SharedPtr engine) +ConnectWindow::set_connected_to(SharedPtr engine) { _app->world()->set_engine(engine); @@ -134,8 +134,7 @@ ConnectWindow::set_connecting_widget_states() /** Launch (if applicable) and connect to the Engine. * - * This will create the ServerInterface and ClientInterface and initialize - * the App with them. + * This will create the required interfaces and initialize the App with them. */ void ConnectWindow::connect(bool existing) @@ -230,7 +229,7 @@ ConnectWindow::disconnect() _attached = false; _app->detach(); - set_connected_to(SharedPtr()); + set_connected_to(SharedPtr()); if (!_widgets_loaded) return; diff --git a/src/gui/ConnectWindow.hpp b/src/gui/ConnectWindow.hpp index 9905b51a..29684e0f 100644 --- a/src/gui/ConnectWindow.hpp +++ b/src/gui/ConnectWindow.hpp @@ -43,7 +43,7 @@ public: ConnectWindow(BaseObjectType* cobject, const Glib::RefPtr& xml); - void set_connected_to(SharedPtr engine); + void set_connected_to(SharedPtr engine); void start(App& app, Ingen::Shared::World* world); void ingen_response(int32_t id, Status status) { _attached = true; } diff --git a/src/gui/ControlPanel.cpp b/src/gui/ControlPanel.cpp index 3c02d2d9..f0d0b936 100644 --- a/src/gui/ControlPanel.cpp +++ b/src/gui/ControlPanel.cpp @@ -15,7 +15,7 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "ingen/ServerInterface.hpp" +#include "ingen/Interface.hpp" #include "ingen/shared/LV2URIMap.hpp" #include "ingen/client/NodeModel.hpp" #include "ingen/client/PortModel.hpp" diff --git a/src/gui/Controls.cpp b/src/gui/Controls.cpp index eba36d1d..c3fe2658 100644 --- a/src/gui/Controls.cpp +++ b/src/gui/Controls.cpp @@ -18,7 +18,7 @@ #include #include #include "raul/log.hpp" -#include "ingen/ServerInterface.hpp" +#include "ingen/Interface.hpp" #include "ingen/shared/LV2URIMap.hpp" #include "ingen/client/PluginModel.hpp" #include "ingen/client/NodeModel.hpp" diff --git a/src/gui/LoadPatchWindow.cpp b/src/gui/LoadPatchWindow.cpp index 66c64495..dd10e089 100644 --- a/src/gui/LoadPatchWindow.cpp +++ b/src/gui/LoadPatchWindow.cpp @@ -18,7 +18,7 @@ #include #include #include -#include "ingen/ServerInterface.hpp" +#include "ingen/Interface.hpp" #include "ingen/shared/LV2URIMap.hpp" #include "ingen/client/NodeModel.hpp" #include "ingen/client/PatchModel.hpp" diff --git a/src/gui/LoadPluginWindow.cpp b/src/gui/LoadPluginWindow.cpp index f6b6e5e9..95bbc0b6 100644 --- a/src/gui/LoadPluginWindow.cpp +++ b/src/gui/LoadPluginWindow.cpp @@ -20,7 +20,7 @@ #include #include -#include "ingen/ServerInterface.hpp" +#include "ingen/Interface.hpp" #include "ingen/client/ClientStore.hpp" #include "ingen/client/PatchModel.hpp" #include "ingen/shared/LV2URIMap.hpp" diff --git a/src/gui/NewSubpatchWindow.cpp b/src/gui/NewSubpatchWindow.cpp index ad0b6e42..4f0d602a 100644 --- a/src/gui/NewSubpatchWindow.cpp +++ b/src/gui/NewSubpatchWindow.cpp @@ -16,7 +16,7 @@ */ #include "App.hpp" -#include "ingen/ServerInterface.hpp" +#include "ingen/Interface.hpp" #include "ingen/shared/LV2URIMap.hpp" #include "ingen/client/PatchModel.hpp" #include "ingen/client/ClientStore.hpp" diff --git a/src/gui/NodeControlWindow.cpp b/src/gui/NodeControlWindow.cpp index 2af13b98..0a8603e6 100644 --- a/src/gui/NodeControlWindow.cpp +++ b/src/gui/NodeControlWindow.cpp @@ -16,7 +16,7 @@ */ #include -#include "ingen/ServerInterface.hpp" +#include "ingen/Interface.hpp" #include "ingen/shared/LV2URIMap.hpp" #include "ingen/client/NodeModel.hpp" #include "App.hpp" diff --git a/src/gui/NodeMenu.cpp b/src/gui/NodeMenu.cpp index 2ceb4a66..ea40988a 100644 --- a/src/gui/NodeMenu.cpp +++ b/src/gui/NodeMenu.cpp @@ -16,7 +16,7 @@ */ #include -#include "ingen/ServerInterface.hpp" +#include "ingen/Interface.hpp" #include "ingen/shared/LV2URIMap.hpp" #include "ingen/client/NodeModel.hpp" #include "ingen/client/PluginModel.hpp" diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp index 36c3b67b..697961db 100644 --- a/src/gui/NodeModule.cpp +++ b/src/gui/NodeModule.cpp @@ -18,7 +18,7 @@ #include #include "raul/log.hpp" #include "raul/Atom.hpp" -#include "ingen/ServerInterface.hpp" +#include "ingen/Interface.hpp" #include "ingen/shared/LV2URIMap.hpp" #include "ingen/client/PatchModel.hpp" #include "ingen/client/NodeModel.hpp" diff --git a/src/gui/ObjectMenu.cpp b/src/gui/ObjectMenu.cpp index 4c3804bd..76607559 100644 --- a/src/gui/ObjectMenu.cpp +++ b/src/gui/ObjectMenu.cpp @@ -19,7 +19,7 @@ #include -#include "ingen/ServerInterface.hpp" +#include "ingen/Interface.hpp" #include "ingen/client/ObjectModel.hpp" #include "ingen/shared/LV2URIMap.hpp" diff --git a/src/gui/PatchCanvas.cpp b/src/gui/PatchCanvas.cpp index 61e30e04..64c7df66 100644 --- a/src/gui/PatchCanvas.cpp +++ b/src/gui/PatchCanvas.cpp @@ -22,7 +22,7 @@ #include "raul/log.hpp" #include "ganv/Canvas.hpp" #include "ganv/Circle.hpp" -#include "ingen/ServerInterface.hpp" +#include "ingen/Interface.hpp" #include "ingen/shared/LV2URIMap.hpp" #include "ingen/shared/Builder.hpp" #include "ingen/shared/ClashAvoider.hpp" diff --git a/src/gui/PatchPortModule.cpp b/src/gui/PatchPortModule.cpp index be8008da..1e5b1d5a 100644 --- a/src/gui/PatchPortModule.cpp +++ b/src/gui/PatchPortModule.cpp @@ -18,7 +18,7 @@ #include #include #include "PatchPortModule.hpp" -#include "ingen/ServerInterface.hpp" +#include "ingen/Interface.hpp" #include "ingen/shared/LV2URIMap.hpp" #include "ingen/client/PatchModel.hpp" #include "ingen/client/NodeModel.hpp" diff --git a/src/gui/PatchTreeWindow.cpp b/src/gui/PatchTreeWindow.cpp index 36bc78ea..41d82899 100644 --- a/src/gui/PatchTreeWindow.cpp +++ b/src/gui/PatchTreeWindow.cpp @@ -17,7 +17,7 @@ #include "raul/log.hpp" #include "raul/Path.hpp" -#include "ingen/ServerInterface.hpp" +#include "ingen/Interface.hpp" #include "ingen/shared/LV2URIMap.hpp" #include "ingen/client/ClientStore.hpp" #include "ingen/client/PatchModel.hpp" diff --git a/src/gui/PatchView.cpp b/src/gui/PatchView.cpp index e2a650fa..4506a651 100644 --- a/src/gui/PatchView.cpp +++ b/src/gui/PatchView.cpp @@ -18,7 +18,7 @@ #include #include #include "raul/log.hpp" -#include "ingen/ServerInterface.hpp" +#include "ingen/Interface.hpp" #include "ingen/shared/LV2URIMap.hpp" #include "ingen/client/PatchModel.hpp" #include "App.hpp" diff --git a/src/gui/PatchWindow.cpp b/src/gui/PatchWindow.cpp index 748bec74..c97ae89a 100644 --- a/src/gui/PatchWindow.cpp +++ b/src/gui/PatchWindow.cpp @@ -24,7 +24,7 @@ #include "raul/AtomRDF.hpp" -#include "ingen/ServerInterface.hpp" +#include "ingen/Interface.hpp" #include "ingen/client/ClientStore.hpp" #include "ingen/client/PatchModel.hpp" #include "ingen/shared/LV2URIMap.hpp" diff --git a/src/gui/Port.cpp b/src/gui/Port.cpp index 7c9de28b..7bf3412d 100644 --- a/src/gui/Port.cpp +++ b/src/gui/Port.cpp @@ -18,7 +18,7 @@ #include #include "raul/log.hpp" #include "ganv/Module.hpp" -#include "ingen/ServerInterface.hpp" +#include "ingen/Interface.hpp" #include "ingen/shared/LV2URIMap.hpp" #include "ingen/client/PatchModel.hpp" #include "ingen/client/PortModel.hpp" diff --git a/src/gui/PortMenu.cpp b/src/gui/PortMenu.cpp index c757d917..60d419f6 100644 --- a/src/gui/PortMenu.cpp +++ b/src/gui/PortMenu.cpp @@ -18,7 +18,7 @@ #include #include #include "raul/SharedPtr.hpp" -#include "ingen/ServerInterface.hpp" +#include "ingen/Interface.hpp" #include "ingen/shared/LV2URIMap.hpp" #include "ingen/client/PatchModel.hpp" #include "ingen/client/PortModel.hpp" diff --git a/src/gui/PortPropertiesWindow.cpp b/src/gui/PortPropertiesWindow.cpp index 13dd4781..dd138b12 100644 --- a/src/gui/PortPropertiesWindow.cpp +++ b/src/gui/PortPropertiesWindow.cpp @@ -17,7 +17,7 @@ #include #include -#include "ingen/ServerInterface.hpp" +#include "ingen/Interface.hpp" #include "ingen/shared/LV2URIMap.hpp" #include "ingen/client/NodeModel.hpp" #include "ingen/client/PluginModel.hpp" diff --git a/src/gui/RenameWindow.cpp b/src/gui/RenameWindow.cpp index 6b3a5f20..49323c4e 100644 --- a/src/gui/RenameWindow.cpp +++ b/src/gui/RenameWindow.cpp @@ -20,7 +20,7 @@ #include "ingen/shared/LV2URIMap.hpp" -#include "ingen/ServerInterface.hpp" +#include "ingen/Interface.hpp" #include "ingen/client/ObjectModel.hpp" #include "ingen/client/ClientStore.hpp" diff --git a/src/gui/SubpatchModule.cpp b/src/gui/SubpatchModule.cpp index e71dcbc8..475a6e8f 100644 --- a/src/gui/SubpatchModule.cpp +++ b/src/gui/SubpatchModule.cpp @@ -18,7 +18,7 @@ #include #include -#include "ingen/ServerInterface.hpp" +#include "ingen/Interface.hpp" #include "ingen/client/PatchModel.hpp" #include "ingen/shared/LV2URIMap.hpp" diff --git a/src/gui/ThreadedLoader.cpp b/src/gui/ThreadedLoader.cpp index babc6ee9..9d7731bb 100644 --- a/src/gui/ThreadedLoader.cpp +++ b/src/gui/ThreadedLoader.cpp @@ -29,7 +29,7 @@ using namespace Raul; namespace Ingen { namespace GUI { -ThreadedLoader::ThreadedLoader(App& app, SharedPtr engine) +ThreadedLoader::ThreadedLoader(App& app, SharedPtr engine) : _app(app) , _engine(engine) { diff --git a/src/gui/ThreadedLoader.hpp b/src/gui/ThreadedLoader.hpp index 2668a691..8d17fa64 100644 --- a/src/gui/ThreadedLoader.hpp +++ b/src/gui/ThreadedLoader.hpp @@ -25,7 +25,7 @@ #include "raul/Thread.hpp" #include "raul/Slave.hpp" #include -#include "ingen/ServerInterface.hpp" +#include "ingen/Interface.hpp" #include "ingen/serialisation/Serialiser.hpp" #include "ingen/serialisation/Parser.hpp" @@ -54,8 +54,8 @@ namespace GUI { class ThreadedLoader : public Raul::Slave { public: - ThreadedLoader(App& app, - SharedPtr engine); + ThreadedLoader(App& app, + SharedPtr engine); void load_patch(bool merge, const Glib::ustring& document_uri, @@ -75,10 +75,10 @@ private: void _whipped(); - App& _app; - SharedPtr _engine; - Glib::Mutex _mutex; - list _events; + App& _app; + SharedPtr _engine; + Glib::Mutex _mutex; + list _events; }; } // namespace GUI -- cgit v1.2.1