add left/right side trim cursors and use them for region trimming, as appropriate

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

diff --git a/libs/ardour/location.cc b/libs/ardour/location.cc
index d3fc3b0d4151144c348e0a89aecab6bc05d1944e..7202e1ef035def7603447ef8fe9ca5630ac9887e 100644 (file)
--- a/libs/ardour/location.cc
+++ b/libs/ardour/location.cc
@@ -89,32 +89,27 @@ Location::set_start (nframes64_t s)
                return -1;
        }
 
+       if (((is_auto_punch() || is_auto_loop()) && s >= _end) || (!is_mark() && s > _end)) {
+               return -1;
+       }
+
        if (is_mark()) {
                if (_start != s) {
-
                        _start = s;
                        _end = s;
-
-                       start_changed(this); /* EMIT SIGNAL */
-                       end_changed(this); /* EMIT SIGNAL */
-
+                       start_changed (this); /* EMIT SIGNAL */
+                       end_changed (this); /* EMIT SIGNAL */
                }
                return 0;
        }
        
-       if (is_session_range()) {
-               start_changed (this); /* EMIT SIGNAL */
-               Session::StartTimeChanged (); /* EMIT SIGNAL */
-               AudioFileSource::set_header_position_offset (s);
-       }
-
-       if (((is_auto_punch() || is_auto_loop()) && s >= _end) || s > _end) {
-               return -1;
-       }
-
        if (s != _start) {
                _start = s;
-               start_changed(this); /* EMIT SIGNAL */
+               start_changed (this); /* EMIT SIGNAL */
+               if (is_session_range ()) {
+                       Session::StartTimeChanged (); /* EMIT SIGNAL */
+                       AudioFileSource::set_header_position_offset (s);
+               }
        }
 
        return 0;
@@ -127,56 +122,39 @@ Location::set_end (nframes64_t e)
                return -1;
        }
 
+       if (((is_auto_punch() || is_auto_loop()) && e <= _start) || e < _start) {
+               return -1;
+       }
+       
        if (is_mark()) {
                if (_start != e) {
                        _start = e;
                        _end = e;
-                       start_changed(this); /* EMIT SIGNAL */
-                       end_changed(this); /* EMIT SIGNAL */
+                       start_changed (this); /* EMIT SIGNAL */
+                       end_changed (this); /* EMIT SIGNAL */
                }
                return 0;
        }
 
-       if (is_session_range()) {
+       if (e != _end) {
                _end = e;
-               end_changed (this); /* EMIT SIGNAL */
-               Session::EndTimeChanged (); /* EMIT SIGNAL */
-       }
+               end_changed(this); /* EMIT SIGNAL */
 
-       if (((is_auto_punch() || is_auto_loop()) && e <= _start) || e < _start) {
-               return -1;
+               if (is_session_range()) {
+                       Session::EndTimeChanged (); /* EMIT SIGNAL */
+               }
        }
 
-       if (e != _end) {
-               _end = e;
-                end_changed(this); /* EMIT SIGNAL */
-       }
        return 0;
 }
 
 int
 Location::set (nframes64_t start, nframes64_t end)
 {
-       if (_locked) {
-               return -1;
-       }
-
-       if (is_mark() && start != end) {
-               return -1;
-       } else if (((is_auto_punch() || is_auto_loop()) && start >= end) || (start > end)) {
-               return -1;
-       }
+       int const s = set_start (start);
+       int const e = set_end (end);
 
-       if (_start != start) {
-               _start = start;
-               start_changed(this); /* EMIT SIGNAL */
-       }
-
-       if (_end != end) {
-               _end = end;
-               end_changed(this); /* EMIT SIGNAL */
-       }
-       return 0;
+       return (s == 0 && e == 0) ? 0 : -1;
 }
 
 int
@@ -220,14 +198,6 @@ Location::set_cd (bool yn, void *src)
        }
 }
 
-void
-Location::set_is_session_range (bool yn, void *src)
-{
-       if (set_flag_internal (yn, IsSessionRange)) {
-                FlagsChanged (this, src); /* EMIT SIGNAL */
-       }
-}
-
 void
 Location::set_is_range_marker (bool yn, void *src)
 {
@@ -578,6 +548,8 @@ Locations::clear_ranges ()
 void
 Locations::add (Location *loc, bool make_current)
 {
+       assert (loc);
+       
        {
                Glib::Mutex::Lock lm (lock);
                locations.push_back (loc);