diff options
author | David Robillard <d@drobilla.net> | 2010-01-05 21:32:55 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2010-01-05 21:32:55 +0000 |
commit | 534b3d2248884d5a8352c2239c668e632ab16b41 (patch) | |
tree | 1307d53d6c62d3ab51b1ad0f3056d387fba9a682 /src/engine/QueuedEngineInterface.cpp | |
parent | f4800095303dbcdec079d9c96b921f169696903c (diff) | |
download | ingen-534b3d2248884d5a8352c2239c668e632ab16b41.tar.gz ingen-534b3d2248884d5a8352c2239c668e632ab16b41.tar.bz2 ingen-534b3d2248884d5a8352c2239c668e632ab16b41.zip |
Merge JackMidiDriver and JackAudioDriver.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2343 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/engine/QueuedEngineInterface.cpp')
-rw-r--r-- | src/engine/QueuedEngineInterface.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/engine/QueuedEngineInterface.cpp b/src/engine/QueuedEngineInterface.cpp index 8adf2325..5532b732 100644 --- a/src/engine/QueuedEngineInterface.cpp +++ b/src/engine/QueuedEngineInterface.cpp @@ -21,7 +21,7 @@ #include "QueuedEventSource.hpp" #include "events.hpp" #include "Engine.hpp" -#include "AudioDriver.hpp" +#include "Driver.hpp" using namespace std; using namespace Raul; @@ -44,8 +44,8 @@ QueuedEngineInterface::now() const { // Exactly one cycle latency (some could run ASAP if we get lucky, but not always, and a slight // constant latency is far better than jittery lower (average) latency - if (_engine.audio_driver()) - return _engine.audio_driver()->frame_time() + _engine.audio_driver()->buffer_size(); + if (_engine.driver()) + return _engine.driver()->frame_time() + _engine.driver()->buffer_size(); else return 0; } |