X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fplaylist.cc;h=b93ac553260e51cc32528d052b8241a4f0c2070d;hb=97c637e39914a8b68f1d0c83d3f8c37d81fc43c2;hp=58614157735bf7c3f20dbe61fd03b0c1c6201132;hpb=82d1d7ef0bd499868b49d49847a2a320cc088f85;p=ardour.git diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc index 5861415773..b93ac55326 100644 --- a/libs/ardour/playlist.cc +++ b/libs/ardour/playlist.cc @@ -22,25 +22,27 @@ #include #include -#include - -#include "pbd/convert.h" +#include "pbd/types_convert.h" #include "pbd/stateful_diff_command.h" +#include "pbd/strsplit.h" #include "pbd/xml++.h" #include "ardour/debug.h" +#include "ardour/midi_region.h" #include "ardour/playlist.h" -#include "ardour/session.h" +#include "ardour/playlist_factory.h" +#include "ardour/playlist_source.h" #include "ardour/region.h" #include "ardour/region_factory.h" #include "ardour/region_sorters.h" -#include "ardour/playlist_factory.h" -#include "ardour/playlist_source.h" -#include "ardour/transient_detector.h" +#include "ardour/session.h" #include "ardour/session_playlists.h" #include "ardour/source_factory.h" +#include "ardour/tempo.h" +#include "ardour/transient_detector.h" +#include "ardour/types_convert.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; @@ -104,16 +106,16 @@ RegionListProperty::get_content_as_xml (boost::shared_ptr region, XMLNod code, so we can just store ID here. */ - node.add_property ("id", region->id().to_s ()); + node.set_property ("id", region->id()); } boost::shared_ptr RegionListProperty::get_content_from_xml (XMLNode const & node) const { - XMLProperty const * prop = node.property ("id"); - assert (prop); - - PBD::ID id (prop->value ()); + PBD::ID id; + if (!node.get_property ("id", id)) { + assert (false); + } boost::shared_ptr ret = _playlist.region_by_id (id); @@ -141,7 +143,7 @@ Playlist::Playlist (Session& sess, const XMLNode& node, DataType type, bool hide , _type(type) { #ifndef NDEBUG - const XMLProperty* prop = node.property("type"); + XMLProperty const * prop = node.property("type"); assert(!prop || DataType(prop->value()) == _type); #endif @@ -157,6 +159,7 @@ Playlist::Playlist (boost::shared_ptr other, string namestr, boo , regions (*this) , _type(other->_type) , _orig_track_id (other->_orig_track_id) + , _shared_with_ids (other->_shared_with_ids) { init (hide); @@ -184,15 +187,16 @@ Playlist::Playlist (boost::shared_ptr other, string namestr, boo _frozen = other->_frozen; } -Playlist::Playlist (boost::shared_ptr other, framepos_t start, framecnt_t cnt, string str, bool hide) +Playlist::Playlist (boost::shared_ptr other, samplepos_t start, samplecnt_t cnt, string str, bool hide) : SessionObject(other->_session, str) , regions (*this) , _type(other->_type) , _orig_track_id (other->_orig_track_id) + , _shared_with_ids (other->_shared_with_ids) { RegionReadLock rlock2 (const_cast (other.get())); - framepos_t end = start + cnt - 1; + samplepos_t end = start + cnt - 1; init (hide); @@ -202,9 +206,9 @@ Playlist::Playlist (boost::shared_ptr other, framepos_t start, f boost::shared_ptr region; boost::shared_ptr new_region; - frameoffset_t offset = 0; - framepos_t position = 0; - framecnt_t len = 0; + sampleoffset_t offset = 0; + samplepos_t position = 0; + samplecnt_t len = 0; string new_name; Evoral::OverlapType overlap; @@ -289,7 +293,7 @@ Playlist::copy_regions (RegionList& newlist) const RegionReadLock rlock (const_cast (this)); for (RegionList::const_iterator i = regions.begin(); i != regions.end(); ++i) { - newlist.push_back (RegionFactory::create (*i, true)); + newlist.push_back (RegionFactory::create (*i, true, true)); } } @@ -358,11 +362,7 @@ Playlist::_set_sort_id () } else { string t = _name.val().substr(dot_position + 1); - try { - _sort_id = boost::lexical_cast(t); - } - - catch (boost::bad_lexical_cast e) { + if (!string_to_uint32 (t, _sort_id)) { _sort_id = 0; } } @@ -482,7 +482,7 @@ Playlist::notify_region_removed (boost::shared_ptr r) void Playlist::notify_region_moved (boost::shared_ptr r) { - Evoral::RangeMove const move (r->last_position (), r->length (), r->position ()); + Evoral::RangeMove const move (r->last_position (), r->length (), r->position ()); if (holding_state ()) { @@ -490,7 +490,7 @@ Playlist::notify_region_moved (boost::shared_ptr r) } else { - list< Evoral::RangeMove > m; + list< Evoral::RangeMove > m; m.push_back (move); RangesMoved (m, false); } @@ -505,7 +505,7 @@ Playlist::notify_region_start_trimmed (boost::shared_ptr r) return; } - Evoral::Range const extra (r->position(), r->last_position()); + Evoral::Range const extra (r->position(), r->last_position()); if (holding_state ()) { @@ -513,7 +513,7 @@ Playlist::notify_region_start_trimmed (boost::shared_ptr r) } else { - list > r; + list > r; r.push_back (extra); RegionsExtended (r); @@ -527,7 +527,7 @@ Playlist::notify_region_end_trimmed (boost::shared_ptr r) /* trimmed shorter */ } - Evoral::Range const extra (r->position() + r->last_length(), r->position() + r->length()); + Evoral::Range const extra (r->position() + r->last_length(), r->position() + r->length()); if (holding_state ()) { @@ -535,7 +535,7 @@ Playlist::notify_region_end_trimmed (boost::shared_ptr r) } else { - list > r; + list > r; r.push_back (extra); RegionsExtended (r); } @@ -591,7 +591,7 @@ Playlist::flush_notifications (bool from_undo) // RegionSortByLayer cmp; // pending_bounds.sort (cmp); - list > crossfade_ranges; + list > crossfade_ranges; for (RegionList::iterator r = pending_bounds.begin(); r != pending_bounds.end(); ++r) { crossfade_ranges.push_back ((*r)->last_range ()); @@ -648,645 +648,682 @@ Playlist::flush_notifications (bool from_undo) in_flush = false; } - void - Playlist::clear_pending () - { - pending_adds.clear (); - pending_removes.clear (); - pending_bounds.clear (); - pending_range_moves.clear (); - pending_region_extensions.clear (); - pending_contents_change = false; - } +void +Playlist::clear_pending () +{ + pending_adds.clear (); + pending_removes.clear (); + pending_bounds.clear (); + pending_range_moves.clear (); + pending_region_extensions.clear (); + pending_contents_change = false; + pending_layering = false; +} - /************************************************************* +/************************************************************* PLAYLIST OPERATIONS - *************************************************************/ +*************************************************************/ /** Note: this calls set_layer (..., DBL_MAX) so it will reset the layering index of region */ - void - Playlist::add_region (boost::shared_ptr region, framepos_t position, float times, bool auto_partition) - { - RegionWriteLock rlock (this); - times = fabs (times); - - int itimes = (int) floor (times); - - framepos_t pos = position; +void +Playlist::add_region (boost::shared_ptr region, samplepos_t position, float times, bool auto_partition, int32_t sub_num, double quarter_note, bool for_music) +{ + RegionWriteLock rlock (this); + times = fabs (times); - if (times == 1 && auto_partition){ - partition(pos - 1, (pos + region->length()), true); - } + int itimes = (int) floor (times); - if (itimes >= 1) { - add_region_internal (region, pos); - set_layer (region, DBL_MAX); - pos += region->length(); - --itimes; - } + samplepos_t pos = position; + if (times == 1 && auto_partition){ + RegionList thawlist; + partition_internal (pos - 1, (pos + region->length()), true, thawlist); + for (RegionList::iterator i = thawlist.begin(); i != thawlist.end(); ++i) { + (*i)->resume_property_changes (); + _session.add_command (new StatefulDiffCommand (*i)); + } + } - /* note that itimes can be zero if we being asked to just - insert a single fraction of the region. - */ + if (itimes >= 1) { + add_region_internal (region, pos, sub_num, quarter_note, for_music); + set_layer (region, DBL_MAX); + pos += region->length(); + --itimes; + } - for (int i = 0; i < itimes; ++i) { - boost::shared_ptr copy = RegionFactory::create (region, true); - add_region_internal (copy, pos); - set_layer (copy, DBL_MAX); - pos += region->length(); - } + /* note that itimes can be zero if we being asked to just + insert a single fraction of the region. + */ - framecnt_t length = 0; + for (int i = 0; i < itimes; ++i) { + boost::shared_ptr copy = RegionFactory::create (region, true); + add_region_internal (copy, pos, sub_num); + set_layer (copy, DBL_MAX); + pos += region->length(); + } - if (floor (times) != times) { - length = (framecnt_t) floor (region->length() * (times - floor (times))); - string name; - RegionFactory::region_name (name, region->name(), false); + samplecnt_t length = 0; - { - PropertyList plist; + if (floor (times) != times) { + length = (samplecnt_t) floor (region->length() * (times - floor (times))); + string name; + RegionFactory::region_name (name, region->name(), false); - plist.add (Properties::start, region->start()); - plist.add (Properties::length, length); - plist.add (Properties::name, name); - plist.add (Properties::layer, region->layer()); + { + PropertyList plist; - boost::shared_ptr sub = RegionFactory::create (region, plist); - add_region_internal (sub, pos); - set_layer (sub, DBL_MAX); - } - } + plist.add (Properties::start, region->start()); + plist.add (Properties::length, length); + plist.add (Properties::name, name); + plist.add (Properties::layer, region->layer()); - possibly_splice_unlocked (position, (pos + length) - position, region); - } + boost::shared_ptr sub = RegionFactory::create (region, plist); + add_region_internal (sub, pos, sub_num); + set_layer (sub, DBL_MAX); + } + } - void - Playlist::set_region_ownership () - { - RegionWriteLock rl (this); - RegionList::iterator i; - boost::weak_ptr pl (shared_from_this()); + possibly_splice_unlocked (position, (pos + length) - position, region); +} - for (i = regions.begin(); i != regions.end(); ++i) { - (*i)->set_playlist (pl); - } - } +void +Playlist::set_region_ownership () +{ + RegionWriteLock rl (this); + RegionList::iterator i; + boost::weak_ptr pl (shared_from_this()); - bool - Playlist::add_region_internal (boost::shared_ptr region, framepos_t position) - { - if (region->data_type() != _type) { - return false; - } + for (i = regions.begin(); i != regions.end(); ++i) { + (*i)->set_playlist (pl); + } +} - RegionSortByPosition cmp; +bool +Playlist::add_region_internal (boost::shared_ptr region, samplepos_t position, int32_t sub_num, double quarter_note, bool for_music) +{ + if (region->data_type() != _type) { + return false; + } - if (!first_set_state) { - boost::shared_ptr foo (shared_from_this()); - region->set_playlist (boost::weak_ptr(foo)); - } + RegionSortByPosition cmp; - region->set_position (position); + if (!first_set_state) { + boost::shared_ptr foo (shared_from_this()); + region->set_playlist (boost::weak_ptr(foo)); + } + if (for_music) { + region->set_position_music (quarter_note); + } else { + region->set_position (position, sub_num); + } - regions.insert (upper_bound (regions.begin(), regions.end(), region, cmp), region); - all_regions.insert (region); + regions.insert (upper_bound (regions.begin(), regions.end(), region, cmp), region); + all_regions.insert (region); - possibly_splice_unlocked (position, region->length(), region); + possibly_splice_unlocked (position, region->length(), region); - if (!holding_state ()) { - /* layers get assigned from XML state, and are not reset during undo/redo */ - relayer (); - } + if (!holding_state ()) { + /* layers get assigned from XML state, and are not reset during undo/redo */ + relayer (); + } - /* we need to notify the existence of new region before checking dependents. Ick. */ + /* we need to notify the existence of new region before checking dependents. Ick. */ - notify_region_added (region); + notify_region_added (region); - region->PropertyChanged.connect_same_thread (region_state_changed_connections, boost::bind (&Playlist::region_changed_proxy, this, _1, boost::weak_ptr (region))); + region->PropertyChanged.connect_same_thread (region_state_changed_connections, boost::bind (&Playlist::region_changed_proxy, this, _1, boost::weak_ptr (region))); + region->DropReferences.connect_same_thread (region_drop_references_connections, boost::bind (&Playlist::region_going_away, this, boost::weak_ptr (region))); - return true; - } + return true; +} - void - Playlist::replace_region (boost::shared_ptr old, boost::shared_ptr newr, framepos_t pos) - { - RegionWriteLock rlock (this); +void +Playlist::replace_region (boost::shared_ptr old, boost::shared_ptr newr, samplepos_t pos) +{ + RegionWriteLock rlock (this); - bool old_sp = _splicing; - _splicing = true; + bool old_sp = _splicing; + _splicing = true; - remove_region_internal (old); - add_region_internal (newr, pos); - set_layer (newr, old->layer ()); + remove_region_internal (old); + add_region_internal (newr, pos); + set_layer (newr, old->layer ()); - _splicing = old_sp; + _splicing = old_sp; - possibly_splice_unlocked (pos, old->length() - newr->length()); - } + possibly_splice_unlocked (pos, old->length() - newr->length()); +} - void - Playlist::remove_region (boost::shared_ptr region) - { - RegionWriteLock rlock (this); - remove_region_internal (region); - } +void +Playlist::remove_region (boost::shared_ptr region) +{ + RegionWriteLock rlock (this); + remove_region_internal (region); +} - int - Playlist::remove_region_internal (boost::shared_ptr region) - { - RegionList::iterator i; +int +Playlist::remove_region_internal (boost::shared_ptr region) +{ + RegionList::iterator i; - if (!in_set_state) { - /* unset playlist */ - region->set_playlist (boost::weak_ptr()); - } + if (!in_set_state) { + /* unset playlist */ + region->set_playlist (boost::weak_ptr()); + } - /* XXX should probably freeze here .... */ + /* XXX should probably freeze here .... */ - for (i = regions.begin(); i != regions.end(); ++i) { - if (*i == region) { + for (i = regions.begin(); i != regions.end(); ++i) { + if (*i == region) { - framepos_t pos = (*i)->position(); - framecnt_t distance = (*i)->length(); + samplepos_t pos = (*i)->position(); + samplecnt_t distance = (*i)->length(); - regions.erase (i); + regions.erase (i); - possibly_splice_unlocked (pos, -distance); + possibly_splice_unlocked (pos, -distance); - if (!holding_state ()) { - relayer (); - remove_dependents (region); - } + if (!holding_state ()) { + relayer (); + remove_dependents (region); + } - notify_region_removed (region); - break; - } - } + notify_region_removed (region); + break; + } + } - return -1; - } + return -1; +} - void - Playlist::get_equivalent_regions (boost::shared_ptr other, vector >& results) - { - if (Config->get_use_overlap_equivalency()) { - for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) { - if ((*i)->overlap_equivalent (other)) { - results.push_back (*i); - } - } - } else { - for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) { - if ((*i)->equivalent (other)) { - results.push_back (*i); - } - } - } - } +void +Playlist::get_equivalent_regions (boost::shared_ptr other, vector >& results) +{ + if (Config->get_use_overlap_equivalency()) { + for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) { + if ((*i)->overlap_equivalent (other)) { + results.push_back (*i); + } + } + } else { + for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) { + if ((*i)->equivalent (other)) { + results.push_back (*i); + } + } + } +} - void - Playlist::get_region_list_equivalent_regions (boost::shared_ptr other, vector >& results) - { - for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) { +void +Playlist::get_region_list_equivalent_regions (boost::shared_ptr other, vector >& results) +{ + for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) { - if ((*i) && (*i)->region_list_equivalent (other)) { - results.push_back (*i); - } - } - } + if ((*i) && (*i)->region_list_equivalent (other)) { + results.push_back (*i); + } + } +} - void - Playlist::get_source_equivalent_regions (boost::shared_ptr other, vector >& results) - { - for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) { +void +Playlist::get_source_equivalent_regions (boost::shared_ptr other, vector >& results) +{ + for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) { - if ((*i) && (*i)->any_source_equivalent (other)) { - results.push_back (*i); - } - } - } + if ((*i) && (*i)->any_source_equivalent (other)) { + results.push_back (*i); + } + } +} - void - Playlist::partition (framepos_t start, framepos_t end, bool cut) - { - RegionList thawlist; +void +Playlist::partition (samplepos_t start, samplepos_t end, bool cut) +{ + RegionList thawlist; + { + RegionWriteLock lock(this); + partition_internal (start, end, cut, thawlist); + } - partition_internal (start, end, cut, thawlist); + for (RegionList::iterator i = thawlist.begin(); i != thawlist.end(); ++i) { + (*i)->resume_property_changes (); + } +} - for (RegionList::iterator i = thawlist.begin(); i != thawlist.end(); ++i) { - (*i)->resume_property_changes (); - } - } +/* If a MIDI region is locked to musical-time, Properties::start is ignored + * and _start is overwritten using Properties::start_beats in + * add_region_internal() -> Region::set_position() -> MidiRegion::set_position_internal() + */ +static void maybe_add_start_beats (TempoMap const& tm, PropertyList& plist, boost::shared_ptr r, samplepos_t start, samplepos_t end) +{ + boost::shared_ptr mr = boost::dynamic_pointer_cast(r); + if (!mr) { + return; + } + double delta_beats = tm.quarter_notes_between_samples (start, end); + plist.add (Properties::start_beats, mr->start_beats () + delta_beats); +} /** Go through each region on the playlist and cut them at start and end, removing the section between * start and end if cutting == true. Regions that lie entirely within start and end are always * removed. */ - void - Playlist::partition_internal (framepos_t start, framepos_t end, bool cutting, RegionList& thawlist) - { - RegionList new_regions; +void +Playlist::partition_internal (samplepos_t start, samplepos_t end, bool cutting, RegionList& thawlist) +{ + RegionList new_regions; - { - RegionWriteLock rlock (this); + { - boost::shared_ptr region; - boost::shared_ptr current; - string new_name; - RegionList::iterator tmp; - Evoral::OverlapType overlap; - framepos_t pos1, pos2, pos3, pos4; + boost::shared_ptr region; + boost::shared_ptr current; + string new_name; + RegionList::iterator tmp; + Evoral::OverlapType overlap; + samplepos_t pos1, pos2, pos3, pos4; - in_partition = true; + in_partition = true; - /* need to work from a copy, because otherwise the regions we add during the process - get operated on as well. - */ + /* need to work from a copy, because otherwise the regions we add during the process + get operated on as well. + */ - RegionList copy = regions.rlist(); + RegionList copy = regions.rlist(); - for (RegionList::iterator i = copy.begin(); i != copy.end(); i = tmp) { + for (RegionList::iterator i = copy.begin(); i != copy.end(); i = tmp) { - tmp = i; - ++tmp; + tmp = i; + ++tmp; - current = *i; + current = *i; - if (current->first_frame() >= start && current->last_frame() < end) { + if (current->first_sample() >= start && current->last_sample() < end) { - if (cutting) { - remove_region_internal (current); - } + if (cutting) { + remove_region_internal (current); + } - continue; - } + continue; + } - /* coverage will return OverlapStart if the start coincides - with the end point. we do not partition such a region, - so catch this special case. - */ + /* coverage will return OverlapStart if the start coincides + with the end point. we do not partition such a region, + so catch this special case. + */ - if (current->first_frame() >= end) { - continue; - } + if (current->first_sample() >= end) { + continue; + } - if ((overlap = current->coverage (start, end)) == Evoral::OverlapNone) { - continue; - } + if ((overlap = current->coverage (start, end)) == Evoral::OverlapNone) { + continue; + } - pos1 = current->position(); - pos2 = start; - pos3 = end; - pos4 = current->last_frame(); - - if (overlap == Evoral::OverlapInternal) { - /* split: we need 3 new regions, the front, middle and end. - cut: we need 2 regions, the front and end. - */ - - /* - start end - ---------------*************************------------ - P1 P2 P3 P4 - SPLIT: - ---------------*****++++++++++++++++====------------ - CUT - ---------------*****----------------====------------ - - */ - - if (!cutting) { - /* "middle" ++++++ */ - - RegionFactory::region_name (new_name, current->name(), false); - - PropertyList plist; - - plist.add (Properties::start, current->start() + (pos2 - pos1)); - plist.add (Properties::length, pos3 - pos2); - plist.add (Properties::name, new_name); - plist.add (Properties::layer, current->layer ()); - plist.add (Properties::layering_index, current->layering_index ()); - plist.add (Properties::automatic, true); - plist.add (Properties::left_of_split, true); - plist.add (Properties::right_of_split, true); - - region = RegionFactory::create (current, plist); - add_region_internal (region, start); - new_regions.push_back (region); - } + pos1 = current->position(); + pos2 = start; + pos3 = end; + pos4 = current->last_sample(); + + if (overlap == Evoral::OverlapInternal) { + /* split: we need 3 new regions, the front, middle and end. + cut: we need 2 regions, the front and end. + */ + + /* + start end + ---------------*************************------------ + P1 P2 P3 P4 + SPLIT: + ---------------*****++++++++++++++++====------------ + CUT + ---------------*****----------------====------------ + + */ + + if (!cutting) { + /* "middle" ++++++ */ + + RegionFactory::region_name (new_name, current->name(), false); + + PropertyList plist; + + plist.add (Properties::start, current->start() + (pos2 - pos1)); + plist.add (Properties::length, pos3 - pos2); + plist.add (Properties::name, new_name); + plist.add (Properties::layer, current->layer ()); + plist.add (Properties::layering_index, current->layering_index ()); + plist.add (Properties::automatic, true); + plist.add (Properties::left_of_split, true); + plist.add (Properties::right_of_split, true); + maybe_add_start_beats (_session.tempo_map(), plist, current, current->start(), current->start() + (pos2 - pos1)); + + /* see note in :_split_region() + * for MusicSample is needed to offset region-gain + */ + region = RegionFactory::create (current, MusicSample (pos2 - pos1, 0), plist); + add_region_internal (region, start); + new_regions.push_back (region); + } - /* "end" ====== */ + /* "end" ====== */ - RegionFactory::region_name (new_name, current->name(), false); + RegionFactory::region_name (new_name, current->name(), false); - PropertyList plist; + PropertyList plist; - plist.add (Properties::start, current->start() + (pos3 - pos1)); - plist.add (Properties::length, pos4 - pos3); - plist.add (Properties::name, new_name); - plist.add (Properties::layer, current->layer ()); - plist.add (Properties::layering_index, current->layering_index ()); - plist.add (Properties::automatic, true); - plist.add (Properties::right_of_split, true); + plist.add (Properties::start, current->start() + (pos3 - pos1)); + plist.add (Properties::length, pos4 - pos3); + plist.add (Properties::name, new_name); + plist.add (Properties::layer, current->layer ()); + plist.add (Properties::layering_index, current->layering_index ()); + plist.add (Properties::automatic, true); + plist.add (Properties::right_of_split, true); + maybe_add_start_beats (_session.tempo_map(), plist, current, current->start(), current->start() + (pos3 - pos1)); - region = RegionFactory::create (current, plist); + region = RegionFactory::create (current, MusicSample (pos3 - pos1, 0), plist); - add_region_internal (region, end); - new_regions.push_back (region); + add_region_internal (region, end); + new_regions.push_back (region); - /* "front" ***** */ + /* "front" ***** */ - current->suspend_property_changes (); - thawlist.push_back (current); - current->cut_end (pos2 - 1); + current->clear_changes (); + current->suspend_property_changes (); + thawlist.push_back (current); + current->cut_end (pos2 - 1); - } else if (overlap == Evoral::OverlapEnd) { + } else if (overlap == Evoral::OverlapEnd) { - /* - start end - ---------------*************************------------ - P1 P2 P4 P3 - SPLIT: - ---------------**************+++++++++++------------ - CUT: - ---------------**************----------------------- - */ + /* + start end + ---------------*************************------------ + P1 P2 P4 P3 + SPLIT: + ---------------**************+++++++++++------------ + CUT: + ---------------**************----------------------- + */ - if (!cutting) { + if (!cutting) { - /* end +++++ */ + /* end +++++ */ - RegionFactory::region_name (new_name, current->name(), false); + RegionFactory::region_name (new_name, current->name(), false); - PropertyList plist; + PropertyList plist; - plist.add (Properties::start, current->start() + (pos2 - pos1)); - plist.add (Properties::length, pos4 - pos2); - plist.add (Properties::name, new_name); - plist.add (Properties::layer, current->layer ()); - plist.add (Properties::layering_index, current->layering_index ()); - plist.add (Properties::automatic, true); - plist.add (Properties::left_of_split, true); + plist.add (Properties::start, current->start() + (pos2 - pos1)); + plist.add (Properties::length, pos4 - pos2); + plist.add (Properties::name, new_name); + plist.add (Properties::layer, current->layer ()); + plist.add (Properties::layering_index, current->layering_index ()); + plist.add (Properties::automatic, true); + plist.add (Properties::left_of_split, true); + maybe_add_start_beats (_session.tempo_map(), plist, current, current->start(), current->start() + (pos2 - pos1)); - region = RegionFactory::create (current, plist); + region = RegionFactory::create (current, MusicSample(pos2 - pos1, 0), plist); - add_region_internal (region, start); - new_regions.push_back (region); - } + add_region_internal (region, start); + new_regions.push_back (region); + } - /* front ****** */ + /* front ****** */ - current->suspend_property_changes (); - thawlist.push_back (current); - current->cut_end (pos2 - 1); + current->clear_changes (); + current->suspend_property_changes (); + thawlist.push_back (current); + current->cut_end (pos2 - 1); - } else if (overlap == Evoral::OverlapStart) { + } else if (overlap == Evoral::OverlapStart) { - /* split: we need 2 regions: the front and the end. - cut: just trim current to skip the cut area - */ + /* split: we need 2 regions: the front and the end. + cut: just trim current to skip the cut area + */ - /* - start end - ---------------*************************------------ - P2 P1 P3 P4 + /* + start end + ---------------*************************------------ + P2 P1 P3 P4 - SPLIT: - ---------------****+++++++++++++++++++++------------ - CUT: - -------------------*********************------------ + SPLIT: + ---------------****+++++++++++++++++++++------------ + CUT: + -------------------*********************------------ - */ + */ - if (!cutting) { - /* front **** */ - RegionFactory::region_name (new_name, current->name(), false); + if (!cutting) { + /* front **** */ + RegionFactory::region_name (new_name, current->name(), false); - PropertyList plist; + PropertyList plist; - plist.add (Properties::start, current->start()); - plist.add (Properties::length, pos3 - pos1); - plist.add (Properties::name, new_name); - plist.add (Properties::layer, current->layer ()); - plist.add (Properties::layering_index, current->layering_index ()); - plist.add (Properties::automatic, true); - plist.add (Properties::right_of_split, true); + plist.add (Properties::start, current->start()); + plist.add (Properties::length, pos3 - pos1); + plist.add (Properties::name, new_name); + plist.add (Properties::layer, current->layer ()); + plist.add (Properties::layering_index, current->layering_index ()); + plist.add (Properties::automatic, true); + plist.add (Properties::right_of_split, true); + maybe_add_start_beats (_session.tempo_map(), plist, current, current->start(), current->start()); - region = RegionFactory::create (current, plist); + region = RegionFactory::create (current, plist); - add_region_internal (region, pos1); - new_regions.push_back (region); - } + add_region_internal (region, pos1); + new_regions.push_back (region); + } - /* end */ + /* end */ - current->suspend_property_changes (); - thawlist.push_back (current); - current->trim_front (pos3); - } else if (overlap == Evoral::OverlapExternal) { + current->clear_changes (); + current->suspend_property_changes (); + thawlist.push_back (current); + current->trim_front (pos3); + } else if (overlap == Evoral::OverlapExternal) { - /* split: no split required. - cut: remove the region. - */ + /* split: no split required. + cut: remove the region. + */ - /* - start end - ---------------*************************------------ - P2 P1 P3 P4 + /* + start end + ---------------*************************------------ + P2 P1 P3 P4 - SPLIT: - ---------------*************************------------ - CUT: - ---------------------------------------------------- + SPLIT: + ---------------*************************------------ + CUT: + ---------------------------------------------------- - */ + */ - if (cutting) { - remove_region_internal (current); - } + if (cutting) { + remove_region_internal (current); + } - new_regions.push_back (current); - } - } + new_regions.push_back (current); + } + } - in_partition = false; - } + in_partition = false; + } //keep track of any dead space at end (for pasting into Ripple or Splice mode) - framepos_t wanted_length = end-start; - _end_space = wanted_length - get_extent().second-get_extent().first; - } + samplepos_t wanted_length = end-start; + _end_space = wanted_length - _get_extent().second - _get_extent().first; +} - boost::shared_ptr - Playlist::cut_copy (boost::shared_ptr (Playlist::*pmf)(framepos_t, framecnt_t,bool), list& ranges, bool result_is_hidden) - { - boost::shared_ptr ret; - boost::shared_ptr pl; - framepos_t start; +boost::shared_ptr +Playlist::cut_copy (boost::shared_ptr (Playlist::*pmf)(samplepos_t, samplecnt_t,bool), list& ranges, bool result_is_hidden) +{ + boost::shared_ptr ret; + boost::shared_ptr pl; + samplepos_t start; - if (ranges.empty()) { - return boost::shared_ptr(); - } + if (ranges.empty()) { + return boost::shared_ptr(); + } - start = ranges.front().start; + start = ranges.front().start; - for (list::iterator i = ranges.begin(); i != ranges.end(); ++i) { + for (list::iterator i = ranges.begin(); i != ranges.end(); ++i) { - pl = (this->*pmf)((*i).start, (*i).length(), result_is_hidden); + pl = (this->*pmf)((*i).start, (*i).length(), result_is_hidden); - if (i == ranges.begin()) { - ret = pl; - } else { + if (i == ranges.begin()) { + ret = pl; + } else { - /* paste the next section into the nascent playlist, - offset to reflect the start of the first range we - chopped. - */ + /* paste the next section into the nascent playlist, + offset to reflect the start of the first range we + chopped. + */ - ret->paste (pl, (*i).start - start, 1.0f); - } - } + ret->paste (pl, (*i).start - start, 1.0f, 0); + } + } - return ret; - } + return ret; +} - boost::shared_ptr - Playlist::cut (list& ranges, bool result_is_hidden) - { - boost::shared_ptr (Playlist::*pmf)(framepos_t,framecnt_t,bool) = &Playlist::cut; - return cut_copy (pmf, ranges, result_is_hidden); - } +boost::shared_ptr +Playlist::cut (list& ranges, bool result_is_hidden) +{ + boost::shared_ptr (Playlist::*pmf)(samplepos_t,samplecnt_t,bool) = &Playlist::cut; + return cut_copy (pmf, ranges, result_is_hidden); +} - boost::shared_ptr - Playlist::copy (list& ranges, bool result_is_hidden) - { - boost::shared_ptr (Playlist::*pmf)(framepos_t,framecnt_t,bool) = &Playlist::copy; - return cut_copy (pmf, ranges, result_is_hidden); - } +boost::shared_ptr +Playlist::copy (list& ranges, bool result_is_hidden) +{ + boost::shared_ptr (Playlist::*pmf)(samplepos_t,samplecnt_t,bool) = &Playlist::copy; + return cut_copy (pmf, ranges, result_is_hidden); +} - boost::shared_ptr - Playlist::cut (framepos_t start, framecnt_t cnt, bool result_is_hidden) - { - boost::shared_ptr the_copy; - RegionList thawlist; - char buf[32]; +boost::shared_ptr +Playlist::cut (samplepos_t start, samplecnt_t cnt, bool result_is_hidden) +{ + boost::shared_ptr the_copy; + RegionList thawlist; + char buf[32]; - snprintf (buf, sizeof (buf), "%" PRIu32, ++subcnt); - string new_name = _name; - new_name += '.'; - new_name += buf; + snprintf (buf, sizeof (buf), "%" PRIu32, ++subcnt); + string new_name = _name; + new_name += '.'; + new_name += buf; - if ((the_copy = PlaylistFactory::create (shared_from_this(), start, cnt, new_name, result_is_hidden)) == 0) { - return boost::shared_ptr(); - } + if ((the_copy = PlaylistFactory::create (shared_from_this(), start, cnt, new_name, result_is_hidden)) == 0) { + return boost::shared_ptr(); + } - partition_internal (start, start+cnt-1, true, thawlist); + { + RegionWriteLock rlock (this); + partition_internal (start, start+cnt-1, true, thawlist); + } - for (RegionList::iterator i = thawlist.begin(); i != thawlist.end(); ++i) { - (*i)->resume_property_changes(); - } + for (RegionList::iterator i = thawlist.begin(); i != thawlist.end(); ++i) { + (*i)->resume_property_changes(); + } - return the_copy; - } + return the_copy; +} - boost::shared_ptr - Playlist::copy (framepos_t start, framecnt_t cnt, bool result_is_hidden) - { - char buf[32]; +boost::shared_ptr +Playlist::copy (samplepos_t start, samplecnt_t cnt, bool result_is_hidden) +{ + char buf[32]; - snprintf (buf, sizeof (buf), "%" PRIu32, ++subcnt); - string new_name = _name; - new_name += '.'; - new_name += buf; + snprintf (buf, sizeof (buf), "%" PRIu32, ++subcnt); + string new_name = _name; + new_name += '.'; + new_name += buf; // cnt = min (_get_extent().second - start, cnt); (We need the full range length when copy/pasting in Ripple. Why was this limit here? It's not in CUT... ) - return PlaylistFactory::create (shared_from_this(), start, cnt, new_name, result_is_hidden); - } + return PlaylistFactory::create (shared_from_this(), start, cnt, new_name, result_is_hidden); +} - int - Playlist::paste (boost::shared_ptr other, framepos_t position, float times) - { - times = fabs (times); +int +Playlist::paste (boost::shared_ptr other, samplepos_t position, float times, const int32_t sub_num) +{ + times = fabs (times); - { - RegionReadLock rl2 (other.get()); + { + RegionReadLock rl2 (other.get()); - int itimes = (int) floor (times); - framepos_t pos = position; - framecnt_t const shift = other->_get_extent().second; - layer_t top = top_layer (); + int itimes = (int) floor (times); + samplepos_t pos = position; + samplecnt_t const shift = other->_get_extent().second; + layer_t top = top_layer (); - { - RegionWriteLock rl1 (this); - while (itimes--) { - for (RegionList::iterator i = other->regions.begin(); i != other->regions.end(); ++i) { - boost::shared_ptr copy_of_region = RegionFactory::create (*i, true); + { + RegionWriteLock rl1 (this); + while (itimes--) { + for (RegionList::iterator i = other->regions.begin(); i != other->regions.end(); ++i) { + boost::shared_ptr copy_of_region = RegionFactory::create (*i, true); - /* put these new regions on top of all existing ones, but preserve - the ordering they had in the original playlist. - */ + /* put these new regions on top of all existing ones, but preserve + the ordering they had in the original playlist. + */ - add_region_internal (copy_of_region, (*i)->position() + pos); - set_layer (copy_of_region, copy_of_region->layer() + top); - } - pos += shift; - } - } - } + add_region_internal (copy_of_region, (*i)->position() + pos, sub_num); + set_layer (copy_of_region, copy_of_region->layer() + top); + } + pos += shift; + } + } + } - return 0; - } + return 0; +} - void - Playlist::duplicate (boost::shared_ptr region, framepos_t position, float times) - { - duplicate(region, position, region->length(), times); - } +void +Playlist::duplicate (boost::shared_ptr region, samplepos_t position, float times) +{ + duplicate(region, position, region->length(), times); +} /** @param gap from the beginning of the region to the next beginning */ - void - Playlist::duplicate (boost::shared_ptr region, framepos_t position, framecnt_t gap, float times) - { - times = fabs (times); +void +Playlist::duplicate (boost::shared_ptr region, samplepos_t position, samplecnt_t gap, float times) +{ + times = fabs (times); - RegionWriteLock rl (this); - int itimes = (int) floor (times); + RegionWriteLock rl (this); + int itimes = (int) floor (times); - while (itimes--) { - boost::shared_ptr copy = RegionFactory::create (region, true); - add_region_internal (copy, position); - set_layer (copy, DBL_MAX); - position += gap; - } + while (itimes--) { + boost::shared_ptr copy = RegionFactory::create (region, true); + add_region_internal (copy, position); + set_layer (copy, DBL_MAX); + position += gap; + } - if (floor (times) != times) { - framecnt_t length = (framecnt_t) floor (region->length() * (times - floor (times))); - string name; - RegionFactory::region_name (name, region->name(), false); + if (floor (times) != times) { + samplecnt_t length = (samplecnt_t) floor (region->length() * (times - floor (times))); + string name; + RegionFactory::region_name (name, region->name(), false); - { - PropertyList plist; + { + PropertyList plist; - plist.add (Properties::start, region->start()); - plist.add (Properties::length, length); - plist.add (Properties::name, name); + plist.add (Properties::start, region->start()); + plist.add (Properties::length, length); + plist.add (Properties::name, name); - boost::shared_ptr sub = RegionFactory::create (region, plist); - add_region_internal (sub, position); - set_layer (sub, DBL_MAX); - } - } - } + boost::shared_ptr sub = RegionFactory::create (region, plist); + add_region_internal (sub, position); + set_layer (sub, DBL_MAX); + } + } +} /** @param gap from the beginning of the region to the next beginning */ -/** @param end the first frame that does _not_ contain a duplicated frame */ +/** @param end the first sample that does _not_ contain a duplicated sample */ void -Playlist::duplicate_until (boost::shared_ptr region, framepos_t position, framecnt_t gap, framepos_t end) +Playlist::duplicate_until (boost::shared_ptr region, samplepos_t position, samplecnt_t gap, samplepos_t end) { RegionWriteLock rl (this); @@ -1298,7 +1335,7 @@ Playlist::duplicate_until (boost::shared_ptr region, framepos_t position } if (position < end) { - framecnt_t length = min (region->length(), end - position); + samplecnt_t length = min (region->length(), end - position); string name; RegionFactory::region_name (name, region->name(), false); @@ -1320,19 +1357,19 @@ void Playlist::duplicate_range (AudioRange& range, float times) { boost::shared_ptr pl = copy (range.start, range.length(), true); - framecnt_t offset = range.end - range.start; - paste (pl, range.start + offset, times); + samplecnt_t offset = range.end - range.start; + paste (pl, range.start + offset, times, 0); } void -Playlist::duplicate_ranges (std::list& ranges, float /* times */) +Playlist::duplicate_ranges (std::list& ranges, float times) { if (ranges.empty()) { return; } - framepos_t min_pos = max_framepos; - framepos_t max_pos = 0; + samplepos_t min_pos = max_samplepos; + samplepos_t max_pos = 0; for (std::list::const_iterator i = ranges.begin(); i != ranges.end(); @@ -1341,16 +1378,21 @@ Playlist::duplicate_ranges (std::list& ranges, float /* times */) max_pos = max (max_pos, (*i).end); } - framecnt_t offset = max_pos - min_pos; + samplecnt_t offset = max_pos - min_pos; - for (list::iterator i = ranges.begin(); i != ranges.end(); ++i) { - boost::shared_ptr pl = copy ((*i).start, (*i).length(), true); - paste (pl, (*i).start + offset, 1.0f); // times ?? + int count = 1; + int itimes = (int) floor (times); + while (itimes--) { + for (list::iterator i = ranges.begin (); i != ranges.end (); ++i) { + boost::shared_ptr pl = copy ((*i).start, (*i).length (), true); + paste (pl, (*i).start + (offset * count), 1.0f, 0); + } + ++count; } } void - Playlist::shift (framepos_t at, frameoffset_t distance, bool move_intersected, bool ignore_music_glue) + Playlist::shift (samplepos_t at, sampleoffset_t distance, bool move_intersected, bool ignore_music_glue) { RegionWriteLock rlock (this); RegionList copy (regions.rlist()); @@ -1358,12 +1400,12 @@ Playlist::duplicate_ranges (std::list& ranges, float /* times */) for (RegionList::iterator r = copy.begin(); r != copy.end(); ++r) { - if ((*r)->last_frame() < at) { + if ((*r)->last_sample() < at) { /* too early */ continue; } - if (at > (*r)->first_frame() && at < (*r)->last_frame()) { + if (at > (*r)->first_sample() && at < (*r)->last_sample()) { /* intersected region */ if (!move_intersected) { continue; @@ -1384,12 +1426,12 @@ Playlist::duplicate_ranges (std::list& ranges, float /* times */) /* XXX: may not be necessary; Region::post_set should do this, I think */ for (RegionList::iterator r = fixup.begin(); r != fixup.end(); ++r) { - (*r)->recompute_position_from_lock_style (); + (*r)->recompute_position_from_lock_style (0); } } void - Playlist::split (framepos_t at) + Playlist::split (const MusicSample& at) { RegionWriteLock rlock (this); RegionList copy (regions.rlist()); @@ -1403,28 +1445,29 @@ Playlist::duplicate_ranges (std::list& ranges, float /* times */) } void - Playlist::split_region (boost::shared_ptr region, framepos_t playlist_position) + Playlist::split_region (boost::shared_ptr region, const MusicSample& playlist_position) { RegionWriteLock rl (this); _split_region (region, playlist_position); } void - Playlist::_split_region (boost::shared_ptr region, framepos_t playlist_position) + Playlist::_split_region (boost::shared_ptr region, const MusicSample& playlist_position) { - if (!region->covers (playlist_position)) { + if (!region->covers (playlist_position.sample)) { return; } - if (region->position() == playlist_position || - region->last_frame() == playlist_position) { + if (region->position() == playlist_position.sample || + region->last_sample() == playlist_position.sample) { return; } boost::shared_ptr left; boost::shared_ptr right; - frameoffset_t before; - frameoffset_t after; + + MusicSample before (playlist_position.sample - region->position(), playlist_position.division); + MusicSample after (region->length() - before.sample, 0); string before_name; string after_name; @@ -1433,15 +1476,12 @@ Playlist::duplicate_ranges (std::list& ranges, float /* times */) bool old_sp = _splicing; _splicing = true; - before = playlist_position - region->position(); - after = region->length() - before; - RegionFactory::region_name (before_name, region->name(), false); { PropertyList plist; - plist.add (Properties::length, before); + plist.add (Properties::length, before.sample); plist.add (Properties::name, before_name); plist.add (Properties::left_of_split, true); plist.add (Properties::layering_index, region->layering_index ()); @@ -1451,7 +1491,7 @@ Playlist::duplicate_ranges (std::list& ranges, float /* times */) since it supplies that offset to the Region constructor, which is necessary to get audio region gain envelopes right. */ - left = RegionFactory::create (region, 0, plist); + left = RegionFactory::create (region, MusicSample (0, 0), plist, true); } RegionFactory::region_name (after_name, region->name(), false); @@ -1459,25 +1499,26 @@ Playlist::duplicate_ranges (std::list& ranges, float /* times */) { PropertyList plist; - plist.add (Properties::length, after); + plist.add (Properties::length, after.sample); plist.add (Properties::name, after_name); plist.add (Properties::right_of_split, true); plist.add (Properties::layering_index, region->layering_index ()); plist.add (Properties::layer, region->layer ()); /* same note as above */ - right = RegionFactory::create (region, before, plist); + right = RegionFactory::create (region, before, plist, true); } - add_region_internal (left, region->position()); - add_region_internal (right, region->position() + before); + add_region_internal (left, region->position(), 0); + add_region_internal (right, region->position() + before.sample, before.division); + remove_region_internal (region); _splicing = old_sp; } void - Playlist::possibly_splice (framepos_t at, framecnt_t distance, boost::shared_ptr exclude) + Playlist::possibly_splice (samplepos_t at, samplecnt_t distance, boost::shared_ptr exclude) { if (_splicing || in_set_state) { /* don't respond to splicing moves or state setting */ @@ -1490,7 +1531,7 @@ Playlist::duplicate_ranges (std::list& ranges, float /* times */) } void - Playlist::possibly_splice_unlocked (framepos_t at, framecnt_t distance, boost::shared_ptr exclude) + Playlist::possibly_splice_unlocked (samplepos_t at, samplecnt_t distance, boost::shared_ptr exclude) { if (_splicing || in_set_state) { /* don't respond to splicing moves or state setting */ @@ -1503,7 +1544,7 @@ Playlist::duplicate_ranges (std::list& ranges, float /* times */) } void - Playlist::splice_locked (framepos_t at, framecnt_t distance, boost::shared_ptr exclude) + Playlist::splice_locked (samplepos_t at, samplecnt_t distance, boost::shared_ptr exclude) { { RegionWriteLock rl (this); @@ -1512,13 +1553,13 @@ Playlist::duplicate_ranges (std::list& ranges, float /* times */) } void - Playlist::splice_unlocked (framepos_t at, framecnt_t distance, boost::shared_ptr exclude) + Playlist::splice_unlocked (samplepos_t at, samplecnt_t distance, boost::shared_ptr exclude) { core_splice (at, distance, exclude); } void - Playlist::core_splice (framepos_t at, framecnt_t distance, boost::shared_ptr exclude) + Playlist::core_splice (samplepos_t at, samplecnt_t distance, boost::shared_ptr exclude) { _splicing = true; @@ -1529,11 +1570,11 @@ Playlist::duplicate_ranges (std::list& ranges, float /* times */) } if ((*i)->position() >= at) { - framepos_t new_pos = (*i)->position() + distance; + samplepos_t new_pos = (*i)->position() + distance; if (new_pos < 0) { new_pos = 0; - } else if (new_pos >= max_framepos - (*i)->length()) { - new_pos = max_framepos - (*i)->length(); + } else if (new_pos >= max_samplepos - (*i)->length()) { + new_pos = max_samplepos - (*i)->length(); } (*i)->set_position (new_pos); @@ -1546,7 +1587,7 @@ Playlist::duplicate_ranges (std::list& ranges, float /* times */) } void -Playlist::ripple_locked (framepos_t at, framecnt_t distance, RegionList *exclude) +Playlist::ripple_locked (samplepos_t at, samplecnt_t distance, RegionList *exclude) { { RegionWriteLock rl (this); @@ -1555,13 +1596,13 @@ Playlist::ripple_locked (framepos_t at, framecnt_t distance, RegionList *exclude } void -Playlist::ripple_unlocked (framepos_t at, framecnt_t distance, RegionList *exclude) +Playlist::ripple_unlocked (samplepos_t at, samplecnt_t distance, RegionList *exclude) { core_ripple (at, distance, exclude); } void -Playlist::core_ripple (framepos_t at, framecnt_t distance, RegionList *exclude) +Playlist::core_ripple (samplepos_t at, samplecnt_t distance, RegionList *exclude) { if (distance == 0) { return; @@ -1579,8 +1620,8 @@ Playlist::core_ripple (framepos_t at, framecnt_t distance, RegionList *exclude) } if ((*i)->position() >= at) { - framepos_t new_pos = (*i)->position() + distance; - framepos_t limit = max_framepos - (*i)->length(); + samplepos_t new_pos = (*i)->position() + distance; + samplepos_t limit = max_samplepos - (*i)->length(); if (new_pos < 0) { new_pos = 0; } else if (new_pos >= limit ) { @@ -1627,7 +1668,7 @@ Playlist::region_bounds_changed (const PropertyChange& what_changed, boost::shar if (what_changed.contains (Properties::position) || what_changed.contains (Properties::length)) { - frameoffset_t delta = 0; + sampleoffset_t delta = 0; if (what_changed.contains (Properties::position)) { delta = region->position() - region->last_position(); @@ -1646,9 +1687,9 @@ Playlist::region_bounds_changed (const PropertyChange& what_changed, boost::shar } else { notify_contents_changed (); relayer (); - list > xf; - xf.push_back (Evoral::Range (region->last_range())); - xf.push_back (Evoral::Range (region->range())); + list > xf; + xf.push_back (Evoral::Range (region->last_range())); + xf.push_back (Evoral::Range (region->range())); coalesce_and_check_crossfades (xf); } } @@ -1744,6 +1785,7 @@ Playlist::region_bounds_changed (const PropertyChange& what_changed, boost::shar RegionWriteLock rl (this); region_state_changed_connections.drop_connections (); + region_drop_references_connections.drop_connections (); for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) { pending_removes.insert (*i); @@ -1774,20 +1816,38 @@ Playlist::region_bounds_changed (const PropertyChange& what_changed, boost::shar **********************************************************************/ boost::shared_ptr -Playlist::regions_at (framepos_t frame) +Playlist::region_list() +{ + RegionReadLock rlock (this); + boost::shared_ptr rlist (new RegionList (regions.rlist ())); + return rlist; +} + +void +Playlist::deep_sources (std::set >& sources) const +{ + RegionReadLock rlock (const_cast(this)); + + for (RegionList::const_iterator i = regions.begin(); i != regions.end(); ++i) { + (*i)->deep_sources (sources); + } +} + +boost::shared_ptr +Playlist::regions_at (samplepos_t sample) { RegionReadLock rlock (this); - return find_regions_at (frame); + return find_regions_at (sample); } uint32_t - Playlist::count_regions_at (framepos_t frame) const + Playlist::count_regions_at (samplepos_t sample) const { RegionReadLock rlock (const_cast(this)); uint32_t cnt = 0; for (RegionList::const_iterator i = regions.begin(); i != regions.end(); ++i) { - if ((*i)->covers (frame)) { + if ((*i)->covers (sample)) { cnt++; } } @@ -1796,11 +1856,11 @@ Playlist::regions_at (framepos_t frame) } boost::shared_ptr - Playlist::top_region_at (framepos_t frame) + Playlist::top_region_at (samplepos_t sample) { RegionReadLock rlock (this); - boost::shared_ptr rlist = find_regions_at (frame); + boost::shared_ptr rlist = find_regions_at (sample); boost::shared_ptr region; if (rlist->size()) { @@ -1813,15 +1873,16 @@ Playlist::regions_at (framepos_t frame) } boost::shared_ptr - Playlist::top_unmuted_region_at (framepos_t frame) + Playlist::top_unmuted_region_at (samplepos_t sample) { RegionReadLock rlock (this); - boost::shared_ptr rlist = find_regions_at (frame); + boost::shared_ptr rlist = find_regions_at (sample); for (RegionList::iterator i = rlist->begin(); i != rlist->end(); ) { RegionList::iterator tmp = i; + ++tmp; if ((*i)->muted()) { @@ -1843,14 +1904,14 @@ Playlist::regions_at (framepos_t frame) } boost::shared_ptr -Playlist::find_regions_at (framepos_t frame) +Playlist::find_regions_at (samplepos_t sample) { /* Caller must hold lock */ boost::shared_ptr rlist (new RegionList); for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) { - if ((*i)->covers (frame)) { + if ((*i)->covers (sample)) { rlist->push_back (*i); } } @@ -1859,13 +1920,13 @@ Playlist::find_regions_at (framepos_t frame) } boost::shared_ptr -Playlist::regions_with_start_within (Evoral::Range range) +Playlist::regions_with_start_within (Evoral::Range range) { RegionReadLock rlock (this); boost::shared_ptr rlist (new RegionList); for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) { - if ((*i)->first_frame() >= range.from && (*i)->first_frame() <= range.to) { + if ((*i)->first_sample() >= range.from && (*i)->first_sample() <= range.to) { rlist->push_back (*i); } } @@ -1874,13 +1935,13 @@ Playlist::regions_with_start_within (Evoral::Range range) } boost::shared_ptr -Playlist::regions_with_end_within (Evoral::Range range) +Playlist::regions_with_end_within (Evoral::Range range) { RegionReadLock rlock (this); boost::shared_ptr rlist (new RegionList); for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) { - if ((*i)->last_frame() >= range.from && (*i)->last_frame() <= range.to) { + if ((*i)->last_sample() >= range.from && (*i)->last_sample() <= range.to) { rlist->push_back (*i); } } @@ -1893,14 +1954,14 @@ Playlist::regions_with_end_within (Evoral::Range range) * @return regions which have some part within this range. */ boost::shared_ptr -Playlist::regions_touched (framepos_t start, framepos_t end) +Playlist::regions_touched (samplepos_t start, samplepos_t end) { RegionReadLock rlock (this); return regions_touched_locked (start, end); } boost::shared_ptr -Playlist::regions_touched_locked (framepos_t start, framepos_t end) +Playlist::regions_touched_locked (samplepos_t start, samplepos_t end) { boost::shared_ptr rlist (new RegionList); @@ -1913,8 +1974,8 @@ Playlist::regions_touched_locked (framepos_t start, framepos_t end) return rlist; } -framepos_t -Playlist::find_next_transient (framepos_t from, int dir) +samplepos_t +Playlist::find_next_transient (samplepos_t from, int dir) { RegionReadLock rlock (this); AnalysisFeatureList points; @@ -1922,20 +1983,20 @@ Playlist::find_next_transient (framepos_t from, int dir) for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) { if (dir > 0) { - if ((*i)->last_frame() < from) { + if ((*i)->last_sample() < from) { continue; } } else { - if ((*i)->first_frame() > from) { + if ((*i)->first_sample() > from) { continue; } } (*i)->get_transients (these_points); - /* add first frame, just, err, because */ + /* add first sample, just, err, because */ - these_points.push_back ((*i)->first_frame()); + these_points.push_back ((*i)->first_sample()); points.insert (points.end(), these_points.begin(), these_points.end()); these_points.clear (); @@ -1945,7 +2006,7 @@ Playlist::find_next_transient (framepos_t from, int dir) return -1; } - TransientDetector::cleanup_transients (points, _session.frame_rate(), 3.0); + TransientDetector::cleanup_transients (points, _session.sample_rate(), 3.0); bool reached = false; if (dir > 0) { @@ -1959,7 +2020,7 @@ Playlist::find_next_transient (framepos_t from, int dir) } } } else { - for (AnalysisFeatureList::const_reverse_iterator x = points.rbegin(); x != points.rend(); ++x) { + for (AnalysisFeatureList::reverse_iterator x = points.rbegin(); x != points.rend(); ++x) { if ((*x) <= from) { reached = true; } @@ -1974,11 +2035,11 @@ Playlist::find_next_transient (framepos_t from, int dir) } boost::shared_ptr -Playlist::find_next_region (framepos_t frame, RegionPoint point, int dir) +Playlist::find_next_region (samplepos_t sample, RegionPoint point, int dir) { RegionReadLock rlock (this); boost::shared_ptr ret; - framepos_t closest = max_framepos; + samplepos_t closest = max_samplepos; bool end_iter = false; @@ -1986,16 +2047,16 @@ Playlist::find_next_region (framepos_t frame, RegionPoint point, int dir) if(end_iter) break; - frameoffset_t distance; + sampleoffset_t distance; boost::shared_ptr r = (*i); - framepos_t pos = 0; + samplepos_t pos = 0; switch (point) { case Start: - pos = r->first_frame (); + pos = r->first_sample (); break; case End: - pos = r->last_frame (); + pos = r->last_sample (); break; case SyncPoint: pos = r->sync_position (); @@ -2005,8 +2066,8 @@ Playlist::find_next_region (framepos_t frame, RegionPoint point, int dir) switch (dir) { case 1: /* forwards */ - if (pos > frame) { - if ((distance = pos - frame) < closest) { + if (pos > sample) { + if ((distance = pos - sample) < closest) { closest = distance; ret = r; end_iter = true; @@ -2017,8 +2078,8 @@ Playlist::find_next_region (framepos_t frame, RegionPoint point, int dir) default: /* backwards */ - if (pos < frame) { - if ((distance = frame - pos) < closest) { + if (pos < sample) { + if ((distance = sample - pos) < closest) { closest = distance; ret = r; } @@ -2033,37 +2094,39 @@ Playlist::find_next_region (framepos_t frame, RegionPoint point, int dir) return ret; } - framepos_t - Playlist::find_next_region_boundary (framepos_t frame, int dir) + samplepos_t + Playlist::find_next_region_boundary (samplepos_t sample, int dir) { RegionReadLock rlock (this); - framepos_t closest = max_framepos; - framepos_t ret = -1; + samplepos_t closest = max_samplepos; + samplepos_t ret = -1; if (dir > 0) { for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) { boost::shared_ptr r = (*i); - frameoffset_t distance; + sampleoffset_t distance; + const samplepos_t first_sample = r->first_sample(); + const samplepos_t last_sample = r->last_sample(); - if (r->first_frame() > frame) { + if (first_sample > sample) { - distance = r->first_frame() - frame; + distance = first_sample - sample; if (distance < closest) { - ret = r->first_frame(); + ret = first_sample; closest = distance; } } - if (r->last_frame () > frame) { + if (last_sample > sample) { - distance = r->last_frame () - frame; + distance = last_sample - sample; if (distance < closest) { - ret = r->last_frame (); + ret = last_sample; closest = distance; } } @@ -2074,24 +2137,26 @@ Playlist::find_next_region (framepos_t frame, RegionPoint point, int dir) for (RegionList::reverse_iterator i = regions.rbegin(); i != regions.rend(); ++i) { boost::shared_ptr r = (*i); - frameoffset_t distance; + sampleoffset_t distance; + const samplepos_t first_sample = r->first_sample(); + const samplepos_t last_sample = r->last_sample(); - if (r->last_frame() < frame) { + if (last_sample < sample) { - distance = frame - r->last_frame(); + distance = sample - last_sample; if (distance < closest) { - ret = r->last_frame(); + ret = last_sample; closest = distance; } } - if (r->first_frame() < frame) { + if (first_sample < sample) { - distance = frame - r->first_frame(); + distance = sample - first_sample; if (distance < closest) { - ret = r->first_frame(); + ret = first_sample; closest = distance; } } @@ -2154,9 +2219,7 @@ Playlist::find_next_region (framepos_t frame, RegionPoint point, int dir) XMLNode *child; XMLNodeList nlist; XMLNodeConstIterator niter; - XMLPropertyList plist; XMLPropertyConstIterator piter; - XMLProperty *prop; boost::shared_ptr region; string region_name; bool seen_region_nodes = false; @@ -2171,26 +2234,31 @@ Playlist::find_next_region (framepos_t frame, RegionPoint point, int dir) freeze (); - plist = node.properties(); - set_id (node); - for (piter = plist.begin(); piter != plist.end(); ++piter) { - - prop = *piter; - - if (prop->name() == X_("name")) { - _name = prop->value(); - _set_sort_id (); - } else if (prop->name() == X_("orig-diskstream-id")) { - /* XXX legacy session: fix up later */ - _orig_track_id = prop->value (); - } else if (prop->name() == X_("orig-track-id")) { - _orig_track_id = prop->value (); - } else if (prop->name() == X_("frozen")) { - _frozen = string_is_affirmative (prop->value()); - } else if (prop->name() == X_("combine-ops")) { - _combine_ops = atoi (prop->value()); + std::string name; + if (node.get_property (X_("name"), name)) { + _name = name; + _set_sort_id (); + } + + /* XXX legacy session: fix up later */ + node.get_property (X_("orig-diskstream-id"), _orig_track_id); + + node.get_property (X_("orig-track-id"), _orig_track_id); + node.get_property (X_("frozen"), _frozen); + + node.get_property (X_("combine-ops"), _combine_ops); + + string shared_ids; + if (node.get_property (X_("shared-with-ids"), shared_ids)) { + if (!shared_ids.empty()) { + vector result; + ::split (shared_ids, result, ','); + vector::iterator it = result.begin(); + for (; it != result.end(); ++it) { + _shared_with_ids.push_back (PBD::ID(*it)); + } } } @@ -2206,13 +2274,12 @@ Playlist::find_next_region (framepos_t frame, RegionPoint point, int dir) seen_region_nodes = true; - if ((prop = child->property ("id")) == 0) { + ID id; + if (!child->get_property ("id", id)) { error << _("region state node has no ID, ignored") << endmsg; continue; } - ID id = prop->value (); - if ((region = region_by_id (id))) { region->suspend_property_changes (); @@ -2270,21 +2337,28 @@ XMLNode& Playlist::state (bool full_state) { XMLNode *node = new XMLNode (X_("Playlist")); - char buf[64]; - node->add_property (X_("id"), id().to_s()); - node->add_property (X_("name"), _name); - node->add_property (X_("type"), _type.to_string()); + node->set_property (X_("id"), id()); + node->set_property (X_("name"), name()); + node->set_property (X_("type"), _type); + node->set_property (X_("orig-track-id"), _orig_track_id); + + string shared_ids; + list::const_iterator it = _shared_with_ids.begin(); + for (; it != _shared_with_ids.end(); ++it) { + shared_ids += "," + (*it).to_s(); + } + if (!shared_ids.empty()) { + shared_ids.erase(0,1); + } - _orig_track_id.print (buf, sizeof (buf)); - node->add_property (X_("orig-track-id"), buf); - node->add_property (X_("frozen"), _frozen ? "yes" : "no"); + node->set_property (X_("shared-with-ids"), shared_ids); + node->set_property (X_("frozen"), _frozen); if (full_state) { RegionReadLock rlock (this); - snprintf (buf, sizeof (buf), "%u", _combine_ops); - node->add_property ("combine-ops", buf); + node->set_property ("combine-ops", _combine_ops); for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) { node->add_child_nocopy ((*i)->get_state()); @@ -2322,25 +2396,25 @@ Playlist::all_regions_empty() const return all_regions.empty(); } -pair +pair Playlist::get_extent () const { RegionReadLock rlock (const_cast(this)); return _get_extent (); } -pair +pair Playlist::get_extent_with_endspace () const { - pair l = get_extent(); + pair l = get_extent(); l.second += _end_space; return l; } -pair +pair Playlist::_get_extent () const { - pair ext (max_framepos, 0); + pair ext (max_samplepos, 0); if (regions.empty()) { ext.first = 0; @@ -2348,7 +2422,7 @@ Playlist::_get_extent () const } for (RegionList::const_iterator i = regions.begin(); i != regions.end(); ++i) { - pair const e ((*i)->position(), (*i)->position() + (*i)->length()); + pair const e ((*i)->position(), (*i)->position() + (*i)->length()); if (e.first < ext.first) { ext.first = e.first; } @@ -2464,8 +2538,8 @@ Playlist::relayer () int const divisions = 512; /* find the start and end positions of the regions on this playlist */ - framepos_t start = INT64_MAX; - framepos_t end = 0; + samplepos_t start = INT64_MAX; + samplepos_t end = 0; for (RegionList::const_iterator i = regions.begin(); i != regions.end(); ++i) { start = min (start, (*i)->position()); end = max (end, (*i)->position() + (*i)->length()); @@ -2600,7 +2674,7 @@ Playlist::lower_region_to_bottom (boost::shared_ptr region) } void -Playlist::nudge_after (framepos_t start, framecnt_t distance, bool forwards) +Playlist::nudge_after (samplepos_t start, samplecnt_t distance, bool forwards) { RegionList::iterator i; bool moved = false; @@ -2614,12 +2688,12 @@ Playlist::nudge_after (framepos_t start, framecnt_t distance, bool forwards) if ((*i)->position() >= start) { - framepos_t new_pos; + samplepos_t new_pos; if (forwards) { - if ((*i)->last_frame() > max_framepos - distance) { - new_pos = max_framepos - (*i)->length(); + if ((*i)->last_sample() > max_samplepos - distance) { + new_pos = max_samplepos - (*i)->length(); } else { new_pos = (*i)->position() + distance; } @@ -2647,12 +2721,18 @@ Playlist::nudge_after (framepos_t start, framecnt_t distance, bool forwards) } bool -Playlist::uses_source (boost::shared_ptr src) const +Playlist::uses_source (boost::shared_ptr src, bool shallow) const { RegionReadLock rlock (const_cast (this)); for (set >::const_iterator r = all_regions.begin(); r != all_regions.end(); ++r) { - if ((*r)->uses_source (src)) { + /* Note: passing the second argument as false can cause at best + incredibly deep and time-consuming recursion, and at worst + cycles if the user has managed to create cycles of reference + between compound regions. We generally only this during + cleanup, and @param shallow is passed as true. + */ + if ((*r)->uses_source (src, shallow)) { return true; } } @@ -2660,6 +2740,7 @@ Playlist::uses_source (boost::shared_ptr src) const return false; } + boost::shared_ptr Playlist::find_region (const ID& id) const { @@ -2784,9 +2865,9 @@ Playlist::shuffle (boost::shared_ptr region, int dir) break; } - framepos_t new_pos; + samplepos_t new_pos; - if ((*next)->position() != region->last_frame() + 1) { + if ((*next)->position() != region->last_sample() + 1) { /* they didn't used to touch, so after shuffle, just have them swap positions. */ @@ -2827,8 +2908,8 @@ Playlist::shuffle (boost::shared_ptr region, int dir) break; } - framepos_t new_pos; - if (region->position() != (*prev)->last_frame() + 1) { + samplepos_t new_pos; + if (region->position() != (*prev)->last_sample() + 1) { /* they didn't used to touch, so after shuffle, just have them swap positions. */ @@ -2881,7 +2962,7 @@ Playlist::region_is_shuffle_constrained (boost::shared_ptr) } void -Playlist::ripple (framepos_t at, framecnt_t distance, RegionList *exclude) +Playlist::ripple (samplepos_t at, samplecnt_t distance, RegionList *exclude) { ripple_locked (at, distance, exclude); } @@ -2897,7 +2978,7 @@ Playlist::update_after_tempo_map_change () for (RegionList::iterator i = copy.begin(); i != copy.end(); ++i) { (*i)->update_after_tempo_map_change (); } - + /* possibly causes a contents changed notification (flush_notifications()) */ thaw (); } @@ -2911,7 +2992,7 @@ Playlist::foreach_region (boost::function)> s) } bool -Playlist::has_region_at (framepos_t const p) const +Playlist::has_region_at (samplepos_t const p) const { RegionReadLock (const_cast (this)); @@ -2923,32 +3004,13 @@ Playlist::has_region_at (framepos_t const p) const return (i != regions.end()); } -/** Remove any region that uses a given source */ -void -Playlist::remove_region_by_source (boost::shared_ptr s) -{ - RegionWriteLock rl (this); - - RegionList::iterator i = regions.begin(); - while (i != regions.end()) { - RegionList::iterator j = i; - ++j; - - if ((*i)->uses_source (s)) { - remove_region_internal (*i); - } - - i = j; - } -} - -/** Look from a session frame time and find the start time of the next region +/** Look from a session sample time and find the start time of the next region * which is on the top layer of this playlist. * @param t Time to look from. - * @return Position of next top-layered region, or max_framepos if there isn't one. + * @return Position of next top-layered region, or max_samplepos if there isn't one. */ -framepos_t -Playlist::find_next_top_layer_position (framepos_t t) const +samplepos_t +Playlist::find_next_top_layer_position (samplepos_t t) const { RegionReadLock rlock (const_cast (this)); @@ -2963,7 +3025,7 @@ Playlist::find_next_top_layer_position (framepos_t t) const } } - return max_framepos; + return max_samplepos; } boost::shared_ptr @@ -2972,7 +3034,7 @@ Playlist::combine (const RegionList& r) PropertyList plist; uint32_t channels = 0; uint32_t layer = 0; - framepos_t earliest_position = max_framepos; + samplepos_t earliest_position = max_samplepos; vector old_and_new_regions; vector > originals; vector > copies; @@ -3042,7 +3104,7 @@ Playlist::combine (const RegionList& r) /* now create a new PlaylistSource for each channel in the new playlist */ SourceList sources; - pair extent = pl->get_extent(); + pair extent = pl->get_extent(); for (uint32_t chn = 0; chn < channels; ++chn) { sources.push_back (SourceFactory::createFromPlaylist (_type, _session, pl, id(), parent_name, chn, 0, extent.second, false, false)); @@ -3112,8 +3174,8 @@ Playlist::uncombine (boost::shared_ptr target) pl = pls->playlist(); - framepos_t adjusted_start = 0; // gcc isn't smart enough - framepos_t adjusted_end = 0; // gcc isn't smart enough + samplepos_t adjusted_start = 0; // gcc isn't smart enough + samplepos_t adjusted_end = 0; // gcc isn't smart enough /* the leftmost (earliest) edge of the compound region starts at zero in its source, or larger if it @@ -3126,9 +3188,9 @@ Playlist::uncombine (boost::shared_ptr target) // (2) get all the original regions - const RegionList& rl (pl->region_list().rlist()); + const RegionList& rl (pl->region_list_property().rlist()); RegionFactory::CompoundAssociations& cassocs (RegionFactory::compound_associations()); - frameoffset_t move_offset = 0; + sampleoffset_t move_offset = 0; /* there are two possibilities here: 1) the playlist that the playlist source was based on @@ -3163,7 +3225,7 @@ Playlist::uncombine (boost::shared_ptr target) } if (!same_playlist) { - framepos_t pos = original->position(); + samplepos_t pos = original->position(); /* make a copy, but don't announce it */ original = RegionFactory::create (original, false); /* the pure copy constructor resets position() to zero, @@ -3263,11 +3325,18 @@ Playlist::uncombine (boost::shared_ptr target) void Playlist::fade_range (list& ranges) { - for (list::iterator r = ranges.begin(); r != ranges.end(); ++r) { - for (RegionList::const_iterator i = regions.begin(); i != regions.end(); ++i) { - (*i)->fade_range ((*r).start, (*r).end); - } - } + RegionReadLock rlock (this); + for (list::iterator r = ranges.begin(); r != ranges.end(); ) { + list::iterator tmpr = r; + ++tmpr; + for (RegionList::const_iterator i = regions.begin(); i != regions.end(); ) { + RegionList::const_iterator tmpi = i; + ++tmpi; + (*i)->fade_range ((*r).start, (*r).end); + i = tmpi; + } + r = tmpr; + } } uint32_t @@ -3286,14 +3355,61 @@ Playlist::max_source_level () const void Playlist::set_orig_track_id (const PBD::ID& id) { + if (shared_with(id)) { + // Swap 'shared_id' / origin_track_id + unshare_with (id); + share_with (_orig_track_id); + } _orig_track_id = id; } +void +Playlist::share_with (const PBD::ID& id) +{ + if (!shared_with(id)) { + _shared_with_ids.push_back (id); + } +} + +void +Playlist::unshare_with (const PBD::ID& id) +{ + list::iterator it = _shared_with_ids.begin (); + while (it != _shared_with_ids.end()) { + if (*it == id) { + _shared_with_ids.erase (it); + break; + } + ++it; + } +} + +bool +Playlist::shared_with (const PBD::ID& id) const +{ + bool shared = false; + list::const_iterator it = _shared_with_ids.begin (); + while (it != _shared_with_ids.end() && !shared) { + if (*it == id) { + shared = true; + } + ++it; + } + + return shared; +} + +void +Playlist::reset_shares () +{ + _shared_with_ids.clear(); +} + /** Take a list of ranges, coalesce any that can be coalesced, then call * check_crossfades for each one. */ void -Playlist::coalesce_and_check_crossfades (list > ranges) +Playlist::coalesce_and_check_crossfades (list > ranges) { /* XXX: it's a shame that this coalesce algorithm also exists in TimeSelection::consolidate(). @@ -3302,8 +3418,8 @@ Playlist::coalesce_and_check_crossfades (list > ranges /* XXX: xfade: this is implemented in Evoral::RangeList */ restart: - for (list >::iterator i = ranges.begin(); i != ranges.end(); ++i) { - for (list >::iterator j = ranges.begin(); j != ranges.end(); ++j) { + for (list >::iterator i = ranges.begin(); i != ranges.end(); ++i) { + for (list >::iterator j = ranges.begin(); j != ranges.end(); ++j) { if (i == j) { continue;