move speed quietning code into Delivery, where it belongs.
[ardour.git] / libs / ardour / session.cc
index 72e61b80846fd0815ce2beddf9808ebf047df607..43b5790228b8324d31e09835c3d46010ed579bee 100644 (file)
@@ -46,6 +46,7 @@
 #include "pbd/search_path.h"
 #include "pbd/stacktrace.h"
 #include "pbd/stl_delete.h"
+#include "pbd/replace_all.h"
 #include "pbd/unwind.h"
 
 #include "ardour/amp.h"
@@ -67,6 +68,9 @@
 #include "ardour/data_type.h"
 #include "ardour/debug.h"
 #include "ardour/directory_names.h"
+#ifdef USE_TRACKS_CODE_FEATURES
+#include "ardour/engine_state_controller.h"
+#endif
 #include "ardour/filename_extensions.h"
 #include "ardour/graph.h"
 #include "ardour/midiport_manager.h"
 
 #include "i18n.h"
 
+#include <glibmm/checksum.h>
+
 namespace ARDOUR {
 class MidiSource;
 class Processor;
@@ -114,6 +120,7 @@ using namespace ARDOUR;
 using namespace PBD;
 
 bool Session::_disable_all_loaded_plugins = false;
+bool Session::_bypass_all_loaded_plugins = false;
 
 PBD::Signal1<int,uint32_t> Session::AudioEngineSetupRequired;
 PBD::Signal1<void,std::string> Session::Dialog;
@@ -131,10 +138,17 @@ PBD::Signal0<void> Session::FeedbackDetected;
 PBD::Signal0<void> Session::SuccessfulGraphSort;
 PBD::Signal2<void,std::string,std::string> Session::VersionMismatch;
 
-const framecnt_t Session::bounce_chunk_size = 65536;
+const framecnt_t Session::bounce_chunk_size = 8192;
 static void clean_up_session_event (SessionEvent* ev) { delete ev; }
 const SessionEvent::RTeventCallback Session::rt_cleanup (clean_up_session_event);
 
+// seconds should be added after the region exceeds end marker
+#ifdef USE_TRACKS_CODE_FEATURES
+const uint32_t Session::session_end_shift = 5;
+#else
+const uint32_t Session::session_end_shift = 0;
+#endif
+
 /** @param snapshot_name Snapshot name, without .ardour suffix */
 Session::Session (AudioEngine &eng,
                   const string& fullpath,
@@ -180,6 +194,8 @@ Session::Session (AudioEngine &eng,
        , average_dir (0)
        , have_first_delta_accumulator (false)
        , _slave_state (Stopped)
+       , _mtc_active (false)
+       , _ltc_active (false)
        , post_export_sync (false)
        , post_export_position (0)
        , _exporting (false)
@@ -244,6 +260,7 @@ Session::Session (AudioEngine &eng,
        , _all_route_group (new RouteGroup (*this, "all"))
        , routes (new RouteList)
        , _adding_routes_in_progress (false)
+       , _reconnecting_routes_in_progress (false)
        , _route_deletion_in_progress (false)
        , destructive_index (0)
        , _track_number_decimals(1)
@@ -265,6 +282,8 @@ Session::Session (AudioEngine &eng,
        , click_emphasis_length (0)
        , _clicks_cleared (0)
        , _play_range (false)
+       , _range_selection (-1,-1)
+       , _object_selection (-1,-1)
        , main_outs (0)
        , first_file_data_format_reset (true)
        , first_file_header_format_reset (true)
@@ -288,14 +307,20 @@ Session::Session (AudioEngine &eng,
        pre_engine_init (fullpath);
        
        if (_is_new) {
+
+               Stateful::loading_state_version = CURRENT_SESSION_FILE_VERSION;
+
+#ifdef USE_TRACKS_CODE_FEATURES                
+               sr = EngineStateController::instance()->get_current_sample_rate();
+#endif
                if (ensure_engine (sr)) {
                        destroy ();
-                       throw failed_constructor ();
+                       throw SessionException (_("Cannot connect to audio/midi engine"));
                }
 
                if (create (mix_template, bus_profile)) {
                        destroy ();
-                       throw failed_constructor ();
+                       throw SessionException (_("Session initialization failed"));
                }
 
                /* if a mix template was provided, then ::create() will
@@ -311,7 +336,7 @@ Session::Session (AudioEngine &eng,
 
                if (!mix_template.empty()) { 
                        if (load_state (_current_snapshot_name)) {
-                               throw failed_constructor ();
+                               throw SessionException (_("Failed to load template/snapshot state"));
                        }
                        store_recent_templates (mix_template);
                }
@@ -322,7 +347,7 @@ Session::Session (AudioEngine &eng,
        } else {
 
                if (load_state (_current_snapshot_name)) {
-                       throw failed_constructor ();
+                       throw SessionException (_("Failed to load state"));
                }
        
                /* try to get sample rate from XML state so that we
@@ -339,13 +364,13 @@ Session::Session (AudioEngine &eng,
 
                if (ensure_engine (sr)) {
                        destroy ();
-                       throw failed_constructor ();
+                       throw SessionException (_("Cannot connect to audio/midi engine"));
                }
        }
 
        if (post_engine_init ()) {
                destroy ();
-               throw failed_constructor ();
+               throw SessionException (_("Cannot configure audio/midi engine with session parameters"));
        }
 
        store_recent_sessions (_name, _path);
@@ -364,8 +389,6 @@ Session::Session (AudioEngine &eng,
        StartTimeChanged.connect_same_thread (*this, boost::bind (&Session::start_time_changed, this, _1));
        EndTimeChanged.connect_same_thread (*this, boost::bind (&Session::end_time_changed, this, _1));
 
-       _is_new = false;
-
        emit_thread_start ();
 
        /* hook us up to the engine since we are now completely constructed */
@@ -375,8 +398,53 @@ Session::Session (AudioEngine &eng,
        _engine.set_session (this);
        _engine.reset_timebase ();
 
-       BootMessage (_("Session loading complete"));
+#ifdef USE_TRACKS_CODE_FEATURES
+       
+       EngineStateController::instance()->set_session(this);
+       
+       if (_is_new ) {
+               if ( ARDOUR::Profile->get_trx () ) {
 
+                       /* Waves Tracks: fill session with tracks basing on the amount of inputs.
+                        * each available input must have corresponding track when session starts.
+                        */
+                       
+                       uint32_t how_many (0);
+                       
+                       std::vector<std::string> inputs;
+                       EngineStateController::instance()->get_physical_audio_inputs(inputs);
+                       
+                       how_many = inputs.size();
+                       
+                       list<boost::shared_ptr<AudioTrack> > tracks;
+                       
+                       // Track names after driver 
+                       if (Config->get_tracks_auto_naming() == NameAfterDriver) {
+                               string track_name = "";
+                               for (std::vector<string>::size_type i = 0; i < inputs.size(); ++i) {
+                                       string track_name;
+                                       track_name = inputs[i];
+                                       replace_all (track_name, "system:capture", "");
+                                       
+                                       list<boost::shared_ptr<AudioTrack> > single_track = new_audio_track (1, 1, Normal, 0, 1, track_name);
+                                       tracks.insert(tracks.begin(), single_track.front());
+                               }   
+                       } else { // Default track names
+                               tracks = new_audio_track (1, 1, Normal, 0, how_many, string());
+                       }
+                       
+                       if (tracks.size() != how_many) {
+                               destroy ();
+                               throw failed_constructor ();
+                       }
+               }
+       }
+#endif
+       
+       _is_new = false;
+       session_loaded ();
+
+       BootMessage (_("Session loading complete"));
 }
 
 Session::~Session ()
@@ -485,6 +553,10 @@ Session::destroy ()
 
        _engine.remove_session ();
 
+#ifdef USE_TRACKS_CODE_FEATURES
+       EngineStateController::instance()->remove_session();
+#endif
+
        /* deregister all ports - there will be no process or any other
         * callbacks from the engine any more.
         */
@@ -744,10 +816,10 @@ Session::setup_bundles ()
        /* mono output bundles */
 
        for (uint32_t np = 0; np < outputs[DataType::AUDIO].size(); ++np) {
-               char buf[32];
+               char buf[64];
                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());
+                       snprintf (buf, sizeof (buf), _("out %s"), pn.c_str());
                } else {
                        snprintf (buf, sizeof (buf), _("out %" PRIu32), np+1);
                }
@@ -778,10 +850,10 @@ Session::setup_bundles ()
        /* mono input bundles */
 
        for (uint32_t np = 0; np < inputs[DataType::AUDIO].size(); ++np) {
-               char buf[32];
+               char buf[64];
                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());
+                       snprintf (buf, sizeof (buf), _("in %s"), pn.c_str());
                } else {
                        snprintf (buf, sizeof (buf), _("in %" PRIu32), np+1);
                }
@@ -852,7 +924,13 @@ Session::auto_connect_master_bus ()
        if (!_master_out || !Config->get_auto_connect_standard_busses() || _monitor_out) {
                return;
        }
-               
+       
+       // Waves Tracks: Do not connect master bas for Tracks if AutoConnectMaster option is not set
+       // In this case it means "Multi Out" output mode
+       if (ARDOUR::Profile->get_trx() && !(Config->get_output_auto_connect() & AutoConnectMaster) ) {
+               return;
+       }
+
        /* if requested auto-connect the outputs to the first N physical ports.
         */
        
@@ -883,7 +961,7 @@ Session::auto_connect_master_bus ()
 void
 Session::remove_monitor_section ()
 {
-       if (!_monitor_out) {
+       if (!_monitor_out || Profile->get_trx()) {
                return;
        }
 
@@ -937,7 +1015,7 @@ Session::add_monitor_section ()
 {
        RouteList rl;
 
-       if (_monitor_out || !_master_out) {
+       if (_monitor_out || !_master_out || Profile->get_trx()) {
                return;
        }
 
@@ -950,10 +1028,13 @@ Session::add_monitor_section ()
 #ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
        // boost_debug_shared_ptr_mark_interesting (r.get(), "Route");
 #endif
-       {
+       try {
                Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
                r->input()->ensure_io (_master_out->output()->n_ports(), false, this);
                r->output()->ensure_io (_master_out->output()->n_ports(), false, this);
+       } catch (...) {
+               error << _("Cannot create monitor section. 'Monitor' Port name is not unique.") << endmsg;
+               return;
        }
 
        rl.push_back (r);
@@ -1085,7 +1166,7 @@ Session::reset_monitor_section ()
 {
        /* Process lock should be held by the caller.*/
 
-       if (!_monitor_out) {
+       if (!_monitor_out || Profile->get_trx()) {
                return;
        }
 
@@ -1384,6 +1465,19 @@ Session::auto_loop_changed (Location* location)
                clear_events (SessionEvent::AutoLoop);
        }
 
+       /* possibly move playhead if not rolling; if we are rolling we'll move
+          to the loop start on stop if that is appropriate.
+        */
+
+       framepos_t pos;
+
+       if (!transport_rolling() && select_playhead_priority_target (pos)) {
+               if (pos == location->start()) {
+                       request_locate (pos);
+               }
+       }
+
+       
        last_loopend = location->end();
        set_dirty ();
 }
@@ -1478,9 +1572,21 @@ Session::set_auto_loop_location (Location* location)
        location->StartChanged.connect_same_thread (loop_connections, boost::bind (&Session::auto_loop_changed, this, location));
        location->EndChanged.connect_same_thread (loop_connections, boost::bind (&Session::auto_loop_changed, this, location));
        location->Changed.connect_same_thread (loop_connections, boost::bind (&Session::auto_loop_changed, this, location));
+       location->FlagsChanged.connect_same_thread (loop_connections, boost::bind (&Session::auto_loop_changed, this, location));
 
        location->set_auto_loop (true, this);
 
+       if (Config->get_loop_is_mode() && play_loop && Config->get_seamless_loop()) {
+               // set all tracks to use internal looping
+               boost::shared_ptr<RouteList> rl = routes.reader ();
+               for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
+                       boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (*i);
+                       if (tr && !tr->hidden()) {
+                               tr->set_loop (location);
+                       }
+               }
+       }
+    
        /* take care of our stuff first */
 
        auto_loop_changed (location);
@@ -1490,12 +1596,6 @@ Session::set_auto_loop_location (Location* location)
        auto_loop_location_changed (location);
 }
 
-void
-Session::update_loop (Location*)
-{
-       set_dirty ();
-}
-
 void
 Session::update_marks (Location*)
 {
@@ -1505,10 +1605,10 @@ Session::update_marks (Location*)
 void
 Session::update_skips (Location* loc, bool consolidate)
 {
-    if (_ignore_skips_updates) {
-        return;
-    }
-    
+       if (_ignore_skips_updates) {
+               return;
+       }
+       
        Locations::LocationList skips;
 
         if (consolidate) {
@@ -1669,10 +1769,15 @@ Session::_locations_changed (const Locations::LocationList& locations)
            We might be re-adding a location here but it doesn't actually matter
            for all the locations that the Session takes an interest in.
         */
-
-       for (Locations::LocationList::const_iterator i = locations.begin(); i != locations.end(); ++i) {
-                location_added (*i);
-        }
+       
+       {
+               PBD::Unwinder<bool> protect_ignore_skip_updates (_ignore_skips_updates, true);
+               for (Locations::LocationList::const_iterator i = locations.begin(); i != locations.end(); ++i) {
+                       location_added (*i);
+               }
+       }
+       
+       update_skips (NULL, false);
 }
 
 void
@@ -1763,6 +1868,11 @@ Session::maybe_enable_record ()
 
        save_state ("", true);
 
+        if (Config->get_loop_is_mode()) {
+                /* makes no sense to use loop play as mode when recording */
+                request_play_loop (false);
+        }
+        
        if (_transport_speed) {
                if (!config.get_punch_in()) {
                        enable_record ();
@@ -1850,7 +1960,8 @@ Session::set_frame_rate (framecnt_t frames_per_second)
        sync_time_vars();
 
        clear_clicks ();
-
+       reset_write_sources (false);
+       
        // XXX we need some equivalent to this, somehow
        // SndFileSource::setup_standard_crossfades (frames_per_second);
 
@@ -2088,16 +2199,48 @@ Session::resort_routes_using (boost::shared_ptr<RouteList> r)
  *  and \a id do not reflect a free route name.
  */
 bool
-Session::find_route_name (string const & base, uint32_t& id, char* name, size_t name_len, bool definitely_add_number)
-{
+Session::find_route_name (string const & base, uint32_t& id, string& name, bool definitely_add_number)
+{
+       /* it is unfortunate that we need to include reserved names here that
+          refer to control surfaces. But there's no way to ensure a complete
+          lack of collisions without doing this, since the control surface
+          support may not even be active. Without adding an API to control 
+          surface support that would list their port names, we do have to
+          list them here.
+       */
+
+       char const * const reserved[] = {
+               _("Monitor"),
+               _("Master"),
+               _("Control"),
+               _("Click"),
+               _("Mackie"),
+               0
+       };
+       
+       /* the base may conflict with ports that do not belong to existing
+          routes, but hidden objects like the click track. So check port names
+          before anything else.
+       */
+       
+       for (int n = 0; reserved[n]; ++n) {
+               if (base == reserved[n]) {
+                       definitely_add_number = true;
+                       if (id < 1) {
+                               id = 1;
+                       }
+                       break;
+               }
+       }
+       
        if (!definitely_add_number && route_by_name (base) == 0) {
                /* juse use the base */
-               snprintf (name, name_len, "%s", base.c_str());
+               name = base;
                return true;
        }
 
        do {
-               snprintf (name, name_len, "%s %" PRIu32, base.c_str(), id);
+               name = string_compose ("%1 %2", base, id);
 
                if (route_by_name (name) == 0) {
                        return true;
@@ -2128,6 +2271,25 @@ Session::count_existing_track_channels (ChanCount& in, ChanCount& out)
        }
 }
 
+string
+Session::default_track_name_pattern (DataType t)
+{
+       switch (t) {
+       case DataType::AUDIO:
+               if (Profile->get_trx()) {
+                       return _("Track ");
+               } else {
+                       return _("Audio ");
+               }
+               break;
+
+       case DataType::MIDI:
+               return _("MIDI ");
+       }
+
+       return "";
+}
+
 /** Caller must not hold process lock
  *  @param name_template string to use for the start of the name, or "" to use "MIDI".
  *  @param instrument plugin info for the instrument to insert pre-fader, if any
@@ -2136,16 +2298,17 @@ list<boost::shared_ptr<MidiTrack> >
 Session::new_midi_track (const ChanCount& input, const ChanCount& output, boost::shared_ptr<PluginInfo> instrument, 
                         TrackMode mode, RouteGroup* route_group, uint32_t how_many, string name_template)
 {
-       char track_name[32];
+       string track_name;
        uint32_t track_id = 0;
        string port;
        RouteList new_routes;
        list<boost::shared_ptr<MidiTrack> > ret;
 
-       bool const use_number = (how_many != 1) || name_template.empty () || name_template == _("MIDI");
+       const string name_pattern = default_track_name_pattern (DataType::MIDI);
+       bool const use_number = (how_many != 1) || name_template.empty () || (name_template == name_pattern);
 
        while (how_many) {
-               if (!find_route_name (name_template.empty() ? _("MIDI") : name_template, ++track_id, track_name, sizeof(track_name), use_number)) {
+               if (!find_route_name (name_template.empty() ? _("MIDI") : name_template, ++track_id, track_name, use_number)) {
                        error << "cannot find name for new midi track" << endmsg;
                        goto failed;
                }
@@ -2346,6 +2509,17 @@ Session::auto_connect_route (boost::shared_ptr<Route> route, ChanCount& existing
                        for (uint32_t i = output_start.get(*t); i < route->n_outputs().get(*t); ++i) {
                                string port;
 
+                               /* Waves Tracks:
+                                * do not create new connections if we reached the limit of physical outputs
+                                * in Multi Out mode
+                                */
+
+                               if (!(Config->get_output_auto_connect() & AutoConnectMaster) &&
+                                   ARDOUR::Profile->get_trx () &&
+                                   existing_outputs.get(*t) == nphysical_out ) {
+                                       break;
+                               }
+
                                if ((*t) == DataType::MIDI && (Config->get_output_auto_connect() & AutoConnectPhysical)) {
                                        port = physoutputs[(out_offset.get(*t) + i) % nphysical_out];
                                } else if ((*t) == DataType::AUDIO && (Config->get_output_auto_connect() & AutoConnectMaster)) {
@@ -2371,46 +2545,285 @@ Session::auto_connect_route (boost::shared_ptr<Route> route, ChanCount& existing
        }
 }
 
+#ifdef USE_TRACKS_CODE_FEATURES 
+
+static bool
+compare_routes_by_remote_id (const boost::shared_ptr<Route>& route1, const boost::shared_ptr<Route>& route2)
+{
+       return route1->remote_control_id() < route2->remote_control_id();
+}
+
 void
 Session::reconnect_existing_routes (bool withLock, bool reconnect_master, bool reconnect_inputs, bool reconnect_outputs)
 {
-        /* TRX does stuff here, ardour does not (but probably should). This is called after an engine reset (in particular).
-         */
-}
+       // it is not allowed to perform connection
+       if (!IO::connecting_legal) {
+               return;
+       }
+    
+       // if we are deleting routes we will call this once at the end
+       if (_route_deletion_in_progress) {
+               return;
+       }
+    
+       Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock (), Glib::Threads::NOT_LOCK);
+    
+       if (withLock) {
+               lm.acquire ();
+       }
+    
+       // We need to disconnect the route's inputs and outputs first
+       // basing on autoconnect configuration
+       bool reconnectIputs = !(Config->get_input_auto_connect() & ManualConnect) && reconnect_inputs;
+       bool reconnectOutputs = !(Config->get_output_auto_connect() & ManualConnect) && reconnect_outputs;
+    
+       ChanCount existing_inputs;
+       ChanCount existing_outputs;
+       count_existing_track_channels (existing_inputs, existing_outputs);
+    
+       //ChanCount inputs = ChanCount::ZERO;
+       //ChanCount outputs = ChanCount::ZERO;
+    
+       RouteList existing_routes = *routes.reader ();
+       existing_routes.sort (compare_routes_by_remote_id);
+    
+       {
+               PBD::Unwinder<bool> protect_ignore_changes (_reconnecting_routes_in_progress, true);
 
-#ifdef USE_TRACKS_CODE_FEATURES
+               vector<string> physinputs;
+               vector<string> physoutputs;
+        
+               EngineStateController::instance()->get_physical_audio_outputs(physoutputs);
+               EngineStateController::instance()->get_physical_audio_inputs(physinputs);
+                
+               uint32_t input_n = 0;
+               uint32_t output_n = 0;
+               RouteList::iterator rIter = existing_routes.begin();
+               const AutoConnectOption current_input_auto_connection (Config->get_input_auto_connect());
+               const AutoConnectOption current_output_auto_connection (Config->get_output_auto_connect());
+               for (; rIter != existing_routes.end(); ++rIter) {
+                       if (*rIter == _master_out || *rIter == _monitor_out ) {
+                               continue;
+                       }
+
+                       if (current_output_auto_connection == AutoConnectPhysical) {
+                               (*rIter)->amp()->deactivate();
+                       } else if (current_output_auto_connection == AutoConnectMaster) {
+                               (*rIter)->amp()->activate();
+                       }
+            
+                       if (reconnectIputs) {
+                               (*rIter)->input()->disconnect (this); //GZ: check this; could be heavy
+                
+                               for (uint32_t route_input_n = 0; route_input_n < (*rIter)->n_inputs().get(DataType::AUDIO); ++route_input_n) {
+                    
+                                       if (current_input_auto_connection & AutoConnectPhysical) {
+                        
+                                               if ( input_n == physinputs.size() ) {
+                                                       break;
+                                               }
+                        
+                                               string port = physinputs[input_n];
+                    
+                                               if (port.empty() ) {
+                                                       error << "Physical Input number "<< input_n << " is unavailable and cannot be connected" << endmsg;
+                                               }
+                        
+                                               //GZ: check this; could be heavy
+                                               (*rIter)->input()->connect ((*rIter)->input()->ports().port(DataType::AUDIO, route_input_n), port, this);
+                                               ++input_n;
+                                       }
+                               }
+                       }
+            
+                       if (reconnectOutputs) {
+                
+                               //normalize route ouptuts: reduce the amount outputs to be equal to the amount of inputs
+                               if (current_output_auto_connection & AutoConnectPhysical) {
+                
+                                       //GZ: check this; could be heavy
+                                       (*rIter)->output()->disconnect (this);
+                                       size_t route_inputs_count = (*rIter)->n_inputs().get(DataType::AUDIO);
+                    
+                                       //GZ: check this; could be heavy
+                                       (*rIter)->output()->ensure_io(ChanCount(DataType::AUDIO, route_inputs_count), false, this );
+               
+                               } else if (current_output_auto_connection & AutoConnectMaster){
+                    
+                                       if (!reconnect_master) {
+                                               continue;
+                                       }
+                    
+                                       //GZ: check this; could be heavy
+                                       (*rIter)->output()->disconnect (this);
+                    
+                                       if (_master_out) {
+                                               uint32_t master_inputs_count = _master_out->n_inputs().get(DataType::AUDIO);
+                                               (*rIter)->output()->ensure_io(ChanCount(DataType::AUDIO, master_inputs_count), false, this );
+                                       } else {
+                                               error << error << "Master bus is not available" << endmsg;
+                                               break;
+                                       }
+                               }
+                
+                               for (uint32_t route_output_n = 0; route_output_n < (*rIter)->n_outputs().get(DataType::AUDIO); ++route_output_n) {
+                                       if (current_output_auto_connection & AutoConnectPhysical) {
+                        
+                                               if ( output_n == physoutputs.size() ) {
+                                                       break;
+                                               }
+                        
+                                               string port = physoutputs[output_n];
+                        
+                                               if (port.empty() ) {
+                                                       error << "Physical Output number "<< output_n << " is unavailable and cannot be connected" << endmsg;
+                                               }
+                    
+                                               //GZ: check this; could be heavy
+                                               (*rIter)->output()->connect ((*rIter)->output()->ports().port(DataType::AUDIO, route_output_n), port, this);
+                                               ++output_n;
+                        
+                                       } else if (current_output_auto_connection & AutoConnectMaster) {
+                  
+                                               if ( route_output_n == _master_out->n_inputs().get(DataType::AUDIO) ) {
+                                                       break;
+                                               }
+                        
+                                               // connect to master bus
+                                               string port = _master_out->input()->ports().port(DataType::AUDIO, route_output_n)->name();
+                    
+                                               if (port.empty() ) {
+                                                       error << "MasterBus Input number "<< route_output_n << " is unavailable and cannot be connected" << endmsg;
+                                               }
+                        
+                            
+                                               //GZ: check this; could be heavy
+                                               (*rIter)->output()->connect ((*rIter)->output()->ports().port(DataType::AUDIO, route_output_n), port, this);
+                            
+                                       }
+                               }
+                       }
+            
+                       //auto_connect_route (*rIter, inputs, outputs, false, reconnectIputs);
+               }
+        
+               _master_out->output()->disconnect (this);
+               auto_connect_master_bus ();
+       }
+    
+       graph_reordered ();
+    
+       session_routes_reconnected (); /* EMIT SIGNAL */
+}
 
 void
 Session::reconnect_midi_scene_ports(bool inputs)
 {
-       if (inputs) {
-               scene_in()->disconnect_all ();
+    if (inputs ) {
         
-               std::vector<EngineStateController::MidiPortState> midi_port_states;
-               EngineStateController::instance()->get_physical_midi_input_states (midi_port_states);
+        boost::shared_ptr<MidiPort> scene_in_ptr = scene_in();
+        if (scene_in_ptr) {
+            scene_in_ptr->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->scene_connected) {
+                    scene_in_ptr->connect (state_iter->name);
+                }
+            }
+        }
+
+    } else {
         
-               std::vector<EngineStateController::MidiPortState>::iterator state_iter = midi_port_states.begin();
+        boost::shared_ptr<MidiPort> scene_out_ptr = scene_out();
         
-               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);
-                       }
-               }
+        if (scene_out_ptr ) {
+            scene_out_ptr->disconnect_all ();
 
-       } 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->scene_connected) {
+                    scene_out_ptr->connect (state_iter->name);
+                }
+            }
+        }
+    }
+}
+
+void
+Session::reconnect_mtc_ports ()
+{
+       boost::shared_ptr<MidiPort> mtc_in_ptr = _midi_ports->mtc_input_port();
 
-               std::vector<EngineStateController::MidiPortState> midi_port_states;
-               EngineStateController::instance()->get_physical_midi_output_states (midi_port_states);
+       if (!mtc_in_ptr) {
+               return;
+       }
+
+       mtc_in_ptr->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->available && state_iter->mtc_in) {
+                       mtc_in_ptr->connect (state_iter->name);
+               }
+       }
+       
+       if (!_midi_ports->mtc_input_port ()->connected () &&
+           config.get_external_sync () &&
+           (Config->get_sync_source () == MTC) ) {
+               config.set_external_sync (false);
+       }
+       
+       if ( ARDOUR::Profile->get_trx () ) {
+               // Tracks need this signal to update timecode_source_dropdown
+               MtcOrLtcInputPortChanged (); //emit signal
+       }
+}
+
+void
+Session::reconnect_mmc_ports(bool inputs)
+{
+       if (inputs ) { // get all enabled midi input ports
         
-               std::vector<EngineStateController::MidiPortState>::iterator state_iter = midi_port_states.begin();
+               boost::shared_ptr<MidiPort> mmc_in_ptr = _midi_ports->mmc_in();
+               if (mmc_in_ptr) {
+                       mmc_in_ptr->disconnect_all ();
+                       std::vector<std::string> enabled_midi_inputs;
+                       EngineStateController::instance()->get_physical_midi_inputs (enabled_midi_inputs);
+            
+                       std::vector<std::string>::iterator port_iter = enabled_midi_inputs.begin();
+            
+                       for (; port_iter != enabled_midi_inputs.end(); ++port_iter) {
+                               mmc_in_ptr->connect (*port_iter);
+                       }
+
+               }
+       } else { // get all enabled midi output ports
         
-               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);
+               boost::shared_ptr<MidiPort> mmc_out_ptr = _midi_ports->mmc_out();
+               if (mmc_out_ptr ) {
+                       mmc_out_ptr->disconnect_all ();
+                       std::vector<std::string> enabled_midi_outputs;
+                       EngineStateController::instance()->get_physical_midi_outputs (enabled_midi_outputs);
+            
+                       std::vector<std::string>::iterator port_iter = enabled_midi_outputs.begin();
+            
+                       for (; port_iter != enabled_midi_outputs.end(); ++port_iter) {
+                               mmc_out_ptr->connect (*port_iter);
                        }
                }
-
        }
 }
 
@@ -2423,25 +2836,18 @@ list< boost::shared_ptr<AudioTrack> >
 Session::new_audio_track (int input_channels, int output_channels, TrackMode mode, RouteGroup* route_group, 
                          uint32_t how_many, string name_template)
 {
-       char track_name[32];
+       string track_name;
        uint32_t track_id = 0;
        string port;
        RouteList new_routes;
        list<boost::shared_ptr<AudioTrack> > ret;
 
-       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() );
+       const string name_pattern = default_track_name_pattern (DataType::AUDIO);
+       bool const use_number = (how_many != 1) || name_template.empty () || (name_template == name_pattern);
        
        while (how_many) {
 
-               if (!find_route_name (name_template.empty() ? _(name_pattern.c_str()) : 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, use_number)) {
                        error << "cannot find name for new audio track" << endmsg;
                        goto failed;
                }
@@ -2455,6 +2861,20 @@ Session::new_audio_track (int input_channels, int output_channels, TrackMode mod
                                goto failed;
                        }
 
+                       if (ARDOUR::Profile->get_trx ()) {
+                               // TRACKS considers it's not a USE CASE, it's
+                               // a piece of behavior of the session model:
+                               //
+                               // Gain for a newly created route depends on
+                               // the current output_auto_connect mode:
+                               //
+                               //  0 for Stereo Out mode
+                               //  0 Multi Out mode
+                               if (Config->get_output_auto_connect() & AutoConnectMaster) {
+                                       track->set_gain (dB_to_coefficient (0), 0);
+                               }
+                       }
+
                        track->use_new_diskstream();
 
 #ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
@@ -2530,7 +2950,7 @@ Session::new_audio_track (int input_channels, int output_channels, TrackMode mod
 RouteList
 Session::new_audio_route (int input_channels, int output_channels, RouteGroup* route_group, uint32_t how_many, string name_template)
 {
-       char bus_name[32];
+       string bus_name;
        uint32_t bus_id = 0;
        string port;
        RouteList ret;
@@ -2538,7 +2958,7 @@ Session::new_audio_route (int input_channels, int output_channels, RouteGroup* r
        bool const use_number = (how_many != 1) || name_template.empty () || name_template == _("Bus");
        
        while (how_many) {
-               if (!find_route_name (name_template.empty () ? _("Bus") : name_template, ++bus_id, bus_name, sizeof(bus_name), use_number)) {
+               if (!find_route_name (name_template.empty () ? _("Bus") : name_template, ++bus_id, bus_name, use_number)) {
                        error << "cannot find name for new audio bus" << endmsg;
                        goto failure;
                }
@@ -2644,7 +3064,7 @@ Session::new_route_from_template (uint32_t how_many, const std::string& template
                node_copy.remove_property_recursively (X_("id"));
 
                try {
-                       char name[32];
+                       string name;
 
                        if (!name_base.empty()) {
 
@@ -2653,7 +3073,7 @@ Session::new_route_from_template (uint32_t how_many, const std::string& template
                                 * numbered, via the final parameter.
                                 */
 
-                               if (!find_route_name (name_base.c_str(), ++number, name, sizeof(name), (being_added > 1))) {
+                               if (!find_route_name (name_base.c_str(), ++number, name, (being_added > 1))) {
                                        fatal << _("Session: UINT_MAX routes? impossible!") << endmsg;
                                        /*NOTREACHDE*/
                                }
@@ -2663,7 +3083,7 @@ Session::new_route_from_template (uint32_t how_many, const std::string& template
                                string const route_name  = node_copy.property(X_("name"))->value ();
                        
                                /* generate a new name by adding a number to the end of the template name */
-                               if (!find_route_name (route_name.c_str(), ++number, name, sizeof(name), true)) {
+                               if (!find_route_name (route_name.c_str(), ++number, name, true)) {
                                        fatal << _("Session: UINT_MAX routes? impossible!") << endmsg;
                                        abort(); /*NOTREACHED*/
                                }
@@ -2961,6 +3381,8 @@ Session::add_internal_send (boost::shared_ptr<Route> dest, boost::shared_ptr<Pro
 void
 Session::remove_routes (boost::shared_ptr<RouteList> routes_to_remove)
 {
+       PBD::Unwinder<bool> uw_flag (_route_deletion_in_progress, true);
+
        { // RCU Writer scope
                RCUWriter<RouteList> writer (routes);
                boost::shared_ptr<RouteList> rs = writer.get_copy ();
@@ -2989,8 +3411,6 @@ Session::remove_routes (boost::shared_ptr<RouteList> routes_to_remove)
                                _monitor_out.reset ();
                        }
 
-                       update_route_solo_state ();
-            
                        // We need to disconnect the route's inputs and outputs
             
                        (*iter)->input()->disconnect (0);
@@ -3021,14 +3441,14 @@ Session::remove_routes (boost::shared_ptr<RouteList> routes_to_remove)
                                        _step_editors--;
                                }
                        }
-
-                       RouteAddedOrRemoved (false); /* EMIT SIGNAL */
                }
     
                /* writer goes out of scope, forces route list update */
 
        } // end of RCU Writer scope
     
+       update_route_solo_state ();
+       RouteAddedOrRemoved (false); /* EMIT SIGNAL */
        update_latency_compensation ();
        set_dirty();
     
@@ -3037,11 +3457,12 @@ Session::remove_routes (boost::shared_ptr<RouteList> routes_to_remove)
         * Wave Tracks: reconnect routes
         */
 
-       if (ARDOUR::Profile->get_trx () ) {
+#ifdef USE_TRACKS_CODE_FEATURES
                reconnect_existing_routes(true, false);
-       } else {
+#else
+               routes.flush (); // maybe unsafe, see below.
                resort_routes ();
-       }
+#endif
     
        if (_process_graph) {
                _process_graph->clear_other_chain ();
@@ -3055,7 +3476,6 @@ Session::remove_routes (boost::shared_ptr<RouteList> routes_to_remove)
        /* try to cause everyone to drop their references
         * and unregister ports from the backend
         */
-       PBD::Unwinder<bool> uw_flag (_route_deletion_in_progress, true);
 
        for (RouteList::iterator iter = routes_to_remove->begin(); iter != routes_to_remove->end(); ++iter) {
                (*iter)->drop_references ();
@@ -3148,6 +3568,120 @@ Session::route_solo_isolated_changed (void* /*src*/, boost::weak_ptr<Route> wpr)
        }
 }
 
+void
+Session::routes_solo_changed (boost::shared_ptr<RouteList> solo_change_routes)
+{
+       if (solo_update_disabled) {
+               // We know already
+               DEBUG_TRACE (DEBUG::Solo, "solo update disabled - changed ignored\n");
+               return;
+       }
+
+       if (solo_change_routes->empty() ) {
+               return;
+       }
+
+       boost::shared_ptr<RouteList> non_solo_change_routes (new RouteList);
+       boost::shared_ptr<RouteList> r = routes.reader ();
+       int32_t delta;
+
+       std::set_difference (r->begin(), r->end(),
+                            solo_change_routes->begin(), solo_change_routes->end(),
+                            std::back_inserter(*non_solo_change_routes) );
+
+       DEBUG_TRACE (DEBUG::Solo, string_compose ("propagate solo change, delta = %1\n", delta));
+
+       solo_update_disabled = true;
+       RouteList uninvolved;
+
+       for (RouteList::iterator route = solo_change_routes->begin(); route != solo_change_routes->end(); ++route) {
+
+               if ((*route)->self_soloed() ) {
+                       delta = 1;
+               } else {
+                       delta = -1;
+               }
+
+               DEBUG_TRACE (DEBUG::Solo, string_compose ("%1\n", (*route)->name()));
+
+               for (RouteList::iterator i = non_solo_change_routes->begin(); i != non_solo_change_routes->end(); ++i) {
+                       bool via_sends_only;
+                       bool in_signal_flow;
+
+                       if ((*i) == *route || (*i)->solo_isolated() || (*i)->is_master() || (*i)->is_monitor() || (*i)->is_auditioner() ) {
+                               continue;
+                       }
+
+                       in_signal_flow = false;
+
+                       DEBUG_TRACE (DEBUG::Solo, string_compose ("check feed from %1\n", (*i)->name()));
+
+                       if ((*i)->feeds (*route, &via_sends_only)) {
+                               DEBUG_TRACE (DEBUG::Solo, string_compose ("\tthere is a feed from %1\n", (*i)->name()));
+                               if (!via_sends_only) {
+                                       if (!(*route)->soloed_by_others_upstream()) {
+                                               (*i)->mod_solo_by_others_downstream (delta);
+                                       }
+                               } else {
+                                       DEBUG_TRACE (DEBUG::Solo, string_compose ("\tthere is a send-only feed from %1\n", (*i)->name()));
+                               }
+                               in_signal_flow = true;
+                       } else {
+                               DEBUG_TRACE (DEBUG::Solo, string_compose ("\tno feed from %1\n", (*i)->name()));
+                       }
+
+                       DEBUG_TRACE (DEBUG::Solo, string_compose ("check feed to %1\n", (*i)->name()));
+
+                       if ((*route)->feeds (*i, &via_sends_only)) {
+                               /* propagate solo upstream only if routing other than
+                                  sends is involved, but do consider the other route
+                                  (*i) to be part of the signal flow even if only
+                                  sends are involved.
+                               */
+                               DEBUG_TRACE (DEBUG::Solo, string_compose ("%1 feeds %2 via sends only %3 sboD %4 sboU %5\n",
+                                                                         (*route)->name(),
+                                                                         (*i)->name(),
+                                                                         via_sends_only,
+                                                                         (*route)->soloed_by_others_downstream(),
+                                                                         (*route)->soloed_by_others_upstream()));
+                               if (!via_sends_only) {
+                                       if (!(*route)->soloed_by_others_downstream()) {
+                                               DEBUG_TRACE (DEBUG::Solo, string_compose ("\tmod %1 by %2\n", (*i)->name(), delta));
+                                               (*i)->mod_solo_by_others_upstream (delta);
+                                       } else {
+                                               DEBUG_TRACE (DEBUG::Solo, "\talready soloed by others downstream\n");
+                                       }
+                               } else {
+                                       DEBUG_TRACE (DEBUG::Solo, string_compose ("\tfeed to %1 ignored, sends-only\n", (*i)->name()));
+                               }
+                               in_signal_flow = true;
+                       } else {
+                               DEBUG_TRACE (DEBUG::Solo, "\tno feed to\n");
+                       }
+
+                       if (!in_signal_flow) {
+                               uninvolved.push_back (*i);
+                       }
+               }
+       }
+       solo_update_disabled = false;
+       DEBUG_TRACE (DEBUG::Solo, "propagation complete\n");
+
+       update_route_solo_state ();
+
+       /* now notify that the mute state of the routes not involved in the signal
+          pathway of the just-solo-changed route may have altered.
+       */
+
+       for (RouteList::iterator i = uninvolved.begin(); i != uninvolved.end(); ++i) {
+               DEBUG_TRACE (DEBUG::Solo, string_compose ("mute change for %1\n", (*i)->name() ));
+               (*i)->mute_changed (this);
+       }
+
+       SoloChanged (); /* EMIT SIGNAL */
+       set_dirty();
+}
+
 void
 Session::route_solo_changed (bool self_solo_change, void* /*src*/, boost::weak_ptr<Route> wpr)
 {
@@ -3583,9 +4117,11 @@ Session::maybe_update_session_range (framepos_t a, framepos_t b)
                return;
        }
 
+       framepos_t session_end_marker_shift_samples = session_end_shift * _nominal_frame_rate;
+
        if (_session_range_location == 0) {
 
-               add_session_range_location (a, b);
+               set_session_range_location (a, b + session_end_marker_shift_samples);
 
        } else {
 
@@ -3861,20 +4397,31 @@ Session::count_sources_by_origin (const string& path)
        return cnt;
 }
 
+static string
+peak_file_helper (const string& peak_path, const string& file_path, const string& file_base, bool hash) {
+       if (hash) {
+               std::string checksum = Glib::Checksum::compute_checksum(Glib::Checksum::CHECKSUM_SHA1, file_path + G_DIR_SEPARATOR + file_base);
+               return Glib::build_filename (peak_path, checksum + peakfile_suffix);
+       } else {
+               return Glib::build_filename (peak_path, file_base + peakfile_suffix);
+       }
+}
+
 string
-Session::peak_path (string base) const
+Session::construct_peak_filepath (const string& filepath, const bool in_session, const bool old_peak_name) const
 {
-       if (Glib::path_is_absolute (base)) {
+       string interchange_dir_string = string (interchange_dir_name) + G_DIR_SEPARATOR;
+
+       if (Glib::path_is_absolute (filepath)) {
 
                /* 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) {
+               if (filepath.find (interchange_dir_string) != string::npos) {
                
-                       session_path = Glib::path_get_dirname (base); /* now ends in audiofiles */
+                       session_path = Glib::path_get_dirname (filepath); /* 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 */
@@ -3894,12 +4441,25 @@ Session::peak_path (string base) const
 
                if (in_another_session) {
                        SessionDirectory sd (session_path);
-                       return Glib::build_filename (sd.peak_path(), Glib::path_get_basename (base) + peakfile_suffix);
+                       return peak_file_helper (sd.peak_path(), "", Glib::path_get_basename (filepath), !old_peak_name);
                }
        }
 
-       base = Glib::path_get_basename (base);
-       return Glib::build_filename (_session_dir->peak_path(), base + peakfile_suffix);
+       /* 1) if file belongs to this session
+        * it may be a relative path (interchange/...)
+        * or just basename (session_state, remove source)
+        * -> just use the basename
+        */
+       std::string filename = Glib::path_get_basename (filepath);
+       std::string path;
+
+       /* 2) if the file is outside our session dir:
+        * (imported but not copied) add the path for check-summming */
+       if (!in_session) {
+               path = Glib::path_get_dirname (filepath);
+       }
+       
+       return peak_file_helper (_session_dir->peak_path(), path, Glib::path_get_basename (filepath), !old_peak_name);
 }
 
 string
@@ -4022,7 +4582,7 @@ Session::format_audio_source_name (const string& legalized_base, uint32_t nchan,
        ostringstream sstr;
        const string ext = native_header_format_extension (config.get_native_file_header_format(), DataType::AUDIO);
        
-       if (destructive) {
+       if (Profile->get_trx() && destructive) {
                sstr << 'T';
                sstr << setfill ('0') << setw (4) << cnt;
                sstr << legalized_base;
@@ -4179,7 +4739,7 @@ Session::create_audio_source_for_session (size_t n_chans, string const & base, u
 
        if (!path.empty()) {
                return boost::dynamic_pointer_cast<AudioFileSource> (
-                       SourceFactory::createWritable (DataType::AUDIO, *this, path, destructive, frame_rate()));
+                       SourceFactory::createWritable (DataType::AUDIO, *this, path, destructive, frame_rate(), true, true));
        } else {
                throw failed_constructor ();
        }
@@ -4352,7 +4912,7 @@ Session::graph_reordered ()
           from a set_state() call or creating new tracks. Ditto for deletion.
        */
 
-       if ((_state_of_the_state & (InitialConnecting|Deletion)) || _adding_routes_in_progress) {
+       if ((_state_of_the_state & (InitialConnecting|Deletion)) || _adding_routes_in_progress || _reconnecting_routes_in_progress || _route_deletion_in_progress) {
                return;
        }
 
@@ -4675,12 +5235,12 @@ void
 Session::reset_native_file_format ()
 {
        boost::shared_ptr<RouteList> rl = routes.reader ();
+
        for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
                boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (*i);
                if (tr) {
                        /* don't save state as we do this, there's no point
                         */
-
                        _state_of_the_state = StateOfTheState (_state_of_the_state|InCleanup);
                        tr->reset_write_sources (false);
                        _state_of_the_state = StateOfTheState (_state_of_the_state & ~InCleanup);
@@ -5228,7 +5788,7 @@ Session::current_end_frame () const
 }
 
 void
-Session::add_session_range_location (framepos_t start, framepos_t end)
+Session::set_session_range_location (framepos_t start, framepos_t end)
 {
        _session_range_location = new Location (*this, start, end, _("session"), Location::IsSessionRange);
        _locations->add (_session_range_location);
@@ -5664,6 +6224,12 @@ Session::next_control_id () const
                subtract++;
        }
 
+       /* the same about masterbus in Waves Tracks */
+
+       if (Profile->get_trx() && _master_out) {
+               subtract++;
+       }
+
        return nroutes() - subtract;
 }
 
@@ -5681,6 +6247,14 @@ Session::notify_remote_id_change ()
        default:
                break;
        }
+
+#ifdef USE_TRACKS_CODE_FEATURES
+               /* Waves Tracks: for Waves Tracks session it's required to reconnect their IOs
+                * if track order has been changed by user
+                */
+               reconnect_existing_routes(true, true);
+#endif
+               
 }
 
 void
@@ -5735,6 +6309,11 @@ Session::reconnect_ltc_input ()
                if (src != _("None") && !src.empty())  {
                        _ltc_input->nth (0)->connect (src);
                }
+
+               if ( ARDOUR::Profile->get_trx () ) {
+                       // Tracks need this signal to update timecode_source_dropdown
+                       MtcOrLtcInputPortChanged (); //emit signal
+               }
        }
 }
 
@@ -5743,14 +6322,48 @@ Session::reconnect_ltc_output ()
 {
        if (_ltc_output) {
 
-#if 0
-               string src = Config->get_ltc_sink_port();
+               string src = Config->get_ltc_output_port();
 
                _ltc_output->disconnect (this);
 
                if (src != _("None") && !src.empty())  {
                        _ltc_output->nth (0)->connect (src);
                }
-#endif
        }
 }
+
+void
+Session::set_range_selection (framepos_t start, framepos_t end)
+{
+       _range_selection = Evoral::Range<framepos_t> (start, end);
+#ifdef USE_TRACKS_CODE_FEATURES
+       follow_playhead_priority ();
+#endif
+}
+
+void
+Session::set_object_selection (framepos_t start, framepos_t end)
+{
+       _object_selection = Evoral::Range<framepos_t> (start, end);
+#ifdef USE_TRACKS_CODE_FEATURES
+       follow_playhead_priority ();
+#endif
+}
+
+void
+Session::clear_range_selection ()
+{
+       _range_selection = Evoral::Range<framepos_t> (-1,-1);
+#ifdef USE_TRACKS_CODE_FEATURES
+       follow_playhead_priority ();
+#endif
+}
+
+void
+Session::clear_object_selection ()
+{
+       _object_selection = Evoral::Range<framepos_t> (-1,-1);
+#ifdef USE_TRACKS_CODE_FEATURES
+       follow_playhead_priority ();
+#endif 
+}