X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Faudio_track.cc;h=293ca0d2c1c941b7d9afd90e67a923e8a350e54b;hb=9a0b1cce075f32768197d001f269a191869cc4e6;hp=deefd45e89c6c0dd68aa576b04a483e898f60c90;hpb=24056f055f0b565595e253e3fb14ea63d5fa91b1;p=ardour.git diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc index deefd45e89..293ca0d2c1 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 */ } @@ -200,18 +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; - XMLNodeConstIterator iter; - XMLNode *child; - if (Track::_set_state (node, version)) { + if (Track::set_state (node, version)) { return -1; } @@ -221,32 +203,6 @@ AudioTrack::_set_state (const XMLNode& node, int version) _mode = Normal; } - if (version >= 3000) { - if ((child = find_named_node (node, X_("Diskstream"))) != 0) { - boost::shared_ptr ds (new AudioDiskstream (_session, *child)); - ds->do_refill_with_alloc (); - set_diskstream (ds); - } - } - - /* set rec-enable control *AFTER* setting up diskstream, because it may want to operate - on the diskstream as it sets its own state - */ - - XMLNodeList nlist; - XMLNodeConstIterator niter; - - nlist = node.children(); - for (niter = nlist.begin(); niter != nlist.end(); ++niter){ - child = *niter; - - if (child->name() == Controllable::xml_node_name && (prop = child->property ("name")) != 0) { - if (prop->value() == X_("recenable")) { - _rec_enable_control->set_state (*child, version); - } - } - } - pending_state = const_cast (&node); if (_session.state_of_the_state() & Session::Loading) { @@ -285,8 +241,6 @@ AudioTrack::state (bool full_state) } root.add_property (X_("mode"), enum_2_string (_mode)); - root.add_child_nocopy (_rec_enable_control->get_state()); - root.add_child_nocopy (_diskstream->get_state ()); return root; } @@ -350,6 +304,9 @@ 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) { @@ -359,7 +316,6 @@ AudioTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_fram return 0; } - int dret; Sample* b; Sample* tmpb; framepos_t transport_frame; @@ -378,19 +334,26 @@ AudioTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_fram transport_frame = _session.transport_frame(); + int dret; + framecnt_t playback_distance; + if ((nframes = check_initial_delay (nframes, transport_frame)) == 0) { /* need to do this so that the diskstream sets its playback distance to zero, thus causing diskstream::commit to do nothing. */ - return diskstream->process (transport_frame, 0, need_butler); + + dret = diskstream->process (transport_frame, 0, playback_distance); + need_butler = diskstream->commit (playback_distance); + return dret; } _silent = false; _amp->apply_gain_automation(false); - if ((dret = diskstream->process (transport_frame, nframes, need_butler)) != 0) { + if ((dret = diskstream->process (transport_frame, nframes, playback_distance)) != 0) { + need_butler = diskstream->commit (playback_distance); silence (nframes); return dret; } @@ -500,20 +463,23 @@ 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 */ silence (nframes); } + need_butler = diskstream->commit (playback_distance); + return 0; } 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]); @@ -548,41 +514,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::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 @@ -625,7 +660,8 @@ 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; } @@ -636,21 +672,20 @@ AudioTrack::freeze_me (InterThreadInfo& itt) for (ProcessorList::iterator r = _processors.begin(); r != _processors.end(); ++r) { - boost::shared_ptr processor; + if (!(*r)->does_routing()) { - if ((processor = boost::dynamic_pointer_cast(*r)) != 0) { + FreezeRecordProcessorInfo* frii = new FreezeRecordProcessorInfo ((*r)->get_state(), (*r)); - FreezeRecordProcessorInfo* frii = new FreezeRecordProcessorInfo ((*r)->get_state(), processor); - - 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 (); } } @@ -671,7 +706,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); @@ -723,10 +758,8 @@ AudioTrack::write_source (uint32_t n) return ds->write_source (n); } -bool -AudioTrack::bounceable () const +boost::shared_ptr +AudioTrack::diskstream_factory (XMLNode const & node) { - return n_inputs().n_audio() >= n_outputs().n_audio(); + return boost::shared_ptr (new AudioDiskstream (_session, node)); } - -