diff options
| author | David Robillard <d@drobilla.net> | 2007-07-24 06:48:02 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2007-07-24 06:48:02 +0000 |
| commit | cf1c161a0209cdce869a3e8c3b48b1d53c1bab00 (patch) | |
| tree | f56c68b22bb013127ed5bc02501ee124ae46d873 /src/libs/engine/Engine.cpp | |
| parent | db1861e76aa1a42789c78f37f110cc81c0339a2d (diff) | |
| download | ingen-cf1c161a0209cdce869a3e8c3b48b1d53c1bab00.tar.gz ingen-cf1c161a0209cdce869a3e8c3b48b1d53c1bab00.tar.bz2 ingen-cf1c161a0209cdce869a3e8c3b48b1d53c1bab00.zip | |
Removed recursive autohell, except for SLv2.
Always build against local copies, hopefully fixing broken compilation against outdated system versions.
git-svn-id: http://svn.drobilla.net/lad/ingen@610 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/libs/engine/Engine.cpp')
| -rw-r--r-- | src/libs/engine/Engine.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/libs/engine/Engine.cpp b/src/libs/engine/Engine.cpp index e80bcafe..a2bfc757 100644 --- a/src/libs/engine/Engine.cpp +++ b/src/libs/engine/Engine.cpp @@ -40,10 +40,10 @@ #ifdef HAVE_JACK_MIDI #include "JackMidiDriver.h" #endif -#ifdef HAVE_LASH +/*#ifdef HAVE_LASH #include "LashDriver.h" -#endif -using std::cout; using std::cerr; using std::endl; +#endif*/ +using namespace std; namespace Ingen { @@ -56,11 +56,11 @@ Engine::Engine() _broadcaster(new ClientBroadcaster()), _object_store(new ObjectStore()), _node_factory(new NodeFactory()), -#ifdef HAVE_LASH +/*#ifdef HAVE_LASH _lash_driver(new LashDriver()), -#else +#else */ _lash_driver(NULL), -#endif +//#endif _quit_flag(false), _activated(false) { @@ -129,11 +129,11 @@ Engine::main() bool Engine::main_iteration() { -#ifdef HAVE_LASH +/*#ifdef HAVE_LASH // Process any pending LASH events if (lash_driver->enabled()) lash_driver->process_events(); -#endif +#endif*/ // Run the maid (garbage collector) _maid->cleanup(); |