integrate Session::remove_routes() from Tracks and replace Session::remove_route...
[ardour.git] / libs / ardour / session.cc
index 3bdee5d6a115a22393a55620e95caaab5b27167f..9df9f1940730ea15a9e300a5b9b9097b3b66dfc4 100644 (file)
@@ -66,6 +66,7 @@
 #include "ardour/control_protocol_manager.h"
 #include "ardour/data_type.h"
 #include "ardour/debug.h"
+#include "ardour/directory_names.h"
 #include "ardour/filename_extensions.h"
 #include "ardour/graph.h"
 #include "ardour/midiport_manager.h"
@@ -77,6 +78,7 @@
 #include "ardour/plugin.h"
 #include "ardour/plugin_insert.h"
 #include "ardour/process_thread.h"
+#include "ardour/profile.h"
 #include "ardour/rc_configuration.h"
 #include "ardour/recent_sessions.h"
 #include "ardour/region.h"
@@ -91,7 +93,9 @@
 #include "ardour/smf_source.h"
 #include "ardour/source_factory.h"
 #include "ardour/speakers.h"
+#include "ardour/tempo.h"
 #include "ardour/track.h"
+#include "ardour/user_bundle.h"
 #include "ardour/utils.h"
 
 #include "midi++/port.h"
@@ -170,6 +174,7 @@ Session::Session (AudioEngine &eng,
        , _writable (false)
        , _was_seamless (Config->get_seamless_loop ())
        , _under_nsm_control (false)
+       , _xrun_count (0)
        , delta_accumulator_cnt (0)
        , average_slave_delta (1800) // !!! why 1800 ???
        , average_dir (0)
@@ -210,6 +215,8 @@ Session::Session (AudioEngine &eng,
        , rf_scale (1.0)
        , _locations (new Locations (*this))
        , _ignore_skips_updates (false)
+       , _rt_thread_active (false)
+       , _rt_emit_pending (false)
        , step_speed (0)
        , outbound_mtc_timecode_frame (0)
        , next_quarter_frame_to_send (-1)
@@ -237,6 +244,7 @@ Session::Session (AudioEngine &eng,
        , _all_route_group (new RouteGroup (*this, "all"))
        , routes (new RouteList)
        , _adding_routes_in_progress (false)
+       , _route_deletion_in_progress (false)
        , destructive_index (0)
        , _track_number_decimals(1)
        , solo_update_disabled (false)
@@ -262,10 +270,11 @@ Session::Session (AudioEngine &eng,
        , first_file_header_format_reset (true)
        , have_looped (false)
        , _have_rec_enabled_track (false)
+    , _have_rec_disabled_track (true)
        , _step_editors (0)
        , _suspend_timecode_transmission (0)
        ,  _speakers (new Speakers)
-       , _order_hint (0)
+       , _order_hint (-1)
        , ignore_route_processor_changes (false)
        , _scene_changer (0)
        , _midi_ports (0)
@@ -273,6 +282,9 @@ Session::Session (AudioEngine &eng,
 {
        uint32_t sr = 0;
 
+       pthread_mutex_init (&_rt_emit_mutex, 0);
+       pthread_cond_init (&_rt_emit_cond, 0);
+
        pre_engine_init (fullpath);
        
        if (_is_new) {
@@ -297,8 +309,11 @@ Session::Session (AudioEngine &eng,
                 * of a template.
                 */
 
-               if (!mix_template.empty() && load_state (_current_snapshot_name)) {
-                       throw failed_constructor ();
+               if (!mix_template.empty()) { 
+                       if (load_state (_current_snapshot_name)) {
+                               throw failed_constructor ();
+                       }
+                       store_recent_templates (mix_template);
                }
 
                /* load default session properties - if any */
@@ -351,6 +366,8 @@ Session::Session (AudioEngine &eng,
 
        _is_new = false;
 
+       emit_thread_start ();
+
        /* hook us up to the engine since we are now completely constructed */
 
        BootMessage (_("Connect to engine"));
@@ -442,6 +459,10 @@ Session::immediately_post_engine ()
                return -1;
        }
 
+       /* TODO, connect in different thread. (PortRegisteredOrUnregistered may be in RT context)
+        * can we do that? */
+        _engine.PortRegisteredOrUnregistered.connect_same_thread (*this, boost::bind (&Session::setup_bundles, this));
+
        return 0;
 }
 
@@ -564,6 +585,11 @@ Session::destroy ()
        /* not strictly necessary, but doing it here allows the shared_ptr debugging to work */
        playlists.reset ();
 
+       emit_thread_terminate ();
+
+       pthread_cond_destroy (&_rt_emit_cond);
+       pthread_mutex_destroy (&_rt_emit_mutex);
+
        delete _scene_changer; _scene_changer = 0;
        delete midi_control_ui; midi_control_ui = 0;
 
@@ -571,6 +597,8 @@ Session::destroy ()
        delete _midi_ports; _midi_ports = 0;
        delete _locations; _locations = 0;
 
+       delete _tempo_map;
+       
        DEBUG_TRACE (DEBUG::Destruction, "Session::destroy() done\n");
 
 #ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
@@ -685,6 +713,19 @@ Session::setup_click_state (const XMLNode* node)
 void
 Session::setup_bundles ()
 {
+
+       {
+               RCUWriter<BundleList> writer (_bundles);
+               boost::shared_ptr<BundleList> b = writer.get_copy ();
+               for (BundleList::iterator i = b->begin(); i != b->end();) {
+                       if (boost::dynamic_pointer_cast<UserBundle>(*i)) {
+                               ++i;
+                               continue;
+                       }
+                       i = b->erase(i);
+               }
+       }
+
        vector<string> inputs[DataType::num_types];
        vector<string> outputs[DataType::num_types];
        for (uint32_t i = 0; i < DataType::num_types; ++i) {
@@ -704,13 +745,18 @@ Session::setup_bundles ()
 
        for (uint32_t np = 0; np < outputs[DataType::AUDIO].size(); ++np) {
                char buf[32];
-               snprintf (buf, sizeof (buf), _("out %" PRIu32), np+1);
+               std::string pn = _engine.get_pretty_name_by_name (outputs[DataType::AUDIO][np]);
+               if (!pn.empty()) {
+                       snprintf (buf, sizeof (buf), _("out %s"), pn.substr(0,12).c_str());
+               } else {
+                       snprintf (buf, sizeof (buf), _("out %" PRIu32), np+1);
+               }
 
                boost::shared_ptr<Bundle> c (new Bundle (buf, true));
                c->add_channel (_("mono"), DataType::AUDIO);
                c->set_port (0, outputs[DataType::AUDIO][np]);
 
-               add_bundle (c);
+               add_bundle (c, false);
        }
 
        /* stereo output bundles */
@@ -725,7 +771,7 @@ Session::setup_bundles ()
                        c->add_channel (_("R"), DataType::AUDIO);
                        c->set_port (1, outputs[DataType::AUDIO][np + 1]);
 
-                       add_bundle (c);
+                       add_bundle (c, false);
                }
        }
 
@@ -733,13 +779,18 @@ Session::setup_bundles ()
 
        for (uint32_t np = 0; np < inputs[DataType::AUDIO].size(); ++np) {
                char buf[32];
-               snprintf (buf, sizeof (buf), _("in %" PRIu32), np+1);
+               std::string pn = _engine.get_pretty_name_by_name (inputs[DataType::AUDIO][np]);
+               if (!pn.empty()) {
+                       snprintf (buf, sizeof (buf), _("in %s"), pn.substr(0,12).c_str());
+               } else {
+                       snprintf (buf, sizeof (buf), _("in %" PRIu32), np+1);
+               }
 
                boost::shared_ptr<Bundle> c (new Bundle (buf, false));
                c->add_channel (_("mono"), DataType::AUDIO);
                c->set_port (0, inputs[DataType::AUDIO][np]);
 
-               add_bundle (c);
+               add_bundle (c, false);
        }
 
        /* stereo input bundles */
@@ -755,7 +806,7 @@ Session::setup_bundles ()
                        c->add_channel (_("R"), DataType::AUDIO);
                        c->set_port (1, inputs[DataType::AUDIO][np + 1]);
 
-                       add_bundle (c);
+                       add_bundle (c, false);
                }
        }
 
@@ -763,26 +814,36 @@ Session::setup_bundles ()
 
        for (uint32_t np = 0; np < inputs[DataType::MIDI].size(); ++np) {
                string n = inputs[DataType::MIDI][np];
-               boost::erase_first (n, X_("alsa_pcm:"));
-
+               std::string pn = _engine.get_pretty_name_by_name (n);
+               if (!pn.empty()) {
+                       n = pn;
+               } else {
+                       boost::erase_first (n, X_("alsa_pcm:"));
+               }
                boost::shared_ptr<Bundle> c (new Bundle (n, false));
                c->add_channel ("", DataType::MIDI);
                c->set_port (0, inputs[DataType::MIDI][np]);
-               add_bundle (c);
+               add_bundle (c, false);
        }
 
        /* MIDI output bundles */
 
        for (uint32_t np = 0; np < outputs[DataType::MIDI].size(); ++np) {
                string n = outputs[DataType::MIDI][np];
-               boost::erase_first (n, X_("alsa_pcm:"));
-
+               std::string pn = _engine.get_pretty_name_by_name (n);
+               if (!pn.empty()) {
+                       n = pn;
+               } else {
+                       boost::erase_first (n, X_("alsa_pcm:"));
+               }
                boost::shared_ptr<Bundle> c (new Bundle (n, true));
                c->add_channel ("", DataType::MIDI);
                c->set_port (0, outputs[DataType::MIDI][np]);
-               add_bundle (c);
+               add_bundle (c, false);
        }
 
+       // we trust the backend to only calls us if there's a change
+       BundleAddedOrRemoved (); /* EMIT SIGNAL */
 }
 
 void
@@ -1019,6 +1080,121 @@ Session::add_monitor_section ()
        }
 }
 
+void
+Session::reset_monitor_section ()
+{
+       /* Process lock should be held by the caller.*/
+
+       if (!_monitor_out) {
+               return;
+       }
+
+       uint32_t limit = _master_out->n_outputs().n_audio();
+
+       /* connect the inputs to the master bus outputs. this
+        * represents a separate data feed from the internal sends from
+        * each route. as of jan 2011, it allows the monitor section to
+        * conditionally ignore either the internal sends or the normal
+        * input feed, but we should really find a better way to do
+        * this, i think.
+        */
+
+       _master_out->output()->disconnect (this);
+       _monitor_out->output()->disconnect (this);
+
+       _monitor_out->input()->ensure_io (_master_out->output()->n_ports(), false, this);
+       _monitor_out->output()->ensure_io (_master_out->output()->n_ports(), false, this);
+
+       for (uint32_t n = 0; n < limit; ++n) {
+               boost::shared_ptr<AudioPort> p = _monitor_out->input()->ports().nth_audio_port (n);
+               boost::shared_ptr<AudioPort> o = _master_out->output()->ports().nth_audio_port (n);
+
+               if (o) {
+                       string connect_to = o->name();
+                       if (_monitor_out->input()->connect (p, connect_to, this)) {
+                               error << string_compose (_("cannot connect control input %1 to %2"), n, connect_to)
+                                     << endmsg;
+                               break;
+                       }
+               }
+       }
+
+       /* connect monitor section to physical outs
+        */
+
+       if (Config->get_auto_connect_standard_busses()) {
+
+               if (!Config->get_monitor_bus_preferred_bundle().empty()) {
+
+                       boost::shared_ptr<Bundle> b = bundle_by_name (Config->get_monitor_bus_preferred_bundle());
+
+                       if (b) {
+                               _monitor_out->output()->connect_ports_to_bundle (b, true, this);
+                       } else {
+                               warning << string_compose (_("The preferred I/O for the monitor bus (%1) cannot be found"),
+                                                          Config->get_monitor_bus_preferred_bundle())
+                                       << endmsg;
+                       }
+
+               } else {
+
+                       /* Monitor bus is audio only */
+
+                       vector<string> outputs[DataType::num_types];
+
+                       for (uint32_t i = 0; i < DataType::num_types; ++i) {
+                               _engine.get_physical_outputs (DataType (DataType::Symbol (i)), outputs[i]);
+                       }
+
+                       uint32_t mod = outputs[DataType::AUDIO].size();
+                       uint32_t limit = _monitor_out->n_outputs().get (DataType::AUDIO);
+
+                       if (mod != 0) {
+
+                               for (uint32_t n = 0; n < limit; ++n) {
+
+                                       boost::shared_ptr<Port> p = _monitor_out->output()->ports().port(DataType::AUDIO, n);
+                                       string connect_to;
+                                       if (outputs[DataType::AUDIO].size() > (n % mod)) {
+                                               connect_to = outputs[DataType::AUDIO][n % mod];
+                                       }
+
+                                       if (!connect_to.empty()) {
+                                               if (_monitor_out->output()->connect (p, connect_to, this)) {
+                                                       error << string_compose (
+                                                               _("cannot connect control output %1 to %2"),
+                                                               n, connect_to)
+                                                             << endmsg;
+                                                       break;
+                                               }
+                                       }
+                               }
+                       }
+               }
+       }
+
+       /* Connect tracks to monitor section. Note that in an
+          existing session, the internal sends will already exist, but we want the
+          routes to notice that they connect to the control out specifically.
+       */
+
+
+       boost::shared_ptr<RouteList> rls = routes.reader ();
+
+       PBD::Unwinder<bool> uw (ignore_route_processor_changes, true);
+
+       for (RouteList::iterator x = rls->begin(); x != rls->end(); ++x) {
+
+               if ((*x)->is_monitor()) {
+                       /* relax */
+               } else if ((*x)->is_master()) {
+                       /* relax */
+               } else {
+                       (*x)->enable_monitor_send ();
+               }
+       }
+}
+
 void
 Session::hookup_io ()
 {
@@ -1176,10 +1352,10 @@ Session::auto_loop_changed (Location* location)
        framepos_t dcp;
        framecnt_t dcl;
        auto_loop_declick_range (location, dcp, dcl);
-       replace_event (SessionEvent::AutoLoopDeclick, dcp, dcl);
 
        if (transport_rolling() && play_loop) {
 
+               replace_event (SessionEvent::AutoLoopDeclick, dcp, dcl);
 
                // if (_transport_frame > location->end()) {
 
@@ -1203,6 +1379,9 @@ Session::auto_loop_changed (Location* location)
                        }
 
                }
+       } else {
+               clear_events (SessionEvent::AutoLoopDeclick);
+               clear_events (SessionEvent::AutoLoop);
        }
 
        last_loopend = location->end();
@@ -1428,6 +1607,15 @@ Session::location_added (Location *location)
                 _session_range_location = location;
         }
 
+        if (location->is_mark()) {
+                /* listen for per-location signals that require us to do any * global updates for marks */
+
+                location->StartChanged.connect_same_thread (skip_update_connections, boost::bind (&Session::update_marks, this, location));
+                location->EndChanged.connect_same_thread (skip_update_connections, boost::bind (&Session::update_marks, this, location));
+                location->Changed.connect_same_thread (skip_update_connections, boost::bind (&Session::update_marks, this, location));
+                location->FlagsChanged.connect_same_thread (skip_update_connections, boost::bind (&Session::update_marks, this, location));
+        }
+
         if (location->is_skip()) {
                 /* listen for per-location signals that require us to update skip-locate events */
 
@@ -1438,7 +1626,7 @@ Session::location_added (Location *location)
 
                 update_skips (location, true);
         }
-
+        
        set_dirty ();
 }
 
