From a854ac939a20b12932384c3074c9ce85df0b39bd Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 22 Dec 2009 16:34:14 +0000 Subject: Fix compilation. Consistent naming of module source files. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2315 a436a847-0d15-0410-975c-d299462d15a1 --- src/client/client.cpp | 72 --------------------------------------------- src/client/ingen_client.cpp | 72 +++++++++++++++++++++++++++++++++++++++++++++ src/client/wscript | 2 +- 3 files changed, 73 insertions(+), 73 deletions(-) delete mode 100644 src/client/client.cpp create mode 100644 src/client/ingen_client.cpp (limited to 'src/client') diff --git a/src/client/client.cpp b/src/client/client.cpp deleted file mode 100644 index 9512ba44..00000000 --- a/src/client/client.cpp +++ /dev/null @@ -1,72 +0,0 @@ -/* This file is part of Ingen. - * Copyright (C) 2007-2009 Dave 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 HAVEOUT 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-config.h" -#include "raul/SharedPtr.hpp" -#include "module/Module.hpp" -#include "module/World.hpp" -#ifdef HAVE_LIBLO -#include "OSCEngineSender.hpp" -#endif -#ifdef HAVE_SOUP -#include "HTTPEngineSender.hpp" -#endif - -using namespace Ingen; - -#ifdef HAVE_LIBLO -SharedPtr -new_osc_interface(Ingen::Shared::World* world, const std::string& url) -{ - Client::OSCEngineSender* oes = Client::OSCEngineSender::create(url); - oes->attach(rand(), true); - return SharedPtr(oes); -} -#endif - -#ifdef HAVE_SOUP -SharedPtr -new_http_interface(Ingen::Shared::World* world, const std::string& url) -{ - Client::HTTPEngineSender* hes = new Client::HTTPEngineSender(world, url); - hes->attach(rand(), true); - return SharedPtr(hes); -} -#endif - -struct IngenClientModule : public Ingen::Shared::Module { - void load(Ingen::Shared::World* world) { - world->interface_factories.insert(make_pair("osc.udp", &new_osc_interface)); - world->interface_factories.insert(make_pair("osc.tcp", &new_osc_interface)); - world->interface_factories.insert(make_pair("http", &new_http_interface)); - } -}; - -static IngenClientModule* module = NULL; - -extern "C" { - -Ingen::Shared::Module* -ingen_module_load() { - if (!module) - module = new IngenClientModule(); - - return module; -} - -} // extern "C" - diff --git a/src/client/ingen_client.cpp b/src/client/ingen_client.cpp new file mode 100644 index 00000000..9f644e4d --- /dev/null +++ b/src/client/ingen_client.cpp @@ -0,0 +1,72 @@ +/* This file is part of Ingen. + * Copyright (C) 2007-2009 Dave 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 HAVEOUT 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-config.h" +#include "raul/SharedPtr.hpp" +#include "module/Module.hpp" +#include "module/World.hpp" +#ifdef HAVE_LIBLO +#include "OSCEngineSender.hpp" +#endif +#ifdef HAVE_SOUP +#include "HTTPEngineSender.hpp" +#endif + +using namespace Ingen; + +#ifdef HAVE_LIBLO +SharedPtr +new_osc_interface(Ingen::Shared::World* world, const std::string& url) +{ + Client::OSCEngineSender* oes = Client::OSCEngineSender::create(url); + oes->attach(rand(), true); + return SharedPtr(oes); +} +#endif + +#ifdef HAVE_SOUP +SharedPtr +new_http_interface(Ingen::Shared::World* world, const std::string& url) +{ + Client::HTTPEngineSender* hes = new Client::HTTPEngineSender(world, url); + hes->attach(rand(), true); + return SharedPtr(hes); +} +#endif + +struct IngenClientModule : 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); + world->add_interface_factory("http", &new_http_interface); + } +}; + +static IngenClientModule* module = NULL; + +extern "C" { + +Ingen::Shared::Module* +ingen_module_load() { + if (!module) + module = new IngenClientModule(); + + return module; +} + +} // extern "C" + diff --git a/src/client/wscript b/src/client/wscript index ea0eef85..749d9ec7 100644 --- a/src/client/wscript +++ b/src/client/wscript @@ -15,7 +15,7 @@ def build(bld): PluginUI.cpp PortModel.cpp ThreadedSigClientInterface.cpp - client.cpp + ingen_client.cpp ''' if bld.env['HAVE_SOUP'] == 1: -- cgit v1.2.1