From bcab07af6332345c0c01a29a2037a5ce19fe7642 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sun, 27 Jun 2021 17:32:30 +0200 Subject: [PATCH] Resolve microseconds_t ambiguity 2/2 --- gtk2_ardour/ardour_ui.cc | 2 -- gtk2_ardour/ardour_ui.h | 6 +++--- gtk2_ardour/editor.h | 2 +- gtk2_ardour/shuttle_control.h | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 41987aa98a..6dec1c60f5 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -143,8 +143,6 @@ #include "temporal/time.h" -typedef uint64_t microseconds_t; - #include "about.h" #include "editing.h" #include "enums_convert.h" diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index e49c92666e..bf3d90f795 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -779,11 +779,11 @@ private: void flush_trash (); bool have_configure_timeout; - ARDOUR::microseconds_t last_configure_time; + PBD::microseconds_t last_configure_time; gint configure_timeout (); - ARDOUR::microseconds_t last_peak_grab; - ARDOUR::microseconds_t last_shuttle_request; + PBD::microseconds_t last_peak_grab; + PBD::microseconds_t last_shuttle_request; bool have_disk_speed_dialog_displayed; void disk_speed_dialog_gone (int ignored_response, Gtk::MessageDialog*); diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 3fbd0d756a..531e5ed4a1 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -2160,7 +2160,7 @@ private: /* tracking step changes of track height */ TimeAxisView* current_stepping_trackview; - ARDOUR::microseconds_t last_track_height_step_timestamp; + PBD::microseconds_t last_track_height_step_timestamp; gint track_height_step_timeout(); sigc::connection step_timeout; diff --git a/gtk2_ardour/shuttle_control.h b/gtk2_ardour/shuttle_control.h index 7de29fba6e..71cef9310d 100644 --- a/gtk2_ardour/shuttle_control.h +++ b/gtk2_ardour/shuttle_control.h @@ -74,7 +74,7 @@ protected: boost::shared_ptr _controllable; cairo_pattern_t* pattern; cairo_pattern_t* shine_pattern; - ARDOUR::microseconds_t last_shuttle_request; + PBD::microseconds_t last_shuttle_request; PBD::ScopedConnection parameter_connection; ArdourWidgets::ArdourButton _info_button; Gtk::Menu* shuttle_context_menu;