Make liblo optional for building ingen.

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

9 files changed, 21 insertions, 21 deletions

diff --git a/src/client/HTTPClientReceiver.cpp b/src/client/HTTPClientReceiver.cpp
index ece55ab2..4773b7ce 100644
--- a/src/client/HTTPClientReceiver.cpp
+++ b/src/client/HTTPClientReceiver.cpp
@@ -20,7 +20,6 @@
 #include <cstring>
 #include <iostream>
 #include <sstream>
-#include <raul/AtomLiblo.hpp>
 #include "module/Module.hpp"
 #include "HTTPClientReceiver.hpp"
 
diff --git a/src/client/client.cpp b/src/client/client.cpp
index 5e452030..8e51fb23 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -19,7 +19,9 @@
 
 #include <iostream>
 #include "client.hpp"
+#ifdef WITH_LIBLO
 #include "OSCEngineSender.hpp"
+#endif
 #ifdef WITH_SOUP
 #include "HTTPEngineSender.hpp"
 #endif
@@ -34,21 +36,25 @@ SharedPtr<Ingen::Shared::EngineInterface>
 new_remote_interface(const std::string& url)
 {
 	const string scheme = url.substr(0, url.find(":"));
-	cout << "SCHEME: " << scheme << endl;
+
+#ifdef WITH_LIBLO
 	if (scheme == "osc.udp" || scheme == "osc.tcp") {
 		OSCEngineSender* oes = new OSCEngineSender(url);
 		oes->attach(rand(), true);
 		return SharedPtr<Shared::EngineInterface>(oes);
+	}
+#endif
+
 #ifdef WITH_SOUP
-	} else if (scheme == "http") {
+	if (scheme == "http") {
 		HTTPEngineSender* hes = new HTTPEngineSender(url);
 		hes->attach(rand(), true);
 		return SharedPtr<Shared::EngineInterface>(hes);
-#endif
-	} else {
-		cerr << "WARNING: Unknown URI scheme '" << scheme << "'" << endl;
-		return SharedPtr<Shared::EngineInterface>();
 	}
+#endif
+
+	cerr << "WARNING: Unknown URI scheme '" << scheme << "'" << endl;
+	return SharedPtr<Shared::EngineInterface>();
 }
 
 
diff --git a/src/engine/ClientBroadcaster.cpp b/src/engine/ClientBroadcaster.cpp
index d754f072..f13743f6 100644
--- a/src/engine/ClientBroadcaster.cpp
+++ b/src/engine/ClientBroadcaster.cpp
@@ -30,7 +30,6 @@
 #include "ConnectionImpl.hpp"
 #include "AudioDriver.hpp"
 #include "ObjectSender.hpp"
-#include "OSCClientSender.hpp"
 
 using namespace std;
 using Ingen::Shared::ClientInterface;
diff --git a/src/engine/ClientBroadcaster.hpp b/src/engine/ClientBroadcaster.hpp
index b0963610..efb58450 100644
--- a/src/engine/ClientBroadcaster.hpp
+++ b/src/engine/ClientBroadcaster.hpp
@@ -21,7 +21,6 @@
 #include <string>
 #include <list>
 #include <map>
-#include <lo/lo.h>
 #include <pthread.h>
 #include <raul/SharedPtr.hpp>
 #include "interface/ClientInterface.hpp"
diff --git a/src/engine/Engine.cpp b/src/engine/Engine.cpp
index 7445abc5..2e995281 100644
--- a/src/engine/Engine.cpp
+++ b/src/engine/Engine.cpp
@@ -39,7 +39,9 @@
 #include "PostProcessor.hpp"
 #include "events/CreatePatchEvent.hpp"
 #include "events/EnablePatchEvent.hpp"
+#ifdef HAVE_LIBLO
 #include "OSCEngineReceiver.hpp"
+#endif
 #ifdef HAVE_SOUP
 #include "HTTPEngineReceiver.hpp"
 #endif
