Fix crash on save of MIDI data.

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

diff --git a/libs/ardour/internal_send.cc b/libs/ardour/internal_send.cc
index bbf15166d4b4df8bff697bd2c576ebabe2167895..d70889a27c922445a5a65ecf83461d12cf183b74 100644 (file)
--- a/libs/ardour/internal_send.cc
+++ b/libs/ardour/internal_send.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2009 Paul Davis 
+    Copyright (C) 2009 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -42,14 +42,14 @@ InternalSend::InternalSend (Session& s, boost::shared_ptr<MuteMaster> mm, boost:
        }
 
        set_name (sendto->name());
-       
+
        _send_to->GoingAway.connect (mem_fun (*this, &InternalSend::send_to_going_away));
 }
 
 InternalSend::InternalSend (Session& s, boost::shared_ptr<MuteMaster> mm, const XMLNode& node)
        : Send (s, mm, node, Delivery::Aux /* will be reset in set_state() */)
 {
-       set_state (node);
+       set_state (node, Stateful::loading_state_version);
 }
 
 InternalSend::~InternalSend ()
@@ -79,16 +79,16 @@ InternalSend::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame,
 
        // we have to copy the input, because we may alter the buffers with the amp
        // in-place, which a send must never do.
-       
+
        assert(mixbufs.available() >= bufs.count());
        mixbufs.read_from (bufs, nframes);
-       
+
        /* gain control */
 
        gain_t tgain = target_gain ();
-       
+
        if (tgain != _current_gain) {
-               
+
                /* target gain has changed */
 
                Amp::apply_gain (mixbufs, nframes, _current_gain, tgain);
@@ -109,7 +109,7 @@ InternalSend::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame,
                Amp::apply_simple_gain (mixbufs, nframes, tgain);
        }
 
-       
+
        // Can't automate gain for sends or returns yet because we need different buffers
        // so that we don't overwrite the main automation data for the route amp
        // _amp->setup_gain_automation (start_frame, end_frame, nframes);
@@ -119,7 +119,7 @@ InternalSend::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame,
        /* XXX NEED TO PAN */
 
        /* consider metering */
-       
+
        if (_metering) {
                if (_amp->gain_control()->get_value() == 0) {
                        _meter->reset();
@@ -160,7 +160,7 @@ InternalSend::state (bool full)
        if (_send_to) {
                node.add_property ("target", _send_to->id().to_s());
        }
-       
+
        return node;
 }
 
@@ -171,11 +171,11 @@ InternalSend::get_state()
 }
 
 int
-InternalSend::set_state (const XMLNode& node)
+InternalSend::set_state (const XMLNode& node, int version)
 {
        const XMLProperty* prop;
 
-       Send::set_state (node);
+       Send::set_state (node, version);
 
        if ((prop = node.property ("target")) != 0) {
 
@@ -192,7 +192,7 @@ InternalSend::set_state (const XMLNode& node)
                        connect_when_legal ();
                }
        }
-       
+
        return 0;
 }
 
@@ -209,8 +209,8 @@ InternalSend::connect_when_legal ()
        if ((_send_to = _session.route_by_id (_send_to_id)) == 0) {
                error << X_("cannot find route to connect to") << endmsg;
                return -1;
-       } 
-       
+       }
+
        if ((target = _send_to->get_return_buffer ()) == 0) {
                error << X_("target for internal send has no return buffer") << endmsg;
                return -1;
@@ -219,7 +219,7 @@ InternalSend::connect_when_legal ()
        return 0;
 }
 
-bool 
+bool
 InternalSend::can_support_io_configuration (const ChanCount& in, ChanCount& out) const
 {
        out = in;
@@ -230,7 +230,7 @@ bool
 InternalSend::configure_io (ChanCount in, ChanCount out)
 {
        bool ret = Send::configure_io (in, out);
-       set_block_size (_session.get_block_size());
+       set_block_size (_session.engine().frames_per_cycle());
        return ret;
 }
 
@@ -258,5 +258,5 @@ InternalSend::visible () const
                return true;
        }
 
-       return false; 
+       return false;
 }