X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Faudio_track.cc;h=d30899caf8605b44490007c82662f1db3002ab9f;hb=89e4d352445e9394073804f78fbd6845e6820f20;hp=171f2d7c6b39483bb5e6385bd715225d9af86980;hpb=ffdf5ada616d285fafb58f45c2e3d37b212a328a;p=ardour.git diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc index 171f2d7c6b..d30899caf8 100644 --- a/libs/ardour/audio_track.cc +++ b/libs/ardour/audio_track.cc @@ -15,26 +15,30 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id$ */ -#include + #include #include #include +#include +#include + #include #include #include -#include +#include #include #include #include #include -#include +#include +#include #include +#include #include #include - +#include #include "i18n.h" using namespace std; @@ -57,6 +61,7 @@ AudioTrack::AudioTrack (Session& sess, string name, Route::Flag flag, TrackMode } boost::shared_ptr ds (new AudioDiskstream (_session, name, dflags)); + _session.add_diskstream (ds); set_diskstream (boost::dynamic_pointer_cast (ds), this); @@ -65,13 +70,44 @@ AudioTrack::AudioTrack (Session& sess, string name, Route::Flag flag, TrackMode AudioTrack::AudioTrack (Session& sess, const XMLNode& node) : Track (sess, node) { - set_state (node); + _set_state (node, false); } AudioTrack::~AudioTrack () { } +int +AudioTrack::set_mode (TrackMode m) +{ + if (m != _mode) { + + if (_diskstream->set_destructive (m == Destructive)) { + return -1; + } + + _mode = m; + + TrackModeChanged (); /* EMIT SIGNAL */ + } + + return 0; +} + +bool +AudioTrack::can_use_mode (TrackMode m, bool& bounce_required) +{ + switch (m) { + case Normal: + bounce_required = false; + return true; + + case Destructive: + default: + return _diskstream->can_become_destructive (bounce_required); + } +} + int AudioTrack::deprecated_use_diskstream_connections () { @@ -88,10 +124,10 @@ AudioTrack::deprecated_use_diskstream_connections () diskstream->deprecated_io_node = 0; - set_input_minimum (-1); - set_input_maximum (-1); - set_output_minimum (-1); - set_output_maximum (-1); + set_input_minimum (ChanCount::ZERO); + set_input_maximum (ChanCount::INFINITE); + set_output_minimum (ChanCount::ZERO); + set_output_maximum (ChanCount::INFINITE); if ((prop = node.property ("gain")) != 0) { set_gain (atof (prop->value().c_str()), this); @@ -99,22 +135,22 @@ AudioTrack::deprecated_use_diskstream_connections () } if ((prop = node.property ("input-connection")) != 0) { - Connection* c = _session.connection_by_name (prop->value()); + boost::shared_ptr c = _session.bundle_by_name (prop->value()); if (c == 0) { - error << string_compose(_("Unknown connection \"%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.connection_by_name (_("in 1"))) == 0) { - error << _("No input connections available as a replacement") + if ((c = _session.bundle_by_name (_("in 1"))) == 0) { + error << _("No input bundles available as a replacement") << endmsg; return -1; } else { - info << string_compose (_("Connection %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; } } - use_input_connection (*c, this); + connect_input_ports_to_bundle (c, this); } else if ((prop = node.property ("inputs")) != 0) { if (set_inputs (prop->value())) { @@ -187,23 +223,24 @@ AudioTrack::audio_diskstream() const int AudioTrack::set_state (const XMLNode& node) +{ + return _set_state (node, true); +} + +int +AudioTrack::_set_state (const XMLNode& node, bool call_base) { const XMLProperty *prop; XMLNodeConstIterator iter; - if (Route::set_state (node)) { - return -1; + if (call_base) { + if (Route::_set_state (node, call_base)) { + return -1; + } } if ((prop = node.property (X_("mode"))) != 0) { - if (prop->value() == X_("normal")) { - _mode = Normal; - } else if (prop->value() == X_("destructive")) { - _mode = Destructive; - } else { - warning << string_compose ("unknown audio track mode \"%1\" seen and ignored", prop->value()) << endmsg; - _mode = Normal; - } + _mode = TrackMode (string_2_enum (prop->value(), _mode)); } else { _mode = Normal; } @@ -240,16 +277,9 @@ AudioTrack::set_state (const XMLNode& node) for (niter = nlist.begin(); niter != nlist.end(); ++niter){ child = *niter; - if (child->name() == X_("remote_control")) { - if ((prop = child->property (X_("id"))) != 0) { - int32_t x; - sscanf (prop->value().c_str(), "%d", &x); - set_remote_control_id (x); - } - - } else if (child->name() == X_("recenable")) { - _rec_enable_control.set_state (*child); - _session.add_controllable (&_rec_enable_control); + if (child->name() == X_("recenable")) { + _rec_enable_control->set_state (*child); + _session.add_controllable (_rec_enable_control); } } @@ -272,11 +302,10 @@ AudioTrack::state(bool full_state) freeze_node = new XMLNode (X_("freeze-info")); freeze_node->add_property ("playlist", _freeze_record.playlist->name()); - snprintf (buf, sizeof (buf), "%d", (int) _freeze_record.state); - freeze_node->add_property ("state", buf); + freeze_node->add_property ("state", enum_2_string (_freeze_record.state)); - for (vector::iterator i = _freeze_record.insert_info.begin(); i != _freeze_record.insert_info.end(); ++i) { - inode = new XMLNode (X_("insert")); + for (vector::iterator i = _freeze_record.processor_info.begin(); i != _freeze_record.processor_info.end(); ++i) { + inode = new XMLNode (X_("processor")); (*i)->id.print (buf, sizeof (buf)); inode->add_property (X_("id"), buf); inode->add_child_copy ((*i)->state); @@ -290,30 +319,11 @@ AudioTrack::state(bool full_state) /* Alignment: act as a proxy for the diskstream */ XMLNode* align_node = new XMLNode (X_("alignment")); - switch (_diskstream->alignment_style()) { - case ExistingMaterial: - snprintf (buf, sizeof (buf), X_("existing")); - break; - case CaptureTime: - snprintf (buf, sizeof (buf), X_("capture")); - break; - } - align_node->add_property (X_("style"), buf); + AlignStyle as = _diskstream->alignment_style (); + align_node->add_property (X_("style"), enum_2_string (as)); root.add_child_nocopy (*align_node); - XMLNode* remote_control_node = new XMLNode (X_("remote_control")); - snprintf (buf, sizeof (buf), "%d", _remote_control_id); - remote_control_node->add_property (X_("id"), buf); - root.add_child_nocopy (*remote_control_node); - - switch (_mode) { - case Normal: - root.add_property (X_("mode"), X_("normal")); - break; - case Destructive: - root.add_property (X_("mode"), X_("destructive")); - break; - } + 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 @@ -324,7 +334,7 @@ AudioTrack::state(bool full_state) _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 (_rec_enable_control->get_state()); return root; } @@ -350,31 +360,31 @@ AudioTrack::set_state_part_two () _freeze_record.have_mementos = false; _freeze_record.state = Frozen; - for (vector::iterator i = _freeze_record.insert_info.begin(); i != _freeze_record.insert_info.end(); ++i) { + for (vector::iterator i = _freeze_record.processor_info.begin(); i != _freeze_record.processor_info.end(); ++i) { delete *i; } - _freeze_record.insert_info.clear (); + _freeze_record.processor_info.clear (); if ((prop = fnode->property (X_("playlist"))) != 0) { - Playlist* pl = _session.playlist_by_name (prop->value()); + boost::shared_ptr pl = _session.playlist_by_name (prop->value()); if (pl) { - _freeze_record.playlist = dynamic_cast (pl); + _freeze_record.playlist = boost::dynamic_pointer_cast (pl); } else { - _freeze_record.playlist = 0; + _freeze_record.playlist.reset (); _freeze_record.state = NoFreeze; return; } } if ((prop = fnode->property (X_("state"))) != 0) { - _freeze_record.state = (FreezeState) atoi (prop->value().c_str()); + _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_("insert")) { + if ((*citer)->name() != X_("processor")) { continue; } @@ -382,10 +392,10 @@ AudioTrack::set_state_part_two () continue; } - FreezeRecordInsertInfo* frii = new FreezeRecordInsertInfo (*((*citer)->children().front()), - boost::shared_ptr()); + FreezeRecordProcessorInfo* frii = new FreezeRecordProcessorInfo (*((*citer)->children().front()), + boost::shared_ptr()); frii->id = prop->value (); - _freeze_record.insert_info.push_back (frii); + _freeze_record.processor_info.push_back (frii); } } @@ -394,34 +404,31 @@ AudioTrack::set_state_part_two () if ((fnode = find_named_node (*pending_state, X_("alignment"))) != 0) { if ((prop = fnode->property (X_("style"))) != 0) { - if (prop->value() == "existing") { - _diskstream->set_persistent_align_style (ExistingMaterial); - } else if (prop->value() == "capture") { - _diskstream->set_persistent_align_style (CaptureTime); + + /* 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; } -uint32_t -AudioTrack::n_process_buffers () -{ - return max ((uint32_t) _diskstream->n_channels(), redirect_max_outs); -} - -void -AudioTrack::passthru_silence (nframes_t start_frame, nframes_t end_frame, nframes_t nframes, nframes_t offset, int declick, bool meter) -{ - uint32_t nbufs = n_process_buffers (); - process_output_buffers (_session.get_silent_buffers (nbufs), nbufs, start_frame, end_frame, nframes, offset, true, declick, meter); -} - int AudioTrack::no_roll (nframes_t nframes, nframes_t start_frame, nframes_t end_frame, nframes_t offset, bool session_state_changing, bool can_record, bool rec_monitors_input) { - if (n_outputs() == 0) { + if (n_outputs().n_total() == 0) { return 0; } @@ -450,19 +457,24 @@ AudioTrack::no_roll (nframes_t nframes, nframes_t start_frame, nframes_t end_fra send_silence = true; } else { - if (Config->get_auto_input()) { - if (Config->get_monitoring_model() == SoftwareMonitoring) { + if (!Config->get_tape_machine_mode()) { + /* + ADATs work in a strange way.. + they monitor input always when stopped.and auto-input is engaged. + */ + if ((Config->get_monitoring_model() == SoftwareMonitoring) && (Config->get_auto_input () || _diskstream->record_enabled())) { send_silence = false; } else { send_silence = true; } } else { - if (_diskstream->record_enabled()) { - if (Config->get_monitoring_model() == SoftwareMonitoring) { - send_silence = false; - } else { - send_silence = true; - } + /* + Other machines switch to input on stop if the track is record enabled, + regardless of the auto input setting (auto input only changes the + monitoring state when the transport is rolling) + */ + if ((Config->get_monitoring_model() == SoftwareMonitoring) && _diskstream->record_enabled()) { + send_silence = false; } else { send_silence = true; } @@ -508,15 +520,16 @@ AudioTrack::roll (nframes_t nframes, nframes_t start_frame, nframes_t end_frame, boost::shared_ptr diskstream = audio_diskstream(); { - Glib::RWLock::ReaderLock lm (redirect_lock, Glib::TRY_LOCK); + 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); + automation_snapshot (start_frame, false); } } + - if (n_outputs() == 0 && _redirects.empty()) { + if (n_outputs().n_total() == 0 && _processors.empty()) { return 0; } @@ -527,6 +540,8 @@ AudioTrack::roll (nframes_t nframes, nframes_t start_frame, nframes_t end_frame, transport_frame = _session.transport_frame(); + prepare_inputs( nframes, offset ); + if ((nframes = check_initial_delay (nframes, offset, transport_frame)) == 0) { /* need to do this so that the diskstream sets its playback distance to zero, thus causing diskstream::commit @@ -572,16 +587,15 @@ AudioTrack::roll (nframes_t nframes, nframes_t start_frame, nframes_t end_frame, /* copy the diskstream data to all output buffers */ - vector& bufs = _session.get_passthru_buffers (); - uint32_t limit = n_process_buffers (); + const size_t limit = n_process_buffers().n_audio(); + BufferSet& bufs = _session.get_scratch_buffers (n_process_buffers()); uint32_t n; uint32_t i; - for (i = 0, n = 1; i < limit; ++i, ++n) { - memcpy (bufs[i], b, sizeof (Sample) * nframes); - if (n < diskstream->n_channels()) { + 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) { b = tmpb; @@ -592,14 +606,14 @@ AudioTrack::roll (nframes_t nframes, nframes_t start_frame, nframes_t end_frame, /* don't waste time with automation if we're recording or we've just stopped (yes it can happen) */ if (!diskstream->record_enabled() && _session.transport_rolling()) { - Glib::Mutex::Lock am (automation_lock, Glib::TRY_LOCK); + Glib::Mutex::Lock am (data().control_lock(), Glib::TRY_LOCK); - if (am.locked() && gain_automation_playback()) { - apply_gain_automation = _gain_automation_curve.rt_safe_get_vector (start_frame, end_frame, _session.gain_automation_buffer(), nframes); + if (am.locked() && gain_control()->automation_playback()) { + apply_gain_automation = gain_control()->list()->curve().rt_safe_get_vector (start_frame, end_frame, _session.gain_automation_buffer(), nframes); } } - process_output_buffers (bufs, limit, start_frame, end_frame, nframes, offset, (!_session.get_record_enabled() || !Config->get_do_not_record_plugins()), declick, (_meter_point != MeterInput)); + process_output_buffers (bufs, start_frame, end_frame, nframes, offset, (!_session.get_record_enabled() || !Config->get_do_not_record_plugins()), declick, (_meter_point != MeterInput)); } else { /* problem with the diskstream; just be quiet for a bit */ @@ -613,7 +627,7 @@ int AudioTrack::silent_roll (nframes_t nframes, nframes_t start_frame, nframes_t end_frame, nframes_t offset, bool can_record, bool rec_monitors_input) { - if (n_outputs() == 0 && _redirects.empty()) { + if (n_outputs().n_total() == 0 && _processors.empty()) { return 0; } @@ -631,57 +645,57 @@ AudioTrack::silent_roll (nframes_t nframes, nframes_t start_frame, nframes_t end } int -AudioTrack::export_stuff (vector& buffers, uint32_t nbufs, nframes_t start, nframes_t nframes) +AudioTrack::export_stuff (BufferSet& buffers, nframes_t start, nframes_t nframes) { gain_t gain_automation[nframes]; gain_t gain_buffer[nframes]; float mix_buffer[nframes]; - RedirectList::iterator i; + ProcessorList::iterator i; bool post_fader_work = false; gain_t this_gain = _gain; - vector::iterator bi; - Sample * b; boost::shared_ptr diskstream = audio_diskstream(); - Glib::RWLock::ReaderLock rlock (redirect_lock); + Glib::RWLock::ReaderLock rlock (_processor_lock); - // FIXME - AudioPlaylist* const apl = dynamic_cast(diskstream->playlist()); + boost::shared_ptr apl = boost::dynamic_pointer_cast(diskstream->playlist()); assert(apl); - if (apl->read (buffers[0], mix_buffer, gain_buffer, start, nframes) != nframes) { + assert(buffers.get_audio(0).capacity() >= nframes); + + if (apl->read (buffers.get_audio(0).data(), mix_buffer, gain_buffer, start, nframes) != nframes) { return -1; } + assert(buffers.count().n_audio() >= 1); uint32_t n=1; - bi = buffers.begin(); - b = buffers[0]; + Sample* b = buffers.get_audio(0).data(); + BufferSet::audio_iterator bi = buffers.audio_begin(); ++bi; - for (; bi != buffers.end(); ++bi, ++n) { - if (n < diskstream->n_channels()) { - if (apl->read ((*bi), mix_buffer, gain_buffer, start, nframes, n) != nframes) { + 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) { return -1; } - b = (*bi); + b = bi->data(); } else { /* duplicate last across remaining buffers */ - memcpy ((*bi), b, sizeof (Sample) * nframes); + memcpy (bi->data(), b, sizeof (Sample) * nframes); } } - /* note: only run inserts during export. other layers in the machinery - will already have checked that there are no external port inserts. + /* note: only run processors during export. other layers in the machinery + will already have checked that there are no external port processors. */ - for (i = _redirects.begin(); i != _redirects.end(); ++i) { - boost::shared_ptr insert; + for (i = _processors.begin(); i != _processors.end(); ++i) { + boost::shared_ptr processor; - if ((insert = boost::dynamic_pointer_cast(*i)) != 0) { - switch (insert->placement()) { + if ((processor = boost::dynamic_pointer_cast(*i)) != 0) { + switch (processor->placement()) { case PreFader: - insert->run (buffers, nbufs, nframes, 0); + processor->run_in_place (buffers, start, start+nframes, nframes, 0); break; case PostFader: post_fader_work = true; @@ -690,12 +704,12 @@ AudioTrack::export_stuff (vector& buffers, uint32_t nbufs, nframes_t st } } - if (_gain_automation_curve.automation_state() == Play) { + if (gain_control()->automation_state() == Play) { - _gain_automation_curve.get_vector (start, start + nframes, gain_automation, nframes); + gain_control()->list()->curve().get_vector (start, start + nframes, gain_automation, nframes); - for (bi = buffers.begin(); bi != buffers.end(); ++bi) { - Sample *b = *bi; + for (BufferSet::audio_iterator bi = buffers.audio_begin(); bi != buffers.audio_end(); ++bi) { + Sample *b = bi->data(); for (nframes_t n = 0; n < nframes; ++n) { b[n] *= gain_automation[n]; } @@ -703,8 +717,8 @@ AudioTrack::export_stuff (vector& buffers, uint32_t nbufs, nframes_t st } else { - for (bi = buffers.begin(); bi != buffers.end(); ++bi) { - Sample *b = *bi; + for (BufferSet::audio_iterator bi = buffers.audio_begin(); bi != buffers.audio_end(); ++bi) { + Sample *b = bi->data(); for (nframes_t n = 0; n < nframes; ++n) { b[n] *= this_gain; } @@ -713,15 +727,15 @@ AudioTrack::export_stuff (vector& buffers, uint32_t nbufs, nframes_t st if (post_fader_work) { - for (i = _redirects.begin(); i != _redirects.end(); ++i) { - boost::shared_ptr insert; + for (i = _processors.begin(); i != _processors.end(); ++i) { + boost::shared_ptr processor; - if ((insert = boost::dynamic_pointer_cast(*i)) != 0) { + if ((processor = boost::dynamic_pointer_cast(*i)) != 0) { switch ((*i)->placement()) { case PreFader: break; case PostFader: - insert->run (buffers, nbufs, nframes, 0); + processor->run_in_place (buffers, start, start+nframes, nframes, 0); break; } } @@ -731,32 +745,31 @@ AudioTrack::export_stuff (vector& buffers, uint32_t nbufs, nframes_t st return 0; } -void +boost::shared_ptr AudioTrack::bounce (InterThreadInfo& itt) { - vector > srcs; - _session.write_one_audio_track (*this, 0, _session.current_end_frame(), false, srcs, itt); + vector > srcs; + return _session.write_one_track (*this, _session.current_start_frame(), _session.current_end_frame(), false, srcs, itt); } - -void +boost::shared_ptr AudioTrack::bounce_range (nframes_t start, nframes_t end, InterThreadInfo& itt) { - vector > srcs; - _session.write_one_audio_track (*this, start, end, false, srcs, itt); + vector > srcs; + return _session.write_one_track (*this, start, end, false, srcs, itt); } void AudioTrack::freeze (InterThreadInfo& itt) { - vector > srcs; + vector > srcs; string new_playlist_name; - Playlist* new_playlist; + boost::shared_ptr new_playlist; string dir; string region_name; boost::shared_ptr diskstream = audio_diskstream(); - if ((_freeze_record.playlist = dynamic_cast(diskstream->playlist())) == 0) { + if ((_freeze_record.playlist = boost::dynamic_pointer_cast(diskstream->playlist())) == 0) { return; } @@ -784,52 +797,54 @@ AudioTrack::freeze (InterThreadInfo& itt) return; } - if (_session.write_one_audio_track (*this, 0, _session.current_end_frame(), true, srcs, itt)) { + boost::shared_ptr res; + + if ((res = _session.write_one_track (*this, _session.current_start_frame(), _session.current_end_frame(), true, srcs, itt)) == 0) { return; } - _freeze_record.insert_info.clear (); + _freeze_record.processor_info.clear (); _freeze_record.have_mementos = true; { - Glib::RWLock::ReaderLock lm (redirect_lock); + Glib::RWLock::ReaderLock lm (_processor_lock); - for (RedirectList::iterator r = _redirects.begin(); r != _redirects.end(); ++r) { + for (ProcessorList::iterator r = _processors.begin(); r != _processors.end(); ++r) { - boost::shared_ptr insert; + boost::shared_ptr processor; - if ((insert = boost::dynamic_pointer_cast(*r)) != 0) { + if ((processor = boost::dynamic_pointer_cast(*r)) != 0) { - FreezeRecordInsertInfo* frii = new FreezeRecordInsertInfo ((*r)->get_state(), insert); + FreezeRecordProcessorInfo* frii = new FreezeRecordProcessorInfo ((*r)->get_state(), processor); - frii->id = insert->id(); - frii->memento = (*r)->get_memento(); - - _freeze_record.insert_info.push_back (frii); + frii->id = processor->id(); + + _freeze_record.processor_info.push_back (frii); - /* now deactivate the insert */ + /* now deactivate the processor */ - insert->set_active (false, this); + processor->set_active (false); + _session.set_dirty (); } } } - new_playlist = new AudioPlaylist (_session, new_playlist_name, false); + new_playlist = PlaylistFactory::create (DataType::AUDIO, _session, new_playlist_name, false); 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(), region_name, 0, - (AudioRegion::Flag) (AudioRegion::WholeFile|AudioRegion::DefaultFlags), + (Region::Flag) (Region::WholeFile|Region::DefaultFlags), false)); new_playlist->set_orig_diskstream_id (diskstream->id()); - new_playlist->add_region (region, 0); + new_playlist->add_region (region, _session.current_start_frame()); new_playlist->set_frozen (true); region->set_locked (true); - diskstream->use_playlist (dynamic_cast(new_playlist)); + diskstream->use_playlist (boost::dynamic_pointer_cast(new_playlist)); diskstream->set_record_enabled (false); _freeze_record.state = Frozen; @@ -844,15 +859,15 @@ AudioTrack::unfreeze () if (_freeze_record.have_mementos) { - for (vector::iterator i = _freeze_record.insert_info.begin(); i != _freeze_record.insert_info.end(); ++i) { + for (vector::iterator i = _freeze_record.processor_info.begin(); i != _freeze_record.processor_info.end(); ++i) { (*i)->memento (); } } else { - Glib::RWLock::ReaderLock lm (redirect_lock); // should this be a write lock? jlc - for (RedirectList::iterator i = _redirects.begin(); i != _redirects.end(); ++i) { - for (vector::iterator ii = _freeze_record.insert_info.begin(); ii != _freeze_record.insert_info.end(); ++ii) { + Glib::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()) { (*i)->set_state (((*ii)->state)); break; @@ -861,7 +876,7 @@ AudioTrack::unfreeze () } } - _freeze_record.playlist = 0; + _freeze_record.playlist.reset (); } _freeze_record.state = UnFrozen;