X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fplaylist.cc;h=139f62cb91d3bdefff3a8be1df263bd88d951206;hb=1bd4c5b3a212460eed1773f6b049d18c89625565;hp=b8a7a44f58557cbac4836f494c60a637b825e66c;hpb=ce234f363e95c38fc92728e520bf5ba240a89aa7;p=ardour.git diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc index b8a7a44f58..139f62cb91 100644 --- a/libs/ardour/playlist.cc +++ b/libs/ardour/playlist.cc @@ -99,37 +99,36 @@ Playlist::Playlist (const Playlist& other, string namestr, bool hide) RegionList tmp; other.copy_regions (tmp); - in_set_state = true; + in_set_state++; for (list >::iterator x = tmp.begin(); x != tmp.end(); ++x) { add_region_internal( (*x), (*x)->position() ); } - in_set_state = false; + in_set_state--; _splicing = other._splicing; _nudging = other._nudging; _edit_mode = other._edit_mode; - in_set_state = false; + in_set_state = 0; in_flush = false; in_partition = false; subcnt = 0; _read_data_count = 0; _frozen = other._frozen; - save_on_thaw = false; layer_op_counter = other.layer_op_counter; freeze_length = other.freeze_length; } -Playlist::Playlist (const Playlist& other, jack_nframes_t start, jack_nframes_t cnt, string str, bool hide) +Playlist::Playlist (const Playlist& other, nframes_t start, nframes_t cnt, string str, bool hide) : _name (str), _session (other._session), _orig_diskstream_id(other._orig_diskstream_id) { RegionLock rlock2 (&((Playlist&)other)); - jack_nframes_t end = start + cnt - 1; + nframes_t end = start + cnt - 1; init (hide); @@ -137,9 +136,9 @@ Playlist::Playlist (const Playlist& other, jack_nframes_t start, jack_nframes_t boost::shared_ptr region; boost::shared_ptr new_region; - jack_nframes_t offset = 0; - jack_nframes_t position = 0; - jack_nframes_t len = 0; + nframes_t offset = 0; + nframes_t position = 0; + nframes_t len = 0; string new_name; OverlapType overlap; @@ -231,14 +230,13 @@ Playlist::init (bool hide) _hidden = hide; _splicing = false; _nudging = false; - in_set_state = false; - _edit_mode = _session.get_edit_mode(); + in_set_state = 0; + _edit_mode = Config->get_edit_mode(); in_flush = false; in_partition = false; subcnt = 0; _read_data_count = 0; _frozen = false; - save_on_thaw = false; layer_op_counter = 0; freeze_length = 0; @@ -333,9 +331,10 @@ void Playlist::notify_region_removed (boost::shared_ptr r) { if (holding_state ()) { - pending_removals.insert (pending_removals.end(), r); + pending_removes.insert (r); + pending_modified = true; + pending_length = true; } else { - RegionRemoved (r); /* EMIT SIGNAL */ /* this might not be true, but we have to act as though it could be. */ @@ -347,13 +346,15 @@ Playlist::notify_region_removed (boost::shared_ptr r) void Playlist::notify_region_added (boost::shared_ptr r) { + /* the length change might not be true, but we have to act + as though it could be. + */ + if (holding_state()) { - pending_adds.insert (pending_adds.end(), r); + pending_adds.insert (r); + pending_modified = true; + pending_length = true; } else { - RegionAdded (r); /* EMIT SIGNAL */ - /* this might not be true, but we have to act - as though it could be. - */ LengthChanged (); /* EMIT SIGNAL */ Modified (); /* EMIT SIGNAL */ } @@ -373,9 +374,8 @@ Playlist::notify_length_changed () void Playlist::flush_notifications () { - RegionList::iterator r; - RegionList::iterator a; set > dependent_checks_needed; + set >::iterator s; uint32_t n = 0; if (in_flush) { @@ -394,7 +394,7 @@ Playlist::flush_notifications () // pending_bounds.sort (cmp); for (RegionList::iterator r = pending_bounds.begin(); r != pending_bounds.end(); ++r) { - if (_session.get_layer_model() == Session::MoveAddHigher) { + if (Config->get_layer_model() == MoveAddHigher) { timestamp_layer_op (*r); } pending_length = true; @@ -406,19 +406,17 @@ Playlist::flush_notifications () /* don't increment n again - its the same list */ } - for (a = pending_adds.begin(); a != pending_adds.end(); ++a) { - dependent_checks_needed.insert (*a); - RegionAdded (*a); /* EMIT SIGNAL */ + for (s = pending_adds.begin(); s != pending_adds.end(); ++s) { + dependent_checks_needed.insert (*s); n++; } - for (set >::iterator x = dependent_checks_needed.begin(); x != dependent_checks_needed.end(); ++x) { - check_dependents (*x, false); + for (s = dependent_checks_needed.begin(); s != dependent_checks_needed.end(); ++s) { + check_dependents (*s, false); } - for (r = pending_removals.begin(); r != pending_removals.end(); ++r) { - remove_dependents (*r); - RegionRemoved (*r); /* EMIT SIGNAL */ + for (s = pending_removes.begin(); s != pending_removes.end(); ++s) { + remove_dependents (*s); n++; } @@ -438,14 +436,9 @@ Playlist::flush_notifications () } pending_adds.clear (); - pending_removals.clear (); + pending_removes.clear (); pending_bounds.clear (); - if (save_on_thaw) { - save_on_thaw = false; - save_state (last_save_reason); - } - in_flush = false; } @@ -454,7 +447,7 @@ Playlist::flush_notifications () *************************************************************/ void -Playlist::add_region (boost::shared_ptr region, jack_nframes_t position, float times, bool with_save) +Playlist::add_region (boost::shared_ptr region, nframes_t position, float times) { RegionLock rlock (this); @@ -462,7 +455,7 @@ Playlist::add_region (boost::shared_ptr region, jack_nframes_t position, int itimes = (int) floor (times); - jack_nframes_t pos = position; + nframes_t pos = position; if (itimes >= 1) { add_region_internal (region, pos, true); @@ -487,23 +480,19 @@ Playlist::add_region (boost::shared_ptr region, jack_nframes_t position, } if (floor (times) != times) { - jack_nframes_t length = (jack_nframes_t) floor (region->length() * (times - floor (times))); + nframes_t length = (nframes_t) floor (region->length() * (times - floor (times))); string name; _session.region_name (name, region->name(), false); boost::shared_ptr sub = RegionFactory::create (region, 0, length, name, region->layer(), region->flags()); add_region_internal (sub, pos, true); } - - if (with_save) { - maybe_save_state (_("add region")); - } } void -Playlist::add_region_internal (boost::shared_ptr region, jack_nframes_t position, bool delay_sort) +Playlist::add_region_internal (boost::shared_ptr region, nframes_t position, bool delay_sort) { RegionSortByPosition cmp; - jack_nframes_t old_length = 0; + nframes_t old_length = 0; if (!holding_state()) { old_length = _get_maximum_extent(); @@ -511,11 +500,11 @@ Playlist::add_region_internal (boost::shared_ptr region, jack_nframes_t region->set_playlist (this); region->set_position (position, this); - region->lock_sources (); timestamp_layer_op (region); regions.insert (upper_bound (regions.begin(), regions.end(), region, cmp), region); + all_regions.insert (region); if (!holding_state () && !in_set_state) { /* layers get assigned from XML state */ @@ -533,11 +522,12 @@ Playlist::add_region_internal (boost::shared_ptr region, jack_nframes_t } } - region->StateChanged.connect (sigc::bind (mem_fun (this, &Playlist::region_changed_proxy), region)); + region->StateChanged.connect (sigc::bind (mem_fun (this, &Playlist::region_changed_proxy), + boost::weak_ptr (region))); } void -Playlist::replace_region (boost::shared_ptr old, boost::shared_ptr newr, jack_nframes_t pos) +Playlist::replace_region (boost::shared_ptr old, boost::shared_ptr newr, nframes_t pos) { RegionLock rlock (this); @@ -547,8 +537,6 @@ Playlist::replace_region (boost::shared_ptr old, boost::shared_ptr region) if (!holding_state ()) { possibly_splice_unlocked (); } - - maybe_save_state (_("remove region")); } int Playlist::remove_region_internal (boost::shared_ptrregion, bool delay_sort) { RegionList::iterator i; - jack_nframes_t old_length = 0; + nframes_t old_length = 0; - // cerr << "removing region " << region->name() << endl; + cerr << "removing region " << region->name() << " holding = " << holding_state() << endl; if (!holding_state()) { old_length = _get_maximum_extent(); @@ -623,7 +609,7 @@ Playlist::get_region_list_equivalent_regions (boost::shared_ptr other, v } void -Playlist::partition (jack_nframes_t start, jack_nframes_t end, bool just_top_level) +Playlist::partition (nframes_t start, nframes_t end, bool just_top_level) { RegionList thawlist; @@ -632,12 +618,10 @@ Playlist::partition (jack_nframes_t start, jack_nframes_t end, bool just_top_lev for (RegionList::iterator i = thawlist.begin(); i != thawlist.end(); ++i) { (*i)->thaw ("separation"); } - - maybe_save_state (_("separate")); } void -Playlist::partition_internal (jack_nframes_t start, jack_nframes_t end, bool cutting, RegionList& thawlist) +Playlist::partition_internal (nframes_t start, nframes_t end, bool cutting, RegionList& thawlist) { RegionLock rlock (this); boost::shared_ptr region; @@ -645,7 +629,7 @@ Playlist::partition_internal (jack_nframes_t start, jack_nframes_t end, bool cut string new_name; RegionList::iterator tmp; OverlapType overlap; - jack_nframes_t pos1, pos2, pos3, pos4; + nframes_t pos1, pos2, pos3, pos4; RegionList new_regions; in_partition = true; @@ -819,11 +803,11 @@ Playlist::partition_internal (jack_nframes_t start, jack_nframes_t end, bool cut } Playlist* -Playlist::cut_copy (Playlist* (Playlist::*pmf)(jack_nframes_t, jack_nframes_t,bool), list& ranges, bool result_is_hidden) +Playlist::cut_copy (Playlist* (Playlist::*pmf)(nframes_t, nframes_t,bool), list& ranges, bool result_is_hidden) { Playlist* ret; Playlist* pl; - jack_nframes_t start; + nframes_t start; if (ranges.empty()) { return 0; @@ -863,19 +847,19 @@ Playlist::cut_copy (Playlist* (Playlist::*pmf)(jack_nframes_t, jack_nframes_t,bo Playlist* Playlist::cut (list& ranges, bool result_is_hidden) { - Playlist* (Playlist::*pmf)(jack_nframes_t,jack_nframes_t,bool) = &Playlist::cut; + Playlist* (Playlist::*pmf)(nframes_t,nframes_t,bool) = &Playlist::cut; return cut_copy (pmf, ranges, result_is_hidden); } Playlist* Playlist::copy (list& ranges, bool result_is_hidden) { - Playlist* (Playlist::*pmf)(jack_nframes_t,jack_nframes_t,bool) = &Playlist::copy; + Playlist* (Playlist::*pmf)(nframes_t,nframes_t,bool) = &Playlist::copy; return cut_copy (pmf, ranges, result_is_hidden); } Playlist * -Playlist::cut (jack_nframes_t start, jack_nframes_t cnt, bool result_is_hidden) +Playlist::cut (nframes_t start, nframes_t cnt, bool result_is_hidden) { Playlist *the_copy; RegionList thawlist; @@ -897,13 +881,11 @@ Playlist::cut (jack_nframes_t start, jack_nframes_t cnt, bool result_is_hidden) (*i)->thaw ("playlist cut"); } - maybe_save_state (_("cut")); - return the_copy; } Playlist * -Playlist::copy (jack_nframes_t start, jack_nframes_t cnt, bool result_is_hidden) +Playlist::copy (nframes_t start, nframes_t cnt, bool result_is_hidden) { char buf[32]; @@ -917,10 +899,10 @@ Playlist::copy (jack_nframes_t start, jack_nframes_t cnt, bool result_is_hidden) } int -Playlist::paste (Playlist& other, jack_nframes_t position, float times) +Playlist::paste (Playlist& other, nframes_t position, float times) { times = fabs (times); - jack_nframes_t old_length; + nframes_t old_length; { RegionLock rl1 (this); @@ -929,8 +911,8 @@ Playlist::paste (Playlist& other, jack_nframes_t position, float times) old_length = _get_maximum_extent(); int itimes = (int) floor (times); - jack_nframes_t pos = position; - jack_nframes_t shift = other._get_maximum_extent(); + nframes_t pos = position; + nframes_t shift = other._get_maximum_extent(); layer_t top_layer = regions.size(); while (itimes--) { @@ -958,20 +940,18 @@ Playlist::paste (Playlist& other, jack_nframes_t position, float times) } - maybe_save_state (_("paste")); - return 0; } void -Playlist::duplicate (boost::shared_ptr region, jack_nframes_t position, float times) +Playlist::duplicate (boost::shared_ptr region, nframes_t position, float times) { times = fabs (times); RegionLock rl (this); int itimes = (int) floor (times); - jack_nframes_t pos = position; + nframes_t pos = position; while (itimes--) { boost::shared_ptr copy = RegionFactory::create (region); @@ -980,18 +960,16 @@ Playlist::duplicate (boost::shared_ptr region, jack_nframes_t position, } if (floor (times) != times) { - jack_nframes_t length = (jack_nframes_t) floor (region->length() * (times - floor (times))); + nframes_t length = (nframes_t) floor (region->length() * (times - floor (times))); string name; _session.region_name (name, region->name(), false); boost::shared_ptr sub = RegionFactory::create (region, 0, length, name, region->layer(), region->flags()); add_region_internal (sub, pos, true); } - - maybe_save_state (_("duplicate")); } void -Playlist::split_region (boost::shared_ptr region, jack_nframes_t playlist_position) +Playlist::split_region (boost::shared_ptr region, nframes_t playlist_position) { RegionLock rl (this); @@ -1006,8 +984,8 @@ Playlist::split_region (boost::shared_ptr region, jack_nframes_t playlis boost::shared_ptr left; boost::shared_ptr right; - jack_nframes_t before; - jack_nframes_t after; + nframes_t before; + nframes_t after; string before_name; string after_name; @@ -1041,8 +1019,6 @@ Playlist::split_region (boost::shared_ptr region, jack_nframes_t playlis if (remove_region_internal (region, true)) { return; } - - maybe_save_state (_("split")); } void @@ -1135,7 +1111,7 @@ Playlist::region_bounds_changed (Change what_changed, boost::shared_ptr if (holding_state ()) { pending_bounds.push_back (region); } else { - if (_session.get_layer_model() == Session::MoveAddHigher) { + if (Config->get_layer_model() == MoveAddHigher) { /* it moved or changed length, so change the timestamp */ timestamp_layer_op (region); } @@ -1149,8 +1125,14 @@ Playlist::region_bounds_changed (Change what_changed, boost::shared_ptr } void -Playlist::region_changed_proxy (Change what_changed, boost::shared_ptr region) +Playlist::region_changed_proxy (Change what_changed, boost::weak_ptr weak_region) { + boost::shared_ptr region (weak_region.lock()); + + if (!region) { + return; + } + /* this makes a virtual call to the right kind of playlist ... */ region_changed (what_changed, region); @@ -1186,24 +1168,21 @@ Playlist::region_changed (Change what_changed, boost::shared_ptr region) } void -Playlist::clear (bool with_save) +Playlist::clear (bool with_signals) { - RegionList::iterator i; - RegionList tmp; - { RegionLock rl (this); - tmp = regions; + for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) { + pending_removes.insert (*i); + } regions.clear (); } - - for (i = tmp.begin(); i != tmp.end(); ++i) { - notify_region_removed (*i); - } - if (with_save) { - maybe_save_state (_("clear")); + if (with_signals) { + LengthChanged (); + Modified (); } + } /*********************************************************************** @@ -1211,7 +1190,7 @@ Playlist::clear (bool with_save) **********************************************************************/ Playlist::RegionList * -Playlist::regions_at (jack_nframes_t frame) +Playlist::regions_at (nframes_t frame) { RegionLock rlock (this); @@ -1219,7 +1198,7 @@ Playlist::regions_at (jack_nframes_t frame) } boost::shared_ptr -Playlist::top_region_at (jack_nframes_t frame) +Playlist::top_region_at (nframes_t frame) { RegionLock rlock (this); @@ -1237,7 +1216,7 @@ Playlist::top_region_at (jack_nframes_t frame) } Playlist::RegionList * -Playlist::find_regions_at (jack_nframes_t frame) +Playlist::find_regions_at (nframes_t frame) { RegionList *rlist = new RegionList; @@ -1251,7 +1230,7 @@ Playlist::find_regions_at (jack_nframes_t frame) } Playlist::RegionList * -Playlist::regions_touched (jack_nframes_t start, jack_nframes_t end) +Playlist::regions_touched (nframes_t start, nframes_t end) { RegionLock rlock (this); RegionList *rlist = new RegionList; @@ -1267,17 +1246,17 @@ Playlist::regions_touched (jack_nframes_t start, jack_nframes_t end) boost::shared_ptr -Playlist::find_next_region (jack_nframes_t frame, RegionPoint point, int dir) +Playlist::find_next_region (nframes_t frame, RegionPoint point, int dir) { RegionLock rlock (this); boost::shared_ptr ret; - jack_nframes_t closest = max_frames; + nframes_t closest = max_frames; for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) { - jack_nframes_t distance; + nframes_t distance; boost::shared_ptr r = (*i); - jack_nframes_t pos = 0; + nframes_t pos = 0; switch (point) { case Start: @@ -1333,8 +1312,6 @@ Playlist::mark_session_dirty () int Playlist::set_state (const XMLNode& node) { - in_set_state = true; - XMLNode *child; XMLNodeList nlist; XMLNodeConstIterator niter; @@ -1344,13 +1321,15 @@ Playlist::set_state (const XMLNode& node) boost::shared_ptr region; string region_name; - clear (false); + in_set_state++; if (node.name() != "Playlist") { - in_set_state = false; + in_set_state--; return -1; } + freeze (); + plist = node.properties(); for (piter = plist.begin(); piter != plist.end(); ++piter) { @@ -1366,6 +1345,8 @@ Playlist::set_state (const XMLNode& node) } } + clear (false); + nlist = node.children(); for (niter = nlist.begin(); niter != nlist.end(); ++niter) { @@ -1374,19 +1355,34 @@ Playlist::set_state (const XMLNode& node) if (child->name() == "Region") { - if ((region = RegionFactory::create (_session, *child, true)) == 0) { - error << _("Playlist: cannot create region from state file") << endmsg; + if ((prop = child->property ("id")) == 0) { + error << _("region state node has no ID, ignored") << endmsg; continue; } + + ID id = prop->value (); + + if ((region = region_by_id (id))) { + + Change what_changed = Change (0); + + if (region->set_live_state (*child, what_changed, true)) { + error << _("Playlist: cannot reset region state from XML") << endmsg; + continue; + } - add_region (region, region->position(), 1.0, false); + } else if ((region = RegionFactory::create (_session, *child, true)) == 0) { + error << _("Playlist: cannot create region from XML") << endmsg; + continue; + } + + add_region (region, region->position(), 1.0); // So that layer_op ordering doesn't get screwed up region->set_last_layer_op( region->layer()); } } - /* update dependents, which was not done during add_region_internal due to in_set_state being true @@ -1395,8 +1391,12 @@ Playlist::set_state (const XMLNode& node) for (RegionList::iterator r = regions.begin(); r != regions.end(); ++r) { check_dependents (*r, false); } - - in_set_state = false; + + notify_modified (); + + thaw (); + + in_set_state--; return 0; } @@ -1421,13 +1421,12 @@ Playlist::state (bool full_state) node->add_property (X_("name"), _name); - _orig_diskstream_id.print (buf); + _orig_diskstream_id.print (buf, sizeof (buf)); node->add_property (X_("orig_diskstream_id"), buf); node->add_property (X_("frozen"), _frozen ? "yes" : "no"); if (full_state) { RegionLock rlock (this, false); - for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) { node->add_child_nocopy ((*i)->get_state()); } @@ -1446,19 +1445,19 @@ Playlist::empty() const return regions.empty(); } -jack_nframes_t +nframes_t Playlist::get_maximum_extent () const { RegionLock rlock (const_cast(this)); return _get_maximum_extent (); } -jack_nframes_t +nframes_t Playlist::_get_maximum_extent () const { RegionList::const_iterator i; - jack_nframes_t max_extent = 0; - jack_nframes_t end = 0; + nframes_t max_extent = 0; + nframes_t end = 0; for (i = regions.begin(); i != regions.end(); ++i) { if ((end = (*i)->position() + (*i)->length()) > max_extent) { @@ -1538,8 +1537,8 @@ Playlist::relayer () freeze (); - if (_session.get_layer_model() == Session::MoveAddHigher || - _session.get_layer_model() == Session::AddHigher) { + if (Config->get_layer_model() == MoveAddHigher || + Config->get_layer_model() == AddHigher) { RegionSortByLastLayerOp cmp; RegionList copy = regions; @@ -1605,8 +1604,8 @@ void Playlist::raise_region_to_top (boost::shared_ptr region) { /* does nothing useful if layering mode is later=higher */ - if ((_session.get_layer_model() == Session::MoveAddHigher) || - (_session.get_layer_model() == Session::AddHigher)) { + if ((Config->get_layer_model() == MoveAddHigher) || + (Config->get_layer_model() == AddHigher)) { timestamp_layer_op (region); relayer (); } @@ -1616,8 +1615,8 @@ void Playlist::lower_region_to_bottom (boost::shared_ptr region) { /* does nothing useful if layering mode is later=higher */ - if ((_session.get_layer_model() == Session::MoveAddHigher) || - (_session.get_layer_model() == Session::AddHigher)) { + if ((Config->get_layer_model() == MoveAddHigher) || + (Config->get_layer_model() == AddHigher)) { region->set_last_layer_op (0); relayer (); } @@ -1695,10 +1694,10 @@ Playlist::move_region_to_layer (layer_t target_layer, boost::shared_ptr } void -Playlist::nudge_after (jack_nframes_t start, jack_nframes_t distance, bool forwards) +Playlist::nudge_after (nframes_t start, nframes_t distance, bool forwards) { RegionList::iterator i; - jack_nframes_t new_pos; + nframes_t new_pos; bool moved = false; _nudging = true; @@ -1735,7 +1734,6 @@ Playlist::nudge_after (jack_nframes_t start, jack_nframes_t distance, bool forwa if (moved) { _nudging = false; - maybe_save_state (_("nudged")); notify_length_changed (); } @@ -1745,26 +1743,31 @@ boost::shared_ptr Playlist::find_region (const ID& id) const { RegionLock rlock (const_cast (this)); - RegionList::const_iterator i; - boost::shared_ptr ret; - for (i = regions.begin(); i != regions.end(); ++i) { + /* searches all regions currently in use by the playlist */ + + for (RegionList::const_iterator i = regions.begin(); i != regions.end(); ++i) { if ((*i)->id() == id) { - ret = *i; + return *i; } } - return ret; + return boost::shared_ptr (); } - -void -Playlist::save_state (std::string why) + +boost::shared_ptr +Playlist::region_by_id (ID id) { - if (!in_set_state) { - StateManager::save_state (why); + /* searches all regions ever added to this playlist */ + + for (set >::iterator i = all_regions.begin(); i != all_regions.end(); ++i) { + if ((*i)->id() == id) { + return *i; + } } + return boost::shared_ptr (); } - + void Playlist::dump () const { @@ -1800,13 +1803,3 @@ Playlist::timestamp_layer_op (boost::shared_ptr region) region->set_last_layer_op (++layer_op_counter); } -void -Playlist::maybe_save_state (string why) -{ - if (holding_state ()) { - save_on_thaw = true; - last_save_reason = why; - } else { - save_state (why); - } -}