Various tweaks to the bundle manager.
[ardour.git] / libs / ardour / session.cc
index e62d672984e3559236db4649f3345b4d98c4cddf..031c2aa58a69cee081d0565e579d993acb9a0b85 100644 (file)
 #include "pbd/stacktrace.h"
 #include "pbd/file_utils.h"
 
+#include "ardour/amp.h"
 #include "ardour/analyser.h"
 #include "ardour/audio_buffer.h"
 #include "ardour/audio_diskstream.h"
+#include "ardour/audio_port.h"
 #include "ardour/audio_track.h"
 #include "ardour/audioengine.h"
 #include "ardour/audiofilesource.h"
 #include "ardour/auditioner.h"
 #include "ardour/buffer_set.h"
 #include "ardour/bundle.h"
+#include "ardour/butler.h"
 #include "ardour/click.h"
 #include "ardour/configuration.h"
 #include "ardour/crossfade.h"
 #include "ardour/cycle_timer.h"
 #include "ardour/data_type.h"
 #include "ardour/filename_extensions.h"
+#include "ardour/internal_send.h"
 #include "ardour/io_processor.h"
 #include "ardour/midi_diskstream.h"
 #include "ardour/midi_playlist.h"
 #include "ardour/plugin_insert.h"
 #include "ardour/port_insert.h"
 #include "ardour/processor.h"
+#include "ardour/rc_configuration.h"
 #include "ardour/recent_sessions.h"
 #include "ardour/region_factory.h"
+#include "ardour/return.h"
 #include "ardour/route_group.h"
 #include "ardour/send.h"
 #include "ardour/session.h"
@@ -92,12 +98,6 @@ using namespace ARDOUR;
 using namespace PBD;
 using boost::shared_ptr;
 
-#ifdef __x86_64__
-static const int CPU_CACHE_ALIGN = 64;
-#else
-static const int CPU_CACHE_ALIGN = 16; /* arguably 32 on most arches, but it matters less */
-#endif
-
 bool Session::_disable_all_loaded_plugins = false;
 
 sigc::signal<void,std::string> Session::Dialog;
@@ -105,7 +105,7 @@ sigc::signal<int> Session::AskAboutPendingState;
 sigc::signal<int,nframes_t,nframes_t> Session::AskAboutSampleRateMismatch;
 sigc::signal<void> Session::SendFeedback;
 
-sigc::signal<void> Session::SMPTEOffsetChanged;
+sigc::signal<void> Session::TimecodeOffsetChanged;
 sigc::signal<void> Session::StartTimeChanged;
 sigc::signal<void> Session::EndTimeChanged;
 sigc::signal<void> Session::AutoBindingOn;
@@ -118,6 +118,7 @@ Session::Session (AudioEngine &eng,
                  string mix_template)
 
        : _engine (eng),
+         _target_transport_speed (0.0),
          _requested_return_frame (-1),
          _scratch_buffers(new BufferSet()),
          _silent_buffers(new BufferSet()),
