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

Resolve microseconds_t ambiguity 2/2

Browse source
This commit is contained in:
Robin Gareus 2021-06-27 17:32:30 +02:00
parent b58dfc7f0f
commit bcab07af63
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
4 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/ardour_ui.cc
View file

@ -143,8 +143,6 @@
#include "temporal/time.h" #include "temporal/time.h"
typedef uint64_t microseconds_t;
#include "about.h" #include "about.h"
#include "editing.h" #include "editing.h"
#include "enums_convert.h" #include "enums_convert.h"

6
gtk2_ardour/ardour_ui.h
View file

@ -779,11 +779,11 @@ private:
void flush_trash (); void flush_trash ();
bool have_configure_timeout; bool have_configure_timeout;
ARDOUR::microseconds_t last_configure_time; PBD::microseconds_t last_configure_time;
gint configure_timeout (); gint configure_timeout ();
ARDOUR::microseconds_t last_peak_grab; PBD::microseconds_t last_peak_grab;
ARDOUR::microseconds_t last_shuttle_request; PBD::microseconds_t last_shuttle_request;
bool have_disk_speed_dialog_displayed; bool have_disk_speed_dialog_displayed;
void disk_speed_dialog_gone (int ignored_response, Gtk::MessageDialog*); void disk_speed_dialog_gone (int ignored_response, Gtk::MessageDialog*);

2
gtk2_ardour/editor.h
View file

@ -2160,7 +2160,7 @@ private:
/* tracking step changes of track height */ /* tracking step changes of track height */
TimeAxisView* current_stepping_trackview; 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(); gint track_height_step_timeout();
sigc::connection step_timeout; sigc::connection step_timeout;

2
gtk2_ardour/shuttle_control.h
View file

@ -74,7 +74,7 @@ protected:
boost::shared_ptr<ShuttleControllable> _controllable; boost::shared_ptr<ShuttleControllable> _controllable;
cairo_pattern_t* pattern; cairo_pattern_t* pattern;
cairo_pattern_t* shine_pattern; cairo_pattern_t* shine_pattern;
ARDOUR::microseconds_t last_shuttle_request; PBD::microseconds_t last_shuttle_request;
PBD::ScopedConnection parameter_connection; PBD::ScopedConnection parameter_connection;
ArdourWidgets::ArdourButton _info_button; ArdourWidgets::ArdourButton _info_button;
Gtk::Menu* shuttle_context_menu; Gtk::Menu* shuttle_context_menu;