Re-enable creation of stereo bundles for system IO, so that the mixer strip
[ardour.git] / libs / ardour / session.cc
index 71653a6896fc598827d958fb26b12c02b833f369..ed5ff668aad41d122f9584ac59f258d38b38e13f 100644 (file)
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 1999-2004 Paul Davis 
+    Copyright (C) 1999-2004 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -33,6 +33,7 @@
 
 #include <glibmm/thread.h>
 #include <glibmm/miscutils.h>
+#include <glibmm/fileutils.h>
 
 #include <pbd/error.h>
 #include <glibmm/thread.h>
 #include <pbd/stl_delete.h>
 #include <pbd/basename.h>
 #include <pbd/stacktrace.h>
+#include <pbd/file_utils.h>
 
-#include <ardour/audioengine.h>
-#include <ardour/configuration.h>
-#include <ardour/session.h>
-#include <ardour/session_directory.h>
-#include <ardour/utils.h>
+#include <ardour/analyser.h>
+#include <ardour/audio_buffer.h>
 #include <ardour/audio_diskstream.h>
+#include <ardour/audio_track.h>
+#include <ardour/audioengine.h>
+#include <ardour/audiofilesource.h>
 #include <ardour/audioplaylist.h>
 #include <ardour/audioregion.h>
-#include <ardour/audiofilesource.h>
+#include <ardour/auditioner.h>
+#include <ardour/buffer_set.h>
+#include <ardour/bundle.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/midi_region.h>
-#include <ardour/smf_source.h>
-#include <ardour/auditioner.h>
-#include <ardour/recent_sessions.h>
-#include <ardour/redirect.h>
-#include <ardour/send.h>
-#include <ardour/insert.h>
-#include <ardour/bundle.h>
-#include <ardour/slave.h>
-#include <ardour/tempo.h>
-#include <ardour/audio_track.h>
 #include <ardour/midi_track.h>
-#include <ardour/cycle_timer.h>
 #include <ardour/named_selection.h>
-#include <ardour/crossfade.h>
 #include <ardour/playlist.h>
-#include <ardour/click.h>
-#include <ardour/data_type.h>
-#include <ardour/buffer_set.h>
-#include <ardour/source_factory.h>
+#include <ardour/plugin_insert.h>
+#include <ardour/port_insert.h>
+#include <ardour/processor.h>
+#include <ardour/recent_sessions.h>
 #include <ardour/region_factory.h>
-#include <ardour/filename_extensions.h>
+#include <ardour/route_group.h>
+#include <ardour/send.h>
+#include <ardour/session.h>
 #include <ardour/session_directory.h>
-
-#ifdef HAVE_LIBLO
-#include <ardour/osc.h>
-#endif
+#include <ardour/session_directory.h>
+#include <ardour/session_metadata.h>
+#include <ardour/slave.h>
+#include <ardour/smf_source.h>
+#include <ardour/source_factory.h>
+#include <ardour/tape_file_matcher.h>
+#include <ardour/tempo.h>
+#include <ardour/utils.h>
 
 #include "i18n.h"
 
@@ -93,97 +99,86 @@ static const int CPU_CACHE_ALIGN = 64;
 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;
 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::StartTimeChanged;
 sigc::signal<void> Session::EndTimeChanged;
+sigc::signal<void> Session::AutoBindingOn;
+sigc::signal<void> Session::AutoBindingOff;
+sigc::signal<void, std::string, std::string> Session::Exported;
 
 Session::Session (AudioEngine &eng,
-                 string fullpath,
-                 string snapshot_name,
-                 string* mix_template)
+                 const string& fullpath,
+                 const string& snapshot_name,
+                 string mix_template)
 
        : _engine (eng),
+         _requested_return_frame (-1),
          _scratch_buffers(new BufferSet()),
          _silent_buffers(new BufferSet()),
-         _send_buffers(new BufferSet()),
+         _mix_buffers(new BufferSet()),
+         mmc (0),
          _mmc_port (default_mmc_port),
          _mtc_port (default_mtc_port),
          _midi_port (default_midi_port),
+         _midi_clock_port (default_midi_clock_port),
          _session_dir (new SessionDirectory(fullpath)),
          pending_events (2048),
-         //midi_requests (128), // the size of this should match the midi request pool size
+         state_tree (0),
+         butler_mixdown_buffer (0),
+         butler_gain_buffer (0),
+         post_transport_work((PostTransportWork)0),
          _send_smpte_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),
          _click_io ((IO*) 0),
