(1) remove most uses of MementoCommand for Playlist and Region (2) move frozen state...
[ardour.git] / libs / ardour / region.cc
index d55a8aea1a2931c043a83a1b4a9665c0cec865c9..b89ad2854b575573b7a3a40f7bc63c92ea8c10c3 100644 (file)
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000-2003 Paul Davis 
+    Copyright (C) 2000-2003 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <iostream>
 #include <cmath>
 #include <climits>
 #include <algorithm>
+#include <sstream>
 
-#include <sigc++/bind.h>
-#include <sigc++/class_slot.h>
 
 #include <glibmm/thread.h>
-#include <pbd/xml++.h>
-
-#include <ardour/region.h>
-#include <ardour/playlist.h>
-#include <ardour/session.h>
-#include <ardour/source.h>
-#include <ardour/region_factory.h>
+#include "pbd/xml++.h"
+#include "pbd/stacktrace.h"
+#include "pbd/enumwriter.h"
+
+#include "ardour/debug.h"
+#include "ardour/region.h"
+#include "ardour/playlist.h"
+#include "ardour/session.h"
+#include "ardour/source.h"
+#include "ardour/tempo.h"
+#include "ardour/region_factory.h"
+#include "ardour/filter.h"
+#include "ardour/profile.h"
+#include "ardour/utils.h"
 
 #include "i18n.h"
 
@@ -41,328 +46,406 @@ 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 ();
-
-/** Basic Region constructor (single source) */
-Region::Region (boost::shared_ptr<Source> src, jack_nframes_t start, jack_nframes_t length, const string& name, DataType type, layer_t layer, Region::Flag flags)
-       : _name(name)
-       , _type(type)
-       , _flags(flags)
-       , _start(start) 
-       , _length(length) 
-       , _position(0) 
-       , _sync_position(_start)
-       , _layer(layer)
-       , _first_edit(EditChangesNothing)
-       , _frozen(0)
-       , _read_data_count(0)
-       , _pending_changed(Change (0))
-       , _last_layer_op(0)
-       , _playlist(0)
-{
-       _current_state_id = 0;
+namespace ARDOUR { 
+       namespace Properties {
+               PBD::PropertyDescriptor<bool> muted;
+               PBD::PropertyDescriptor<bool> opaque;
+               PBD::PropertyDescriptor<bool> locked;
+               PBD::PropertyDescriptor<bool> automatic;
+               PBD::PropertyDescriptor<bool> whole_file;
+               PBD::PropertyDescriptor<bool> import;
+               PBD::PropertyDescriptor<bool> external;
+               PBD::PropertyDescriptor<bool> sync_marked;
+               PBD::PropertyDescriptor<bool> left_of_split;
+               PBD::PropertyDescriptor<bool> right_of_split;
+               PBD::PropertyDescriptor<bool> hidden;
+               PBD::PropertyDescriptor<bool> position_locked;
+               PBD::PropertyDescriptor<framepos_t> start;
+               PBD::PropertyDescriptor<framecnt_t> length;
+               PBD::PropertyDescriptor<framepos_t> position;
+               PBD::PropertyDescriptor<framecnt_t> sync_position;
+               PBD::PropertyDescriptor<layer_t> layer;
+               PBD::PropertyDescriptor<framepos_t> ancestral_start;
+               PBD::PropertyDescriptor<framecnt_t> ancestral_length;
+               PBD::PropertyDescriptor<float> stretch;
+               PBD::PropertyDescriptor<float> shift;
+       }
+}
        
-       _sources.push_back (src);
-       _master_sources.push_back (src);
-       src->GoingAway.connect (bind (mem_fun (*this, &Region::source_deleted), src));
+PBD::Signal2<void,boost::shared_ptr<ARDOUR::Region>,const PropertyChange&> Region::RegionPropertyChanged;
 
-       assert(_sources.size() > 0);
+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));
 }
 
-/** Basic Region constructor (many sources) */
-Region::Region (SourceList& srcs, jack_nframes_t start, jack_nframes_t length, const string& name, DataType type, layer_t layer, Region::Flag flags)
-       : _name(name)
+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, framepos_t start, framecnt_t length, const string& name, DataType type)
+       : SessionObject(s, name)
        , _type(type)
-       , _flags(flags)
-       , _start(start) 
-       , _length(length) 
-       , _position(0) 
-       , _sync_position(_start)
-       , _layer(layer)
-       , _first_edit(EditChangesNothing)
-       , _frozen(0)
+       , REGION_DEFAULT_STATE(start,length)
+       , _last_length (length)
+       , _last_position (0)
+       , _positional_lock_style(AudioTime)
+       , _first_edit (EditChangesNothing)
        , _read_data_count(0)
-       , _pending_changed(Change (0))
        , _last_layer_op(0)
-       , _playlist(0)
+       , _pending_explicit_relayer (false)
 {
-       _current_state_id = 0;
-       
-       set<boost::shared_ptr<Source> > unique_srcs;
-
-       for (SourceList::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);
-       }
+       register_properties ();
 
-       for (SourceList::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)));
-               }
-       }
-       
-       assert(_sources.size() > 0);
+       /* no sources at this point */
 }
 
