X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Faudio_track.cc;h=90439f46e907eadd5ff5e66e1f545ce4ba95cd31;hb=2037b9534791377d5feecadea015d5a6927233be;hp=1dc1ba3a6ad355c4c9c7aa9eddc2230a63ee9af3;hpb=5dba72c874def27bef3ba3fe7a5cf2414e77aadb;p=ardour.git diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc index 1dc1ba3a6a..90439f46e9 100644 --- a/libs/ardour/audio_track.cc +++ b/libs/ardour/audio_track.cc @@ -19,9 +19,9 @@ #include -#include "pbd/error.h" -#include "pbd/enumwriter.h" #include "pbd/boost_debug.h" +#include "pbd/enumwriter.h" +#include "pbd/error.h" #include "evoral/Curve.hpp" @@ -30,22 +30,18 @@ #include "ardour/audio_diskstream.h" #include "ardour/audio_track.h" #include "ardour/audioplaylist.h" -#include "ardour/audioregion.h" -#include "ardour/audiosource.h" #include "ardour/buffer_set.h" -#include "ardour/io_processor.h" -#include "ardour/panner.h" +#include "ardour/delivery.h" #include "ardour/meter.h" #include "ardour/playlist_factory.h" -#include "ardour/plugin_insert.h" #include "ardour/processor.h" +#include "ardour/region.h" #include "ardour/region_factory.h" -#include "ardour/route_group_specialized.h" #include "ardour/session.h" -#include "ardour/utils.h" #include "ardour/session_playlists.h" -#include "ardour/delivery.h" -#include "ardour/meter.h" +#include "ardour/source.h" +#include "ardour/utils.h" + #include "i18n.h" using namespace std; @@ -61,8 +57,8 @@ AudioTrack::~AudioTrack () { } -void -AudioTrack::use_new_diskstream () +boost::shared_ptr +AudioTrack::create_diskstream () { AudioDiskstream::Flag dflags = AudioDiskstream::Flag (0); @@ -78,13 +74,7 @@ AudioTrack::use_new_diskstream () dflags = AudioDiskstream::Flag(dflags | AudioDiskstream::NonLayered); } - AudioDiskstream* dsp (new AudioDiskstream (_session, name(), dflags)); - boost::shared_ptr ds (dsp); - - ds->do_refill_with_alloc (); - ds->set_block_size (_session.get_block_size ()); - - set_diskstream (ds); + return boost::shared_ptr (new AudioDiskstream (_session, name(), dflags)); } void @@ -106,7 +96,7 @@ AudioTrack::set_diskstream (boost::shared_ptr ds) } _diskstream->set_record_enabled (false); - _diskstream->monitor_input (false); + _diskstream->request_jack_monitors_input (false); DiskstreamChanged (); /* EMIT SIGNAL */ } @@ -186,7 +176,7 @@ AudioTrack::deprecated_use_diskstream_connections () } } - _input->connect_ports_to_bundle (c, this); + _input->connect_ports_to_bundle (c, true, this); } else if ((prop = node.property ("inputs")) != 0) { if (_input->set_ports (prop->value())) { @@ -200,16 +190,10 @@ AudioTrack::deprecated_use_diskstream_connections () int AudioTrack::set_state (const XMLNode& node, int version) -{ - return _set_state (node, version); -} - -int -AudioTrack::_set_state (const XMLNode& node, int version) { const XMLProperty *prop; - if (Track::_set_state (node, version)) { + if (Track::set_state (node, version)) { return -1; } @@ -320,10 +304,13 @@ AudioTrack::set_state_part_two () } } +/** @param need_butler to be set to true if this track now needs the butler, otherwise it can be left alone + * or set to false. + */ int AudioTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame, int declick, bool& need_butler) { - Glib::RWLock::ReaderLock lm (_processor_lock, Glib::TRY_LOCK); + Glib::Threads::RWLock::ReaderLock lm (_processor_lock, Glib::Threads::TRY_LOCK); if (!lm.locked()) { return 0; @@ -334,8 +321,6 @@ AudioTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_fram framepos_t transport_frame; boost::shared_ptr diskstream = audio_diskstream(); - automation_snapshot (start_frame, false); - if (n_outputs().n_total() == 0 && _processors.empty()) { return 0; } @@ -476,9 +461,9 @@ AudioTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_fram process_output_buffers ( bufs, start_frame, end_frame, nframes, - (!_session.get_record_enabled() || !Config->get_do_not_record_plugins()), declick, - (!diskstream->record_enabled() && _session.transport_rolling())); + (!diskstream->record_enabled() && _session.transport_rolling()) + ); } else { /* problem with the diskstream; just be quiet for a bit */ @@ -491,13 +476,14 @@ AudioTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_fram } int -AudioTrack::export_stuff (BufferSet& buffers, framepos_t start, framecnt_t nframes, bool enable_processing) +AudioTrack::export_stuff (BufferSet& buffers, framepos_t start, framecnt_t nframes, + boost::shared_ptr endpoint, bool include_endpoint, bool for_export) { boost::scoped_array gain_buffer (new gain_t[nframes]); boost::scoped_array mix_buffer (new Sample[nframes]); boost::shared_ptr diskstream = audio_diskstream(); - Glib::RWLock::ReaderLock rlock (_processor_lock); + Glib::Threads::RWLock::ReaderLock rlock (_processor_lock); boost::shared_ptr apl = boost::dynamic_pointer_cast(diskstream->playlist()); @@ -526,41 +512,110 @@ AudioTrack::export_stuff (BufferSet& buffers, framepos_t start, framecnt_t nfram } // If no processing is required, there's no need to go any further. - if (!enable_processing) { + + if (!endpoint && !include_endpoint) { return 0; } - /* note: only run processors during export. other layers in the machinery - will already have checked that there are no external port processors. - Also, don't run deliveries that write to real output ports, and don't - run meters. - */ - for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) { - boost::shared_ptr processor = boost::dynamic_pointer_cast (*i); - boost::shared_ptr delivery = boost::dynamic_pointer_cast (*i); - boost::shared_ptr meter = boost::dynamic_pointer_cast (*i); - if (processor && (!delivery || !Delivery::role_requires_output_ports (delivery->role())) && !meter) { - processor->run (buffers, start, start+nframes, nframes, true); + if (!include_endpoint && (*i) == endpoint) { + break; + } + + /* if we're not exporting, stop processing if we come across a routing processor. + */ + + if (!for_export && (*i)->does_routing()) { + break; + } + + /* even for export, don't run any processor that does routing. + + oh, and don't bother with the peak meter either. + */ + + if (!(*i)->does_routing() && !boost::dynamic_pointer_cast(*i)) { + (*i)->run (buffers, start, start+nframes, nframes, true); + } + + if ((*i) == endpoint) { + break; } } return 0; } +bool +AudioTrack::bounceable (boost::shared_ptr endpoint, bool include_endpoint) const +{ + if (!endpoint && !include_endpoint) { + /* no processing - just read from the playlist and create new + files: always possible. + */ + return true; + } + + Glib::Threads::RWLock::ReaderLock lm (_processor_lock); + uint32_t naudio = n_inputs().n_audio(); + + for (ProcessorList::const_iterator r = _processors.begin(); r != _processors.end(); ++r) { + + /* if we're not including the endpoint, potentially stop + right here before we test matching i/o valences. + */ + + if (!include_endpoint && (*r) == endpoint) { + return true; + } + + /* ignore any processors that do routing, because we will not + * use them during a bounce/freeze/export operation. + */ + + if ((*r)->does_routing()) { + continue; + } + + /* does the output from the last considered processor match the + * input to this one? + */ + + if (naudio != (*r)->input_streams().n_audio()) { + return false; + } + + /* we're including the endpoint - if we just hit it, + then stop. + */ + + if ((*r) == endpoint) { + return true; + } + + /* save outputs of this processor to test against inputs + of the next one. + */ + + naudio = (*r)->output_streams().n_audio(); + } + + return true; +} + boost::shared_ptr AudioTrack::bounce (InterThreadInfo& itt) { - vector > srcs; - return _session.write_one_track (*this, _session.current_start_frame(), _session.current_end_frame(), false, srcs, itt); + return bounce_range (_session.current_start_frame(), _session.current_end_frame(), itt, main_outs(), false); } boost::shared_ptr -AudioTrack::bounce_range (framepos_t start, framepos_t end, InterThreadInfo& itt, bool enable_processing) +AudioTrack::bounce_range (framepos_t start, framepos_t end, InterThreadInfo& itt, + boost::shared_ptr endpoint, bool include_endpoint) { vector > srcs; - return _session.write_one_track (*this, start, end, false, srcs, itt, enable_processing); + return _session.write_one_track (*this, start, end, false, srcs, itt, endpoint, include_endpoint, false); } void @@ -603,32 +658,32 @@ AudioTrack::freeze_me (InterThreadInfo& itt) boost::shared_ptr res; - if ((res = _session.write_one_track (*this, _session.current_start_frame(), _session.current_end_frame(), true, srcs, itt)) == 0) { + if ((res = _session.write_one_track (*this, _session.current_start_frame(), _session.current_end_frame(), true, srcs, itt, + main_outs(), false, false)) == 0) { return; } _freeze_record.processor_info.clear (); { - Glib::RWLock::ReaderLock lm (_processor_lock); + Glib::Threads::RWLock::ReaderLock lm (_processor_lock); for (ProcessorList::iterator r = _processors.begin(); r != _processors.end(); ++r) { - boost::shared_ptr processor; - - if ((processor = boost::dynamic_pointer_cast(*r)) != 0) { + if (!(*r)->does_routing() && !boost::dynamic_pointer_cast(*r)) { - FreezeRecordProcessorInfo* frii = new FreezeRecordProcessorInfo ((*r)->get_state(), processor); + FreezeRecordProcessorInfo* frii = new FreezeRecordProcessorInfo ((*r)->get_state(), (*r)); - frii->id = processor->id(); + frii->id = (*r)->id(); _freeze_record.processor_info.push_back (frii); /* now deactivate the processor */ - processor->deactivate (); - _session.set_dirty (); + (*r)->deactivate (); } + + _session.set_dirty (); } } @@ -649,7 +704,7 @@ AudioTrack::freeze_me (InterThreadInfo& itt) boost::shared_ptr region (RegionFactory::create (srcs, plist, false)); - new_playlist->set_orig_diskstream_id (_diskstream->id()); + new_playlist->set_orig_track_id (id()); new_playlist->add_region (region, _session.current_start_frame()); new_playlist->set_frozen (true); region->set_locked (true); @@ -674,7 +729,7 @@ AudioTrack::unfreeze () audio_diskstream()->use_playlist (_freeze_record.playlist); { - Glib::RWLock::ReaderLock lm (_processor_lock); // should this be a write lock? jlc + Glib::Threads::RWLock::ReaderLock lm (_processor_lock); // should this be a write lock? jlc for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) { for (vector::iterator ii = _freeze_record.processor_info.begin(); ii != _freeze_record.processor_info.end(); ++ii) { if ((*ii)->id == (*i)->id()) { @@ -701,12 +756,6 @@ AudioTrack::write_source (uint32_t n) return ds->write_source (n); } -bool -AudioTrack::bounceable () const -{ - return n_inputs().n_audio() >= n_outputs().n_audio(); -} - boost::shared_ptr AudioTrack::diskstream_factory (XMLNode const & node) {