View | Details | Raw Unified | Return to bug 199558 | Differences between
and this patch

Collapse All | Expand All

(-)drivers/oss/oss_driver.c (-3 / +10 lines)
Lines 23-28 Link Here
23
23
24
#include <config.h>
24
#include <config.h>
25
25
26
#define __BSD_VISIBLE	1
26
#ifdef USE_BARRIER
27
#ifdef USE_BARRIER
27
/*
28
/*
28
 * POSIX conformance level should be globally defined somewhere, possibly
29
 * POSIX conformance level should be globally defined somewhere, possibly
Lines 181-187 static void set_period_size (oss_driver_ Link Here
181
		((double) driver->period_size /
182
		((double) driver->period_size /
182
		(double) driver->sample_rate) * 1e6;
183
		(double) driver->sample_rate) * 1e6;
183
	driver->last_wait_ust = 0;
184
	driver->last_wait_ust = 0;
184
	driver->last_periodtime = driver->engine->get_microseconds();
185
	driver->last_periodtime = driver->engine ?
186
		driver->engine->get_microseconds() :
187
		jack_get_microseconds();
185
	driver->next_periodtime = 0;
188
	driver->next_periodtime = 0;
186
	driver->iodelay = 0.0F;
189
	driver->iodelay = 0.0F;
187
}
190
}
Lines 189-195 static void set_period_size (oss_driver_ Link Here
189
192
190
static inline void update_times (oss_driver_t *driver)
193
static inline void update_times (oss_driver_t *driver)
191
{
194
{
192
	driver->last_periodtime = driver->engine->get_microseconds();
195
	driver->last_periodtime = driver->engine ?
196
		driver->engine->get_microseconds() :
197
		jack_get_microseconds();
193
	if (driver->next_periodtime > 0)
198
	if (driver->next_periodtime > 0)
194
	{
199
	{
195
		driver->iodelay = (float)
200
		driver->iodelay = (float)
Lines 759-765 static int oss_driver_start (oss_driver_ Link Here
759
	if (driver->threads & 1) sem_post(&driver->sem_start);
764
	if (driver->threads & 1) sem_post(&driver->sem_start);
760
	if (driver->threads & 2) sem_post(&driver->sem_start);
765
	if (driver->threads & 2) sem_post(&driver->sem_start);
761
766
762
	driver->last_periodtime = driver->engine->get_microseconds();
767
	driver->last_periodtime = driver->engine ?
768
		driver->engine->get_microseconds() :
769
		jack_get_microseconds();
763
	driver->next_periodtime = 0;
770
	driver->next_periodtime = 0;
764
	driver->iodelay = 0.0F;
771
	driver->iodelay = 0.0F;
765
772

Return to bug 199558