Resolve microseconds_t ambiguity 2/2
This commit is contained in:
parent
b58dfc7f0f
commit
bcab07af63
|
@ -143,8 +143,6 @@
|
|||
|
||||
#include "temporal/time.h"
|
||||
|
||||
typedef uint64_t microseconds_t;
|
||||
|
||||
#include "about.h"
|
||||
#include "editing.h"
|
||||
#include "enums_convert.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*);
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -74,7 +74,7 @@ protected:
|
|||
boost::shared_ptr<ShuttleControllable> _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;
|
||||
|
|
Loading…
Reference in New Issue