From a7d83f19b08eb4c6f79a82fe60c2b86db13f4420 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 24 Nov 2018 13:44:03 +0100 Subject: Squashed 'waflib/' changes from 6e726eb1..5ea8f99f 5ea8f99f Improve test output spacing 0e23b29f Raise exception when test suite fails to ensure non-zero exit status d6de073b Show run time of unit tests 5b655541 Add short configure option for ultra-strict flags 4687ba6d Use gtest-like test output 258903d9 Fix failure count in test group summaries da07e738 Fix verbose tests with Python 3 git-subtree-dir: waflib git-subtree-split: 5ea8f99f6e1246079c1fe6bb590c38a53aadd40d --- src/server/ingen_jack.cpp | 58 ----------------------------------------------- 1 file changed, 58 deletions(-) delete mode 100644 src/server/ingen_jack.cpp (limited to 'src/server/ingen_jack.cpp') diff --git a/src/server/ingen_jack.cpp b/src/server/ingen_jack.cpp deleted file mode 100644 index a897f130..00000000 --- a/src/server/ingen_jack.cpp +++ /dev/null @@ -1,58 +0,0 @@ -/* - This file is part of Ingen. - Copyright 2007-2015 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 "ingen/Atom.hpp" -#include "ingen/Configuration.hpp" -#include "ingen/Configuration.hpp" -#include "ingen/Log.hpp" -#include "ingen/Module.hpp" -#include "ingen/World.hpp" - -#include "JackDriver.hpp" -#include "Engine.hpp" - -using namespace Ingen; - -struct IngenJackModule : public Ingen::Module { - void load(Ingen::World* world) { - if (((Server::Engine*)world->engine().get())->driver()) { - world->log().warn("Engine already has a driver\n"); - return; - } - - Server::JackDriver* driver = new Server::JackDriver( - *(Server::Engine*)world->engine().get()); - const Atom& s = world->conf().option("jack-server"); - const std::string server_name = s.is_valid() ? s.ptr() : ""; - driver->attach(server_name, - world->conf().option("jack-name").ptr(), - nullptr); - ((Server::Engine*)world->engine().get())->set_driver( - SPtr(driver)); - } -}; - -extern "C" { - -Ingen::Module* -ingen_module_load() -{ - return new IngenJackModule(); -} - -} // extern "C" -- cgit v1.2.1