diff --git a/libs/surfaces/mackie/button.cc b/libs/surfaces/mackie/button.cc index 8ab3f053c8..8185d8b9fc 100644 --- a/libs/surfaces/mackie/button.cc +++ b/libs/surfaces/mackie/button.cc @@ -42,7 +42,7 @@ Button::factory (Surface& surface, Button::ID bid, int id, const std::string& na void Button::pressed () { - press_time = ARDOUR::get_microseconds (); + press_time = PBD::get_microseconds (); } void @@ -58,7 +58,7 @@ Button::long_press_count () return -1; /* button is not pressed */ } - const ARDOUR::microseconds_t delta = ARDOUR::get_microseconds () - press_time; + const ARDOUR::microseconds_t delta = PBD::get_microseconds () - press_time; if (delta < 500000) { return 0; diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc index d1015b915c..d3abee573e 100644 --- a/libs/surfaces/mackie/mackie_control_protocol.cc +++ b/libs/surfaces/mackie/mackie_control_protocol.cc @@ -536,7 +536,7 @@ MackieControlProtocol::periodic () update_timecode_display (); - ARDOUR::microseconds_t now_usecs = ARDOUR::get_microseconds (); + ARDOUR::microseconds_t now_usecs = PBD::get_microseconds (); { Glib::Threads::Mutex::Lock lm (surfaces_lock); @@ -565,7 +565,7 @@ MackieControlProtocol::redisplay () initialize(); } - ARDOUR::microseconds_t now = ARDOUR::get_microseconds (); + ARDOUR::microseconds_t now = PBD::get_microseconds (); { Glib::Threads::Mutex::Lock lm (surfaces_lock); diff --git a/libs/surfaces/mackie/strip.cc b/libs/surfaces/mackie/strip.cc index 6f71ea3338..e7889948ee 100644 --- a/libs/surfaces/mackie/strip.cc +++ b/libs/surfaces/mackie/strip.cc @@ -1063,13 +1063,13 @@ Strip::flip_mode_changed () void Strip::block_screen_display_for (uint32_t msecs) { - _block_screen_redisplay_until = ARDOUR::get_microseconds() + (msecs * 1000); + _block_screen_redisplay_until = PBD::get_microseconds() + (msecs * 1000); } void Strip::block_vpot_mode_display_for (uint32_t msecs) { - return_to_vpot_mode_display_at = ARDOUR::get_microseconds() + (msecs * 1000); + return_to_vpot_mode_display_at = PBD::get_microseconds() + (msecs * 1000); } void diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc index 03cb71ae47..d942e4a0d7 100644 --- a/libs/surfaces/osc/osc.cc +++ b/libs/surfaces/osc/osc.cc @@ -2991,7 +2991,7 @@ OSC::scrub (float delta, lo_message msg) float speed; - int64_t now = ARDOUR::get_microseconds (); + int64_t now = PBD::get_microseconds (); int64_t diff = now - scrub_time; if (diff > 35000) { // speed 1 (or 0 if jog wheel supports touch) @@ -5892,7 +5892,7 @@ OSC::periodic (void) if (scrub_speed != 0) { // for those jog wheels that don't have 0 on release (touch), time out. - int64_t now = ARDOUR::get_microseconds (); + int64_t now = PBD::get_microseconds (); int64_t diff = now - scrub_time; if (diff > 120000) { scrub_speed = 0; diff --git a/libs/surfaces/us2400/button.cc b/libs/surfaces/us2400/button.cc index 1fb06a05e0..5b3933ccee 100644 --- a/libs/surfaces/us2400/button.cc +++ b/libs/surfaces/us2400/button.cc @@ -41,7 +41,7 @@ Button::factory (Surface& surface, Button::ID bid, int id, const std::string& na void Button::pressed () { - press_time = ARDOUR::get_microseconds (); + press_time = PBD::get_microseconds (); } void @@ -57,7 +57,7 @@ Button::long_press_count () return -1; /* button is not pressed */ } - const ARDOUR::microseconds_t delta = ARDOUR::get_microseconds () - press_time; + const ARDOUR::microseconds_t delta = PBD::get_microseconds () - press_time; if (delta < 500000) { return 0; diff --git a/libs/surfaces/us2400/us2400_control_protocol.cc b/libs/surfaces/us2400/us2400_control_protocol.cc index 5aa7eb5ccf..bf8604c62e 100644 --- a/libs/surfaces/us2400/us2400_control_protocol.cc +++ b/libs/surfaces/us2400/us2400_control_protocol.cc @@ -457,7 +457,7 @@ US2400Protocol::periodic () initialize(); } - ARDOUR::microseconds_t now_usecs = ARDOUR::get_microseconds (); + ARDOUR::microseconds_t now_usecs = PBD::get_microseconds (); { Glib::Threads::Mutex::Lock lm (surfaces_lock);