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/alsa | |
| 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/alsa')
| -rw-r--r-- | drivers/alsa/alsa_driver.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/alsa/alsa_driver.c b/drivers/alsa/alsa_driver.c index f8cd209..05581ee 100644 --- a/drivers/alsa/alsa_driver.c +++ b/drivers/alsa/alsa_driver.c @@ -1262,7 +1262,7 @@ alsa_driver_wait (alsa_driver_t *driver, int extra_fd, int *status, float nfds++; } - poll_enter = jack_get_microseconds (); + poll_enter = driver->engine->get_microseconds (); if (poll_enter > driver->poll_next) { /* @@ -1296,7 +1296,7 @@ alsa_driver_wait (alsa_driver_t *driver, int extra_fd, int *status, float } - poll_ret = jack_get_microseconds (); + poll_ret = driver->engine->get_microseconds (); if (extra_fd < 0) { if (driver->poll_next && poll_ret > driver->poll_next) { |