X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsession_playlists.cc;h=50bc710347ab4935a7940437dd40455402f9e01c;hb=9bf40bde3aed831791108bfccc4b1e10b071afdc;hp=1e31801271ee8955a8046272fee6e67c4bfb4bf9;hpb=24a38b8b08914636c5fd81646460cc083df5ecb9;p=ardour.git diff --git a/libs/ardour/session_playlists.cc b/libs/ardour/session_playlists.cc index 1e31801271..50bc710347 100644 --- a/libs/ardour/session_playlists.cc +++ b/libs/ardour/session_playlists.cc @@ -18,17 +18,14 @@ */ #include -#include "pbd/xml++.h" -#include "pbd/compose.h" #include "ardour/debug.h" -#include "ardour/session_playlists.h" #include "ardour/playlist.h" -#include "ardour/region.h" #include "ardour/playlist_factory.h" -#include "ardour/session.h" -#include "ardour/source.h" +#include "ardour/session_playlists.h" #include "ardour/track.h" -#include "i18n.h" +#include "pbd/i18n.h" +#include "pbd/compose.h" +#include "pbd/xml++.h" using namespace std; using namespace PBD; @@ -72,7 +69,7 @@ SessionPlaylists::~SessionPlaylists () bool SessionPlaylists::add (boost::shared_ptr playlist) { - Glib::Mutex::Lock lm (lock); + Glib::Threads::Mutex::Lock lm (lock); bool const existing = find (playlists.begin(), playlists.end(), playlist) != playlists.end(); @@ -99,7 +96,7 @@ SessionPlaylists::remove_weak (boost::weak_ptr playlist) void SessionPlaylists::remove (boost::shared_ptr playlist) { - Glib::Mutex::Lock lm (lock); + Glib::Threads::Mutex::Lock lm (lock); List::iterator i; @@ -132,7 +129,7 @@ SessionPlaylists::track (bool inuse, boost::weak_ptr wpl) } { - Glib::Mutex::Lock lm (lock); + Glib::Threads::Mutex::Lock lm (lock); if (!inuse) { @@ -157,14 +154,14 @@ SessionPlaylists::track (bool inuse, boost::weak_ptr wpl) uint32_t SessionPlaylists::n_playlists () const { - Glib::Mutex::Lock lm (lock); + Glib::Threads::Mutex::Lock lm (lock); return playlists.size(); } boost::shared_ptr SessionPlaylists::by_name (string name) { - Glib::Mutex::Lock lm (lock); + Glib::Threads::Mutex::Lock lm (lock); for (List::iterator i = playlists.begin(); i != playlists.end(); ++i) { if ((*i)->name() == name) { @@ -184,7 +181,7 @@ SessionPlaylists::by_name (string name) boost::shared_ptr SessionPlaylists::by_id (const PBD::ID& id) { - Glib::Mutex::Lock lm (lock); + Glib::Threads::Mutex::Lock lm (lock); for (List::iterator i = playlists.begin(); i != playlists.end(); ++i) { if ((*i)->id() == id) { @@ -204,16 +201,16 @@ SessionPlaylists::by_id (const PBD::ID& id) void SessionPlaylists::unassigned (std::list > & list) { - Glib::Mutex::Lock lm (lock); + Glib::Threads::Mutex::Lock lm (lock); for (List::iterator i = playlists.begin(); i != playlists.end(); ++i) { - if (!(*i)->get_orig_diskstream_id().to_s().compare ("0")) { + if (!(*i)->get_orig_track_id().to_s().compare ("0")) { list.push_back (*i); } } for (List::iterator i = unused_playlists.begin(); i != unused_playlists.end(); ++i) { - if (!(*i)->get_orig_diskstream_id().to_s().compare ("0")) { + if (!(*i)->get_orig_track_id().to_s().compare ("0")) { list.push_back (*i); } } @@ -222,13 +219,13 @@ SessionPlaylists::unassigned (std::list > & list) void SessionPlaylists::get (vector >& s) const { - Glib::Mutex::Lock lm (lock); + Glib::Threads::Mutex::Lock lm (lock); - for (List::iterator i = playlists.begin(); i != playlists.end(); ++i) { + for (List::const_iterator i = playlists.begin(); i != playlists.end(); ++i) { s.push_back (*i); } - for (List::iterator i = unused_playlists.begin(); i != unused_playlists.end(); ++i) { + for (List::const_iterator i = unused_playlists.begin(); i != unused_playlists.end(); ++i) { s.push_back (*i); } } @@ -236,7 +233,7 @@ SessionPlaylists::get (vector >& s) const void SessionPlaylists::destroy_region (boost::shared_ptr r) { - Glib::Mutex::Lock lm (lock); + Glib::Threads::Mutex::Lock lm (lock); for (List::iterator i = playlists.begin(); i != playlists.end(); ++i) { (*i)->destroy_region (r); @@ -247,7 +244,6 @@ SessionPlaylists::destroy_region (boost::shared_ptr r) } } - void SessionPlaylists::find_equivalent_playlist_regions (boost::shared_ptr region, vector >& result) { @@ -255,25 +251,39 @@ SessionPlaylists::find_equivalent_playlist_regions (boost::shared_ptr re (*i)->get_region_list_equivalent_regions (region, result); } -/** Return the number of playlists (not regions) that contain @a src */ +/** Return the number of playlists (not regions) that contain @a src + * Important: this counts usage in both used and not-used playlists. + */ uint32_t SessionPlaylists::source_use_count (boost::shared_ptr src) const { uint32_t count = 0; + /* XXXX this can go wildly wrong in the presence of circular references + * between compound regions. + */ + for (List::const_iterator p = playlists.begin(); p != playlists.end(); ++p) { if ((*p)->uses_source (src)) { ++count; break; } } + + for (List::const_iterator p = unused_playlists.begin(); p != unused_playlists.end(); ++p) { + if ((*p)->uses_source (src)) { + ++count; + break; + } + } + return count; } void SessionPlaylists::sync_all_regions_with_regions () { - Glib::Mutex::Lock lm (lock); + Glib::Threads::Mutex::Lock lm (lock); for (List::const_iterator p = playlists.begin(); p != playlists.end(); ++p) { (*p)->sync_all_regions_with_regions (); @@ -292,28 +302,63 @@ SessionPlaylists::update_after_tempo_map_change () } } +namespace { +struct id_compare +{ + bool operator()(const boost::shared_ptr& p1, const boost::shared_ptr& p2) + { + return p1->id () < p2->id (); + } +}; + +typedef std::set > List; +typedef std::set, id_compare> IDSortedList; + +static void +get_id_sorted_playlists (const List& playlists, IDSortedList& id_sorted_playlists) +{ + for (List::const_iterator i = playlists.begin(); i != playlists.end(); ++i) { + id_sorted_playlists.insert(*i); + } +} + +} // anonymous namespace + void -SessionPlaylists::add_state (XMLNode* node, bool full_state) +SessionPlaylists::add_state (XMLNode* node, bool save_template, bool include_unused) { XMLNode* child = node->add_child ("Playlists"); - for (List::iterator i = playlists.begin(); i != playlists.end(); ++i) { - if (!(*i)->hidden()) { - if (full_state) { - child->add_child_nocopy ((*i)->get_state()); - } else { - child->add_child_nocopy ((*i)->get_template()); - } - } + + IDSortedList id_sorted_playlists; + get_id_sorted_playlists (playlists, id_sorted_playlists); + + for (IDSortedList::iterator i = id_sorted_playlists.begin (); i != id_sorted_playlists.end (); ++i) { + if (!(*i)->hidden ()) { + if (save_template) { + child->add_child_nocopy ((*i)->get_template ()); + } else { + child->add_child_nocopy ((*i)->get_state ()); + } + } + } + + if (!include_unused) { + return; } child = node->add_child ("UnusedPlaylists"); - for (List::iterator i = unused_playlists.begin(); i != unused_playlists.end(); ++i) { + + IDSortedList id_sorted_unused_playlists; + get_id_sorted_playlists (unused_playlists, id_sorted_unused_playlists); + + for (IDSortedList::iterator i = id_sorted_unused_playlists.begin (); + i != id_sorted_unused_playlists.end (); ++i) { if (!(*i)->hidden()) { if (!(*i)->empty()) { - if (full_state) { - child->add_child_nocopy ((*i)->get_state()); - } else { + if (save_template) { child->add_child_nocopy ((*i)->get_template()); + } else { + child->add_child_nocopy ((*i)->get_state()); } } } @@ -326,15 +371,39 @@ SessionPlaylists::maybe_delete_unused (boost::function > playlists_tbd; + bool delete_remaining = false; + bool keep_remaining = false; + for (List::iterator x = unused_playlists.begin(); x != unused_playlists.end(); ++x) { + if (keep_remaining) { + break; + } + + if (delete_remaining) { + playlists_tbd.push_back (*x); + continue; + } + int status = ask (*x); switch (status) { case -1: + // abort return true; - case 0: + case -2: + // keep this and all later + keep_remaining = true; + break; + + case 2: + // delete this and all later + delete_remaining = true; + // no break; + + case 1: + // delete this playlists_tbd.push_back (*x); break; @@ -414,7 +483,7 @@ SessionPlaylists::XMLPlaylistFactory (Session& session, const XMLNode& node) boost::shared_ptr SessionPlaylists::find_crossfade (const PBD::ID& id) { - Glib::Mutex::Lock lm (lock); + Glib::Threads::Mutex::Lock lm (lock); boost::shared_ptr c; @@ -438,14 +507,14 @@ SessionPlaylists::find_crossfade (const PBD::ID& id) uint32_t SessionPlaylists::region_use_count (boost::shared_ptr region) const { - Glib::Mutex::Lock lm (lock); + Glib::Threads::Mutex::Lock lm (lock); uint32_t cnt = 0; - for (List::iterator i = playlists.begin(); i != playlists.end(); ++i) { + for (List::const_iterator i = playlists.begin(); i != playlists.end(); ++i) { cnt += (*i)->region_use_count (region); } - for (List::iterator i = unused_playlists.begin(); i != unused_playlists.end(); ++i) { + for (List::const_iterator i = unused_playlists.begin(); i != unused_playlists.end(); ++i) { cnt += (*i)->region_use_count (region); } @@ -458,14 +527,36 @@ SessionPlaylists::playlists_for_track (boost::shared_ptr tr) const { vector > pl; get (pl); - + vector > pl_tr; for (vector >::iterator i = pl.begin(); i != pl.end(); ++i) { - if (((*i)->get_orig_diskstream_id() == tr->diskstream_id()) || (tr->playlist()->id() == (*i)->id())) { + if ( ((*i)->get_orig_track_id() == tr->id()) || + (tr->playlist()->id() == (*i)->id()) || + ((*i)->shared_with (tr->id())) ) + { pl_tr.push_back (*i); } } return pl_tr; } + +void +SessionPlaylists::foreach (boost::function)> functor, bool incl_unused) +{ + Glib::Threads::Mutex::Lock lm (lock); + for (List::iterator i = playlists.begin(); i != playlists.end(); i++) { + if (!(*i)->hidden()) { + functor (*i); + } + } + if (!incl_unused) { + return; + } + for (List::iterator i = unused_playlists.begin(); i != unused_playlists.end(); i++) { + if (!(*i)->hidden()) { + functor (*i); + } + } +}