3 files changed, 115 insertions, 0 deletions
diff --git a/src/osc/ingen_osc_client.cpp b/src/osc/ingen_osc_client.cpp
new file mode 100644
index 00000000..46a6c399
--- /dev/null
+++ b/src/osc/ingen_osc_client.cpp
@@ -0,0 +1,55 @@
+/* This file is part of Ingen.
+ * Copyright 2007-2011 David 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 "ingen/shared/Module.hpp"
+#include "ingen/shared/World.hpp"
+
+#include "OSCClientReceiver.hpp"
+#include "OSCEngineSender.hpp"
+
+using namespace std;
+using namespace Ingen;
+
+SharedPtr<Ingen::ServerInterface>
+new_osc_interface(Ingen::Shared::World*      world,
+                  const std::string&         url,
+                  SharedPtr<ClientInterface> respond_to)
+{
+	SharedPtr<Client::OSCClientReceiver> receiver(
+		new Client::OSCClientReceiver(16181, respond_to));
+	Client::OSCEngineSender* oes = new Client::OSCEngineSender(
+		url, world->conf()->option("packet-size").get_int32(), receiver);
+	oes->attach(rand(), true);
+	return SharedPtr<ServerInterface>(oes);
+}
+
+struct IngenOSCClientModule : public Ingen::Shared::Module {
+	void load(Ingen::Shared::World* world) {
+		world->add_interface_factory("osc.udp", &new_osc_interface);
+		world->add_interface_factory("osc.tcp", &new_osc_interface);
+	}
+};
+
+extern "C" {
+
+Ingen::Shared::Module*
+ingen_module_load()
+{
+	return new IngenOSCClientModule();
+}
+
+} // extern "C"
diff --git a/src/osc/macros.h b/src/osc/macros.h
new file mode 100644
index 00000000..f77b41c1
--- /dev/null
+++ b/src/osc/macros.h
@@ -0,0 +1,32 @@
+/* This file is part of Ingen.
+ * Copyright 2007-2011 David 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_OSC_MACROS_H
+#define INGEN_OSC_MACROS_H
+
+/* Some boilerplate killing macros... */
+#define LO_HANDLER_ARGS const char* path, const char* types, lo_arg** argv, int argc, lo_message msg
+
+/* Defines a static handler to be passed to lo_add_method, which is a trivial
+ * wrapper around a non-static method that does the real work.  Makes a whoole
+ * lot of ugly boiler plate go away */
+#define LO_HANDLER(ObjType, name)                                       \
+int _##name##_cb (LO_HANDLER_ARGS);\
+inline static int name##_cb(LO_HANDLER_ARGS, void* myself)\
+{ return ((ObjType*)myself)->_##name##_cb(path, types, argv, argc, msg); }
+
+#endif  // INGEN_OSC_MACROS_H
diff --git a/src/osc/wscript b/src/osc/wscript
new file mode 100644
index 00000000..01e86db9
--- /dev/null
+++ b/src/osc/wscript
@@ -0,0 +1,28 @@
+#!/usr/bin/env python
+from waflib.extras import autowaf as autowaf
+
+def build(bld):
+    if bld.is_defined('HAVE_LIBLO'):
+        obj = bld(features        = 'cxx cxxshlib',
+                  source          = '''OSCClientSender.cpp
+                                       OSCEngineReceiver.cpp
+                                       OSCSender.cpp
+                                       ingen_osc_server.cpp''',
+                  includes        = ['.', '../..', '../../include'],
+                  name            = 'libingen_osc_server',
+                  target          = 'ingen_osc_server',
+                  install_path    = '${LIBDIR}',
+                  use             = 'libingen_server')
+        autowaf.use_lib(bld, obj, 'RAUL LIBLO')
+
+        obj = bld(features        = 'cxx cxxshlib',
+                  source          = '''OSCClientReceiver.cpp
+                                       OSCEngineSender.cpp
+                                       OSCSender.cpp
+                                       ingen_osc_client.cpp''',
+                  includes        = ['.', '../..', '../../include'],
+                  name            = 'libingen_osc_client',
+                  target          = 'ingen_osc_client',
+                  install_path    = '${LIBDIR}',
+                  use             = 'libingen_client')
+        autowaf.use_lib(bld, obj, 'RAUL LIBLO')