@@ -130,15 +131,13 @@ Session::Session (AudioEngine &eng,
          _session_dir (new SessionDirectory(fullpath)),
          pending_events (2048),
          state_tree (0),
-         butler_mixdown_buffer (0),
-         butler_gain_buffer (0),
+         _butler (new Butler (this)),
          post_transport_work((PostTransportWork)0),
-         _send_smpte_update (false),
+         _send_timecode_update (false),
          midi_thread (pthread_t (0)),
          midi_requests (128), // the size of this should match the midi request pool size
          diskstreams (new DiskstreamList),
          routes (new RouteList),
-         auditioner ((Auditioner*) 0),
          _total_free_4k_blocks (0),
          _bundles (new BundleList),
          _bundle_xml_node (0),
@@ -146,16 +145,19 @@ Session::Session (AudioEngine &eng,
          click_data (0),
          click_emphasis_data (0),
          main_outs (0),
-         _metadata (new SessionMetadata())
+         _metadata (new SessionMetadata()),
+         _have_rec_enabled_diskstream (false)
 
 {
        bool new_session;
 
+       interpolation.add_channel_to (0, 0);
+
        if (!eng.connected()) {
                throw failed_constructor();
        }
 
-       cerr << "Loading session " << fullpath << " using snapshot " << snapshot_name << " (1)" << endl;
+       info << "Loading session " << fullpath << " using snapshot " << snapshot_name << " (1)" << endl;
 
        n_physical_outputs = _engine.n_physical_outputs(DataType::AUDIO);
        n_physical_inputs =  _engine.n_physical_inputs(DataType::AUDIO);
@@ -182,7 +184,8 @@ Session::Session (AudioEngine &eng,
 
        _state_of_the_state = StateOfTheState (_state_of_the_state & ~Dirty);
 
-       Config->ParameterChanged.connect (mem_fun (*this, &Session::config_changed));
+       Config->ParameterChanged.connect (bind (mem_fun (*this, &Session::config_changed), false));
+       config.ParameterChanged.connect (bind (mem_fun (*this, &Session::config_changed), true));
 
        if (was_dirty) {
                DirtyChanged (); /* EMIT SIGNAL */
@@ -201,6 +204,7 @@ Session::Session (AudioEngine &eng,
                  nframes_t initial_length)
 
        : _engine (eng),
+         _target_transport_speed (0.0),
          _requested_return_frame (-1),
          _scratch_buffers(new BufferSet()),
          _silent_buffers(new BufferSet()),
@@ -213,15 +217,13 @@ Session::Session (AudioEngine &eng,
          _session_dir ( new SessionDirectory(fullpath)),
          pending_events (2048),
          state_tree (0),
-         butler_mixdown_buffer (0),
-         butler_gain_buffer (0),
+         _butler (new Butler (this)),
          post_transport_work((PostTransportWork)0),
-         _send_smpte_update (false),
+         _send_timecode_update (false),
          midi_thread (pthread_t (0)),
          midi_requests (16),
          diskstreams (new DiskstreamList),
          routes (new RouteList),
-         auditioner ((Auditioner *) 0),
          _total_free_4k_blocks (0),
          _bundles (new BundleList),
          _bundle_xml_node (0),
@@ -229,15 +231,18 @@ Session::Session (AudioEngine &eng,
          click_data (0),
          click_emphasis_data (0),
          main_outs (0),
-         _metadata (new SessionMetadata())
+         _metadata (new SessionMetadata()),
+         _have_rec_enabled_diskstream (false)
 {
        bool new_session;
 
+       interpolation.add_channel_to (0, 0);
+
        if (!eng.connected()) {
                throw failed_constructor();
        }
 
-       cerr << "Loading session " << fullpath << " using snapshot " << snapshot_name << " (2)" << endl;
+       info << "Loading session " << fullpath << " using snapshot " << snapshot_name << " (2)" << endl;
 
        n_physical_outputs = _engine.n_physical_outputs (DataType::AUDIO);
        n_physical_inputs = _engine.n_physical_inputs (DataType::AUDIO);
@@ -267,15 +272,11 @@ Session::Session (AudioEngine &eng,
                RouteList rl;
                int control_id = 1;
 
-               if (control_out_channels) {
-                       shared_ptr<Route> r (new Route (*this, _("monitor"), -1, control_out_channels, -1, control_out_channels, Route::ControlOut));
-                       r->set_remote_control_id (control_id++);
-
-                       rl.push_back (r);
-               }
-
                if (master_out_channels) {
-                       shared_ptr<Route> r (new Route (*this, _("master"), -1, master_out_channels, -1, master_out_channels, Route::MasterOut));
+                       ChanCount count(DataType::AUDIO, master_out_channels);
+                       shared_ptr<Route> r (new Route (*this, _("master"), Route::MasterOut, DataType::AUDIO));
+                       r->input()->ensure_io (count, false, this);
+                       r->output()->ensure_io (count, false, this);
                        r->set_remote_control_id (control_id);
 
                        rl.push_back (r);
@@ -284,12 +285,27 @@ Session::Session (AudioEngine &eng,
                        output_ac = AutoConnectOption (output_ac & ~AutoConnectMaster);
                }
 
+               if (control_out_channels) {
+                       ChanCount count(DataType::AUDIO, control_out_channels);
+                       shared_ptr<Route> r (new Route (*this, _("monitor"), Route::ControlOut, DataType::AUDIO));
+                       r->input()->ensure_io (count, false, this);
+                       r->output()->ensure_io (count, false, this);
+                       r->set_remote_control_id (control_id++);
+
+                       rl.push_back (r);
+               }
+
                if (!rl.empty()) {
                        add_routes (rl, false);
                }
 
        }
 
+       if (no_auto_connect()) {
+               input_ac = AutoConnectOption (0);
+               output_ac = AutoConnectOption (0);
+       }
+
        Config->set_input_auto_connect (input_ac);
        Config->set_output_auto_connect (output_ac);
 
@@ -302,7 +318,7 @@ Session::Session (AudioEngine &eng,
 
        _state_of_the_state = StateOfTheState (_state_of_the_state & ~Dirty);
 
-       Config->ParameterChanged.connect (mem_fun (*this, &Session::config_changed));
+       Config->ParameterChanged.connect (bind (mem_fun (*this, &Session::config_changed), false));
 }
 
 Session::~Session ()
@@ -337,7 +353,11 @@ Session::destroy ()
 
        delete state_tree;
 
-       terminate_butler_thread ();
+       /* reset dynamic state version back to default */
+
+       Stateful::loading_state_version = 0;
+
+       _butler->terminate_thread ();
        //terminate_midi_thread ();
 
        if (click_data != default_click) {
@@ -460,37 +480,14 @@ Session::destroy ()
        }
        sources.clear ();
 
-#ifdef TRACK_DESTRUCTION
-       cerr << "delete mix groups\n";
-#endif /* TRACK_DESTRUCTION */
-       for (list<RouteGroup *>::iterator i = mix_groups.begin(); i != mix_groups.end(); ) {
-               list<RouteGroup*>::iterator tmp;
-
-               tmp = i;
-               ++tmp;
-
-               delete *i;
-
-               i = tmp;
-       }
 
 #ifdef TRACK_DESTRUCTION
-       cerr << "delete edit groups\n";
+       cerr << "delete route groups\n";
 #endif /* TRACK_DESTRUCTION */
-       for (list<RouteGroup *>::iterator i = edit_groups.begin(); i != edit_groups.end(); ) {
-               list<RouteGroup*>::iterator tmp;
-
-               tmp = i;
-               ++tmp;
-
+       for (list<RouteGroup *>::iterator i = _route_groups.begin(); i != _route_groups.end(); ++i) {
                delete *i;
-
-               i = tmp;
        }
 
-       delete [] butler_mixdown_buffer;
-       delete [] butler_gain_buffer;
-
        Crossfade::set_buffer_size (0);
 
        delete mmc;
@@ -509,8 +506,8 @@ Session::set_worst_io_latencies ()
        boost::shared_ptr<RouteList> r = routes.reader ();
 
        for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-               _worst_output_latency = max (_worst_output_latency, (*i)->output_latency());
-               _worst_input_latency = max (_worst_input_latency, (*i)->input_latency());
+               _worst_output_latency = max (_worst_output_latency, (*i)->output()->latency());
+               _worst_input_latency = max (_worst_input_latency, (*i)->input()->latency());
        }
 }
 
@@ -519,8 +516,6 @@ Session::when_engine_running ()
 {
        string first_physical_output;
 
-       /* we don't want to run execute this again */
-
        BootMessage (_("Set block size and sample rate"));
 
        set_block_size (_engine.frames_per_cycle());
@@ -528,7 +523,7 @@ Session::when_engine_running ()
 
        BootMessage (_("Using configuration"));
 
-       Config->map_parameters (mem_fun (*this, &Session::config_changed));
+       Config->map_parameters (bind (mem_fun (*this, &Session::config_changed), false));
 
        /* every time we reconnect, recompute worst case output latencies */
 
@@ -538,7 +533,7 @@ Session::when_engine_running ()
                _engine.transport_stop ();
        }
 
-       if (Config->get_jack_time_master()) {
+       if (config.get_jack_time_master()) {
                _engine.transport_locate (_transport_frame);
        }
 
@@ -547,22 +542,30 @@ Session::when_engine_running ()
        try {
                XMLNode* child = 0;
 
-               _click_io.reset (new ClickIO (*this, "click", 0, 0, -1, -1));
+               _click_io.reset (new ClickIO (*this, "click"));
 
                if (state_tree && (child = find_named_node (*state_tree->root(), "Click")) != 0) {
 
                        /* existing state for Click */
+                       int c;
 
-                       if (_click_io->set_state (*child->children().front()) == 0) {
+                       if (Stateful::loading_state_version < 3000) {
+                               c = _click_io->set_state_2X (*child->children().front(), Stateful::loading_state_version, false);
+                       } else {
+                               c = _click_io->set_state (*child->children().front(), Stateful::loading_state_version);
+                       }
+                                       
 
+                       if (c == 0) {
                                _clicking = Config->get_clicking ();
-
+                               
                        } else {
-
+                               
                                error << _("could not setup Click I/O") << endmsg;
                                _clicking = false;
                        }
 
+
                } else {
 
                        /* default state for Click: dual-mono to first 2 physical outputs */
@@ -571,13 +574,13 @@ Session::when_engine_running ()
                                string physical_output = _engine.get_nth_physical_output (DataType::AUDIO, physport);
 
                                if (physical_output.length()) {
-                                       if (_click_io->add_output_port (physical_output, this)) {
+                                       if (_click_io->add_port (physical_output, this)) {
                                                // relax, even though its an error
                                       }
                               }
                       }
-                      
-                       if (_click_io->n_outputs () > ChanCount::ZERO) {
+
+                       if (_click_io->n_ports () > ChanCount::ZERO) {
                                _clicking = Config->get_clicking ();
                        }
                }
@@ -602,19 +605,24 @@ Session::when_engine_running ()
           mono and stereo bundles, so that the common cases of mono
           and stereo tracks get bundles to put in their mixer strip
           in / out menus.  There may be a nicer way of achieving that;
-          it doesn't really scale that well to higher channel counts */
+          it doesn't really scale that well to higher channel counts
+       */
+
+       /* mono output bundles */
 
        for (uint32_t np = 0; np < n_physical_outputs; ++np) {
                char buf[32];
                snprintf (buf, sizeof (buf), _("out %" PRIu32), np+1);
 
-               shared_ptr<Bundle> c (new Bundle (buf, true));
+               shared_ptr<Bundle> c (new Bundle (buf, true));
                c->add_channel (_("mono"));
-               c->set_port (0, _engine.get_nth_physical_output (DataType::AUDIO, np));
+               c->set_port (0, _engine.get_nth_physical_output (DataType::AUDIO, np));
 
-               add_bundle (c);
+               add_bundle (c);
        }
 
+       /* stereo output bundles */
+
        for (uint32_t np = 0; np < n_physical_outputs; np += 2) {
                if (np + 1 < n_physical_outputs) {
                        char buf[32];
@@ -629,17 +637,21 @@ Session::when_engine_running ()
                }
        }
 
+       /* mono input bundles */
+
        for (uint32_t np = 0; np < n_physical_inputs; ++np) {
                char buf[32];
                snprintf (buf, sizeof (buf), _("in %" PRIu32), np+1);
 
-               shared_ptr<Bundle> c (new Bundle (buf, false));
+               shared_ptr<Bundle> c (new Bundle (buf, false));
                c->add_channel (_("mono"));
-               c->set_port (0, _engine.get_nth_physical_input (DataType::AUDIO, np));
+               c->set_port (0, _engine.get_nth_physical_input (DataType::AUDIO, np));
 
-               add_bundle (c);
+               add_bundle (c);
        }
 
+       /* stereo input bundles */
+
        for (uint32_t np = 0; np < n_physical_inputs; np += 2) {
                if (np + 1 < n_physical_inputs) {
                        char buf[32];
@@ -655,79 +667,108 @@ Session::when_engine_running ()
                }
        }
 
-       if (_master_out) {
+       BootMessage (_("Setup signal flow and plugins"));
 
-               /* create master/control ports */
+       hookup_io ();
 
-               if (_master_out) {
-                       uint32_t n;
+       if (!no_auto_connect()) {
 
-                       /* force the master to ignore any later call to this */
+               if (_master_out && Config->get_auto_connect_standard_busses()) {
 
-                       if (_master_out->pending_state_node) {
-                               _master_out->ports_became_legal();
-                       }
+                       /* if requested auto-connect the outputs to the first N physical ports.
+                        */
 
-                       /* no panner resets till we are through */
+                       uint32_t limit = _master_out->n_outputs().n_total();
 
-                       _master_out->defer_pan_reset ();
+                       for (uint32_t n = 0; n < limit; ++n) {
+                               Port* p = _master_out->output()->nth (n);
+                               string connect_to = _engine.get_nth_physical_output (DataType (p->type()), n);
 
-                       while (_master_out->n_inputs().n_audio()
-                                       < _master_out->input_maximum().n_audio()) {
-                               if (_master_out->add_input_port ("", this, DataType::AUDIO)) {
-                                       error << _("cannot setup master inputs")
-                                             << endmsg;
-                                       break;
+                               if (!connect_to.empty() && p->connected_to (connect_to) == false) {
+                                       if (_master_out->output()->connect (p, connect_to, this)) {
+                                               error << string_compose (_("cannot connect master output %1 to %2"), n, connect_to)
+                                                     << endmsg;
+                                               break;
+                                       }
                                }
                        }
-                       n = 0;
-                       while (_master_out->n_outputs().n_audio()
-                                       < _master_out->output_maximum().n_audio()) {
-                               if (_master_out->add_output_port (_engine.get_nth_physical_output (DataType::AUDIO, n), this, DataType::AUDIO)) {
-                                       error << _("cannot setup master outputs")
-                                             << endmsg;
-                                       break;
+               }
+
+               if (_control_out) {
+
+                       /* AUDIO ONLY as of june 29th 2009, because listen semantics for anything else
+                          are undefined, at best.
+                        */
+
+                       /* control out listens to master bus (but ignores it
+                          under some conditions)
+                       */
+
+                       uint32_t limit = _control_out->n_inputs().n_audio();
+
+                       if (_master_out) {
+                               for (uint32_t n = 0; n < limit; ++n) {
+                                       AudioPort* p = _control_out->input()->ports().nth_audio_port (n);
+                                       AudioPort* o = _master_out->output()->ports().nth_audio_port (n);
+
+                                       if (o) {
+                                               string connect_to = o->name();
+                                               if (_control_out->input()->connect (p, connect_to, this)) {
+                                                       error << string_compose (_("cannot connect control input %1 to %2"), n, connect_to)
+                                                             << endmsg;
+                                                       break;
+                                               }
+                                       }
                                }
-                               n++;
                        }
 
-                       _master_out->allow_pan_reset ();
+                       /* if control out is not connected,
+                          connect control out to physical outs, but use ones after the master if possible
+                       */
 
-               }
-       }
+                       if (!_control_out->output()->connected_to (boost::shared_ptr<IO>())) {
 
-       BootMessage (_("Setup signal flow and plugins"));
+                               if (!Config->get_monitor_bus_preferred_bundle().empty()) {
 
-       hookup_io ();
+                                       boost::shared_ptr<Bundle> b = bundle_by_name (Config->get_monitor_bus_preferred_bundle());
 
-       /* catch up on send+insert cnts */
+                                       if (b) {
+                                               _control_out->output()->connect_ports_to_bundle (b, this);
+                                       } else {
+                                               warning << string_compose (_("The preferred I/O for the monitor bus (%1) cannot be found"),
+                                                                          Config->get_monitor_bus_preferred_bundle())
+                                                       << endmsg;
+                                       }
 
-       BootMessage (_("Catch up with send/insert state"));
+                               } else {
 
-       insert_cnt = 0;
+                                       /* XXX this logic is wrong for mixed port types */
 
-       for (list<PortInsert*>::iterator i = _port_inserts.begin(); i != _port_inserts.end(); ++i) {
-               uint32_t id;
+                                       uint32_t shift = _master_out->n_outputs().n_audio();
+                                       uint32_t mod = _engine.n_physical_outputs (DataType::AUDIO);
+                                       limit = _control_out->n_outputs().n_audio();
 
-               if (sscanf ((*i)->name().c_str(), "%*s %u", &id) == 1) {
-                       if (id > insert_cnt) {
-                               insert_cnt = id;
-                       }
-               }
-       }
+                                       cerr << "Connecting " << limit << " control out ports, shift is " << shift << " mod is " << mod << endl;
 
-       send_cnt = 0;
+                                       for (uint32_t n = 0; n < limit; ++n) {
 
-       for (list<Send*>::iterator i = _sends.begin(); i != _sends.end(); ++i) {
-               uint32_t id;
+                                               Port* p = _control_out->output()->nth (n);
+                                               string connect_to = _engine.get_nth_physical_output (DataType (p->type()), (n+shift) % mod);
 
-               if (sscanf ((*i)->name().c_str(), "%*s %u", &id) == 1) {
-                       if (id > send_cnt) {
-                               send_cnt = id;
+                                               if (!connect_to.empty()) {
+                                                       if (_control_out->output()->connect (p, connect_to, this)) {
+                                                               error << string_compose (_("cannot connect control output %1 to %2"), n, connect_to)
+                                                                     << endmsg;
+                                                               break;
+                                                       }
+                                               }
+                                       }
+                               }
                        }
                }
        }
 
+       /* catch up on send+insert cnts */
 
        _state_of_the_state = StateOfTheState (_state_of_the_state & ~(CannotSave|Dirty));
 
@@ -748,7 +789,7 @@ Session::hookup_io ()
        _state_of_the_state = StateOfTheState (_state_of_the_state | InitialConnecting);
 
 
-       if (auditioner == 0) {
+       if (!auditioner) {
 
                /* we delay creating the auditioner till now because
                   it makes its own connections to ports.
@@ -764,45 +805,6 @@ Session::hookup_io ()
                }
        }
 
-       /* Tell all IO objects to create their ports */
-
-       IO::enable_ports ();
-
-       if (_control_out) {
-               uint32_t n;
-               vector<string> cports;
-
-               while (_control_out->n_inputs().n_audio() < _control_out->input_maximum().n_audio()) {
-                       if (_control_out->add_input_port ("", this)) {
-                               error << _("cannot setup control inputs")
-                                     << endmsg;
-                               break;
-                       }
-               }
-               n = 0;
-               while (_control_out->n_outputs().n_audio() < _control_out->output_maximum().n_audio()) {
-                       if (_control_out->add_output_port (_engine.get_nth_physical_output (DataType::AUDIO, n), this)) {
-                               error << _("cannot set up master outputs")
-                                     << endmsg;
-                               break;
-                       }
-                       n++;
-               }
-
-
-               uint32_t ni = _control_out->n_inputs().get (DataType::AUDIO);
-
-               for (n = 0; n < ni; ++n) {
-                       cports.push_back (_control_out->input(n)->name());
-               }
-
-               boost::shared_ptr<RouteList> r = routes.reader ();
-
-               for (RouteList::iterator x = r->begin(); x != r->end(); ++x) {
-                       (*x)->set_control_outs (cports);
-               }
-       }
-
        /* load bundles, which we may have postponed earlier on */
        if (_bundle_xml_node) {
                load_bundles (*_bundle_xml_node);
@@ -815,7 +817,25 @@ Session::hookup_io ()
 
        /* Now reset all panners */
 
-       IO::reset_panners ();
+       Delivery::reset_panners ();
+
+       /* Connect tracks to listen/solo etc. busses XXX generalize this beyond control_out */
+
+       if (_control_out) {
+
+               boost::shared_ptr<RouteList> r = routes.reader ();
+
+               for (RouteList::iterator x = r->begin(); x != r->end(); ++x) {
+
+                       if ((*x)->is_control() || (*x)->is_master()) {
+                               continue;
+                       }
+
+                       (*x)->listen_via (_control_out,
+                                         (Config->get_listen_position() == AfterFaderListen ? PostFader : PreFader),
+                                         false, false);
+               }
+       }
 
        /* Anyone who cares about input state, wake up and do something */
 
@@ -823,16 +843,19 @@ Session::hookup_io ()
 
        _state_of_the_state = StateOfTheState (_state_of_the_state & ~InitialConnecting);
 
-
        /* now handle the whole enchilada as if it was one
           graph reorder event.
        */
 
        graph_reordered ();
 
-       /* update mixer solo state */
+       /* update the full solo state, which can't be
+          correctly determined on a per-route basis, but
+          needs the global overview that only the session
+          has.
+       */
 
-       catch_up_on_solo();
+       update_route_solo_state ();
 }
 
 void
@@ -864,9 +887,9 @@ bool
 Session::record_enabling_legal () const
 {
        /* this used to be in here, but survey says.... we don't need to restrict it */
-       // if (record_status() == Recording) {
-       //      return false;
-       // }
+       // if (record_status() == Recording) {
+       //      return false;
+       // }
 
        if (Config->get_all_safe()) {
                return false;
@@ -884,7 +907,7 @@ Session::reset_input_monitor_state ()
                for (DiskstreamList::iterator i = dsl->begin(); i != dsl->end(); ++i) {
                        if ((*i)->record_enabled ()) {
                                //cerr << "switching to input = " << !auto_input << __FILE__ << __LINE__ << endl << endl;
-                               (*i)->monitor_input (Config->get_monitoring_model() == HardwareMonitoring && !Config->get_auto_input());
+                               (*i)->monitor_input (Config->get_monitoring_model() == HardwareMonitoring && !config.get_auto_input());
                        }
                }
        } else {
@@ -904,7 +927,7 @@ Session::auto_punch_start_changed (Location* location)
 {
        replace_event (Event::PunchIn, location->start());
 
-       if (get_record_enabled() && Config->get_punch_in()) {
+       if (get_record_enabled() && config.get_punch_in()) {
                /* capture start has been changed, so save new pending state */
                save_state ("", true);
        }
@@ -935,9 +958,10 @@ Session::auto_loop_changed (Location* location)
 
        if (transport_rolling() && play_loop) {
 
-               //if (_transport_frame < location->start() || _transport_frame > location->end()) {
 
-               if (_transport_frame > location->end()) {
+               // if (_transport_frame > location->end()) {
+
+               if (_transport_frame < location->start() || _transport_frame > location->end()) {
                        // relocate to beginning of loop
                        clear_events (Event::LocateRoll);
 
@@ -1051,7 +1075,7 @@ Session::set_auto_loop_location (Location* location)
 }
 
 void
-Session::locations_added (Location* ignored)
+Session::locations_added (Location *)
 {
        set_dirty ();
 }
@@ -1110,7 +1134,7 @@ Session::enable_record ()
                _last_record_location = _transport_frame;
                deliver_mmc(MIDI::MachineControl::cmdRecordStrobe, _last_record_location);
 
-               if (Config->get_monitoring_model() == HardwareMonitoring && Config->get_auto_input()) {
+               if (Config->get_monitoring_model() == HardwareMonitoring && config.get_auto_input()) {
                        boost::shared_ptr<DiskstreamList> dsl = diskstreams.reader();
                        for (DiskstreamList::iterator i = dsl->begin(); i != dsl->end(); ++i) {
                                if ((*i)->record_enabled ()) {
@@ -1144,7 +1168,7 @@ Session::disable_record (bool rt_context, bool force)
                if (rt_context)
                        deliver_mmc (MIDI::MachineControl::cmdRecordExit, _transport_frame);
 
-               if (Config->get_monitoring_model() == HardwareMonitoring && Config->get_auto_input()) {
+               if (Config->get_monitoring_model() == HardwareMonitoring && config.get_auto_input()) {
                        boost::shared_ptr<DiskstreamList> dsl = diskstreams.reader();
 
                        for (DiskstreamList::iterator i = dsl->begin(); i != dsl->end(); ++i) {
@@ -1169,7 +1193,7 @@ Session::step_back_from_record ()
        if (g_atomic_int_get (&_record_status) == Recording) {
                g_atomic_int_set (&_record_status, Enabled);
 
-               if (Config->get_monitoring_model() == HardwareMonitoring && Config->get_auto_input()) {
+               if (Config->get_monitoring_model() == HardwareMonitoring && config.get_auto_input()) {
                        boost::shared_ptr<DiskstreamList> dsl = diskstreams.reader();
 
                        for (DiskstreamList::iterator i = dsl->begin(); i != dsl->end(); ++i) {
@@ -1194,7 +1218,7 @@ Session::maybe_enable_record ()
        save_state ("", true);
 
        if (_transport_speed) {
-               if (!Config->get_punch_in()) {
+               if (!config.get_punch_in()) {
                        enable_record ();
                }
        } else {
@@ -1240,7 +1264,7 @@ Session::audible_frame () const
        } else {
                tf = _transport_frame;
        }
-       
+
        ret = tf;
 
        if (!non_realtime_work_pending()) {
@@ -1259,8 +1283,8 @@ Session::audible_frame () const
                                if (tf < _last_roll_location + offset) {
                                        return _last_roll_location;
                                }
-                       } 
-                       
+                       }
+
 
                        /* forwards */
                        ret -= offset;
@@ -1317,7 +1341,6 @@ Session::set_block_size (nframes_t nframes)
        */
 
        {
-
                current_block_size = nframes;
 
                ensure_buffers(_scratch_buffers->available());
@@ -1343,7 +1366,7 @@ Session::set_block_size (nframes_t nframes)
 }
 
 void
-Session::set_default_fade (float steepness, float fade_msecs)
+Session::set_default_fade (float /*steepness*/, float /*fade_msecs*/)
 {
 #if 0
        nframes_t fade_frames;
@@ -1515,7 +1538,7 @@ Session::resort_routes_using (shared_ptr<RouteList> r)
 }
 
 list<boost::shared_ptr<MidiTrack> >
-Session::new_midi_track (TrackMode mode, uint32_t how_many)
+Session::new_midi_track (TrackMode mode, RouteGroup* route_group, uint32_t how_many)
 {
        char track_name[32];
        uint32_t track_id = 0;
@@ -1575,7 +1598,13 @@ Session::new_midi_track (TrackMode mode, uint32_t how_many)
                try {
                        track = boost::shared_ptr<MidiTrack>((new MidiTrack (*this, track_name, Route::Flag (0), mode)));
 
-                       if (track->ensure_io (ChanCount(DataType::MIDI, 1), ChanCount(DataType::AUDIO, 1), false, this)) {
+                       if (track->input()->ensure_io (ChanCount(DataType::MIDI, 1), false, this)) {
+                               error << "cannot configure 1 in/1 out configuration for new midi track" << endmsg;
+                               goto failed;
+                       }
+
+
+                       if (track->output()->ensure_io (ChanCount(DataType::MIDI, 1), false, this)) {
                                error << "cannot configure 1 in/1 out configuration for new midi track" << endmsg;
                                goto failed;
                        }
@@ -1618,6 +1647,7 @@ Session::new_midi_track (TrackMode mode, uint32_t how_many)
                        */
 
                        track->midi_diskstream()->non_realtime_input_change();
+                       track->set_route_group (route_group, 0);
 
                        track->DiskstreamChanged.connect (mem_fun (this, &Session::resort_routes));
                        //track->set_remote_control_id (control_id);
@@ -1674,7 +1704,7 @@ Session::new_midi_track (TrackMode mode, uint32_t how_many)
 }
 
 list<boost::shared_ptr<AudioTrack> >
-Session::new_audio_track (int input_channels, int output_channels, TrackMode mode, uint32_t how_many)
+Session::new_audio_track (int input_channels, int output_channels, TrackMode mode, RouteGroup* route_group,  uint32_t how_many)
 {
        char track_name[32];
        uint32_t track_id = 0;
@@ -1733,7 +1763,14 @@ Session::new_audio_track (int input_channels, int output_channels, TrackMode mod
                try {
                        track = boost::shared_ptr<AudioTrack>((new AudioTrack (*this, track_name, Route::Flag (0), mode)));
 
-                       if (track->ensure_io (ChanCount(DataType::AUDIO, input_channels), ChanCount(DataType::AUDIO, output_channels), false, this)) {
+                       if (track->input()->ensure_io (ChanCount(DataType::AUDIO, input_channels), false, this)) {
+                               error << string_compose (_("cannot configure %1 in/%2 out configuration for new audio track"),
+                                                        input_channels, output_channels)
+                                     << endmsg;
+                               goto failed;
+                       }
+
+                       if (track->output()->ensure_io (ChanCount(DataType::AUDIO, output_channels), false, this)) {
                                error << string_compose (_("cannot configure %1 in/%2 out configuration for new audio track"),
                                                         input_channels, output_channels)
                                      << endmsg;
@@ -1751,7 +1788,7 @@ Session::new_audio_track (int input_channels, int output_channels, TrackMode mod
                                                port = physinputs[(channels_used+x)%nphysical_in];
                                        }
 
-                                       if (port.length() && track->connect_input (track->input (x), port, this)) {
+                                       if (port.length() && track->input()->connect (track->input()->nth(x), port, this)) {
                                                break;
                                        }
                                }
@@ -1761,18 +1798,17 @@ Session::new_audio_track (int input_channels, int output_channels, TrackMode mod
                                uint32_t nphysical_out = physoutputs.size();
 
                                for (uint32_t x = 0; x < track->n_outputs().n_audio(); ++x) {
-                                       
                                        port = "";
-                                       
+
                                        if (Config->get_output_auto_connect() & AutoConnectPhysical) {
                                                port = physoutputs[(channels_used+x)%nphysical_out];
                                        } else if (Config->get_output_auto_connect() & AutoConnectMaster) {
-                                               if (_master_out) {
-                                                       port = _master_out->input (x%_master_out->n_inputs().n_audio())->name();
+                                               if (_master_out && _master_out->n_inputs().n_audio() > 0) {
+                                                       port = _master_out->input()->nth (x % _master_out->input()->n_ports().n_audio())->name();
                                                }
                                        }
-                                       
-                                       if (port.length() && track->connect_output (track->output (x), port, this)) {
+
+                                       if (port.length() && track->output()->connect (track->output()->nth(x), port, this)) {
                                                break;
                                        }
                                }
@@ -1780,6 +1816,8 @@ Session::new_audio_track (int input_channels, int output_channels, TrackMode mod
 
                        channels_used += track->n_inputs ().n_audio();
 
+                       track->set_route_group (route_group, 0);
+
                        track->audio_diskstream()->non_realtime_input_change();
 
                        track->DiskstreamChanged.connect (mem_fun (this, &Session::resort_routes));
@@ -1858,7 +1896,7 @@ Session::set_remote_control_ids ()
 
 
 RouteList
-Session::new_audio_route (int input_channels, int output_channels, uint32_t how_many)
+Session::new_audio_route (int input_channels, int output_channels, RouteGroup* route_group, uint32_t how_many)
 {
        char bus_name[32];
        uint32_t bus_id = 1;
@@ -1910,9 +1948,9 @@ Session::new_audio_route (int input_channels, int output_channels, uint32_t how_
                } while (bus_id < (UINT_MAX-1));
 
                try {
-                       shared_ptr<Route> bus (new Route (*this, bus_name, -1, -1, -1, -1, Route::Flag(0), DataType::AUDIO));
+                       shared_ptr<Route> bus (new Route (*this, bus_name, Route::Flag(0), DataType::AUDIO));
 
-                       if (bus->ensure_io (ChanCount(DataType::AUDIO, input_channels), ChanCount(DataType::AUDIO, output_channels), false, this)) {
+                       if (bus->input()->ensure_io (ChanCount(DataType::AUDIO, input_channels), false, this)) {
                                error << string_compose (_("cannot configure %1 in/%2 out configuration for new audio track"),
                                                         input_channels, output_channels)
                                      << endmsg;
@@ -1920,21 +1958,24 @@ Session::new_audio_route (int input_channels, int output_channels, uint32_t how_
                        }
 
 
+                       if (bus->output()->ensure_io (ChanCount(DataType::AUDIO, output_channels), false, this)) {
+                               error << string_compose (_("cannot configure %1 in/%2 out configuration for new audio track"),
+                                                        input_channels, output_channels)
+                                     << endmsg;
+                               goto failure;
+                       }
 
-                       /*
-                       for (uint32_t x = 0; n_physical_audio_inputs && x < bus->n_inputs(); ++x) {
-                                       
+                       for (uint32_t x = 0; n_physical_audio_inputs && x < bus->input()->n_ports().n_audio(); ++x) {
                                port = "";
-                               
+
                                if (Config->get_input_auto_connect() & AutoConnectPhysical) {
                                        port = physinputs[((n+x)%n_physical_audio_inputs)];
-                               } 
-                               
-                               if (port.length() && bus->connect_input (bus->input (x), port, this)) {
+                               }
+
+                               if (port.length() && bus->input()->connect (bus->input()->nth (x), port, this)) {
                                        break;
                                }
                        }
-                       */
 
                        for (uint32_t x = 0; n_physical_audio_outputs && x < bus->n_outputs().n_audio(); ++x) {
                                port = "";
@@ -1943,17 +1984,18 @@ Session::new_audio_route (int input_channels, int output_channels, uint32_t how_
                                        port = physoutputs[((n+x)%n_physical_outputs)];
                                } else if (Config->get_output_auto_connect() & AutoConnectMaster) {
                                        if (_master_out) {
-                                               port = _master_out->input (x%_master_out->n_inputs().n_audio())->name();
+                                               port = _master_out->input()->nth (x%_master_out->input()->n_ports().n_audio())->name();
                                        }
                                }
 
-                               if (port.length() && bus->connect_output (bus->output (x), port, this)) {
+                               if (port.length() && bus->output()->connect (bus->output()->nth(x), port, this)) {
                                        break;
                                }
                        }
 
                        channels_used += bus->n_inputs ().n_audio();
 
+                       bus->set_route_group (route_group, 0);
                        bus->set_remote_control_id (control_id);
                        ++control_id;
 
@@ -1991,6 +2033,7 @@ Session::new_route_from_template (uint32_t how_many, const std::string& template
        RouteList ret;
        uint32_t control_id;
        XMLTree tree;
+       uint32_t number = 1;
 
        if (!tree.read (template_path.c_str())) {
                return ret;
@@ -2003,38 +2046,33 @@ Session::new_route_from_template (uint32_t how_many, const std::string& template
        while (how_many) {
 
                XMLNode node_copy (*node); // make a copy so we can change the name if we need to
-         
-               std::string node_name = IO::name_from_state (*node_copy.children().front());
 
-               if (route_by_name (node_name) != 0) {
+               std::string node_name = IO::name_from_state (*node_copy.children().front());
 
-                       /* generate a new name by adding a number to the end of the template name */
+               /* generate a new name by adding a number to the end of the template name */
 
-                       uint32_t number = 1;
+               do {
+                       snprintf (name, sizeof (name), "%s %" PRIu32, node_name.c_str(), number);
 
-                       do {
-                               snprintf (name, sizeof (name), "%s %" PRIu32, node_name.c_str(), number);
-             
-                               number++;
-             
-                               if (route_by_name (name) == 0) {
-                                       break;
-                               }
-             
-                       } while (number < UINT_MAX);
+                       number++;
 
-                       if (number == UINT_MAX) {
-                               fatal << _("Session: UINT_MAX routes? impossible!") << endmsg;
-                               /*NOTREACHED*/
+                       if (route_by_name (name) == 0) {
+                               break;
                        }
 
-                       IO::set_name_in_state (*node_copy.children().front(), name);
+               } while (number < UINT_MAX);
+
+               if (number == UINT_MAX) {
+                       fatal << _("Session: UINT_MAX routes? impossible!") << endmsg;
+                       /*NOTREACHED*/
                }
 
+               IO::set_name_in_state (*node_copy.children().front(), name);
+
                Track::zero_diskstream_id_in_xml (node_copy);
 
                try {
-                       shared_ptr<Route> route (XMLRouteFactory (node_copy));
+                       shared_ptr<Route> route (XMLRouteFactory (node_copy, 3000));
            
                        if (route == 0) {
                                error << _("Session: cannot create track/bus from template description") << endmsg;
@@ -2046,26 +2084,26 @@ Session::new_route_from_template (uint32_t how_many, const std::string& template
                                   picks up the configuration of the route. During session
                                   loading this normally happens in a different way.
                                */
-                               route->input_changed (IOChange (ConfigurationChanged|ConnectionsChanged), this);
-                               route->output_changed (IOChange (ConfigurationChanged|ConnectionsChanged), this);
+                               route->input()->changed (IOChange (ConfigurationChanged|ConnectionsChanged), this);
+                               route->output()->changed (IOChange (ConfigurationChanged|ConnectionsChanged), this);
                        }
-                       
+
                        route->set_remote_control_id (control_id);
                        ++control_id;
-           
+
                        ret.push_back (route);
                }
-         
+
                catch (failed_constructor &err) {
                        error << _("Session: could not create new route from template") << endmsg;
                        goto out;
                }
-         
+
                catch (AudioEngine::PortRegistrationFailure& pfe) {
                        error << pfe.what() << endmsg;
                        goto out;
                }
-         
+
                --how_many;
        }
 
@@ -2084,17 +2122,29 @@ Session::add_routes (RouteList& new_routes, bool save)
                RCUWriter<RouteList> writer (routes);
                shared_ptr<RouteList> r = writer.get_copy ();
                r->insert (r->end(), new_routes.begin(), new_routes.end());
-               resort_routes_using (r);
+
+
+               /* if there is no control out and we're not in the middle of loading,
+                  resort the graph here. if there is a control out, we will resort
+                  toward the end of this method. if we are in the middle of loading,
+                  we will resort when done.
+               */
+
+               if (!_control_out && IO::connecting_legal) {
+                       resort_routes_using (r);
+               }
        }
 
        for (RouteList::iterator x = new_routes.begin(); x != new_routes.end(); ++x) {
 
                boost::weak_ptr<Route> wpr (*x);
 
+               (*x)->listen_changed.connect (sigc::bind (mem_fun (*this, &Session::route_listen_changed), wpr));
                (*x)->solo_changed.connect (sigc::bind (mem_fun (*this, &Session::route_solo_changed), wpr));
                (*x)->mute_changed.connect (mem_fun (*this, &Session::route_mute_changed));
-               (*x)->output_changed.connect (mem_fun (*this, &Session::set_worst_io_latencies_x));
+               (*x)->output()->changed.connect (mem_fun (*this, &Session::set_worst_io_latencies_x));
                (*x)->processors_changed.connect (bind (mem_fun (*this, &Session::update_latency_compensation), false, false));
+               (*x)->route_group_changed.connect (hide (mem_fun (*this, &Session::route_group_changed)));
 
                if ((*x)->is_master()) {
                        _master_out = (*x);
@@ -2107,16 +2157,16 @@ Session::add_routes (RouteList& new_routes, bool save)
 
        if (_control_out && IO::connecting_legal) {
 
-               vector<string> cports;
-               uint32_t ni = _control_out->n_inputs().n_audio();
-
-               for (uint32_t n = 0; n < ni; ++n) {
-                       cports.push_back (_control_out->input(n)->name());
-               }
-
                for (RouteList::iterator x = new_routes.begin(); x != new_routes.end(); ++x) {
-                       (*x)->set_control_outs (cports);
+                       if ((*x)->is_control() || (*x)->is_master()) {
+                               continue;
+                       }
+                       (*x)->listen_via (_control_out,
+                                         (Config->get_listen_position() == AfterFaderListen ? PostFader : PreFader),
+                                         false, false);
                }
+
+               resort_routes ();
        }
 
        set_dirty();
@@ -2128,6 +2178,96 @@ Session::add_routes (RouteList& new_routes, bool save)
        RouteAdded (new_routes); /* EMIT SIGNAL */
 }
 
+void
+Session::globally_set_send_gains_to_zero (boost::shared_ptr<Route> dest)
+{
+       boost::shared_ptr<RouteList> r = routes.reader ();
+       boost::shared_ptr<Send> s;
+
+       /* only tracks */
+
+       for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
+               if (boost::dynamic_pointer_cast<Track>(*i)) {
+                       if ((s = (*i)->internal_send_for (dest)) != 0) {
+                               s->amp()->gain_control()->set_value (0.0);
+                       }
+               }
+       }
+}
+
+void
+Session::globally_set_send_gains_to_unity (boost::shared_ptr<Route> dest)
+{
+       boost::shared_ptr<RouteList> r = routes.reader ();
+       boost::shared_ptr<Send> s;
+
+       /* only tracks */
+
+       for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
+               if (boost::dynamic_pointer_cast<Track>(*i)) {
+                       if ((s = (*i)->internal_send_for (dest)) != 0) {
+                               s->amp()->gain_control()->set_value (1.0);
+                       }
+               }
+       }
+}
+
+void
+Session::globally_set_send_gains_from_track(boost::shared_ptr<Route> dest)
+{
+       boost::shared_ptr<RouteList> r = routes.reader ();
+       boost::shared_ptr<Send> s;
+
+       /* only tracks */
+
+       for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
+               if (boost::dynamic_pointer_cast<Track>(*i)) {
+                       if ((s = (*i)->internal_send_for (dest)) != 0) {
+                               s->amp()->gain_control()->set_value ((*i)->gain_control()->get_value());
+                       }
+               }
+       }
+}
+
+void
+Session::globally_add_internal_sends (boost::shared_ptr<Route> dest, Placement p)
+{
+       boost::shared_ptr<RouteList> r = routes.reader ();
+       boost::shared_ptr<RouteList> t (new RouteList);
+
+       /* only send tracks */
+
+       for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
+               if (boost::dynamic_pointer_cast<Track>(*i)) {
+                       t->push_back (*i);
+               }
+       }
+
+       add_internal_sends (dest, p, t);
+}
+
+
+void
+Session::add_internal_sends (boost::shared_ptr<Route> dest, Placement p, boost::shared_ptr<RouteList> senders)
+{
+       if (dest->is_control() || dest->is_master()) {
+               return;
+       }
+
+       if (!dest->internal_return()) {
+               dest->add_internal_return();
+       }
+
+       for (RouteList::iterator i = senders->begin(); i != senders->end(); ++i) {
+
+               if ((*i)->is_control() || (*i)->is_master() || (*i) == dest) {
+                       continue;
+               }
+
+               (*i)->listen_via (dest, p, true, true);
+       }
+}
+
 void
 Session::add_diskstream (boost::shared_ptr<Diskstream> dstream)
 {
@@ -2147,6 +2287,8 @@ Session::add_diskstream (boost::shared_ptr<Diskstream> dstream)
        /* this will connect to future changes, and check the current length */
        diskstream_playlist_changed (dstream);
 
+       dstream->RecordEnableChanged.connect (mem_fun (*this, &Session::update_have_rec_enabled_diskstream));
+
        dstream->prepare ();
 
 }
@@ -2170,15 +2312,14 @@ Session::remove_route (shared_ptr<Route> route)
                }
 
                if (route == _control_out) {
-                       _control_out = shared_ptr<Route> ();
 
                        /* cancel control outs for all routes */
 
-                       vector<string> empty;
-
                        for (RouteList::iterator r = rs->begin(); r != rs->end(); ++r) {
-                               (*r)->set_control_outs (empty);
+                               (*r)->drop_listen (_control_out);
                        }
+
+                       _control_out.reset ();
                }
 
                update_route_solo_state ();
@@ -2206,8 +2347,8 @@ Session::remove_route (shared_ptr<Route> route)
 
        // We need to disconnect the routes inputs and outputs
 
-       route->disconnect_inputs (0);
-       route->disconnect_outputs (0);
+       route->input()->disconnect (0);
+       route->output()->disconnect (0);
 
        update_latency_compensation (false, false);
        set_dirty();
@@ -2232,20 +2373,35 @@ Session::remove_route (shared_ptr<Route> route)
 }
 
 void
-Session::route_mute_changed (void* src)
+Session::route_mute_changed (void* /*src*/)
 {
        set_dirty ();
 }
 
 void
-Session::route_solo_changed (void* src, boost::weak_ptr<Route> wpr)
+Session::route_listen_changed (void* /*src*/, boost::weak_ptr<Route> wpr)
+{
+       boost::shared_ptr<Route> route = wpr.lock();
+       if (!route) {
+               error << string_compose (_("programming error: %1"), X_("invalid route weak ptr passed to route_solo_changed")) << endmsg;
+               return;
+       }
+
+       if (route->listening()) {
+               _listen_cnt++;
+       } else if (_listen_cnt > 0) {
+               _listen_cnt--;
+       }
+}
+
+void
+Session::route_solo_changed (void* /*src*/, boost::weak_ptr<Route> wpr)
 {
        if (solo_update_disabled) {
                // We know already
                return;
        }
 
-       bool is_track;
        boost::shared_ptr<Route> route = wpr.lock ();
 
        if (!route) {
@@ -2254,218 +2410,70 @@ Session::route_solo_changed (void* src, boost::weak_ptr<Route> wpr)
                return;
        }
 
-       is_track = (boost::dynamic_pointer_cast<AudioTrack>(route) != 0);
-
        shared_ptr<RouteList> r = routes.reader ();
+       int32_t delta;
 
-       for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-
-               /* soloing a track mutes all other tracks, soloing a bus mutes all other busses */
-
-               if (is_track) {
-
-                       /* don't mess with busses */
-
-                       if (boost::dynamic_pointer_cast<Track>(*i) == 0) {
-                               continue;
-                       }
-
-               } else {
-
-                       /* don't mess with tracks */
-
-                       if (boost::dynamic_pointer_cast<Track>(*i) != 0) {
-                               continue;
-                       }
-               }
-
-               if ((*i) != route &&
-                   ((*i)->mix_group () == 0 ||
-                    (*i)->mix_group () != route->mix_group () ||
-                    !route->mix_group ()->is_active())) {
-
-                       if ((*i)->soloed()) {
+       if (route->soloed()) {
+               delta = 1;
+       } else {
+               delta = -1;
+       }
 
-                               /* if its already soloed, and solo latching is enabled,
-                                  then leave it as it is.
-                               */
+       /* now mod the solo level of all other routes except master & control outs
+          so that they will be silent if appropriate.
+       */
 
-                               if (Config->get_solo_latched()) {
-                                       continue;
-                               }
-                       }
+       solo_update_disabled = true;
+       for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
 
+               if ((*i)->feeds (route) && !(*i)->is_hidden() && !(*i)->is_master() && !(*i)->is_control()) {
                        /* do it */
-
-                       solo_update_disabled = true;
-                       (*i)->set_solo (false, src);
-                       solo_update_disabled = false;
+                       (*i)->mod_solo_level (delta);
                }
        }
 
-       bool something_soloed = false;
-       bool same_thing_soloed = false;
-       bool signal = false;
+       /* make sure master is never muted by solo */
 
-        for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-               if ((*i)->soloed()) {
-                       something_soloed = true;
-                       if (boost::dynamic_pointer_cast<Track>(*i)) {
-                               if (is_track) {
-                                       same_thing_soloed = true;
-                                       break;
-                               }
-                       } else {
-                               if (!is_track) {
-                                       same_thing_soloed = true;
-                                       break;
-                               }
-                       }
-                       break;
-               }
-       }
-
-       if (something_soloed != currently_soloing) {
-               signal = true;
-               currently_soloing = something_soloed;
+       if (_master_out && route != _master_out && _master_out->solo_level() == 0 && !_master_out->soloed()) {
+               _master_out->mod_solo_level (1);
        }
 
-       modify_solo_mute (is_track, same_thing_soloed);
+       /* ditto for control outs make sure master is never muted by solo */
 
-       if (signal) {
-               SoloActive (currently_soloing); /* EMIT SIGNAL */
+       if (_control_out && route != _control_out && _control_out && _control_out->solo_level() == 0) {
+               _control_out->mod_solo_level (1);
        }
 
+       solo_update_disabled = false;
+       update_route_solo_state (r);
        SoloChanged (); /* EMIT SIGNAL */
-
        set_dirty();
 }
 
 void
-Session::update_route_solo_state ()
+Session::update_route_solo_state (boost::shared_ptr<RouteList> r)
 {
-       bool mute = false;
-       bool is_track = false;
-       bool signal = false;
+       /* now figure out if anything that matters is soloed */
 
-       /* this is where we actually implement solo by changing
-          the solo mute setting of each track.
-       */
+       bool something_soloed = false;
 
-       shared_ptr<RouteList> r = routes.reader ();
+       if (!r) {
+               r = routes.reader();
+       }
 
        for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-               if ((*i)->soloed()) {
-                       mute = true;
-                       if (boost::dynamic_pointer_cast<Track>(*i)) {
-                               is_track = true;
-                       }
+               if (!(*i)->is_master() && !(*i)->is_control() && !(*i)->is_hidden() && (*i)->soloed()) {
+                       something_soloed = true;
                        break;
                }
        }
 
-       if (mute != currently_soloing) {
-               signal = true;
-               currently_soloing = mute;
-       }
-
-       if (!is_track && !mute) {
-
-               /* nothing is soloed */
-
-               for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-                       (*i)->set_solo_mute (false);
-               }
-
-               if (signal) {
-                       SoloActive (false);
-               }
-
-               return;
-       }
-
-       modify_solo_mute (is_track, mute);
-
-       if (signal) {
-               SoloActive (currently_soloing);
-       }
-}
-
-void
-Session::modify_solo_mute (bool is_track, bool mute)
-{
-       shared_ptr<RouteList> r = routes.reader ();
-
-        for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-
-               if (is_track) {
-
-                       /* only alter track solo mute */
-
-                       if (boost::dynamic_pointer_cast<Track>(*i)) {
-                               if ((*i)->soloed()) {
-                                       (*i)->set_solo_mute (!mute);
-                               } else {
-                                       (*i)->set_solo_mute (mute);
-                               }
-                       }
-
-               } else {
-
-                       /* only alter bus solo mute */
-
-                       if (!boost::dynamic_pointer_cast<Track>(*i)) {
-
-                               if ((*i)->soloed()) {
-
-                                       (*i)->set_solo_mute (false);
-
-                               } else {
-
-                                       /* don't mute master or control outs
-                                          in response to another bus solo
-                                       */
-
-                                       if ((*i) != _master_out &&
-                                           (*i) != _control_out) {
-                                               (*i)->set_solo_mute (mute);
-                                       }
-                               }
-                       }
-
-               }
+       if (something_soloed != _non_soloed_outs_muted) {
+               _non_soloed_outs_muted = something_soloed;
+               SoloActive (_non_soloed_outs_muted); /* EMIT SIGNAL */
        }
 }
 
-
-void
-Session::catch_up_on_solo ()
-{
-       /* this is called after set_state() to catch the full solo
-          state, which can't be correctly determined on a per-route
-          basis, but needs the global overview that only the session
-          has.
-       */
-       update_route_solo_state();
-}      
-
-void
-Session::catch_up_on_solo_mute_override ()
-{
-       if (Config->get_solo_model() != InverseMute) {
-               return;
-       }
-
-       /* this is called whenever the param solo-mute-override is
-          changed.
-       */
-       shared_ptr<RouteList> r = routes.reader ();
-
-       for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-               (*i)->catch_up_on_solo_mute_override ();
-       }
-}      
-
 shared_ptr<Route>
 Session::route_by_name (string name)
 {
@@ -2777,17 +2785,17 @@ void
 Session::update_region_name_map (boost::shared_ptr<Region> region)
 {
        string::size_type last_period = region->name().find_last_of ('.');
-       
+
        if (last_period != string::npos && last_period < region->name().length() - 1) {
-               
+
                string base = region->name().substr (0, last_period);
                string number = region->name().substr (last_period+1);
                map<string,uint32_t>::iterator x;
-               
+
                /* note that if there is no number, we get zero from atoi,
                   which is just fine
                */
-               
+
                region_name_map[base] = atoi (number);
        }
 }
@@ -2998,6 +3006,23 @@ Session::remove_source (boost::weak_ptr<Source> src)
        }
 }
 
+/** Return the number of playlists (not regions) that contain @a src */
+uint32_t
+Session::source_use_count (boost::shared_ptr<const Source> src) const
+{
+       uint32_t count = 0;
+       for (PlaylistList::const_iterator p = playlists.begin(); p != playlists.end(); ++p) {
+               for (Playlist::RegionList::const_iterator r = (*p)->region_list().begin();
+                               r != (*p)->region_list().end(); ++r) {
+                       if ((*r)->uses_source(src)) {
+                               ++count;
+                               break;
+                       }
+               }
+       }
+       return count;
+}
+
 boost::shared_ptr<Source>
 Session::source_by_id (const PBD::ID& id)
 {
@@ -3493,7 +3518,7 @@ Session::set_audition (boost::shared_ptr<Region> r)
 {
        pending_audition_region = r;
        post_transport_work = PostTransportWork (post_transport_work | PostTransportAudition);
-       schedule_butler_transport_work ();
+       _butler->schedule_transport_work ();
 }
 
 void
@@ -3600,6 +3625,20 @@ Session::set_all_solo (bool yn)
        set_dirty();
 }
 
+void
+Session::set_all_listen (bool yn)
+{
+       shared_ptr<RouteList> r = routes.reader ();
+
+       for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
+               if (!(*i)->is_hidden()) {
+                       (*i)->set_listen (yn, this);
+               }
+       }
+
+       set_dirty();
+}
+
 void
 Session::set_all_mute (bool yn)
 {
@@ -3690,23 +3729,7 @@ Session::record_enable_change_all (bool yn)
 void
 Session::add_processor (Processor* processor)
 {
-       Send* send;
-       PortInsert* port_insert;
-       PluginInsert* plugin_insert;
-
-       if ((port_insert = dynamic_cast<PortInsert *> (processor)) != 0) {
-               _port_inserts.insert (_port_inserts.begin(), port_insert);
-       } else if ((plugin_insert = dynamic_cast<PluginInsert *> (processor)) != 0) {
-               _plugin_inserts.insert (_plugin_inserts.begin(), plugin_insert);
-       } else if ((send = dynamic_cast<Send *> (processor)) != 0) {
-               _sends.insert (_sends.begin(), send);
-       } else {
-               fatal << _("programming error: unknown type of Insert created!") << endmsg;
-               /*NOTREACHED*/
-       }
-
        processor->GoingAway.connect (sigc::bind (mem_fun (*this, &Session::remove_processor), processor));
-
        set_dirty();
 }
 
@@ -3714,26 +3737,15 @@ void
 Session::remove_processor (Processor* processor)
 {
        Send* send;
+       Return* retrn;
        PortInsert* port_insert;
-       PluginInsert* plugin_insert;
 
        if ((port_insert = dynamic_cast<PortInsert *> (processor)) != 0) {
-               list<PortInsert*>::iterator x = find (_port_inserts.begin(), _port_inserts.end(), port_insert);
-               if (x != _port_inserts.end()) {
-                       insert_bitset[port_insert->bit_slot()] = false;
-                       _port_inserts.erase (x);
-               }
-       } else if ((plugin_insert = dynamic_cast<PluginInsert *> (processor)) != 0) {
-               _plugin_inserts.remove (plugin_insert);
+               insert_bitset[port_insert->bit_slot()] = false;
        } else if ((send = dynamic_cast<Send *> (processor)) != 0) {
-               list<Send*>::iterator x = find (_sends.begin(), _sends.end(), send);
-               if (x != _sends.end()) {
-                       send_bitset[send->bit_slot()] = false;
-                       _sends.erase (x);
-               }
-       } else {
-               fatal << _("programming error: unknown type of Insert deleted!") << endmsg;
-               /*NOTREACHED*/
+               send_bitset[send->bit_slot()] = false;
+       } else if ((retrn = dynamic_cast<Return *> (processor)) != 0) {
+               return_bitset[send->bit_slot()] = false;
        }
 
        set_dirty();
@@ -3744,7 +3756,7 @@ Session::available_capture_duration ()
 {
        float sample_bytes_on_disk = 4.0; // keep gcc happy
 
-       switch (Config->get_native_file_data_format()) {
+       switch (config.get_native_file_data_format()) {
        case FormatFloat:
                sample_bytes_on_disk = 4.0;
                break;
@@ -3815,7 +3827,7 @@ shared_ptr<Bundle>
 Session::bundle_by_name (string name) const
 {
        boost::shared_ptr<BundleList> b = _bundles.reader ();
-       
+
        for (BundleList::const_iterator i = b->begin(); i != b->end(); ++i) {
                if ((*i)->name() == name) {
                        return* i;
@@ -3826,7 +3838,7 @@ Session::bundle_by_name (string name) const
 }
 
 void
-Session::tempo_map_changed (Change ignored)
+Session::tempo_map_changed (Change)
 {
        clear_clicks ();
 
@@ -3847,22 +3859,28 @@ Session::tempo_map_changed (Change ignored)
 void
 Session::ensure_buffers (ChanCount howmany)
 {
-       if (current_block_size == 0)
+       if (current_block_size == 0) {
                return; // too early? (is this ok?)
+       }
 
-       // We need at least 2 MIDI scratch buffers to mix/merge
-       if (howmany.n_midi() < 2)
-               howmany.set_midi(2);
-
-       // FIXME: JACK needs to tell us maximum MIDI buffer size
-       // Using nasty assumption (max # events == nframes) for now
-       _scratch_buffers->ensure_buffers(howmany, current_block_size);
-       _mix_buffers->ensure_buffers(howmany, current_block_size);
-       _silent_buffers->ensure_buffers(howmany, current_block_size);
+       for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
+               size_t count = std::max(_scratch_buffers->available().get(*t), howmany.get(*t));
+               _scratch_buffers->ensure_buffers (*t, count, _engine.raw_buffer_size(*t));
+               _mix_buffers->ensure_buffers (*t, count, _engine.raw_buffer_size(*t));
+               _silent_buffers->ensure_buffers (*t, count, _engine.raw_buffer_size(*t));
+       }
 
        allocate_pan_automation_buffers (current_block_size, howmany.n_audio(), false);
 }
 
+void
+Session::ensure_buffer_set(BufferSet& buffers, const ChanCount& count)
+{
+       for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
+               buffers.ensure_buffers(*t, count.get(*t), _engine.raw_buffer_size(*t));
+       }
+}
+
 uint32_t
 Session::next_insert_id ()
 {
@@ -3903,6 +3921,26 @@ Session::next_send_id ()
        }
 }
 
+uint32_t
+Session::next_return_id ()
+{
+       /* this doesn't really loop forever. just think about it */
+
+       while (true) {
+               for (boost::dynamic_bitset<uint32_t>::size_type n = 0; n < return_bitset.size(); ++n) {
+                       if (!return_bitset[n]) {
+                               return_bitset[n] = true;
+                               return n;
+
+                       }
+               }
+
+               /* none available, so resize and try again */
+
+               return_bitset.resize (return_bitset.size() + 16, false);
+       }
+}
+
 void
 Session::mark_send_id (uint32_t id)
 {
@@ -3915,6 +3953,18 @@ Session::mark_send_id (uint32_t id)
        send_bitset[id] = true;
 }
 
+void
+Session::mark_return_id (uint32_t id)
+{
+       if (id >= return_bitset.size()) {
+               return_bitset.resize (id+16, false);
+       }
+       if (return_bitset[id]) {
+               warning << string_compose (_("return ID %1 appears to be in use already"), id) << endmsg;
+       }
+       return_bitset[id] = true;
+}
+
 void
 Session::mark_insert_id (uint32_t id)
 {
@@ -4005,6 +4055,20 @@ Session::route_name_unique (string n) const
        return true;
 }
 
+bool
+Session::route_name_internal (string n) const
+{
+       if (auditioner && auditioner->name() == n) {
+               return true;
+       }
+
+       if (_click_io && _click_io->name() == n) {
+               return true;
+       }
+
+       return false;
+}
+
 uint32_t
 Session::n_playlists () const
 {
@@ -4058,8 +4122,8 @@ Session::freeze (InterThreadInfo& itt)
 }
 
 boost::shared_ptr<Region>
-Session::write_one_track (AudioTrack& track, nframes_t start, nframes_t end,   
-                         bool overwrite, vector<boost::shared_ptr<Source> >& srcs, 
+Session::write_one_track (AudioTrack& track, nframes_t start, nframes_t end,
+                         bool /*overwrite*/, vector<boost::shared_ptr<Source> >& srcs,
                          InterThreadInfo& itt, bool enable_processing)
 {
        boost::shared_ptr<Region> result;
@@ -4085,7 +4149,9 @@ Session::write_one_track (AudioTrack& track, nframes_t start, nframes_t end,
        // any bigger than this seems to cause stack overflows in called functions
        const nframes_t chunk_size = (128 * 1024)/4;
 
-       g_atomic_int_set (&processing_prohibited, 1);
+       // block all process callback handling
+
+       block_processing ();
 
        /* call tree *MUST* hold route_lock */
 
@@ -4132,7 +4198,7 @@ Session::write_one_track (AudioTrack& track, nframes_t start, nframes_t end,
        to_do = len;
 
        /* create a set of reasonably-sized buffers */
-       buffers.ensure_buffers(nchans, chunk_size);
+       buffers.ensure_buffers(DataType::AUDIO, nchans.n_audio(), chunk_size);
        buffers.set_count(nchans);
 
        for (vector<boost::shared_ptr<Source> >::iterator src=srcs.begin(); src != srcs.end(); ++src) {
@@ -4186,7 +4252,7 @@ Session::write_one_track (AudioTrack& track, nframes_t start, nframes_t end,
                /* construct a region to represent the bounced material */
 
                result = RegionFactory::create (srcs, 0,
-                               srcs.front()->length(srcs.front()->timeline_position()), 
+                               srcs.front()->length(srcs.front()->timeline_position()),
                                region_name_from_path (srcs.front()->name(), true));
        }
 
@@ -4198,7 +4264,7 @@ Session::write_one_track (AudioTrack& track, nframes_t start, nframes_t end,
                        if (afs) {
                                afs->mark_for_remove ();
                        }
-                       
+
                        (*src)->drop_references ();
                }
 
@@ -4211,7 +4277,7 @@ Session::write_one_track (AudioTrack& track, nframes_t start, nframes_t end,
                }
        }
 
-       g_atomic_int_set (&processing_prohibited, 0);
+       unblock_processing ();
 
        return result;
 }
@@ -4295,7 +4361,7 @@ Session::compute_initial_length ()
 }
 
 void
-Session::sync_order_keys (const char* base)
+Session::sync_order_keys (std::string const & base)
 {
        if (!Config->get_sync_all_route_ordering()) {
                /* leave order keys as they are */
@@ -4312,3 +4378,68 @@ Session::sync_order_keys (const char* base)
 }
 
 
+/** @return true if there is at least one record-enabled diskstream, otherwise false */
+bool
+Session::have_rec_enabled_diskstream () const
+{
+       return g_atomic_int_get (&_have_rec_enabled_diskstream) == 1;
+}
+
+/** Update the state of our rec-enabled diskstreams flag */
+void
+Session::update_have_rec_enabled_diskstream ()
+{
+       boost::shared_ptr<DiskstreamList> dsl = diskstreams.reader ();
+       DiskstreamList::iterator i = dsl->begin ();
+       while (i != dsl->end () && (*i)->record_enabled () == false) {
+               ++i;
+       }
+
+       int const old = g_atomic_int_get (&_have_rec_enabled_diskstream);
+
+       g_atomic_int_set (&_have_rec_enabled_diskstream, i != dsl->end () ? 1 : 0);
+
+       if (g_atomic_int_get (&_have_rec_enabled_diskstream) != old) {
+               RecordStateChanged (); /* EMIT SIGNAL */
+       }
+}
+
+void
+Session::listen_position_changed ()
+{
+       Placement p;
+
+       switch (Config->get_listen_position()) {
+       case AfterFaderListen:
+               p = PostFader;
+               break;
+
+       case PreFaderListen:
+               p = PreFader;
+               break;
+       }
+
+       boost::shared_ptr<RouteList> r = routes.reader ();
+
+       for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
+               (*i)->put_control_outs_at (p);
+       }
+}
+
+void
+Session::solo_control_mode_changed ()
+{
+       /* cancel all solo or all listen when solo control mode changes */
+
+       if (Config->get_solo_control_is_listen_control()) {
+               set_all_solo (false);
+       } else {
+               set_all_listen (false);
+       }
+}
+
+void
+Session::route_group_changed ()
+{
+       RouteGroupChanged (); /* EMIT SIGNAL */
+}