Merge branch 'v0.21.x'

This commit is contained in:
Max Kellermann
2019-06-17 22:06:54 +02:00
17 changed files with 185 additions and 289 deletions

View File

@@ -670,12 +670,13 @@ OssOutput::Play(const void *chunk, size_t size)
#ifdef AFMT_S24_PACKED
const auto e = pcm_export->Export({chunk, size});
if (e.empty())
return size;
chunk = e.data;
size = e.size;
#endif
assert(size > 0);
while (true) {
ret = fd.Write(chunk, size);
if (ret > 0) {