@@ -173,6 +175,7 @@ Engine::start_jack_driver()
 void
 Engine::start_osc_driver(int port)
 {
+#ifdef HAVE_LIBLO
 	if (_event_source) {
 		cerr << "WARNING: Replacing event source" << endl;
 		_event_source.reset();
@@ -180,6 +183,7 @@ Engine::start_osc_driver(int port)
 
 	_event_source = SharedPtr<EventSource>(new OSCEngineReceiver(
 			*this, pre_processor_queue_size, port));
+#endif
 }
 
 	
diff --git a/src/engine/HTTPEngineReceiver.cpp b/src/engine/HTTPEngineReceiver.cpp
index 1b21e184..58b2bbe8 100644
--- a/src/engine/HTTPEngineReceiver.cpp
+++ b/src/engine/HTTPEngineReceiver.cpp
@@ -22,7 +22,6 @@
 #include <boost/format.hpp>
 #include "types.hpp"
 #include <raul/SharedPtr.hpp>
-#include <raul/AtomLiblo.hpp>
 #include "interface/ClientInterface.hpp"
 #include "module/Module.hpp"
 #include "serialisation/serialisation.hpp"
diff --git a/src/engine/wscript b/src/engine/wscript
index 33809ab0..c10dc028 100644
--- a/src/engine/wscript
+++ b/src/engine/wscript
@@ -29,8 +29,6 @@ def build(bld):
 		MidiTriggerNode.cpp
 		NodeBase.cpp
 		NodeFactory.cpp
-		OSCClientSender.cpp
-		OSCEngineReceiver.cpp
 		ObjectSender.cpp
 		OutputPort.cpp
 		PatchImpl.cpp
@@ -79,6 +77,8 @@ def build(bld):
 		obj.source += ' LV2Node.cpp '
 	if bld.env()['HAVE_SOUP']:
 		obj.source += ' HTTPEngineReceiver.cpp '
+	if bld.env()['HAVE_LIBLO']:
+		obj.source += ' OSCEngineReceiver.cpp OSCClientSender.cpp '
 	obj.includes     = ['..', '../common', './events']
 	obj.name         = 'libingen_engine'
 	obj.target       = 'ingen_engine'
diff --git a/src/gui/PatchTreeWindow.cpp b/src/gui/PatchTreeWindow.cpp
index 4730da2b..5afce50a 100644
--- a/src/gui/PatchTreeWindow.cpp
+++ b/src/gui/PatchTreeWindow.cpp
@@ -17,7 +17,6 @@
 
 #include <raul/Path.hpp>
 #include "interface/EngineInterface.hpp"
-#include "client/OSCEngineSender.hpp"
 #include "client/ClientStore.hpp"
 #include "client/PatchModel.hpp"
 #include "App.hpp"
@@ -90,13 +89,7 @@ PatchTreeWindow::add_patch(SharedPtr<PatchModel> pm)
 		Gtk::TreeModel::iterator iter = _patch_treestore->append();
 		Gtk::TreeModel::Row row = *iter;
 		if (pm->path() == "/") {
-			SharedPtr<OSCEngineSender> osc_sender = PtrCast<OSCEngineSender>(App::instance().engine());
-			string root_name = osc_sender ? osc_sender->uri() : "Internal";
-			// Hack off trailing '/' if it's there (ugly)
-			//if (root_name.substr(root_name.length()-1,1) == "/")
-			//	root_name = root_name.substr(0, root_name.length()-1);
-			//root_name.append(":/");
-			row[_patch_tree_columns.name_col] = root_name;
+			row[_patch_tree_columns.name_col] = App::instance().engine()->uri();
 		} else {
 			row[_patch_tree_columns.name_col] = pm->path().name();
 		}
diff --git a/src/shared/wscript b/src/shared/wscript
index 790b703c..741c9379 100644
--- a/src/shared/wscript
+++ b/src/shared/wscript
@@ -9,9 +9,10 @@ def build(bld):
 		ClashAvoider.cpp
 		LV2Features.cpp
 		LV2URIMap.cpp
-		OSCSender.cpp
 		Store.cpp
 	'''
+	if bld.env()['HAVE_LIBLO']:
+		obj.source += ' OSCSender.cpp '
 	obj.includes = ['../', '../common']
 	obj.name     = 'libingen_shared'
 	obj.target   = 'ingen_shared'