-/** Create a new Region from part of an existing one */
-Region::Region (boost::shared_ptr<const Region> other, nframes_t offset, nframes_t length, const string& name, layer_t layer, Flag flags)
-       : _name(name)
-       , _type(other->data_type())
-       , _flags(Flag(flags & ~(Locked|WholeFile|Hidden)))
-       , _start(other->_start + offset) 
-       , _length(length) 
-       , _position(0) 
-       , _sync_position(_start)
-       , _layer(layer)
-       , _first_edit(EditChangesNothing)
-       , _frozen(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)
-       , _playlist(0)
+       , _last_layer_op (0)
+       , _pending_explicit_relayer (false)
 {
-       _current_state_id = 0;
-       
-       if (other->_sync_position < offset)
-               _sync_position = other->_sync_position;
+       register_properties ();
 
-       set<boost::shared_ptr<Source> > unique_srcs;
+       _type = srcs.front()->type();
 
-       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);
-       }
-       
-       if (other->_sync_position < offset) {
-               _sync_position = other->_sync_position;
-       }
+       use_sources (srcs);
 
-       for (SourceList::const_iterator i = other->_master_sources.begin(); i != other->_master_sources.end(); ++i) {
-               if (unique_srcs.find (*i) == unique_srcs.end()) {
-                       (*i)->GoingAway.connect (bind (mem_fun (*this, &Region::source_deleted), (*i)));
-               }
-               _master_sources.push_back (*i);
-       }
-       
        assert(_sources.size() > 0);
+       assert (_type == srcs.front()->type());
 }
 
-/** Pure copy constructor */
-Region::Region (boost::shared_ptr<const Region> other)
-       : _name(other->_name)
-       , _type(other->data_type())
-       , _flags(Flag(other->_flags & ~Locked))
-       , _start(other->_start) 
-       , _length(other->_length) 
-       , _position(other->_position) 
-       , _sync_position(other->_sync_position)
-       , _layer(other->_layer)
-       , _first_edit(EditChangesID)
-       , _frozen(0)
+/** 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<const Region> 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)
-       , _pending_changed(Change(0))
-       , _last_layer_op(other->_last_layer_op)
-       , _playlist(0)
+       , _last_layer_op (0)
+       , _pending_explicit_relayer (false)
+
 {
-       _current_state_id = 0;
-       
-       other->_first_edit = EditChangesName;
+       register_properties ();
 
-       if (other->_extra_xml) {
-               _extra_xml = new XMLNode (*other->_extra_xml);
-       } else {
-               _extra_xml = 0;
-       }
+       /* override state that may have been incorrectly inherited from the other region
+        */
 
-       set<boost::shared_ptr<Source> > unique_srcs;
+       _position = 0;
+       _locked = false;
+       _whole_file = false;
+       _hidden = false;
 
-       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);
-       }
+       use_sources (other->_sources);
 
-       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)));
-               }
-       }
-       
-       assert(_sources.size() > 0);
-}
+       if (!offset_relative) {
 
-Region::Region (SourceList& srcs, const XMLNode& node)
-       : _name(X_("error: XML did not reset this"))
-       , _type(DataType::NIL) // to be loaded from XML
-       , _flags(Flag(0))
-       , _start(0) 
-       , _length(0) 
-       , _position(0) 
-       , _sync_position(_start)
-       , _layer(0)
-       , _first_edit(EditChangesNothing)
-       , _frozen(0)
-       , _read_data_count(0)
-       , _pending_changed(Change(0))
-       , _last_layer_op(0)
-       , _playlist(0)
+               /* not sure why we do this, but its a hangover from ardour before
+                  property lists. this would be nice to remove.
+               */
 
-{
-       _current_state_id = 0;
+               _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*/
+               }
 
-       set<boost::shared_ptr<Source> > unique_srcs;
+       } else {
 
-       for (SourceList::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);
+               _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_marked = false;
+                       _sync_position = _start;
+               }
        }
 
-       for (SourceList::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)));
+       if (Profile->get_sae()) {
+               /* reset sync point to start if its ended up
+                  outside region bounds.
+               */
+
+               if (_sync_position < _start || _sync_position >= _start + _length) {
+                       _sync_marked = false;
+                       _sync_position = _start;
                }
        }
 
-       if (set_state (node)) {
-               throw failed_constructor();
+       assert (_type == other->data_type());
+}
+
+/** Create a copy of @param other but with different sources. Used by filters */
+Region::Region (boost::shared_ptr<const Region> 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)
+{
+       register_properties ();
+
+       _locked = false;
+       _position_locked = false;
+
+       other->_first_edit = EditChangesName;
+
+       if (other->_extra_xml) {
+               _extra_xml = new XMLNode (*other->_extra_xml);
+       } else {
+               _extra_xml = 0;
        }
 
-       assert(_type != DataType::NIL);
+       use_sources (srcs);
        assert(_sources.size() > 0);
 }
 
