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

output/sndio: rename the "sio_hdl" variable to avoid clash with struct name

Browse Source
This commit is contained in:
Max Kellermann 2017-09-19 18:49:33 +02:00
parent b253a6b71e
commit 6c8d86bb90
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,7 +50,7 @@ class SndioOutput {
AudioOutput base; AudioOutput base;
const char *const device; const char *const device;
const unsigned buffer_time; /* in ms */ const unsigned buffer_time; /* in ms */
struct sio_hdl *sio_hdl; struct sio_hdl *hdl;
public: public:
SndioOutput(const ConfigBlock &block); SndioOutput(const ConfigBlock &block);
@ -80,16 +80,14 @@ SndioOutput::Create(const ConfigBlock &block)
static bool static bool
sndio_test_default_device() sndio_test_default_device()
{ {
struct sio_hdl *sio_hdl; auto *hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0);
if (!hdl) {
sio_hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0);
if (!sio_hdl) {
FormatError(sndio_output_domain, FormatError(sndio_output_domain,
"Error opening default sndio device"); "Error opening default sndio device");
return false; return false;
} }
sio_close(sio_hdl); sio_close(hdl);
return true; return true;
} }
@ -99,8 +97,8 @@ SndioOutput::Open(AudioFormat &audio_format)
struct sio_par par; struct sio_par par;
unsigned bits, rate, chans; unsigned bits, rate, chans;
sio_hdl = sio_open(device, SIO_PLAY, 0); hdl = sio_open(device, SIO_PLAY, 0);
if (!sio_hdl) if (!hdl)
throw std::runtime_error("Failed to open default sndio device"); throw std::runtime_error("Failed to open default sndio device");
switch (audio_format.format) { switch (audio_format.format) {
@ -130,9 +128,9 @@ SndioOutput::Open(AudioFormat &audio_format)
par.le = SIO_LE_NATIVE; par.le = SIO_LE_NATIVE;
par.appbufsz = rate * buffer_time / 1000; par.appbufsz = rate * buffer_time / 1000;
if (!sio_setpar(sio_hdl, &par) || if (!sio_setpar(hdl, &par) ||
!sio_getpar(sio_hdl, &par)) { !sio_getpar(hdl, &par)) {
sio_close(sio_hdl); sio_close(hdl);
throw std::runtime_error("Failed to set/get audio params"); throw std::runtime_error("Failed to set/get audio params");
} }
@ -142,12 +140,12 @@ SndioOutput::Open(AudioFormat &audio_format)
par.pchan != chans || par.pchan != chans ||
par.sig != 1 || par.sig != 1 ||
par.le != SIO_LE_NATIVE) { par.le != SIO_LE_NATIVE) {
sio_close(sio_hdl); sio_close(hdl);
throw std::runtime_error("Requested audio params cannot be satisfied"); throw std::runtime_error("Requested audio params cannot be satisfied");
} }
if (!sio_start(sio_hdl)) { if (!sio_start(hdl)) {
sio_close(sio_hdl); sio_close(hdl);
throw std::runtime_error("Failed to start audio device"); throw std::runtime_error("Failed to start audio device");
} }
} }
@ -155,7 +153,7 @@ SndioOutput::Open(AudioFormat &audio_format)
void void
SndioOutput::Close() SndioOutput::Close()
{ {
sio_close(sio_hdl); sio_close(hdl);
} }
size_t size_t
@ -163,8 +161,8 @@ SndioOutput::Play(const void *chunk, size_t size)
{ {
size_t n; size_t n;
n = sio_write(sio_hdl, chunk, size); n = sio_write(hdl, chunk, size);
if (n == 0 && sio_eof(sio_hdl) != 0) if (n == 0 && sio_eof(hdl) != 0)
throw std::runtime_error("sndio write failed"); throw std::runtime_error("sndio write failed");
return n; return n;
} }