decoder/opus: fix replay gain when there are no other tags

The `tag_builder.empty()` check was wrong for the SubmitReplayGain() call. Closes https://github.com/MusicPlayerDaemon/MPD/issues/497

decoder/opus: fix replay gain when there are no other tags
1aa7cdd6 · Max Kellermann · a4b8a0d8 · 1aa7cdd6 · 1aa7cdd6
Commit 1aa7cdd6 authored Mar 16, 2019 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

NEWS NEWS +2 -0

OpusDecoderPlugin.cxx src/decoder/plugins/OpusDecoderPlugin.cxx +5 -3

No files found.
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,8 @@ ver 0.21.6 (not yet released)
  - fix "list" with filter expression
 * input
  - cdio_paranoia: fix build failure due to missing #include
+* decoder
+  - opus: fix replay gain when there are no other tags
 * playlist
  - flac: fix use-after-free bug
 * support abstract sockets on Linux

--- a/src/decoder/plugins/OpusDecoderPlugin.cxx
+++ b/src/decoder/plugins/OpusDecoderPlugin.cxx
@@ -208,10 +208,12 @@ MPDOpusDecoder::HandleTags(const ogg_packet &packet)
 	TagBuilder tag_builder;
 	AddTagHandler h(tag_builder);

-	if (ScanOpusTags(packet.packet, packet.bytes, &rgi, h) &&
-	    !tag_builder.empty()) {
-		client.SubmitReplayGain(&rgi);
+	if (!ScanOpusTags(packet.packet, packet.bytes, &rgi, h))
+		return;
+
+	client.SubmitReplayGain(&rgi);

+	if (!tag_builder.empty()) {
 		Tag tag = tag_builder.Commit();
 		auto cmd = client.SubmitTag(input_stream, std::move(tag));
 		if (cmd != DecoderCommand::NONE)