remove all trace of SAE from source code.

[ardour.git] / libs / ardour / region.cc

diff --git a/libs/ardour/region.cc b/libs/ardour/region.cc
index 516adb6ee593ed4cd2b6bb8bb60362122a15fb61..5ff06e5076738dd39defca18a1004be272d12e33 100644 (file)
--- a/libs/ardour/region.cc
+++ b/libs/ardour/region.cc
@@ -301,17 +301,6 @@ Region::Region (boost::shared_ptr<const Region> other)
                _sync_position = _start;
        }
 
-       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;
-               }
-       }
-
        assert (_type == other->data_type());
 }
 
@@ -360,17 +349,6 @@ Region::Region (boost::shared_ptr<const Region> other, frameoffset_t offset)
                _sync_position = _start;
        }
 
-       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;
-               }
-       }
-
        assert (_type == other->data_type());
 }
 
@@ -591,6 +569,44 @@ Region::set_position (framepos_t pos)
 
 }
 
+/** A gui may need to create a region, then place it in an initial
+ *  position determined by the user.
+ *  When this takes place within one gui operation, we have to reset
+ *  _last_position to prevent an implied move.
+ */
+void
+Region::set_initial_position (framepos_t pos)
+{
+       if (!can_move()) {
+               return;
+       }
+
+       if (_position != pos) {
+               _position = pos;
+
+               /* check that the new _position wouldn't make the current
+                  length impossible - if so, change the length.
+
+                  XXX is this the right thing to do?
+               */
+
+               if (max_framepos - _length < _position) {
+                       _last_length = _length;
+                       _length = max_framepos - _position;
+               }
+
+               recompute_position_from_lock_style ();
+               /* ensure that this move doesn't cause a range move */
+               _last_position = _position;
+       }
+
+
+       /* do this even if the position is the same. this helps out
+          a GUI that has moved its representation already.
+       */
+       send_change (Properties::position);
+}
+
 void
 Region::set_position_internal (framepos_t pos, bool allow_bbt_recompute)
 {