projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into saveas
[ardour.git]
/
libs
/
ardour
/
port_insert.cc
diff --git
a/libs/ardour/port_insert.cc
b/libs/ardour/port_insert.cc
index d64920b1e2ddcb7f8cacb322f89213d2e43e227e..fa09ea05ac8dd11e3b2f2358ebed1b5eb4e81b66 100644
(file)
--- a/
libs/ardour/port_insert.cc
+++ b/
libs/ardour/port_insert.cc
@@
-49,7
+49,7
@@
PortInsert::PortInsert (Session& s, boost::shared_ptr<Pannable> pannable, boost:
{
_mtdm = 0;
_latency_detect = false;
{
_mtdm = 0;
_latency_detect = false;
- _latency_flush_frames =
false
;
+ _latency_flush_frames =
0
;
_measured_latency = 0;
}
_measured_latency = 0;
}
@@
-64,7
+64,7
@@
PortInsert::start_latency_detection ()
{
delete _mtdm;
_mtdm = new MTDM (_session.frame_rate());
{
delete _mtdm;
_mtdm = new MTDM (_session.frame_rate());
- _latency_flush_frames =
false
;
+ _latency_flush_frames =
0
;
_latency_detect = true;
_measured_latency = 0;
}
_latency_detect = true;
_measured_latency = 0;
}
@@
-116,7
+116,6
@@
PortInsert::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame,
_mtdm->process (nframes, in, out);
_mtdm->process (nframes, in, out);
- outbuf.set_is_silent (false);
outbuf.set_written (true);
}
outbuf.set_written (true);
}
@@
-250,7
+249,9
@@
PortInsert::signal_latency() const
bool
PortInsert::configure_io (ChanCount in, ChanCount out)
{
bool
PortInsert::configure_io (ChanCount in, ChanCount out)
{
+#ifndef PLATFORM_WINDOWS
assert (!AudioEngine::instance()->process_lock().trylock());
assert (!AudioEngine::instance()->process_lock().trylock());
+#endif
/* for an insert, processor input corresponds to IO output, and vice versa */
/* for an insert, processor input corresponds to IO output, and vice versa */