oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

output/sndio: refuse to build with libroarsndio

Browse Source 
RoarAudio's sndio emulation has been a source for annoyances.  First,
their headers turned out to be broken with C++, due to their use of
the "new" keyword.  Then they used a preprocessor macro to rename
"sio_hdl" to something else, effectively disallowing the use of
forward declarations.  Enough is enough, and I'm removing support for
it.

RoarAudio users should better use the RoarAudio output plugin.
This commit is contained in:
Max Kellermann
2017-09-19 19:38:15 +02:00
parent 20a5ef2798
commit 5ce93d6fa8
3 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/output/plugins/SndioOutputPlugin.cxx
View File

@@ -24,16 +24,8 @@
#include "util/Domain.hxx"
#include "Log.hxx"
/* work around a C++ incompatibility if the sndio API is emulated by
libroar: libroar's "struct roar_service_stream" has a member named
"new", which is an illegal identifier in C++ */
#define new new_
#include <sndio.h>
/* undo the libroar workaround */
#undef new
#include <stdexcept>
#ifndef SIO_DEVANY