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

output/ao: use const_cast instead of the union hack

Browse Source
This commit is contained in:
Max Kellermann 2017-01-25 10:44:19 +01:00
parent cbe59714d4
commit 30d5186db4
1 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/output/plugins/AoOutputPlugin.cxx
View File

@ -182,23 +182,6 @@ ao_output_open(AudioOutput *ao, AudioFormat &audio_format)
throw MakeAoError(); throw MakeAoError();
} }
/**
* For whatever reason, libao wants a non-const pointer. Let's hope
* it does not write to the buffer, and use the union deconst hack to
* work around this API misdesign.
*/
static int ao_play_deconst(ao_device *device, const void *output_samples,
uint_32 num_bytes)
{
union {
const void *in;
char *out;
} u;
u.in = output_samples;
return ao_play(device, u.out, num_bytes);
}
static size_t static size_t
ao_output_play(AudioOutput *ao, const void *chunk, size_t size) ao_output_play(AudioOutput *ao, const void *chunk, size_t size)
{ {
@ -207,7 +190,12 @@ ao_output_play(AudioOutput *ao, const void *chunk, size_t size)
if (size > ad->write_size) if (size > ad->write_size)
size = ad->write_size; size = ad->write_size;
if (ao_play_deconst(ad->device, chunk, size) == 0) /* For whatever reason, libao wants a non-const pointer.
Let's hope it does not write to the buffer, and use the
union deconst hack to * work around this API misdesign. */
char *data = const_cast<char *>((const char *)chunk);
if (ao_play(ad->device, data, size) == 0)
throw MakeAoError(); throw MakeAoError();
return size; return size;