smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 14:54:56 +01:00
Code Issues Projects Releases Wiki Activity

partially revert cf6eff4d9 upon realizing that a lot of the changes were not required

Browse source 
Hiding the overlay text when the trigger rec-enable state changes is sufficient
This commit is contained in:
Paul Davis 2025-12-01 15:32:47 -07:00
parent cf6eff4d9f
commit fca85e01c9
3 changed files with 8 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

30
gtk2_ardour/audio_clip_editor.cc
View file

@ -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 ();
}
}

4
gtk2_ardour/audio_clip_editor.h
View file

@ -110,8 +110,6 @@ public:
samplecnt_t current_page_samples() const; samplecnt_t current_page_samples() const;
void set_samples_per_pixel (samplecnt_t); void set_samples_per_pixel (samplecnt_t);
void set_session (ARDOUR::Session* s);
Gdk::Cursor* which_track_cursor () const { return nullptr; } Gdk::Cursor* which_track_cursor () const { return nullptr; }
Gdk::Cursor* which_mode_cursor () const { return nullptr; } Gdk::Cursor* which_mode_cursor () const { return nullptr; }
Gdk::Cursor* which_trim_cursor (bool left_side) 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); void grid_type_chosen (Editing::GridType);
Gtk::Box* pack_mouse_mode_box () { return nullptr; } Gtk::Box* pack_mouse_mode_box () { return nullptr; }
void map_transport_state ();
}; };

2
gtk2_ardour/pianoroll.cc
View file

@ -1811,6 +1811,7 @@ Pianoroll::set_session (ARDOUR::Session* s)
CueEditor::set_session (s); CueEditor::set_session (s);
if (with_transport_controls) {
if (_session) { if (_session) {
_session->TransportStateChange.connect (_session_connections, MISSING_INVALIDATOR, std::bind (&Pianoroll::map_transport_state, this), gui_context()); _session->TransportStateChange.connect (_session_connections, MISSING_INVALIDATOR, std::bind (&Pianoroll::map_transport_state, this), gui_context());
} else { } else {
@ -1818,6 +1819,7 @@ Pianoroll::set_session (ARDOUR::Session* s)
} }
map_transport_state (); map_transport_state ();
}
if (_session) { if (_session) {
zoom_to_show (timecnt_t (timepos_t (max_extents_scale() * max_zoom_extent ().second.samples()))); zoom_to_show (timecnt_t (timepos_t (max_extents_scale() * max_zoom_extent ().second.samples())));