From 86f24d20e1616ffaafc97de65db49fd6a91270f8 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 16 Jun 2009 14:58:33 +0000 Subject: first pass (ok, third really) at internal send+return - audio routing inside ardour without JACK. lots still to do, but at least the obvious works git-svn-id: svn://localhost/ardour2/branches/3.0@5202 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/audioengine.cc | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) (limited to 'libs/ardour/audioengine.cc') diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc index 4e2d97f718..4143cb109a 100644 --- a/libs/ardour/audioengine.cc +++ b/libs/ardour/audioengine.cc @@ -31,23 +31,23 @@ #include "midi++/jack.h" +#include "ardour/amp.h" +#include "ardour/audio_port.h" #include "ardour/audioengine.h" #include "ardour/buffer.h" -#include "ardour/delivery.h" -#include "ardour/port.h" -#include "ardour/audio_port.h" -#include "ardour/midi_port.h" -#include "ardour/meter.h" -#include "ardour/session.h" +#include "ardour/buffer_set.h" #include "ardour/cycle_timer.h" -#include "ardour/utils.h" +#include "ardour/delivery.h" #include "ardour/event_type_map.h" +#include "ardour/internal_return.h" #include "ardour/io.h" -#include "ardour/amp.h" +#include "ardour/meter.h" +#include "ardour/midi_port.h" +#include "ardour/port.h" #include "ardour/port_set.h" -#include "ardour/buffer_set.h" - +#include "ardour/session.h" #include "ardour/timestamps.h" +#include "ardour/utils.h" #include "i18n.h" @@ -364,6 +364,7 @@ AudioEngine::process_callback (nframes_t nframes) Delivery::CycleStart (nframes); Port::set_port_offset (0); + InternalReturn::CycleStart (nframes); /* tell all Ports that we're starting a new cycle */ @@ -822,10 +823,15 @@ AudioEngine::frames_per_cycle () Port * AudioEngine::get_port_by_name (const string& portname) { - assert (portname.find_first_of (':') != string::npos); + string s; + if (portname.find_first_of (':') == string::npos) { + s = make_port_name_non_relative (portname); + } else { + s = portname; + } Glib::Mutex::Lock lm (_process_lock); - return get_port_by_name_locked (portname); + return get_port_by_name_locked (s); } Port * -- cgit v1.2.3