diff options
author | Chris Robinson <[email protected]> | 2012-12-02 11:20:20 -0800 |
---|---|---|
committer | Chris Robinson <[email protected]> | 2012-12-02 11:30:23 -0800 |
commit | 1fb9311d82ff7e591aabb209eb5aaba108efc20e (patch) | |
tree | 5d7a6485ec0723394f18f4a60a43d7ec917e1940 /Alc/backends/oss.c | |
parent | dd34daed42adb98fe2a167f6fc9aaf98947a3cc3 (diff) |
Lock the device before calling aluHandleDisconnect
PulseAudio causes an assert if being relocked inside a callback on the worker
thread, where aluHandleDisconnect is called. We can assume it's already locked
there, so just make sure the device is locked before being calling it.
Diffstat (limited to 'Alc/backends/oss.c')
-rw-r--r-- | Alc/backends/oss.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Alc/backends/oss.c b/Alc/backends/oss.c index ba11faf0..0ed49517 100644 --- a/Alc/backends/oss.c +++ b/Alc/backends/oss.c @@ -102,7 +102,9 @@ static ALuint OSSProc(ALvoid *ptr) if(errno != EAGAIN && errno != EWOULDBLOCK && errno != EINTR) { ERR("write failed: %s\n", strerror(errno)); + ALCdevice_Lock(Device); aluHandleDisconnect(Device); + ALCdevice_Unlock(Device); break; } @@ -135,7 +137,9 @@ static ALuint OSSCaptureProc(ALvoid *ptr) if(amt < 0) { ERR("read failed: %s\n", strerror(errno)); + ALCdevice_Lock(Device); aluHandleDisconnect(Device); + ALCdevice_Unlock(Device); break; } if(amt == 0) |