X-Git-Url: https://main.carlh.net/gitweb/?p=ardour.git;a=blobdiff_plain;f=libs%2Fardour%2Fsend.cc;h=d0049ff7b243f700d4eba516b118841092d6461f;hp=ebe8c46c8f9f0061e981f02ef361ae1a807a0d39;hb=c8c6bca6587450ff64303dbc994a4cd28d6ce7aa;hpb=bb090c0012340b637508e0930376b3d5afba5f5c diff --git a/libs/ardour/send.cc b/libs/ardour/send.cc index ebe8c46c8f..d0049ff7b2 100644 --- a/libs/ardour/send.cc +++ b/libs/ardour/send.cc @@ -21,9 +21,9 @@ #include #include "pbd/xml++.h" -#include "pbd/boost_debug.h" #include "ardour/amp.h" +#include "ardour/boost_debug.h" #include "ardour/buffer_set.h" #include "ardour/debug.h" #include "ardour/gain_control.h" @@ -33,7 +33,7 @@ #include "ardour/send.h" #include "ardour/session.h" -#include "i18n.h" +#include "pbd/i18n.h" namespace ARDOUR { class AutomationControl; @@ -159,7 +159,7 @@ Send::set_delay_out(framecnt_t delay) } void -Send::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pframes_t nframes, bool) +Send::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, double speed, pframes_t nframes, bool) { if (_output->n_ports() == ChanCount::ZERO) { _meter->reset (); @@ -185,13 +185,13 @@ Send::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pframe _amp->set_gain_automation_buffer (_session.send_gain_automation_buffer ()); _amp->setup_gain_automation (start_frame, end_frame, nframes); - _amp->run (sendbufs, start_frame, end_frame, nframes, true); + _amp->run (sendbufs, start_frame, end_frame, speed, nframes, true); - _delayline->run (sendbufs, start_frame, end_frame, nframes, true); + _delayline->run (sendbufs, start_frame, end_frame, speed, nframes, true); /* deliver to outputs */ - Delivery::run (sendbufs, start_frame, end_frame, nframes, true); + Delivery::run (sendbufs, start_frame, end_frame, speed, nframes, true); /* consider metering */ @@ -199,7 +199,7 @@ Send::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pframe if (_amp->gain_control()->get_value() == 0) { _meter->reset(); } else { - _meter->run (*_output_buffers, start_frame, end_frame, nframes, true); + _meter->run (*_output_buffers, start_frame, end_frame, speed, nframes, true); } } @@ -239,7 +239,7 @@ Send::set_state (const XMLNode& node, int version) return set_state_2X (node, version); } - const XMLProperty* prop; + XMLProperty const * prop; Delivery::set_state (node, version); @@ -409,7 +409,7 @@ Send::display_to_user () const } string -Send::value_as_string (boost::shared_ptr ac) const +Send::value_as_string (boost::shared_ptr ac) const { return _amp->value_as_string (ac); }