mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-05 22:34:56 +01:00
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
This commit is contained in:
parent
cf6eff4d9f
commit
fca85e01c9
3 changed files with 8 additions and 40 deletions
|
|
@ -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 ();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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 ();
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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())));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue