From af9b6c3e58688ca4ea291e92faf6e50e35c03128 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 22 Oct 2011 00:37:55 +0000 Subject: Add missing files git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3581 a436a847-0d15-0410-975c-d299462d15a1 --- src/http/ingen_http_client.cpp | 54 +++++++++++++++++++++++++++++++++++++++++ src/http/wscript | 28 +++++++++++++++++++++ src/osc/ingen_osc_client.cpp | 55 ++++++++++++++++++++++++++++++++++++++++++ src/osc/macros.h | 32 ++++++++++++++++++++++++ src/osc/wscript | 28 +++++++++++++++++++++ src/shared/Module.cpp | 34 ++++++++++++++++++++++++++ 6 files changed, 231 insertions(+) create mode 100644 src/http/ingen_http_client.cpp create mode 100644 src/http/wscript create mode 100644 src/osc/ingen_osc_client.cpp create mode 100644 src/osc/macros.h create mode 100644 src/osc/wscript create mode 100644 src/shared/Module.cpp diff --git a/src/http/ingen_http_client.cpp b/src/http/ingen_http_client.cpp new file mode 100644 index 00000000..31be3e46 --- /dev/null +++ b/src/http/ingen_http_client.cpp @@ -0,0 +1,54 @@ +/* This file is part of Ingen. + * Copyright 2007-2011 David Robillard + * + * 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 "HTTPClientReceiver.hpp" +#include "HTTPEngineSender.hpp" + +using namespace std; +using namespace Ingen; + +SharedPtr +new_http_interface(Ingen::Shared::World* world, + const std::string& url, + SharedPtr respond_to) +{ + SharedPtr receiver( + new Client::HTTPClientReceiver(world, url, respond_to)); + Client::HTTPEngineSender* hes = new Client::HTTPEngineSender( + world, url, receiver); + hes->attach(rand(), true); + return SharedPtr(hes); +} + +struct IngenHTTPClientModule : public Ingen::Shared::Module { + void load(Ingen::Shared::World* world) { + world->add_interface_factory("http", &new_http_interface); + } +}; + +extern "C" { + +Ingen::Shared::Module* +ingen_module_load() +{ + return new IngenHTTPClientModule(); +} + +} // extern "C" diff --git a/src/http/wscript b/src/http/wscript new file mode 100644 index 00000000..9d2d6049 --- /dev/null +++ b/src/http/wscript @@ -0,0 +1,28 @@ +#!/usr/bin/env python +from waflib.extras import autowaf as autowaf + +def build(bld): + if bld.is_defined('HAVE_SOUP'): + obj = bld(features = 'cxx cxxshlib', + source = '''HTTPClientSender.cpp + HTTPEngineReceiver.cpp + HTTPSender.cpp + ingen_http_server.cpp''', + includes = ['../..', '../../include'], + name = 'libingen_http_server', + target = 'ingen_http_server', + install_path = '${LIBDIR}', + use = 'libingen_server') + autowaf.use_lib(bld, obj, 'RAUL SOUP') + + obj = bld(features = 'cxx cxxshlib', + source = '''HTTPClientReceiver.cpp + HTTPEngineSender.cpp + HTTPSender.cpp + ingen_http_client.cpp''', + includes = ['../..', '../../include'], + name = 'libingen_http_client', + target = 'ingen_http_client', + install_path = '${LIBDIR}', + use = 'libingen_client') + autowaf.use_lib(bld, obj, 'RAUL SOUP') 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 + * + * 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 +new_osc_interface(Ingen::Shared::World* world, + const std::string& url, + SharedPtr respond_to) +{ + SharedPtr 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(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 + * + * 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') diff --git a/src/shared/Module.cpp b/src/shared/Module.cpp new file mode 100644 index 00000000..afe2eb9b --- /dev/null +++ b/src/shared/Module.cpp @@ -0,0 +1,34 @@ +/* This file is part of Ingen. + * Copyright 2007-2011 David Robillard + * + * 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 + +#include "raul/log.hpp" +#include "raul/SharedPtr.hpp" + +#include "ingen/shared/Module.hpp" + +namespace Ingen { +namespace Shared { + +Module::~Module() +{ + Raul::info << "[Module] Unloading " << library->get_name() << std::endl; +} + +} // namespace Shared +} // namespace Ingen -- cgit v1.2.1