X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Faudio_track.cc;h=aa7768a22872a839433f09ef4acd7db2310885a7;hb=a473d630eb165272992e90f8d854b1d66ec0be63;hp=3c8fe8c42c3308ffbfcbc3d513458fa8a0760362;hpb=b65f8073ba306ac2d85133875746767e7c6b0eb6;p=ardour.git diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc index 3c8fe8c42c..aa7768a228 100644 --- a/libs/ardour/audio_track.cc +++ b/libs/ardour/audio_track.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2002 Paul Davis + Copyright (C) 2002 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,12 +17,11 @@ */ -#include -#include -#include +#include #include "pbd/error.h" #include "pbd/enumwriter.h" +#include "pbd/boost_debug.h" #include "evoral/Curve.hpp" @@ -44,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; @@ -53,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) - : Track (sess, node) -{ - _set_state (node, false); } AudioTrack::~AudioTrack () @@ -82,13 +77,44 @@ AudioTrack::use_new_diskstream () } else if (_mode == NonLayered){ dflags = AudioDiskstream::Flag(dflags | AudioDiskstream::NonLayered); } - - boost::shared_ptr ds (new AudioDiskstream (_session, name(), dflags)); - - _session.add_diskstream (ds); + 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); +} + +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); - set_diskstream (boost::dynamic_pointer_cast (ds), this); + DiskstreamChanged (); /* EMIT SIGNAL */ +} + +boost::shared_ptr +AudioTrack::audio_diskstream() const +{ + return boost::dynamic_pointer_cast(_diskstream); } int @@ -99,10 +125,10 @@ AudioTrack::set_mode (TrackMode m) if (_diskstream->set_destructive (m == Destructive)) { return -1; } - + _diskstream->set_non_layered (m == NonLayered); _mode = m; - + TrackModeChanged (); /* EMIT SIGNAL */ } @@ -117,7 +143,7 @@ AudioTrack::can_use_mode (TrackMode m, bool& bounce_required) case Normal: bounce_required = false; return true; - + case Destructive: default: return _diskstream->can_become_destructive (bounce_required); @@ -146,16 +172,16 @@ AudioTrack::deprecated_use_diskstream_connections () if ((prop = node.property ("input-connection")) != 0) { boost::shared_ptr c = _session.bundle_by_name (prop->value()); - + if (c == 0) { - error << string_compose(_("Unknown bundle \"%1\" listed for input of %2"), prop->value(), _name) << endmsg; - + error << string_compose(_("Unknown bundle \"%1\" listed for input of %2"), prop->value(), _name) << endmsg; + if ((c = _session.bundle_by_name (_("in 1"))) == 0) { - error << _("No input bundles available as a replacement") + error << _("No input bundles available as a replacement") << endmsg; return -1; } else { - info << string_compose (_("Bundle %1 was not available - \"in 1\" used instead"), prop->value()) + info << string_compose (_("Bundle %1 was not available - \"in 1\" used instead"), prop->value()) << endmsg; } } @@ -164,88 +190,29 @@ AudioTrack::deprecated_use_diskstream_connections () } else if ((prop = node.property ("inputs")) != 0) { if (_input->set_ports (prop->value())) { - error << string_compose(_("improper input channel list in XML node (%1)"), prop->value()) << endmsg; + error << string_compose(_("improper input channel list in XML node (%1)"), prop->value()) << endmsg; return -1; } } - - 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); - - ic_connection.disconnect(); - ic_connection = _input->changed.connect (mem_fun (*_diskstream, &Diskstream::handle_input_change)); - - 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) +AudioTrack::set_state (const XMLNode& node, int version) { - return _set_state (node, true); + return _set_state (node, version, true); } int -AudioTrack::_set_state (const XMLNode& node, bool call_base) +AudioTrack::_set_state (const XMLNode& node, int version, bool call_base) { const XMLProperty *prop; XMLNodeConstIterator iter; + XMLNode *child; if (call_base) { - if (Route::_set_state (node, call_base)) { + if (Route::_set_state (node, version, call_base)) { return -1; } } @@ -256,59 +223,36 @@ AudioTrack::_set_state (const XMLNode& node, 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; + 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; - XMLNode *child; nlist = node.children(); for (niter = nlist.begin(); niter != nlist.end(); ++niter){ child = *niter; - if (child->name() == X_("recenable")) { - _rec_enable_control->set_state (*child); - _session.add_controllable (_rec_enable_control); + 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) { - _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 (); } @@ -316,8 +260,8 @@ AudioTrack::_set_state (const XMLNode& node, bool call_base) return 0; } -XMLNode& -AudioTrack::state(bool full_state) +XMLNode& +AudioTrack::state (bool full_state) { XMLNode& root (Route::state(full_state)); XMLNode* freeze_node; @@ -335,32 +279,16 @@ AudioTrack::state(bool full_state) (*i)->id.print (buf, sizeof (buf)); inode->add_property (X_("id"), buf); inode->add_child_copy ((*i)->state); - + freeze_node->add_child_nocopy (*inode); } 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; } @@ -383,14 +311,14 @@ AudioTrack::set_state_part_two () if ((fnode = find_named_node (*pending_state, X_("freeze-info"))) != 0) { _freeze_record.state = Frozen; - + for (vector::iterator i = _freeze_record.processor_info.begin(); i != _freeze_record.processor_info.end(); ++i) { delete *i; } _freeze_record.processor_info.clear (); - + if ((prop = fnode->property (X_("playlist"))) != 0) { - boost::shared_ptr pl = _session.playlist_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 { @@ -399,75 +327,48 @@ AudioTrack::set_state_part_two () return; } } - + if ((prop = fnode->property (X_("state"))) != 0) { _freeze_record.state = FreezeState (string_2_enum (prop->value(), _freeze_record.state)); } - + XMLNodeConstIterator citer; XMLNodeList clist = fnode->children(); - + for (citer = clist.begin(); citer != clist.end(); ++citer) { if ((*citer)->name() != X_("processor")) { continue; } - + if ((prop = (*citer)->property (X_("id"))) == 0) { continue; } - + FreezeRecordProcessorInfo* frii = new FreezeRecordProcessorInfo (*((*citer)->children().front()), boost::shared_ptr()); frii->id = prop->value (); _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) +AudioTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame, int declick, + 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; + framepos_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; } @@ -485,19 +386,19 @@ 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; } /* special condition applies */ - + if (_meter_point == MeterInput) { _input->process_input (_meter, start_frame, end_frame, nframes); } @@ -520,10 +421,10 @@ AudioTrack::roll (nframes_t nframes, sframes_t start_frame, sframes_t end_frame, while in the process() tree. */ - + /* copy the diskstream data to all output buffers */ - size_t limit = n_process_buffers().n_audio(); + size_t limit = input_streams ().n_audio(); BufferSet& bufs = _session.get_scratch_buffers (); const size_t blimit = bufs.count().n_audio(); @@ -536,22 +437,22 @@ AudioTrack::roll (nframes_t nframes, sframes_t start_frame, sframes_t end_frame, but loaded with an 8 channel file. there are only 2 passthrough buffers, but n_process_buffers() will return 8. - + arbitrary decision: map all channels in the diskstream to the outputs available. */ float scaling = limit/blimit; - + for (i = 0, n = 1; i < blimit; ++i, ++n) { - /* first time through just copy a channel into + /* first time through just copy a channel into the output buffer. */ - + Sample* bb = bufs.get_audio (i).data(); - for (nframes_t xx = 0; xx < nframes; ++xx) { + for (pframes_t xx = 0; xx < nframes; ++xx) { bb[xx] = b[xx] * scaling; } @@ -564,27 +465,27 @@ AudioTrack::roll (nframes_t nframes, sframes_t start_frame, sframes_t end_frame, } for (;i < limit; ++i, ++n) { - + /* for all remaining channels, sum with existing - data in the output buffers + data in the output buffers */ - + bufs.get_audio (i%blimit).accumulate_with_gain_from (b, nframes, 0, scaling); - + if (n < diskstream->n_channels().n_audio()) { tmpb = diskstream->playback_buffer(n); if (tmpb!=0) { b = tmpb; } } - + } limit = blimit; } else { - for (i = 0, n = 1; i < blimit; ++i, ++n) { - memcpy (bufs.get_audio (i).data(), b, sizeof (Sample) * nframes); + for (i = 0, n = 1; i < limit; ++i, ++n) { + memcpy (bufs.get_audio (i).data(), b, sizeof (Sample) * nframes); if (n < diskstream->n_channels().n_audio()) { tmpb = diskstream->playback_buffer(n); if (tmpb!=0) { @@ -592,24 +493,23 @@ AudioTrack::roll (nframes_t nframes, sframes_t start_frame, sframes_t end_frame, } } } - } - /* don't waste time with automation if we're recording or we've just stopped (yes it can happen) */ + /* try to leave any MIDI buffers alone */ - if (!diskstream->record_enabled() && _session.transport_rolling()) { -#ifdef XXX_MOVE_THIS_TO_AMP - Glib::Mutex::Lock am (data().control_lock(), Glib::TRY_LOCK); - - if (am.locked() && gain_control()->automation_playback()) { - _amp->apply_gain_automation( - gain_control()->list()->curve().rt_safe_get_vector ( - start_frame, end_frame, _session.gain_automation_buffer(), nframes)); - } -#endif + ChanCount chn; + chn.set_audio (limit); + chn.set_midi (_input->n_ports().n_midi()); + bufs.set_count (chn); } - process_output_buffers (bufs, start_frame, end_frame, nframes, (!_session.get_record_enabled() || !Config->get_do_not_record_plugins()), declick); - + /* final argument: don't waste time with automation if we're recording or we've just stopped (yes it can happen) */ + + 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())); + } else { /* problem with the diskstream; just be quiet for a bit */ silence (nframes); @@ -619,39 +519,37 @@ 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) +AudioTrack::export_stuff (BufferSet& buffers, framepos_t start, framecnt_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); boost::shared_ptr apl = boost::dynamic_pointer_cast(diskstream->playlist()); - assert(apl); - assert(buffers.get_audio(0).capacity() >= nframes); + assert(apl); + assert(buffers.count().n_audio() >= 1); + assert ((framecnt_t) 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; } - assert(buffers.count().n_audio() >= 1); uint32_t n=1; Sample* b = buffers.get_audio(0).data(); BufferSet::audio_iterator bi = buffers.audio_begin(); ++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(); - } - else { + } else { /* duplicate last across remaining buffers */ - memcpy (bi->data(), b, sizeof (Sample) * nframes); + memcpy (bi->data(), b, sizeof (Sample) * nframes); } } @@ -662,15 +560,20 @@ 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) { - processor->run (buffers, start, start+nframes, nframes); + + 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); } } - + return 0; } @@ -682,14 +585,14 @@ AudioTrack::bounce (InterThreadInfo& itt) } boost::shared_ptr -AudioTrack::bounce_range (nframes_t start, nframes_t end, InterThreadInfo& itt, bool enable_processing) +AudioTrack::bounce_range (framepos_t start, framepos_t end, InterThreadInfo& itt, bool enable_processing) { vector > srcs; return _session.write_one_track (*this, start, end, false, srcs, itt, enable_processing); } void -AudioTrack::freeze (InterThreadInfo& itt) +AudioTrack::freeze_me (InterThreadInfo& itt) { vector > srcs; string new_playlist_name; @@ -697,7 +600,7 @@ AudioTrack::freeze (InterThreadInfo& itt) string dir; string region_name; boost::shared_ptr diskstream = audio_diskstream(); - + if ((_freeze_record.playlist = boost::dynamic_pointer_cast(diskstream->playlist())) == 0) { return; } @@ -705,23 +608,23 @@ AudioTrack::freeze (InterThreadInfo& itt) uint32_t n = 1; while (n < (UINT_MAX-1)) { - + string candidate; - + candidate = string_compose ("%1", _freeze_record.playlist->name(), n); - if (_session.playlist_by_name (candidate) == 0) { + if (_session.playlists->by_name (candidate) == 0) { new_playlist_name = candidate; break; } ++n; - } + } if (n == (UINT_MAX-1)) { error << string_compose (X_("There are too many frozen versions of playlist \"%1\"" - " to create another one"), _freeze_record.playlist->name()) + " to create another one"), _freeze_record.playlist->name()) << endmsg; return; } @@ -736,21 +639,21 @@ AudioTrack::freeze (InterThreadInfo& itt) { Glib::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) { - + FreezeRecordProcessorInfo* frii = new FreezeRecordProcessorInfo ((*r)->get_state(), processor); - + frii->id = processor->id(); _freeze_record.processor_info.push_back (frii); - + /* now deactivate the processor */ - + processor->deactivate (); _session.set_dirty (); } @@ -759,21 +662,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; - new_playlist->set_orig_diskstream_id (diskstream->id()); + 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); + + 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); @@ -782,7 +686,7 @@ AudioTrack::freeze (InterThreadInfo& itt) diskstream->set_record_enabled (false); /* reset stuff that has already been accounted for in the freeze process */ - + set_gain (1.0, this); _amp->gain_control()->set_automation_state (Off); /* XXX need to use _main_outs _panner->set_automation_state (Off); */ @@ -802,16 +706,14 @@ AudioTrack::unfreeze () 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()) { - (*i)->set_state (((*ii)->state)); + (*i)->set_state (((*ii)->state), Stateful::current_state_version); break; } } } } - + _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); */ } @@ -819,3 +721,16 @@ 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); +} + +bool +AudioTrack::bounceable () const +{ + return n_inputs().n_audio() >= n_outputs().n_audio(); +}