-Region::Region (boost::shared_ptr<Source> src, const XMLNode& node)
-       : _name(X_("error: XML did not reset this"))
-       , _type(DataType::NIL)
-       , _flags(Flag(0))
-       , _start(0) 
-       , _length(0) 
-       , _position(0) 
-       , _sync_position(_start)
-       , _layer(0)
-       , _first_edit(EditChangesNothing)
-       , _frozen(0)
+/** Simple "copy" constructor */
+Region::Region (boost::shared_ptr<const Region> 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)
-       , _playlist(0)
+       , _last_layer_op(other->_last_layer_op)
+       , _pending_explicit_relayer (false)
 {
-       _sources.push_back (src);
+       register_properties ();
 
-       _current_state_id = 0;
+       _locked = false;
+       _position_locked = false;
 
-       if (set_state (node)) {
-               throw failed_constructor();
+       other->_first_edit = EditChangesName;
+
+       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 ()
 {
-       /* derived classes must call notify_callbacks() and then emit GoingAway */
+       DEBUG_TRACE (DEBUG::Destruction, string_compose ("Region %1 destructor @ %2\n", _name, this));
 }
 
 void
-Region::set_playlist (Playlist* pl)
+Region::set_playlist (boost::weak_ptr<Playlist> wpl)
 {
-       _playlist = pl;
+       _playlist = wpl.lock();
 }
 
-void
-Region::store_state (RegionState& state) const
-{
-       state._start = _start;
-       state._length = _length;
-       state._position = _position;
-       state._flags = _flags;
-       state._sync_position = _sync_position;
-       state._layer = _layer;
-       state._name = _name;
-       state._first_edit = _first_edit;
-}      
-
-Change
-Region::restore_and_return_flags (RegionState& state)
-{
-       Change what_changed = Change (0);
-
-       {
-               Glib::Mutex::Lock lm (_lock);
-               
-               if (_start != state._start) {
-                       what_changed = Change (what_changed|StartChanged);      
-                       _start = state._start;
-               }
-               if (_length != state._length) {
-                       what_changed = Change (what_changed|LengthChanged);
-                       _length = state._length;
-               }
-               if (_position != state._position) {
-                       what_changed = Change (what_changed|PositionChanged);
-                       _position = state._position;
-               } 
-               if (_sync_position != state._sync_position) {
-                       _sync_position = state._sync_position;
-                       what_changed = Change (what_changed|SyncOffsetChanged);
-               }
-               if (_layer != state._layer) {
-                       what_changed = Change (what_changed|LayerChanged);
-                       _layer = state._layer;
-               }
-
-               uint32_t old_flags = _flags;
-               _flags = Flag (state._flags);
-               
-               if ((old_flags ^ state._flags) & Muted) {
-                       what_changed = Change (what_changed|MuteChanged);
-               }
-               if ((old_flags ^ state._flags) & Opaque) {
-                       what_changed = Change (what_changed|OpacityChanged);
-               }
-               if ((old_flags ^ state._flags) & Locked) {
-                       what_changed = Change (what_changed|LockChanged);
-               }
-
-               _first_edit = state._first_edit;
-       }
-
-       return what_changed;
-}
-
-void
-Region::set_name (string str)
-
+bool
+Region::set_name (const std::string& str)
 {
        if (_name != str) {
-               _name = str; 
-               send_change (NameChanged);
+               SessionObject::set_name(str); // EMIT SIGNAL NameChanged()
+               assert(_name == str);
+               send_change (Properties::name);
        }
+
+       return true;
 }
 
 void
-Region::set_length (nframes_t len, void *src)
+Region::set_length (framecnt_t len, void */*src*/)
 {
-       if (_flags & Locked) {
+       //cerr << "Region::set_length() len = " << len << endl;
+       if (locked()) {
                return;
        }
 
        if (_length != len && len != 0) {
 
-               /* check that the current _position wouldn't make the new 
+               /* check that the current _position wouldn't make the new
                   length impossible.
                */
 
@@ -373,139 +456,210 @@ Region::set_length (nframes_t len, void *src)
                if (!verify_length (len)) {
                        return;
                }
-               
-               _length = len;
 
-               _flags = Region::Flag (_flags & ~WholeFile);
 
+               _last_length = _length;
+               _length = len;
+               _whole_file = false;
                first_edit ();
                maybe_uncopy ();
+               invalidate_transients ();
 
-               if (!_frozen) {
+               if (!property_changes_suspended()) {
                        recompute_at_end ();
-
-                       char buf[64];
-                       snprintf (buf, sizeof (buf), "length set to %u", len);
-                       save_state (buf);
                }
 
-               send_change (LengthChanged);
+               send_change (Properties::length);
        }
 }
 
 void
 Region::maybe_uncopy ()
 {
+       /* this does nothing but marked a semantic moment once upon a time */
 }
 
 void
 Region::first_edit ()
 {
-       if (_first_edit != EditChangesNothing && _playlist) {
+       boost::shared_ptr<Playlist> pl (playlist());
 
-               _name = _playlist->session().new_region_name (_name);
+       if (_first_edit != EditChangesNothing && pl) {
+
+               _name = _session.new_region_name (_name);
                _first_edit = EditChangesNothing;
 
-               send_change (NameChanged);
+               send_change (Properties::name);
                RegionFactory::CheckNewRegion (shared_from_this());
        }
 }
 
+bool
+Region::at_natural_position () const
+{
+       boost::shared_ptr<Playlist> pl (playlist());
+
+       if (!pl) {
+               return false;
+       }
+
+       boost::shared_ptr<Region> whole_file_region = get_parent();
+
+       if (whole_file_region) {
+               if (_position == whole_file_region->position() + _start) {
+                       return true;
+               }
+       }
+
+       return false;
+}
+
 void
 Region::move_to_natural_position (void *src)
 {
-       if (!_playlist) {
+       boost::shared_ptr<Playlist> pl (playlist());
+
+       if (!pl) {
                return;
        }
-       
+
        boost::shared_ptr<Region> whole_file_region = get_parent();
 
        if (whole_file_region) {
                set_position (whole_file_region->position() + _start, 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 
+       /* this is used when creating a whole file region as
           a way to store its "natural" or "captured" position.
        */
 
+       _position = _position;
        _position = pos;
 }
 
 void
-Region::set_position (nframes_t pos, void *src)
+Region::set_position_lock_style (PositionLockStyle ps)
 {
-       if (_flags & Locked) {
+       boost::shared_ptr<Playlist> pl (playlist());
+
+       if (!pl) {
+               return;
+       }
+
+       _positional_lock_style = ps;
+
+       if (_positional_lock_style == MusicTime) {
+               _session.tempo_map().bbt_time (_position, _bbt_time);
+       }
+
+}
+
+void
+Region::update_position_after_tempo_map_change ()
+{
+       boost::shared_ptr<Playlist> pl (playlist());
+
+       if (!pl || _positional_lock_style != MusicTime) {
                return;
        }
 
+       TempoMap& map (_session.tempo_map());
+       framepos_t pos = map.frame_time (_bbt_time);
+       set_position_internal (pos, false);
+}
+
+void
+Region::set_position (framepos_t pos, void* /*src*/)
+{
+       if (!can_move()) {
+               return;
+       }
+
+       set_position_internal (pos, true);
+}
+
+void
+Region::set_position_internal (framepos_t pos, bool allow_bbt_recompute)
+{
        if (_position != pos) {
+               _last_position = _position;
                _position = pos;
 
                /* check that the new _position wouldn't make the current
-                  length impossible - if so, change the length. 
+                  length impossible - if so, change the length.
 
                   XXX is this the right thing to do?
                */
 
                if (max_frames - _length < _position) {
+                       _last_length = _length;
                        _length = max_frames - _position;
                }
 
-               if (!_frozen) {
-                       char buf[64];
-                       snprintf (buf, sizeof (buf), "position set to %u", pos);
-                       save_state (buf);
+               if (allow_bbt_recompute) {
+                       recompute_position_from_lock_style ();
                }
+
+               invalidate_transients ();
        }
 
        /* do this even if the position is the same. this helps out
           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;
        }
 
        if (_position != pos) {
+               _last_position = _position;
                _position = pos;
-
-               if (!_frozen) {
-                       char buf[64];
-                       snprintf (buf, sizeof (buf), "position set to %u", pos);
-                       save_state (buf);
-               }
        }
 
-       _playlist->raise_region_to_top (boost::shared_ptr<Region>(this));
+       boost::shared_ptr<Playlist> pl (playlist());
+
+       if (pl) {
+               pl->raise_region_to_top (shared_from_this ());
+       }
 
        /* do this even if the position is the same. this helps out
           a GUI that has moved its representation already.
        */
-       
-       send_change (PositionChanged);
+
+       send_change (Properties::position);
+}
+
+void
+Region::recompute_position_from_lock_style ()
+{
+       if (_positional_lock_style == MusicTime) {
+               _session.tempo_map().bbt_time (_position, _bbt_time);
+       }
 }
 
 void
-Region::nudge_position (long n, void *src)
+Region::nudge_position (frameoffset_t n, void* /*src*/)
 {
-       if (_flags & Locked) {
+       if (locked()) {
                return;
        }
 
        if (n == 0) {
                return;
        }
-       
+
+       _last_position = _position;
+
        if (n > 0) {
                if (_position > max_frames - n) {
                        _position = max_frames;
@@ -513,26 +667,29 @@ Region::nudge_position (long n, void *src)
                        _position += n;
                }
        } else {
-               if (_position < (nframes_t) -n) {
+               if (_position < -n) {
                        _position = 0;
                } else {
                        _position += n;
                }
        }
 
-       if (!_frozen) {
-               char buf[64];
-               snprintf (buf, sizeof (buf), "position set to %u", _position);
-               save_state (buf);
-       }
+       send_change (Properties::position);
+}
 
-       send_change (PositionChanged);
+void
+Region::set_ancestral_data (framepos_t s, framecnt_t l, float st, float sh)
+{
+       _ancestral_length = l;
+       _ancestral_start = s;
+       _stretch = st;
+       _shift = sh;
 }
 
 void
-Region::set_start (nframes_t pos, void *src)
+Region::set_start (framepos_t pos, void* /*src*/)
 {
-       if (_flags & Locked) {
+       if (locked() || position_locked()) {
                return;
        }
        /* This just sets the start, nothing else. It effectively shifts
@@ -547,28 +704,23 @@ Region::set_start (nframes_t pos, void *src)
                }
 
                _start = pos;
-               _flags = Region::Flag (_flags & ~WholeFile);
+               _whole_file = false;
                first_edit ();
+               invalidate_transients ();
 
-               if (!_frozen) {
-                       char buf[64];
-                       snprintf (buf, sizeof (buf), "start set to %u", pos);
-                       save_state (buf);
-               }
-
-               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) {
+       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;
        } else {
@@ -589,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;
@@ -601,29 +753,23 @@ Region::trim_start (nframes_t new_position, void *src)
        if (new_start == _start) {
                return;
        }
-       
+
        _start = new_start;
-       _flags = Region::Flag (_flags & ~WholeFile);
+       _whole_file = false;
        first_edit ();
 
-       if (!_frozen) {
-               char buf[64];
-               snprintf (buf, sizeof (buf), "slipped start to %u", _start);
-               save_state (buf);
-       }
-
-       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;
@@ -632,64 +778,68 @@ 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 */
-               
+
                new_position = max (new_position, source_zero);
-               
-               
+
+
                if (new_position > _position) {
                        newlen = _length - (new_position - _position);
                } else {
                        newlen = _length + (_position - new_position);
                }
-               
+
                trim_to_internal (new_position, newlen, src);
-               if (!_frozen) {
+               if (!property_changes_suspended()) {
                        recompute_at_start ();
                }
        }
 }
 
+/** @param new_endpoint New region end point, such that, for example,
+ *  a region at 0 of length 10 has an endpoint of 9.
+ */
+
 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, this);
-               if (!_frozen) {
+               trim_to_internal (_position, new_endpoint - _position + 1, this);
+               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;
        }
 
@@ -710,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;
@@ -723,76 +873,72 @@ 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 (!property_changes_suspended()) {
+                       _last_length = _length;
+               }
                _length = length;
-               what_changed = Change (what_changed|LengthChanged);
+               what_changed.add (Properties::length);
        }
        if (_position != position) {
+               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);
 
-       if (what_changed & (StartChanged|LengthChanged)) {
-               first_edit ();
-       } 
+       _whole_file = false;
 
-       if (what_changed) {
-               
-               if (!_frozen) {
-                       char buf[64];
-                       snprintf (buf, sizeof (buf), "trimmed to %u-%u", _position, _position+_length-1);
-                       save_state (buf);
-               }
+       PropertyChange start_and_length;
+
+       start_and_length.add (Properties::start);
+       start_and_length.add (Properties::length);
 
+       if (what_changed.contains (start_and_length)) {
+               first_edit ();
+       }
+
+       if (!what_changed.empty()) {
                send_change (what_changed);
        }
-}      
+}
 
 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);
-               }
-
-               if (!_frozen) {
-                       char buf[64];
-                       if (yn) {
-                               snprintf (buf, sizeof (buf), "muted");
-                       } else {
-                               snprintf (buf, sizeof (buf), "unmuted");
-                       }
-                       save_state (buf);
-               }
-
-               send_change (MuteChanged);
+               _muted = yn;
+               send_change (Properties::muted);
        }
 }
 
@@ -800,18 +946,8 @@ void
 Region::set_opaque (bool yn)
 {
        if (opaque() != yn) {
-               if (!_frozen) {
-                       char buf[64];
-                       if (yn) {
-                               snprintf (buf, sizeof (buf), "opaque");
-                               _flags = Flag (_flags|Opaque);
-                       } else {
-                               snprintf (buf, sizeof (buf), "translucent");
-                               _flags = Flag (_flags & ~Opaque);
-                       }
-                       save_state (buf);
-               }
-               send_change (OpacityChanged);
+               _opaque = yn;
+               send_change (Properties::opaque);
        }
 }
 
@@ -819,66 +955,56 @@ void
 Region::set_locked (bool yn)
 {
        if (locked() != yn) {
-               if (!_frozen) {
-                       char buf[64];
-                       if (yn) {
-                               snprintf (buf, sizeof (buf), "locked");
-                               _flags = Flag (_flags|Locked);
-                       } else {
-                               snprintf (buf, sizeof (buf), "unlocked");
-                               _flags = Flag (_flags & ~Locked);
-                       }
-                       save_state (buf);
-               }
-               send_change (LockChanged);
+               _locked = yn;
+               send_change (Properties::locked);
        }
 }
 
 void
-Region::set_sync_position (nframes_t absolute_pos)
+Region::set_position_locked (bool yn)
 {
-       nframes_t file_pos;
+       if (position_locked() != yn) {
+               _position_locked = yn;
+               send_change (Properties::locked);
+       }
+}
 
-       file_pos = _start + (absolute_pos - _position);
+void
+Region::set_sync_position (framepos_t absolute_pos)
+{
+       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) {
-                       char buf[64];
+               if (!property_changes_suspended()) {
                        maybe_uncopy ();
-                       snprintf (buf, sizeof (buf), "sync point set to %u", _sync_position);
-                       save_state (buf);
                }
-               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 ();
-                       save_state ("sync point removed");
                }
-               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; 
+                       return _sync_position - _start;
                } else {
                        dir = -1;
                        return _start - _sync_position;
@@ -889,77 +1015,74 @@ Region::sync_offset (int& dir) const
        }
 }
 
-nframes_t 
-Region::adjust_to_sync (nframes_t pos)
+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;
+
        if (sync_dir > 0) {
-               if (max_frames - pos > offset) {
-                       pos += offset;
-               }
-       } else {
                if (pos > offset) {
                        pos -= offset;
                } else {
                        pos = 0;
                }
+       } else {
+               if (max_frames - pos > offset) {
+                       pos += offset;
+               }
        }
 
        return pos;
 }
 
-nframes_t
+framepos_t
 Region::sync_position() const
 {
-       if (_flags & SyncMarked) {
-               return _sync_position; 
+       if (sync_marked()) {
+               return _sync_position;
        } else {
                return _start;
        }
 }
 
-
 void
 Region::raise ()
 {
-       if (_playlist == 0) {
-               return;
+       boost::shared_ptr<Playlist> pl (playlist());
+       if (pl) {
+               pl->raise_region (shared_from_this ());
        }
-
-       _playlist->raise_region (boost::shared_ptr<Region>(this));
 }
 
 void
 Region::lower ()
 {
-       if (_playlist == 0) {
-               return;
+       boost::shared_ptr<Playlist> pl (playlist());
+       if (pl) {
+               pl->lower_region (shared_from_this ());
        }
-
-       _playlist->lower_region (boost::shared_ptr<Region>(this));
 }
 
+
 void
 Region::raise_to_top ()
 {
-
-       if (_playlist == 0) {
-               return;
+       boost::shared_ptr<Playlist> pl (playlist());
+       if (pl) {
+               pl->raise_region_to_top (shared_from_this());
        }
-
-       _playlist->raise_region_to_top (boost::shared_ptr<Region>(this));
 }
 
 void
 Region::lower_to_bottom ()
 {
-       if (_playlist == 0) {
-               return;
+       boost::shared_ptr<Playlist> pl (playlist());
+       if (pl) {
+               pl->lower_region_to_bottom (shared_from_this());
        }
-
-       _playlist->lower_region_to_bottom (boost::shared_ptr<Region>(this));
 }
 
 void
@@ -967,40 +1090,49 @@ Region::set_layer (layer_t l)
 {
        if (_layer != l) {
                _layer = l;
-               
-               if (!_frozen) {
-                       char buf[64];
-                       snprintf (buf, sizeof (buf), "layer set to %" PRIu32, _layer);
-                       save_state (buf);
-               }
-               
-               send_change (LayerChanged);
+
+               send_change (Properties::layer);
        }
 }
 
 XMLNode&
-Region::state (bool full_state)
+Region::state (bool /*full_state*/)
 {
        XMLNode *node = new XMLNode ("Region");
        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);
+
+       switch (_first_edit) {
+       case EditChangesNothing:
+               fe = X_("nothing");
+               break;
+       case EditChangesName:
+               fe = X_("name");
+               break;
+       case EditChangesID:
+               fe = X_("id");
+               break;
+       default: /* should be unreachable but makes g++ happy */
+               fe = X_("nothing");
+               break;
+       }
+
+       node->add_property ("first-edit", fe);
 
        /* note: flags are stored by derived classes */
 
-       snprintf (buf, sizeof (buf), "%d", (int) _layer);
-       node->add_property ("layer", buf);
-       snprintf (buf, sizeof (buf), "%u", _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;
+               str << _bbt_time;
+               node->add_property ("bbt-position", str.str());
+       }
 
        return *node;
 }
@@ -1012,128 +1144,121 @@ Region::get_state ()
 }
 
 int
-Region::set_state (const XMLNode& node)
+Region::set_state (const XMLNode& node, int version)
 {
-       const XMLNodeList& nlist = node.children();
-       const XMLProperty *prop;
-
-       if (_extra_xml) {
-               delete _extra_xml;
-               _extra_xml = 0;
-       }
+       PropertyChange what_changed;
+       return _set_state (node, version, what_changed, true);
+}
 
-       if ((prop = node.property ("id")) == 0) {
-               error << _("Session: XMLNode describing a Region is incomplete (no id)") << endmsg;
-               return -1;
-       }
+int
+Region::_set_state (const XMLNode& node, int version, PropertyChange& what_changed, bool send)
+{
+       const XMLProperty* prop;
 
-       _id = prop->value();
+       what_changed = set_properties (node);
 
-       if ((prop = node.property ("name")) == 0) {
-               error << _("Session: XMLNode describing a Region is incomplete (no name)") << endmsg;
-               return -1;
+       if ((prop = node.property (X_("id")))) {
+               _id = prop->value();
        }
 
-       _name = prop->value();
-       
-       if ((prop = node.property ("type")) == 0) {
-               _type = DataType::AUDIO;
-       } else {
-               _type = DataType(prop->value());
-       }
+       if ((prop = node.property ("positional-lock-style")) != 0) {
+               _positional_lock_style = PositionLockStyle (string_2_enum (prop->value(), _positional_lock_style));
 
-       if ((prop = node.property ("start")) != 0) {
-               sscanf (prop->value().c_str(), "%" PRIu32, &_start);
-       }
+               if (_positional_lock_style == MusicTime) {
+                       if ((prop = node.property ("bbt-position")) == 0) {
+                               /* missing BBT info, revert to audio time locking */
+                               _positional_lock_style = AudioTime;
+                       } else {
+                               if (sscanf (prop->value().c_str(), "%d|%d|%d",
+                                           &_bbt_time.bars,
+                                           &_bbt_time.beats,
+                                           &_bbt_time.ticks) != 3) {
+                                       _positional_lock_style = AudioTime;
+                               }
+                       }
+               }
 
-       if ((prop = node.property ("length")) != 0) {
-               sscanf (prop->value().c_str(), "%" PRIu32, &_length);
        }
 
-       if ((prop = node.property ("position")) != 0) {
-               sscanf (prop->value().c_str(), "%" PRIu32, &_position);
+       /* fix problems with old sessions corrupted by impossible
+          values for _stretch or _shift
+       */
+       if (_stretch == 0.0f) {
+               _stretch = 1.0f;
        }
-
-       if ((prop = node.property ("layer")) != 0) {
-               _layer = (layer_t) atoi (prop->value().c_str());
+       
+       if (_shift == 0.0f) {
+               _shift = 1.0f;
        }
 
-       /* note: derived classes set flags */
+       const XMLNodeList& nlist = node.children();
 
-       if ((prop = node.property ("sync-position")) != 0) {
-               sscanf (prop->value().c_str(), "%" PRIu32, &_sync_position);
-       } else {
-               _sync_position = _start;
-       }
-       
        for (XMLNodeConstIterator niter = nlist.begin(); niter != nlist.end(); ++niter) {
-               
+
                XMLNode *child;
-               
+
                child = (*niter);
-               
-               if (child->name () == "extra") {
+
+               if (child->name () == "Extra") {
+                       delete _extra_xml;
                        _extra_xml = new XMLNode (*child);
                        break;
                }
        }
 
-       _first_edit = EditChangesNothing;
+       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;
 }
 
 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 ();
        }
-               
-       save_state (why);
-       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;
        }
 
-       StateManager::send_state_changed (what_changed);
+        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<Region> rptr = shared_from_this();
+                       RegionPropertyChanged (rptr, what_changed);
+               } catch (...) {
+                       /* no shared_ptr available, relax; */
+               }
+       }
 }
 
 void
@@ -1170,9 +1295,21 @@ Region::region_list_equivalent (boost::shared_ptr<const Region> other) const
 }
 
 void
-Region::source_deleted (boost::shared_ptr<Source>)
+Region::source_deleted (boost::weak_ptr<Source>)
 {
-       delete this;
+       _sources.clear ();
+
+       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<string>
@@ -1188,6 +1325,13 @@ Region::master_source_names ()
        return names;
 }
 
+void
+Region::set_master_sources (const SourceList& srcs)
+{
+       _master_sources = srcs;
+       assert (_sources.size() == _master_sources.size());
+}
+
 bool
 Region::source_equivalent (boost::shared_ptr<const Region> other) const
 {
@@ -1213,31 +1357,67 @@ Region::source_equivalent (boost::shared_ptr<const Region> other) const
 }
 
 bool
-Region::verify_length (jack_nframes_t len)
+Region::uses_source (boost::shared_ptr<const Source> source) const
 {
-       for (uint32_t n=0; n < _sources.size(); ++n) {
-               if (_start > _sources[n]->length() - len) {
-                       return false;
+       for (SourceList::const_iterator i = _sources.begin(); i != _sources.end(); ++i) {
+               if (*i == source) {
+                       return true;
                }
        }
+       return false;
+}
+
+sframes_t
+Region::source_length(uint32_t n) const
+{
+       return _sources[n]->length(_position - _start);
+}
+
+bool
+Region::verify_length (framecnt_t len)
+{
+       if (source() && (source()->destructive() || source()->length_mutable())) {
+               return true;
+       }
+
+       framecnt_t maxlen = 0;
+
+       for (uint32_t n=0; n < _sources.size(); ++n) {
+               maxlen = max (maxlen, source_length(n) - _start);
+       }
+
+       len = min (len, maxlen);
+
        return true;
 }
 
 bool
-Region::verify_start_and_length (jack_nframes_t new_start, jack_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;
+       }
+
+       framecnt_t maxlen = 0;
+
        for (uint32_t n=0; n < _sources.size(); ++n) {
-               if (new_length > _sources[n]->length() - new_start) {
-                       return false;
-               }
+               maxlen = max (maxlen, source_length(n) - new_start);
        }
+
+       new_length = min (new_length, maxlen);
+
        return true;
 }
+
 bool
-Region::verify_start (jack_nframes_t pos)
+Region::verify_start (framepos_t pos)
 {
+       if (source() && (source()->destructive() || source()->length_mutable())) {
+               return true;
+       }
+
        for (uint32_t n=0; n < _sources.size(); ++n) {
-               if (pos > _sources[n]->length() - _length) {
+               if (pos > source_length(n) - _length) {
                        return false;
                }
        }
@@ -1245,25 +1425,186 @@ Region::verify_start (jack_nframes_t pos)
 }
 
 bool
-Region::verify_start_mutable (jack_nframes_t& new_start)
+Region::verify_start_mutable (framepos_t& new_start)
 {
+       if (source() && (source()->destructive() || source()->length_mutable())) {
+               return true;
+       }
+
        for (uint32_t n=0; n < _sources.size(); ++n) {
-               if (new_start > _sources[n]->length() - _length) {
-                       new_start = _sources[n]->length() - _length;
+               if (new_start > source_length(n) - _length) {
+                       new_start = source_length(n) - _length;
                }
        }
        return true;
 }
 
 boost::shared_ptr<Region>
-Region::get_parent()
+Region::get_parent() const
 {
-       boost::shared_ptr<Region> r;
+       boost::shared_ptr<Playlist> pl (playlist());
+
+       if (pl) {
+               boost::shared_ptr<Region> r;
+               boost::shared_ptr<Region const> grrr2 = boost::dynamic_pointer_cast<Region const> (shared_from_this());
+
+               if (grrr2 && (r = _session.find_whole_file_parent (grrr2))) {
+                       return boost::static_pointer_cast<Region> (r);
+               }
+       }
+
+       return boost::shared_ptr<Region>();
+}
+
+int
+Region::apply (Filter& filter)
+{
+       return filter.run (shared_from_this());
+}
+
+
+void
+Region::invalidate_transients ()
+{
+       _valid_transients = false;
+       _transients.clear ();
+}
+
+
+void
+Region::use_sources (SourceList const & s)
+{
+       set<boost::shared_ptr<Source> > unique_srcs;
 
-       if (_playlist) {
-               r = _playlist->session().find_whole_file_parent (*this);
+       for (SourceList::const_iterator i = s.begin (); i != s.end(); ++i) {
+               _sources.push_back (*i);
+               (*i)->DropReferences.connect_same_thread (*this, boost::bind (&Region::source_deleted, this, boost::weak_ptr<Source>(*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)->DropReferences.connect_same_thread (*this, boost::bind (&Region::source_deleted, this, boost::weak_ptr<Source>(*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<const PropertyTemplate<bool>*>(&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<const PropertyTemplate<bool>*>(&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<const PropertyTemplate<bool>*>(&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<const PropertyTemplate<bool>*>(&prop)->val();
+       } else if (prop == Properties::whole_file.property_id) {
+               _whole_file = dynamic_cast<const PropertyTemplate<bool>*>(&prop)->val();
+       } else if (prop == Properties::import.property_id) {
+               _import = dynamic_cast<const PropertyTemplate<bool>*>(&prop)->val();
+       } else if (prop == Properties::external.property_id) {
+               _external = dynamic_cast<const PropertyTemplate<bool>*>(&prop)->val();
+       } else if (prop == Properties::sync_marked.property_id) {
+               _sync_marked = dynamic_cast<const PropertyTemplate<bool>*>(&prop)->val();
+       } else if (prop == Properties::left_of_split.property_id) {
+               _left_of_split = dynamic_cast<const PropertyTemplate<bool>*>(&prop)->val();
+       } else if (prop == Properties::right_of_split.property_id) {
+               _right_of_split = dynamic_cast<const PropertyTemplate<bool>*>(&prop)->val();
+       } else if (prop == Properties::hidden.property_id) {
+               bool val = dynamic_cast<const PropertyTemplate<bool>*>(&prop)->val();
+               if (val != _hidden) {
+                       _hidden = val;
+                       return true;
+               }
+       } else if (prop == Properties::position_locked.property_id) {
+               _position_locked = dynamic_cast<const PropertyTemplate<bool>*>(&prop)->val();
+       } else if (prop == Properties::start.property_id) {
+               framepos_t val = dynamic_cast<const PropertyTemplate<framepos_t>*>(&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<const PropertyTemplate<framecnt_t>* > (&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<const PropertyTemplate<framepos_t>*>(&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<const PropertyTemplate<framepos_t>*>(&prop)->val();
+               if (val != _sync_position) {
+                       _sync_position = val;
+                       return true;
+               }
+       } else if (prop == Properties::layer.property_id) {
+               layer_t val = dynamic_cast<const PropertyTemplate<layer_t>*>(&prop)->val();
+               if (val != _layer) {
+                       _layer = val;
+                       return true;
+               }
+       } else if (prop == Properties::ancestral_start.property_id) {
+               _ancestral_start = dynamic_cast<const PropertyTemplate<framepos_t>*>(&prop)->val();
+       } else if (prop == Properties::ancestral_length.property_id) {
+               _ancestral_length = dynamic_cast<const PropertyTemplate<framecnt_t>*>(&prop)->val();
+       } else if (prop == Properties::stretch.property_id) {
+               _stretch = dynamic_cast<const PropertyTemplate<float>*>(&prop)->val();
+       } else if (prop == Properties::shift.property_id) {
+               _shift = dynamic_cast<const PropertyTemplate<float>*>(&prop)->val();
+       } else {
+               return SessionObject::set_property (prop);
        }
        
-       return r;
+       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;
+}