lots of stuff related to capture alignment. things appear to be working now, but...
[ardour.git] / libs / ardour / session.cc
index 3b69fd827936bb23668d61a537134a1a6778f03f..759495351a8fbc9cf40743b574b5ee29f86b3584 100644 (file)
@@ -99,7 +99,8 @@
 #include "ardour/tempo.h"
 #include "ardour/utils.h"
 #include "ardour/graph.h"
-#include "ardour/vbap_speakers.h"
+#include "ardour/speakers.h"
+#include "ardour/operations.h"
 
 #include "midi++/port.h"
 #include "midi++/mmc.h"
@@ -135,8 +136,7 @@ Session::Session (AudioEngine &eng,
                  const string& snapshot_name,
                   BusProfile* bus_profile,
                  string mix_template)
-
-       : _engine (eng)
+        : _engine (eng)
        , _target_transport_speed (0.0)
        , _requested_return_frame (-1)
        , _session_dir (new SessionDirectory(fullpath))
@@ -151,6 +151,7 @@ Session::Session (AudioEngine &eng,
        , _total_free_4k_blocks (0)
        , _bundles (new BundleList)
        , _bundle_xml_node (0)
+       , _current_trans (0)
        , _click_io ((IO*) 0)
        , click_data (0)
        , click_emphasis_data (0)
@@ -237,10 +238,6 @@ Session::destroy ()
 
        delete state_tree;
 
-       /* remove all stubfiles that might still be lurking */
-
-       cleanup_stubfiles ();
-
        /* reset dynamic state version back to default */
 
        Stateful::loading_state_version = 0;
@@ -300,8 +297,6 @@ Session::destroy ()
        }
        routes.flush ();
 
-       boost::shared_ptr<RouteList> r = routes.reader ();
-
        DEBUG_TRACE (DEBUG::Destruction, "delete sources\n");
        for (SourceMap::iterator i = sources.begin(); i != sources.end(); ++i) {
                DEBUG_TRACE(DEBUG::Destruction, string_compose ("Dropping for source %1 ; pre-ref = %2\n", i->second->path(), i->second.use_count()));
@@ -321,17 +316,22 @@ Session::destroy ()
        /* not strictly necessary, but doing it here allows the shared_ptr debugging to work */
        playlists.reset ();
 
-       boost_debug_list_ptrs ();
-
        delete _locations;
-        delete _speakers;
 
        DEBUG_TRACE (DEBUG::Destruction, "Session::destroy() done\n");
+
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
+       boost_debug_list_ptrs ();
+#endif
 }
 
 void
 Session::set_worst_io_latencies ()
 {
+        if (_state_of_the_state & InitialConnecting) {
+                return;
+        }
+
        _worst_output_latency = 0;
        _worst_input_latency = 0;
 
@@ -345,6 +345,9 @@ Session::set_worst_io_latencies ()
                _worst_output_latency = max (_worst_output_latency, (*i)->output()->latency());
                _worst_input_latency = max (_worst_input_latency, (*i)->input()->latency());
        }
+        
+        DEBUG_TRACE (DEBUG::Latency, string_compose ("Worst output latency: %1 Worst input latency: %2\n",
+                                                     _worst_output_latency, _worst_input_latency));
 }
 
 void
@@ -433,8 +436,6 @@ Session::when_engine_running ()
 
        BootMessage (_("Compute I/O Latencies"));
 
-       set_worst_io_latencies ();
-
        if (_clicking) {
                // XXX HOW TO ALERT UI TO THIS ? DO WE NEED TO?
        }
@@ -648,7 +649,7 @@ Session::when_engine_running ()
                }
        }
 
-       /* catch up on send+insert cnts */
+       set_worst_io_latencies ();
 
        _state_of_the_state = StateOfTheState (_state_of_the_state & ~(CannotSave|Dirty));
 
@@ -657,6 +658,7 @@ Session::when_engine_running ()
        BootMessage (_("Connect to engine"));
 
        _engine.set_session (this);
+        _engine.update_total_latencies ();
 }
 
 void
