From af4f0f805cf539d380d6d960c6ad234fcde70270 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 5 Oct 2008 20:37:24 +0000 Subject: Move engine.cpp to ingen_engine.cpp to avoid case insensitive name clashes. Get this: this is an issue with /modern/ Macs. Apple DOS/X lol etc. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@1618 a436a847-0d15-0410-975c-d299462d15a1 --- src/engine/engine.cpp | 56 --------------------------------------------- src/engine/ingen_engine.cpp | 56 +++++++++++++++++++++++++++++++++++++++++++++ src/engine/wscript | 2 +- 3 files changed, 57 insertions(+), 57 deletions(-) delete mode 100644 src/engine/engine.cpp create mode 100644 src/engine/ingen_engine.cpp diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp deleted file mode 100644 index 1d2dd8c1..00000000 --- a/src/engine/engine.cpp +++ /dev/null @@ -1,56 +0,0 @@ -/* This file is part of Ingen. - * Copyright (C) 2007 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 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 "config.h" - -#include -#include "engine.hpp" -#include "Engine.hpp" -#include "QueuedEngineInterface.hpp" -#include "tuning.hpp" -#include "util.hpp" - -namespace Ingen { - -Engine* -new_engine(Ingen::Shared::World* world) -{ - set_denormal_flags(); - return new Engine(world); -} - - -bool -launch_osc_engine(int port) -{ - char port_str[6]; - snprintf(port_str, 6, "%u", port); - const string cmd = string("ingen -e --engine-port=").append(port_str); - - if (Raul::Process::launch(cmd)) { - return true; - //return SharedPtr(new OSCEngineSender( - // string("osc.udp://localhost:").append(port_str))); - } else { - std::cerr << "Failed to launch engine process." << std::endl; - //return SharedPtr(); - return false; - } -} - -} // namespace Ingen - diff --git a/src/engine/ingen_engine.cpp b/src/engine/ingen_engine.cpp new file mode 100644 index 00000000..1d2dd8c1 --- /dev/null +++ b/src/engine/ingen_engine.cpp @@ -0,0 +1,56 @@ +/* This file is part of Ingen. + * Copyright (C) 2007 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 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 "config.h" + +#include +#include "engine.hpp" +#include "Engine.hpp" +#include "QueuedEngineInterface.hpp" +#include "tuning.hpp" +#include "util.hpp" + +namespace Ingen { + +Engine* +new_engine(Ingen::Shared::World* world) +{ + set_denormal_flags(); + return new Engine(world); +} + + +bool +launch_osc_engine(int port) +{ + char port_str[6]; + snprintf(port_str, 6, "%u", port); + const string cmd = string("ingen -e --engine-port=").append(port_str); + + if (Raul::Process::launch(cmd)) { + return true; + //return SharedPtr(new OSCEngineSender( + // string("osc.udp://localhost:").append(port_str))); + } else { + std::cerr << "Failed to launch engine process." << std::endl; + //return SharedPtr(); + return false; + } +} + +} // namespace Ingen + diff --git a/src/engine/wscript b/src/engine/wscript index c10dc028..0b2b3812 100644 --- a/src/engine/wscript +++ b/src/engine/wscript @@ -40,7 +40,7 @@ def build(bld): QueuedEvent.cpp QueuedEventSource.cpp TransportNode.cpp - engine.cpp + ingen_engine.cpp events/AllNotesOffEvent.cpp events/ClearPatchEvent.cpp events/ConnectionEvent.cpp -- cgit v1.2.1