X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Faudio_playlist.cc;h=6e8b35a07238e8661058cef8f5453f42ab9fa85d;hb=7720d0d109ca47c2a0a23883d5831de1ff32005d;hp=a17ab1036f24ca1f00a3ff00df887f046114243c;hpb=cc677d5c87265d6af7adc73d386a74511fee28cb;p=ardour.git diff --git a/libs/ardour/audio_playlist.cc b/libs/ardour/audio_playlist.cc index a17ab1036f..6e8b35a072 100644 --- a/libs/ardour/audio_playlist.cc +++ b/libs/ardour/audio_playlist.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2003 Paul Davis + Copyright (C) 2003 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 @@ -21,21 +21,19 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "ardour/types.h" +#include "ardour/configuration.h" +#include "ardour/audioplaylist.h" +#include "ardour/audioregion.h" +#include "ardour/crossfade.h" +#include "ardour/crossfade_compare.h" +#include "ardour/session.h" +#include "pbd/enumwriter.h" #include "i18n.h" using namespace ARDOUR; -using namespace sigc; using namespace std; using namespace PBD; @@ -46,7 +44,7 @@ AudioPlaylist::AudioPlaylist (Session& session, const XMLNode& node, bool hidden assert(!prop || DataType(prop->value()) == DataType::AUDIO); in_set_state++; - set_state (node); + set_state (node, Stateful::loading_state_version); in_set_state--; } @@ -73,9 +71,9 @@ AudioPlaylist::AudioPlaylist (boost::shared_ptr other, stri RegionList::const_iterator out_n = regions.begin(); while (out_o != other->regions.end()) { - + boost::shared_ptrar2 = boost::dynamic_pointer_cast(*out_o); - + if ((*xfades)->out() == ar2) { boost::shared_ptrin = boost::dynamic_pointer_cast(*in_n); boost::shared_ptrout = boost::dynamic_pointer_cast(*out_n); @@ -83,7 +81,7 @@ AudioPlaylist::AudioPlaylist (boost::shared_ptr other, stri add_crossfade(new_fade); break; } - + out_o++; out_n++; } @@ -104,12 +102,6 @@ AudioPlaylist::AudioPlaylist (boost::shared_ptr other, nfra AudioPlaylist::~AudioPlaylist () { - GoingAway (); /* EMIT SIGNAL */ - - /* drop connections to signals */ - - notify_callbacks (); - _crossfades.clear (); } @@ -129,9 +121,9 @@ AudioPlaylist::read (Sample *buf, Sample *mixdown_buffer, float *gain_buffer, nf nframes_t skip_frames; /* optimizing this memset() away involves a lot of conditionals - that may well cause more of a hit due to cache misses + that may well cause more of a hit due to cache misses and related stuff than just doing this here. - + it would be great if someone could measure this at some point. @@ -143,11 +135,11 @@ AudioPlaylist::read (Sample *buf, Sample *mixdown_buffer, float *gain_buffer, nf memset (buf, 0, sizeof (Sample) * cnt); - /* this function is never called from a realtime thread, so + /* this function is never called from a realtime thread, so its OK to block (for short intervals). */ - Glib::Mutex::Lock rm (region_lock); + Glib::RecMutex::Lock rm (region_lock); end = start + cnt - 1; read_frames = 0; @@ -202,7 +194,7 @@ AudioPlaylist::read (Sample *buf, Sample *mixdown_buffer, float *gain_buffer, nf ar->read_at (buf, mixdown_buffer, gain_buffer, start, cnt, chan_n, read_frames, skip_frames); _read_data_count += ar->read_data_count(); } - + for (vector >::iterator i = x.begin(); i != x.end(); ++i) { (*i)->read_at (buf, mixdown_buffer, gain_buffer, start, cnt, chan_n); @@ -225,7 +217,7 @@ AudioPlaylist::remove_dependents (boost::shared_ptr region) if (in_set_state) { return; } - + if (r == 0) { fatal << _("programming error: non-audio Region passed to remove_overlap in audio playlist") << endmsg; @@ -233,7 +225,7 @@ AudioPlaylist::remove_dependents (boost::shared_ptr region) } for (Crossfades::iterator i = _crossfades.begin(); i != _crossfades.end(); ) { - + if ((*i)->involves (r)) { i = _crossfades.erase (i); } else { @@ -260,7 +252,7 @@ AudioPlaylist::flush_notifications () } _pending_xfade_adds.clear (); - + in_flush = false; } @@ -277,7 +269,7 @@ AudioPlaylist::refresh_dependents (boost::shared_ptr r) for (Crossfades::iterator x = _crossfades.begin(); x != _crossfades.end();) { Crossfades::iterator tmp; - + tmp = x; ++tmp; @@ -286,7 +278,7 @@ AudioPlaylist::refresh_dependents (boost::shared_ptr r) if ((*x)->involves (ar)) { pair >::iterator, bool> const u = updated.insert (*x); - + if (u.second) { /* x was successfully inserted into the set, so it has not already been updated */ try { @@ -316,7 +308,7 @@ AudioPlaylist::finalize_split_region (boost::shared_ptr o, boost::shared ++tmp; boost::shared_ptr fade; - + if ((*x)->_in == orig) { if (! (*x)->covers(right->position())) { fade = boost::shared_ptr (new Crossfade (*x, left, (*x)->_out)); @@ -325,7 +317,7 @@ AudioPlaylist::finalize_split_region (boost::shared_ptr o, boost::shared fade = boost::shared_ptr (new Crossfade (*x, right, (*x)->_out)); } } - + if ((*x)->_out == orig) { if (! (*x)->covers(right->position())) { fade = boost::shared_ptr (new Crossfade (*x, (*x)->_in, right)); @@ -334,7 +326,7 @@ AudioPlaylist::finalize_split_region (boost::shared_ptr o, boost::shared fade = boost::shared_ptr (new Crossfade (*x, (*x)->_in, left)); } } - + if (fade) { _crossfades.remove (*x); add_crossfade (fade); @@ -351,7 +343,7 @@ AudioPlaylist::check_dependents (boost::shared_ptr r, bool norefresh) boost::shared_ptr top; boost::shared_ptr bottom; boost::shared_ptr xfade; - RegionList* touched_regions; + RegionList* touched_regions = 0; if (in_set_state || in_partition) { return; @@ -368,7 +360,7 @@ AudioPlaylist::check_dependents (boost::shared_ptr r, bool norefresh) } - if (!Config->get_auto_xfade()) { + if (!_session.config.get_auto_xfade()) { return; } @@ -385,7 +377,7 @@ AudioPlaylist::check_dependents (boost::shared_ptr r, bool norefresh) if (other->muted() || region->muted()) { continue; } - + if (other->layer() < region->layer()) { top = region; @@ -401,6 +393,9 @@ AudioPlaylist::check_dependents (boost::shared_ptr r, bool norefresh) OverlapType c = top->coverage (bottom->position(), bottom->last_frame()); + delete touched_regions; + touched_regions = 0; + try { switch (c) { case OverlapNone: @@ -413,56 +408,56 @@ AudioPlaylist::check_dependents (boost::shared_ptr r, bool norefresh) break; case OverlapExternal: - + /* [ -------- top ------- ] * {=========== bottom =============} */ - + /* to avoid discontinuities at the region boundaries of an internal overlap (this region is completely within another), we create two hidden crossfades at each boundary. this is not dependent on the auto-xfade option, because we require it as basic audio engineering. */ - - xfade_length = min ((nframes_t) 720, top->length()); + + xfade_length = min ((framecnt_t) 720, top->length()); if (top_region_at (top->first_frame()) == top) { - + xfade = boost::shared_ptr (new Crossfade (top, bottom, xfade_length, top->first_frame(), StartOfIn)); add_crossfade (xfade); } if (top_region_at (top->last_frame() - 1) == top) { - /* - only add a fade out if there is no region on top of the end of 'top' (which + /* + only add a fade out if there is no region on top of the end of 'top' (which would cover it). */ - + xfade = boost::shared_ptr (new Crossfade (bottom, top, xfade_length, top->last_frame() - xfade_length, EndOfOut)); add_crossfade (xfade); } break; case OverlapStart: - /* { ==== top ============ } - * [---- bottom -------------------] + /* { ==== top ============ } + * [---- bottom -------------------] */ - if (Config->get_xfade_model() == FullCrossfade) { + if (_session.config.get_xfade_model() == FullCrossfade) { touched_regions = regions_touched (top->first_frame(), bottom->last_frame()); if (touched_regions->size() <= 2) { - xfade = boost::shared_ptr (new Crossfade (region, other, Config->get_xfade_model(), Config->get_xfades_active())); + xfade = boost::shared_ptr (new Crossfade (region, other, _session.config.get_xfade_model(), _session.config.get_xfades_active())); add_crossfade (xfade); } } else { - touched_regions = regions_touched (top->first_frame(), - top->first_frame() + min ((nframes_t)Config->get_short_xfade_seconds() * _session.frame_rate(), + touched_regions = regions_touched (top->first_frame(), + top->first_frame() + min ((framecnt_t) _session.config.get_short_xfade_seconds() * _session.frame_rate(), top->length())); if (touched_regions->size() <= 2) { - xfade = boost::shared_ptr (new Crossfade (region, other, Config->get_xfade_model(), Config->get_xfades_active())); + xfade = boost::shared_ptr (new Crossfade (region, other, _session.config.get_xfade_model(), _session.config.get_xfades_active())); add_crossfade (xfade); } } @@ -470,32 +465,32 @@ AudioPlaylist::check_dependents (boost::shared_ptr r, bool norefresh) case OverlapEnd: - /* [---- top ------------------------] - * { ==== bottom ============ } - */ + /* [---- top ------------------------] + * { ==== bottom ============ } + */ - if (Config->get_xfade_model() == FullCrossfade) { + if (_session.config.get_xfade_model() == FullCrossfade) { touched_regions = regions_touched (bottom->first_frame(), top->last_frame()); if (touched_regions->size() <= 2) { - xfade = boost::shared_ptr (new Crossfade (region, other, - Config->get_xfade_model(), Config->get_xfades_active())); + xfade = boost::shared_ptr (new Crossfade (region, other, + _session.config.get_xfade_model(), _session.config.get_xfades_active())); add_crossfade (xfade); } } else { - touched_regions = regions_touched (bottom->first_frame(), - bottom->first_frame() + min ((nframes_t)Config->get_short_xfade_seconds() * _session.frame_rate(), + touched_regions = regions_touched (bottom->first_frame(), + bottom->first_frame() + min ((framecnt_t)_session.config.get_short_xfade_seconds() * _session.frame_rate(), bottom->length())); if (touched_regions->size() <= 2) { - xfade = boost::shared_ptr (new Crossfade (region, other, Config->get_xfade_model(), Config->get_xfades_active())); + xfade = boost::shared_ptr (new Crossfade (region, other, _session.config.get_xfade_model(), _session.config.get_xfades_active())); add_crossfade (xfade); } } break; default: - xfade = boost::shared_ptr (new Crossfade (region, other, - Config->get_xfade_model(), Config->get_xfades_active())); + xfade = boost::shared_ptr (new Crossfade (region, other, + _session.config.get_xfade_model(), _session.config.get_xfades_active())); add_crossfade (xfade); } } @@ -503,12 +498,14 @@ AudioPlaylist::check_dependents (boost::shared_ptr r, bool norefresh) catch (failed_constructor& err) { continue; } - + catch (Crossfade::NoCrossfadeHere& err) { continue; } - + } + + delete touched_regions; } void @@ -521,25 +518,24 @@ AudioPlaylist::add_crossfade (boost::shared_ptr xfade) break; } } - + if (ci != _crossfades.end()) { // it will just go away } else { _crossfades.push_back (xfade); - xfade->Invalidated.connect (mem_fun (*this, &AudioPlaylist::crossfade_invalidated)); - xfade->StateChanged.connect (mem_fun (*this, &AudioPlaylist::crossfade_changed)); + xfade->Invalidated.connect_same_thread (*this, boost::bind (&AudioPlaylist::crossfade_invalidated, this, _1)); + xfade->PropertyChanged.connect_same_thread (*this, boost::bind (&AudioPlaylist::crossfade_changed, this, _1)); notify_crossfade_added (xfade); } } - + void AudioPlaylist::notify_crossfade_added (boost::shared_ptr x) { if (g_atomic_int_get(&block_notifications)) { _pending_xfade_adds.insert (_pending_xfade_adds.end(), x); } else { - NewCrossfade (x); /* EMIT SIGNAL */ } } @@ -559,16 +555,17 @@ AudioPlaylist::crossfade_invalidated (boost::shared_ptr r) } int -AudioPlaylist::set_state (const XMLNode& node) +AudioPlaylist::set_state (const XMLNode& node, int version) { XMLNode *child; XMLNodeList nlist; XMLNodeConstIterator niter; in_set_state++; - freeze (); - Playlist::set_state (node); + Playlist::set_state (node, version); + + freeze (); nlist = node.children(); @@ -583,14 +580,14 @@ AudioPlaylist::set_state (const XMLNode& node) try { boost::shared_ptr xfade = boost::shared_ptr (new Crossfade (*((const Playlist *)this), *child)); _crossfades.push_back (xfade); - xfade->Invalidated.connect (mem_fun (*this, &AudioPlaylist::crossfade_invalidated)); - xfade->StateChanged.connect (mem_fun (*this, &AudioPlaylist::crossfade_changed)); + xfade->Invalidated.connect_same_thread (*this, boost::bind (&AudioPlaylist::crossfade_invalidated, this, _1)); + xfade->PropertyChanged.connect_same_thread (*this, boost::bind (&AudioPlaylist::crossfade_changed, this, _1)); NewCrossfade(xfade); } - + catch (failed_constructor& err) { // cout << string_compose (_("could not create crossfade object in playlist %1"), - // _name) + // _name) // << endl; continue; } @@ -619,7 +616,7 @@ AudioPlaylist::state (bool full_state) node.add_child_nocopy ((*i)->get_state()); } } - + return node; } @@ -636,9 +633,9 @@ AudioPlaylist::dump () const for (RegionList::const_iterator i = regions.begin(); i != regions.end(); ++i) { r = *i; - cerr << " " << r->name() << " @ " << r << " [" - << r->start() << "+" << r->length() - << "] at " + cerr << " " << r->name() << " @ " << r << " [" + << r->start() << "+" << r->length() + << "] at " << r->position() << " on layer " << r->layer () @@ -647,13 +644,13 @@ AudioPlaylist::dump () const for (Crossfades::const_iterator i = _crossfades.begin(); i != _crossfades.end(); ++i) { x = *i; - cerr << " xfade [" + cerr << " xfade [" << x->out()->name() << ',' << x->in()->name() << " @ " << x->position() - << " length = " + << " length = " << x->length () << " active ? " << (x->active() ? "yes" : "no") @@ -680,15 +677,15 @@ AudioPlaylist::destroy_region (boost::shared_ptr region) RegionLock rlock (this); for (RegionList::iterator i = regions.begin(); i != regions.end(); ) { - + RegionList::iterator tmp = i; ++tmp; - + if ((*i) == region) { regions.erase (i); changed = true; } - + i = tmp; } @@ -696,12 +693,12 @@ AudioPlaylist::destroy_region (boost::shared_ptr region) set >::iterator xtmp = x; ++xtmp; - + if ((*x) == region) { all_regions.erase (x); changed = true; } - + x = xtmp; } @@ -716,7 +713,7 @@ AudioPlaylist::destroy_region (boost::shared_ptr region) unique_xfades.insert (*c); _crossfades.erase (c); } - + c = ctmp; } @@ -729,7 +726,7 @@ AudioPlaylist::destroy_region (boost::shared_ptr region) } void -AudioPlaylist::crossfade_changed (Change ignored) +AudioPlaylist::crossfade_changed (const PropertyChange&) { if (in_flush || in_set_state) { return; @@ -741,32 +738,35 @@ AudioPlaylist::crossfade_changed (Change ignored) that occured. */ - notify_modified (); + notify_contents_changed (); } bool -AudioPlaylist::region_changed (Change what_changed, boost::shared_ptr region) +AudioPlaylist::region_changed (const PropertyChange& what_changed, boost::shared_ptr region) { if (in_flush || in_set_state) { return false; } - Change our_interests = Change (AudioRegion::FadeInChanged| - AudioRegion::FadeOutChanged| - AudioRegion::FadeInActiveChanged| - AudioRegion::FadeOutActiveChanged| - AudioRegion::EnvelopeActiveChanged| - AudioRegion::ScaleAmplitudeChanged| - AudioRegion::EnvelopeChanged); + PropertyChange our_interests; + + our_interests.add (Properties::fade_in_active); + our_interests.add (Properties::fade_out_active); + our_interests.add (Properties::scale_amplitude); + our_interests.add (Properties::envelope_active); + our_interests.add (Properties::envelope); + our_interests.add (Properties::fade_in); + our_interests.add (Properties::fade_out); + bool parent_wants_notify; parent_wants_notify = Playlist::region_changed (what_changed, region); - if ((parent_wants_notify || (what_changed & our_interests))) { - notify_modified (); + if (parent_wants_notify || (what_changed.contains (our_interests))) { + notify_contents_changed (); } - return true; + return true; } void @@ -782,7 +782,15 @@ AudioPlaylist::crossfades_at (nframes_t frame, Crossfades& clist) if (frame >= start && frame <= end) { clist.push_back (*i); - } + } } } +void +AudioPlaylist::foreach_crossfade (boost::function)> s) +{ + RegionLock rl (this, false); + for (Crossfades::iterator i = _crossfades.begin(); i != _crossfades.end(); ++i) { + s (*i); + } +}