@@ -668,7 +670,6 @@ Session::hookup_io ()
 
        _state_of_the_state = StateOfTheState (_state_of_the_state | InitialConnecting);
 
-
        if (!auditioner) {
 
                /* we delay creating the auditioner till now because
@@ -676,13 +677,12 @@ Session::hookup_io ()
                */
 
                try {
-                       Auditioner* a = new Auditioner (*this);
+                       boost::shared_ptr<Auditioner> a (new Auditioner (*this));
                        if (a->init()) {
-                               delete a;
-                               throw failed_constructor();
+                               throw failed_constructor ();
                        }
                        a->use_new_diskstream ();
-                       auditioner.reset (a);
+                       auditioner = a;
                }
 
                catch (failed_constructor& err) {
@@ -724,10 +724,8 @@ Session::hookup_io ()
                                /* relax */
                                 
                        } else {
-                                
-                               (*x)->listen_via (_monitor_out,
-                                                 (Config->get_listen_position() == AfterFaderListen ? PostFader : PreFader),
-                                                 false, false);
+
+                               (*x)->listen_via_monitor ();
                        }
                }
        }
@@ -764,11 +762,10 @@ Session::track_playlist_changed (boost::weak_ptr<Track> wp)
        boost::shared_ptr<Playlist> playlist;
 
        if ((playlist = track->playlist()) != 0) {
-               playlist->LengthChanged.connect_same_thread (*this, boost::bind (&Session::update_session_range_location_marker, this));
-               playlist->RangesMoved.connect_same_thread (*this, boost::bind (&Session::update_session_range_location_marker, this));
+               playlist->RegionAdded.connect_same_thread (*this, boost::bind (&Session::playlist_region_added, this, _1));
+               playlist->RangesMoved.connect_same_thread (*this, boost::bind (&Session::playlist_ranges_moved, this, _1));
+               playlist->RegionsExtended.connect_same_thread (*this, boost::bind (&Session::playlist_regions_extended, this, _1));
        }
-
-       update_session_range_location_marker ();
 }
 
 bool
@@ -785,30 +782,26 @@ Session::record_enabling_legal () const
        return true;
 }
 
+void
+Session::set_track_monitor_input_status (bool yn)
+{
+        boost::shared_ptr<RouteList> rl = routes.reader ();
+        for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
+                boost::shared_ptr<AudioTrack> tr = boost::dynamic_pointer_cast<AudioTrack> (*i);
+                if (tr && tr->record_enabled ()) {
+                        //cerr << "switching to input = " << !auto_input << __FILE__ << __LINE__ << endl << endl;
+                        tr->monitor_input (yn);
+                }
+        }
+}
+
 void
 Session::reset_input_monitor_state ()
 {
        if (transport_rolling()) {
-
-               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->record_enabled ()) {
-                               //cerr << "switching to input = " << !auto_input << __FILE__ << __LINE__ << endl << endl;
-                               tr->monitor_input (Config->get_monitoring_model() == HardwareMonitoring && !config.get_auto_input());
-                       }
-               }
-               
+                set_track_monitor_input_status (Config->get_monitoring_model() == HardwareMonitoring && !config.get_auto_input());
        } else {
-               
-               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->record_enabled ()) {
-                               //cerr << "switching to input = " << !Config->get_auto_input() << __FILE__ << __LINE__ << endl << endl;
-                               tr->monitor_input (Config->get_monitoring_model() == HardwareMonitoring);
-                       }
-               }
+                set_track_monitor_input_status (Config->get_monitoring_model() == HardwareMonitoring);
        }
 }
 
@@ -1019,14 +1012,7 @@ Session::enable_record ()
                        MIDI::Manager::instance()->mmc()->send (MIDI::MachineControlCommand (MIDI::MachineControl::cmdRecordStrobe));
                         
                        if (Config->get_monitoring_model() == HardwareMonitoring && config.get_auto_input()) {
-                                
-                               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->record_enabled ()) {
-                                               tr->monitor_input (true);
-                                       }
-                               }
+                                set_track_monitor_input_status (true);
                        }
                         
                        RecordStateChanged ();