@@ -2022,7 +2210,11 @@ Session::new_midi_track (const ChanCount& input, const ChanCount& output, boost:
   failed:
        if (!new_routes.empty()) {
                StateProtector sp (this);
-               add_routes (new_routes, true, true, true);
+               if (Profile->get_trx()) {
+                       add_routes (new_routes, false, false, false);
+               } else {
+                       add_routes (new_routes, true, true, false);
+               }
 
                if (instrument) {
                        for (RouteList::iterator r = new_routes.begin(); r != new_routes.end(); ++r) {
@@ -2184,6 +2376,43 @@ Session::reconnect_existing_routes (bool withLock, bool reconnect_master, bool r
          */
 }
 
+#ifdef USE_TRACKS_CODE_FEATURES
+
+void
+Session::reconnect_midi_scene_ports(bool inputs)
+{
+       if (inputs) {
+               scene_in()->disconnect_all ();
+        
+               std::vector<EngineStateController::MidiPortState> midi_port_states;
+               EngineStateController::instance()->get_physical_midi_input_states (midi_port_states);
+        
+               std::vector<EngineStateController::MidiPortState>::iterator state_iter = midi_port_states.begin();
+        
+               for (; state_iter != midi_port_states.end(); ++state_iter) {
+                       if (state_iter->active && state_iter->available && state_iter->connected) {
+                               scene_in()->connect (state_iter->name);
+                       }
+               }
+
+       } else {
+               scene_out()->disconnect_all ();
+
+               std::vector<EngineStateController::MidiPortState> midi_port_states;
+               EngineStateController::instance()->get_physical_midi_output_states (midi_port_states);
+        
+               std::vector<EngineStateController::MidiPortState>::iterator state_iter = midi_port_states.begin();
+        
+               for (; state_iter != midi_port_states.end(); ++state_iter) {
+                       if (state_iter->active && state_iter->available && state_iter->connected) {
+                               scene_out()->connect (state_iter->name);
+                       }
+               }
+
+       }
+}
+
+#endif
 
 /** Caller must not hold process lock
  *  @param name_template string to use for the start of the name, or "" to use "Audio".
@@ -2198,10 +2427,19 @@ Session::new_audio_track (int input_channels, int output_channels, TrackMode mod
        RouteList new_routes;
        list<boost::shared_ptr<AudioTrack> > ret;
 
-       bool const use_number = (how_many != 1) || name_template.empty () || name_template == _("Audio");
+       string name_pattern;
 
+       if (Profile->get_trx() ) {
+               name_pattern = "Track ";
+       } else {
+               name_pattern = "Audio ";
+       }
+    
+       bool const use_number = (how_many != 1) || name_template.empty () || name_template == _(name_pattern.c_str() );
+       
        while (how_many) {
-               if (!find_route_name (name_template.empty() ? _("Audio") : name_template, ++track_id, track_name, sizeof(track_name), use_number)) {
+
+               if (!find_route_name (name_template.empty() ? _(name_pattern.c_str()) : name_template, ++track_id, track_name, sizeof(track_name), use_number)) {
                        error << "cannot find name for new audio track" << endmsg;
                        goto failed;
                }
@@ -2272,7 +2510,11 @@ Session::new_audio_track (int input_channels, int output_channels, TrackMode mod
   failed:
        if (!new_routes.empty()) {
                StateProtector sp (this);
-               add_routes (new_routes, true, true, true);
+               if (Profile->get_trx()) {
+                       add_routes (new_routes, false, false, false);
+               } else {
+                       add_routes (new_routes, true, true, false);
+               }
        }
 
        return ret;
@@ -2358,7 +2600,11 @@ Session::new_audio_route (int input_channels, int output_channels, RouteGroup* r
   failure:
        if (!ret.empty()) {
                StateProtector sp (this);
-               add_routes (ret, false, true, true); // autoconnect outputs only
+               if (Profile->get_trx()) {
+                       add_routes (ret, false, false, false);
+               } else {
+                       add_routes (ret, false, true, true); // autoconnect // outputs only
+               }
        }
 
        return ret;
@@ -2475,7 +2721,11 @@ Session::new_route_from_template (uint32_t how_many, const std::string& template
   out:
        if (!ret.empty()) {
                StateProtector sp (this);
-               add_routes (ret, true, true, true);
+               if (Profile->get_trx()) {
+                       add_routes (ret, false, false, false);
+               } else {
+                       add_routes (ret, true, true, false);
+               }
                IO::enable_connecting ();
        }
 
@@ -2506,6 +2756,8 @@ Session::add_routes (RouteList& new_routes, bool input_auto_connect, bool output
        
        reassign_track_numbers();
 
+       update_route_record_state ();
+    
        RouteAdded (new_routes); /* EMIT SIGNAL */
 }
 
@@ -2516,9 +2768,9 @@ Session::add_routes_inner (RouteList& new_routes, bool input_auto_connect, bool
         ChanCount existing_outputs;
        uint32_t order = next_control_id();
 
-       if (_order_hint != 0) {
+       if (_order_hint > -1) {
                order = _order_hint;
-               _order_hint = 0;
+               _order_hint = -1;
        }
 
         count_existing_track_channels (existing_inputs, existing_outputs);
@@ -2563,7 +2815,7 @@ Session::add_routes_inner (RouteList& new_routes, bool input_auto_connect, bool
                if (tr) {
                        tr->PlaylistChanged.connect_same_thread (*this, boost::bind (&Session::track_playlist_changed, this, boost::weak_ptr<Track> (tr)));
                        track_playlist_changed (boost::weak_ptr<Track> (tr));
-                       tr->RecordEnableChanged.connect_same_thread (*this, boost::bind (&Session::update_have_rec_enabled_track, this));
+                       tr->RecordEnableChanged.connect_same_thread (*this, boost::bind (&Session::update_route_record_state, this));
 
                        boost::shared_ptr<MidiTrack> mt = boost::dynamic_pointer_cast<MidiTrack> (tr);
                        if (mt) {
@@ -2619,7 +2871,7 @@ Session::globally_set_send_gains_to_zero (boost::shared_ptr<Route> dest)
 
        for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
                if ((s = (*i)->internal_send_for (dest)) != 0) {
-                       s->amp()->gain_control()->set_value (0.0);
+                       s->amp()->gain_control()->set_value (GAIN_COEFF_ZERO);
                }
        }
 }
@@ -2632,7 +2884,7 @@ Session::globally_set_send_gains_to_unity (boost::shared_ptr<Route> dest)
 
        for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
                if ((s = (*i)->internal_send_for (dest)) != 0) {
-                       s->amp()->gain_control()->set_value (1.0);
+                       s->amp()->gain_control()->set_value (GAIN_COEFF_UNITY);
                }
        }
 }
@@ -2697,100 +2949,128 @@ Session::add_internal_send (boost::shared_ptr<Route> dest, boost::shared_ptr<Pro
        graph_reordered ();
 }
 
+
 void
-Session::remove_route (boost::shared_ptr<Route> route)
+Session::remove_routes (boost::shared_ptr<RouteList> routes_to_remove)
 {
-       if (route == _master_out) {
-               return;
-       }
-
-       route->set_solo (false, this);
-
-       {
+       { // RCU Writer scope
                RCUWriter<RouteList> writer (routes);
                boost::shared_ptr<RouteList> rs = writer.get_copy ();
-
-               rs->remove (route);
-
-               /* deleting the master out seems like a dumb
-                  idea, but its more of a UI policy issue
-                  than our concern.
-               */
-
-               if (route == _master_out) {
-                       _master_out = boost::shared_ptr<Route> ();
-               }
-
-               if (route == _monitor_out) {
-                       _monitor_out.reset ();
-               }
-
-               /* writer goes out of scope, forces route list update */
-       }
-
-       update_route_solo_state ();
-
-       // We need to disconnect the route's inputs and outputs
-
-       route->input()->disconnect (0);
-       route->output()->disconnect (0);
-
-       /* if the route had internal sends sending to it, remove them */
-       if (route->internal_return()) {
-
-               boost::shared_ptr<RouteList> r = routes.reader ();
-               for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-                       boost::shared_ptr<Send> s = (*i)->internal_send_for (route);
-                       if (s) {
-                               (*i)->remove_processor (s);
+        
+        
+               for (RouteList::iterator iter = routes_to_remove->begin(); iter != routes_to_remove->end(); ++iter) {
+            
+                       if (*iter == _master_out) {
+                               continue;
+                       }
+            
+                       (*iter)->set_solo (false, this);
+            
+                       rs->remove (*iter);
+            
+                       /* deleting the master out seems like a dumb
+                          idea, but its more of a UI policy issue
+                          than our concern.
+                       */
+            
+                       if (*iter == _master_out) {
+                               _master_out = boost::shared_ptr<Route> ();
+                       }
+            
+                       if (*iter == _monitor_out) {
+                               _monitor_out.reset ();
                        }
-               }
-       }
 
-       /* if the monitoring section had a pointer to this route, remove it */
-       if (_monitor_out && !route->is_master() && !route->is_monitor()) {
-               Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
-               PBD::Unwinder<bool> uw (ignore_route_processor_changes, true);
-               route->remove_aux_or_listen (_monitor_out);
-       }
+                       update_route_solo_state ();
+            
+                       // We need to disconnect the route's inputs and outputs
+            
+                       (*iter)->input()->disconnect (0);
+                       (*iter)->output()->disconnect (0);
+            
+                       /* if the route had internal sends sending to it, remove them */
+                       if ((*iter)->internal_return()) {
+                
+                               boost::shared_ptr<RouteList> r = routes.reader ();
+                               for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
+                                       boost::shared_ptr<Send> s = (*i)->internal_send_for (*iter);
+                                       if (s) {
+                                               (*i)->remove_processor (s);
+                                       }
+                               }
+                       }
+            
+                       /* if the monitoring section had a pointer to this route, remove it */
+                       if (_monitor_out && !(*iter)->is_master() && !(*iter)->is_monitor()) {
+                               Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
+                               PBD::Unwinder<bool> uw (ignore_route_processor_changes, true);
+                               (*iter)->remove_aux_or_listen (_monitor_out);
+                       }
+            
+                       boost::shared_ptr<MidiTrack> mt = boost::dynamic_pointer_cast<MidiTrack> (*iter);
+                       if (mt && mt->step_editing()) {
+                               if (_step_editors > 0) {
+                                       _step_editors--;
+                               }
+                       }
 
-       boost::shared_ptr<MidiTrack> mt = boost::dynamic_pointer_cast<MidiTrack> (route);
-       if (mt && mt->step_editing()) {
-               if (_step_editors > 0) {
-                       _step_editors--;
+                       RouteAddedOrRemoved (false); /* EMIT SIGNAL */
                }
-       }
+    
+               /* writer goes out of scope, forces route list update */
 
+       } // end of RCU Writer scope
+    
        update_latency_compensation ();
        set_dirty();
-
+    
        /* Re-sort routes to remove the graph's current references to the one that is
         * going away, then flush old references out of the graph.
+        * Wave Tracks: reconnect routes
         */
 
-       resort_routes ();
+       if (ARDOUR::Profile->get_trx () ) {
+               reconnect_existing_routes(true, false);
+       } else {
+               resort_routes ();
+       }
+    
        if (_process_graph) {
                _process_graph->clear_other_chain ();
        }
-
+    
        /* 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) */
-
+    
        routes.flush ();
+    
+       /* try to cause everyone to drop their references
+        * and unregister ports from the backend
+        */
+       PBD::Unwinder<bool> uw_flag (_route_deletion_in_progress, true);
 
-       /* try to cause everyone to drop their references */
-
-       route->drop_references ();
-
+       for (RouteList::iterator iter = routes_to_remove->begin(); iter != routes_to_remove->end(); ++iter) {
+               (*iter)->drop_references ();
+       }
+    
        Route::RemoteControlIDChange(); /* EMIT SIGNAL */
-
+    
        /* save the new state of the world */
-
+    
        if (save_state (_current_snapshot_name)) {
                save_history (_current_snapshot_name);
        }
+
        reassign_track_numbers();
+       update_route_record_state ();
+}
+
+void
+Session::remove_route (boost::shared_ptr<Route> route)
+{
+       boost::shared_ptr<RouteList> rl (new RouteList);
+       rl->push_back (route);
+       remove_routes (rl);
 }
 
 void
@@ -2984,6 +3264,7 @@ Session::route_solo_changed (bool self_solo_change, void* /*src*/, boost::weak_p
 
        for (RouteList::iterator i = uninvolved.begin(); i != uninvolved.end(); ++i) {
                DEBUG_TRACE (DEBUG::Solo, string_compose ("mute change for %1, which neither feeds or is fed by %2\n", (*i)->name(), route->name()));
+               (*i)->act_on_mute ();
                (*i)->mute_changed (this);
        }
 
@@ -3575,6 +3856,41 @@ Session::count_sources_by_origin (const string& path)
 string
 Session::peak_path (string base) const
 {
+       if (Glib::path_is_absolute (base)) {
+
+               /* rip the session dir from the audiofile source */
+
+               string session_path;
+               string interchange_dir_string = string (interchange_dir_name) + G_DIR_SEPARATOR;
+               bool in_another_session = true;
+               
+               if (base.find (interchange_dir_string) != string::npos) {
+               
+                       session_path = Glib::path_get_dirname (base); /* now ends in audiofiles */
+                       session_path = Glib::path_get_dirname (session_path); /* now ends in session name */
+                       session_path = Glib::path_get_dirname (session_path); /* now ends in interchange */
+                       session_path = Glib::path_get_dirname (session_path); /* now has session path */
+
+                       /* see if it is within our session */
+
+                       for (vector<space_and_path>::const_iterator i = session_dirs.begin(); i != session_dirs.end(); ++i) {
+                               if (i->path == session_path) {
+                                       in_another_session = false;
+                                       break;
+                               }
+                       }
+               } else {
+                       in_another_session = false;
+               }
+               
+
+               if (in_another_session) {
+                       SessionDirectory sd (session_path);
+                       return Glib::build_filename (sd.peak_path(), Glib::path_get_basename (base) + peakfile_suffix);
+               }
+       }
+
+       base = Glib::path_get_basename (base);
        return Glib::build_filename (_session_dir->peak_path(), base + peakfile_suffix);
 }
 
@@ -3638,8 +3954,19 @@ Session::new_audio_source_path_for_embedded (const std::string& path)
        return newpath;
 }
 
+/** Return true if there are no audio file sources that use @param name as 
+ * the filename component of their path. 
+ *
+ * Return false otherwise.
+ *
+ * This method MUST ONLY be used to check in-session, mono files since it 
+ * hard-codes the channel of the audio file source we are looking for as zero.
+ * 
+ * If/when Ardour supports native files in non-mono formats, the logic here
+ * will need to be revisited.
+ */
 bool
-Session::audio_source_name_is_unique (const string& name, uint32_t chan)
+Session::audio_source_name_is_unique (const string& name)
 {
        std::vector<string> sdirs = source_search_path (DataType::AUDIO);
        vector<space_and_path>::iterator i;
@@ -3672,7 +3999,7 @@ Session::audio_source_name_is_unique (const string& name, uint32_t chan)
                
                string possible_path = Glib::build_filename (spath, name);
 
-               if (audio_source_by_path_and_channel (possible_path, chan)) {
+               if (audio_source_by_path_and_channel (possible_path, 0)) {
                        existing++;
                        break;
                }
@@ -3740,7 +4067,7 @@ Session::new_audio_source_path (const string& base, uint32_t nchan, uint32_t cha
 
                possible_name = format_audio_source_name (legalized, nchan, chan, destructive, take_required, cnt, some_related_source_name_exists);
                
-               if (audio_source_name_is_unique (possible_name, chan)) {
+               if (audio_source_name_is_unique (possible_name)) {
                        break;
                }
                
@@ -4087,7 +4414,7 @@ Session::available_capture_duration ()
 }
 
 void
-Session::add_bundle (boost::shared_ptr<Bundle> bundle)
+Session::add_bundle (boost::shared_ptr<Bundle> bundle, bool emit_signal)
 {
        {
                RCUWriter<BundleList> writer (_bundles);
@@ -4095,7 +4422,9 @@ Session::add_bundle (boost::shared_ptr<Bundle> bundle)
                b->push_back (bundle);
        }
 
-       BundleAdded (bundle); /* EMIT SIGNAL */
+       if (emit_signal) {
+               BundleAddedOrRemoved (); /* EMIT SIGNAL */
+       }
 
        set_dirty();
 }
@@ -4117,7 +4446,7 @@ Session::remove_bundle (boost::shared_ptr<Bundle> bundle)
        }
 
        if (removed) {
-                BundleRemoved (bundle); /* EMIT SIGNAL */
+                BundleAddedOrRemoved (); /* EMIT SIGNAL */
        }
 
        set_dirty();
@@ -4640,6 +4969,12 @@ Session::gain_automation_buffer() const
        return ProcessThread::gain_automation_buffer ();
 }
 
+gain_t*
+Session::trim_automation_buffer() const
+{
+       return ProcessThread::trim_automation_buffer ();
+}
+
 gain_t*
 Session::send_gain_automation_buffer() const
 {
@@ -4720,9 +5055,15 @@ Session::have_rec_enabled_track () const
        return g_atomic_int_get (const_cast<gint*>(&_have_rec_enabled_track)) == 1;
 }
 
+bool
+Session::have_rec_disabled_track () const
+{
+    return g_atomic_int_get (const_cast<gint*>(&_have_rec_disabled_track)) == 1;
+}
+
 /** Update the state of our rec-enabled tracks flag */
 void
-Session::update_have_rec_enabled_track ()
+Session::update_route_record_state ()
 {
        boost::shared_ptr<RouteList> rl = routes.reader ();
        RouteList::iterator i = rl->begin();
@@ -4743,6 +5084,20 @@ Session::update_have_rec_enabled_track ()
        if (g_atomic_int_get (&_have_rec_enabled_track) != old) {
                RecordStateChanged (); /* EMIT SIGNAL */
        }
+
+    
+    i = rl->begin();
+       while (i != rl->end ()) {
+        
+               boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (*i);
+               if (tr && !tr->record_enabled ()) {
+                       break;
+               }
+        
+               ++i;
+       }
+    
+    g_atomic_int_set (&_have_rec_disabled_track, i != rl->end () ? 1 : 0);
 }
 
 void
@@ -4785,7 +5140,8 @@ Session::route_added_to_route_group (RouteGroup* rg, boost::weak_ptr<Route> r)
 void
 Session::route_removed_from_route_group (RouteGroup* rg, boost::weak_ptr<Route> r)
 {
-       RouteRemovedFromRouteGroup (rg, r);
+       update_route_record_state ();
+       RouteRemovedFromRouteGroup (rg, r); /* EMIT SIGNAL */
 }
 
 boost::shared_ptr<RouteList>