aboutsummaryrefslogtreecommitdiff
path: root/audio/jack/files/patch-drivers-oss-oss_driver.c
diff options
context:
space:
mode:
Diffstat (limited to 'audio/jack/files/patch-drivers-oss-oss_driver.c')
-rw-r--r--audio/jack/files/patch-drivers-oss-oss_driver.c37
1 files changed, 35 insertions, 2 deletions
diff --git a/audio/jack/files/patch-drivers-oss-oss_driver.c b/audio/jack/files/patch-drivers-oss-oss_driver.c
index 633186167a73..612695654128 100644
--- a/audio/jack/files/patch-drivers-oss-oss_driver.c
+++ b/audio/jack/files/patch-drivers-oss-oss_driver.c
@@ -1,5 +1,5 @@
---- drivers/oss/oss_driver.c.orig Sat May 1 10:53:47 2004
-+++ drivers/oss/oss_driver.c Sat May 1 10:58:57 2004
+--- drivers/oss/oss_driver.c.orig
++++ drivers/oss/oss_driver.c
@@ -23,6 +23,7 @@
#include <config.h>
@@ -8,3 +8,36 @@
#ifdef USE_BARRIER
/*
* POSIX conformance level should be globally defined somewhere, possibly
+@@ -181,7 +182,9 @@ static void set_period_size (oss_driver_
+ ((double) driver->period_size /
+ (double) driver->sample_rate) * 1e6;
+ driver->last_wait_ust = 0;
+- driver->last_periodtime = driver->engine->get_microseconds();
++ driver->last_periodtime = driver->engine ?
++ driver->engine->get_microseconds() :
++ jack_get_microseconds();
+ driver->next_periodtime = 0;
+ driver->iodelay = 0.0F;
+ }
+@@ -189,7 +192,9 @@ static void set_period_size (oss_driver_
+
+ static inline void update_times (oss_driver_t *driver)
+ {
+- driver->last_periodtime = driver->engine->get_microseconds();
++ driver->last_periodtime = driver->engine ?
++ driver->engine->get_microseconds() :
++ jack_get_microseconds();
+ if (driver->next_periodtime > 0)
+ {
+ driver->iodelay = (float)
+@@ -759,7 +764,9 @@ static int oss_driver_start (oss_driver_
+ if (driver->threads & 1) sem_post(&driver->sem_start);
+ if (driver->threads & 2) sem_post(&driver->sem_start);
+
+- driver->last_periodtime = driver->engine->get_microseconds();
++ driver->last_periodtime = driver->engine ?
++ driver->engine->get_microseconds() :
++ jack_get_microseconds();
+ driver->next_periodtime = 0;
+ driver->iodelay = 0.0F;
+