diff options
| author | Christian Glöckner <cgloeckner@freenet.de> | 2016-01-25 12:32:09 +0100 |
|---|---|---|
| committer | André Nusser <andre.nusser@googlemail.com> | 2016-02-09 09:03:16 +0100 |
| commit | 41b6ef4642b25c22e47e5f89f113b502d3a4321c (patch) | |
| tree | 2aac4d7d2fe822506d7ce902f81d3c7dc52e0171 /drumgizmo/enginefactory.cc | |
| parent | 7236fee052f52667f116ed83cacb21ed587d0d65 (diff) | |
added JackMidiInputEngine + additional minor changes
Diffstat (limited to 'drumgizmo/enginefactory.cc')
| -rw-r--r-- | drumgizmo/enginefactory.cc | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/drumgizmo/enginefactory.cc b/drumgizmo/enginefactory.cc index cb332ed..06f8141 100644 --- a/drumgizmo/enginefactory.cc +++ b/drumgizmo/enginefactory.cc @@ -26,6 +26,7 @@ */ #include <iostream> +#include "cpp11fix.h" // required for c++11 #include "enginefactory.h" EngineFactory::EngineFactory() @@ -42,6 +43,9 @@ EngineFactory::EngineFactory() #ifdef HAVE_INPUT_MIDIFILE input.push_back("midifile"); #endif +#ifdef HAVE_INPUT_JACKMIDI + input.push_back("jackmidi"); +#endif // list available output engines #ifdef HAVE_OUTPUT_DUMMY @@ -85,6 +89,12 @@ std::unique_ptr<AudioInputEngine> EngineFactory::createInput(std::string const & return std::make_unique<MidifileInputEngine>(); } #endif +#ifdef HAVE_INPUT_JACKMIDI + if (name == "jackmidi") { + prepareJack(); + return std::make_unique<JackMidiInputEngine>(*jack); + } +#endif // todo: add more engines @@ -111,7 +121,7 @@ std::unique_ptr<AudioOutputEngine> EngineFactory::createOutput(std::string const #ifdef HAVE_OUTPUT_JACKAUDIO if (name == "jackaudio") { prepareJack(); - return std::make_unique<JackaudioOutputEngine>(*jack); + return std::make_unique<JackAudioOutputEngine>(*jack); } #endif |