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

Merge branch 'v0.20.x'

Browse Source
This commit is contained in:
Max Kellermann
2017-11-05 17:48:41 +01:00
parent 55e6629fb4 b111a8fe8d
commit 523051132d
5 changed files with 63 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/output/Thread.cxx
View File

@@ -245,16 +245,15 @@ try {
inline bool
AudioOutputControl::PlayChunk() noexcept
{
if (tags) {
const auto *tag = source.ReadTag();
if (tag != nullptr) {
const ScopeUnlock unlock(mutex);
try {
output->SendTag(*tag);
} catch (const std::runtime_error &e) {
FormatError(e, "Failed to send tag to %s",
GetLogName());
}
// ensure pending tags are flushed in all cases
const auto *tag = source.ReadTag();
if (tags && tag != nullptr) {
const ScopeUnlock unlock(mutex);
try {
output->SendTag(*tag);
} catch (const std::runtime_error &e) {
FormatError(e, "Failed to send tag to %s",
GetLogName());
}
}