From dedf85e95ab248c4df8abc0d77d0f24dbeedd338 Mon Sep 17 00:00:00 2001 From: falkTX Date: Sun, 13 Sep 2020 00:47:33 +0100 Subject: [PATCH] Revert "alsa: fix the poll interval" This reverts commit d9f84dcca39e22653e92eadd45926d3982d58272. --- linux/alsa/alsa_driver.c | 4 ++-- linux/alsa/alsa_driver.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/linux/alsa/alsa_driver.c b/linux/alsa/alsa_driver.c index be9c4493..e6d111be 100644 --- a/linux/alsa/alsa_driver.c +++ b/linux/alsa/alsa_driver.c @@ -900,7 +900,7 @@ alsa_driver_set_parameters (alsa_driver_t *driver, driver->period_usecs = (jack_time_t) floor ((((float) driver->frames_per_cycle) / driver->frame_rate) * 1000000.0f); - driver->poll_timeout_ms = (int) floor (1.5f * (driver->period_usecs / 1000.0f)); + driver->poll_timeout = (int) floor (1.5f * driver->period_usecs); // JACK2 /* @@ -1362,7 +1362,7 @@ alsa_driver_wait (alsa_driver_t *driver, int extra_fd, int *status, float #ifdef __ANDROID__ poll_result = poll (driver->pfd, nfds, -1); //fix for sleep issue #else - poll_result = poll (driver->pfd, nfds, driver->poll_timeout_ms); + poll_result = poll (driver->pfd, nfds, driver->poll_timeout); #endif if (poll_result < 0) { diff --git a/linux/alsa/alsa_driver.h b/linux/alsa/alsa_driver.h index f01c08ea..efe93de5 100644 --- a/linux/alsa/alsa_driver.h +++ b/linux/alsa/alsa_driver.h @@ -58,7 +58,7 @@ typedef struct _alsa_driver { JACK_DRIVER_NT_DECL - int poll_timeout_ms; + int poll_timeout; jack_time_t poll_last; jack_time_t poll_next; char **playback_addr; -- 2.11.4.GIT