fix for bad sync with other JACK transport-aware clients (thanks to torben for discovering the problem and suggesting the best fix)

git-svn-id: svn://localhost/ardour2/branches/3.0@3887 d708f5d6-7413-0410-9779-e7cbd77b26cf

4 files changed, 0 insertions, 21 deletions

diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index eef953ac2c..dff59e0243 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -1397,7 +1397,6 @@ class Session : public PBD::StatefulDestructible
 	int           use_config_midi_ports ();
 
 	mutable  gint   butler_active;
-	bool waiting_to_start;
 
 	void set_play_loop (bool yn);
 	void overwrite_some_buffers (Diskstream*);
@@ -1410,7 +1409,6 @@ class Session : public PBD::StatefulDestructible
 	void set_transport_speed (float speed, bool abort = false);
 	void stop_transport (bool abort = false);
 	void start_transport ();
-	void actually_start_transport ();
 	void realtime_stop (bool abort);
 	void non_realtime_start_scrub ();
 	void non_realtime_set_speed ();
diff --git a/libs/ardour/session_process.cc b/libs/ardour/session_process.cc
index abe802548a..5433120f53 100644
--- a/libs/ardour/session_process.cc
+++ b/libs/ardour/session_process.cc
@@ -54,12 +54,6 @@ Session::process (nframes_t nframes)
 
 	_silent = false;
 
-	if (synced_to_jack() && waiting_to_start) {
-		if ( _engine.transport_state() == AudioEngine::TransportRolling) {
-			actually_start_transport ();
-		}
-	}
-
 	if (non_realtime_work_pending()) {
 		if (!transport_work_requested ()) {
 			post_transport ();
diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc
index 310df3cbed..0975d4dc8a 100644
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -198,7 +198,6 @@ Session::first_stage_init (string fullpath, string snapshot_name)
 	g_atomic_int_set (&_playback_load_min, 100);
 	g_atomic_int_set (&_capture_load_min, 100);
 	_play_range = false;
-	waiting_to_start = false;
 	_exporting = false;
 	_exporting_realtime = false;
 	_gain_automation_buffer = 0;
diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc
index 7480ba49df..7f574d4811 100644
--- a/libs/ardour/session_transport.cc
+++ b/libs/ardour/session_transport.cc
@@ -973,18 +973,6 @@ Session::start_transport ()
 		break;
 	}
 
-	if (!synced_to_jack() || _exporting) {
-		actually_start_transport ();
-	} else {
-		waiting_to_start = true;
-	}
-}
-
-void
-Session::actually_start_transport ()
-{
-	waiting_to_start = false;
-
 	transport_sub_state |= PendingDeclickIn;
 	_transport_speed = 1.0;