-         main_outs (0)
+         click_data (0),
+         click_emphasis_data (0),
+         main_outs (0),
+         _metadata (new SessionMetadata())
+
 {
+       bool new_session;
+
        if (!eng.connected()) {
                throw failed_constructor();
        }
 
-       n_physical_outputs = _engine.n_physical_outputs();
-       n_physical_inputs =  _engine.n_physical_inputs();
-
-       first_stage_init (fullpath, snapshot_name);
+       cerr << "Loading session " << fullpath << " using snapshot " << snapshot_name << " (1)" << endl;
 
-       initialize_start_and_end_locations(0, compute_initial_length ());
+       n_physical_outputs = _engine.n_physical_outputs(DataType::AUDIO);
+       n_physical_inputs =  _engine.n_physical_inputs(DataType::AUDIO);
 
-       if(mix_template) {
-               // try and create a new session directory
-               try
-               {
-                       if(!_session_dir->create()) {
-                               // an existing session.
-                               // throw a_more_meaningful_exception()
-                               destroy ();
-                               throw failed_constructor ();
-                       }
-               }
-               catch(sys::filesystem_error& ex)
-               {
-                       destroy ();
-                       throw failed_constructor ();
-               }
+       first_stage_init (fullpath, snapshot_name);
 
-               if(!create_session_file_from_template (*mix_template)) {
-                       destroy ();
-                       throw failed_constructor ();
-               }
+       new_session = !Glib::file_test (_path, Glib::FileTest (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR));
 
-               cerr << "Creating session " << fullpath
-                       <<" using template" << *mix_template
-                       << endl;
-       } else {
-               // must be an existing session
-               try
-               {
-                       // ensure the necessary session subdirectories exist
-                       // in case the directory structure has changed etc.
-                       _session_dir->create();
-               }
-               catch(sys::filesystem_error& ex)
-               {
+       if (new_session) {
+               if (create (new_session, mix_template, compute_initial_length())) {
                        destroy ();
                        throw failed_constructor ();
                }
-
-               cerr << "Loading session " << fullpath
-                       << " using snapshot " << snapshot_name << " (1)"
-                       << endl;
        }
 
-       if (second_stage_init (false)) {
+       if (second_stage_init (new_session)) {
                destroy ();
                throw failed_constructor ();
        }
-       
+
        store_recent_sessions(_name, _path);
-       
+
        bool was_dirty = dirty();
 
        _state_of_the_state = StateOfTheState (_state_of_the_state & ~Dirty);
@@ -207,29 +202,46 @@ Session::Session (AudioEngine &eng,
                  nframes_t initial_length)
 
        : _engine (eng),
+         _requested_return_frame (-1),
          _scratch_buffers(new BufferSet()),
          _silent_buffers(new BufferSet()),
-         _send_buffers(new BufferSet()),
+         _mix_buffers(new BufferSet()),
+         mmc (0),
          _mmc_port (default_mmc_port),
          _mtc_port (default_mtc_port),
          _midi_port (default_midi_port),
+         _midi_clock_port (default_midi_clock_port),
          _session_dir ( new SessionDirectory(fullpath)),
          pending_events (2048),
-         //midi_requests (16),
+         state_tree (0),
+         butler_mixdown_buffer (0),
+         butler_gain_buffer (0),
+         post_transport_work((PostTransportWork)0),
          _send_smpte_update (false),
+         midi_thread (pthread_t (0)),
+         midi_requests (16),
          diskstreams (new DiskstreamList),
          routes (new RouteList),
-         main_outs (0)
-
+         auditioner ((Auditioner *) 0),
+         _total_free_4k_blocks (0),
+         _bundles (new BundleList),
+         _bundle_xml_node (0),
+         _click_io ((IO *) 0),
+         click_data (0),
+         click_emphasis_data (0),
+         main_outs (0),
+         _metadata (new SessionMetadata())
 {
+       bool new_session;
+
        if (!eng.connected()) {
                throw failed_constructor();
        }
 
        cerr << "Loading session " << fullpath << " using snapshot " << snapshot_name << " (2)" << endl;
 
-       n_physical_outputs = _engine.n_physical_outputs();
-       n_physical_inputs = _engine.n_physical_inputs();
+       n_physical_outputs = _engine.n_physical_outputs (DataType::AUDIO);
+       n_physical_inputs = _engine.n_physical_inputs (DataType::AUDIO);
 
        if (n_physical_inputs) {
                n_physical_inputs = max (requested_physical_in, n_physical_inputs);
@@ -241,61 +253,57 @@ Session::Session (AudioEngine &eng,
 
        first_stage_init (fullpath, snapshot_name);
 
-       initialize_start_and_end_locations(0, initial_length);
-       
-       if (!_session_dir->create () || !create_session_file ())        {
-               destroy ();
-               throw failed_constructor ();
+       new_session = !g_file_test (_path.c_str(), GFileTest (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR));
+
+       if (new_session) {
+               if (create (new_session, string(), initial_length)) {
+                       destroy ();
+                       throw failed_constructor ();
+               }
        }
 
        {
                /* set up Master Out and Control Out if necessary */
-               
+
                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));
                        r->set_remote_control_id (control_id);
-                        
+
                        rl.push_back (r);
                } else {
                        /* prohibit auto-connect to master, because there isn't one */
                        output_ac = AutoConnectOption (output_ac & ~AutoConnectMaster);
                }
-               
+
                if (!rl.empty()) {
-                       add_routes (rl);
+                       add_routes (rl, false);
                }
-               
+
        }
 
        Config->set_input_auto_connect (input_ac);
        Config->set_output_auto_connect (output_ac);
 
-       if (second_stage_init (true)) {
+       if (second_stage_init (new_session)) {
                destroy ();
                throw failed_constructor ();
        }
-       
-       store_recent_sessions(_name, _path);
-       
-       bool was_dirty = dirty ();
+
+       store_recent_sessions (_name, _path);
 
        _state_of_the_state = StateOfTheState (_state_of_the_state & ~Dirty);
 
        Config->ParameterChanged.connect (mem_fun (*this, &Session::config_changed));
-
-       if (was_dirty) {
-               DirtyChanged (); /* EMIT SIGNAL */
-       }
 }
 
 Session::~Session ()
@@ -313,10 +321,11 @@ Session::destroy ()
        remove_pending_capture_state ();
 
        _state_of_the_state = StateOfTheState (CannotSave|Deletion);
+
        _engine.remove_session ();
 
        GoingAway (); /* EMIT SIGNAL */
-       
+
        /* do this */
 
        notify_callbacks ();
@@ -326,19 +335,17 @@ Session::destroy ()
        _history.clear ();
 
        /* clear state tree so that no references to objects are held any more */
-       
-       if (state_tree) {
-               delete state_tree;
-       }
+
+       delete state_tree;
 
        terminate_butler_thread ();
        //terminate_midi_thread ();
-       
-       if (click_data && click_data != default_click) {
+
+       if (click_data != default_click) {
                delete [] click_data;
        }
 
-       if (click_emphasis_data && click_emphasis_data != default_click_emphasis) {
+       if (click_emphasis_data != default_click_emphasis) {
                delete [] click_emphasis_data;
        }
 
@@ -346,10 +353,12 @@ Session::destroy ()
 
        delete _scratch_buffers;
        delete _silent_buffers;
-       delete _send_buffers;
+       delete _mix_buffers;
 
        AudioDiskstream::free_working_buffers();
-       
+
+       Route::SyncOrderKeys.clear();
+
 #undef TRACK_DESTRUCTION
 #ifdef TRACK_DESTRUCTION
        cerr << "delete named selections\n";
@@ -374,10 +383,10 @@ Session::destroy ()
                ++tmp;
 
                (*i)->drop_references ();
-               
+
                i = tmp;
        }
-       
+
        for (PlaylistList::iterator i = unused_playlists.begin(); i != unused_playlists.end(); ) {
                PlaylistList::iterator tmp;
 
@@ -385,17 +394,17 @@ Session::destroy ()
                ++tmp;
 
                (*i)->drop_references ();
-               
+
                i = tmp;
        }
-       
+
        playlists.clear ();
        unused_playlists.clear ();
 
 #ifdef TRACK_DESTRUCTION
        cerr << "delete regions\n";
 #endif /* TRACK_DESTRUCTION */
-       
+
        for (RegionList::iterator i = regions.begin(); i != regions.end(); ) {
                RegionList::iterator tmp;
 
@@ -412,7 +421,7 @@ Session::destroy ()
 #ifdef TRACK_DESTRUCTION
        cerr << "delete routes\n";
 #endif /* TRACK_DESTRUCTION */
-        {
+       {
                RCUWriter<RouteList> writer (routes);
                boost::shared_ptr<RouteList> r = writer.get_copy ();
                for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
@@ -450,7 +459,6 @@ Session::destroy ()
 
                i = tmp;
        }
-
        sources.clear ();
 
 #ifdef TRACK_DESTRUCTION
@@ -472,20 +480,6 @@ Session::destroy ()
 #endif /* TRACK_DESTRUCTION */
        for (list<RouteGroup *>::iterator i = edit_groups.begin(); i != edit_groups.end(); ) {
                list<RouteGroup*>::iterator tmp;
-               
-               tmp = i;
-               ++tmp;
-
-               delete *i;
-
-               i = tmp;
-       }
-       
-#ifdef TRACK_DESTRUCTION
-       cerr << "delete bundles\n";
-#endif /* TRACK_DESTRUCTION */
-       for (BundleList::iterator i = _bundles.begin(); i != _bundles.end(); ) {
-               BundleList::iterator tmp;
 
                tmp = i;
                ++tmp;
@@ -495,19 +489,12 @@ Session::destroy ()
                i = tmp;
        }
 
-       if (butler_mixdown_buffer) {
-               delete [] butler_mixdown_buffer;
-       }
-
-       if (butler_gain_buffer) {
-               delete [] butler_gain_buffer;
-       }
+       delete [] butler_mixdown_buffer;
+       delete [] butler_gain_buffer;
 
        Crossfade::set_buffer_size (0);
 
-       if (mmc) {
-               delete mmc;
-       }
+       delete mmc;
 }
 
 void
@@ -521,7 +508,7 @@ 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());
@@ -535,9 +522,13 @@ Session::when_engine_running ()
 
        /* we don't want to run execute this again */
 
+       BootMessage (_("Set block size and sample rate"));
+
        set_block_size (_engine.frames_per_cycle());
        set_frame_rate (_engine.frame_rate());
 
+       BootMessage (_("Using configuration"));
+
        Config->map_parameters (mem_fun (*this, &Session::config_changed));
 
        /* every time we reconnect, recompute worst case output latencies */
@@ -556,15 +547,15 @@ Session::when_engine_running ()
 
        try {
                XMLNode* child = 0;
-               
+
                _click_io.reset (new ClickIO (*this, "click", 0, 0, -1, -1));
 
                if (state_tree && (child = find_named_node (*state_tree->root(), "Click")) != 0) {
 
                        /* existing state for Click */
-                       
+
                        if (_click_io->set_state (*child->children().front()) == 0) {
-                               
+
                                _clicking = Config->get_clicking ();
 
                        } else {
@@ -574,7 +565,7 @@ Session::when_engine_running ()
                        }
 
                } else {
-                       
+
                        /* default state for Click */
 
                        first_physical_output = _engine.get_nth_physical_output (DataType::AUDIO, 0);
@@ -593,89 +584,95 @@ Session::when_engine_running ()
                error << _("cannot setup Click I/O") << endmsg;
        }
 
+       BootMessage (_("Compute I/O Latencies"));
+
        set_worst_io_latencies ();
 
        if (_clicking) {
                // XXX HOW TO ALERT UI TO THIS ? DO WE NEED TO?
        }
 
-       /* Create a set of Bundle objects that map
-          to the physical outputs currently available
-       */
+       BootMessage (_("Set up standard connections"));
 
-       /* ONE: MONO */
+       /* Create a set of Bundle objects that map
+          to the physical I/O currently available.  We create both
+          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 */
 
        for (uint32_t np = 0; np < n_physical_outputs; ++np) {
                char buf[32];
                snprintf (buf, sizeof (buf), _("out %" PRIu32), np+1);
 
-               Bundle* c = new OutputBundle (buf, true);
-               c->set_nchannels (1);
-               c->add_port_to_channel (0, _engine.get_nth_physical_output (DataType::AUDIO, np));
+               shared_ptr<Bundle> c (new Bundle (buf, true));
+               c->add_channel (_("mono"));
+               c->set_port (0, _engine.get_nth_physical_output (DataType::AUDIO, np));
 
-               add_bundle (c);
+               add_bundle (c);
        }
 
-       for (uint32_t np = 0; np < n_physical_inputs; ++np) {
-               char buf[32];
-               snprintf (buf, sizeof (buf), _("in %" PRIu32), np+1);
-
-               Bundle* c = new InputBundle (buf, true);
-               c->set_nchannels (1);
-               c->add_port_to_channel (0, _engine.get_nth_physical_input (DataType::AUDIO, np));
+       for (uint32_t np = 0; np < n_physical_outputs; np += 2) {
+               if (np + 1 < n_physical_outputs) {
+                       char buf[32];
+                       snprintf (buf, sizeof(buf), _("out %" PRIu32 "+%" PRIu32), np + 1, np + 2);
+                       shared_ptr<Bundle> c (new Bundle (buf, true));
+                       c->add_channel (_("L"));
+                       c->set_port (0, _engine.get_nth_physical_output (DataType::AUDIO, np));
+                       c->add_channel (_("R"));
+                       c->set_port (1, _engine.get_nth_physical_output (DataType::AUDIO, np + 1));
 
-               add_bundle (c);
+                       add_bundle (c);
+               }
        }
 
-       /* TWO: STEREO */
-
-       for (uint32_t np = 0; np < n_physical_outputs; np +=2) {
+       for (uint32_t np = 0; np < n_physical_inputs; ++np) {
                char buf[32];
-               snprintf (buf, sizeof (buf), _("out %" PRIu32 "+%" PRIu32), np+1, np+2);
+               snprintf (buf, sizeof (buf), _("in %" PRIu32), np+1);
 
-               Bundle* c = new OutputBundle (buf, true);
-               c->set_nchannels (2);
-               c->add_port_to_channel (0, _engine.get_nth_physical_output (DataType::AUDIO, np));
-               c->add_port_to_channel (1, _engine.get_nth_physical_output (DataType::AUDIO, np+1));
+               shared_ptr<Bundle> c (new Bundle (buf, false));
+               c->add_channel (_("mono"));
+               c->set_port (0, _engine.get_nth_physical_input (DataType::AUDIO, np));
 
-               add_bundle (c);
+               add_bundle (c);
        }
 
-       for (uint32_t np = 0; np < n_physical_inputs; np +=2) {
-               char buf[32];
-               snprintf (buf, sizeof (buf), _("in %" PRIu32 "+%" PRIu32), np+1, np+2);
+       for (uint32_t np = 0; np < n_physical_inputs; np += 2) {
+               if (np + 1 < n_physical_inputs) {
+                       char buf[32];
+                       snprintf (buf, sizeof(buf), _("in %" PRIu32 "+%" PRIu32), np + 1, np + 2);
 
-               Bundle* c = new InputBundle (buf, true);
-               c->set_nchannels (2);
-               c->add_port_to_channel (0, _engine.get_nth_physical_input (DataType::AUDIO, np));
-               c->add_port_to_channel (1, _engine.get_nth_physical_input (DataType::AUDIO, np+1));
+                       shared_ptr<Bundle> c (new Bundle (buf, false));
+                       c->add_channel (_("L"));
+                       c->set_port (0, _engine.get_nth_physical_input (DataType::AUDIO, np));
+                       c->add_channel (_("R"));
+                       c->set_port (1, _engine.get_nth_physical_input (DataType::AUDIO, np + 1));
 
-               add_bundle (c);
+                       add_bundle (c);
+               }
        }
 
-       /* THREE MASTER */
-
        if (_master_out) {
 
                /* create master/control ports */
-               
+
                if (_master_out) {
                        uint32_t n;
 
                        /* force the master to ignore any later call to this */
-                       
+
                        if (_master_out->pending_state_node) {
                                _master_out->ports_became_legal();
                        }
 
                        /* no panner resets till we are through */
-                       
+
                        _master_out->defer_pan_reset ();
-                       
+
                        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") 
+                                       error << _("cannot setup master inputs")
                                              << endmsg;
                                        break;
                                }
@@ -692,24 +689,20 @@ Session::when_engine_running ()
                        }
 
                        _master_out->allow_pan_reset ();
-                       
-               }
 
-               Bundle* c = new OutputBundle (_("Master Out"), true);
-
-               c->set_nchannels (_master_out->n_inputs().n_total());
-               for (uint32_t n = 0; n < _master_out->n_inputs ().n_total(); ++n) {
-                       c->add_port_to_channel ((int) n, _master_out->input(n)->name());
                }
-               add_bundle (c);
-       } 
+       }
+
+       BootMessage (_("Setup signal flow and plugins"));
 
        hookup_io ();
 
        /* catch up on send+insert cnts */
 
+       BootMessage (_("Catch up with send/insert state"));
+
        insert_cnt = 0;
-       
+
        for (list<PortInsert*>::iterator i = _port_inserts.begin(); i != _port_inserts.end(); ++i) {
                uint32_t id;
 
@@ -724,7 +717,7 @@ Session::when_engine_running ()
 
        for (list<Send*>::iterator i = _sends.begin(); i != _sends.end(); ++i) {
                uint32_t id;
-               
+
                if (sscanf ((*i)->name().c_str(), "%*s %u", &id) == 1) {
                        if (id > send_cnt) {
                                send_cnt = id;
@@ -732,22 +725,14 @@ Session::when_engine_running ()
                }
        }
 
-       
+
        _state_of_the_state = StateOfTheState (_state_of_the_state & ~(CannotSave|Dirty));
 
        /* hook us up to the engine */
 
-       _engine.set_session (this);
-
-#ifdef HAVE_LIBLO
-       /* and to OSC */
+       BootMessage (_("Connect to engine"));
 
-       osc->set_session (*this);
-#endif
-
-       _state_of_the_state = Clean;
-
-       DirtyChanged (); /* EMIT SIGNAL */
+       _engine.set_session (this);
 }
 
 void
@@ -759,17 +744,18 @@ Session::hookup_io ()
 
        _state_of_the_state = StateOfTheState (_state_of_the_state | InitialConnecting);
 
+
        if (auditioner == 0) {
-               
+
                /* we delay creating the auditioner till now because
                   it makes its own connections to ports.
                   the engine has to be running for this to work.
                */
-               
+
                try {
                        auditioner.reset (new Auditioner (*this));
                }
-               
+
                catch (failed_constructor& err) {
                        warning << _("cannot create Auditioner: no auditioning of regions possible") << endmsg;
                }
@@ -807,12 +793,18 @@ Session::hookup_io ()
                        cports.push_back (_control_out->input(n)->name());
                }
 
-               boost::shared_ptr<RouteList> r = routes.reader ();              
+               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);
+               delete _bundle_xml_node;
+       }
 
        /* Tell all IO objects to connect themselves together */
 
@@ -828,6 +820,7 @@ 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.
        */
@@ -842,10 +835,10 @@ Session::hookup_io ()
 void
 Session::playlist_length_changed ()
 {
-       /* we can't just increase end_location->end() if pl->get_maximum_extent() 
+       /* we can't just increase end_location->end() if pl->get_maximum_extent()
           if larger. if the playlist used to be the longest playlist,
           and its now shorter, we have to decrease end_location->end(). hence,
-          we have to iterate over all diskstreams and check the 
+          we have to iterate over all diskstreams and check the
           playlists currently in use.
        */
        find_current_end ();
@@ -859,7 +852,7 @@ Session::diskstream_playlist_changed (boost::shared_ptr<Diskstream> dstream)
        if ((playlist = dstream->playlist()) != 0) {
                playlist->LengthChanged.connect (mem_fun (this, &Session::playlist_length_changed));
        }
-       
+
        /* see comment in playlist_length_changed () */
        find_current_end ();
 }
@@ -912,7 +905,7 @@ Session::auto_punch_start_changed (Location* location)
                /* capture start has been changed, so save new pending state */
                save_state ("", true);
        }
-}      
+}
 
 void
 Session::auto_punch_end_changed (Location* location)
@@ -920,7 +913,7 @@ Session::auto_punch_end_changed (Location* location)
        nframes_t when_to_stop = location->end();
        // when_to_stop += _worst_output_latency + _worst_input_latency;
        replace_event (Event::PunchOut, when_to_stop);
-}      
+}
 
 void
 Session::auto_punch_changed (Location* location)
@@ -930,7 +923,7 @@ Session::auto_punch_changed (Location* location)
        replace_event (Event::PunchIn, location->start());
        //when_to_stop += _worst_output_latency + _worst_input_latency;
        replace_event (Event::PunchOut, when_to_stop);
-}      
+}
 
 void
 Session::auto_loop_changed (Location* location)
