Changed send/deliver role "Personal" to "Foldback" so bus type can match

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

diff --git a/libs/ardour/send.cc b/libs/ardour/send.cc
index 7fd88aebac20644bf5ebfc458630ea22e2241abb..a9b8f2b135c2dfaadb1507ba16f7eb88ff5c7b07 100644 (file)
--- a/libs/ardour/send.cc
+++ b/libs/ardour/send.cc
@@ -67,6 +67,8 @@ Send::name_and_id_new_send (Session& s, Role r, uint32_t& bitslot, bool ignore_b
                return _("listen"); // no ports, no need for numbering
        case Delivery::Send:
                return string_compose (_("send %1"), (bitslot = s.next_send_id ()) + 1);
+       case Delivery::Foldback:
+               return string_compose (_("foldback %1"), (bitslot = s.next_aux_send_id ()) + 1);
        default:
                fatal << string_compose (_("programming error: send created using role %1"), enum_2_string (r)) << endmsg;
                abort(); /*NOTREACHED*/
@@ -260,15 +262,9 @@ Send::run (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_sample, do
 }
 
 XMLNode&
-Send::get_state(void)
+Send::state ()
 {
-       return state (true);
-}
-
-XMLNode&
-Send::state (bool full)
-{
-       XMLNode& node = Delivery::state(full);
+       XMLNode& node = Delivery::state ();
 
        node.set_property ("type", "send");
 
@@ -278,7 +274,7 @@ Send::state (bool full)
 
        node.set_property ("selfdestruct", _remove_on_disconnect);
 
-       node.add_child_nocopy (_amp->state (full));
+       node.add_child_nocopy (_amp->get_state ());
 
        return node;
 }
@@ -301,7 +297,7 @@ Send::set_state (const XMLNode& node, int version)
                */
 
                if ((prop = node.property ("bitslot")) == 0) {
-                       if (_role == Delivery::Aux) {
+                       if (_role == Delivery::Aux || _role == Delivery::Foldback) {
                                _bitslot = _session.next_aux_send_id ();
                        } else if (_role == Delivery::Send) {
                                _bitslot = _session.next_send_id ();
@@ -310,7 +306,7 @@ Send::set_state (const XMLNode& node, int version)
                                _bitslot = 0;
                        }
                } else {
-                       if (_role == Delivery::Aux) {
+                       if (_role == Delivery::Aux || _role == Delivery::Foldback) {
                                _session.unmark_aux_send_id (_bitslot);
                                _bitslot = string_to<uint32_t>(prop->value());
                                _session.mark_aux_send_id (_bitslot);
@@ -455,7 +451,7 @@ Send::display_to_user () const
 {
        /* we ignore Deliver::_display_to_user */
 
-       if (_role == Listen) {
+       if (_role == Listen || _role == Foldback) {
                /* don't make the monitor/control/listen send visible */
                return false;
        }