ardour/livetrax
13
0
Fork 0
Code

libs fix for get_microseconds() move to libpbd

Browse Source
This commit is contained in:
Paul Davis 2021-06-26 18:27:39 -06:00
parent 04df262447
commit 9cbaa31c7e
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/surfaces/mackie/button.cc
View File

@ -42,7 +42,7 @@ Button::factory (Surface& surface, Button::ID bid, int id, const std::string& na
void void
Button::pressed () Button::pressed ()
{ {
press_time = ARDOUR::get_microseconds (); press_time = PBD::get_microseconds ();
} }
void void
@ -58,7 +58,7 @@ Button::long_press_count ()
return -1; /* button is not pressed */ 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) { if (delta < 500000) {
return 0; return 0;

4
libs/surfaces/mackie/mackie_control_protocol.cc
View File

@ -536,7 +536,7 @@ MackieControlProtocol::periodic ()
update_timecode_display (); 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); Glib::Threads::Mutex::Lock lm (surfaces_lock);
@ -565,7 +565,7 @@ MackieControlProtocol::redisplay ()
initialize(); initialize();
} }
ARDOUR::microseconds_t now = ARDOUR::get_microseconds (); ARDOUR::microseconds_t now = PBD::get_microseconds ();
{ {
Glib::Threads::Mutex::Lock lm (surfaces_lock); Glib::Threads::Mutex::Lock lm (surfaces_lock);

4
libs/surfaces/mackie/strip.cc
View File

@ -1063,13 +1063,13 @@ Strip::flip_mode_changed ()
void void
Strip::block_screen_display_for (uint32_t msecs) 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 void
Strip::block_vpot_mode_display_for (uint32_t msecs) 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 void

4
libs/surfaces/osc/osc.cc
View File

@ -2991,7 +2991,7 @@ OSC::scrub (float delta, lo_message msg)
float speed; float speed;
int64_t now = ARDOUR::get_microseconds (); int64_t now = PBD::get_microseconds ();
int64_t diff = now - scrub_time; int64_t diff = now - scrub_time;
if (diff > 35000) { if (diff > 35000) {
// speed 1 (or 0 if jog wheel supports touch) // speed 1 (or 0 if jog wheel supports touch)
@ -5892,7 +5892,7 @@ OSC::periodic (void)
if (scrub_speed != 0) { if (scrub_speed != 0) {
// for those jog wheels that don't have 0 on release (touch), time out. // 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; int64_t diff = now - scrub_time;
if (diff > 120000) { if (diff > 120000) {
scrub_speed = 0; scrub_speed = 0;

4
libs/surfaces/us2400/button.cc
View File

@ -41,7 +41,7 @@ Button::factory (Surface& surface, Button::ID bid, int id, const std::string& na
void void
Button::pressed () Button::pressed ()
{ {
press_time = ARDOUR::get_microseconds (); press_time = PBD::get_microseconds ();
} }
void void
@ -57,7 +57,7 @@ Button::long_press_count ()
return -1; /* button is not pressed */ 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) { if (delta < 500000) {
return 0; return 0;

2
libs/surfaces/us2400/us2400_control_protocol.cc
View File

@ -457,7 +457,7 @@ US2400Protocol::periodic ()
initialize(); initialize();
} }
ARDOUR::microseconds_t now_usecs = ARDOUR::get_microseconds (); ARDOUR::microseconds_t now_usecs = PBD::get_microseconds ();
{ {
Glib::Threads::Mutex::Lock lm (surfaces_lock); Glib::Threads::Mutex::Lock lm (surfaces_lock);