summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libs/ardour/ardour/delivery.h2
-rw-r--r--libs/ardour/ardour/midi_port.h2
-rw-r--r--libs/ardour/ardour/port.h2
-rw-r--r--libs/ardour/delivery.cc4
-rw-r--r--libs/ardour/midi_port.cc2
-rw-r--r--libs/ardour/midi_track.cc2
-rw-r--r--libs/ardour/track.cc2
7 files changed, 8 insertions, 8 deletions
diff --git a/libs/ardour/ardour/delivery.h b/libs/ardour/ardour/delivery.h
index cb2f37d1f0..4ee171c033 100644
--- a/libs/ardour/ardour/delivery.h
+++ b/libs/ardour/ardour/delivery.h
@@ -74,7 +74,7 @@ public:
/* supplemental method used with MIDI */
- void flush_buffers (framecnt_t nframes, framepos_t time);
+ void flush_buffers (framecnt_t nframes);
void no_outs_cuz_we_no_monitor(bool);
void transport_stopped (framepos_t frame);
void realtime_locate ();
diff --git a/libs/ardour/ardour/midi_port.h b/libs/ardour/ardour/midi_port.h
index a4d2f53806..84575ca351 100644
--- a/libs/ardour/ardour/midi_port.h
+++ b/libs/ardour/ardour/midi_port.h
@@ -41,7 +41,7 @@ class MidiPort : public Port {
void cycle_end (pframes_t nframes);
void cycle_split ();
- void flush_buffers (pframes_t nframes, framepos_t time);
+ void flush_buffers (pframes_t nframes);
void transport_stopped ();
void realtime_locate ();
void reset ();
diff --git a/libs/ardour/ardour/port.h b/libs/ardour/ardour/port.h
index 7aa4e8a0d5..37101950d5 100644
--- a/libs/ardour/ardour/port.h
+++ b/libs/ardour/ardour/port.h
@@ -116,7 +116,7 @@ public:
virtual void cycle_end (pframes_t) = 0;
virtual void cycle_split () = 0;
virtual Buffer& get_buffer (pframes_t nframes) = 0;
- virtual void flush_buffers (pframes_t /*nframes*/, framepos_t /*time*/) {}
+ virtual void flush_buffers (pframes_t /*nframes*/) {}
virtual void transport_stopped () {}
virtual void realtime_locate () {}
diff --git a/libs/ardour/delivery.cc b/libs/ardour/delivery.cc
index 3b95c5ee3d..2fc8d82e47 100644
--- a/libs/ardour/delivery.cc
+++ b/libs/ardour/delivery.cc
@@ -446,7 +446,7 @@ Delivery::reset_panners ()
}
void
-Delivery::flush_buffers (framecnt_t nframes, framepos_t time)
+Delivery::flush_buffers (framecnt_t nframes)
{
/* io_lock, not taken: function must be called from Session::process() calltree */
@@ -457,7 +457,7 @@ Delivery::flush_buffers (framecnt_t nframes, framepos_t time)
PortSet& ports (_output->ports());
for (PortSet::iterator i = ports.begin(); i != ports.end(); ++i) {
- i->flush_buffers (nframes, time);
+ i->flush_buffers (nframes);
}
}
diff --git a/libs/ardour/midi_port.cc b/libs/ardour/midi_port.cc
index 0f91dd3e36..6d09ddb52c 100644
--- a/libs/ardour/midi_port.cc
+++ b/libs/ardour/midi_port.cc
@@ -151,7 +151,7 @@ MidiPort::resolve_notes (void* jack_buffer, MidiBuffer::TimeType when)
}
void
-MidiPort::flush_buffers (pframes_t nframes, framepos_t /*time*/)
+MidiPort::flush_buffers (pframes_t nframes)
{
if (sends_output ()) {
diff --git a/libs/ardour/midi_track.cc b/libs/ardour/midi_track.cc
index 6000f64c35..15db5ddb97 100644
--- a/libs/ardour/midi_track.cc
+++ b/libs/ardour/midi_track.cc
@@ -369,7 +369,7 @@ MidiTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame
for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
boost::shared_ptr<Delivery> d = boost::dynamic_pointer_cast<Delivery> (*i);
if (d) {
- d->flush_buffers (nframes, end_frame - start_frame - 1);
+ d->flush_buffers (nframes);
}
}
diff --git a/libs/ardour/track.cc b/libs/ardour/track.cc
index 5b6cb63091..2ef3c85b4a 100644
--- a/libs/ardour/track.cc
+++ b/libs/ardour/track.cc
@@ -406,7 +406,7 @@ Track::no_roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame,
for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
boost::shared_ptr<Delivery> d = boost::dynamic_pointer_cast<Delivery> (*i);
if (d) {
- d->flush_buffers (nframes, end_frame - start_frame - 1);
+ d->flush_buffers (nframes);
}
}