@@ -944,12 +937,12 @@ Session::auto_loop_changed (Location* location)
                if (_transport_frame > location->end()) {
                        // relocate to beginning of loop
                        clear_events (Event::LocateRoll);
-                       
+
                        request_locate (location->start(), true);
 
                }
                else if (Config->get_seamless_loop() && !loop_changing) {
-                       
+
                        // schedule a locate-roll to refill the diskstreams at the
                        // previous loop end
                        loop_changing = true;
@@ -961,10 +954,9 @@ Session::auto_loop_changed (Location* location)
                        }
 
                }
-       }       
+       }
 
        last_loopend = location->end();
-       
 }
 
 void
@@ -987,7 +979,7 @@ Session::set_auto_punch_location (Location* location)
        if (location == 0) {
                return;
        }
-       
+
        if (location->end() <= location->start()) {
                error << _("Session: you can't use that location for auto punch (start <= end)") << endmsg;
                return;
@@ -996,12 +988,16 @@ Session::set_auto_punch_location (Location* location)
        auto_punch_start_changed_connection.disconnect();
        auto_punch_end_changed_connection.disconnect();
        auto_punch_changed_connection.disconnect();
-               
+
        auto_punch_start_changed_connection = location->start_changed.connect (mem_fun (this, &Session::auto_punch_start_changed));
        auto_punch_end_changed_connection = location->end_changed.connect (mem_fun (this, &Session::auto_punch_end_changed));
        auto_punch_changed_connection = location->changed.connect (mem_fun (this, &Session::auto_punch_changed));
 
        location->set_auto_punch (true, this);
+
+
+       auto_punch_changed (location);
+
        auto_punch_location_changed (location);
 }
 
@@ -1018,7 +1014,7 @@ Session::set_auto_loop_location (Location* location)
                remove_event (existing->end(), Event::AutoLoop);
                auto_loop_location_changed (0);
        }
-       
+
        set_dirty();
 
        if (location == 0) {
@@ -1031,16 +1027,23 @@ Session::set_auto_loop_location (Location* location)
        }
 
        last_loopend = location->end();
-       
+
        auto_loop_start_changed_connection.disconnect();
        auto_loop_end_changed_connection.disconnect();
        auto_loop_changed_connection.disconnect();
-       
+
        auto_loop_start_changed_connection = location->start_changed.connect (mem_fun (this, &Session::auto_loop_changed));
        auto_loop_end_changed_connection = location->end_changed.connect (mem_fun (this, &Session::auto_loop_changed));
        auto_loop_changed_connection = location->changed.connect (mem_fun (this, &Session::auto_loop_changed));
 
        location->set_auto_loop (true, this);
+
+       /* take care of our stuff first */
+
+       auto_loop_changed (location);
+
+       /* now tell everyone else */
+
        auto_loop_location_changed (location);
 }
 
@@ -1076,7 +1079,13 @@ Session::handle_locations_changed (Locations::LocationList& locations)
                        set_auto_loop_location (location);
                        set_loop = true;
                }
-               
+
+               if (location->is_start()) {
+                       start_location = location;
+               }
+               if (location->is_end()) {
+                       end_location = location;
+               }
        }
 
        if (!set_loop) {
@@ -1087,7 +1096,7 @@ Session::handle_locations_changed (Locations::LocationList& locations)
        }
 
        set_dirty();
-}                                                   
+}
 
 void
 Session::enable_record ()
@@ -1102,7 +1111,7 @@ Session::enable_record ()
                        boost::shared_ptr<DiskstreamList> dsl = diskstreams.reader();
                        for (DiskstreamList::iterator i = dsl->begin(); i != dsl->end(); ++i) {
                                if ((*i)->record_enabled ()) {
-                                       (*i)->monitor_input (true);   
+                                       (*i)->monitor_input (true);
                                }
                        }
                }
