From 4b5a08b27a051a6313f5684fe26d54ac450ca740 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 16 Jan 2015 17:52:01 +0000 Subject: Prevent build directory path clashes. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@5518 a436a847-0d15-0410-975c-d299462d15a1 --- src/ingen/ingen.cpp | 218 ++++++++++++++++++++++++++++++++++++++++++++++++++++ src/ingen/main.cpp | 218 ---------------------------------------------------- wscript | 4 +- 3 files changed, 220 insertions(+), 220 deletions(-) create mode 100644 src/ingen/ingen.cpp delete mode 100644 src/ingen/main.cpp diff --git a/src/ingen/ingen.cpp b/src/ingen/ingen.cpp new file mode 100644 index 00000000..6e058414 --- /dev/null +++ b/src/ingen/ingen.cpp @@ -0,0 +1,218 @@ +/* + This file is part of Ingen. + Copyright 2007-2012 David Robillard + + Ingen is free software: you can redistribute it and/or modify it under the + terms of the GNU Affero General Public License as published by the Free + Software Foundation, either version 3 of the License, or 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 Affero General Public License for details. + + You should have received a copy of the GNU Affero General Public License + along with Ingen. If not, see . +*/ + +#include +#include + +#include +#include + +#include +#include + +#include "raul/Path.hpp" + +#include "ingen_config.h" + +#include "ingen/Configuration.hpp" +#include "ingen/EngineBase.hpp" +#include "ingen/Interface.hpp" +#include "ingen/Log.hpp" +#include "ingen/World.hpp" +#include "ingen/client/ThreadedSigClientInterface.hpp" +#include "ingen/runtime_paths.hpp" +#include "ingen/serialisation/Parser.hpp" +#include "ingen/types.hpp" +#ifdef WITH_BINDINGS +#include "bindings/ingen_bindings.hpp" +#endif + +using namespace std; +using namespace Ingen; + +Ingen::World* world = NULL; + +static void +ingen_interrupt(int signal) +{ + if (signal == SIGTERM) { + cerr << "ingen: Terminated" << endl; + delete world; + exit(EXIT_FAILURE); + } else { + cout << "ingen: Interrupted" << endl; + if (world && world->engine()) { + world->engine()->quit(); + } + } +} + +static void +ingen_try(bool cond, const char* msg) +{ + if (!cond) { + cerr << "ingen: Error: " << msg << endl; + delete world; + exit(EXIT_FAILURE); + } +} + +int +main(int argc, char** argv) +{ + Glib::thread_init(); + Ingen::set_bundle_path_from_code((void*)&main); + + // Create world + try { + world = new Ingen::World(argc, argv, NULL, NULL, NULL); + if (argc <= 1) { + world->conf().print_usage("ingen", cout); + return EXIT_FAILURE; + } else if (world->conf().option("help").get()) { + world->conf().print_usage("ingen", cout); + return EXIT_SUCCESS; + } + } catch (std::exception& e) { + cout << "ingen: " << e.what() << endl; + return EXIT_FAILURE; + } + + Configuration& conf = world->conf(); + if (conf.option("uuid").is_valid()) { + world->set_jack_uuid(conf.option("uuid").ptr()); + } + + // Run engine + SPtr engine_interface; + if (conf.option("engine").get()) { + ingen_try(world->load_module("server"), + "Unable to load server module"); + + ingen_try(bool(world->engine()), "Unable to create engine"); + + engine_interface = world->interface(); + +#ifdef HAVE_SOCKET + ingen_try(world->load_module("socket_server"), + "Unable to load socket server module"); +#endif + } + + // If we don't have a local engine interface (for GUI), use network + if (!engine_interface) { + ingen_try(world->load_module("client"), + "Unable to load client module"); +#ifdef HAVE_SOCKET + ingen_try(world->load_module("socket_client"), + "Unable to load socket client module"); +#endif + const char* const uri = conf.option("connect").ptr(); + ingen_try(Raul::URI::is_valid(uri), + (fmt("Invalid URI <%1%>") % uri).str().c_str()); + SPtr client(new Client::ThreadedSigClientInterface(1024)); + engine_interface = world->new_interface(Raul::URI(uri), client); + ingen_try(bool(engine_interface), + (fmt("Unable to create interface to `%1%'") % uri).str().c_str()); + } + + world->set_interface(engine_interface); + + // Load necessary modules before activating engine (and Jack driver) + + if (conf.option("load").is_valid() || !conf.files().empty()) { + ingen_try(world->load_module("serialisation"), + "Unable to load serialisation module"); + } + + if (conf.option("gui").get()) { + ingen_try(world->load_module("gui"), + "Unable to load GUI module"); + } + + // Activate the engine, if we have one + if (world->engine()) { + ingen_try(world->load_module("jack"), + "Unable to load jack module"); + world->engine()->activate(); + } + + // Load a graph + if (conf.option("load").is_valid() || !conf.files().empty()) { + boost::optional parent; + boost::optional symbol; + + const Atom& path_option = conf.option("path"); + if (path_option.is_valid()) { + if (Raul::Path::is_valid(path_option.ptr())) { + const Raul::Path p(path_option.ptr()); + if (!p.is_root()) { + parent = p.parent(); + symbol = Raul::Symbol(p.symbol()); + } + } else { + cerr << "Invalid path given: '" << path_option.ptr() << endl; + } + } + + ingen_try(bool(world->parser()), "Unable to create parser"); + + const string path = (conf.option("load").is_valid() + ? conf.option("load").ptr() + : conf.files().front()); + + engine_interface->get(Raul::URI("ingen:/plugins")); + engine_interface->get(Node::root_uri()); + world->parser()->parse_file( + world, engine_interface.get(), path, parent, symbol); + } + + // Set up signal handlers that will set quit_flag on interrupt + signal(SIGINT, ingen_interrupt); + signal(SIGTERM, ingen_interrupt); + + if (conf.option("gui").get()) { + world->run_module("gui"); + } else if (conf.option("run").is_valid()) { + // Run a script +#ifdef WITH_BINDINGS + ingen_try(world->load_module("bindings"), + "Unable to load bindings module"); + + world->run("application/x-python", conf.option("run").ptr()); +#else + cerr << "This build of ingen does not support scripting." << endl; +#endif + + } else if (world->engine() && !conf.option("gui").get()) { + // Run engine main loop until interrupt + while (world->engine()->main_iteration()) { + Glib::usleep(125000); // 1/8 second + } + } + + // Sleep for a half second to allow event queues to drain + Glib::usleep(500000); + + // Shut down + if (world->engine()) + world->engine()->deactivate(); + + engine_interface.reset(); + delete world; + + return 0; +} diff --git a/src/ingen/main.cpp b/src/ingen/main.cpp deleted file mode 100644 index 6e058414..00000000 --- a/src/ingen/main.cpp +++ /dev/null @@ -1,218 +0,0 @@ -/* - This file is part of Ingen. - Copyright 2007-2012 David Robillard - - Ingen is free software: you can redistribute it and/or modify it under the - terms of the GNU Affero General Public License as published by the Free - Software Foundation, either version 3 of the License, or 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 Affero General Public License for details. - - You should have received a copy of the GNU Affero General Public License - along with Ingen. If not, see . -*/ - -#include -#include - -#include -#include - -#include -#include - -#include "raul/Path.hpp" - -#include "ingen_config.h" - -#include "ingen/Configuration.hpp" -#include "ingen/EngineBase.hpp" -#include "ingen/Interface.hpp" -#include "ingen/Log.hpp" -#include "ingen/World.hpp" -#include "ingen/client/ThreadedSigClientInterface.hpp" -#include "ingen/runtime_paths.hpp" -#include "ingen/serialisation/Parser.hpp" -#include "ingen/types.hpp" -#ifdef WITH_BINDINGS -#include "bindings/ingen_bindings.hpp" -#endif - -using namespace std; -using namespace Ingen; - -Ingen::World* world = NULL; - -static void -ingen_interrupt(int signal) -{ - if (signal == SIGTERM) { - cerr << "ingen: Terminated" << endl; - delete world; - exit(EXIT_FAILURE); - } else { - cout << "ingen: Interrupted" << endl; - if (world && world->engine()) { - world->engine()->quit(); - } - } -} - -static void -ingen_try(bool cond, const char* msg) -{ - if (!cond) { - cerr << "ingen: Error: " << msg << endl; - delete world; - exit(EXIT_FAILURE); - } -} - -int -main(int argc, char** argv) -{ - Glib::thread_init(); - Ingen::set_bundle_path_from_code((void*)&main); - - // Create world - try { - world = new Ingen::World(argc, argv, NULL, NULL, NULL); - if (argc <= 1) { - world->conf().print_usage("ingen", cout); - return EXIT_FAILURE; - } else if (world->conf().option("help").get()) { - world->conf().print_usage("ingen", cout); - return EXIT_SUCCESS; - } - } catch (std::exception& e) { - cout << "ingen: " << e.what() << endl; - return EXIT_FAILURE; - } - - Configuration& conf = world->conf(); - if (conf.option("uuid").is_valid()) { - world->set_jack_uuid(conf.option("uuid").ptr()); - } - - // Run engine - SPtr engine_interface; - if (conf.option("engine").get()) { - ingen_try(world->load_module("server"), - "Unable to load server module"); - - ingen_try(bool(world->engine()), "Unable to create engine"); - - engine_interface = world->interface(); - -#ifdef HAVE_SOCKET - ingen_try(world->load_module("socket_server"), - "Unable to load socket server module"); -#endif - } - - // If we don't have a local engine interface (for GUI), use network - if (!engine_interface) { - ingen_try(world->load_module("client"), - "Unable to load client module"); -#ifdef HAVE_SOCKET - ingen_try(world->load_module("socket_client"), - "Unable to load socket client module"); -#endif - const char* const uri = conf.option("connect").ptr(); - ingen_try(Raul::URI::is_valid(uri), - (fmt("Invalid URI <%1%>") % uri).str().c_str()); - SPtr client(new Client::ThreadedSigClientInterface(1024)); - engine_interface = world->new_interface(Raul::URI(uri), client); - ingen_try(bool(engine_interface), - (fmt("Unable to create interface to `%1%'") % uri).str().c_str()); - } - - world->set_interface(engine_interface); - - // Load necessary modules before activating engine (and Jack driver) - - if (conf.option("load").is_valid() || !conf.files().empty()) { - ingen_try(world->load_module("serialisation"), - "Unable to load serialisation module"); - } - - if (conf.option("gui").get()) { - ingen_try(world->load_module("gui"), - "Unable to load GUI module"); - } - - // Activate the engine, if we have one - if (world->engine()) { - ingen_try(world->load_module("jack"), - "Unable to load jack module"); - world->engine()->activate(); - } - - // Load a graph - if (conf.option("load").is_valid() || !conf.files().empty()) { - boost::optional parent; - boost::optional symbol; - - const Atom& path_option = conf.option("path"); - if (path_option.is_valid()) { - if (Raul::Path::is_valid(path_option.ptr())) { - const Raul::Path p(path_option.ptr()); - if (!p.is_root()) { - parent = p.parent(); - symbol = Raul::Symbol(p.symbol()); - } - } else { - cerr << "Invalid path given: '" << path_option.ptr() << endl; - } - } - - ingen_try(bool(world->parser()), "Unable to create parser"); - - const string path = (conf.option("load").is_valid() - ? conf.option("load").ptr() - : conf.files().front()); - - engine_interface->get(Raul::URI("ingen:/plugins")); - engine_interface->get(Node::root_uri()); - world->parser()->parse_file( - world, engine_interface.get(), path, parent, symbol); - } - - // Set up signal handlers that will set quit_flag on interrupt - signal(SIGINT, ingen_interrupt); - signal(SIGTERM, ingen_interrupt); - - if (conf.option("gui").get()) { - world->run_module("gui"); - } else if (conf.option("run").is_valid()) { - // Run a script -#ifdef WITH_BINDINGS - ingen_try(world->load_module("bindings"), - "Unable to load bindings module"); - - world->run("application/x-python", conf.option("run").ptr()); -#else - cerr << "This build of ingen does not support scripting." << endl; -#endif - - } else if (world->engine() && !conf.option("gui").get()) { - // Run engine main loop until interrupt - while (world->engine()->main_iteration()) { - Glib::usleep(125000); // 1/8 second - } - } - - // Sleep for a half second to allow event queues to drain - Glib::usleep(500000); - - // Shut down - if (world->engine()) - world->engine()->deactivate(); - - engine_interface.reset(); - delete world; - - return 0; -} diff --git a/wscript b/wscript index 270d87d2..c40839ee 100644 --- a/wscript +++ b/wscript @@ -177,8 +177,8 @@ def build(bld): # Program obj = bld(features = 'c cxx cxxprogram', - source = 'src/ingen/main.cpp', - target = bld.path.get_bld().make_node('ingen'), + source = 'src/ingen/ingen.cpp', + target = 'src/ingen/ingen', includes = ['.'], use = 'libingen', install_path = '${BINDIR}') -- cgit v1.2.1