diff options
| author | torben <torben@0c269be4-1314-0410-8aa9-9f06e86f4224> | 2011-05-29 00:46:51 +0000 |
|---|---|---|
| committer | torben <torben@0c269be4-1314-0410-8aa9-9f06e86f4224> | 2011-05-29 00:46:51 +0000 |
| commit | 0cdc3916cd3af5260d95fb07d3143b7de26894da (patch) | |
| tree | 138a172c9da84958cba5e607f529d4d5428965d5 /drivers/dummy | |
| parent | a16492b6896fe7799a048e62011c31235ba0a3bf (diff) | |
| download | jack1-0cdc3916cd3af5260d95fb07d3143b7de26894da.tar.gz | |
fix broken jack_get_microseconds in drivers when libjackserver is RTLD_LOCAL
for python loading libjackserver and using controlAPI.
drivers are linked to a second instance of libjackserver.so and the
global symbol _jack_get_microseconds showed up uninitialised.
by providing a function pointer to right instance in the engine struct,
we can fix this problem. since _jack_get_microseconds is a in systemdeps,
we need a generic way to get the right function pointer.
git-svn-id: svn+ssh://jackaudio.org/trunk/jack@4421 0c269be4-1314-0410-8aa9-9f06e86f4224
Diffstat (limited to 'drivers/dummy')
| -rw-r--r-- | drivers/dummy/dummy_driver.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/dummy/dummy_driver.c b/drivers/dummy/dummy_driver.c index 5647d20..3d101bb 100644 --- a/drivers/dummy/dummy_driver.c +++ b/drivers/dummy/dummy_driver.c @@ -146,7 +146,7 @@ dummy_driver_wait (dummy_driver_t *driver, int extra_fd, int *status, driver->next_wakeup = add_ts(driver->next_wakeup, driver->wait_time); } - driver->last_wait_ust = jack_get_microseconds (); + driver->last_wait_ust = driver->engine->get_microseconds (); driver->engine->transport_cycle_start (driver->engine, driver->last_wait_ust); @@ -165,7 +165,7 @@ static jack_nframes_t dummy_driver_wait (dummy_driver_t *driver, int extra_fd, int *status, float *delayed_usecs) { - jack_time_t now = jack_get_microseconds(); + jack_time_t now = driver->engine->get_microseconds(); if (driver->next_time < now) { if (driver->next_time == 0) { @@ -191,7 +191,7 @@ dummy_driver_wait (dummy_driver_t *driver, int extra_fd, int *status, driver->next_time += driver->wait_time; } - driver->last_wait_ust = jack_get_microseconds (); + driver->last_wait_ust = driver->engine->get_microseconds (); driver->engine->transport_cycle_start (driver->engine, driver->last_wait_ust); |