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/events/CreatePort.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/events/CreatePort.cpp')
-rw-r--r-- | src/engine/events/CreatePort.cpp | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/src/engine/events/CreatePort.cpp b/src/engine/events/CreatePort.cpp index 60fd7cf9..ea2b3efa 100644 --- a/src/engine/events/CreatePort.cpp +++ b/src/engine/events/CreatePort.cpp @@ -30,9 +30,7 @@ #include "EngineStore.hpp" #include "ClientBroadcaster.hpp" #include "PortImpl.hpp" -#include "AudioDriver.hpp" -#include "MidiDriver.hpp" -#include "OSCDriver.hpp" +#include "Driver.hpp" #include "DuplexPort.hpp" using namespace std; @@ -94,7 +92,7 @@ CreatePort::pre_process() size_t buffer_size = 1; if (_type.str() != "ingen:Float") - buffer_size = _engine.audio_driver()->buffer_size(); + buffer_size = _engine.driver()->buffer_size(); const uint32_t old_num_ports = _patch->num_ports(); @@ -120,15 +118,9 @@ CreatePort::pre_process() _ports_array->at(_patch->num_ports()-1) = _patch_port; _engine.engine_store()->add(_patch_port); - if (!_patch->parent()) { - if (_type.str() == "lv2:AudioPort") { - _driver_port = _engine.audio_driver()->create_port( - dynamic_cast<DuplexPort*>(_patch_port)); - } else if (_type.str() == "lv2ev:EventPort") { - _driver_port = _engine.midi_driver()->create_port( - dynamic_cast<DuplexPort*>(_patch_port)); - } - } + if (!_patch->parent()) + _driver_port = _engine.driver()->create_port( + dynamic_cast<DuplexPort*>(_patch_port)); assert(_ports_array->size() == _patch->num_ports()); @@ -151,11 +143,7 @@ CreatePort::execute(ProcessContext& context) } if (_driver_port) { - if (_type.str() == "lv2:AudioPort") { - _engine.audio_driver()->add_port(_driver_port); - } else if (_type.str() == "lv2ev:EventPort") { - _engine.midi_driver()->add_port(_driver_port); - } + _engine.driver()->add_port(_driver_port); } } |