projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
some strategic documentation
[ardour.git]
/
libs
/
ardour
/
internal_return.cc
diff --git
a/libs/ardour/internal_return.cc
b/libs/ardour/internal_return.cc
index fc5963603b5ac572d7d9313b3211b0b2c07bacc4..4947231c84717b9836a405c7d5dfc09eaa7aa6f3 100644
(file)
--- a/
libs/ardour/internal_return.cc
+++ b/
libs/ardour/internal_return.cc
@@
-20,6
+20,7
@@
#include "ardour/internal_return.h"
#include "ardour/internal_send.h"
#include "ardour/internal_return.h"
#include "ardour/internal_send.h"
+#include "ardour/route.h"
using namespace std;
using namespace ARDOUR;
using namespace std;
using namespace ARDOUR;
@@
-38,10
+39,10
@@
InternalReturn::run (BufferSet& bufs, framepos_t /*start_frame*/, framepos_t /*e
}
Glib::Threads::Mutex::Lock lm (_sends_mutex, Glib::Threads::TRY_LOCK);
}
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 (lm.locked ()) {
for (list<InternalSend*>::iterator i = _sends.begin(); i != _sends.end(); ++i) {
- if ((*i)->active ()) {
+ if ((*i)->active ()
&& (!(*i)->source_route() || (*i)->source_route()->active())
) {
bufs.merge_from ((*i)->get_buffers(), nframes);
}
}
bufs.merge_from ((*i)->get_buffers(), nframes);
}
}