X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Faudio_track.cc;h=bc2f0d9feba60c79aa43a6a34d873f278581d482;hb=118816dfe393cc671d29352c3ed4741b4f261088;hp=b0ac7a4bd78dffaa234015b1f07f745b37156a4c;hpb=532f6aad4ac79ca15d69deccd18fca90e444c437;p=ardour.git diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc index b0ac7a4bd7..bc2f0d9feb 100644 --- a/libs/ardour/audio_track.cc +++ b/libs/ardour/audio_track.cc @@ -15,7 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id$ */ #include @@ -28,12 +27,13 @@ #include #include #include -#include +#include #include #include #include #include -#include +#include +#include #include #include #include @@ -61,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); @@ -134,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())) { @@ -276,16 +277,9 @@ AudioTrack::_set_state (const XMLNode& node, bool call_base) 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); } } @@ -310,8 +304,8 @@ AudioTrack::state(bool full_state) freeze_node->add_property ("playlist", _freeze_record.playlist->name()); 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); @@ -329,11 +323,6 @@ AudioTrack::state(bool full_state) 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); - root.add_property (X_("mode"), enum_2_string (_mode)); /* we don't return diskstream state because we don't @@ -345,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; } @@ -371,10 +360,10 @@ 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) { boost::shared_ptr pl = _session.playlist_by_name (prop->value()); @@ -395,7 +384,7 @@ AudioTrack::set_state_part_two () XMLNodeList clist = fnode->children(); for (citer = clist.begin(); citer != clist.end(); ++citer) { - if ((*citer)->name() != X_("insert")) { + if ((*citer)->name() != X_("processor")) { continue; } @@ -403,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); } } @@ -439,7 +428,7 @@ 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().get_total() == 0) { + if (n_outputs().n_total() == 0) { return 0; } @@ -526,7 +515,7 @@ 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 @@ -535,7 +524,7 @@ AudioTrack::roll (nframes_t nframes, nframes_t start_frame, nframes_t end_frame, } - if (n_outputs().get_total() == 0 && _redirects.empty()) { + if (n_outputs().n_total() == 0 && _processors.empty()) { return 0; } @@ -591,15 +580,15 @@ AudioTrack::roll (nframes_t nframes, nframes_t start_frame, nframes_t end_frame, /* copy the diskstream data to all output buffers */ - const size_t limit = n_process_buffers().get(DataType::AUDIO); + 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.get_audio(i).data(nframes), b, sizeof (Sample) * nframes); - if (n < diskstream->n_channels().get(DataType::AUDIO)) { + 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; @@ -610,10 +599,10 @@ 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 (_automation_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()->list()->automation_playback()) { + apply_gain_automation = gain_control()->list()->curve().rt_safe_get_vector (start_frame, end_frame, _session.gain_automation_buffer(), nframes); } } @@ -631,7 +620,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().get_total() == 0 && _redirects.empty()) { + if (n_outputs().n_total() == 0 && _processors.empty()) { return 0; } @@ -654,51 +643,52 @@ 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; boost::shared_ptr diskstream = audio_diskstream(); - Glib::RWLock::ReaderLock rlock (redirect_lock); + Glib::RWLock::ReaderLock rlock (_processor_lock); boost::shared_ptr apl = boost::dynamic_pointer_cast(diskstream->playlist()); assert(apl); - if (apl->read (buffers.get_audio(nframes).data(nframes), - 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().get(DataType::AUDIO) >= 1); + assert(buffers.count().n_audio() >= 1); uint32_t n=1; - Sample* b = buffers.get_audio(0).data(nframes); + 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().get(DataType::AUDIO)) { - if (apl->read (bi->data(nframes), mix_buffer, gain_buffer, start, nframes, n) != nframes) { + if (n < diskstream->n_channels().n_audio()) { + if (apl->read (bi->data(), mix_buffer, gain_buffer, start, nframes, n) != nframes) { return -1; } - b = bi->data(nframes); + b = bi->data(); } else { /* duplicate last across remaining buffers */ - memcpy (bi->data(nframes), 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, start, start+nframes, nframes, 0); + processor->run_in_place (buffers, start, start+nframes, nframes, 0); break; case PostFader: post_fader_work = true; @@ -707,12 +697,12 @@ AudioTrack::export_stuff (BufferSet& buffers, nframes_t start, nframes_t nframes } } - if (_gain_automation_curve.automation_state() == Play) { + if (gain_control()->list()->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 (BufferSet::audio_iterator bi = buffers.audio_begin(); bi != buffers.audio_end(); ++bi) { - Sample *b = bi->data(nframes); + Sample *b = bi->data(); for (nframes_t n = 0; n < nframes; ++n) { b[n] *= gain_automation[n]; } @@ -721,7 +711,7 @@ AudioTrack::export_stuff (BufferSet& buffers, nframes_t start, nframes_t nframes } else { for (BufferSet::audio_iterator bi = buffers.audio_begin(); bi != buffers.audio_end(); ++bi) { - Sample *b = bi->data(nframes); + Sample *b = bi->data(); for (nframes_t n = 0; n < nframes; ++n) { b[n] *= this_gain; } @@ -730,15 +720,15 @@ AudioTrack::export_stuff (BufferSet& buffers, nframes_t start, nframes_t nframes 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, start, start+nframes, nframes, 0); + processor->run_in_place (buffers, start, start+nframes, nframes, 0); break; } } @@ -753,6 +743,7 @@ AudioTrack::bounce (InterThreadInfo& itt) { vector > srcs; _session.write_one_audio_track (*this, 0, _session.current_end_frame(), false, srcs, itt); + itt.done = true; } @@ -761,6 +752,7 @@ AudioTrack::bounce_range (nframes_t start, nframes_t end, InterThreadInfo& itt) { vector > srcs; _session.write_one_audio_track (*this, start, end, false, srcs, itt); + itt.done = true; } void @@ -805,32 +797,33 @@ AudioTrack::freeze (InterThreadInfo& itt) 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->id = processor->id(); - _freeze_record.insert_info.push_back (frii); + _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 = PlaylistFactory::create (_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 */ @@ -860,15 +853,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;