monster commit: transport mgmt changes from 2.X (omnibus edition); make slave use...

[ardour.git] / libs / ardour / session_state.cc

diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc
index 83cebbccbee2988818338bbb1dbeaf9893b52620..1a4758186eac9aee5c99545ee9f7e49f14d4c557 100644 (file)
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -174,6 +174,7 @@ Session::first_stage_init (string fullpath, string snapshot_name)
        auto_play_legal = false;
        transport_sub_state = 0;
        _transport_frame = 0;
+       _requested_return_frame = -1;
        end_location = new Location (0, 0, _("end"), Location::Flags ((Location::IsMark|Location::IsEnd)));
        start_location = new Location (0, 0, _("start"), Location::Flags ((Location::IsMark|Location::IsStart)));
        g_atomic_int_set (&_record_status, Disabled);
@@ -194,13 +195,12 @@ Session::first_stage_init (string fullpath, string snapshot_name)
        _have_captured = false;
        _worst_output_latency = 0;
        _worst_input_latency = 0;
-       _worst_track_latency = 0;
+       _worst_track_latency = 0;
        _state_of_the_state = StateOfTheState(CannotSave|InitialConnecting|Loading);
-
+       _was_seamless = Config->get_seamless_loop ();
        _slave = 0;
        session_send_mmc = false;
        session_send_mtc = false;
-       post_transport_work = PostTransportWork (0);
        g_atomic_int_set (&_playback_load, 100);
        g_atomic_int_set (&_capture_load, 100);
        g_atomic_int_set (&_playback_load_min, 100);
@@ -2436,7 +2436,7 @@ struct RegionCounter {
 };
 
 int
-Session::cleanup_sources (Session::cleanup_report& rep)
+Session::cleanup_sources (CleanupReport& rep)
 {
        // FIXME: needs adaptation to midi
 
@@ -2503,7 +2503,7 @@ Session::cleanup_sources (Session::cleanup_report& rep)
                   capture files.
                */
 
-               if (!i->second->used() && i->second->length(i->second->timeline_position()) > 0) {
+               if (!source_use_count(i->second) && i->second->length(i->second->timeline_position()) > 0) {
                        dead_sources.push_back (i->second);
                        i->second->GoingAway();
                }
@@ -2699,7 +2699,7 @@ Session::cleanup_sources (Session::cleanup_report& rep)
 }
 
 int
-Session::cleanup_trash_sources (Session::cleanup_report& rep)
+Session::cleanup_trash_sources (CleanupReport& rep)
 {
        // FIXME: needs adaptation for MIDI