ardour/livetrax
13
0
Fork 0
Code

Factor source copying into a method and use it in a couple of places where it is missing. Fixes crash on splitting MIDI regions.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@5146 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2009-06-10 00:18:15 +00:00
parent 43340cd37c
commit 57f16be394
2 changed files with 27 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/ardour/ardour/region.h
View File

@ -332,6 +332,10 @@ class Region
SourceList _master_sources;
boost::weak_ptr<ARDOUR::Playlist> _playlist;
private:
void use_sources (SourceList const &);
};
} /* namespace ARDOUR */

54
libs/ardour/region.cc
View File

@ -133,22 +133,7 @@ Region::Region (const SourceList& srcs, nframes_t start, nframes_t length, const
, _pending_changed(Change (0))
, _last_layer_op(0)
{
set<boost::shared_ptr<Source> > unique_srcs;
for (SourceList::const_iterator i=srcs.begin(); i != srcs.end(); ++i) {
_sources.push_back (*i);
(*i)->GoingAway.connect (bind (mem_fun (*this, &Region::source_deleted), (*i)));
unique_srcs.insert (*i);
}
for (SourceList::const_iterator i = srcs.begin(); i != srcs.end(); ++i) {
_master_sources.push_back (*i);
if (unique_srcs.find (*i) == unique_srcs.end()) {
(*i)->GoingAway.connect (bind (mem_fun (*this, &Region::source_deleted), (*i)));
}
}
use_sources (srcs);
assert(_sources.size() > 0);
}
@ -272,21 +257,7 @@ Region::Region (boost::shared_ptr<const Region> other)
_extra_xml = 0;
}
set<boost::shared_ptr<Source> > unique_srcs;
for (SourceList::const_iterator i = other->_sources.begin(); i != other->_sources.end(); ++i) {
_sources.push_back (*i);
(*i)->GoingAway.connect (bind (mem_fun (*this, &Region::source_deleted), (*i)));
unique_srcs.insert (*i);
}
for (SourceList::const_iterator i = other->_master_sources.begin(); i != other->_master_sources.end(); ++i) {
_master_sources.push_back (*i);
if (unique_srcs.find (*i) == unique_srcs.end()) {
(*i)->GoingAway.connect (bind (mem_fun (*this, &Region::source_deleted), (*i)));
}
}
use_sources (other->_sources);
assert(_sources.size() > 0);
}
@ -401,6 +372,8 @@ Region::copy_stuff (boost::shared_ptr<const Region> other, nframes_t offset, nfr
_first_edit = EditChangesNothing;
_last_layer_op = 0;
_positional_lock_style = AudioTime;
use_sources (other->_sources);
}
void
@ -1639,3 +1612,22 @@ Region::invalidate_transients ()
}
void
Region::use_sources (SourceList const & s)
{
set<boost::shared_ptr<Source> > unique_srcs;
for (SourceList::const_iterator i = s.begin (); i != s.end(); ++i) {
_sources.push_back (*i);
(*i)->GoingAway.connect (bind (mem_fun (*this, &Region::source_deleted), *i));
unique_srcs.insert (*i);
}
for (SourceList::const_iterator i = s.begin(); i != s.end(); ++i) {
_master_sources.push_back (*i);
if (unique_srcs.find (*i) == unique_srcs.end()) {
(*i)->GoingAway.connect (bind (mem_fun (*this, &Region::source_deleted), *i));
}
}
}