X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Faudio_track.cc;h=fcd211375aed7f80cd58bfd4527e3c60d4173c3a;hb=2b9dc7b380bb4e40171067f42b4010970869a57d;hp=93814bcc14cf8f7c12b5237a390b20da8532eda5;hpb=9ad2875905c611b33fc9114101da224c878ca9cd;p=ardour.git diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc index 93814bcc14..fcd211375a 100644 --- a/libs/ardour/audio_track.cc +++ b/libs/ardour/audio_track.cc @@ -17,9 +17,7 @@ */ -#include -#include -#include +#include #include "pbd/error.h" #include "pbd/enumwriter.h" @@ -45,6 +43,9 @@ #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 "i18n.h" using namespace std; @@ -54,13 +55,6 @@ using namespace PBD; AudioTrack::AudioTrack (Session& sess, string name, Route::Flag flag, TrackMode mode) : Track (sess, name, flag, mode) { - use_new_diskstream (); -} - -AudioTrack::AudioTrack (Session& sess, const XMLNode& node, int /*version*/) - : Track (sess, node) -{ - _set_state (node, Stateful::loading_state_version, false); } AudioTrack::~AudioTrack () @@ -87,9 +81,40 @@ AudioTrack::use_new_diskstream () AudioDiskstream* dsp (new AudioDiskstream (_session, name(), dflags)); boost::shared_ptr ds (dsp); - _session.add_diskstream (ds); + ds->do_refill_with_alloc (); + ds->set_block_size (_session.get_block_size ()); - set_diskstream (boost::dynamic_pointer_cast (ds), this); + set_diskstream (ds); +} + +void +AudioTrack::set_diskstream (boost::shared_ptr ds) +{ + Track::set_diskstream (ds); + + _diskstream->set_track (this); + _diskstream->set_destructive (_mode == Destructive); + _diskstream->set_non_layered (_mode == NonLayered); + + if (audio_diskstream()->deprecated_io_node) { + + if (!IO::connecting_legal) { + IO::ConnectingLegal.connect_same_thread (*this, boost::bind (&AudioTrack::deprecated_use_diskstream_connections, this)); + } else { + deprecated_use_diskstream_connections (); + } + } + + _diskstream->set_record_enabled (false); + _diskstream->monitor_input (false); + + DiskstreamChanged (); /* EMIT SIGNAL */ +} + +boost::shared_ptr +AudioTrack::audio_diskstream() const +{ + return boost::dynamic_pointer_cast(_diskstream); } int @@ -173,63 +198,6 @@ AudioTrack::deprecated_use_diskstream_connections () return 0; } -int -AudioTrack::set_diskstream (boost::shared_ptr ds, void * /*src*/) -{ - _diskstream = ds; - _diskstream->set_route (*this); - _diskstream->set_destructive (_mode == Destructive); - _diskstream->set_non_layered (_mode == NonLayered); - - if (audio_diskstream()->deprecated_io_node) { - - if (!IO::connecting_legal) { - IO::ConnectingLegal.connect (mem_fun (*this, &AudioTrack::deprecated_use_diskstream_connections)); - } else { - deprecated_use_diskstream_connections (); - } - } - - _diskstream->set_record_enabled (false); - _diskstream->monitor_input (false); - - DiskstreamChanged (); /* EMIT SIGNAL */ - - return 0; -} - -int -AudioTrack::use_diskstream (string name) -{ - boost::shared_ptr dstream; - - if ((dstream = boost::dynamic_pointer_cast(_session.diskstream_by_name (name))) == 0) { - error << string_compose(_("AudioTrack: audio diskstream \"%1\" not known by session"), name) << endmsg; - return -1; - } - - return set_diskstream (dstream, this); -} - -int -AudioTrack::use_diskstream (const PBD::ID& id) -{ - boost::shared_ptr dstream; - - if ((dstream = boost::dynamic_pointer_cast (_session.diskstream_by_id (id))) == 0) { - error << string_compose(_("AudioTrack: audio diskstream \"%1\" not known by session"), id) << endmsg; - return -1; - } - - return set_diskstream (dstream, this); -} - -boost::shared_ptr -AudioTrack::audio_diskstream() const -{ - return boost::dynamic_pointer_cast(_diskstream); -} - int AudioTrack::set_state (const XMLNode& node, int version) { @@ -254,41 +222,6 @@ AudioTrack::_set_state (const XMLNode& node, int version, bool call_base) _mode = Normal; } - if ((prop = node.property ("diskstream-id")) == 0) { - - /* some old sessions use the diskstream name rather than the ID */ - - if ((prop = node.property ("diskstream")) == 0) { - fatal << _("programming error: AudioTrack given state without diskstream!") << endmsg; - /*NOTREACHED*/ - return -1; - } - - if (use_diskstream (prop->value())) { - return -1; - } - - } else { - - PBD::ID id (prop->value()); - PBD::ID zero ("0"); - - /* this wierd hack is used when creating tracks from a template. there isn't - a particularly good time to interpose between setting the first part of - the track state (notably Route::set_state() and the track mode), and the - second part (diskstream stuff). So, we have a special ID for the diskstream - that means "you should create a new diskstream here, not look for - an old one. - */ - - if (id == zero) { - use_new_diskstream (); - } else if (use_diskstream (id)) { - return -1; - } - } - - XMLNodeList nlist; XMLNodeConstIterator niter; XMLNode *child; @@ -303,10 +236,18 @@ AudioTrack::_set_state (const XMLNode& node, int version, bool call_base) } } + 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); + } + } + pending_state = const_cast (&node); if (_session.state_of_the_state() & Session::Loading) { - _session.StateReady.connect (mem_fun (*this, &AudioTrack::set_state_part_two)); + _session.StateReady.connect_same_thread (*this, boost::bind (&AudioTrack::set_state_part_two, this)); } else { set_state_part_two (); } @@ -315,7 +256,7 @@ AudioTrack::_set_state (const XMLNode& node, int version, bool call_base) } XMLNode& -AudioTrack::state(bool full_state) +AudioTrack::state (bool full_state) { XMLNode& root (Route::state(full_state)); XMLNode* freeze_node; @@ -340,25 +281,9 @@ AudioTrack::state(bool full_state) root.add_child_nocopy (*freeze_node); } - /* Alignment: act as a proxy for the diskstream */ - - XMLNode* align_node = new XMLNode (X_("Alignment")); - AlignStyle as = _diskstream->alignment_style (); - align_node->add_property (X_("style"), enum_2_string (as)); - root.add_child_nocopy (*align_node); - root.add_property (X_("mode"), enum_2_string (_mode)); - - /* we don't return diskstream state because we don't - own the diskstream exclusively. control of the diskstream - state is ceded to the Session, even if we create the - diskstream. - */ - - _diskstream->id().print (buf, sizeof (buf)); - root.add_property ("diskstream-id", buf); - root.add_child_nocopy (_rec_enable_control->get_state()); + root.add_child_nocopy (_diskstream->get_state ()); return root; } @@ -388,7 +313,7 @@ AudioTrack::set_state_part_two () _freeze_record.processor_info.clear (); if ((prop = fnode->property (X_("playlist"))) != 0) { - boost::shared_ptr pl = _session.playlists.by_name (prop->value()); + boost::shared_ptr pl = _session.playlists->by_name (prop->value()); if (pl) { _freeze_record.playlist = boost::dynamic_pointer_cast (pl); } else { @@ -420,58 +345,31 @@ AudioTrack::set_state_part_two () _freeze_record.processor_info.push_back (frii); } } - - /* Alignment: act as a proxy for the diskstream */ - - if ((fnode = find_named_node (*pending_state, X_("Alignment"))) != 0) { - - if ((prop = fnode->property (X_("style"))) != 0) { - - /* fix for older sessions from before EnumWriter */ - - string pstr; - - if (prop->value() == "capture") { - pstr = "CaptureTime"; - } else if (prop->value() == "existing") { - pstr = "ExistingMaterial"; - } else { - pstr = prop->value(); - } - - AlignStyle as = AlignStyle (string_2_enum (pstr, as)); - _diskstream->set_persistent_align_style (as); - } - } - return; } int AudioTrack::roll (nframes_t nframes, sframes_t start_frame, sframes_t end_frame, int declick, - bool can_record, bool rec_monitors_input) + bool can_record, bool rec_monitors_input, bool& need_butler) { + Glib::RWLock::ReaderLock lm (_processor_lock, Glib::TRY_LOCK); + if (!lm.locked()) { + return 0; + } + int dret; Sample* b; Sample* tmpb; nframes_t transport_frame; boost::shared_ptr diskstream = audio_diskstream(); - - { - Glib::RWLock::ReaderLock lm (_processor_lock, Glib::TRY_LOCK); - if (lm.locked()) { - // automation snapshot can also be called from the non-rt context - // and it uses the redirect list, so we take the lock out here - automation_snapshot (start_frame, false); - } - } - + + automation_snapshot (start_frame, false); if (n_outputs().n_total() == 0 && _processors.empty()) { return 0; } if (!_active) { - silence (nframes); + silence (nframes); return 0; } @@ -483,13 +381,13 @@ AudioTrack::roll (nframes_t nframes, sframes_t start_frame, sframes_t end_frame, playback distance to zero, thus causing diskstream::commit to do nothing. */ - return diskstream->process (transport_frame, 0, can_record, rec_monitors_input); + return diskstream->process (transport_frame, 0, can_record, rec_monitors_input, need_butler); } _silent = false; _amp->apply_gain_automation(false); - if ((dret = diskstream->process (transport_frame, nframes, can_record, rec_monitors_input)) != 0) { + if ((dret = diskstream->process (transport_frame, nframes, can_record, rec_monitors_input, need_butler)) != 0) { silence (nframes); return dret; } @@ -521,7 +419,7 @@ AudioTrack::roll (nframes_t nframes, sframes_t start_frame, sframes_t end_frame, /* copy the diskstream data to all output buffers */ - size_t limit = _input->n_ports().n_audio(); + size_t limit = input_streams ().n_audio(); BufferSet& bufs = _session.get_scratch_buffers (); const size_t blimit = bufs.count().n_audio(); @@ -626,9 +524,8 @@ AudioTrack::roll (nframes_t nframes, sframes_t start_frame, sframes_t end_frame, int AudioTrack::export_stuff (BufferSet& buffers, sframes_t start, nframes_t nframes, bool enable_processing) { - gain_t gain_buffer[nframes]; - float mix_buffer[nframes]; - ProcessorList::iterator i; + 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); @@ -638,7 +535,7 @@ AudioTrack::export_stuff (BufferSet& buffers, sframes_t start, nframes_t nframes assert(buffers.get_audio(0).capacity() >= nframes); - if (apl->read (buffers.get_audio(0).data(), mix_buffer, gain_buffer, start, nframes) != nframes) { + if (apl->read (buffers.get_audio(0).data(), mix_buffer.get(), gain_buffer.get(), start, nframes) != nframes) { return -1; } @@ -649,7 +546,7 @@ AudioTrack::export_stuff (BufferSet& buffers, sframes_t start, nframes_t nframes ++bi; for ( ; bi != buffers.audio_end(); ++bi, ++n) { if (n < diskstream->n_channels().n_audio()) { - if (apl->read (bi->data(), mix_buffer, gain_buffer, start, nframes, n) != nframes) { + if (apl->read (bi->data(), mix_buffer.get(), gain_buffer.get(), start, nframes, n) != nframes) { return -1; } b = bi->data(); @@ -667,11 +564,16 @@ AudioTrack::export_stuff (BufferSet& buffers, sframes_t start, nframes_t nframes /* 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 (i = _processors.begin(); i != _processors.end(); ++i) { - boost::shared_ptr processor; - if ((processor = boost::dynamic_pointer_cast(*i)) != 0) { + 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); } } @@ -694,7 +596,7 @@ AudioTrack::bounce_range (nframes_t start, nframes_t end, InterThreadInfo& itt, } void -AudioTrack::freeze (InterThreadInfo& itt) +AudioTrack::freeze_me (InterThreadInfo& itt) { vector > srcs; string new_playlist_name; @@ -715,7 +617,7 @@ AudioTrack::freeze (InterThreadInfo& itt) candidate = string_compose ("%1", _freeze_record.playlist->name(), n); - if (_session.playlists.by_name (candidate) == 0) { + if (_session.playlists->by_name (candidate) == 0) { new_playlist_name = candidate; break; } @@ -764,21 +666,22 @@ AudioTrack::freeze (InterThreadInfo& itt) new_playlist = PlaylistFactory::create (DataType::AUDIO, _session, new_playlist_name, false); - _freeze_record.gain = _amp->gain(); - _freeze_record.gain_automation_state = _amp->gain_control()->automation_state(); /* XXX need main outs automation state _freeze_record.pan_automation_state = _mainpanner->automation_state(); */ region_name = new_playlist_name; /* create a new region from all filesources, keep it private */ - boost::shared_ptr region (RegionFactory::create (srcs, 0, - srcs[0]->length(srcs[0]->timeline_position()), - region_name, 0, - (Region::Flag) (Region::WholeFile|Region::DefaultFlags), - false)); + PropertyList plist; + + plist.add (Properties::start, 0); + plist.add (Properties::length, srcs[0]->length(srcs[0]->timeline_position())); + plist.add (Properties::name, region_name); + plist.add (Properties::whole_file, true); - new_playlist->set_orig_diskstream_id (diskstream->id()); + boost::shared_ptr region (RegionFactory::create (srcs, plist, false)); + + new_playlist->set_orig_diskstream_id (_diskstream->id()); new_playlist->add_region (region, _session.current_start_frame()); new_playlist->set_frozen (true); region->set_locked (true); @@ -815,8 +718,6 @@ AudioTrack::unfreeze () } _freeze_record.playlist.reset (); - set_gain (_freeze_record.gain, this); - _amp->gain_control()->set_automation_state (_freeze_record.gain_automation_state); /* XXX need to use _main_outs _panner->set_automation_state (_freeze_record.pan_automation_state); */ } @@ -824,3 +725,10 @@ AudioTrack::unfreeze () FreezeChange (); /* EMIT SIGNAL */ } +boost::shared_ptr +AudioTrack::write_source (uint32_t n) +{ + boost::shared_ptr ds = boost::dynamic_pointer_cast (_diskstream); + assert (ds); + return ds->write_source (n); +}