NO-OP: cleanup code
authorRobin Gareus <robin@gareus.org>
Sun, 22 Sep 2019 02:15:01 +0000 (04:15 +0200)
committerRobin Gareus <robin@gareus.org>
Sun, 22 Sep 2019 02:15:01 +0000 (04:15 +0200)
libs/ardour/internal_return.cc

index 3d0fff28975ff5e65bc2178c2d22025d63d69d07..0ca7a5dec36825a42a71fe4096672a924bcdadbd 100644 (file)
@@ -31,7 +31,7 @@ using namespace ARDOUR;
 InternalReturn::InternalReturn (Session& s)
        : Return (s, true)
 {
-        _display_to_user = false;
+       _display_to_user = false;
 }
 
 void
@@ -40,18 +40,19 @@ InternalReturn::run (BufferSet& bufs, samplepos_t /*start_sample*/, samplepos_t
        if (!_active && !_pending_active) {
                return;
        }
+       _active = _pending_active;
 
        Glib::Threads::Mutex::Lock lm (_sends_mutex, Glib::Threads::TRY_LOCK);
 
-       if (lm.locked ()) {
-               for (list<InternalSend*>::iterator i = _sends.begin(); i != _sends.end(); ++i) {
-                       if ((*i)->active () && (!(*i)->source_route() || (*i)->source_route()->active())) {
-                               bufs.merge_from ((*i)->get_buffers(), nframes);
-                       }
-               }
+       if (!lm.locked ()) {
+               return;
        }
 
-       _active = _pending_active;
+       for (list<InternalSend*>::iterator i = _sends.begin(); i != _sends.end(); ++i) {
+               if ((*i)->active () && (!(*i)->source_route() || (*i)->source_route()->active())) {
+                       bufs.merge_from ((*i)->get_buffers(), nframes);
+               }
+       }
 }
 
 void