@@ -1052,14 +1038,7 @@ Session::disable_record (bool rt_context, bool force)
                }
 
                if (Config->get_monitoring_model() == HardwareMonitoring && config.get_auto_input()) {
-
-                       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->record_enabled ()) {
-                                       tr->monitor_input (false);
-                               }
-                       }
+                        set_track_monitor_input_status (false);
                }
 
                RecordStateChanged (); /* emit signal */
@@ -1076,14 +1055,7 @@ Session::step_back_from_record ()
        if (g_atomic_int_compare_and_exchange (&_record_status, Recording, Enabled)) {
 
                if (Config->get_monitoring_model() == HardwareMonitoring && config.get_auto_input()) {
-                       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->record_enabled ()) {
-                                       //cerr << "switching from input" << __FILE__ << __LINE__ << endl << endl;
-                                       tr->monitor_input (false);
-                               }
-                       }
+                        set_track_monitor_input_status (false);
                }
        }
 }
@@ -1254,43 +1226,6 @@ Session::set_block_size (pframes_t nframes)
        }
 }
 
-void
-Session::set_default_fade (float /*steepness*/, float /*fade_msecs*/)
-{
-#if 0
-       framecnt_t fade_frames;
-
-       /* Don't allow fade of less 1 frame */
-
-       if (fade_msecs < (1000.0 * (1.0/_current_frame_rate))) {
-
-               fade_msecs = 0;
-               fade_frames = 0;
-
-       } else {
-
-               fade_frames = (framecnt_t) floor (fade_msecs * _current_frame_rate * 0.001);
-
-       }
-
-       default_fade_msecs = fade_msecs;
-       default_fade_steepness = steepness;
-
-       {
-               // jlc, WTF is this!
-               Glib::RWLock::ReaderLock lm (route_lock);
-               AudioRegion::set_default_fade (steepness, fade_frames);
-       }
-
-       set_dirty();
-
-       /* XXX have to do this at some point */
-       /* foreach region using default fade, reset, then
-          refill_all_diskstream_buffers ();
-       */
-#endif
-}
-
 struct RouteSorter {
     /** @return true to run r1 before r2, otherwise false */
     bool operator() (boost::shared_ptr<Route> r1, boost::shared_ptr<Route> r2) {
@@ -1457,20 +1392,29 @@ Session::resort_routes_using (boost::shared_ptr<RouteList> r)
 
 }
 
-/** Find the route name starting with \a base with the lowest \a id.
+/** Find a route name starting with \a base, maybe followed by the
+ *  lowest \a id.  \a id will always be added if \a definitely_add_number
+ *  is true on entry; otherwise it will only be added if required
+ *  to make the name unique.
  *
- * Names are constructed like e.g. "Audio 3" for base="Audio" and id=3.
- * The available route name with the lowest ID will be used, and \a id
- * will be set to the ID.
+ *  Names are constructed like e.g. "Audio 3" for base="Audio" and id=3.
+ *  The available route name with the lowest ID will be used, and \a id
+ *  will be set to the ID.
  *
- * \return false if a route name could not be found, and \a track_name
- * and \a id do not reflect a free route name.
+ *  \return false if a route name could not be found, and \a track_name
+ *  and \a id do not reflect a free route name.
  */
 bool
-Session::find_route_name (const char* base, uint32_t& id, char* name, size_t name_len)
+Session::find_route_name (string const & base, uint32_t& id, char* name, size_t name_len, bool definitely_add_number)
 {
+       if (!definitely_add_number && route_by_name (base) == 0) {
+               /* juse use the base */
+               snprintf (name, name_len, "%s", base.c_str());
+               return true;
+       }
+               
        do {
-               snprintf (name, name_len, "%s %" PRIu32, base, id);
+               snprintf (name, name_len, "%s %" PRIu32, base.c_str(), id);
 
                if (route_by_name (name) == 0) {
                        return true;
@@ -1498,9 +1442,11 @@ Session::count_existing_route_channels (ChanCount& in, ChanCount& out)
        }
 }
 
-/** Caller must not hold process lock */
+/** Caller must not hold process lock
+ *  @param name_template string to use for the start of the name, or "" to use "Midi".
+ */
 list<boost::shared_ptr<MidiTrack> >
-Session::new_midi_track (TrackMode mode, RouteGroup* route_group, uint32_t how_many)
+Session::new_midi_track (TrackMode mode, RouteGroup* route_group, uint32_t how_many, string name_template)
 {
        char track_name[32];
        uint32_t track_id = 0;
@@ -1515,8 +1461,10 @@ Session::new_midi_track (TrackMode mode, RouteGroup* route_group, uint32_t how_m
 
        control_id = ntracks() + nbusses();
 
+       bool const use_number = (how_many != 1);
+       
        while (how_many) {
-               if (!find_route_name ("Midi", ++track_id, track_name, sizeof(track_name))) {
+               if (!find_route_name (name_template.empty() ? _("Midi") : name_template, ++track_id, track_name, sizeof(track_name), use_number)) {
                        error << "cannot find name for new midi track" << endmsg;
                        goto failed;
                }
@@ -1524,18 +1472,17 @@ Session::new_midi_track (TrackMode mode, RouteGroup* route_group, uint32_t how_m
                 boost::shared_ptr<MidiTrack> track;
                 
                try {
-                       MidiTrack* mt = new MidiTrack (*this, track_name, Route::Flag (0), mode);
+                       track.reset (new MidiTrack (*this, track_name, Route::Flag (0), mode));
 
-                       if (mt->init ()) {
-                               delete mt;
+                       if (track->init ()) {
                                goto failed;
                        }
 
-                       mt->use_new_diskstream();
-
-                       boost_debug_shared_ptr_mark_interesting (mt, "Track");
-                       track = boost::shared_ptr<MidiTrack>(mt);
+                       track->use_new_diskstream();
 
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
+                       boost_debug_shared_ptr_mark_interesting (track.get(), "Track");
+#endif
                        {
                                Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
                                if (track->input()->ensure_io (ChanCount(DataType::MIDI, 1), false, this)) {
@@ -1667,9 +1614,13 @@ Session::auto_connect_route (
        existing_outputs += route->n_outputs();
 }
 
-/** Caller must not hold process lock */
+/** Caller must not hold process lock
+ *  @param name_template string to use for the start of the name, or "" to use "Audio".
+ */
 list< boost::shared_ptr<AudioTrack> >
-Session::new_audio_track (int input_channels, int output_channels, TrackMode mode, RouteGroup* route_group, uint32_t how_many)
+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];
        uint32_t track_id = 0;
@@ -1684,8 +1635,10 @@ Session::new_audio_track (int input_channels, int output_channels, TrackMode mod
 
        control_id = ntracks() + nbusses() + 1;
 
+       bool const use_number = (how_many != 1);
+       
        while (how_many) {
-               if (!find_route_name ("Audio", ++track_id, track_name, sizeof(track_name))) {
+               if (!find_route_name (name_template.empty() ? _("Audio") : name_template, ++track_id, track_name, sizeof(track_name), use_number)) {
                        error << "cannot find name for new audio track" << endmsg;
                        goto failed;
                }
@@ -1693,18 +1646,17 @@ Session::new_audio_track (int input_channels, int output_channels, TrackMode mod
                 boost::shared_ptr<AudioTrack> track;
                 
                try {
-                       AudioTrack* at = new AudioTrack (*this, track_name, Route::Flag (0), mode);
+                       track.reset (new AudioTrack (*this, track_name, Route::Flag (0), mode));
 
-                       if (at->init ()) {
-                               delete at;
+                       if (track->init ()) {
                                goto failed;
                        }
 
-                       at->use_new_diskstream();
-
-                       boost_debug_shared_ptr_mark_interesting (at, "Track");
-                       track = boost::shared_ptr<AudioTrack>(at);
+                       track->use_new_diskstream();
 
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
+                       boost_debug_shared_ptr_mark_interesting (track.get(), "Track");
+#endif
                        {
                                Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
 
@@ -1790,9 +1742,11 @@ Session::set_remote_control_ids ()
        }
 }
 
-/** Caller must not hold process lock */
+/** Caller must not hold process lock.
+ *  @param name_template string to use for the start of the name, or "" to use "Bus".
+ */
 RouteList
-Session::new_audio_route (bool aux, int input_channels, int output_channels, RouteGroup* route_group, uint32_t how_many)
+Session::new_audio_route (int input_channels, int output_channels, RouteGroup* route_group, uint32_t how_many, string name_template)
 {
        char bus_name[32];
        uint32_t bus_id = 0;
@@ -1806,23 +1760,23 @@ Session::new_audio_route (bool aux, int input_channels, int output_channels, Rou
 
        control_id = ntracks() + nbusses() + 1;
 
+       bool const use_number = (how_many != 1);
        while (how_many) {
-               if (!find_route_name ("Bus", ++bus_id, bus_name, sizeof(bus_name))) {
+               if (!find_route_name (name_template.empty () ? _("Bus") : name_template, ++bus_id, bus_name, sizeof(bus_name), use_number)) {
                        error << "cannot find name for new audio bus" << endmsg;
                        goto failure;
                }
 
                try {
-                       Route* rt = new Route (*this, bus_name, Route::Flag(0), DataType::AUDIO);
+                       boost::shared_ptr<Route> bus (new Route (*this, bus_name, Route::Flag(0), DataType::AUDIO));
 
-                       if (rt->init ()) {
-                               delete rt;
+                       if (bus->init ()) {
                                goto failure;
                        }
 
-                       boost_debug_shared_ptr_mark_interesting (rt, "Route");
-                        boost::shared_ptr<Route> bus (rt);
-
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
+                       boost_debug_shared_ptr_mark_interesting (bus.get(), "Route");
+#endif
                        {
                                Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
 
@@ -1850,9 +1804,7 @@ Session::new_audio_route (bool aux, int input_channels, int output_channels, Rou
                        bus->set_remote_control_id (control_id);
                        ++control_id;
 
-                       if (aux) {
-                               bus->add_internal_return ();
-                       }
+                       bus->add_internal_return ();
 
                        ret.push_back (bus);
                }
@@ -1905,7 +1857,7 @@ Session::new_route_from_template (uint32_t how_many, const std::string& template
                std::string node_name = IO::name_from_state (*node_copy.children().front());
 
                /* generate a new name by adding a number to the end of the template name */
-               if (!find_route_name (node_name.c_str(), ++number, name, sizeof(name))) {
+               if (!find_route_name (node_name.c_str(), ++number, name, sizeof(name), true)) {
                        fatal << _("Session: UINT_MAX routes? impossible!") << endmsg;
                        /*NOTREACHED*/
                }
@@ -2032,9 +1984,7 @@ Session::add_routes (RouteList& new_routes, bool save)
                        } else if ((*x)->is_master()) {
                                /* relax */
                        } else {
-                               (*x)->listen_via (_monitor_out,
-                                                 (Config->get_listen_position() == AfterFaderListen ? PostFader : PreFader),
-                                                 false, false);
+                               (*x)->listen_via_monitor ();
                        }
                }
 
@@ -2123,7 +2073,7 @@ Session::add_internal_sends (boost::shared_ptr<Route> dest, Placement p, boost::
                        continue;
                }
 
-               (*i)->listen_via (dest, p, true, true);
+               (*i)->listen_via (dest, p);
        }
 
        graph_reordered ();
@@ -2168,7 +2118,6 @@ Session::remove_route (boost::shared_ptr<Route> route)
        }
 
        update_route_solo_state ();
-       update_session_range_location_marker ();
 
        // We need to disconnect the route's inputs and outputs
 
@@ -2240,7 +2189,7 @@ Session::route_listen_changed (void* /*src*/, boost::weak_ptr<Route> wpr)
                return;
        }
 
-       if (route->listening()) {
+       if (route->listening_via_monitor ()) {
 
                if (Config->get_exclusive_solo()) {
                        /* new listen: disable all other listen */
@@ -2259,6 +2208,8 @@ Session::route_listen_changed (void* /*src*/, boost::weak_ptr<Route> wpr)
 
                _listen_cnt--;
        }
+
+       update_route_solo_state ();
 }
 void
 Session::route_solo_isolated_changed (void* /*src*/, boost::weak_ptr<Route> wpr)
@@ -2396,7 +2347,7 @@ Session::update_route_solo_state (boost::shared_ptr<RouteList> r)
                        something_soloed = true;
                }
 
-               if (!(*i)->is_hidden() && (*i)->listening()) {
+               if (!(*i)->is_hidden() && (*i)->listening_via_monitor()) {
                        if (Config->get_solo_control_is_listen_control()) {
                                listeners++;
                        } else {
@@ -2496,64 +2447,85 @@ Session::route_by_remote_id (uint32_t id)
        return boost::shared_ptr<Route> ((Route*) 0);
 }
 
-/** If either end of the session range location marker lies inside the current
- *  session extent, move it to the corresponding session extent.
+void
+Session::playlist_region_added (boost::weak_ptr<Region> w)
+{
+       boost::shared_ptr<Region> r = w.lock ();
+       if (!r) {
+               return;
+       }
+
+       /* These are the operations that are currently in progress... */
+       list<GQuark> curr = _current_trans_quarks;
+       curr.sort ();
+
+       /* ...and these are the operations during which we want to update
+          the session range location markers.
+       */
+       list<GQuark> ops;
+       ops.push_back (Operations::capture);
+       ops.push_back (Operations::paste);
+       ops.push_back (Operations::duplicate_region);
+       ops.push_back (Operations::insert_file);
+       ops.push_back (Operations::insert_region);
+       ops.push_back (Operations::drag_region_brush);
+       ops.push_back (Operations::region_drag);
+       ops.push_back (Operations::selection_grab);
+       ops.push_back (Operations::region_fill);
+       ops.push_back (Operations::fill_selection);
+       ops.push_back (Operations::create_region);
+       ops.sort ();
+
+       /* See if any of the current operations match the ones that we want */
+       list<GQuark> in;
+       set_intersection (_current_trans_quarks.begin(), _current_trans_quarks.end(), ops.begin(), ops.end(), back_inserter (in));
+
+       /* If so, update the session range markers */
+       if (!in.empty ()) {
+               maybe_update_session_range (r->position (), r->last_frame ());
+       }
+}
+
+/** Update the session range markers if a is before the current start or
+ *  b is after the current end.
  */
 void
-Session::update_session_range_location_marker ()
+Session::maybe_update_session_range (framepos_t a, framepos_t b)
 {
        if (_state_of_the_state & Loading) {
                return;
        }
 
-       pair<framepos_t, framepos_t> const ext = get_extent ();
-
        if (_session_range_location == 0) {
-               /* we don't have a session range yet; use this one (provided it is valid) */
-               if (ext.first != max_framepos) {
-                       add_session_range_location (ext.first, ext.second);
-               }
+               
+               add_session_range_location (a, b);
+               
        } else {
-               /* update the existing session range */
-               if (ext.first < _session_range_location->start()) {
-                       _session_range_location->set_start (ext.first);
-                       set_dirty ();
-               }
                
-               if (ext.second > _session_range_location->end()) {
-                       _session_range_location->set_end (ext.second);
-                       set_dirty ();
+               if (a < _session_range_location->start()) {
+                       _session_range_location->set_start (a);
                }
                
+               if (b > _session_range_location->end()) {
+                       _session_range_location->set_end (b);
+               }
        }
 }
 
-/** @return Extent of the session's contents; if the session is empty, the first value of
- *  the pair will equal max_framepos.
- */
-pair<framepos_t, framepos_t>
-Session::get_extent () const
+void
+Session::playlist_ranges_moved (list<Evoral::RangeMove<framepos_t> > const & ranges)
 {
-       pair<framepos_t, framepos_t> ext (max_framepos, 0);
-       
-       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->destructive()) {
-                       // ignore tape tracks when getting extents
-                       continue;
-               }
-
-               pair<framepos_t, framepos_t> e = tr->playlist()->get_extent ();
-               if (e.first < ext.first) {
-                       ext.first = e.first;
-               }
-               if (e.second > ext.second) {
-                       ext.second = e.second;
-               }
+       for (list<Evoral::RangeMove<framepos_t> >::const_iterator i = ranges.begin(); i != ranges.end(); ++i) {
+               maybe_update_session_range (i->to, i->to + i->length);
        }
+}
 
-       return ext;
+void
+Session::playlist_regions_extended (list<Evoral::Range<framepos_t> > const & ranges)
+{
+       for (list<Evoral::Range<framepos_t> >::const_iterator i = ranges.begin(); i != ranges.end(); ++i) {
+               maybe_update_session_range (i->from, i->to);
+       }
 }
 
 /* Region management */
@@ -2687,12 +2659,18 @@ Session::add_source (boost::shared_ptr<Source> source)
                                Analyser::queue_source_for_analysis (source, false);
                        }
                }
+
+               source->DropReferences.connect_same_thread (*this, boost::bind (&Session::remove_source, this, boost::weak_ptr<Source> (source)));
         }
 }
 
 void
 Session::remove_source (boost::weak_ptr<Source> src)
 {
+       if (_state_of_the_state & Deletion) {
+               return;
+       }
+       
        SourceMap::iterator i;
        boost::shared_ptr<Source> source = src.lock();
 
@@ -2704,7 +2682,6 @@ Session::remove_source (boost::weak_ptr<Source> src)
                Glib::Mutex::Lock lm (source_lock);
 
                if ((i = sources.find (source->id())) != sources.end()) {
-                       cerr << "Removing source " << source->name() << endl;
                        sources.erase (i);
                }
        }
@@ -2877,7 +2854,7 @@ Session::change_source_path_by_name (string path, string oldname, string newname
  *         (e.g. as returned by new_*_source_name)
  */
 string
-Session::new_source_path_from_name (DataType type, const string& name, bool as_stub)
+Session::new_source_path_from_name (DataType type, const string& name)
 {
        assert(name.find("/") == string::npos);
 
@@ -2885,9 +2862,9 @@ Session::new_source_path_from_name (DataType type, const string& name, bool as_s
 
        sys::path p;
        if (type == DataType::AUDIO) {
-               p = (as_stub ? sdir.sound_stub_path() : sdir.sound_path());
+               p = sdir.sound_path();
        } else if (type == DataType::MIDI) {
-               p = (as_stub ? sdir.midi_stub_path() : sdir.midi_path());
+               p = sdir.midi_path();
        } else {
                error << "Unknown source type, unable to create file path" << endmsg;
                return "";
@@ -2967,7 +2944,6 @@ Session::new_audio_source_name (const string& base, uint32_t nchan, uint32_t cha
                        SessionDirectory sdir((*i).path);
 
                        string spath = sdir.sound_path().to_string();
-                       string spath_stubs = sdir.sound_stub_path().to_string();
 
                        /* note that we search *without* the extension so that
                           we don't end up both "Audio 1-1.wav" and "Audio 1-1.caf" 
@@ -2975,8 +2951,7 @@ Session::new_audio_source_name (const string& base, uint32_t nchan, uint32_t cha
                           a file format change.
                        */
 
-                       if (matching_unsuffixed_filename_exists_in (spath, buf) ||
-                           matching_unsuffixed_filename_exists_in (spath_stubs, buf)) {
+                       if (matching_unsuffixed_filename_exists_in (spath, buf)) {
                                existing++;
                                break;
                        }
@@ -3000,10 +2975,10 @@ Session::new_audio_source_name (const string& base, uint32_t nchan, uint32_t cha
 
 /** Create a new within-session audio source */
 boost::shared_ptr<AudioFileSource>
-Session::create_audio_source_for_session (size_t n_chans, string const & n, uint32_t chan, bool destructive, bool as_stub)
+Session::create_audio_source_for_session (size_t n_chans, string const & n, uint32_t chan, bool destructive)
 {
        const string name    = new_audio_source_name (n, n_chans, chan, destructive);
-       const string path    = new_source_path_from_name(DataType::AUDIO, name, as_stub);
+       const string path    = new_source_path_from_name(DataType::AUDIO, name);
 
        return boost::dynamic_pointer_cast<AudioFileSource> (
                SourceFactory::createWritable (DataType::AUDIO, *this, path, string(), destructive, frame_rate()));
@@ -3060,7 +3035,7 @@ Session::new_midi_source_name (const string& base)
 
 /** Create a new within-session MIDI source */
 boost::shared_ptr<MidiSource>
-Session::create_midi_source_for_session (Track* track, string const & n, bool as_stub)
+Session::create_midi_source_for_session (Track* track, string const & n)
 {
        /* try to use the existing write source for the track, to keep numbering sane 
         */
@@ -3079,7 +3054,7 @@ Session::create_midi_source_for_session (Track* track, string const & n, bool as
        }
 
        const string name = new_midi_source_name (n);
-       const string path = new_source_path_from_name (DataType::MIDI, name, as_stub);
+       const string path = new_source_path_from_name (DataType::MIDI, name);
 
        return boost::dynamic_pointer_cast<SMFSource> (
                SourceFactory::createWritable (
@@ -3775,45 +3750,18 @@ BufferSet&
 Session::get_silent_buffers (ChanCount count)
 {
        return ProcessThread::get_silent_buffers (count);
-#if 0
-       assert(_silent_buffers->available() >= count);
-       _silent_buffers->set_count(count);
-
-       for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
-               for (size_t i= 0; i < count.get(*t); ++i) {
-                       _silent_buffers->get(*t, i).clear();
-               }
-       }
-
-       return *_silent_buffers;
-#endif
 }
 
 BufferSet&
 Session::get_scratch_buffers (ChanCount count)
 {
        return ProcessThread::get_scratch_buffers (count);
-#if 0
-       if (count != ChanCount::ZERO) {
-               assert(_scratch_buffers->available() >= count);
-               _scratch_buffers->set_count(count);
-       } else {
-               _scratch_buffers->set_count (_scratch_buffers->available());
-       }
-
-       return *_scratch_buffers;
-#endif
 }
 
 BufferSet&
 Session::get_mix_buffers (ChanCount count)
 {
        return ProcessThread::get_mix_buffers (count);
-#if 0
-       assert(_mix_buffers->available() >= count);
-       _mix_buffers->set_count(count);
-       return *_mix_buffers;
-#endif
 }
 
 uint32_t
@@ -3912,22 +3860,10 @@ Session::update_have_rec_enabled_track ()
 void
 Session::listen_position_changed ()
 {
-       Placement p;
-
-       switch (Config->get_listen_position()) {
-       case AfterFaderListen:
-               p = PostFader;
-               break;
-
-       case PreFaderListen:
-               p = PreFader;
-               break;
-       }
-
        boost::shared_ptr<RouteList> r = routes.reader ();
 
        for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-               (*i)->put_monitor_send_at (p);
+               (*i)->listen_position_changed ();
        }
 }
 
@@ -4194,14 +4130,10 @@ Session::ensure_search_path_includes (const string& path, DataType type)
        }
 }
 
-Speakers&
+boost::shared_ptr<Speakers>
 Session::get_speakers() 
 {
-        if (!_speakers) {
-                _speakers = new Speakers;
-        }
-
-        return *_speakers;
+        return _speakers;
 }
 
 list<string>
@@ -4220,3 +4152,24 @@ Session::unknown_processors () const
 
        return p;
 }
+
+#ifdef HAVE_JACK_NEW_LATENCY
+void
+Session::update_latency (bool playback)
+{
+        DEBUG_TRACE (DEBUG::Latency, "JACK latency callback\n");
+
+       boost::shared_ptr<RouteList> r = routes.reader ();
+
+        if (playback) {
+                /* reverse the list so that we work backwards from the last route to run to the first */
+                reverse (r->begin(), r->end());
+        }
+
+       for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
+                DEBUG_TRACE (DEBUG::Latency, string_compose ("------------- Working on latency for %1\n", (*i)->name()));
+                (*i)->set_latency_ranges (playback);
+                DEBUG_TRACE (DEBUG::Latency, string_compose ("------------- Done working on latency for %1\n\n", (*i)->name()));
+        }
+}
+#endif