mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-18 19:49:40 +00:00
Code Issues Releases Activity

audio/openal-soft: Include the last patch for upstream sndio backend.

Browse Source 
Details:
- Backport the remaining sndio backend commit at:
  2df78e49b1

Reported by:	Brad Smith <brad@comstyle.com>
MFH:		2021Q4
This commit is contained in:
Thomas Zander 2021-11-01 15:16:36 +01:00
parent 34fb08b6b2
commit 520be1663a
No known key found for this signature in database
GPG Key ID: 856D8ED47C7EAFA5
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
audio/openal-soft/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= openal-soft
PORTVERSION= 1.21.1
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= https://openal-soft.org/openal-releases/

22
audio/openal-soft/files/patch-alc_backends_sndio.cpp
View File

@ -251,26 +251,18 @@
struct SndioCapture final : public BackendBase {
SndioCapture(ALCdevice *device) noexcept : BackendBase{device} { }
~SndioCapture() override;
@@ -301,6 +283,7 @@ struct SndioCapture final : public BackendBase {
sio_hdl *mSndHandle{nullptr};
+ al::vector<struct pollfd> mFds;
RingBufferPtr mRing;
std::atomic<bool> mKillNow{true};
@@ -323,40 +306,65 @@ int SndioCapture::recordProc()
@@ -323,40 +305,65 @@ int SndioCapture::recordProc()
const uint frameSize{mDevice->frameSizeFromFmt()};
+ int nfds_pre{sio_nfds(mSndHandle)};
+ if (nfds_pre <= 0)
+ if(nfds_pre <= 0)
+ {
+ mDevice->handleDisconnect("Incorrect return value from sio_nfds(): %d", nfds_pre);
+ return 1;
+ }
+
+ mFds.resize(nfds_pre);
+ auto fds = std::make_unique<pollfd[]>(static_cast<uint>(nfds_pre));
+
while(!mKillNow.load(std::memory_order_acquire)
&& mDevice->Connected.load(std::memory_order_acquire))
@ -279,7 +271,7 @@
- size_t todo{data.first.len + data.second.len};
- if(todo == 0)
+ /* Wait until there's some samples to read. */
+ const int nfds{sio_pollfd(mSndHandle, mFds.data(), POLLIN)};
+ const int nfds{sio_pollfd(mSndHandle, fds.get(), POLLIN)};
+ if(nfds <= 0)
{
- static char junk[4096];
@ -288,7 +280,7 @@
+ mDevice->handleDisconnect("Failed to get polling fds: %d", nfds);
+ break;
+ }
+ int pollres{::poll(mFds.data(), static_cast<uint>(nfds), 2000)};
+ int pollres{::poll(fds.get(), static_cast<uint>(nfds), 2000)};
+ if(pollres < 0)
+ {
+ if(errno == EINTR) continue;
@ -298,7 +290,7 @@
+ if(pollres == 0)
continue;
+
+ const int revents{sio_revents(mSndHandle, mFds.data())};
+ const int revents{sio_revents(mSndHandle, fds.get())};
+ if((revents&POLLHUP))
+ {
+ mDevice->handleDisconnect("Got POLLHUP from poll events");
@ -347,7 +339,7 @@
}
return 0;
@@ -371,76 +379,80 @@ void SndioCapture::open(const char *name)
@@ -371,76 +378,80 @@ void SndioCapture::open(const char *name)
throw al::backend_exception{al::backend_error::NoDevice, "Device name \"%s\" not found",
name};