optimize some performance bottlenecks; remove jack_nframes_t that crept back into...
[ardour.git] / libs / ardour / io.cc
index fce8c3f1d81157a81cdcd27c2ceb64ca6f3a42a2..67f365a400ab6b61316463f15b506bb2fb08b548 100644 (file)
 #include <algorithm>
 #include <unistd.h>
 #include <locale.h>
+#include <errno.h>
 
 #include <sigc++/bind.h>
 
 #include <glibmm/thread.h>
 
 #include <pbd/xml++.h>
+#include <pbd/replace_all.h>
 
 #include <ardour/audioengine.h>
 #include <ardour/io.h>
@@ -54,15 +56,14 @@ extern "C" int isnan (double);
 extern "C" int isinf (double);
 #endif
 
+#define BLOCK_PROCESS_CALLBACK() Glib::Mutex::Lock em (_session.engine().process_lock())
 
 using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
+nframes_t    IO::_automation_interval = 0;
 
-static float current_automation_version_number = 1.0;
-
-jack_nframes_t               IO::_automation_interval = 0;
 const string                 IO::state_node_name = "IO";
 bool                         IO::connecting_legal = false;
 bool                         IO::ports_legal = false;
@@ -104,16 +105,29 @@ IO::IO (Session& s, string name,
       _output_buffers(new BufferSet()),
          _name (name),
          _default_type(default_type),
-         _gain_control (*this),
+         _gain_control (X_("gaincontrol"), *this),
          _gain_automation_curve (0.0, 2.0, 1.0),
-         _input_minimum (_default_type, input_min),
-         _input_maximum (_default_type, input_max),
-         _output_minimum (_default_type, output_min),
-         _output_maximum (_default_type, output_max)
+         _input_minimum (ChanCount::ZERO),
+         _input_maximum (ChanCount::INFINITE),
+         _output_minimum (ChanCount::ZERO),
+         _output_maximum (ChanCount::INFINITE)
 {
        _panner = new Panner (name, _session);
        _meter = new PeakMeter (_session);
 
+       if (input_min > 0) {
+               _input_minimum = ChanCount(_default_type, input_min);
+       }
+       if (input_max >= 0) {
+               _input_maximum = ChanCount(_default_type, input_max);
+       }
+       if (output_min > 0) {
+               _output_minimum = ChanCount(_default_type, output_min);
+       }
+       if (output_max >= 0) {
+               _output_maximum = ChanCount(_default_type, output_max);
+       }
+
        _gain = 1.0;
        _desired_gain = 1.0;
        _input_connection = 0;
@@ -124,26 +138,64 @@ IO::IO (Session& s, string name,
        deferred_state = 0;
 
        apply_gain_automation = false;
-
+       
        last_automation_snapshot = 0;
 
        _gain_automation_state = Off;
        _gain_automation_style = Absolute;
-    
-    {
-        // IO::Meter is emitted from another thread so the
-        // Meter signal must be protected.
-        Glib::Mutex::Lock guard (m_meter_signal_lock);
-        m_meter_connection = Meter.connect (mem_fun (*this, &IO::meter));
-    }
+
+       {
+               // IO::Meter is emitted from another thread so the
+               // Meter signal must be protected.
+               Glib::Mutex::Lock guard (m_meter_signal_lock);
+               m_meter_connection = Meter.connect (mem_fun (*this, &IO::meter));
+       }
+       
+       // Connect to our own MoreChannels signal to connect output buffers
+       IO::MoreChannels.connect (mem_fun (*this, &IO::attach_buffers));
+
+       _session.add_controllable (&_gain_control);
+}
+
+IO::IO (Session& s, const XMLNode& node, DataType dt)
+       : _session (s),
+      _output_buffers(new BufferSet()),
+         _default_type (dt),
+         _gain_control (X_("gaincontrol"), *this),
+         _gain_automation_curve (0, 0, 0) // all reset in set_state()
+{
+       // FIXME: hack
+       _meter = new PeakMeter (_session);
+
+       _panner = 0;
+       deferred_state = 0;
+       no_panner_reset = false;
+       _desired_gain = 1.0;
+       _gain = 1.0;
+       _input_connection = 0;
+       _output_connection = 0;
+
+       apply_gain_automation = false;
+
+       set_state (node);
+
+       {
+               // IO::Meter is emitted from another thread so the
+               // Meter signal must be protected.
+               Glib::Mutex::Lock guard (m_meter_signal_lock);
+               m_meter_connection = Meter.connect (mem_fun (*this, &IO::meter));
+       }
        
        // Connect to our own MoreChannels signal to connect output buffers
        IO::MoreChannels.connect (mem_fun (*this, &IO::attach_buffers));
+
+       _session.add_controllable (&_gain_control);
 }
 
 IO::~IO ()
 {
-    Glib::Mutex::Lock guard (m_meter_signal_lock);
+       Glib::Mutex::Lock guard (m_meter_signal_lock);
+       
        Glib::Mutex::Lock lm (io_lock);
 
        for (PortSet::iterator i = _inputs.begin(); i != _inputs.end(); ++i) {
@@ -154,7 +206,7 @@ IO::~IO ()
                _session.engine().unregister_port (*i);
        }
 
-    m_meter_connection.disconnect();
+       m_meter_connection.disconnect();
 
        delete _meter;
        delete _panner;
@@ -162,12 +214,12 @@ IO::~IO ()
 }
 
 void
-IO::silence (jack_nframes_t nframes, jack_nframes_t offset)
+IO::silence (nframes_t nframes, nframes_t offset)
 {
        /* io_lock, not taken: function must be called from Session::process() calltree */
 
        for (PortSet::iterator i = _outputs.begin(); i != _outputs.end(); ++i) {
-               i->silence (nframes, offset);
+               i->get_buffer().silence (nframes, offset);
        }
 }
 
@@ -177,10 +229,9 @@ IO::silence (jack_nframes_t nframes, jack_nframes_t offset)
  * to the outputs, eg applying gain or pan or whatever else needs to be done.
  */
 void
-IO::deliver_output (BufferSet& bufs, jack_nframes_t start_frame, jack_nframes_t end_frame, jack_nframes_t nframes, jack_nframes_t offset)
+IO::deliver_output (BufferSet& bufs, nframes_t start_frame, nframes_t end_frame, nframes_t nframes, nframes_t offset)
 {
        // FIXME: type specific code doesn't actually need to be here, it will go away in time
-       
 
        /* ********** AUDIO ********** */
 
@@ -195,6 +246,7 @@ IO::deliver_output (BufferSet& bufs, jack_nframes_t start_frame, jack_nframes_t
                        if (dm.locked()) {
                                dg = _desired_gain;
                        }
+
                }
 
                Amp::run(bufs, nframes, _gain, dg, _phase_invert);
@@ -203,6 +255,15 @@ IO::deliver_output (BufferSet& bufs, jack_nframes_t start_frame, jack_nframes_t
        // Use the panner to distribute audio to output port buffers
        if (_panner && !_panner->empty() && !_panner->bypassed()) {
                _panner->distribute(bufs, output_buffers(), start_frame, end_frame, nframes, offset);
+       } else {
+               const DataType type = DataType::AUDIO;
+
+               // Copy any audio 1:1 to outputs
+               assert(bufs.count().get(DataType::AUDIO) == output_buffers().count().get(DataType::AUDIO));
+               BufferSet::iterator o = output_buffers().begin(type);
+               for (BufferSet::iterator i = bufs.begin(type); i != bufs.end(type); ++i, ++o) {
+                       o->read_from(*i, nframes, offset);
+               }
        }
 
 
@@ -213,21 +274,21 @@ IO::deliver_output (BufferSet& bufs, jack_nframes_t start_frame, jack_nframes_t
                return;
        }
 
-       const DataType type = DataType::MIDI; // type type type type...
-       
-       // Just dump any MIDI 1-to-1, we're not at all clever with MIDI routing yet
+       const DataType type = DataType::MIDI;
+
+       // Copy any MIDI 1:1 to outputs
+       assert(bufs.count().get(DataType::MIDI) == output_buffers().count().get(DataType::MIDI));
        BufferSet::iterator o = output_buffers().begin(type);
-       for (BufferSet::iterator i = bufs.begin(type); i != bufs.end(type); ++i) {
-               
-               for (PortSet::iterator i = _inputs.begin(type); i != _inputs.end(type); ++i, ++o) {
-                       o->read_from(i->get_buffer(), nframes, offset);
-               }
+       for (BufferSet::iterator i = bufs.begin(type); i != bufs.end(type); ++i, ++o) {
+               o->read_from(*i, nframes, offset);
        }
 }
 
 void
-IO::collect_input (BufferSet& outs, jack_nframes_t nframes, jack_nframes_t offset)
+IO::collect_input (BufferSet& outs, nframes_t nframes, nframes_t offset)
 {
+       assert(outs.available() >= n_inputs());
+
        outs.set_count(n_inputs());
        
        if (outs.count() == ChanCount::ZERO)
@@ -244,11 +305,10 @@ IO::collect_input (BufferSet& outs, jack_nframes_t nframes, jack_nframes_t offse
 }
 
 void
-IO::just_meter_input (jack_nframes_t start_frame, jack_nframes_t end_frame, 
-                     jack_nframes_t nframes, jack_nframes_t offset)
+IO::just_meter_input (nframes_t start_frame, nframes_t end_frame, 
+                     nframes_t nframes, nframes_t offset)
 {
-       BufferSet& bufs = _session.get_scratch_buffers ();
-       ChanCount nbufs = n_process_buffers ();
+       BufferSet& bufs = _session.get_scratch_buffers (n_inputs());
 
        collect_input (bufs, nframes, offset);
 
@@ -281,7 +341,7 @@ IO::disconnect_input (Port* our_port, string other_port, void* src)
        }
 
        { 
-               Glib::Mutex::Lock em (_session.engine().process_lock());
+               BLOCK_PROCESS_CALLBACK ();
                
                {
                        Glib::Mutex::Lock lm (io_lock);
@@ -317,7 +377,7 @@ IO::connect_input (Port* our_port, string other_port, void* src)
        }
 
        {
-               Glib::Mutex::Lock em(_session.engine().process_lock());
+               BLOCK_PROCESS_CALLBACK ();
                
                {
                        Glib::Mutex::Lock lm (io_lock);
@@ -351,7 +411,7 @@ IO::disconnect_output (Port* our_port, string other_port, void* src)
        }
 
        {
-               Glib::Mutex::Lock em(_session.engine().process_lock());
+               BLOCK_PROCESS_CALLBACK ();
                
                {
                        Glib::Mutex::Lock lm (io_lock);
@@ -386,7 +446,8 @@ IO::connect_output (Port* our_port, string other_port, void* src)
        }
 
        {
-               Glib::Mutex::Lock em(_session.engine().process_lock());
+               BLOCK_PROCESS_CALLBACK ();
+
                
                {
                        Glib::Mutex::Lock lm (io_lock);
@@ -426,13 +487,13 @@ IO::set_input (Port* other_port, void* src)
 
        if (other_port == 0) {
                if (_input_minimum == ChanCount::ZERO) {
-                       return ensure_inputs (0, false, true, src);
+                       return ensure_inputs (ChanCount::ZERO, false, true, src);
                } else {
                        return -1;
                }
        }
 
-       if (ensure_inputs (1, true, true, src)) {
+       if (ensure_inputs (ChanCount(other_port->type(), 1), true, true, src)) {
                return -1;
        }
 
@@ -442,50 +503,42 @@ IO::set_input (Port* other_port, void* src)
 int
 IO::remove_output_port (Port* port, void* src)
 {
-       throw; // FIXME
-#if 0
        IOChange change (NoChange);
 
        {
-               Glib::Mutex::Lock em(_session.engine().process_lock());
+               BLOCK_PROCESS_CALLBACK ();
+
                
                {
                        Glib::Mutex::Lock lm (io_lock);
-                       
-                       if (_noutputs - 1 == (uint32_t) _output_minimum) {
+
+                       if (n_outputs() <= _output_minimum) {
                                /* sorry, you can't do this */
                                return -1;
                        }
-                       
-                       for (PortSet::iterator i = _outputs.begin(); i != _outputs.end(); ++i) {
-                               if (*i == port) {
-                                       change = IOChange (change|ConfigurationChanged);
-                                       if (port->connected()) {
-                                               change = IOChange (change|ConnectionsChanged);
-                                       } 
-
-                                       _session.engine().unregister_port (*i);
-                                       _outputs.erase (i);
-                                       _noutputs--;
-                                       drop_output_connection ();
-
-                                       break;
-                               }
-                       }
 
-                       if (change != NoChange) {
+                       if (_outputs.remove(port)) {
+                               change = IOChange (change|ConfigurationChanged);
+
+                               if (port->connected()) {
+                                       change = IOChange (change|ConnectionsChanged);
+                               } 
+
+                               _session.engine().unregister_port (*port);
+                               drop_output_connection ();
+                               
                                setup_peak_meters ();
                                reset_panner ();
                        }
                }
        }
-       
+
        if (change != NoChange) {
-               output_changed (change, src); /* EMIT SIGNAL */
+               output_changed (change, src);
                _session.set_dirty ();
                return 0;
-       }
-#endif
+       } 
+       
        return -1;
 }
 
@@ -505,7 +558,8 @@ IO::add_output_port (string destination, void* src, DataType type)
                type = _default_type;
 
        {
-               Glib::Mutex::Lock em(_session.engine().process_lock());
+               BLOCK_PROCESS_CALLBACK ();
+
                
                { 
                        Glib::Mutex::Lock lm (io_lock);
@@ -517,7 +571,7 @@ IO::add_output_port (string destination, void* src, DataType type)
                        /* Create a new output port */
                        
                        // FIXME: naming scheme for differently typed ports?
-                       if (_output_maximum.get_total() == 1) {
+                       if (_output_maximum.get(type) == 1) {
                                snprintf (name, sizeof (name), _("%s/out"), _name.c_str());
                        } else {
                                snprintf (name, sizeof (name), _("%s/out %u"), _name.c_str(), find_output_port_hole());
@@ -528,7 +582,7 @@ IO::add_output_port (string destination, void* src, DataType type)
                                return -1;
                        }
                        
-                       _outputs.add_port (our_port);
+                       _outputs.add (our_port);
                        drop_output_connection ();
                        setup_peak_meters ();
                        reset_panner ();
@@ -553,39 +607,30 @@ IO::add_output_port (string destination, void* src, DataType type)
 int
 IO::remove_input_port (Port* port, void* src)
 {
-       throw; // FIXME
-#if 0
        IOChange change (NoChange);
 
        {
-               Glib::Mutex::Lock em(_session.engine().process_lock());
+               BLOCK_PROCESS_CALLBACK ();
+
                
                {
                        Glib::Mutex::Lock lm (io_lock);
 
-                       if (((int)_ninputs - 1) < _input_minimum) {
+                       if (n_inputs() <= _input_minimum) {
                                /* sorry, you can't do this */
                                return -1;
                        }
-                       for (PortSet::iterator i = _inputs.begin(); i != _inputs.end(); ++i) {
-
-                               if (*i == port) {
-                                       change = IOChange (change|ConfigurationChanged);
 
-                                       if (port->connected()) {
-                                               change = IOChange (change|ConnectionsChanged);
-                                       } 
+                       if (_inputs.remove(port)) {
+                               change = IOChange (change|ConfigurationChanged);
 
-                                       _session.engine().unregister_port (*i);
-                                       _inputs.erase (i);
-                                       _ninputs--;
-                                       drop_input_connection ();
+                               if (port->connected()) {
+                                       change = IOChange (change|ConnectionsChanged);
+                               } 
 
-                                       break;
-                               }
-                       }
-                       
-                       if (change != NoChange) {
+                               _session.engine().unregister_port (*port);
+                               drop_input_connection ();
+                               
                                setup_peak_meters ();
                                reset_panner ();
                        }
@@ -597,7 +642,7 @@ IO::remove_input_port (Port* port, void* src)
                _session.set_dirty ();
                return 0;
        } 
-#endif
+       
        return -1;
 }
 
@@ -618,7 +663,7 @@ IO::add_input_port (string source, void* src, DataType type)
                type = _default_type;
 
        {
-               Glib::Mutex::Lock em (_session.engine().process_lock());
+               BLOCK_PROCESS_CALLBACK ();
                
                { 
                        Glib::Mutex::Lock lm (io_lock);
@@ -630,7 +675,7 @@ IO::add_input_port (string source, void* src, DataType type)
                        /* Create a new input port */
                        
                        // FIXME: naming scheme for differently typed ports?
-                       if (_input_maximum.get_total() == 1) {
+                       if (_input_maximum.get(type) == 1) {
                                snprintf (name, sizeof (name), _("%s/in"), _name.c_str());
                        } else {
                                snprintf (name, sizeof (name), _("%s/in %u"), _name.c_str(), find_input_port_hole());
@@ -640,8 +685,8 @@ IO::add_input_port (string source, void* src, DataType type)
                                error << string_compose(_("IO: cannot register input port %1"), name) << endmsg;
                                return -1;
                        }
-                       
-                       _inputs.add_port(our_port);
+
+                       _inputs.add (our_port);
                        drop_input_connection ();
                        setup_peak_meters ();
                        reset_panner ();
@@ -668,7 +713,7 @@ int
 IO::disconnect_inputs (void* src)
 {
        { 
-               Glib::Mutex::Lock em (_session.engine().process_lock());
+               BLOCK_PROCESS_CALLBACK ();
                
                {
                        Glib::Mutex::Lock lm (io_lock);
@@ -690,7 +735,7 @@ int
 IO::disconnect_outputs (void* src)
 {
        {
-               Glib::Mutex::Lock em (_session.engine().process_lock());
+               BLOCK_PROCESS_CALLBACK ();
                
                {
                        Glib::Mutex::Lock lm (io_lock);
@@ -710,55 +755,56 @@ IO::disconnect_outputs (void* src)
 }
 
 bool
-IO::ensure_inputs_locked (uint32_t n, bool clear, void* src)
+IO::ensure_inputs_locked (ChanCount count, bool clear, void* src)
 {
-       Port* input_port;
-       bool changed = false;
-       
-       /* remove unused ports */
-
-       while (n_inputs().get(_default_type) > n) {
-               throw; // FIXME
-               /*
-               _session.engine().unregister_port (_inputs.back());
-               _inputs.pop_back();
-               _ninputs--;
-               changed = true;
-               */
-       }
-               
-       /* create any necessary new ports */
-               
-       while (n_inputs().get(_default_type) < n) {
-               
-               char buf[64];
-               
-               /* Create a new input port (of the default type) */
+       Port* input_port = 0;
+       bool  changed    = false;
+
+
+       for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
                
-               if (_input_maximum.get_total() == 1) {
-                       snprintf (buf, sizeof (buf), _("%s/in"), _name.c_str());
-               }
-               else {
-                       snprintf (buf, sizeof (buf), _("%s/in %u"), _name.c_str(), find_input_port_hole());
+               const size_t n = count.get(*t);
+       
+               /* remove unused ports */
+               for (size_t i = n_inputs().get(*t); i > n; --i) {
+                       input_port = _inputs.port(*t, i-1);
+
+                       assert(input_port);
+                       _inputs.remove(input_port);
+                       _session.engine().unregister_port (*input_port);
+
+                       changed = true;
                }
-               
-               try {
-                       
-                       if ((input_port = _session.engine().register_input_port (_default_type, buf)) == 0) {
-                               error << string_compose(_("IO: cannot register input port %1"), buf) << endmsg;
-                               return -1;
+
+               /* create any necessary new ports */
+               while (n_inputs().get(*t) < n) {
+
+                       char buf[64];
+
+                       if (_input_maximum.get(*t) == 1) {
+                               snprintf (buf, sizeof (buf), _("%s/in"), _name.c_str());
+                       } else {
+                               snprintf (buf, sizeof (buf), _("%s/in %u"), _name.c_str(), find_input_port_hole());
                        }
-               }
 
-               catch (AudioEngine::PortRegistrationFailure& err) {
-                       setup_peak_meters ();
-                       reset_panner ();
-                       /* pass it on */
-                       throw err;
+                       try {
+
+                               if ((input_port = _session.engine().register_input_port (*t, buf)) == 0) {
+                                       error << string_compose(_("IO: cannot register input port %1"), buf) << endmsg;
+                                       return -1;
+                               }
+                       }
+
+                       catch (AudioEngine::PortRegistrationFailure& err) {
+                               setup_peak_meters ();
+                               reset_panner ();
+                               /* pass it on */
+                               throw AudioEngine::PortRegistrationFailure();
+                       }
+
+                       _inputs.add (input_port);
+                       changed = true;
                }
-               
-               _inputs.add_port (input_port);
-               changed = true;
        }
        
        if (changed) {
@@ -771,7 +817,6 @@ IO::ensure_inputs_locked (uint32_t n, bool clear, void* src)
        
        if (clear) {
                /* disconnect all existing ports so that we get a fresh start */
-                       
                for (PortSet::iterator i = _inputs.begin(); i != _inputs.end(); ++i) {
                        _session.engine().disconnect (*i);
                }
@@ -782,7 +827,7 @@ IO::ensure_inputs_locked (uint32_t n, bool clear, void* src)
 
 /** Attach output_buffers to port buffers.
  * 
- * Connected to IOs own MoreChannels signal.
+ * Connected to IO's own MoreChannels signal.
  */
 void
 IO::attach_buffers(ChanCount ignored)
@@ -791,129 +836,123 @@ IO::attach_buffers(ChanCount ignored)
 }
 
 int
-IO::ensure_io (const ChanCount& in, const ChanCount& out, bool clear, void* src)
-{
-       // FIXME: TYPE
-       uint32_t nin = in.get(_default_type);
-       uint32_t nout = out.get(_default_type);
-
-       // We only deal with one type still.  Sorry about your luck.
-       assert(nin == in.get_total());
-       assert(nout == out.get_total());
-
-       return ensure_io(nin, nout, clear, src);
-}
-
-int
-IO::ensure_io (uint32_t nin, uint32_t nout, bool clear, void* src)
+IO::ensure_io (ChanCount in, ChanCount out, bool clear, void* src)
 {
-       bool in_changed = false;
-       bool out_changed = false;
-       bool need_pan_reset;
+       bool in_changed     = false;
+       bool out_changed    = false;
+       bool need_pan_reset = false;
 
-       nin = min (_input_maximum.get(_default_type), static_cast<size_t>(nin));
+       in = min (_input_maximum, in);
 
-       nout = min (_output_maximum.get(_default_type), static_cast<size_t>(nout));
+       out = min (_output_maximum, out);
 
-       if (nin == n_inputs().get(_default_type) && nout == n_outputs().get(_default_type) && !clear) {
+       if (in == n_inputs() && out == n_outputs() && !clear) {
                return 0;
        }
 
        {
-               Glib::Mutex::Lock em (_session.engine().process_lock());
+               BLOCK_PROCESS_CALLBACK ();
                Glib::Mutex::Lock lm (io_lock);
 
                Port* port;
                
-               if (n_outputs().get(_default_type) == nout) {
-                       need_pan_reset = false;
-               } else {
+               if (n_outputs() != out) {
                        need_pan_reset = true;
                }
                
-               /* remove unused ports */
-               
-               while (n_inputs().get(_default_type) > nin) {
-                       throw; // FIXME
-                       /*
-                       _session.engine().unregister_port (_inputs.back());
-                       _inputs.pop_back();
-                       _ninputs--;
-                       in_changed = true;*/
-               }
-               
-               while (n_outputs().get(_default_type) > nout) {
-                       throw; // FIXME
-                       /*
-                       _session.engine().unregister_port (_outputs.back());
-                       _outputs.pop_back();
-                       _noutputs--;
-                       out_changed = true;*/
-               }
-               
-               /* create any necessary new ports (of the default type) */
-               
-               while (n_inputs().get(_default_type) < nin) {
-                       
-                       char buf[64];
+               for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
 
-                       /* Create a new input port */
-                       
-                       if (_input_maximum.get_total() == 1) {
-                               snprintf (buf, sizeof (buf), _("%s/in"), _name.c_str());
+                       const size_t nin = in.get(*t);
+                       const size_t nout = out.get(*t);
+
+                       Port* output_port = 0;
+                       Port* input_port = 0;
+
+                       /* remove unused output ports */
+                       for (size_t i = n_outputs().get(*t); i > nout; --i) {
+                               output_port = _outputs.port(*t, i-1);
+
+                               assert(output_port);
+                               _outputs.remove(output_port);
+                               _session.engine().unregister_port (*output_port);
+
+                               out_changed = true;
                        }
-                       else {
-                               snprintf (buf, sizeof (buf), _("%s/in %u"), _name.c_str(), find_input_port_hole());
+
+                       /* remove unused input ports */
+                       for (size_t i = n_inputs().get(*t); i > nin; --i) {
+                               input_port = _inputs.port(*t, i-1);
+
+                               assert(input_port);
+                               _inputs.remove(input_port);
+                               _session.engine().unregister_port (*input_port);
+
+                               in_changed = true;
                        }
-                       
-                       try {
-                               if ((port = _session.engine().register_input_port (_default_type, buf)) == 0) {
-                                       error << string_compose(_("IO: cannot register input port %1"), buf) << endmsg;
-                                       return -1;
+
+                       /* create any necessary new input ports */
+
+                       while (n_inputs().get(*t) < nin) {
+
+                               char buf[64];
+
+                               /* Create a new input port */
+
+                               if (_input_maximum.get(*t) == 1) {
+                                       snprintf (buf, sizeof (buf), _("%s/in"), _name.c_str());
+                               } else {
+                                       snprintf (buf, sizeof (buf), _("%s/in %u"), _name.c_str(), find_input_port_hole());
                                }
-                       }
 
-                       catch (AudioEngine::PortRegistrationFailure& err) {
-                               setup_peak_meters ();
-                               reset_panner ();
-                               /* pass it on */
-                               throw err;
-                       }
-               
-                       _inputs.add_port (port);
-                       in_changed = true;
-               }
+                               try {
+                                       if ((port = _session.engine().register_input_port (*t, buf)) == 0) {
+                                               error << string_compose(_("IO: cannot register input port %1"), buf) << endmsg;
+                                               return -1;
+                                       }
+                               }
+                               
+                               catch (AudioEngine::PortRegistrationFailure& err) {
+                                       setup_peak_meters ();
+                                       reset_panner ();
+                                       /* pass it on */
+                                       throw AudioEngine::PortRegistrationFailure();
+                               }
 
-               /* create any necessary new ports */
-               
-               while (n_outputs().get(_default_type) < nout) {
-                       
-                       char buf[64];
-                       
-                       /* Create a new output port */
-                       
-                       if (_output_maximum.get_total() == 1) {
-                               snprintf (buf, sizeof (buf), _("%s/out"), _name.c_str());
-                       } else {
-                               snprintf (buf, sizeof (buf), _("%s/out %u"), _name.c_str(), find_output_port_hole());
+                               _inputs.add (port);
+                               in_changed = true;
                        }
-                       
-                       try { 
-                               if ((port = _session.engine().register_output_port (_default_type, buf)) == 0) {
-                                       error << string_compose(_("IO: cannot register output port %1"), buf) << endmsg;
-                                       return -1;
+
+                       /* create any necessary new output ports */
+
+                       while (n_outputs().get(*t) < nout) {
+
+                               char buf[64];
+
+                               /* Create a new output port */
+
+                               if (_output_maximum.get(*t) == 1) {
+                                       snprintf (buf, sizeof (buf), _("%s/out"), _name.c_str());
+                               } else {
+                                       snprintf (buf, sizeof (buf), _("%s/out %u"), _name.c_str(), find_output_port_hole());
                                }
+
+                               try { 
+                                       if ((port = _session.engine().register_output_port (*t, buf)) == 0) {
+                                               error << string_compose(_("IO: cannot register output port %1"), buf) << endmsg;
+                                               return -1;
+                                       }
+                               }
+
+                               catch (AudioEngine::PortRegistrationFailure& err) {
+                                       setup_peak_meters ();
+                                       reset_panner ();
+                                       /* pass it on */
+                                       throw AudioEngine::PortRegistrationFailure ();
+                               }
+
+                               _outputs.add (port);
+                               out_changed = true;
                        }
-                       
-                       catch (AudioEngine::PortRegistrationFailure& err) {
-                               setup_peak_meters ();
-                               reset_panner ();
-                               /* pass it on */
-                               throw err;
-                       }
-               
-                       _outputs.add_port (port);
-                       out_changed = true;
                }
                
                if (clear) {
@@ -954,22 +993,22 @@ IO::ensure_io (uint32_t nin, uint32_t nout, bool clear, void* src)
 }
 
 int
-IO::ensure_inputs (uint32_t n, bool clear, bool lockit, void* src)
+IO::ensure_inputs (ChanCount count, bool clear, bool lockit, void* src)
 {
        bool changed = false;
 
-       n = min (_input_maximum.get(_default_type), static_cast<size_t>(n));
+       count = min (_input_maximum, count);
 
-       if (n == n_inputs().get(_default_type) && !clear) {
+       if (count == n_inputs() && !clear) {
                return 0;
        }
 
        if (lockit) {
-               Glib::Mutex::Lock em (_session.engine().process_lock());
+               BLOCK_PROCESS_CALLBACK ();
                Glib::Mutex::Lock im (io_lock);
-               changed = ensure_inputs_locked (n, clear, src);
+               changed = ensure_inputs_locked (count, clear, src);
        } else {
-               changed = ensure_inputs_locked (n, clear, src);
+               changed = ensure_inputs_locked (count, clear, src);
        }
 
        if (changed) {
@@ -980,55 +1019,54 @@ IO::ensure_inputs (uint32_t n, bool clear, bool lockit, void* src)
 }
 
 bool
-IO::ensure_outputs_locked (uint32_t n, bool clear, void* src)
+IO::ensure_outputs_locked (ChanCount count, bool clear, void* src)
 {
-       Port* output_port;
-       bool changed = false;
-       bool need_pan_reset;
+       Port* output_port    = 0;
+       bool  changed        = false;
+       bool  need_pan_reset = false;
 
-       if (n_outputs().get(_default_type) == n) {
-               need_pan_reset = false;
-       } else {
+       if (n_outputs() != count) {
                need_pan_reset = true;
        }
        
-       /* remove unused ports */
-       
-       while (n_outputs().get(_default_type) > n) {
-               throw; // FIXME
-               /*
-               _session.engine().unregister_port (_outputs.back());
-               _outputs.pop_back();
-               _noutputs--;
-               changed = true;
-               */
-       }
-       
-       /* create any necessary new ports */
-       
-       while (n_outputs().get(_default_type) < n) {
-               
-               char buf[64];
-               
-               /* Create a new output port */
-               
-               if (_output_maximum.get(_default_type) == 1) {
-                       snprintf (buf, sizeof (buf), _("%s/out"), _name.c_str());
-               } else {
-                       snprintf (buf, sizeof (buf), _("%s/out %u"), _name.c_str(), find_output_port_hole());
-               }
-               
-               if ((output_port = _session.engine().register_output_port (_default_type, buf)) == 0) {
-                       error << string_compose(_("IO: cannot register output port %1"), buf) << endmsg;
-                       return -1;
+       for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
+
+               const size_t n = count.get(*t);
+
+               /* remove unused ports */
+               for (size_t i = n_outputs().get(*t); i > n; --i) {
+                       output_port = _outputs.port(*t, i-1);
+
+                       assert(output_port);
+                       _outputs.remove(output_port);
+                       _session.engine().unregister_port (*output_port);
+
+                       changed = true;
                }
-               
-               _outputs.add_port (output_port);
-               changed = true;
-               setup_peak_meters ();
 
-               if (need_pan_reset) {
-                       reset_panner ();
+               /* create any necessary new ports */
+               while (n_outputs().get(*t) < n) {
+
+                       char buf[64];
+
+                       if (_output_maximum.get(*t) == 1) {
+                               snprintf (buf, sizeof (buf), _("%s/out"), _name.c_str());
+                       } else {
+                               snprintf (buf, sizeof (buf), _("%s/out %u"), _name.c_str(), find_output_port_hole());
+                       }
+
+                       if ((output_port = _session.engine().register_output_port (*t, buf)) == 0) {
+                               error << string_compose(_("IO: cannot register output port %1"), buf) << endmsg;
+                               return -1;
+                       }
+
+                       _outputs.add (output_port);
+                       changed = true;
+                       setup_peak_meters ();
+
+                       if (need_pan_reset) {
+                               reset_panner ();
+                       }
                }
        }
        
@@ -1040,7 +1078,6 @@ IO::ensure_outputs_locked (uint32_t n, bool clear, void* src)
        
        if (clear) {
                /* disconnect all existing ports so that we get a fresh start */
-               
                for (PortSet::iterator i = _outputs.begin(); i != _outputs.end(); ++i) {
                        _session.engine().disconnect (*i);
                }
@@ -1050,13 +1087,13 @@ IO::ensure_outputs_locked (uint32_t n, bool clear, void* src)
 }
 
 int
-IO::ensure_outputs (uint32_t n, bool clear, bool lockit, void* src)
+IO::ensure_outputs (ChanCount count, bool clear, bool lockit, void* src)
 {
        bool changed = false;
 
        if (_output_maximum < ChanCount::INFINITE) {
-               n = min (_output_maximum.get(_default_type), static_cast<size_t>(n));
-               if (n == n_outputs().get(_default_type) && !clear) {
+               count = min (_output_maximum, count);
+               if (count == n_outputs() && !clear) {
                        return 0;
                }
        }
@@ -1064,16 +1101,17 @@ IO::ensure_outputs (uint32_t n, bool clear, bool lockit, void* src)
        /* XXX caller should hold io_lock, but generally doesn't */
 
        if (lockit) {
-               Glib::Mutex::Lock em (_session.engine().process_lock());
+               BLOCK_PROCESS_CALLBACK ();
                Glib::Mutex::Lock im (io_lock);
-               changed = ensure_outputs_locked (n, clear, src);
+               changed = ensure_outputs_locked (count, clear, src);
        } else {
-               changed = ensure_outputs_locked (n, clear, src);
+               changed = ensure_outputs_locked (count, clear, src);
        }
 
        if (changed) {
                 output_changed (ConfigurationChanged, src); /* EMIT SIGNAL */
        }
+
        return 0;
 }
 
@@ -1092,7 +1130,7 @@ IO::reset_panner ()
 {
        if (panners_legal) {
                if (!no_panner_reset) {
-                       _panner->reset (n_outputs().get(_default_type), pans_required());
+                       _panner->reset (n_outputs().get(DataType::AUDIO), pans_required());
                }
        } else {
                panner_legal_c.disconnect ();
@@ -1103,7 +1141,7 @@ IO::reset_panner ()
 int
 IO::panners_became_legal ()
 {
-       _panner->reset (n_outputs().get(_default_type), pans_required());
+       _panner->reset (n_outputs().get(DataType::AUDIO), pans_required());
        _panner->load (); // automation
        panner_legal_c.disconnect ();
        return 0;
@@ -1141,7 +1179,7 @@ IO::state (bool full_state)
        Glib::Mutex::Lock lm (io_lock);
 
        node->add_property("name", _name);
-       id().print (buf);
+       id().print (buf, sizeof (buf));
        node->add_property("id", buf);
 
        str = "";
@@ -1223,10 +1261,12 @@ IO::state (bool full_state)
        }
 
        node->add_child_nocopy (_panner->state (full_state));
+       node->add_child_nocopy (_gain_control.get_state ());
 
        snprintf (buf, sizeof(buf), "%2.12f", gain());
        node->add_property ("gain", buf);
 
+       // FIXME: this is NOT sufficient!
        const int in_min  = (_input_minimum == ChanCount::ZERO) ? -1 : _input_minimum.get(_default_type);
        const int in_max  = (_input_maximum == ChanCount::INFINITE) ? -1 : _input_maximum.get(_default_type);
        const int out_min = (_output_minimum == ChanCount::ZERO) ? -1 : _output_minimum.get(_default_type);
@@ -1239,68 +1279,22 @@ IO::state (bool full_state)
        /* automation */
 
        if (full_state) {
+
+               XMLNode* autonode = new XMLNode (X_("Automation"));
+               autonode->add_child_nocopy (get_automation_state());
+               node->add_child_nocopy (*autonode);
+
                snprintf (buf, sizeof (buf), "0x%x", (int) _gain_automation_curve.automation_state());
        } else {
                /* never store anything except Off for automation state in a template */
                snprintf (buf, sizeof (buf), "0x%x", ARDOUR::Off); 
        }
-       node->add_property ("automation-state", buf);
-       snprintf (buf, sizeof (buf), "0x%x", (int) _gain_automation_curve.automation_style());
-       node->add_property ("automation-style", buf);
-
-       /* XXX same for pan etc. */
 
        return *node;
 }
 
 int
-IO::connecting_became_legal ()
-{
-       int ret;
-
-       if (pending_state_node == 0) {
-               fatal << _("IO::connecting_became_legal() called without a pending state node") << endmsg;
-               /*NOTREACHED*/
-               return -1;
-       }
-
-       connection_legal_c.disconnect ();
-
-       ret = make_connections (*pending_state_node);
-
-       if (ports_legal) {
-               delete pending_state_node;
-               pending_state_node = 0;
-       }
-
-       return ret;
-}
-
-int
-IO::ports_became_legal ()
-{
-       int ret;
-
-       if (pending_state_node == 0) {
-               fatal << _("IO::ports_became_legal() called without a pending state node") << endmsg;
-               /*NOTREACHED*/
-               return -1;
-       }
-
-       port_legal_c.disconnect ();
-
-       ret = create_ports (*pending_state_node);
-
-       if (connecting_legal) {
-               delete pending_state_node;
-               pending_state_node = 0;
-       }
-
-       return ret;
-}
-
-int
-IO::set_state (const XMLNode& node)
+IO::set_state (const XMLNode& node)
 {
        const XMLProperty* prop;
        XMLNodeConstIterator iter;
@@ -1317,7 +1311,7 @@ IO::set_state (const XMLNode& node)
 
        if ((prop = node.property ("name")) != 0) {
                _name = prop->value();
-               _panner->set_name (_name);
+               /* used to set panner name with this, but no more */
        } 
 
        if ((prop = node.property ("id")) != 0) {
@@ -1343,26 +1337,31 @@ IO::set_state (const XMLNode& node)
                _gain = _desired_gain;
        }
 
+       if ((prop = node.property ("automation-state")) != 0 || (prop = node.property ("automation-style")) != 0) {
+               /* old school automation handling */
+       }
+
        for (iter = node.children().begin(); iter != node.children().end(); ++iter) {
+
                if ((*iter)->name() == "Panner") {
+                       if (_panner == 0) {
+                               _panner = new Panner (_name, _session);
+                       }
                        _panner->set_state (**iter);
                }
-       }
-
-       if ((prop = node.property ("automation-state")) != 0) {
 
-               long int x;
-               x = strtol (prop->value().c_str(), 0, 16);
-               set_gain_automation_state (AutoState (x));
-       }
+               if ((*iter)->name() == X_("Automation")) {
 
-       if ((prop = node.property ("automation-style")) != 0) {
+                       set_automation_state (*(*iter)->children().front());
+               }
 
-              long int x;
-               x = strtol (prop->value().c_str(), 0, 16);
-               set_gain_automation_style (AutoStyle (x));
+               if ((*iter)->name() == X_("controllable")) {
+                       if ((prop = (*iter)->property("name")) != 0 && prop->value() == "gaincontrol") {
+                               _gain_control.set_state (**iter);
+                       }
+               }
        }
-       
+
        if (ports_legal) {
 
                if (create_ports (node)) {
@@ -1395,9 +1394,146 @@ IO::set_state (const XMLNode& node)
                pending_state_node = new XMLNode (node);
        }
 
+       last_automation_snapshot = 0;
+
+       return 0;
+}
+
+int
+IO::set_automation_state (const XMLNode& node)
+{
+       return _gain_automation_curve.set_state (node);
+}
+
+XMLNode&
+IO::get_automation_state ()
+{
+       return (_gain_automation_curve.get_state ());
+}
+
+int
+IO::load_automation (string path)
+{
+       string fullpath;
+       ifstream in;
+       char line[128];
+       uint32_t linecnt = 0;
+       float version;
+       LocaleGuard lg (X_("POSIX"));
+
+       fullpath = _session.automation_dir();
+       fullpath += path;
+
+       in.open (fullpath.c_str());
+
+       if (!in) {
+               fullpath = _session.automation_dir();
+               fullpath += _session.snap_name();
+               fullpath += '-';
+               fullpath += path;
+
+               in.open (fullpath.c_str());
+
+               if (!in) {
+                       error << string_compose(_("%1: cannot open automation event file \"%2\""), _name, fullpath) << endmsg;
+                       return -1;
+               }
+       }
+
+       clear_automation ();
+
+       while (in.getline (line, sizeof(line), '\n')) {
+               char type;
+               nframes_t when;
+               double value;
+
+               if (++linecnt == 1) {
+                       if (memcmp (line, "version", 7) == 0) {
+                               if (sscanf (line, "version %f", &version) != 1) {
+                                       error << string_compose(_("badly formed version number in automation event file \"%1\""), path) << endmsg;
+                                       return -1;
+                               }
+                       } else {
+                               error << string_compose(_("no version information in automation event file \"%1\""), path) << endmsg;
+                               return -1;
+                       }
+
+                       continue;
+               }
+
+               if (sscanf (line, "%c %" PRIu32 " %lf", &type, &when, &value) != 3) {
+                       warning << string_compose(_("badly formatted automation event record at line %1 of %2 (ignored)"), linecnt, path) << endmsg;
+                       continue;
+               }
+
+               switch (type) {
+               case 'g':
+                       _gain_automation_curve.fast_simple_add (when, value);
+                       break;
+
+               case 's':
+                       break;
+
+               case 'm':
+                       break;
+
+               case 'p':
+                       /* older (pre-1.0) versions of ardour used this */
+                       break;
+
+               default:
+                       warning << _("dubious automation event found (and ignored)") << endmsg;
+               }
+       }
+
        return 0;
 }
 
+int
+IO::connecting_became_legal ()
+{
+       int ret;
+
+       if (pending_state_node == 0) {
+               fatal << _("IO::connecting_became_legal() called without a pending state node") << endmsg;
+               /*NOTREACHED*/
+               return -1;
+       }
+
+       connection_legal_c.disconnect ();
+
+       ret = make_connections (*pending_state_node);
+
+       if (ports_legal) {
+               delete pending_state_node;
+               pending_state_node = 0;
+       }
+
+       return ret;
+}
+int
+IO::ports_became_legal ()
+{
+       int ret;
+
+       if (pending_state_node == 0) {
+               fatal << _("IO::ports_became_legal() called without a pending state node") << endmsg;
+               /*NOTREACHED*/
+               return -1;
+       }
+
+       port_legal_c.disconnect ();
+
+       ret = create_ports (*pending_state_node);
+
+       if (connecting_legal) {
+               delete pending_state_node;
+               pending_state_node = 0;
+       }
+
+       return ret;
+}
+
 int
 IO::create_ports (const XMLNode& node)
 {
@@ -1453,7 +1589,8 @@ IO::create_ports (const XMLNode& node)
 
        no_panner_reset = true;
 
-       if (ensure_io (num_inputs, num_outputs, true, this)) {
+       // FIXME: audio-only
+       if (ensure_io (ChanCount(DataType::AUDIO, num_inputs), ChanCount(DataType::AUDIO, num_outputs), true, this)) {
                error << string_compose(_("%1: cannot create I/O ports"), _name) << endmsg;
                return -1;
        }
@@ -1537,7 +1674,8 @@ IO::set_inputs (const string& str)
                return 0;
        }
 
-       if (ensure_inputs (nports, true, true, this)) {
+       // FIXME: audio-only
+       if (ensure_inputs (ChanCount(DataType::AUDIO, nports), true, true, this)) {
                return -1;
        }
 
@@ -1587,7 +1725,8 @@ IO::set_outputs (const string& str)
                return 0;
        }
 
-       if (ensure_outputs (nports, true, true, this)) {
+       // FIXME: audio-only
+       if (ensure_outputs (ChanCount(DataType::AUDIO, nports), true, true, this)) {
                return -1;
        }
 
@@ -1679,6 +1818,12 @@ IO::set_name (string name, void* src)
                return 0;
        }
 
+       /* replace all colons in the name. i wish we didn't have to do this */
+
+       if (replace_all (name, ":", "-")) {
+               warning << _("you cannot use colons to name objects with I/O connections") << endmsg;
+       }
+
        for (PortSet::iterator i = _inputs.begin(); i != _inputs.end(); ++i) {
                string current_name = i->short_name();
                current_name.replace (current_name.find (_name), _name.length(), name);
@@ -1697,42 +1842,6 @@ IO::set_name (string name, void* src)
         return 0;
 }
 
-void
-IO::set_input_minimum (int n)
-{
-       if (n < 0)
-               _input_minimum = ChanCount::ZERO;
-       else
-               _input_minimum = ChanCount(_default_type, n);
-}
-
-void
-IO::set_input_maximum (int n)
-{
-       if (n < 0)
-               _input_maximum = ChanCount::INFINITE;
-       else
-               _input_maximum = ChanCount(_default_type, n);
-}
-
-void
-IO::set_output_minimum (int n)
-{
-       if (n < 0)
-               _output_minimum = ChanCount::ZERO;
-       else
-               _output_minimum = ChanCount(_default_type, n);
-}
-
-void
-IO::set_output_maximum (int n)
-{
-       if (n < 0)
-               _output_maximum = ChanCount::INFINITE;
-       else
-               _output_maximum = ChanCount(_default_type, n);
-}
-
 void
 IO::set_input_minimum (ChanCount n)
 {
@@ -1758,7 +1867,7 @@ IO::set_output_maximum (ChanCount n)
 }
 
 void
-IO::set_port_latency (jack_nframes_t nframes)
+IO::set_port_latency (nframes_t nframes)
 {
        Glib::Mutex::Lock lm (io_lock);
 
@@ -1767,11 +1876,11 @@ IO::set_port_latency (jack_nframes_t nframes)
        }
 }
 
-jack_nframes_t
+nframes_t
 IO::output_latency () const
 {
-       jack_nframes_t max_latency;
-       jack_nframes_t latency;
+       nframes_t max_latency;
+       nframes_t latency;
 
        max_latency = 0;
 
@@ -1786,11 +1895,11 @@ IO::output_latency () const
        return max_latency;
 }
 
-jack_nframes_t
+nframes_t
 IO::input_latency () const
 {
-       jack_nframes_t max_latency;
-       jack_nframes_t latency;
+       nframes_t max_latency;
+       nframes_t latency;
 
        max_latency = 0;
 
@@ -1811,14 +1920,15 @@ IO::use_input_connection (Connection& c, void* src)
        uint32_t limit;
 
        {
-               Glib::Mutex::Lock lm (_session.engine().process_lock());
+               BLOCK_PROCESS_CALLBACK ();
                Glib::Mutex::Lock lm2 (io_lock);
                
                limit = c.nports();
                
                drop_input_connection ();
                
-               if (ensure_inputs (limit, false, false, src)) {
+               // FIXME connections only work for audio-only
+               if (ensure_inputs (ChanCount(DataType::AUDIO, limit), false, false, src)) {
                        return -1;
                }
 
@@ -1889,14 +1999,15 @@ IO::use_output_connection (Connection& c, void* src)
        uint32_t limit; 
 
        {
-               Glib::Mutex::Lock lm (_session.engine().process_lock());
+               BLOCK_PROCESS_CALLBACK ();
                Glib::Mutex::Lock lm2 (io_lock);
 
                limit = c.nports();
                        
                drop_output_connection ();
 
-               if (ensure_outputs (limit, false, false, src)) {
+               // FIXME: audio-only
+               if (ensure_outputs (ChanCount(DataType::AUDIO, limit), false, false, src)) {
                        return -1;
                }
 
@@ -2040,25 +2151,6 @@ IO::GainControllable::get_value (void) const
        return direct_gain_to_control (io.effective_gain());
 }
 
-UndoAction
-IO::get_memento() const
-{
-  return sigc::bind (mem_fun (*(const_cast<IO *>(this)), &StateManager::use_state), _current_state_id);
-}
-
-Change
-IO::restore_state (StateManager::State& state)
-{
-       return Change (0);
-}
-
-StateManager::State*
-IO::state_factory (std::string why) const
-{
-       StateManager::State* state = new StateManager::State (why);
-       return state;
-}
-
 void
 IO::setup_peak_meters()
 {
@@ -2084,124 +2176,12 @@ IO::update_meters()
 void
 IO::meter ()
 {
-       // FIXME: Remove this function and just connect signal directly to PeakMeter::meter
+       // FIXME: Ugly.  Meter should manage the lock, if it's necessary
        
        Glib::Mutex::Lock lm (io_lock); // READER: meter thread.
        _meter->meter();
 }
 
-int
-IO::save_automation (const string& path)
-{
-       string fullpath;
-       ofstream out;
-
-       fullpath = _session.automation_dir();
-       fullpath += path;
-
-       out.open (fullpath.c_str());
-
-       if (!out) {
-               error << string_compose(_("%1: could not open automation event file \"%2\""), _name, fullpath) << endmsg;
-               return -1;
-       }
-
-       out << X_("version ") << current_automation_version_number << endl;
-
-       /* XXX use apply_to_points to get thread safety */
-       
-       for (AutomationList::iterator i = _gain_automation_curve.begin(); i != _gain_automation_curve.end(); ++i) {
-               out << "g " << (jack_nframes_t) floor ((*i)->when) << ' ' << (*i)->value << endl;
-       }
-
-       _panner->save ();
-
-       return 0;
-}
-
-int
-IO::load_automation (const string& path)
-{
-       string fullpath;
-       ifstream in;
-       char line[128];
-       uint32_t linecnt = 0;
-       float version;
-       LocaleGuard lg (X_("POSIX"));
-
-       fullpath = _session.automation_dir();
-       fullpath += path;
-
-       in.open (fullpath.c_str());
-
-       if (!in) {
-               fullpath = _session.automation_dir();
-               fullpath += _session.snap_name();
-               fullpath += '-';
-               fullpath += path;
-               in.open (fullpath.c_str());
-               if (!in) {
-                               error << string_compose(_("%1: cannot open automation event file \"%2\""), _name, fullpath) << endmsg;
-                               return -1;
-               }
-       }
-
-       clear_automation ();
-
-       while (in.getline (line, sizeof(line), '\n')) {
-               char type;
-               jack_nframes_t when;
-               double value;
-
-               if (++linecnt == 1) {
-                       if (memcmp (line, "version", 7) == 0) {
-                               if (sscanf (line, "version %f", &version) != 1) {
-                                       error << string_compose(_("badly formed version number in automation event file \"%1\""), path) << endmsg;
-                                       return -1;
-                               }
-                       } else {
-                               error << string_compose(_("no version information in automation event file \"%1\""), path) << endmsg;
-                               return -1;
-                       }
-
-                       if (version != current_automation_version_number) {
-                               error << string_compose(_("mismatched automation event file version (%1)"), version) << endmsg;
-                               return -1;
-                       }
-
-                       continue;
-               }
-
-               if (sscanf (line, "%c %" PRIu32 " %lf", &type, &when, &value) != 3) {
-                       warning << string_compose(_("badly formatted automation event record at line %1 of %2 (ignored)"), linecnt, path) << endmsg;
-                       continue;
-               }
-
-               switch (type) {
-               case 'g':
-                       _gain_automation_curve.add (when, value, true);
-                       break;
-
-               case 's':
-                       break;
-
-               case 'm':
-                       break;
-
-               case 'p':
-                       /* older (pre-1.0) versions of ardour used this */
-                       break;
-
-               default:
-                       warning << _("dubious automation event found (and ignored)") << endmsg;
-               }
-       }
-
-       _gain_automation_curve.save_state (_("loaded from disk"));
-
-       return 0;
-}
-       
 void
 IO::clear_automation ()
 {
@@ -2319,7 +2299,7 @@ IO::end_pan_touch (uint32_t which)
 }
 
 void
-IO::automation_snapshot (jack_nframes_t now)
+IO::automation_snapshot (nframes_t now)
 {
        if (last_automation_snapshot > now || (now - last_automation_snapshot) > _automation_interval) {
 
@@ -2334,16 +2314,12 @@ IO::automation_snapshot (jack_nframes_t now)
 }
 
 void
-IO::transport_stopped (jack_nframes_t frame)
+IO::transport_stopped (nframes_t frame)
 {
        _gain_automation_curve.reposition_for_rt_add (frame);
 
        if (_gain_automation_curve.automation_state() != Off) {
                
-               if (gain_automation_recording()) {
-                       _gain_automation_curve.save_state (_("automation write/touch"));
-               }
-
                /* the src=0 condition is a special signal to not propagate 
                   automation gain changes into the mix group when locating.
                */