fix clang compilation (include header ordering)

[ardour.git] / libs / ardour / send.cc

diff --git a/libs/ardour/send.cc b/libs/ardour/send.cc
index f1cfdc7ef380febe744aa1c8591665eb426a0dcb..c5ad4d8ed7a2dbd3b9898e0ef86a8636cc1fd4e3 100644 (file)
--- a/libs/ardour/send.cc
+++ b/libs/ardour/send.cc
@@ -33,7 +33,7 @@
 #include "ardour/send.h"
 #include "ardour/session.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 namespace ARDOUR {
 class AutomationControl;
@@ -130,7 +130,7 @@ Send::deactivate ()
 }
 
 void
-Send::set_delay_in(framecnt_t delay)
+Send::set_delay_in(samplecnt_t delay)
 {
        if (!_delayline) return;
        if (_delay_in == delay) {
@@ -145,7 +145,7 @@ Send::set_delay_in(framecnt_t delay)
 }
 
 void
-Send::set_delay_out(framecnt_t delay)
+Send::set_delay_out(samplecnt_t delay)
 {
        if (!_delayline) return;
        if (_delay_out == delay) {
@@ -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, samplepos_t start_sample, samplepos_t end_sample, double speed, pframes_t nframes, bool)
 {
        if (_output->n_ports() == ChanCount::ZERO) {
                _meter->reset ();
@@ -184,14 +184,14 @@ Send::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pframe
        /* gain control */
 
        _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->setup_gain_automation (start_sample, end_sample, nframes);
+       _amp->run (sendbufs, start_sample, end_sample, speed, nframes, true);
 
-       _delayline->run (sendbufs, start_frame, end_frame, nframes, true);
+       _delayline->run (sendbufs, start_sample, end_sample, speed, nframes, true);
 
        /* deliver to outputs */
 
-       Delivery::run (sendbufs, start_frame, end_frame, nframes, true);
+       Delivery::run (sendbufs, start_sample, end_sample, 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_sample, end_sample, speed, nframes, true);
                }
        }
 
@@ -216,16 +216,14 @@ XMLNode&
 Send::state (bool full)
 {
        XMLNode& node = Delivery::state(full);
-       char buf[32];
 
-       node.add_property ("type", "send");
-       snprintf (buf, sizeof (buf), "%" PRIu32, _bitslot);
+       node.set_property ("type", "send");
 
        if (_role != Listen) {
-               node.add_property ("bitslot", buf);
+               node.set_property ("bitslot", _bitslot);
        }
 
-       node.add_property("selfdestruct", _remove_on_disconnect ? "yes" : "no");
+       node.set_property ("selfdestruct", _remove_on_disconnect);
 
        node.add_child_nocopy (_amp->state (full));
 
@@ -261,11 +259,11 @@ Send::set_state (const XMLNode& node, int version)
                } else {
                        if (_role == Delivery::Aux) {
                                _session.unmark_aux_send_id (_bitslot);
-                               sscanf (prop->value().c_str(), "%" PRIu32, &_bitslot);
+                               _bitslot = string_to<uint32_t>(prop->value());
                                _session.mark_aux_send_id (_bitslot);
                        } else if (_role == Delivery::Send) {
                                _session.unmark_send_id (_bitslot);
-                               sscanf (prop->value().c_str(), "%" PRIu32, &_bitslot);
+                               _bitslot = string_to<uint32_t>(prop->value());
                                _session.mark_send_id (_bitslot);
                        } else {
                                // bitslot doesn't matter but make it zero anyway
@@ -274,9 +272,7 @@ Send::set_state (const XMLNode& node, int version)
                }
        }
 
-       if ((prop = node.property (X_("selfdestruct"))) != 0) {
-               _remove_on_disconnect = string_is_affirmative (prop->value());
-       }
+       node.get_property (X_("selfdestruct"), _remove_on_disconnect);
 
        XMLNodeList nlist = node.children();
        for (XMLNodeIterator i = nlist.begin(); i != nlist.end(); ++i) {
@@ -350,7 +346,7 @@ Send::configure_io (ChanCount in, ChanCount out)
                return false;
        }
 
-       if (_delayline && !_delayline->configure_io(in, out)) {
+       if (_delayline && !_delayline->configure_io (ChanCount (DataType::AUDIO, pan_outs()), ChanCount (DataType::AUDIO, pan_outs()))) {
                cerr << "send delayline config failed\n";
                return false;
        }
@@ -408,12 +404,6 @@ Send::display_to_user () const
        return true;
 }
 
-string
-Send::value_as_string (boost::shared_ptr<AutomationControl> ac) const
-{
-       return _amp->value_as_string (ac);
-}
-
 void
 Send::snd_output_changed (IOChange change, void* /*src*/)
 {