Rename Ingen::Engine to Ingen::Server (hopefully avoid odd name clases and fix #675).

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3184 a436a847-0d15-0410-975c-d299462d15a1

27 files changed, 40 insertions, 40 deletions

diff --git a/src/gui/App.cpp b/src/gui/App.cpp
index 0ed8b10a..e4a8c167 100644
--- a/src/gui/App.cpp
+++ b/src/gui/App.cpp
@@ -28,8 +28,8 @@
 #include "raul/Path.hpp"
 #include "flowcanvas/Connection.hpp"
 #include "shared/World.hpp"
-#include "engine/Engine.hpp"
-#include "ingen/EngineInterface.hpp"
+#include "server/Engine.hpp"
+#include "ingen/ServerInterface.hpp"
 #include "shared/runtime_paths.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/ObjectModel.hpp"
@@ -189,7 +189,7 @@ App::detach()
 		_store.reset();
 		_client.reset();
 		_handle.reset();
-		_world->set_engine(SharedPtr<EngineInterface>());
+		_world->set_engine(SharedPtr<ServerInterface>());
 	}
 }
 
diff --git a/src/gui/App.hpp b/src/gui/App.hpp
index 5a5fa0c2..82eab2f3 100644
--- a/src/gui/App.hpp
+++ b/src/gui/App.hpp
@@ -31,7 +31,7 @@
 
 namespace Ingen {
 	class ClientInterface;
-	class EngineInterface;
+	class ServerInterface;
 	class Port;
 	namespace Shared {
 		class World;
@@ -99,7 +99,7 @@ public:
 
 	Glib::RefPtr<Gdk::Pixbuf> icon_from_path(const std::string& path, int size);
 
-	SharedPtr<Ingen::EngineInterface>     engine() const { return _world->engine(); }
+	SharedPtr<Ingen::ServerInterface>     engine() const { return _world->engine(); }
 	SharedPtr<Client::SigClientInterface> client() const { return _client; }
 	SharedPtr<Client::ClientStore>        store()  const { return _store; }
 	SharedPtr<ThreadedLoader>             loader() const { return _loader; }
diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp
index f93ebf4c..171113fb 100644
--- a/src/gui/ConnectWindow.cpp
+++ b/src/gui/ConnectWindow.cpp
@@ -25,10 +25,10 @@
 #include "raul/log.hpp"
 
 #include "ingen-config.h"
-#include "ingen/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
 #include "shared/Module.hpp"
 #include "shared/World.hpp"
-#include "engine/Engine.hpp"
+#include "server/Engine.hpp"
 #ifdef HAVE_SOUP
 #include "client/HTTPClientReceiver.hpp"
 #include "client/HTTPEngineSender.hpp"
@@ -83,7 +83,7 @@ ConnectWindow::start(Ingen::Shared::World* world)
 }
 
 void
-ConnectWindow::set_connected_to(SharedPtr<EngineInterface> engine)
+ConnectWindow::set_connected_to(SharedPtr<ServerInterface> engine)
 {
 	App::instance().world()->set_engine(engine);
 
@@ -142,7 +142,7 @@ ConnectWindow::set_connecting_widget_states()
 
 /** Launch (if applicable) and connect to the Engine.
  *
- * This will create the EngineInterface and ClientInterface and initialize
+ * This will create the ServerInterface and ClientInterface and initialize
  * the App with them.
  */
 void
@@ -193,14 +193,14 @@ ConnectWindow::connect(bool existing)
 #ifdef HAVE_LIBLO
 			if (scheme == "osc.udp" || scheme == "osc.tcp")
 				world->set_engine(
-					SharedPtr<EngineInterface>(
+					SharedPtr<ServerInterface>(
 						new OSCEngineSender(
 							uri,
 							world->conf()->option("packet-size").get_int32())));
 #endif
 #ifdef HAVE_SOUP
 			if (scheme == "http")
-				world->set_engine(SharedPtr<EngineInterface>(
+				world->set_engine(SharedPtr<ServerInterface>(
 					                  new HTTPEngineSender(world, uri)));
 #endif
 		} else {
@@ -222,7 +222,7 @@ ConnectWindow::connect(bool existing)
 		const string cmd = string("ingen -e --engine-port=").append(port_str);
 
 		if (Raul::Process::launch(cmd)) {
-			world->set_engine(SharedPtr<EngineInterface>(
+			world->set_engine(SharedPtr<ServerInterface>(
 					new OSCEngineSender(
 						string("osc.udp://localhost:").append(port_str),
 						world->conf()->option("packet-size").get_int32())));
@@ -252,7 +252,7 @@ ConnectWindow::connect(bool existing)
 
 		SharedPtr<SigClientInterface> client(new SigClientInterface());
 
-		if (!((Engine::Engine*)world->local_engine().get())->driver())
+		if (!((Server::Engine*)world->local_engine().get())->driver())
 			world->load_module("jack");
 
 		world->local_engine()->activate();
@@ -272,7 +272,7 @@ ConnectWindow::disconnect()
 	_attached = false;
 
 	App::instance().detach();
-	set_connected_to(SharedPtr<Ingen::EngineInterface>());
+	set_connected_to(SharedPtr<Ingen::ServerInterface>());
 
 	if (!_widgets_loaded)
 		return;
diff --git a/src/gui/ConnectWindow.hpp b/src/gui/ConnectWindow.hpp
index b5434d29..1e5fdd37 100644
--- a/src/gui/ConnectWindow.hpp
+++ b/src/gui/ConnectWindow.hpp
@@ -49,7 +49,7 @@ class ConnectWindow : public Dialog
 public:
 	ConnectWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& xml);
 
-	void set_connected_to(SharedPtr<EngineInterface> engine);
+	void set_connected_to(SharedPtr<ServerInterface> engine);
 	void start(Ingen::Shared::World* world);
 	void on_response(int32_t id) { _attached = true; }
 
diff --git a/src/gui/ControlPanel.cpp b/src/gui/ControlPanel.cpp
index 083c1457..03e044cc 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/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
 #include "ingen/PortType.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/NodeModel.hpp"
diff --git a/src/gui/Controls.cpp b/src/gui/Controls.cpp
index a2c09e11..9322fd77 100644
--- a/src/gui/Controls.cpp
+++ b/src/gui/Controls.cpp
@@ -18,7 +18,7 @@
 #include <cmath>
 #include <algorithm>
 #include "raul/log.hpp"
-#include "ingen/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/PluginModel.hpp"
 #include "client/NodeModel.hpp"
diff --git a/src/gui/LoadPatchWindow.cpp b/src/gui/LoadPatchWindow.cpp
index edc47d4f..99c1c127 100644
--- a/src/gui/LoadPatchWindow.cpp
+++ b/src/gui/LoadPatchWindow.cpp
@@ -20,7 +20,7 @@
 #include <cassert>
 #include <boost/optional.hpp>
 #include <glibmm/miscutils.h>
-#include "ingen/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/NodeModel.hpp"
 #include "client/PatchModel.hpp"
diff --git a/src/gui/LoadPluginWindow.cpp b/src/gui/LoadPluginWindow.cpp
index b2cfc052..cf780f2d 100644
--- a/src/gui/LoadPluginWindow.cpp
+++ b/src/gui/LoadPluginWindow.cpp
@@ -19,7 +19,7 @@
 #include <algorithm>
 #include <ctype.h>
 #include "ingen-config.h"
-#include "ingen/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/PatchModel.hpp"
 #include "client/ClientStore.hpp"
diff --git a/src/gui/LoadRemotePatchWindow.cpp b/src/gui/LoadRemotePatchWindow.cpp
index e66b25a1..0318dba7 100644
--- a/src/gui/LoadRemotePatchWindow.cpp
+++ b/src/gui/LoadRemotePatchWindow.cpp
@@ -19,7 +19,7 @@
 #include <dirent.h>
 #include <boost/optional/optional.hpp>
 #include "client/PatchModel.hpp"
-#include "ingen/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
 #include "shared/World.hpp"
 #include "App.hpp"
 #include "Configuration.hpp"
diff --git a/src/gui/NewSubpatchWindow.cpp b/src/gui/NewSubpatchWindow.cpp
index 35e66e3b..26664693 100644
--- a/src/gui/NewSubpatchWindow.cpp
+++ b/src/gui/NewSubpatchWindow.cpp
@@ -16,7 +16,7 @@
  */
 
 #include "App.hpp"
-#include "ingen/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/PatchModel.hpp"
 #include "client/ClientStore.hpp"
diff --git a/src/gui/NodeControlWindow.cpp b/src/gui/NodeControlWindow.cpp
index b4ccbe73..ef09a68d 100644
--- a/src/gui/NodeControlWindow.cpp
+++ b/src/gui/NodeControlWindow.cpp
@@ -16,7 +16,7 @@
  */
 
 #include <cmath>
-#include "ingen/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/NodeModel.hpp"
 #include "App.hpp"
diff --git a/src/gui/NodeMenu.cpp b/src/gui/NodeMenu.cpp
index 1e6b0f9f..3a683027 100644
--- a/src/gui/NodeMenu.cpp
+++ b/src/gui/NodeMenu.cpp
@@ -17,7 +17,7 @@
 
 #include <gtkmm.h>
 #include "ingen-config.h"
-#include "ingen/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/NodeModel.hpp"
 #include "client/PluginModel.hpp"
diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp
index 984e84b8..d8f22ecd 100644
--- a/src/gui/NodeModule.cpp
+++ b/src/gui/NodeModule.cpp
@@ -19,7 +19,7 @@
 #include "ingen-config.h"
 #include "raul/log.hpp"
 #include "raul/Atom.hpp"
-#include "ingen/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/PatchModel.hpp"
 #include "client/NodeModel.hpp"
diff --git a/src/gui/ObjectMenu.cpp b/src/gui/ObjectMenu.cpp
index 39afa071..d8a5e426 100644
--- a/src/gui/ObjectMenu.cpp
+++ b/src/gui/ObjectMenu.cpp
@@ -17,7 +17,7 @@
 
 #include <utility>
 #include <gtkmm.h>
-#include "ingen/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/ObjectModel.hpp"
 #include "App.hpp"
diff --git a/src/gui/PatchCanvas.cpp b/src/gui/PatchCanvas.cpp
index 8c7cb0fa..334b7035 100644
--- a/src/gui/PatchCanvas.cpp
+++ b/src/gui/PatchCanvas.cpp
@@ -22,7 +22,7 @@
 #include "raul/log.hpp"
 #include "flowcanvas/Canvas.hpp"
 #include "flowcanvas/Ellipse.hpp"
-#include "ingen/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "shared/Builder.hpp"
 #include "shared/ClashAvoider.hpp"
diff --git a/src/gui/PatchPortModule.cpp b/src/gui/PatchPortModule.cpp
index 10bb60e6..51dd064a 100644
--- a/src/gui/PatchPortModule.cpp
+++ b/src/gui/PatchPortModule.cpp
@@ -18,7 +18,7 @@
 #include <cassert>
 #include <utility>
 #include "PatchPortModule.hpp"
-#include "ingen/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/PatchModel.hpp"
 #include "client/NodeModel.hpp"
diff --git a/src/gui/PatchTreeWindow.cpp b/src/gui/PatchTreeWindow.cpp
index 5ed578db..adb41a13 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/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/ClientStore.hpp"
 #include "client/PatchModel.hpp"
diff --git a/src/gui/PatchView.cpp b/src/gui/PatchView.cpp
index 55c6b4b6..afe73048 100644
--- a/src/gui/PatchView.cpp
+++ b/src/gui/PatchView.cpp
@@ -18,7 +18,7 @@
 #include <cassert>
 #include <fstream>
 #include "raul/log.hpp"
-#include "ingen/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/PatchModel.hpp"
 #include "App.hpp"
diff --git a/src/gui/PatchWindow.cpp b/src/gui/PatchWindow.cpp
index 218453d6..cd97e3e3 100644
--- a/src/gui/PatchWindow.cpp
+++ b/src/gui/PatchWindow.cpp
@@ -22,7 +22,7 @@
 #include <glib/gstdio.h>
 #include <glibmm/fileutils.h>
 #include "raul/AtomRDF.hpp"
-#include "ingen/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/PatchModel.hpp"
 #include "client/ClientStore.hpp"
diff --git a/src/gui/Port.cpp b/src/gui/Port.cpp
index f22af7e4..ba28078d 100644
--- a/src/gui/Port.cpp
+++ b/src/gui/Port.cpp
@@ -18,7 +18,7 @@
 #include <cassert>
 #include "raul/log.hpp"
 #include "flowcanvas/Module.hpp"
-#include "ingen/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/PatchModel.hpp"
 #include "client/PortModel.hpp"
diff --git a/src/gui/PortMenu.cpp b/src/gui/PortMenu.cpp
index 69a67dd9..079e3c3e 100644
--- a/src/gui/PortMenu.cpp
+++ b/src/gui/PortMenu.cpp
@@ -18,7 +18,7 @@
 #include <math.h>
 #include <gtkmm.h>
 #include "raul/SharedPtr.hpp"
-#include "ingen/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/PatchModel.hpp"
 #include "client/PortModel.hpp"
diff --git a/src/gui/PortPropertiesWindow.cpp b/src/gui/PortPropertiesWindow.cpp
index 1f3be2fb..23d38ac9 100644
--- a/src/gui/PortPropertiesWindow.cpp
+++ b/src/gui/PortPropertiesWindow.cpp
@@ -17,7 +17,7 @@
 
 #include <cassert>
 #include <string>
-#include "ingen/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/NodeModel.hpp"
 #include "client/PluginModel.hpp"
diff --git a/src/gui/RenameWindow.cpp b/src/gui/RenameWindow.cpp
index 52e3a339..7b8844f1 100644
--- a/src/gui/RenameWindow.cpp
+++ b/src/gui/RenameWindow.cpp
@@ -17,7 +17,7 @@
 
 #include <cassert>
 #include <string>
-#include "ingen/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/ObjectModel.hpp"
 #include "client/ClientStore.hpp"
diff --git a/src/gui/SubpatchModule.cpp b/src/gui/SubpatchModule.cpp
index 4023a1f2..e2347bdd 100644
--- a/src/gui/SubpatchModule.cpp
+++ b/src/gui/SubpatchModule.cpp
@@ -17,7 +17,7 @@
 
 #include "SubpatchModule.hpp"
 #include <cassert>
-#include "ingen/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
 #include "client/PatchModel.hpp"
 #include "App.hpp"
 #include "NodeModule.hpp"
diff --git a/src/gui/ThreadedLoader.cpp b/src/gui/ThreadedLoader.cpp
index 5338b7ee..7a7a3ede 100644
--- a/src/gui/ThreadedLoader.cpp
+++ b/src/gui/ThreadedLoader.cpp
@@ -30,7 +30,7 @@ using namespace Raul;
 namespace Ingen {
 namespace GUI {
 
-ThreadedLoader::ThreadedLoader(SharedPtr<Shared::LV2URIMap> uris, SharedPtr<EngineInterface> engine)
+ThreadedLoader::ThreadedLoader(SharedPtr<Shared::LV2URIMap> uris, SharedPtr<ServerInterface> engine)
 	: _engine(engine)
 {
 	set_name("Loader");
diff --git a/src/gui/ThreadedLoader.hpp b/src/gui/ThreadedLoader.hpp
index ef137d1e..c35da81f 100644
--- a/src/gui/ThreadedLoader.hpp
+++ b/src/gui/ThreadedLoader.hpp
@@ -25,7 +25,7 @@
 #include "raul/Thread.hpp"
 #include "raul/Slave.hpp"
 #include <glibmm/thread.h>
-#include "ingen/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
 #include "serialisation/Serialiser.hpp"
 #include "serialisation/Parser.hpp"
 using std::string;
@@ -54,7 +54,7 @@ class ThreadedLoader : public Raul::Slave
 {
 public:
 	ThreadedLoader(SharedPtr<Shared::LV2URIMap> uris,
-	               SharedPtr<EngineInterface>   engine);
+	               SharedPtr<ServerInterface>   engine);
 
 	void load_patch(bool                              merge,
                     const Glib::ustring&              document_uri,
@@ -75,7 +75,7 @@ private:
 
 	void _whipped();
 
-	SharedPtr<EngineInterface> _engine;
+	SharedPtr<ServerInterface> _engine;
 
 	Glib::Mutex   _mutex;
 	list<Closure> _events;
diff --git a/src/gui/UploadPatchWindow.cpp b/src/gui/UploadPatchWindow.cpp
index a7526eee..326aa968 100644
--- a/src/gui/UploadPatchWindow.cpp
+++ b/src/gui/UploadPatchWindow.cpp
@@ -24,7 +24,7 @@
 #include "shared/World.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/ClientStore.hpp"
-#include "ingen/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
 #include "serialisation/Serialiser.hpp"
 #include "serialisation/names.hpp"
 #include "client/PatchModel.hpp"