X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fregion.cc;h=b89ad2854b575573b7a3a40f7bc63c92ea8c10c3;hb=17088ee3ea5af1e6174b098bb5bcfdaec6ebf9b0;hp=4fcb7de3cac0aa8896136ee820c3d44c93980261;hpb=f6fdd8dcbf41f864e9f0cc32dabe81fe3533ddfe;p=ardour.git diff --git a/libs/ardour/region.cc b/libs/ardour/region.cc index 4fcb7de3ca..b89ad2854b 100644 --- a/libs/ardour/region.cc +++ b/libs/ardour/region.cc @@ -46,178 +46,294 @@ using namespace std; using namespace ARDOUR; using namespace PBD; -Change Region::FadeChanged = ARDOUR::new_change (); -Change Region::SyncOffsetChanged = ARDOUR::new_change (); -Change Region::MuteChanged = ARDOUR::new_change (); -Change Region::OpacityChanged = ARDOUR::new_change (); -Change Region::LockChanged = ARDOUR::new_change (); -Change Region::LayerChanged = ARDOUR::new_change (); -Change Region::HiddenChanged = ARDOUR::new_change (); +namespace ARDOUR { + namespace Properties { + PBD::PropertyDescriptor muted; + PBD::PropertyDescriptor opaque; + PBD::PropertyDescriptor locked; + PBD::PropertyDescriptor automatic; + PBD::PropertyDescriptor whole_file; + PBD::PropertyDescriptor import; + PBD::PropertyDescriptor external; + PBD::PropertyDescriptor sync_marked; + PBD::PropertyDescriptor left_of_split; + PBD::PropertyDescriptor right_of_split; + PBD::PropertyDescriptor hidden; + PBD::PropertyDescriptor position_locked; + PBD::PropertyDescriptor start; + PBD::PropertyDescriptor length; + PBD::PropertyDescriptor position; + PBD::PropertyDescriptor sync_position; + PBD::PropertyDescriptor layer; + PBD::PropertyDescriptor ancestral_start; + PBD::PropertyDescriptor ancestral_length; + PBD::PropertyDescriptor stretch; + PBD::PropertyDescriptor shift; + } +} + +PBD::Signal2,const PropertyChange&> Region::RegionPropertyChanged; -boost::signals2::signal)> Region::RegionPropertyChanged; +void +Region::make_property_quarks () +{ + Properties::muted.property_id = g_quark_from_static_string (X_("muted")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for muted = %1\n", Properties::muted.property_id)); + Properties::opaque.property_id = g_quark_from_static_string (X_("opaque")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for opaque = %1\n", Properties::opaque.property_id)); + Properties::locked.property_id = g_quark_from_static_string (X_("locked")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for locked = %1\n", Properties::locked.property_id)); + Properties::automatic.property_id = g_quark_from_static_string (X_("automatic")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for automatic = %1\n", Properties::automatic.property_id)); + Properties::whole_file.property_id = g_quark_from_static_string (X_("whole-file")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for whole-file = %1\n", Properties::whole_file.property_id)); + Properties::import.property_id = g_quark_from_static_string (X_("import")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for import = %1\n", Properties::import.property_id)); + Properties::external.property_id = g_quark_from_static_string (X_("external")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for external = %1\n", Properties::external.property_id)); + Properties::sync_marked.property_id = g_quark_from_static_string (X_("sync-marked")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for sync-marked = %1\n", Properties::sync_marked.property_id)); + Properties::left_of_split.property_id = g_quark_from_static_string (X_("left-of-split")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for left-of-split = %1\n", Properties::left_of_split.property_id)); + Properties::right_of_split.property_id = g_quark_from_static_string (X_("right-of-split")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for right-of-split = %1\n", Properties::right_of_split.property_id)); + Properties::hidden.property_id = g_quark_from_static_string (X_("hidden")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for hidden = %1\n", Properties::hidden.property_id)); + Properties::position_locked.property_id = g_quark_from_static_string (X_("position-locked")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for position-locked = %1\n", Properties::position_locked.property_id)); + Properties::start.property_id = g_quark_from_static_string (X_("start")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for start = %1\n", Properties::start.property_id)); + Properties::length.property_id = g_quark_from_static_string (X_("length")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for length = %1\n", Properties::length.property_id)); + Properties::position.property_id = g_quark_from_static_string (X_("position")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for position = %1\n", Properties::position.property_id)); + Properties::sync_position.property_id = g_quark_from_static_string (X_("sync-position")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for sync-position = %1\n", Properties::sync_position.property_id)); + Properties::layer.property_id = g_quark_from_static_string (X_("layer")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for layer = %1\n", Properties::layer.property_id)); + Properties::ancestral_start.property_id = g_quark_from_static_string (X_("ancestral-start")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for ancestral-start = %1\n", Properties::ancestral_start.property_id)); + Properties::ancestral_length.property_id = g_quark_from_static_string (X_("ancestral-length")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for ancestral-length = %1\n", Properties::ancestral_length.property_id)); + Properties::stretch.property_id = g_quark_from_static_string (X_("stretch")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for stretch = %1\n", Properties::stretch.property_id)); + Properties::shift.property_id = g_quark_from_static_string (X_("shift")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for shift = %1\n", Properties::shift.property_id)); +} + +void +Region::register_properties () +{ + _xml_node_name = X_("Region"); + + add_property (_muted); + add_property (_opaque); + add_property (_locked); + add_property (_automatic); + add_property (_whole_file); + add_property (_import); + add_property (_external); + add_property (_sync_marked); + add_property (_left_of_split); + add_property (_right_of_split); + add_property (_hidden); + add_property (_position_locked); + add_property (_start); + add_property (_length); + add_property (_position); + add_property (_sync_position); + add_property (_layer); + add_property (_ancestral_start); + add_property (_ancestral_length); + add_property (_stretch); + add_property (_shift); +} + +#define REGION_DEFAULT_STATE(s,l) \ + _muted (Properties::muted, false) \ + , _opaque (Properties::opaque, true) \ + , _locked (Properties::locked, false) \ + , _automatic (Properties::automatic, false) \ + , _whole_file (Properties::whole_file, false) \ + , _import (Properties::import, false) \ + , _external (Properties::external, false) \ + , _sync_marked (Properties::sync_marked, false) \ + , _left_of_split (Properties::left_of_split, false) \ + , _right_of_split (Properties::right_of_split, false) \ + , _hidden (Properties::hidden, false) \ + , _position_locked (Properties::position_locked, false) \ + , _start (Properties::start, (s)) \ + , _length (Properties::length, (l)) \ + , _position (Properties::position, 0) \ + , _sync_position (Properties::sync_position, (s)) \ + , _layer (Properties::layer, 0) \ + , _ancestral_start (Properties::ancestral_start, (s)) \ + , _ancestral_length (Properties::ancestral_length, (l)) \ + , _stretch (Properties::stretch, 1.0) \ + , _shift (Properties::shift, 1.0) + +#define REGION_COPY_STATE(other) \ + _muted (other->_muted) \ + , _opaque (other->_opaque) \ + , _locked (other->_locked) \ + , _automatic (other->_automatic) \ + , _whole_file (other->_whole_file) \ + , _import (other->_import) \ + , _external (other->_external) \ + , _sync_marked (other->_sync_marked) \ + , _left_of_split (other->_left_of_split) \ + , _right_of_split (other->_right_of_split) \ + , _hidden (other->_hidden) \ + , _position_locked (other->_position_locked) \ + , _start(other->_start) \ + , _length(other->_length) \ + , _position(other->_position) \ + , _sync_position(other->_sync_position) \ + , _layer (other->_layer) \ + , _ancestral_start (other->_ancestral_start) \ + , _ancestral_length (other->_ancestral_length) \ + , _stretch (other->_stretch) \ + , _shift (other->_shift) /* derived-from-derived constructor (no sources in constructor) */ -Region::Region (Session& s, nframes_t start, nframes_t length, const string& name, DataType type, layer_t layer, Region::Flag flags) +Region::Region (Session& s, framepos_t start, framecnt_t length, const string& name, DataType type) : SessionObject(s, name) , _type(type) - , _flags(Flag (flags|DoNotSendPropertyChanges)) - , _start(start) - , _length(length) - , _position(0) - , _last_position(0) + , REGION_DEFAULT_STATE(start,length) + , _last_length (length) + , _last_position (0) , _positional_lock_style(AudioTime) - , _sync_position(_start) - , _layer(layer) - , _first_edit(EditChangesNothing) - , _frozen(0) - , _ancestral_start (0) - , _ancestral_length (0) - , _stretch(1.0) - , _shift(1.0) + , _first_edit (EditChangesNothing) , _read_data_count(0) - , _pending_changed(Change (0)) , _last_layer_op(0) , _pending_explicit_relayer (false) { + register_properties (); + /* no sources at this point */ } -/** Basic Region constructor (single source) */ -Region::Region (boost::shared_ptr src, nframes_t start, nframes_t length, const string& name, DataType type, layer_t layer, Region::Flag flags) - : SessionObject(src->session(), name) - , _type(type) - , _flags(Flag (flags|DoNotSendPropertyChanges)) - , _start(start) - , _length(length) - , _position(0) - , _last_position(0) - , _positional_lock_style(AudioTime) - , _sync_position(_start) - , _layer(layer) - , _first_edit(EditChangesNothing) - , _frozen(0) - , _ancestral_start (0) - , _ancestral_length (0) - , _stretch (1.0) - , _shift (1.0) +/** Basic Region constructor (many sources) */ +Region::Region (const SourceList& srcs) + : SessionObject(srcs.front()->session(), "toBeRenamed") + , _type (srcs.front()->type()) + , REGION_DEFAULT_STATE(0,0) + , _last_length (0) + , _last_position (0) + , _positional_lock_style (_type == DataType::AUDIO ? AudioTime : MusicTime) + , _first_edit (EditChangesNothing) , _valid_transients(false) , _read_data_count(0) - , _pending_changed(Change (0)) - , _last_layer_op(0) + , _last_layer_op (0) , _pending_explicit_relayer (false) { - _sources.push_back (src); - _master_sources.push_back (src); - - scoped_connect (src->GoingAway, boost::bind (&Region::source_deleted, this, boost::weak_ptr(src))); + register_properties (); - assert(_sources.size() > 0); - _positional_lock_style = AudioTime; -} + _type = srcs.front()->type(); -/** Basic Region constructor (many sources) */ -Region::Region (const SourceList& srcs, nframes_t start, nframes_t length, const string& name, DataType type, layer_t layer, Region::Flag flags) - : SessionObject(srcs.front()->session(), name) - , _type(type) - , _flags(Flag (flags|DoNotSendPropertyChanges)) - , _start(start) - , _length(length) - , _position(0) - , _last_position(0) - , _positional_lock_style(AudioTime) - , _sync_position(_start) - , _layer(layer) - , _first_edit(EditChangesNothing) - , _frozen(0) - , _ancestral_start (0) - , _ancestral_length (0) - , _stretch(1.0) - , _shift(1.0) - , _read_data_count(0) - , _pending_changed(Change (0)) - , _last_layer_op(0) - , _pending_explicit_relayer (false) -{ use_sources (srcs); + assert(_sources.size() > 0); + assert (_type == srcs.front()->type()); } -/** Create a new Region from part of an existing one */ -Region::Region (boost::shared_ptr other, nframes_t offset, nframes_t length, const string& name, layer_t layer, Flag flags) - : SessionObject(other->session(), name) +/** Create a new Region from part of an existing one, starting at one of two places: + + if @param offset_relative is true, then the start within @param other is given by @param offset + (i.e. relative to the start of @param other's sources, the start is @param offset + @param other.start() + + if @param offset_relative is false, then the start within the source is given @param offset. +*/ +Region::Region (boost::shared_ptr other, frameoffset_t offset, bool offset_relative) + : SessionObject(other->session(), other->name()) , _type (other->data_type()) + , REGION_COPY_STATE (other) + , _last_length (other->_last_length) + , _last_position(other->_last_position) \ + , _positional_lock_style(other->_positional_lock_style) \ + , _first_edit (EditChangesNothing) + , _valid_transients(false) + , _read_data_count(0) + , _last_layer_op (0) , _pending_explicit_relayer (false) { - _start = other->_start + offset; - copy_stuff (other, offset, length, name, layer, flags); + register_properties (); - _flags = Flag (_flags | DoNotSendPropertyChanges); + /* override state that may have been incorrectly inherited from the other region + */ - /* if the other region had a distinct sync point - set, then continue to use it as best we can. - otherwise, reset sync point back to start. - */ + _position = 0; + _locked = false; + _whole_file = false; + _hidden = false; - if (other->flags() & SyncMarked) { - if (other->_sync_position < _start) { - _flags = Flag (_flags & ~SyncMarked); - _sync_position = _start; - } else { - _sync_position = other->_sync_position; - } - } else { - _flags = Flag (_flags & ~SyncMarked); - _sync_position = _start; - } + use_sources (other->_sources); - if (Profile->get_sae()) { - /* reset sync point to start if its ended up - outside region bounds. + if (!offset_relative) { + + /* not sure why we do this, but its a hangover from ardour before + property lists. this would be nice to remove. */ - if (_sync_position < _start || _sync_position >= _start + _length) { - _flags = Flag (_flags & ~SyncMarked); - _sync_position = _start; + _positional_lock_style = other->_positional_lock_style; + _first_edit = other->_first_edit; + + if (offset == 0) { + + _start = 0; + + /* sync pos is relative to start of file. our start-in-file is now zero, + so set our sync position to whatever the the difference between + _start and _sync_pos was in the other region. + + result is that our new sync pos points to the same point in our source(s) + as the sync in the other region did in its source(s). + + since we start at zero in our source(s), it is not possible to use a sync point that + is before the start. reset it to _start if that was true in the other region. + */ + + if (other->sync_marked()) { + if (other->_start < other->_sync_position) { + /* sync pos was after the start point of the other region */ + _sync_position = other->_sync_position - other->_start; + } else { + /* sync pos was before the start point of the other region. not possible here. */ + _sync_marked = false; + _sync_position = _start; + } + } else { + _sync_marked = false; + _sync_position = _start; + } + } else { + /* XXX do something else ! */ + fatal << string_compose (_("programming error: %1"), X_("Region+offset constructor used with illegal combination of offset+relative")) + << endmsg; + /*NOTREACHED*/ } - } -} - -Region::Region (boost::shared_ptr other, nframes_t length, const string& name, layer_t layer, Flag flags) - : SessionObject(other->session(), name) - , _type (other->data_type()) - , _pending_explicit_relayer (false) -{ - /* create a new Region exactly like another but starting at 0 in its sources */ - _start = 0; - copy_stuff (other, 0, length, name, layer, flags); - - _flags = Flag (_flags | DoNotSendPropertyChanges); - - /* sync pos is relative to start of file. our start-in-file is now zero, - so set our sync position to whatever the the difference between - _start and _sync_pos was in the other region. - - result is that our new sync pos points to the same point in our source(s) - as the sync in the other region did in its source(s). - - since we start at zero in our source(s), it is not possible to use a sync point that - is before the start. reset it to _start if that was true in the other region. - */ + } else { - if (other->flags() & SyncMarked) { - if (other->_start < other->_sync_position) { - /* sync pos was after the start point of the other region */ - _sync_position = other->_sync_position - other->_start; + _start = other->_start + offset; + + /* if the other region had a distinct sync point + set, then continue to use it as best we can. + otherwise, reset sync point back to start. + */ + + if (other->sync_marked()) { + if (other->_sync_position < _start) { + _sync_marked = false; + _sync_position = _start; + } else { + _sync_position = other->_sync_position; + } } else { - /* sync pos was before the start point of the other region. not possible here. */ - _flags = Flag (_flags & ~SyncMarked); + _sync_marked = false; _sync_position = _start; } - } else { - _flags = Flag (_flags & ~SyncMarked); - _sync_position = _start; } if (Profile->get_sae()) { @@ -226,42 +342,32 @@ Region::Region (boost::shared_ptr other, nframes_t length, const s */ if (_sync_position < _start || _sync_position >= _start + _length) { - _flags = Flag (_flags & ~SyncMarked); + _sync_marked = false; _sync_position = _start; } } - /* reset a couple of things that copy_stuff() gets wrong in this particular case */ - - _positional_lock_style = other->_positional_lock_style; - _first_edit = other->_first_edit; + assert (_type == other->data_type()); } -/** Pure copy constructor */ -Region::Region (boost::shared_ptr other) - : SessionObject(other->session(), other->name()) - , _type(other->data_type()) - , _flags(Flag(other->_flags & ~(Locked|PositionLocked))) - , _start(other->_start) - , _length(other->_length) - , _position(other->_position) - , _last_position(other->_last_position) - , _positional_lock_style(other->_positional_lock_style) - , _sync_position(other->_sync_position) - , _layer(other->_layer) - , _first_edit(EditChangesID) - , _frozen(0) - , _ancestral_start (other->_ancestral_start) - , _ancestral_length (other->_ancestral_length) - , _stretch (other->_stretch) - , _shift (other->_shift) - , _valid_transients(false) - , _read_data_count(0) - , _pending_changed(Change(0)) - , _last_layer_op(other->_last_layer_op) +/** Create a copy of @param other but with different sources. Used by filters */ +Region::Region (boost::shared_ptr other, const SourceList& srcs) + : SessionObject (other->session(), other->name()) + , _type (srcs.front()->type()) + , REGION_COPY_STATE (other) + , _last_length (other->_last_length) + , _last_position (other->_last_position) + , _positional_lock_style (other->_positional_lock_style) + , _first_edit (EditChangesID) + , _valid_transients (false) + , _read_data_count (0) + , _last_layer_op (other->_last_layer_op) , _pending_explicit_relayer (false) { - _flags = Flag (_flags | DoNotSendPropertyChanges); + register_properties (); + + _locked = false; + _position_locked = false; other->_first_edit = EditChangesName; @@ -271,101 +377,44 @@ Region::Region (boost::shared_ptr other) _extra_xml = 0; } - use_sources (other->_sources); + use_sources (srcs); assert(_sources.size() > 0); } -Region::Region (const SourceList& srcs, const XMLNode& node) - : SessionObject(srcs.front()->session(), X_("error: XML did not reset this")) - , _type(DataType::NIL) // to be loaded from XML - , _flags(DoNotSendPropertyChanges) - , _start(0) - , _length(0) - , _position(0) - , _last_position(0) - , _positional_lock_style(AudioTime) - , _sync_position(_start) - , _layer(0) - , _first_edit(EditChangesNothing) - , _frozen(0) - , _stretch(1.0) - , _shift(1.0) +/** Simple "copy" constructor */ +Region::Region (boost::shared_ptr other) + : SessionObject(other->session(), other->name()) + , _type(other->data_type()) + , REGION_COPY_STATE (other) + , _last_length (other->_last_length) + , _last_position (other->_last_position) + , _positional_lock_style (other->_positional_lock_style) + , _first_edit (EditChangesID) + , _valid_transients(false) , _read_data_count(0) - , _pending_changed(Change(0)) - , _last_layer_op(0) + , _last_layer_op(other->_last_layer_op) , _pending_explicit_relayer (false) { - use_sources (srcs); + register_properties (); - if (set_state (node, Stateful::loading_state_version)) { - throw failed_constructor(); - } - - assert(_type != DataType::NIL); - assert(_sources.size() > 0); -} + _locked = false; + _position_locked = false; -Region::Region (boost::shared_ptr src, const XMLNode& node) - : SessionObject(src->session(), X_("error: XML did not reset this")) - , _type(DataType::NIL) - , _flags(DoNotSendPropertyChanges) - , _start(0) - , _length(0) - , _position(0) - , _last_position(0) - , _positional_lock_style(AudioTime) - , _sync_position(_start) - , _layer(0) - , _first_edit(EditChangesNothing) - , _frozen(0) - , _stretch(1.0) - , _shift(1.0) - , _read_data_count(0) - , _pending_changed(Change(0)) - , _last_layer_op(0) - , _pending_explicit_relayer (false) -{ - _sources.push_back (src); + other->_first_edit = EditChangesName; - if (set_state (node, Stateful::loading_state_version)) { - throw failed_constructor(); + if (other->_extra_xml) { + _extra_xml = new XMLNode (*other->_extra_xml); + } else { + _extra_xml = 0; } - assert(_type != DataType::NIL); + use_sources (other->_sources); assert(_sources.size() > 0); } Region::~Region () { DEBUG_TRACE (DEBUG::Destruction, string_compose ("Region %1 destructor @ %2\n", _name, this)); - drop_references (); -} - -void -Region::copy_stuff (boost::shared_ptr other, nframes_t /*offset*/, nframes_t length, const string& name, layer_t layer, Flag flags) -{ - _frozen = 0; - _pending_changed = Change (0); - _read_data_count = 0; - _valid_transients = false; - - _length = length; - _last_length = length; - _sync_position = other->_sync_position; - _ancestral_start = other->_ancestral_start; - _ancestral_length = other->_ancestral_length; - _stretch = other->_stretch; - _shift = other->_shift; - _name = name; - _last_position = 0; - _position = 0; - _layer = layer; - _flags = Flag (flags & ~(Locked|WholeFile|Hidden)); - _first_edit = EditChangesNothing; - _last_layer_op = 0; - _positional_lock_style = AudioTime; - - use_sources (other->_sources); } void @@ -380,17 +429,17 @@ Region::set_name (const std::string& str) if (_name != str) { SessionObject::set_name(str); // EMIT SIGNAL NameChanged() assert(_name == str); - send_change (ARDOUR::NameChanged); + send_change (Properties::name); } return true; } void -Region::set_length (nframes_t len, void */*src*/) +Region::set_length (framecnt_t len, void */*src*/) { //cerr << "Region::set_length() len = " << len << endl; - if (_flags & Locked) { + if (locked()) { return; } @@ -411,24 +460,23 @@ Region::set_length (nframes_t len, void */*src*/) _last_length = _length; _length = len; - - _flags = Region::Flag (_flags & ~WholeFile); - + _whole_file = false; first_edit (); maybe_uncopy (); invalidate_transients (); - if (!_frozen) { + if (!property_changes_suspended()) { recompute_at_end (); } - send_change (LengthChanged); + send_change (Properties::length); } } void Region::maybe_uncopy () { + /* this does nothing but marked a semantic moment once upon a time */ } void @@ -441,7 +489,7 @@ Region::first_edit () _name = _session.new_region_name (_name); _first_edit = EditChangesNothing; - send_change (ARDOUR::NameChanged); + send_change (Properties::name); RegionFactory::CheckNewRegion (shared_from_this()); } } @@ -483,7 +531,7 @@ Region::move_to_natural_position (void *src) } void -Region::special_set_position (nframes_t pos) +Region::special_set_position (framepos_t pos) { /* this is used when creating a whole file region as a way to store its "natural" or "captured" position. @@ -520,12 +568,12 @@ Region::update_position_after_tempo_map_change () } TempoMap& map (_session.tempo_map()); - nframes_t pos = map.frame_time (_bbt_time); + framepos_t pos = map.frame_time (_bbt_time); set_position_internal (pos, false); } void -Region::set_position (nframes_t pos, void* /*src*/) +Region::set_position (framepos_t pos, void* /*src*/) { if (!can_move()) { return; @@ -535,7 +583,7 @@ Region::set_position (nframes_t pos, void* /*src*/) } void -Region::set_position_internal (nframes_t pos, bool allow_bbt_recompute) +Region::set_position_internal (framepos_t pos, bool allow_bbt_recompute) { if (_position != pos) { _last_position = _position; @@ -563,13 +611,13 @@ Region::set_position_internal (nframes_t pos, bool allow_bbt_recompute) a GUI that has moved its representation already. */ - send_change (PositionChanged); + send_change (Properties::position); } void -Region::set_position_on_top (nframes_t pos, void* /*src*/) +Region::set_position_on_top (framepos_t pos, void* /*src*/) { - if (_flags & Locked) { + if (locked()) { return; } @@ -588,7 +636,7 @@ Region::set_position_on_top (nframes_t pos, void* /*src*/) a GUI that has moved its representation already. */ - send_change (PositionChanged); + send_change (Properties::position); } void @@ -600,9 +648,9 @@ Region::recompute_position_from_lock_style () } void -Region::nudge_position (nframes64_t n, void* /*src*/) +Region::nudge_position (frameoffset_t n, void* /*src*/) { - if (_flags & Locked) { + if (locked()) { return; } @@ -619,18 +667,18 @@ Region::nudge_position (nframes64_t n, void* /*src*/) _position += n; } } else { - if (_position < (nframes_t) -n) { + if (_position < -n) { _position = 0; } else { _position += n; } } - send_change (PositionChanged); + send_change (Properties::position); } void -Region::set_ancestral_data (nframes64_t s, nframes64_t l, float st, float sh) +Region::set_ancestral_data (framepos_t s, framecnt_t l, float st, float sh) { _ancestral_length = l; _ancestral_start = s; @@ -639,9 +687,9 @@ Region::set_ancestral_data (nframes64_t s, nframes64_t l, float st, float sh) } void -Region::set_start (nframes_t pos, void* /*src*/) +Region::set_start (framepos_t pos, void* /*src*/) { - if (_flags & (Locked|PositionLocked)) { + if (locked() || position_locked()) { return; } /* This just sets the start, nothing else. It effectively shifts @@ -656,22 +704,22 @@ Region::set_start (nframes_t pos, void* /*src*/) } _start = pos; - _flags = Region::Flag (_flags & ~WholeFile); + _whole_file = false; first_edit (); invalidate_transients (); - send_change (StartChanged); + send_change (Properties::start); } } void -Region::trim_start (nframes_t new_position, void */*src*/) +Region::trim_start (framepos_t new_position, void */*src*/) { - if (_flags & (Locked|PositionLocked)) { + if (locked() || position_locked()) { return; } - nframes_t new_start; - int32_t start_shift; + framepos_t new_start; + frameoffset_t start_shift; if (new_position > _position) { start_shift = new_position - _position; @@ -693,7 +741,7 @@ Region::trim_start (nframes_t new_position, void */*src*/) } else if (start_shift < 0) { - if (_start < (nframes_t) -start_shift) { + if (_start < -start_shift) { new_start = 0; } else { new_start = _start + start_shift; @@ -707,21 +755,21 @@ Region::trim_start (nframes_t new_position, void */*src*/) } _start = new_start; - _flags = Region::Flag (_flags & ~WholeFile); + _whole_file = false; first_edit (); - send_change (StartChanged); + send_change (Properties::start); } void -Region::trim_front (nframes_t new_position, void *src) +Region::trim_front (framepos_t new_position, void *src) { - if (_flags & Locked) { + if (locked()) { return; } - nframes_t end = last_frame(); - nframes_t source_zero; + framepos_t end = last_frame(); + framepos_t source_zero; if (_position > _start) { source_zero = _position - _start; @@ -731,7 +779,7 @@ Region::trim_front (nframes_t new_position, void *src) if (new_position < end) { /* can't trim it zero or negative length */ - nframes_t newlen; + framecnt_t newlen; /* can't trim it back passed where source position zero is located */ @@ -745,7 +793,7 @@ Region::trim_front (nframes_t new_position, void *src) } trim_to_internal (new_position, newlen, src); - if (!_frozen) { + if (!property_changes_suspended()) { recompute_at_start (); } } @@ -756,42 +804,42 @@ Region::trim_front (nframes_t new_position, void *src) */ void -Region::trim_end (nframes_t new_endpoint, void */*src*/) +Region::trim_end (framepos_t new_endpoint, void */*src*/) { - if (_flags & Locked) { + if (locked()) { return; } if (new_endpoint > _position) { trim_to_internal (_position, new_endpoint - _position + 1, this); - if (!_frozen) { + if (!property_changes_suspended()) { recompute_at_end (); } } } void -Region::trim_to (nframes_t position, nframes_t length, void *src) +Region::trim_to (framepos_t position, framecnt_t length, void *src) { - if (_flags & Locked) { + if (locked()) { return; } trim_to_internal (position, length, src); - if (!_frozen) { + if (!property_changes_suspended()) { recompute_at_start (); recompute_at_end (); } } void -Region::trim_to_internal (nframes_t position, nframes_t length, void */*src*/) +Region::trim_to_internal (framepos_t position, framecnt_t length, void */*src*/) { - int32_t start_shift; - nframes_t new_start; + frameoffset_t start_shift; + framepos_t new_start; - if (_flags & Locked) { + if (locked()) { return; } @@ -812,7 +860,7 @@ Region::trim_to_internal (nframes_t position, nframes_t length, void */*src*/) } else if (start_shift < 0) { - if (_start < (nframes_t) -start_shift) { + if (_start < -start_shift) { new_start = 0; } else { new_start = _start + start_shift; @@ -825,34 +873,39 @@ Region::trim_to_internal (nframes_t position, nframes_t length, void */*src*/) return; } - Change what_changed = Change (0); + PropertyChange what_changed; if (_start != new_start) { _start = new_start; - what_changed = Change (what_changed|StartChanged); + what_changed.add (Properties::start); } if (_length != length) { - if (!_frozen) { + if (!property_changes_suspended()) { _last_length = _length; } _length = length; - what_changed = Change (what_changed|LengthChanged); + what_changed.add (Properties::length); } if (_position != position) { - if (!_frozen) { + if (!property_changes_suspended()) { _last_position = _position; } _position = position; - what_changed = Change (what_changed|PositionChanged); + what_changed.add (Properties::position); } - _flags = Region::Flag (_flags & ~WholeFile); + _whole_file = false; + + PropertyChange start_and_length; - if (what_changed & (StartChanged|LengthChanged)) { + start_and_length.add (Properties::start); + start_and_length.add (Properties::length); + + if (what_changed.contains (start_and_length)) { first_edit (); } - if (what_changed) { + if (!what_changed.empty()) { send_change (what_changed); } } @@ -861,29 +914,31 @@ void Region::set_hidden (bool yn) { if (hidden() != yn) { + _hidden = yn; + send_change (Properties::hidden); + } +} - if (yn) { - _flags = Flag (_flags|Hidden); - } else { - _flags = Flag (_flags & ~Hidden); - } +void +Region::set_whole_file (bool yn) +{ + _whole_file = yn; + /* no change signal */ +} - send_change (HiddenChanged); - } +void +Region::set_automatic (bool yn) +{ + _automatic = yn; + /* no change signal */ } void Region::set_muted (bool yn) { if (muted() != yn) { - - if (yn) { - _flags = Flag (_flags|Muted); - } else { - _flags = Flag (_flags & ~Muted); - } - - send_change (MuteChanged); + _muted = yn; + send_change (Properties::muted); } } @@ -891,12 +946,8 @@ void Region::set_opaque (bool yn) { if (opaque() != yn) { - if (yn) { - _flags = Flag (_flags|Opaque); - } else { - _flags = Flag (_flags & ~Opaque); - } - send_change (OpacityChanged); + _opaque = yn; + send_change (Properties::opaque); } } @@ -904,12 +955,8 @@ void Region::set_locked (bool yn) { if (locked() != yn) { - if (yn) { - _flags = Flag (_flags|Locked); - } else { - _flags = Flag (_flags & ~Locked); - } - send_change (LockChanged); + _locked = yn; + send_change (Properties::locked); } } @@ -917,51 +964,44 @@ void Region::set_position_locked (bool yn) { if (position_locked() != yn) { - if (yn) { - _flags = Flag (_flags|PositionLocked); - } else { - _flags = Flag (_flags & ~PositionLocked); - } - send_change (LockChanged); + _position_locked = yn; + send_change (Properties::locked); } } void -Region::set_sync_position (nframes_t absolute_pos) +Region::set_sync_position (framepos_t absolute_pos) { - nframes_t const file_pos = _start + (absolute_pos - _position); + framepos_t const file_pos = _start + (absolute_pos - _position); if (file_pos != _sync_position) { - + _sync_marked = true; _sync_position = file_pos; - _flags = Flag (_flags|SyncMarked); - - if (!_frozen) { + if (!property_changes_suspended()) { maybe_uncopy (); } - send_change (SyncOffsetChanged); + send_change (Properties::sync_position); } } void Region::clear_sync_position () { - if (_flags & SyncMarked) { - _flags = Flag (_flags & ~SyncMarked); - - if (!_frozen) { + if (sync_marked()) { + _sync_marked = false; + if (!property_changes_suspended()) { maybe_uncopy (); } - send_change (SyncOffsetChanged); + send_change (Properties::sync_position); } } -nframes_t +framepos_t Region::sync_offset (int& dir) const { /* returns the sync point relative the first frame of the region */ - if (_flags & SyncMarked) { + if (sync_marked()) { if (_sync_position > _start) { dir = 1; return _sync_position - _start; @@ -975,11 +1015,11 @@ Region::sync_offset (int& dir) const } } -nframes_t -Region::adjust_to_sync (nframes_t pos) const +framepos_t +Region::adjust_to_sync (framepos_t pos) const { int sync_dir; - nframes_t offset = sync_offset (sync_dir); + frameoffset_t offset = sync_offset (sync_dir); // cerr << "adjusting pos = " << pos << " to sync at " << _sync_position << " offset = " << offset << " with dir = " << sync_dir << endl; @@ -998,10 +1038,10 @@ Region::adjust_to_sync (nframes_t pos) const return pos; } -nframes_t +framepos_t Region::sync_position() const { - if (_flags & SyncMarked) { + if (sync_marked()) { return _sync_position; } else { return _start; @@ -1051,7 +1091,7 @@ Region::set_layer (layer_t l) if (_layer != l) { _layer = l; - send_change (LayerChanged); + send_change (Properties::layer); } } @@ -1062,24 +1102,11 @@ Region::state (bool /*full_state*/) char buf[64]; const char* fe = NULL; + add_properties (*node); + _id.print (buf, sizeof (buf)); node->add_property ("id", buf); - node->add_property ("name", _name); node->add_property ("type", _type.to_string()); - snprintf (buf, sizeof (buf), "%u", _start); - node->add_property ("start", buf); - snprintf (buf, sizeof (buf), "%u", _length); - node->add_property ("length", buf); - snprintf (buf, sizeof (buf), "%u", _position); - node->add_property ("position", buf); - snprintf (buf, sizeof (buf), "%" PRIi64, _ancestral_start); - node->add_property ("ancestral-start", buf); - snprintf (buf, sizeof (buf), "%" PRIi64, _ancestral_length); - node->add_property ("ancestral-length", buf); - snprintf (buf, sizeof (buf), "%.12g", _stretch); - node->add_property ("stretch", buf); - snprintf (buf, sizeof (buf), "%.12g", _shift); - node->add_property ("shift", buf); switch (_first_edit) { case EditChangesNothing: @@ -1100,11 +1127,6 @@ Region::state (bool /*full_state*/) /* note: flags are stored by derived classes */ - snprintf (buf, sizeof (buf), "%d", (int) _layer); - node->add_property ("layer", buf); - snprintf (buf, sizeof (buf), "%" PRIu32, _sync_position); - node->add_property ("sync-position", buf); - if (_positional_lock_style != AudioTime) { node->add_property ("positional-lock-style", enum_2_string (_positional_lock_style)); stringstream str; @@ -1122,82 +1144,21 @@ Region::get_state () } int -Region::set_live_state (const XMLNode& node, int /*version*/, Change& what_changed, bool send) +Region::set_state (const XMLNode& node, int version) { - const XMLNodeList& nlist = node.children(); - const XMLProperty *prop; - nframes_t val; - - /* this is responsible for setting those aspects of Region state - that are mutable after construction. - */ - - if ((prop = node.property ("name")) == 0) { - error << _("XMLNode describing a Region is incomplete (no name)") << endmsg; - return -1; - } - - _name = prop->value(); - - if ((prop = node.property ("type")) == 0) { - _type = DataType::AUDIO; - } else { - _type = DataType(prop->value()); - } - - if ((prop = node.property ("start")) != 0) { - sscanf (prop->value().c_str(), "%" PRIu32, &val); - if (val != _start) { - what_changed = Change (what_changed|StartChanged); - _start = val; - } - } else { - _start = 0; - } - - if ((prop = node.property ("length")) != 0) { - sscanf (prop->value().c_str(), "%" PRIu32, &val); - if (val != _length) { - what_changed = Change (what_changed|LengthChanged); - _last_length = _length; - _length = val; - } - } else { - _last_length = _length; - _length = 1; - } + PropertyChange what_changed; + return _set_state (node, version, what_changed, true); +} - if ((prop = node.property ("position")) != 0) { - sscanf (prop->value().c_str(), "%" PRIu32, &val); - if (val != _position) { - what_changed = Change (what_changed|PositionChanged); - _last_position = _position; - _position = val; - } - } else { - _last_position = _position; - _position = 0; - } +int +Region::_set_state (const XMLNode& node, int version, PropertyChange& what_changed, bool send) +{ + const XMLProperty* prop; - if ((prop = node.property ("layer")) != 0) { - layer_t x; - x = (layer_t) atoi (prop->value().c_str()); - if (x != _layer) { - what_changed = Change (what_changed|LayerChanged); - _layer = x; - } - } else { - _layer = 0; - } + what_changed = set_properties (node); - if ((prop = node.property ("sync-position")) != 0) { - sscanf (prop->value().c_str(), "%" PRIu32, &val); - if (val != _sync_position) { - what_changed = Change (what_changed|SyncOffsetChanged); - _sync_position = val; - } - } else { - _sync_position = _start; + if ((prop = node.property (X_("id")))) { + _id = prop->value(); } if ((prop = node.property ("positional-lock-style")) != 0) { @@ -1217,57 +1178,20 @@ Region::set_live_state (const XMLNode& node, int /*version*/, Change& what_chang } } - } else { - _positional_lock_style = AudioTime; } - /* XXX FIRST EDIT !!! */ - - /* these 3 properties never change as a result of any editing */ - - if ((prop = node.property ("ancestral-start")) != 0) { - _ancestral_start = strtoll (prop->value().c_str(), 0, 10); - } else { - _ancestral_start = _start; - } - - if ((prop = node.property ("ancestral-length")) != 0) { - _ancestral_length = strtoll (prop->value().c_str(), 0, 10); - } else { - _ancestral_length = _length; - } - - if ((prop = node.property ("stretch")) != 0) { - _stretch = atof (prop->value()); - - /* fix problem with old sessions corrupted by an impossible - value for _stretch - */ - if (_stretch == 0.0) { - _stretch = 1.0; - } - } else { - _stretch = 1.0; + /* fix problems with old sessions corrupted by impossible + values for _stretch or _shift + */ + if (_stretch == 0.0f) { + _stretch = 1.0f; } - - if ((prop = node.property ("shift")) != 0) { - _shift = atof (prop->value()); - - /* fix problem with old sessions corrupted by an impossible - value for _shift - */ - if (_shift == 0.0) { - _shift = 1.0; - } - } else { - _shift = 1.0; + + if (_shift == 0.0f) { + _shift = 1.0f; } - - /* note: derived classes set flags */ - - delete _extra_xml; - _extra_xml = 0; + const XMLNodeList& nlist = node.children(); for (XMLNodeConstIterator niter = nlist.begin(); niter != nlist.end(); ++niter) { @@ -1276,107 +1200,65 @@ Region::set_live_state (const XMLNode& node, int /*version*/, Change& what_chang child = (*niter); if (child->name () == "Extra") { + delete _extra_xml; _extra_xml = new XMLNode (*child); break; } } if (send) { + cerr << _name << ": final change to be sent: "; + for (PropertyChange::iterator i = what_changed.begin(); i != what_changed.end(); ++i) { + cerr << g_quark_to_string ((GQuark) *i) << ' '; + } + cerr << endl; send_change (what_changed); } return 0; } -int -Region::set_state (const XMLNode& node, int version) -{ - const XMLProperty *prop; - Change what_changed = Change (0); - - /* ID is not allowed to change, ever */ - - if ((prop = node.property ("id")) == 0) { - error << _("Session: XMLNode describing a Region is incomplete (no id)") << endmsg; - return -1; - } - - _id = prop->value(); - - _first_edit = EditChangesNothing; - - set_live_state (node, version, what_changed, true); - - return 0; -} - void -Region::freeze () +Region::suspend_property_changes () { - _frozen++; + Stateful::suspend_property_changes (); _last_length = _length; _last_position = _position; } void -Region::thaw (const string& /*why*/) +Region::mid_thaw (const PropertyChange& what_changed) { - Change what_changed = Change (0); - - { - Glib::Mutex::Lock lm (_lock); - - if (_frozen && --_frozen > 0) { - return; - } - - if (_pending_changed) { - what_changed = _pending_changed; - _pending_changed = Change (0); - } - } - - if (what_changed == Change (0)) { - return; - } - - if (what_changed & LengthChanged) { - if (what_changed & PositionChanged) { + if (what_changed.contains (Properties::length)) { + if (what_changed.contains (Properties::position)) { recompute_at_start (); } recompute_at_end (); } - - StateChanged (what_changed); } void -Region::send_change (Change what_changed) +Region::send_change (const PropertyChange& what_changed) { - { - Glib::Mutex::Lock lm (_lock); - if (_frozen) { - _pending_changed = Change (_pending_changed|what_changed); - return; - } + if (what_changed.empty()) { + return; } - StateChanged (what_changed); - - if (!(_flags & DoNotSendPropertyChanges)) { + Stateful::send_change (what_changed); + if (!_no_property_changes) { + /* Try and send a shared_pointer unless this is part of the constructor. If so, do nothing. */ try { boost::shared_ptr rptr = shared_from_this(); - RegionPropertyChanged (rptr); + RegionPropertyChanged (rptr, what_changed); } catch (...) { /* no shared_ptr available, relax; */ } } - } void @@ -1416,8 +1298,18 @@ void Region::source_deleted (boost::weak_ptr) { _sources.clear (); - cerr << "Send drop ref signal from region " << ' ' << this << endl; - drop_references (); + + if (!_session.deletion_in_progress()) { + /* this is a very special case: at least one of the region's + sources has bee deleted, so invalidate all references to + ourselves. Do NOT do this during session deletion, because + then we run the risk that this will actually result + in this object being deleted (as refcnt goes to zero) + while emitting DropReferences. + */ + + drop_references (); + } } vector @@ -1482,16 +1374,16 @@ Region::source_length(uint32_t n) const } bool -Region::verify_length (nframes_t len) +Region::verify_length (framecnt_t len) { if (source() && (source()->destructive() || source()->length_mutable())) { return true; } - nframes_t maxlen = 0; + framecnt_t maxlen = 0; for (uint32_t n=0; n < _sources.size(); ++n) { - maxlen = max (maxlen, (nframes_t)source_length(n) - _start); + maxlen = max (maxlen, source_length(n) - _start); } len = min (len, maxlen); @@ -1500,16 +1392,16 @@ Region::verify_length (nframes_t len) } bool -Region::verify_start_and_length (nframes_t new_start, nframes_t& new_length) +Region::verify_start_and_length (framepos_t new_start, framecnt_t& new_length) { if (source() && (source()->destructive() || source()->length_mutable())) { return true; } - nframes_t maxlen = 0; + framecnt_t maxlen = 0; for (uint32_t n=0; n < _sources.size(); ++n) { - maxlen = max (maxlen, (nframes_t)source_length(n) - new_start); + maxlen = max (maxlen, source_length(n) - new_start); } new_length = min (new_length, maxlen); @@ -1518,7 +1410,7 @@ Region::verify_start_and_length (nframes_t new_start, nframes_t& new_length) } bool -Region::verify_start (nframes_t pos) +Region::verify_start (framepos_t pos) { if (source() && (source()->destructive() || source()->length_mutable())) { return true; @@ -1533,7 +1425,7 @@ Region::verify_start (nframes_t pos) } bool -Region::verify_start_mutable (nframes_t& new_start) +Region::verify_start_mutable (framepos_t& new_start) { if (source() && (source()->destructive() || source()->length_mutable())) { return true; @@ -1586,15 +1478,133 @@ Region::use_sources (SourceList const & s) for (SourceList::const_iterator i = s.begin (); i != s.end(); ++i) { _sources.push_back (*i); - scoped_connect ((*i)->GoingAway, boost::bind (&Region::source_deleted, this, boost::weak_ptr(*i))); + (*i)->DropReferences.connect_same_thread (*this, boost::bind (&Region::source_deleted, this, boost::weak_ptr(*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()) { - scoped_connect ((*i)->GoingAway, boost::bind (&Region::source_deleted, this, boost::weak_ptr(*i))); + (*i)->DropReferences.connect_same_thread (*this, boost::bind (&Region::source_deleted, this, boost::weak_ptr(*i))); + } + } +} + + +bool +Region::set_property (const PropertyBase& prop) +{ + DEBUG_TRACE (DEBUG::Properties, string_compose ("region %1 set property %2\n", _name.val(), prop.property_name())); + + if (prop == Properties::muted.property_id) { + bool val = dynamic_cast*>(&prop)->val(); + if (val != _muted) { + DEBUG_TRACE (DEBUG::Properties, string_compose ("region %1 muted changed from %2 to %3", + _name.val(), _muted.val(), val)); + _muted = val; + return true; + } + } else if (prop == Properties::opaque.property_id) { + bool val = dynamic_cast*>(&prop)->val(); + if (val != _opaque) { + DEBUG_TRACE (DEBUG::Properties, string_compose ("region %1 opaque changed from %2 to %3", + _name.val(), _opaque.val(), val)); + _opaque = val; + return true; } + } else if (prop == Properties::locked.property_id) { + bool val = dynamic_cast*>(&prop)->val(); + if (val != _locked) { + DEBUG_TRACE (DEBUG::Properties, string_compose ("region %1 locked changed from %2 to %3", + _name.val(), _locked.val(), val)); + _locked = val; + return true; + } + } else if (prop == Properties::automatic.property_id) { + _automatic = dynamic_cast*>(&prop)->val(); + } else if (prop == Properties::whole_file.property_id) { + _whole_file = dynamic_cast*>(&prop)->val(); + } else if (prop == Properties::import.property_id) { + _import = dynamic_cast*>(&prop)->val(); + } else if (prop == Properties::external.property_id) { + _external = dynamic_cast*>(&prop)->val(); + } else if (prop == Properties::sync_marked.property_id) { + _sync_marked = dynamic_cast*>(&prop)->val(); + } else if (prop == Properties::left_of_split.property_id) { + _left_of_split = dynamic_cast*>(&prop)->val(); + } else if (prop == Properties::right_of_split.property_id) { + _right_of_split = dynamic_cast*>(&prop)->val(); + } else if (prop == Properties::hidden.property_id) { + bool val = dynamic_cast*>(&prop)->val(); + if (val != _hidden) { + _hidden = val; + return true; + } + } else if (prop == Properties::position_locked.property_id) { + _position_locked = dynamic_cast*>(&prop)->val(); + } else if (prop == Properties::start.property_id) { + framepos_t val = dynamic_cast*>(&prop)->val(); + if (val != _start) { + DEBUG_TRACE (DEBUG::Properties, string_compose ("region %1 start changed from %2 to %3", + _name.val(), _start, val)); + _start = val; + return true; + } + } else if (prop == Properties::length.property_id) { + framecnt_t val = dynamic_cast* > (&prop)->val(); + if (val != _length) { + DEBUG_TRACE (DEBUG::Properties, string_compose ("region %1 length changed from %2 to %3", + _name.val(), _length, val)); + _length = val; + return true; + } + } else if (prop == Properties::position.property_id) { + framepos_t val = dynamic_cast*>(&prop)->val(); + if (val != _position) { + DEBUG_TRACE (DEBUG::Properties, string_compose ("region %1 position changed from %2 to %3", + _name.val(), _position, val)); + _position = val; + return true; + } + } else if (prop == Properties::sync_position.property_id) { + framepos_t val = dynamic_cast*>(&prop)->val(); + if (val != _sync_position) { + _sync_position = val; + return true; + } + } else if (prop == Properties::layer.property_id) { + layer_t val = dynamic_cast*>(&prop)->val(); + if (val != _layer) { + _layer = val; + return true; + } + } else if (prop == Properties::ancestral_start.property_id) { + _ancestral_start = dynamic_cast*>(&prop)->val(); + } else if (prop == Properties::ancestral_length.property_id) { + _ancestral_length = dynamic_cast*>(&prop)->val(); + } else if (prop == Properties::stretch.property_id) { + _stretch = dynamic_cast*>(&prop)->val(); + } else if (prop == Properties::shift.property_id) { + _shift = dynamic_cast*>(&prop)->val(); + } else { + return SessionObject::set_property (prop); } + + return false; } +PropertyList* +Region::property_factory (const XMLNode& history_node) const +{ + PropertyList* prop_list = new PropertyList; + + for (OwnedPropertyList::const_iterator i = _properties->begin(); i != _properties->end(); ++i) { + PropertyBase* prop = i->second->maybe_clone_self_if_found_in_history_node (history_node); + + if (prop) { + prop_list->add (prop); + } + } + + return prop_list; +}