@@ -1118,7 +1127,7 @@ Session::disable_record (bool rt_context, bool force)
 
        if ((rs = (RecordState) g_atomic_int_get (&_record_status)) != Disabled) {
 
-               if (!Config->get_latched_record_enable () || force) {
+               if ((!Config->get_latched_record_enable () && !play_loop) || force) {
                        g_atomic_int_set (&_record_status, Disabled);
                } else {
                        if (rs == Recording) {
@@ -1134,14 +1143,14 @@ Session::disable_record (bool rt_context, bool force)
 
                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 ()) {
-                                       (*i)->monitor_input (false);   
+                                       (*i)->monitor_input (false);
                                }
                        }
                }
-               
+
                RecordStateChanged (); /* emit signal */
 
                if (!rt_context) {
@@ -1153,15 +1162,18 @@ Session::disable_record (bool rt_context, bool force)
 void
 Session::step_back_from_record ()
 {
-       g_atomic_int_set (&_record_status, Enabled);
+       /* XXX really atomic compare+swap here */
+       if (g_atomic_int_get (&_record_status) == Recording) {
+               g_atomic_int_set (&_record_status, Enabled);
 
-       if (Config->get_monitoring_model() == HardwareMonitoring) {
-               boost::shared_ptr<DiskstreamList> dsl = diskstreams.reader();
-               
-               for (DiskstreamList::iterator i = dsl->begin(); i != dsl->end(); ++i) {
-                       if (Config->get_auto_input() && (*i)->record_enabled ()) {
-                               //cerr << "switching from input" << __FILE__ << __LINE__ << endl << endl;
-                               (*i)->monitor_input (false);   
+               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 ()) {
+                                       //cerr << "switching from input" << __FILE__ << __LINE__ << endl << endl;
+                                       (*i)->monitor_input (false);
+                               }
                        }
                }
        }
@@ -1181,7 +1193,7 @@ Session::maybe_enable_record ()
        if (_transport_speed) {
                if (!Config->get_punch_in()) {
                        enable_record ();
-               } 
+               }
        } else {
                deliver_mmc (MIDI::MachineControl::cmdRecordPause, _transport_frame);
                RecordStateChanged (); /* EMIT SIGNAL */
@@ -1197,8 +1209,12 @@ Session::audible_frame () const
        nframes_t offset;
        nframes_t tf;
 
+       if (_transport_speed == 0.0f && non_realtime_work_pending()) {
+               return last_stop_frame;
+       }
+
        /* the first of these two possible settings for "offset"
-          mean that the audible frame is stationary until 
+          mean that the audible frame is stationary until
           audio emerges from the latency compensation
           "pseudo-pipeline".
 
@@ -1211,7 +1227,7 @@ Session::audible_frame () const
 
        if (offset > current_block_size) {
                offset -= current_block_size;
-       } else { 
+       } else {
                /* XXX is this correct? if we have no external
                   physical connections and everything is internal
                   then surely this is zero? still, how
@@ -1225,24 +1241,43 @@ Session::audible_frame () const
        } else {
                tf = _transport_frame;
        }
-
-       if (_transport_speed == 0) {
-               return tf;
-       }
-
-       if (tf < offset) {
-               return 0;
-       }
-
+       
        ret = tf;
 
        if (!non_realtime_work_pending()) {
 
                /* MOVING */
 
-               /* take latency into account */
-               
-               ret -= offset;
+               /* check to see if we have passed the first guaranteed
+                  audible frame past our last start position. if not,
+                  return that last start point because in terms
+                  of audible frames, we have not moved yet.
+               */
+
+               if (_transport_speed > 0.0f) {
+
+                       if (!play_loop || !have_looped) {
+                               if (tf < _last_roll_location + offset) {
+                                       return _last_roll_location;
+                                       
+                               }
+                       } 
+                       
+
+                       /* forwards */
+                       ret -= offset;
+
+               } else if (_transport_speed < 0.0f) {
+
+                       /* XXX wot? no backward looping? */
+
+                       if (tf > _last_roll_location - offset) {
+                               return _last_roll_location;
+                       } else {
+                               /* backwards */
+                               ret += offset;
+                       }
+               }
        }
 
        return ret;
@@ -1252,7 +1287,7 @@ void
 Session::set_frame_rate (nframes_t frames_per_second)
 {
        /** \fn void Session::set_frame_size(nframes_t)
-               the AudioEngine object that calls this guarantees 
+               the AudioEngine object that calls this guarantees
                that it will not be called while we are also in
                ::process(). Its fine to do things that block
                here.
@@ -1262,7 +1297,9 @@ Session::set_frame_rate (nframes_t frames_per_second)
 
        sync_time_vars();
 
-       Route::set_automation_interval ((nframes_t) ceil ((double) frames_per_second * 0.25));
+       Automatable::set_automation_interval ((jack_nframes_t) ceil ((double) frames_per_second * (0.001 * Config->get_automation_interval())));
+
+       clear_clicks ();
 
        // XXX we need some equivalent to this, somehow
        // SndFileSource::setup_standard_crossfades (frames_per_second);
@@ -1275,21 +1312,19 @@ Session::set_frame_rate (nframes_t frames_per_second)
 void
 Session::set_block_size (nframes_t nframes)
 {
-       /* the AudioEngine guarantees 
+       /* the AudioEngine guarantees
           that it will not be called while we are also in
           ::process(). It is therefore fine to do things that block
           here.
        */
 
-       { 
-                       
+       {
+
                current_block_size = nframes;
 
                ensure_buffers(_scratch_buffers->available());
 
-               if (_gain_automation_buffer) {
-                       delete [] _gain_automation_buffer;
-               }
+               delete [] _gain_automation_buffer;
                _gain_automation_buffer = new gain_t[nframes];
 
                allocate_pan_automation_buffers (nframes, _npan_buffers, true);
@@ -1299,7 +1334,7 @@ Session::set_block_size (nframes_t nframes)
                for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
                        (*i)->set_block_size (nframes);
                }
-               
+
                boost::shared_ptr<DiskstreamList> dsl = diskstreams.reader();
                for (DiskstreamList::iterator i = dsl->begin(); i != dsl->end(); ++i) {
                        (*i)->set_block_size (nframes);
@@ -1314,18 +1349,18 @@ Session::set_default_fade (float steepness, float fade_msecs)
 {
 #if 0
        nframes_t fade_frames;
-       
+
        /* Don't allow fade of less 1 frame */
-       
+
        if (fade_msecs < (1000.0 * (1.0/_current_frame_rate))) {
 
                fade_msecs = 0;
                fade_frames = 0;
 
        } else {
-               
+
                fade_frames = (nframes_t) floor (fade_msecs * _current_frame_rate * 0.001);
-               
+
        }
 
        default_fade_msecs = fade_msecs;
@@ -1340,7 +1375,7 @@ Session::set_default_fade (float steepness, float fade_msecs)
        set_dirty();
 
        /* XXX have to do this at some point */
-       /* foreach region using default fade, reset, then 
+       /* foreach region using default fade, reset, then
           refill_all_diskstream_buffers ();
        */
 #endif
@@ -1376,7 +1411,7 @@ trace_terminal (shared_ptr<Route> r1, shared_ptr<Route> rbase)
        if ((r1->fed_by.find (rbase) != r1->fed_by.end()) && (rbase->fed_by.find (r1) != rbase->fed_by.end())) {
                info << string_compose(_("feedback loop setup between %1 and %2"), r1->name(), rbase->name()) << endmsg;
                return;
-       } 
+       }
 
        /* make a copy of the existing list of routes that feed r1 */
 
@@ -1440,45 +1475,45 @@ void
 Session::resort_routes_using (shared_ptr<RouteList> r)
 {
        RouteList::iterator i, j;
-       
+
        for (i = r->begin(); i != r->end(); ++i) {
-               
+
                (*i)->fed_by.clear ();
-               
+
                for (j = r->begin(); j != r->end(); ++j) {
-                       
+
                        /* although routes can feed themselves, it will
                           cause an endless recursive descent if we
                           detect it. so don't bother checking for
                           self-feeding.
                        */
-                       
+
                        if (*j == *i) {
                                continue;
                        }
-                       
+
                        if ((*j)->feeds (*i)) {
                                (*i)->fed_by.insert (*j);
-                       } 
+                       }
                }
        }
-       
+
        for (i = r->begin(); i != r->end(); ++i) {
                trace_terminal (*i, *i);
        }
-       
+
        RouteSorter cmp;
        r->sort (cmp);
-       
+
 #if 0
        cerr << "finished route resort\n";
-       
+
        for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
                cerr << " " << (*i)->name() << " signal order = " << (*i)->order_key ("signal") << endl;
        }
        cerr << endl;
 #endif
-       
+
 }
 
 list<boost::shared_ptr<MidiTrack> >
@@ -1487,10 +1522,12 @@ Session::new_midi_track (TrackMode mode, uint32_t how_many)
        char track_name[32];
        uint32_t track_id = 0;
        uint32_t n = 0;
-       uint32_t channels_used = 0;
        string port;
        RouteList new_routes;
        list<boost::shared_ptr<MidiTrack> > ret;
+       //uint32_t control_id;
+
+       // FIXME: need physical I/O and autoconnect stuff for MIDI
 
        /* count existing midi tracks */
 
@@ -1499,22 +1536,30 @@ Session::new_midi_track (TrackMode mode, uint32_t how_many)
 
                for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
                        if (dynamic_cast<MidiTrack*>((*i).get()) != 0) {
-                               if (!(*i)->hidden()) {
+                               if (!(*i)->is_hidden()) {
                                        n++;
-                                       channels_used += (*i)->n_inputs().n_midi();
+                                       //channels_used += (*i)->n_inputs().n_midi();
                                }
                        }
                }
        }
 
+       vector<string> physinputs;
+       vector<string> physoutputs;
+
+       _engine.get_physical_outputs (DataType::MIDI, physoutputs);
+       _engine.get_physical_inputs (DataType::MIDI, physinputs);
+
+       // control_id = ntracks() + nbusses();
+
        while (how_many) {
 
                /* check for duplicate route names, since we might have pre-existing
-                  routes with this name (e.g. create Midi1, Midi2, delete Midi1,
+                  routes with this name (e.g. create Audio1, Audio2, delete Audio1,
                   save, close,restart,add new route - first named route is now
-                  Midi2)
+                  Audio2)
                */
-               
+
 
                do {
                        ++track_id;
@@ -1524,20 +1569,60 @@ Session::new_midi_track (TrackMode mode, uint32_t how_many)
                        if (route_by_name (track_name) == 0) {
                                break;
                        }
-                       
+
                } while (track_id < (UINT_MAX-1));
 
+               shared_ptr<MidiTrack> track;
+
                try {
-                       shared_ptr<MidiTrack> track (new MidiTrack (*this, track_name, Route::Flag (0), mode));
-                       
-                       if (track->ensure_io (ChanCount(DataType::MIDI, 1), ChanCount(DataType::MIDI, 1), false, this)) {
+                       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)) {
                                error << "cannot configure 1 in/1 out configuration for new midi track" << endmsg;
+                               goto failed;
                        }
-                       
+
+                       /*
+                       if (nphysical_in) {
+                               for (uint32_t x = 0; x < track->n_inputs().n_midi() && x < nphysical_in; ++x) {
+
+                                       port = "";
+
+                                       if (Config->get_input_auto_connect() & AutoConnectPhysical) {
+                                               port = physinputs[(channels_used+x)%nphysical_in];
+                                       }
+
+                                       if (port.length() && track->connect_input (track->input (x), port, this)) {
+                                               break;
+                                       }
+                               }
+                       }
+
+                       for (uint32_t x = 0; x < track->n_outputs().n_midi(); ++x) {
+
+                               port = "";
+
+                               if (nphysical_out && (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_midi())->name();
+                                       }
+                               }
+
+                               if (port.length() && track->connect_output (track->output (x), port, this)) {
+                                       break;
+                               }
+                       }
+
                        channels_used += track->n_inputs ().n_midi();
 
+                       */
+
+                       track->midi_diskstream()->non_realtime_input_change();
+
                        track->DiskstreamChanged.connect (mem_fun (this, &Session::resort_routes));
-                       track->set_remote_control_id (ntracks());
+                       //track->set_remote_control_id (control_id);
 
                        new_routes.push_back (track);
                        ret.push_back (track);
@@ -1545,14 +1630,43 @@ Session::new_midi_track (TrackMode mode, uint32_t how_many)
 
                catch (failed_constructor &err) {
                        error << _("Session: could not create new midi track.") << endmsg;
-                       // XXX should we delete the tracks already created? 
-                       ret.clear ();
-                       return ret;
+
+                       if (track) {
+                               /* we need to get rid of this, since the track failed to be created */
+                               /* XXX arguably, AudioTrack::AudioTrack should not do the Session::add_diskstream() */
+
+                               {
+                                       RCUWriter<DiskstreamList> writer (diskstreams);
+                                       boost::shared_ptr<DiskstreamList> ds = writer.get_copy();
+                                       ds->remove (track->midi_diskstream());
+                               }
+                       }
+
+                       goto failed;
                }
-               
+
+               catch (AudioEngine::PortRegistrationFailure& pfe) {
+
+                       error << _("No more JACK ports are available. You will need to stop Ardour and restart JACK with ports if you need this many tracks.") << endmsg;
+
+                       if (track) {
+                               /* we need to get rid of this, since the track failed to be created */
+                               /* XXX arguably, MidiTrack::MidiTrack should not do the Session::add_diskstream() */
+
+                               {
+                                       RCUWriter<DiskstreamList> writer (diskstreams);
+                                       boost::shared_ptr<DiskstreamList> ds = writer.get_copy();
+                                       ds->remove (track->midi_diskstream());
+                               }
+                       }
+
+                       goto failed;
+               }
+
                --how_many;
        }
 
+  failed:
        if (!new_routes.empty()) {
                add_routes (new_routes, false);
                save_state (_current_snapshot_name);
@@ -1580,7 +1694,7 @@ Session::new_audio_track (int input_channels, int output_channels, TrackMode mod
 
                for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
                        if (dynamic_cast<AudioTrack*>((*i).get()) != 0) {
-                               if (!(*i)->hidden()) {
+                               if (!(*i)->is_hidden()) {
                                        n++;
                                        channels_used += (*i)->n_inputs().n_audio();
                                }
@@ -1590,11 +1704,10 @@ Session::new_audio_track (int input_channels, int output_channels, TrackMode mod
 
        vector<string> physinputs;
        vector<string> physoutputs;
-       uint32_t nphysical_in;
-       uint32_t nphysical_out;
 
-       _engine.get_physical_outputs (physoutputs);
-       _engine.get_physical_inputs (physinputs);
+       _engine.get_physical_outputs (DataType::AUDIO, physoutputs);
+       _engine.get_physical_inputs (DataType::AUDIO, physinputs);
+
        control_id = ntracks() + nbusses() + 1;
 
        while (how_many) {
@@ -1604,7 +1717,7 @@ Session::new_audio_track (int input_channels, int output_channels, TrackMode mod
                   save, close,restart,add new route - first named route is now
                   Audio2)
                */
-               
+
 
                do {
                        ++track_id;
@@ -1614,26 +1727,14 @@ Session::new_audio_track (int input_channels, int output_channels, TrackMode mod
                        if (route_by_name (track_name) == 0) {
                                break;
                        }
-                       
-               } while (track_id < (UINT_MAX-1));
 
-               if (Config->get_input_auto_connect() & AutoConnectPhysical) {
-                       nphysical_in = min (n_physical_inputs, (uint32_t) physinputs.size());
-               } else {
-                       nphysical_in = 0;
-               }
-               
-               if (Config->get_output_auto_connect() & AutoConnectPhysical) {
-                       nphysical_out = min (n_physical_outputs, (uint32_t) physinputs.size());
-               } else {
-                       nphysical_out = 0;
-               }
+               } while (track_id < (UINT_MAX-1));
 
                shared_ptr<AudioTrack> track;
-               
+
                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)) {
                                error << string_compose (_("cannot configure %1 in/%2 out configuration for new audio track"),
                                                         input_channels, output_channels)
@@ -1641,42 +1742,48 @@ Session::new_audio_track (int input_channels, int output_channels, TrackMode mod
                                goto failed;
                        }
 
-                       if (nphysical_in) {
+                       if (!physinputs.empty()) {
+                               uint32_t nphysical_in = physinputs.size();
+
                                for (uint32_t x = 0; x < track->n_inputs().n_audio() && x < nphysical_in; ++x) {
-                                       
+
                                        port = "";
-                                       
+
                                        if (Config->get_input_auto_connect() & AutoConnectPhysical) {
                                                port = physinputs[(channels_used+x)%nphysical_in];
-                                       } 
-                                       
+                                       }
+
                                        if (port.length() && track->connect_input (track->input (x), port, this)) {
                                                break;
                                        }
                                }
                        }
-                       
-                       for (uint32_t x = 0; x < track->n_outputs().n_midi(); ++x) {
-                               
-                               port = "";
-                               
-                               if (nphysical_out && (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 (!physoutputs.empty()) {
+                               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 (port.length() && track->connect_output (track->output (x), port, this)) {
+                                               break;
                                        }
-                               }
-                               
-                               if (port.length() && track->connect_output (track->output (x), port, this)) {
-                                       break;
                                }
                        }
-                       
+
                        channels_used += track->n_inputs ().n_audio();
 
                        track->audio_diskstream()->non_realtime_input_change();
-                       
+
                        track->DiskstreamChanged.connect (mem_fun (this, &Session::resort_routes));
                        track->set_remote_control_id (control_id);
                        ++control_id;
@@ -1692,7 +1799,7 @@ Session::new_audio_track (int input_channels, int output_channels, TrackMode mod
                                /* we need to get rid of this, since the track failed to be created */
                                /* XXX arguably, AudioTrack::AudioTrack should not do the Session::add_diskstream() */
 
-                               { 
+                               {
                                        RCUWriter<DiskstreamList> writer (diskstreams);
                                        boost::shared_ptr<DiskstreamList> ds = writer.get_copy();
                                        ds->remove (track->audio_diskstream());
@@ -1710,7 +1817,7 @@ Session::new_audio_track (int input_channels, int output_channels, TrackMode mod
                                /* we need to get rid of this, since the track failed to be created */
                                /* XXX arguably, AudioTrack::AudioTrack should not do the Session::add_diskstream() */
 
-                               { 
+                               {
                                        RCUWriter<DiskstreamList> writer (diskstreams);
                                        boost::shared_ptr<DiskstreamList> ds = writer.get_copy();
                                        ds->remove (track->audio_diskstream());
@@ -1725,8 +1832,7 @@ Session::new_audio_track (int input_channels, int output_channels, TrackMode mod
 
   failed:
        if (!new_routes.empty()) {
-               add_routes (new_routes, false);
-               save_state (_current_snapshot_name);
+               add_routes (new_routes, true);
        }
 
        return ret;
@@ -1740,25 +1846,26 @@ Session::set_remote_control_ids ()
        shared_ptr<RouteList> r = routes.reader ();
 
        for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-               if ( MixerOrdered == m) {                       
+               if ( MixerOrdered == m) {
                        long order = (*i)->order_key(N_("signal"));
                        (*i)->set_remote_control_id( order+1 );
                } else if ( EditorOrdered == m) {
                        long order = (*i)->order_key(N_("editor"));
                        (*i)->set_remote_control_id( order+1 );
                } else if ( UserOrdered == m) {
-                       //do nothing ... only changes to remote id's are initiated by user 
+                       //do nothing ... only changes to remote id's are initiated by user
                }
        }
 }
 
 
-Session::RouteList
+RouteList
 Session::new_audio_route (int input_channels, int output_channels, uint32_t how_many)
 {
        char bus_name[32];
        uint32_t bus_id = 1;
        uint32_t n = 0;
+       uint32_t channels_used = 0;
        string port;
        RouteList ret;
        uint32_t control_id;
@@ -1769,9 +1876,12 @@ Session::new_audio_route (int input_channels, int output_channels, uint32_t how_
                shared_ptr<RouteList> r = routes.reader ();
 
                for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-                       if (dynamic_cast<AudioTrack*>((*i).get()) == 0) {
-                               if (!(*i)->hidden() && (*i)->name() != _("master")) {
+                       if (boost::dynamic_pointer_cast<Track>(*i) == 0) {
+                               /* its a bus ? */
+                               if (!(*i)->is_hidden() && (*i)->name() != _("master")) {
                                        bus_id++;
+                                       n++;
+                                       channels_used += (*i)->n_inputs().n_audio();
                                }
                        }
                }
@@ -1780,8 +1890,12 @@ Session::new_audio_route (int input_channels, int output_channels, uint32_t how_
        vector<string> physinputs;
        vector<string> physoutputs;
 
-       _engine.get_physical_outputs (physoutputs);
-       _engine.get_physical_inputs (physinputs);
+       _engine.get_physical_outputs (DataType::AUDIO, physoutputs);
+       _engine.get_physical_inputs (DataType::AUDIO, physinputs);
+
+       n_physical_audio_outputs = physoutputs.size();
+       n_physical_audio_inputs = physinputs.size();
+
        control_id = ntracks() + nbusses() + 1;
 
        while (how_many) {
@@ -1799,31 +1913,34 @@ Session::new_audio_route (int input_channels, int output_channels, uint32_t how_
 
                try {
                        shared_ptr<Route> bus (new Route (*this, bus_name, -1, -1, -1, -1, Route::Flag(0), DataType::AUDIO));
-                       
+
                        if (bus->ensure_io (ChanCount(DataType::AUDIO, input_channels), 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_inputs && x < bus->n_inputs().n_audio(); ++x) {
-                               
-                               port = "";
 
+
+
+                       /*
+                       for (uint32_t x = 0; n_physical_audio_inputs && x < bus->n_inputs(); ++x) {
+                                       
+                               port = "";
+                               
                                if (Config->get_input_auto_connect() & AutoConnectPhysical) {
-                                               port = physinputs[((n+x)%n_physical_inputs)];
+                                       port = physinputs[((n+x)%n_physical_audio_inputs)];
                                } 
                                
                                if (port.length() && bus->connect_input (bus->input (x), port, this)) {
                                        break;
                                }
                        }
-                       
-                       for (uint32_t x = 0; n_physical_outputs && x < bus->n_outputs().n_audio(); ++x) {
-                               
+                       */
+
+                       for (uint32_t x = 0; n_physical_audio_outputs && x < bus->n_outputs().n_audio(); ++x) {
                                port = "";
-                               
+
                                if (Config->get_output_auto_connect() & AutoConnectPhysical) {
                                        port = physoutputs[((n+x)%n_physical_outputs)];
                                } else if (Config->get_output_auto_connect() & AutoConnectMaster) {
@@ -1831,18 +1948,20 @@ Session::new_audio_route (int input_channels, int output_channels, uint32_t how_
                                                port = _master_out->input (x%_master_out->n_inputs().n_audio())->name();
                                        }
                                }
-                               
+
                                if (port.length() && bus->connect_output (bus->output (x), port, this)) {
                                        break;
                                }
                        }
-                       
+
+                       channels_used += bus->n_inputs ().n_audio();
+
                        bus->set_remote_control_id (control_id);
                        ++control_id;
 
                        ret.push_back (bus);
                }
-       
+
 
                catch (failed_constructor &err) {
                        error << _("Session: could not create new audio route.") << endmsg;
@@ -1860,8 +1979,7 @@ Session::new_audio_route (int input_channels, int output_channels, uint32_t how_
 
   failure:
        if (!ret.empty()) {
-               add_routes (ret, false);
-               save_state (_current_snapshot_name);
+               add_routes (ret, true);
        }
 
        return ret;
@@ -1871,7 +1989,7 @@ Session::new_audio_route (int input_channels, int output_channels, uint32_t how_
 void
 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());
@@ -1879,21 +1997,21 @@ Session::add_routes (RouteList& new_routes, bool save)
        }
 
        for (RouteList::iterator x = new_routes.begin(); x != new_routes.end(); ++x) {
-               
+
                boost::weak_ptr<Route> wpr (*x);
 
                (*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)->redirects_changed.connect (mem_fun (*this, &Session::update_latency_compensation_proxy));
-               
-               if ((*x)->master()) {
+               (*x)->processors_changed.connect (bind (mem_fun (*this, &Session::update_latency_compensation), false, false));
+
+               if ((*x)->is_master()) {
                        _master_out = (*x);
                }
-               
-               if ((*x)->control()) {
+
+               if ((*x)->is_control()) {
                        _control_out = (*x);
-               } 
+               }
        }
 
        if (_control_out && IO::connecting_legal) {
@@ -1908,7 +2026,7 @@ Session::add_routes (RouteList& new_routes, bool save)
                for (RouteList::iterator x = new_routes.begin(); x != new_routes.end(); ++x) {
                        (*x)->set_control_outs (cports);
                }
-       } 
+       }
 
        set_dirty();
 
@@ -1924,7 +2042,7 @@ Session::add_diskstream (boost::shared_ptr<Diskstream> dstream)
 {
        /* need to do this in case we're rolling at the time, to prevent false underruns */
        dstream->do_refill_with_alloc ();
-       
+
        dstream->set_block_size (current_block_size);
 
        {
@@ -1932,7 +2050,7 @@ Session::add_diskstream (boost::shared_ptr<Diskstream> dstream)
                boost::shared_ptr<DiskstreamList> ds = writer.get_copy();
                ds->push_back (dstream);
                /* writer goes out of scope, copies ds back to main */
-       } 
+       }
 
        dstream->PlaylistChanged.connect (sigc::bind (mem_fun (*this, &Session::diskstream_playlist_changed), dstream));
        /* this will connect to future changes, and check the current length */
@@ -1945,10 +2063,10 @@ Session::add_diskstream (boost::shared_ptr<Diskstream> dstream)
 void
 Session::remove_route (shared_ptr<Route> route)
 {
-       {       
+       {
                RCUWriter<RouteList> writer (routes);
                shared_ptr<RouteList> rs = writer.get_copy ();
-               
+
                rs->remove (route);
 
                /* deleting the master out seems like a dumb
@@ -1973,17 +2091,17 @@ Session::remove_route (shared_ptr<Route> route)
                }
 
                update_route_solo_state ();
-               
+
                /* writer goes out of scope, forces route list update */
        }
 
        Track* t;
        boost::shared_ptr<Diskstream> ds;
-       
+
        if ((t = dynamic_cast<Track*>(route.get())) != 0) {
                ds = t->diskstream();
        }
-       
+
        if (ds) {
 
                {
@@ -1994,14 +2112,15 @@ Session::remove_route (shared_ptr<Route> route)
        }
 
        find_current_end ();
-       
+
+       // We need to disconnect the routes inputs and outputs
+
+       route->disconnect_inputs (0);
+       route->disconnect_outputs (0);
+
        update_latency_compensation (false, false);
        set_dirty();
 
-       // We need to disconnect the routes inputs and outputs 
-       route->disconnect_inputs(NULL);
-       route->disconnect_outputs(NULL);
-       
        /* get rid of it from the dead wood collection in the route list manager */
 
        /* XXX i think this is unsafe as it currently stands, but i am not sure. (pd, october 2nd, 2006) */
@@ -2012,12 +2131,14 @@ Session::remove_route (shared_ptr<Route> route)
 
        route->drop_references ();
 
+       sync_order_keys (N_("session"));
+
        /* save the new state of the world */
 
        if (save_state (_current_snapshot_name)) {
                save_history (_current_snapshot_name);
        }
-}      
+}
 
 void
 Session::route_mute_changed (void* src)
@@ -2027,12 +2148,12 @@ Session::route_mute_changed (void* src)
 
 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 ();
 
@@ -2043,46 +2164,46 @@ Session::route_solo_changed (void* src, boost::weak_ptr<Route> wpr)
        }
 
        is_track = (boost::dynamic_pointer_cast<AudioTrack>(route) != 0);
-       
+
        shared_ptr<RouteList> r = routes.reader ();
 
        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 (dynamic_cast<Track*>((*i).get()) == 0) {
                                continue;
                        }
-                       
+
                } else {
-                       
+
                        /* don't mess with tracks */
-                       
+
                        if (dynamic_cast<Track*>((*i).get()) != 0) {
                                continue;
                        }
                }
-               
+
                if ((*i) != route &&
                    ((*i)->mix_group () == 0 ||
                     (*i)->mix_group () != route->mix_group () ||
                     !route->mix_group ()->is_active())) {
-                       
+
                        if ((*i)->soloed()) {
-                               
+
                                /* if its already soloed, and solo latching is enabled,
                                   then leave it as it is.
                                */
-                               
+
                                if (Config->get_solo_latched()) {
                                        continue;
-                               } 
+                               }
                        }
-                       
+
                        /* do it */
 
                        solo_update_disabled = true;
@@ -2090,7 +2211,7 @@ Session::route_solo_changed (void* src, boost::weak_ptr<Route> wpr)
                        solo_update_disabled = false;
                }
        }
-       
+
        bool something_soloed = false;
        bool same_thing_soloed = false;
        bool signal = false;
@@ -2112,12 +2233,12 @@ Session::route_solo_changed (void* src, boost::weak_ptr<Route> wpr)
                        break;
                }
        }
-       
+
        if (something_soloed != currently_soloing) {
                signal = true;
                currently_soloing = something_soloed;
        }
-       
+
        modify_solo_mute (is_track, same_thing_soloed);
 
        if (signal) {
@@ -2136,15 +2257,13 @@ Session::update_route_solo_state ()
        bool is_track = false;
        bool signal = false;
 
-       /* caller must hold RouteLock */
-
        /* this is where we actually implement solo by changing
           the solo mute setting of each track.
        */
-       
+
        shared_ptr<RouteList> r = routes.reader ();
 
-        for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
+       for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
                if ((*i)->soloed()) {
                        mute = true;
                        if (dynamic_cast<Track*>((*i).get())) {
@@ -2166,7 +2285,7 @@ Session::update_route_solo_state ()
                for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
                        (*i)->set_solo_mute (false);
                }
-               
+
                if (signal) {
                        SoloActive (false);
                }
@@ -2187,11 +2306,11 @@ 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 (dynamic_cast<Track*>((*i).get())) {
                                if ((*i)->soloed()) {
                                        (*i)->set_solo_mute (!mute);
@@ -2215,7 +2334,7 @@ Session::modify_solo_mute (bool is_track, bool mute)
                                        /* 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);
@@ -2225,7 +2344,7 @@ Session::modify_solo_mute (bool is_track, bool mute)
 
                }
        }
-}      
+}
 
 
 void
@@ -2238,7 +2357,24 @@ Session::catch_up_on_solo ()
        */
        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)
 {
@@ -2301,11 +2437,13 @@ nframes_t
 Session::get_maximum_extent () const
 {
        nframes_t max = 0;
-       nframes_t me; 
+       nframes_t me;
 
        boost::shared_ptr<DiskstreamList> dsl = diskstreams.reader();
 
        for (DiskstreamList::const_iterator i = dsl->begin(); i != dsl->end(); ++i) {
+               if ((*i)->destructive())  //ignore tape tracks when getting max extents
+                       continue;
                boost::shared_ptr<Playlist> pl = (*i)->playlist();
                if ((me = pl->get_maximum_extent()) > max) {
                        max = me;
@@ -2354,7 +2492,7 @@ Session::new_region_name (string old)
        char buf[len];
 
        if ((last_period = old.find_last_of ('.')) == string::npos) {
-               
+
                /* no period present - add one explicitly */
 
                old += '.';
@@ -2382,7 +2520,7 @@ Session::new_region_name (string old)
                                break;
                        }
                }
-               
+
                if (i == regions.end()) {
                        break;
                }
@@ -2390,14 +2528,14 @@ Session::new_region_name (string old)
 
        if (number != (UINT_MAX-1)) {
                return buf;
-       } 
+       }
 
        error << string_compose (_("cannot create new name for region \"%1\""), old) << endmsg;
        return old;
 }
 
 int
-Session::region_name (string& result, string base, bool newlevel) const
+Session::region_name (string& result, string base, bool newlevel)
 {
        char buf[16];
        string subbase;
@@ -2405,19 +2543,15 @@ Session::region_name (string& result, string base, bool newlevel) const
        assert(base.find("/") == string::npos);
 
        if (base == "") {
-               
+
                Glib::Mutex::Lock lm (region_lock);
 
                snprintf (buf, sizeof (buf), "%d", (int)regions.size() + 1);
-
-               
                result = "region.";
                result += buf;
 
        } else {
 
-               /* XXX this is going to be slow. optimize me later */
-               
                if (newlevel) {
                        subbase = base;
                } else {
@@ -2431,89 +2565,137 @@ Session::region_name (string& result, string base, bool newlevel) const
 
                }
 
-               bool name_taken = true;
-               
                {
                        Glib::Mutex::Lock lm (region_lock);
-                       
-                       for (int n = 1; n < 5000; ++n) {
-                               
-                               result = subbase;
-                               snprintf (buf, sizeof (buf), ".%d", n);
+
+                       map<string,uint32_t>::iterator x;
+
+                       result = subbase;
+
+                       if ((x = region_name_map.find (subbase)) == region_name_map.end()) {
+                               result += ".1";
+                               region_name_map[subbase] = 1;
+                       } else {
+                               x->second++;
+                               snprintf (buf, sizeof (buf), ".%d", x->second);
+
                                result += buf;
-                               
-                               name_taken = false;
-                               
-                               for (RegionList::const_iterator i = regions.begin(); i != regions.end(); ++i) {
-                                       if (i->second->name() == result) {
-                                               name_taken = true;
-                                               break;
-                                       }
-                               }
-                               
-                               if (!name_taken) {
-                                       break;
-                               }
                        }
                }
-                       
-               if (name_taken) {
-                       fatal << string_compose(_("too many regions with names like %1"), base) << endmsg;
-                       /*NOTREACHED*/
-               }
        }
+
        return 0;
-}      
+}
 
 void
 Session::add_region (boost::shared_ptr<Region> region)
 {
-       boost::shared_ptr<Region> other;
+       vector<boost::shared_ptr<Region> > v;
+       v.push_back (region);
+       add_regions (v);
+}
+
+void
+Session::add_regions (vector<boost::shared_ptr<Region> >& new_regions)
+{
        bool added = false;
 
-       { 
+       {
                Glib::Mutex::Lock lm (region_lock);
 
-               RegionList::iterator x;
+               for (vector<boost::shared_ptr<Region> >::iterator ii = new_regions.begin(); ii != new_regions.end(); ++ii) {
 
-               for (x = regions.begin(); x != regions.end(); ++x) {
+                       boost::shared_ptr<Region> region = *ii;
 
-                       other = x->second;
+                       if (region == 0) {
 
-                       if (region->region_list_equivalent (other)) {
-                               break;
-                       }
-               }
+                               error << _("Session::add_region() ignored a null region. Warning: you might have lost a region.") << endmsg;
+
+                       } else {
+
+                               RegionList::iterator x;
 
-               if (x == regions.end()) {
+                               for (x = regions.begin(); x != regions.end(); ++x) {
 
-                       pair<RegionList::key_type,RegionList::mapped_type> entry;
+                                       if (region->region_list_equivalent (x->second)) {
+                                               break;
+                                       }
+                               }
 
-                       entry.first = region->id();
-                       entry.second = region;
+                               if (x == regions.end()) {
 
-                       pair<RegionList::iterator,bool> x = regions.insert (entry);
+                                       pair<RegionList::key_type,RegionList::mapped_type> entry;
 
+                                       entry.first = region->id();
+                                       entry.second = region;
 
-                       if (!x.second) {
-                               return;
-                       }
+                                       pair<RegionList::iterator,bool> x = regions.insert (entry);
 
-                       added = true;
-               } 
+                                       if (!x.second) {
+                                               return;
+                                       }
 
+                                       added = true;
+                               }
+                       }
+               }
        }
 
        /* mark dirty because something has changed even if we didn't
           add the region to the region list.
        */
-       
-       set_dirty();
-       
+
+       set_dirty ();
+
        if (added) {
-               region->GoingAway.connect (sigc::bind (mem_fun (*this, &Session::remove_region), boost::weak_ptr<Region>(region)));
-               region->StateChanged.connect (sigc::bind (mem_fun (*this, &Session::region_changed), boost::weak_ptr<Region>(region)));
-               RegionAdded (region); /* EMIT SIGNAL */
+
+               vector<boost::weak_ptr<Region> > v;
+               boost::shared_ptr<Region> first_r;
+
+               for (vector<boost::shared_ptr<Region> >::iterator ii = new_regions.begin(); ii != new_regions.end(); ++ii) {
+
+                       boost::shared_ptr<Region> region = *ii;
+
+                       if (region == 0) {
+
+                               error << _("Session::add_region() ignored a null region. Warning: you might have lost a region.") << endmsg;
+
+                       } else {
+                               v.push_back (region);
+
+                               if (!first_r) {
+                                       first_r = region;
+                               }
+                       }
+
+                       region->StateChanged.connect (sigc::bind (mem_fun (*this, &Session::region_changed), boost::weak_ptr<Region>(region)));
+                       region->GoingAway.connect (sigc::bind (mem_fun (*this, &Session::remove_region), boost::weak_ptr<Region>(region)));
+
+                       update_region_name_map (region);
+               }
+
+               if (!v.empty()) {
+                       RegionsAdded (v); /* EMIT SIGNAL */
+               }
+       }
+}
+
+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);
        }
 }
 
@@ -2530,6 +2712,10 @@ Session::region_changed (Change what_changed, boost::weak_ptr<Region> weak_regio
                /* relay hidden changes */
                RegionHiddenChange (region);
        }
+
+       if (what_changed & NameChanged) {
+               update_region_name_map (region);
+       }
 }
 
 void
@@ -2544,7 +2730,7 @@ Session::remove_region (boost::weak_ptr<Region> weak_region)
 
        bool removed = false;
 
-       { 
+       {
                Glib::Mutex::Lock lm (region_lock);
 
                if ((i = regions.find (region->id())) != regions.end()) {
@@ -2569,7 +2755,7 @@ Session::find_whole_file_parent (boost::shared_ptr<Region const> child)
 {
        RegionList::iterator i;
        boost::shared_ptr<Region> region;
-       
+
        Glib::Mutex::Lock lm (region_lock);
 
        for (i = regions.begin(); i != regions.end(); ++i) {
@@ -2582,10 +2768,10 @@ Session::find_whole_file_parent (boost::shared_ptr<Region const> child)
                                return region;
                        }
                }
-       } 
+       }
 
        return boost::shared_ptr<Region> ();
-}      
+}
 
 void
 Session::find_equivalent_playlist_regions (boost::shared_ptr<Region> region, vector<boost::shared_ptr<Region> >& result)
@@ -2598,20 +2784,14 @@ int
 Session::destroy_region (boost::shared_ptr<Region> region)
 {
        vector<boost::shared_ptr<Source> > srcs;
-               
-       {
-               boost::shared_ptr<AudioRegion> aregion;
-               
-               if ((aregion = boost::dynamic_pointer_cast<AudioRegion> (region)) == 0) {
-                       return 0;
-               }
-               
-               if (aregion->playlist()) {
-                       aregion->playlist()->destroy_region (region);
+
+       {
+               if (region->playlist()) {
+                       region->playlist()->destroy_region (region);
                }
-               
-               for (uint32_t n = 0; n < aregion->n_channels(); ++n) {
-                       srcs.push_back (aregion->source (n));
+
+               for (uint32_t n = 0; n < region->n_channels(); ++n) {
+                       srcs.push_back (region->source (n));
                }
        }
 
@@ -2619,17 +2799,10 @@ Session::destroy_region (boost::shared_ptr<Region> region)
 
        for (vector<boost::shared_ptr<Source> >::iterator i = srcs.begin(); i != srcs.end(); ++i) {
 
-               if (!(*i)->used()) {
-                       boost::shared_ptr<AudioFileSource> afs = boost::dynamic_pointer_cast<AudioFileSource>(*i);
-                       
-                       if (afs) {
-                               (afs)->mark_for_remove ();
-                       }
-                       
+                       (*i)->mark_for_remove ();
                        (*i)->drop_references ();
-                       
+
                        cerr << "source was not used by any playlist\n";
-               }
        }
 
        return 0;
@@ -2648,12 +2821,12 @@ int
 Session::remove_last_capture ()
 {
        list<boost::shared_ptr<Region> > r;
-       
+
        boost::shared_ptr<DiskstreamList> dsl = diskstreams.reader();
-       
+
        for (DiskstreamList::iterator i = dsl->begin(); i != dsl->end(); ++i) {
                list<boost::shared_ptr<Region> >& l = (*i)->last_capture_regions();
-               
+
                if (!l.empty()) {
                        r.insert (r.end(), l.begin(), l.end());
                        l.clear ();
@@ -2683,7 +2856,7 @@ Session::add_source (boost::shared_ptr<Source> source)
 
        entry.first = source->id();
        entry.second = source;
-       
+
        {
                Glib::Mutex::Lock lm (source_lock);
                result = sources.insert (entry);
@@ -2693,6 +2866,14 @@ Session::add_source (boost::shared_ptr<Source> source)
                source->GoingAway.connect (sigc::bind (mem_fun (this, &Session::remove_source), boost::weak_ptr<Source> (source)));
                set_dirty();
        }
+
+       boost::shared_ptr<AudioFileSource> afs;
+
+       if ((afs = boost::dynamic_pointer_cast<AudioFileSource>(source)) != 0) {
+               if (Config->get_auto_analyse_audio()) {
+                       Analyser::queue_source_for_analysis (source, false);
+               }
+       }
 }
 
 void
@@ -2703,26 +2884,22 @@ Session::remove_source (boost::weak_ptr<Source> src)
 
        if (!source) {
                return;
-       } 
+       }
 
-       { 
+       {
                Glib::Mutex::Lock lm (source_lock);
-               
-               { 
-                       Glib::Mutex::Lock lm (source_lock);
-                       
-                       if ((i = sources.find (source->id())) != sources.end()) {
-                               sources.erase (i);
-                       } 
+
+               if ((i = sources.find (source->id())) != sources.end()) {
+                       sources.erase (i);
                }
        }
-       
+
        if (!_state_of_the_state & InCleanup) {
-               
+
                /* save state so we don't end up with a session file
                   referring to non-existent sources.
                */
-               
+
                save_state (_current_snapshot_name);
        }
 }
@@ -2738,8 +2915,6 @@ Session::source_by_id (const PBD::ID& id)
                source = i->second;
        }
 
-       /* XXX search MIDI or other searches here */
-       
        return source;
 }
 
@@ -2755,22 +2930,18 @@ Session::source_by_path_and_channel (const Glib::ustring& path, uint16_t chn)
 
                if (afs && afs->path() == path && chn == afs->channel()) {
                        return afs;
-               } 
-                      
+               }
+
        }
        return boost::shared_ptr<Source>();
 }
 
-string
-Session::peak_path_from_audio_path (string audio_path) const
+Glib::ustring
+Session::peak_path (Glib::ustring base) const
 {
-       string res;
-
-       res = peak_dir ();
-       res += PBD::basename_nosuffix (audio_path);
-       res += peakfile_suffix;
-
-       return res;
+       sys::path peakfile_path(_session_dir->peak_path());
+       peakfile_path /= basename_nosuffix (base) + peakfile_suffix;
+       return peakfile_path.to_string();
 }
 
 string
@@ -2783,14 +2954,14 @@ Session::change_audio_path_by_name (string path, string oldname, string newname,
        /* note: we know (or assume) the old path is already valid */
 
        if (destructive) {
-               
+
                /* destructive file sources have a name of the form:
 
                    /path/to/Tnnnn-NAME(%[LR])?.wav
-                 
+
                    the task here is to replace NAME with the new name.
                */
-               
+
                /* find last slash */
 
                string dir;
@@ -2817,16 +2988,16 @@ Session::change_audio_path_by_name (string path, string oldname, string newname,
                path += '-';
                path += new_legalized;
                path += ".wav";  /* XXX gag me with a spoon */
-               
+
        } else {
-               
+
                /* non-destructive file sources have a name of the form:
 
                    /path/to/NAME-nnnnn(%[LR])?.wav
-                 
+
                    the task here is to replace NAME with the new name.
                */
-               
+
                string dir;
                string suffix;
                string::size_type slash;
@@ -2848,7 +3019,7 @@ Session::change_audio_path_by_name (string path, string oldname, string newname,
                }
 
                suffix = path.substr (dash+1);
-               
+
                // Suffix is now everything after the dash. Now we need to eliminate
                // the nnnnn part, which is done by either finding a '%' or a '.'
 
@@ -2949,9 +3120,9 @@ Session::audio_path_from_name (string name, uint32_t nchan, uint32_t chan, bool
                                }
                        }
 
-                       if (g_file_test (buf, G_FILE_TEST_EXISTS)) {
+                       if (sys::exists(buf)) {
                                existing++;
-                       } 
+                       }
 
                }
 
@@ -2972,11 +3143,13 @@ Session::audio_path_from_name (string name, uint32_t nchan, uint32_t chan, bool
 
        string foo = buf;
 
-       spath = discover_best_sound_dir ();
+       SessionDirectory sdir(get_best_session_directory_for_new_source ());
+
+       spath = sdir.sound_path().to_string();
        spath += '/';
 
        string::size_type pos = foo.find_last_of ('/');
-       
+
        if (pos == string::npos) {
                spath += foo;
        } else {
@@ -3005,14 +3178,14 @@ Session::change_midi_path_by_name (string path, string oldname, string newname,
        /* note: we know (or assume) the old path is already valid */
 
        if (destructive) {
-               
+
                /* destructive file sources have a name of the form:
 
                    /path/to/Tnnnn-NAME(%[LR])?.wav
-                 
+
                    the task here is to replace NAME with the new name.
                */
-               
+
                /* find last slash */
 
                string dir;
@@ -3039,16 +3212,16 @@ Session::change_midi_path_by_name (string path, string oldname, string newname,
                path += '-';
                path += new_legalized;
                path += ".mid";  /* XXX gag me with a spoon */
-               
+
        } else {
-               
+
                /* non-destructive file sources have a name of the form:
 
                    /path/to/NAME-nnnnn(%[LR])?.wav
-                 
+
                    the task here is to replace NAME with the new name.
                */
-               
+
                string dir;
                string suffix;
                string::size_type slash;
@@ -3070,7 +3243,7 @@ Session::change_midi_path_by_name (string path, string oldname, string newname,
                }
 
                suffix = path.substr (dash+1);
-               
+
                // Suffix is now everything after the dash. Now we need to eliminate
                // the nnnnn part, which is done by either finding a '%' or a '.'
 
@@ -3132,15 +3305,19 @@ Session::midi_path_from_name (string name)
 
                for (i = session_dirs.begin(); i != session_dirs.end(); ++i) {
 
-                       spath = (*i).path;
+                       SessionDirectory sdir((*i).path);
+
+                       sys::path p = sdir.midi_path();
 
-                       spath += midi_dir(false) + "/" + legalized;
+                       p /= legalized;
+
+                       spath = p.to_string();
 
                        snprintf (buf, sizeof(buf), "%s-%u.mid", spath.c_str(), cnt);
 
-                       if (g_file_test (buf, G_FILE_TEST_EXISTS)) {
+                       if (sys::exists (buf)) {
                                existing++;
-                       } 
+                       }
                }
 
                if (existing == 0) {
@@ -3159,11 +3336,13 @@ Session::midi_path_from_name (string name)
 
        string foo = buf;
 
-       spath = discover_best_midi_dir ();
+       SessionDirectory sdir(get_best_session_directory_for_new_source ());
+
+       spath = sdir.midi_path().to_string();
        spath += '/';
 
        string::size_type pos = foo.find_last_of ('/');
-       
+
        if (pos == string::npos) {
                spath += foo;
        } else {
@@ -3177,7 +3356,7 @@ boost::shared_ptr<MidiSource>
 Session::create_midi_source_for_session (MidiDiskstream& ds)
 {
        string mpath = midi_path_from_name (ds.name());
-       
+
        return boost::dynamic_pointer_cast<SMFSource> (SourceFactory::createWritable (DataType::MIDI, *this, mpath, false, frame_rate()));
 }
 
@@ -3203,13 +3382,29 @@ Session::playlist_by_name (string name)
 }
 
 void
-Session::add_playlist (boost::shared_ptr<Playlist> playlist)
+Session::unassigned_playlists (std::list<boost::shared_ptr<Playlist> > & list)
+{
+       Glib::Mutex::Lock lm (playlist_lock);
+       for (PlaylistList::iterator i = playlists.begin(); i != playlists.end(); ++i) {
+               if (!(*i)->get_orig_diskstream_id().to_s().compare ("0")) {
+                       list.push_back (*i);
+               }
+       }
+       for (PlaylistList::iterator i = unused_playlists.begin(); i != unused_playlists.end(); ++i) {
+               if (!(*i)->get_orig_diskstream_id().to_s().compare ("0")) {
+                       list.push_back (*i);
+               }
+       }
+}
+
+void
+Session::add_playlist (boost::shared_ptr<Playlist> playlist, bool unused)
 {
        if (playlist->hidden()) {
                return;
        }
 
-       { 
+       {
                Glib::Mutex::Lock lm (playlist_lock);
                if (find (playlists.begin(), playlists.end(), playlist) == playlists.end()) {
                        playlists.insert (playlists.begin(), playlist);
@@ -3218,6 +3413,10 @@ Session::add_playlist (boost::shared_ptr<Playlist> playlist)
                }
        }
 
+       if (unused) {
+               playlist->release();
+       }
+
        set_dirty();
 
        PlaylistAdded (playlist); /* EMIT SIGNAL */
@@ -3226,7 +3425,7 @@ Session::add_playlist (boost::shared_ptr<Playlist> playlist)
 void
 Session::get_playlists (vector<boost::shared_ptr<Playlist> >& s)
 {
-       { 
+       {
                Glib::Mutex::Lock lm (playlist_lock);
                for (PlaylistList::iterator i = playlists.begin(); i != playlists.end(); ++i) {
                        s.push_back (*i);
@@ -3253,22 +3452,22 @@ Session::track_playlist (bool inuse, boost::weak_ptr<Playlist> wpl)
                return;
        }
 
-       { 
+       {
                Glib::Mutex::Lock lm (playlist_lock);
 
                if (!inuse) {
 
                        unused_playlists.insert (pl);
-                       
+
                        if ((x = playlists.find (pl)) != playlists.end()) {
                                playlists.erase (x);
                        }
 
-                       
+
                } else {
 
                        playlists.insert (pl);
-                       
+
                        if ((x = unused_playlists.find (pl)) != unused_playlists.end()) {
                                unused_playlists.erase (x);
                        }
@@ -3289,7 +3488,7 @@ Session::remove_playlist (boost::weak_ptr<Playlist> weak_playlist)
                return;
        }
 
-       { 
+       {
                Glib::Mutex::Lock lm (playlist_lock);
 
                PlaylistList::iterator i;
@@ -3303,7 +3502,7 @@ Session::remove_playlist (boost::weak_ptr<Playlist> weak_playlist)
                if (i != unused_playlists.end()) {
                        unused_playlists.erase (i);
                }
-               
+
        }
 
        set_dirty();
@@ -3311,7 +3510,7 @@ Session::remove_playlist (boost::weak_ptr<Playlist> weak_playlist)
        PlaylistRemoved (playlist); /* EMIT SIGNAL */
 }
 
-void 
+void
 Session::set_audition (boost::shared_ptr<Region> r)
 {
        pending_audition_region = r;
@@ -3365,47 +3564,37 @@ Session::RoutePublicOrderSorter::operator() (boost::shared_ptr<Route> a, boost::
 void
 Session::remove_empty_sounds ()
 {
-       PathScanner scanner;
+       vector<string> audio_filenames;
+
+       get_files_in_directory (_session_dir->sound_path(), audio_filenames);
 
-       vector<string *>* possible_audiofiles = scanner (_session_dir->sound_path().to_string (),
-                       Config->get_possible_audio_file_regexp (), false, true);
-       
        Glib::Mutex::Lock lm (source_lock);
-       
-       regex_t compiled_tape_track_pattern;
-       int err;
 
-       if ((err = regcomp (&compiled_tape_track_pattern, "/T[0-9][0-9][0-9][0-9]-", REG_EXTENDED|REG_NOSUB))) {
+       TapeFileMatcher tape_file_matcher;
 
-               char msg[256];
-               
-               regerror (err, &compiled_tape_track_pattern, msg, sizeof (msg));
-               
-               error << string_compose (_("Cannot compile tape track regexp for use (%1)"), msg) << endmsg;
-               return;
-       }
+       remove_if (audio_filenames.begin(), audio_filenames.end(),
+                       sigc::mem_fun (tape_file_matcher, &TapeFileMatcher::matches));
 
-       for (vector<string *>::iterator i = possible_audiofiles->begin(); i != possible_audiofiles->end(); ++i) {
-               
-               /* never remove files that appear to be a tape track */
+       for (vector<string>::iterator i = audio_filenames.begin(); i != audio_filenames.end(); ++i) {
 
-               if (regexec (&compiled_tape_track_pattern, (*i)->c_str(), 0, 0, 0) == 0) {
-                       delete *i;
-                       continue;
-               }
-                       
-               if (AudioFileSource::is_empty (*this, *(*i))) {
+               sys::path audio_file_path (_session_dir->sound_path());
 
-                       unlink ((*i)->c_str());
-                       
-                       string peak_path = peak_path_from_audio_path (**i);
-                       unlink (peak_path.c_str());
-               }
+               audio_file_path /= *i;
 
-               delete* i;
-       }
+               if (AudioFileSource::is_empty (*this, audio_file_path.to_string())) {
 
-       delete possible_audiofiles;
+                       try
+                       {
+                               sys::remove (audio_file_path);
+                               const string peakfile = peak_path (audio_file_path.to_string());
+                               sys::remove (peakfile);
+                       }
+                       catch (const sys::filesystem_error& err)
+                       {
+                               error << err.what() << endmsg;
+                       }
+               }
+       }
 }
 
 bool
@@ -3423,30 +3612,30 @@ void
 Session::set_all_solo (bool yn)
 {
        shared_ptr<RouteList> r = routes.reader ();
-       
+
        for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-               if (!(*i)->hidden()) {
+               if (!(*i)->is_hidden()) {
                        (*i)->set_solo (yn, this);
                }
        }
 
        set_dirty();
 }
-               
+
 void
 Session::set_all_mute (bool yn)
 {
        shared_ptr<RouteList> r = routes.reader ();
-       
+
        for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-               if (!(*i)->hidden()) {
+               if (!(*i)->is_hidden()) {
                        (*i)->set_mute (yn, this);
                }
        }
 
        set_dirty();
 }
-               
+
 uint32_t
 Session::n_diskstreams () const
 {
@@ -3472,7 +3661,7 @@ Session::graph_reordered ()
        if (_state_of_the_state & InitialConnecting) {
                return;
        }
-       
+
        /* every track/bus asked for this to be handled but it was deferred because
           we were connecting. do it now.
        */
@@ -3481,10 +3670,10 @@ Session::graph_reordered ()
 
        resort_routes ();
 
-       /* force all diskstreams to update their capture offset values to 
+       /* force all diskstreams to update their capture offset values to
           reflect any changes in latencies within the graph.
        */
-       
+
        boost::shared_ptr<DiskstreamList> dsl = diskstreams.reader();
 
        for (DiskstreamList::iterator i = dsl->begin(); i != dsl->end(); ++i) {
@@ -3508,7 +3697,7 @@ void
 Session::record_enable_change_all (bool yn)
 {
        shared_ptr<RouteList> r = routes.reader ();
-       
+
        for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
                Track* at;
 
@@ -3516,70 +3705,60 @@ Session::record_enable_change_all (bool yn)
                        at->set_record_enable (yn, this);
                }
        }
-       
+
        /* since we don't keep rec-enable state, don't mark session dirty */
 }
 
 void
-Session::add_redirect (Redirect* redirect)
+Session::add_processor (Processor* processor)
 {
        Send* send;
-       Insert* insert;
        PortInsert* port_insert;
        PluginInsert* plugin_insert;
 
-       if ((insert = dynamic_cast<Insert *> (redirect)) != 0) {
-               if ((port_insert = dynamic_cast<PortInsert *> (insert)) != 0) {
-                       _port_inserts.insert (_port_inserts.begin(), port_insert);
-               } else if ((plugin_insert = dynamic_cast<PluginInsert *> (insert)) != 0) {
-                       _plugin_inserts.insert (_plugin_inserts.begin(), plugin_insert);
-               } else {
-                       fatal << _("programming error: unknown type of Insert created!") << endmsg;
-                       /*NOTREACHED*/
-               }
-       } else if ((send = dynamic_cast<Send *> (redirect)) != 0) {
+       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 if (dynamic_cast<InternalSend *> (processor) != 0) {
+               /* relax */
        } else {
-               fatal << _("programming error: unknown type of Redirect created!") << endmsg;
+               fatal << _("programming error: unknown type of Insert created!") << endmsg;
                /*NOTREACHED*/
        }
 
-       redirect->GoingAway.connect (sigc::bind (mem_fun (*this, &Session::remove_redirect), redirect));
+       processor->GoingAway.connect (sigc::bind (mem_fun (*this, &Session::remove_processor), processor));
 
        set_dirty();
 }
 
 void
-Session::remove_redirect (Redirect* redirect)
+Session::remove_processor (Processor* processor)
 {
        Send* send;
-       Insert* insert;
        PortInsert* port_insert;
        PluginInsert* plugin_insert;
-       
-       if ((insert = dynamic_cast<Insert *> (redirect)) != 0) {
-               if ((port_insert = dynamic_cast<PortInsert *> (insert)) != 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 *> (insert)) != 0) {
-                       _plugin_inserts.remove (plugin_insert);
-               } else {
-                       fatal << string_compose (_("programming error: %1"),
-                                                X_("unknown type of Insert deleted!")) 
-                             << endmsg;
-                       /*NOTREACHED*/
-               }
-       } else if ((send = dynamic_cast<Send *> (redirect)) != 0) {
+
+       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);
+       } else if (dynamic_cast<InternalSend *> (processor) != 0) {
+               /* relax */
+       } 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 Redirect deleted!") << endmsg;
+               fatal << _("programming error: unknown type of Insert deleted!") << endmsg;
                /*NOTREACHED*/
        }
 
@@ -3600,7 +3779,11 @@ Session::available_capture_duration ()
                sample_bytes_on_disk = 3.0;
                break;
 
-       default: 
+       case FormatInt16:
+               sample_bytes_on_disk = 2.0;
+               break;
+
+       default:
                /* impossible, but keep some gcc versions happy */
                fatal << string_compose (_("programming error: %1"),
                                         X_("illegal native file data format"))
@@ -3613,34 +3796,36 @@ Session::available_capture_duration ()
        if (_total_free_4k_blocks * scale > (double) max_frames) {
                return max_frames;
        }
-       
+
        return (nframes_t) floor (_total_free_4k_blocks * scale);
 }
 
 void
-Session::add_bundle (ARDOUR::Bundle* bundle)
+Session::add_bundle (shared_ptr<Bundle> bundle)
 {
        {
-               Glib::Mutex::Lock guard (bundle_lock);
-               _bundles.push_back (bundle);
+               RCUWriter<BundleList> writer (_bundles);
+               boost::shared_ptr<BundleList> b = writer.get_copy ();
+               b->push_back (bundle);
        }
-       
+
        BundleAdded (bundle); /* EMIT SIGNAL */
 
        set_dirty();
 }
 
 void
-Session::remove_bundle (ARDOUR::Bundle* bundle)
+Session::remove_bundle (shared_ptr<Bundle> bundle)
 {
        bool removed = false;
 
        {
-               Glib::Mutex::Lock guard (bundle_lock);
-               BundleList::iterator i = find (_bundles.begin(), _bundles.end(), bundle);
-               
-               if (i != _bundles.end()) {
-                       _bundles.erase (i);
+               RCUWriter<BundleList> writer (_bundles);
+               boost::shared_ptr<BundleList> b = writer.get_copy ();
+               BundleList::iterator i = find (b->begin(), b->end(), bundle);
+
+               if (i != b->end()) {
+                       b->erase (i);
                        removed = true;
                }
        }
@@ -3652,24 +3837,33 @@ Session::remove_bundle (ARDOUR::Bundle* bundle)
        set_dirty();
 }
 
-ARDOUR::Bundle *
+shared_ptr<Bundle>
 Session::bundle_by_name (string name) const
 {
-       Glib::Mutex::Lock lm (bundle_lock);
-
-       for (BundleList::const_iterator i = _bundles.begin(); i != _bundles.end(); ++i) {
+       boost::shared_ptr<BundleList> b = _bundles.reader ();
+       
+       for (BundleList::const_iterator i = b->begin(); i != b->end(); ++i) {
                if ((*i)->name() == name) {
                        return* i;
                }
        }
 
-       return 0;
+       return boost::shared_ptr<Bundle> ();
 }
 
 void
 Session::tempo_map_changed (Change ignored)
 {
        clear_clicks ();
+
+       for (PlaylistList::iterator i = playlists.begin(); i != playlists.end(); ++i) {
+               (*i)->update_after_tempo_map_change ();
+       }
+
+       for (PlaylistList::iterator i = unused_playlists.begin(); i != unused_playlists.end(); ++i) {
+               (*i)->update_after_tempo_map_change ();
+       }
+
        set_dirty ();
 }
 
@@ -3679,11 +3873,19 @@ Session::tempo_map_changed (Change ignored)
 void
 Session::ensure_buffers (ChanCount howmany)
 {
-       // FIXME: NASTY assumption (midi block size == audio block size)
+       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);
-       _send_buffers->ensure_buffers(howmany, current_block_size);
+       _mix_buffers->ensure_buffers(howmany, current_block_size);
        _silent_buffers->ensure_buffers(howmany, current_block_size);
-       
+
        allocate_pan_automation_buffers (current_block_size, howmany.n_audio(), false);
 }
 
@@ -3697,10 +3899,10 @@ Session::next_insert_id ()
                        if (!insert_bitset[n]) {
                                insert_bitset[n] = true;
                                return n;
-                               
+
                        }
                }
-               
+
                /* none available, so resize and try again */
 
                insert_bitset.resize (insert_bitset.size() + 16, false);
@@ -3717,10 +3919,10 @@ Session::next_send_id ()
                        if (!send_bitset[n]) {
                                send_bitset[n] = true;
                                return n;
-                               
+
                        }
                }
-               
+
                /* none available, so resize and try again */
 
                send_bitset.resize (send_bitset.size() + 16, false);
@@ -3768,7 +3970,7 @@ Session::named_selection_by_name (string name)
 void
 Session::add_named_selection (NamedSelection* named_selection)
 {
-       { 
+       {
                Glib::Mutex::Lock lm (named_selection_lock);
                named_selections.insert (named_selections.begin(), named_selection);
        }
@@ -3787,7 +3989,7 @@ Session::remove_named_selection (NamedSelection* named_selection)
 {
        bool removed = false;
 
-       { 
+       {
                Glib::Mutex::Lock lm (named_selection_lock);
 
                NamedSelectionList::iterator i = find (named_selections.begin(), named_selections.end(), named_selection);
@@ -3819,13 +4021,13 @@ bool
 Session::route_name_unique (string n) const
 {
        shared_ptr<RouteList> r = routes.reader ();
-       
+
        for (RouteList::const_iterator i = r->begin(); i != r->end(); ++i) {
                if ((*i)->name() == n) {
                        return false;
                }
        }
-       
+
        return true;
 }
 
@@ -3853,7 +4055,7 @@ Session::allocate_pan_automation_buffers (nframes_t nframes, uint32_t howmany, b
        }
 
        _pan_automation_buffer = new pan_t*[howmany];
-       
+
        for (uint32_t i = 0; i < howmany; ++i) {
                _pan_automation_buffer[i] = new pan_t[nframes];
        }
@@ -3881,29 +4083,37 @@ Session::freeze (InterThreadInfo& itt)
        return 0;
 }
 
-int
-Session::write_one_audio_track (AudioTrack& track, nframes_t start, nframes_t len,     
-                              bool overwrite, vector<boost::shared_ptr<Source> >& srcs, 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, InterThreadInfo& itt)
 {
-       int ret = -1;
+       boost::shared_ptr<Region> result;
        boost::shared_ptr<Playlist> playlist;
        boost::shared_ptr<AudioFileSource> fsource;
        uint32_t x;
        char buf[PATH_MAX+1];
-       string dir;
        ChanCount nchans(track.audio_diskstream()->n_channels());
        nframes_t position;
        nframes_t this_chunk;
        nframes_t to_do;
        BufferSet buffers;
+       SessionDirectory sdir(get_best_session_directory_for_new_source ());
+       const string sound_dir = sdir.sound_path().to_string();
+       nframes_t len = end - start;
+
+       if (end <= start) {
+               error << string_compose (_("Cannot write a range where end <= start (e.g. %1 <= %2)"),
+                                        end, start) << endmsg;
+               return result;
+       }
 
        // 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);
-       
+
        /* call tree *MUST* hold route_lock */
-       
+
        if ((playlist = track.diskstream()->playlist()) == 0) {
                goto out;
        }
@@ -3913,28 +4123,26 @@ Session::write_one_audio_track (AudioTrack& track, nframes_t start, nframes_t le
        if (track.has_external_redirects()) {
                goto out;
        }
-       
-       dir = discover_best_sound_dir ();
 
        for (uint32_t chan_n=0; chan_n < nchans.n_audio(); ++chan_n) {
 
                for (x = 0; x < 99999; ++x) {
-                       snprintf (buf, sizeof(buf), "%s/%s-%d-bounce-%" PRIu32 ".wav", dir.c_str(), playlist->name().c_str(), chan_n, x+1);
+                       snprintf (buf, sizeof(buf), "%s/%s-%d-bounce-%" PRIu32 ".wav", sound_dir.c_str(), playlist->name().c_str(), chan_n, x+1);
                        if (access (buf, F_OK) != 0) {
                                break;
                        }
                }
-               
+
                if (x == 99999) {
                        error << string_compose (_("too many bounced versions of playlist \"%1\""), playlist->name()) << endmsg;
                        goto out;
                }
-               
+
                try {
                        fsource = boost::dynamic_pointer_cast<AudioFileSource> (
                                SourceFactory::createWritable (DataType::AUDIO, *this, buf, false, frame_rate()));
                }
-               
+
                catch (failed_constructor& err) {
                        error << string_compose (_("cannot create new audio file \"%1\" for %2"), buf, track.name()) << endmsg;
                        goto out;
@@ -3944,7 +4152,7 @@ Session::write_one_audio_track (AudioTrack& track, nframes_t start, nframes_t le
        }
 
        /* XXX need to flush all redirects */
-       
+
        position = start;
        to_do = len;
 
@@ -3957,11 +4165,11 @@ Session::write_one_audio_track (AudioTrack& track, nframes_t start, nframes_t le
                if (afs)
                        afs->prepare_for_peakfile_writes ();
        }
-                       
+
        while (to_do && !itt.cancel) {
-               
+
                this_chunk = min (to_do, chunk_size);
-               
+
                if (track.export_stuff (buffers, start, this_chunk)) {
                        goto out;
                }
@@ -3969,61 +4177,59 @@ Session::write_one_audio_track (AudioTrack& track, nframes_t start, nframes_t le
                uint32_t n = 0;
                for (vector<boost::shared_ptr<Source> >::iterator src=srcs.begin(); src != srcs.end(); ++src, ++n) {
                        boost::shared_ptr<AudioFileSource> afs = boost::dynamic_pointer_cast<AudioFileSource>(*src);
-                       
+
                        if (afs) {
                                if (afs->write (buffers.get_audio(n).data(), this_chunk) != this_chunk) {
                                        goto out;
                                }
                        }
                }
-               
+
                start += this_chunk;
                to_do -= this_chunk;
-               
+
                itt.progress = (float) (1.0 - ((double) to_do / len));
 
        }
 
        if (!itt.cancel) {
-               
+
                time_t now;
                struct tm* xnow;
                time (&now);
                xnow = localtime (&now);
-               
+
                for (vector<boost::shared_ptr<Source> >::iterator src=srcs.begin(); src != srcs.end(); ++src) {
                        boost::shared_ptr<AudioFileSource> afs = boost::dynamic_pointer_cast<AudioFileSource>(*src);
-                       
+
                        if (afs) {
                                afs->update_header (position, *xnow, now);
                                afs->flush_header ();
                        }
                }
-               
-               /* construct a region to represent the bounced material */
 
-               boost::shared_ptr<Region> aregion = RegionFactory::create (srcs, 0, srcs.front()->length(), 
-                                                                          region_name_from_path (srcs.front()->name(), true));
+               /* construct a region to represent the bounced material */
 
-               ret = 0;
+               result = RegionFactory::create (srcs, 0, srcs.front()->length(), 
+                                               region_name_from_path (srcs.front()->name(), true));
        }
-               
+
   out:
-       if (ret) {
+       if (!result) {
                for (vector<boost::shared_ptr<Source> >::iterator src = srcs.begin(); src != srcs.end(); ++src) {
                        boost::shared_ptr<AudioFileSource> afs = boost::dynamic_pointer_cast<AudioFileSource>(*src);
 
                        if (afs) {
                                afs->mark_for_remove ();
                        }
-
+                       
                        (*src)->drop_references ();
                }
 
        } else {
                for (vector<boost::shared_ptr<Source> >::iterator src = srcs.begin(); src != srcs.end(); ++src) {
                        boost::shared_ptr<AudioFileSource> afs = boost::dynamic_pointer_cast<AudioFileSource>(*src);
-                       
+
                        if (afs)
                                afs->done_with_peakfile_writes ();
                }
@@ -4031,7 +4237,7 @@ Session::write_one_audio_track (AudioTrack& track, nframes_t start, nframes_t le
 
        g_atomic_int_set (&processing_prohibited, 0);
 
-       return ret;
+       return result;
 }
 
 BufferSet&
@@ -4041,31 +4247,36 @@ Session::get_silent_buffers (ChanCount count)
        _silent_buffers->set_count(count);
 
        for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
-               for (size_t i=0; i < count.get(*t); ++i) {
+               for (size_t i= 0; i < count.get(*t); ++i) {
                        _silent_buffers->get(*t, i).clear();
                }
        }
-       
+
        return *_silent_buffers;
 }
 
 BufferSet&
 Session::get_scratch_buffers (ChanCount count)
 {
-       assert(_scratch_buffers->available() >= count);
-       _scratch_buffers->set_count(count);
+       if (count != ChanCount::ZERO) {
+               assert(_scratch_buffers->available() >= count);
+               _scratch_buffers->set_count(count);
+       } else {
+               _scratch_buffers->set_count (_scratch_buffers->available());
+       }
+
        return *_scratch_buffers;
 }
 
 BufferSet&
-Session::get_send_buffers (ChanCount count)
+Session::get_mix_buffers (ChanCount count)
 {
-       assert(_send_buffers->available() >= count);
-       _send_buffers->set_count(count);
-       return *_send_buffers;
+       assert(_mix_buffers->available() >= count);
+       _mix_buffers->set_count(count);
+       return *_mix_buffers;
 }
 
-uint32_t 
+uint32_t
 Session::ntracks () const
 {
        uint32_t n = 0;
@@ -4080,7 +4291,7 @@ Session::ntracks () const
        return n;
 }
 
-uint32_t 
+uint32_t
 Session::nbusses () const
 {
        uint32_t n = 0;
@@ -4107,3 +4318,21 @@ Session::compute_initial_length ()
        return _engine.frame_rate() * 60 * 5;
 }
 
+void
+Session::sync_order_keys (const char* base)
+{
+       if (!Config->get_sync_all_route_ordering()) {
+               /* leave order keys as they are */
+               return;
+       }
+
+       boost::shared_ptr<RouteList> r = routes.reader ();
+
+       for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
+               (*i)->sync_order_keys (base);
+       }
+
+       Route::SyncOrderKeys (base); // EMIT SIGNAL
+}
+
+