Browse Source

fix issue with poll timeouts due to kernel event handling

git-svn-id: svn+ssh://jackaudio.org/trunk/jack@173 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/0.109.0
pbd 24 years ago
parent
commit
eb4b3f3f1b
2 changed files with 3 additions and 3 deletions
  1. +2
    -2
      alsa_driver.c
  2. +1
    -1
      configure.in

+ 2
- 2
alsa_driver.c View File

@@ -823,7 +823,7 @@ alsa_driver_wait (alsa_driver_t *driver, int extra_fd, int *status, float *delay


poll_enter = get_cycles (); poll_enter = get_cycles ();


if (poll (driver->pfd, nfds, (int) floor (driver->period_usecs / 1000.0f)) < 0) {
if (poll (driver->pfd, nfds, (int) floor ((1.5f * driver->period_usecs) / 1000.0f)) < 0) {
if (errno == EINTR) { if (errno == EINTR) {
printf ("poll interrupt\n"); printf ("poll interrupt\n");
// this happens mostly when run // this happens mostly when run
@@ -919,7 +919,7 @@ alsa_driver_wait (alsa_driver_t *driver, int extra_fd, int *status, float *delay
if ((p_timed_out && (p_timed_out == driver->playback_nfds)) && if ((p_timed_out && (p_timed_out == driver->playback_nfds)) &&
(c_timed_out && (c_timed_out == driver->capture_nfds))){ (c_timed_out && (c_timed_out == driver->capture_nfds))){
jack_error ("ALSA: poll time out");
jack_error ("ALSA: poll time out polled for %.6f", ((float) (poll_ret - poll_enter) / driver->cpu_mhz));
*status = -5; *status = -5;
return 0; return 0;
} }


+ 1
- 1
configure.in View File

@@ -5,7 +5,7 @@ AC_CONFIG_AUX_DIR(.)


JACK_MAJOR_VERSION=0 JACK_MAJOR_VERSION=0
JACK_MINOR_VERSION=26 JACK_MINOR_VERSION=26
JACK_MICRO_VERSION=2
JACK_MICRO_VERSION=3


BETA= BETA=




Loading…
Cancel
Save