summaryrefslogtreecommitdiff
path: root/libs/ardour/io.cc
diff options
context:
space:
mode:
Diffstat (limited to 'libs/ardour/io.cc')
-rw-r--r--libs/ardour/io.cc9
1 files changed, 2 insertions, 7 deletions
diff --git a/libs/ardour/io.cc b/libs/ardour/io.cc
index 88b8aceb3f..cdd80b747d 100644
--- a/libs/ardour/io.cc
+++ b/libs/ardour/io.cc
@@ -221,7 +221,7 @@ IO::silence (nframes_t nframes)
* to the outputs, eg applying gain or pan or whatever else needs to be done.
*/
void
-IO::deliver_output (BufferSet& bufs, nframes_t start_frame, nframes_t end_frame, nframes_t nframes)
+IO::deliver_output (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes)
{
// Attach output buffers to port buffers
output_buffers().attach_buffers (_outputs, nframes, _output_offset);
@@ -317,7 +317,7 @@ IO::collect_input (BufferSet& outs, nframes_t nframes, ChanCount offset)
}
void
-IO::just_meter_input (nframes_t start_frame, nframes_t end_frame, nframes_t nframes)
+IO::just_meter_input (sframes_t start_frame, sframes_t end_frame, nframes_t nframes)
{
BufferSet& bufs = _session.get_scratch_buffers (n_inputs());
collect_input (bufs, nframes);
@@ -866,7 +866,6 @@ IO::ensure_io (ChanCount in, ChanCount out, bool clear, void* src)
{
bool in_changed = false;
bool out_changed = false;
- bool need_pan_reset = false;
assert(in != ChanCount::INFINITE);
assert(out != ChanCount::INFINITE);
@@ -887,10 +886,6 @@ IO::ensure_io (ChanCount in, ChanCount out, bool clear, void* src)
Port* port;
- if (n_outputs() != out) {
- need_pan_reset = true;
- }
-
for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
const size_t nin = in.get(*t);