From fca85e01c959c7e2c5089116248f75fdf9bab9ea Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Mon, 1 Dec 2025 15:32:47 -0700
Subject: [PATCH] partially revert cf6eff4d9 upon realizing that a lot of the
 changes were not required

Hiding the overlay text when the trigger rec-enable state changes is sufficient
---
 gtk2_ardour/audio_clip_editor.cc | 30 ------------------------------
 gtk2_ardour/audio_clip_editor.h  |  4 ----
 gtk2_ardour/pianoroll.cc         | 14 ++++++++------
 3 files changed, 8 insertions(+), 40 deletions(-)

diff --git a/gtk2_ardour/audio_clip_editor.cc b/gtk2_ardour/audio_clip_editor.cc
index 3dabd084e4..4ec8a61627 100644
--- a/gtk2_ardour/audio_clip_editor.cc
+++ b/gtk2_ardour/audio_clip_editor.cc
@@ -903,33 +903,3 @@ AudioClipEditor::grid_type_chosen (Editing::GridType gt)
 	}
 }
 
-void
-AudioClipEditor::set_session (ARDOUR::Session* s)
-{
-	EC_LOCAL_TEMPO_SCOPE;
-
-	CueEditor::set_session (s);
-
-	if (_session) {
-		_session->TransportStateChange.connect (_session_connections, MISSING_INVALIDATOR, std::bind (&AudioClipEditor::map_transport_state, this), gui_context());
-	} else {
-		_session_connections.drop_connections();
-	}
-
-	map_transport_state ();
-}
-
-void
-AudioClipEditor::map_transport_state ()
-{
-	EC_LOCAL_TEMPO_SCOPE;
-
-	if (!_session) {
-		return;
-	}
-
-	if (!_session->transport_rolling()) {
-		hide_count_in ();
-	}
-}
-
diff --git a/gtk2_ardour/audio_clip_editor.h b/gtk2_ardour/audio_clip_editor.h
index 1234ecf93d..30790b7e1a 100644
--- a/gtk2_ardour/audio_clip_editor.h
+++ b/gtk2_ardour/audio_clip_editor.h
@@ -110,8 +110,6 @@ public:
 	samplecnt_t current_page_samples() const;
 	void set_samples_per_pixel (samplecnt_t);
 
-	void set_session (ARDOUR::Session* s);
-
 	Gdk::Cursor* which_track_cursor () const { return nullptr; }
 	Gdk::Cursor* which_mode_cursor () const { return nullptr; }
 	Gdk::Cursor* which_trim_cursor (bool left_side) const { return nullptr; }
@@ -211,6 +209,4 @@ public:
 	void grid_type_chosen (Editing::GridType);
 
 	Gtk::Box* pack_mouse_mode_box () { return nullptr; }
-
-	void map_transport_state ();
 };
diff --git a/gtk2_ardour/pianoroll.cc b/gtk2_ardour/pianoroll.cc
index 557ecdb329..71e25b8f1c 100644
--- a/gtk2_ardour/pianoroll.cc
+++ b/gtk2_ardour/pianoroll.cc
@@ -1811,13 +1811,15 @@ Pianoroll::set_session (ARDOUR::Session* s)
 
 	CueEditor::set_session (s);
 
-	if (_session) {
-		_session->TransportStateChange.connect (_session_connections, MISSING_INVALIDATOR, std::bind (&Pianoroll::map_transport_state, this), gui_context());
-	} else {
-		_session_connections.drop_connections();
-	}
+	if (with_transport_controls) {
+		if (_session) {
+			_session->TransportStateChange.connect (_session_connections, MISSING_INVALIDATOR, std::bind (&Pianoroll::map_transport_state, this), gui_context());
+		} else {
+			_session_connections.drop_connections();
+		}
 
-	map_transport_state ();
+		map_transport_state ();
+	}
 
 	if (_session) {
 		zoom_to_show (timecnt_t (timepos_t (max_extents_scale() * max_zoom_extent ().second.samples())));