Merge tag 'v0.21.15'

release v0.21.15

src/ReplayGainInfo.hxx

@@ -38,6 +38,10 @@ struct ReplayGainTuple {
 		return gain > -100;
 	}
 
+	static constexpr ReplayGainTuple Undefined() noexcept {
+		return {-200.0f, 0.0f};
+	}
+
 	gcc_pure
 	float CalculateScale(const ReplayGainConfig &config) const noexcept;
 };
@@ -49,6 +53,13 @@ struct ReplayGainInfo {
 		return track.IsDefined() || album.IsDefined();
 	}
 
+	static constexpr ReplayGainInfo Undefined() noexcept {
+		return {
+			ReplayGainTuple::Undefined(),
+			ReplayGainTuple::Undefined(),
+		};
+	}
+
 	const ReplayGainTuple &Get(ReplayGainMode mode) const noexcept {
 		return mode == ReplayGainMode::ALBUM
 			? (album.IsDefined() ? album : track)

src/decoder/plugins/DsdiffDecoderPlugin.cxx

@@ -362,6 +362,7 @@ dsdiff_decode_chunk(DecoderClient &client, InputStream &is,
 		    unsigned channels, unsigned sample_rate,
 		    const offset_type total_bytes)
 {
+	const unsigned kbit_rate = channels * sample_rate / 1000;
 	const offset_type start_offset = is.GetOffset();
 
 	uint8_t buffer[8192];
@@ -408,7 +409,7 @@ dsdiff_decode_chunk(DecoderClient &client, InputStream &is,
 			bit_reverse_buffer(buffer, buffer + nbytes);
 
 		cmd = client.SubmitData(is, buffer, nbytes,
-					sample_rate / 1000);
+					kbit_rate);
 	}
 
 	return true;

src/decoder/plugins/DsfDecoderPlugin.cxx

@@ -255,6 +255,7 @@ dsf_decode_chunk(DecoderClient &client, InputStream &is,
 		 offset_type n_blocks,
 		 bool bitreverse)
 {
+	const unsigned kbit_rate = channels * sample_rate / 1000;
 	const size_t block_size = channels * DSF_BLOCK_SIZE;
 	const offset_type start_offset = is.GetOffset();
 
@@ -290,7 +291,7 @@ dsf_decode_chunk(DecoderClient &client, InputStream &is,
 
 		cmd = client.SubmitData(is,
 					interleaved_buffer, block_size,
-					sample_rate / 1000);
+					kbit_rate);
 		++i;
 	}
 

src/decoder/plugins/MpcdecDecoderPlugin.cxx

@@ -136,6 +136,28 @@ mpc_to_mpd_buffer(MpcdecSampleTraits::pointer_type dest,
 		*dest++ = mpc_to_mpd_sample(*src++);
 }
 
+static constexpr ReplayGainTuple
+ImportMpcdecReplayGain(mpc_uint16_t gain, mpc_uint16_t peak) noexcept
+{
+	auto t = ReplayGainTuple::Undefined();
+
+	if (gain != 0 && peak != 0) {
+		t.gain = MPC_OLD_GAIN_REF - (gain  / 256.);
+		t.peak = pow(10, peak / 256. / 20) / 32767;
+	}
+
+	return t;
+}
+
+static constexpr ReplayGainInfo
+ImportMpcdecReplayGain(const mpc_streaminfo &info) noexcept
+{
+	auto rgi = ReplayGainInfo::Undefined();
+	rgi.album = ImportMpcdecReplayGain(info.gain_album, info.peak_album);
+	rgi.track = ImportMpcdecReplayGain(info.gain_title, info.peak_title);
+	return rgi;
+}
+
 static void
 mpcdec_decode(DecoderClient &client, InputStream &is)
 {
@@ -166,14 +188,11 @@ mpcdec_decode(DecoderClient &client, InputStream &is)
 					     mpcdec_sample_format,
 					     info.channels);
 
-	ReplayGainInfo rgi;
-	rgi.Clear();
-	rgi.album.gain = MPC_OLD_GAIN_REF  - (info.gain_album  / 256.);
-	rgi.album.peak = pow(10, info.peak_album / 256. / 20) / 32767;
-	rgi.track.gain = MPC_OLD_GAIN_REF  - (info.gain_title  / 256.);
-	rgi.track.peak = pow(10, info.peak_title / 256. / 20) / 32767;
-
-	client.SubmitReplayGain(&rgi);
+	{
+		const auto rgi = ImportMpcdecReplayGain(info);
+		if (rgi.IsDefined())
+			client.SubmitReplayGain(&rgi);
+	}
 
 	client.Ready(audio_format, is.IsSeekable(),
 		     SongTime::FromS(mpc_streaminfo_get_length(&info)));

src/output/plugins/SolarisOutputPlugin.cxx

@@ -22,7 +22,6 @@
 #include "system/FileDescriptor.hxx"
 #include "system/Error.hxx"
 
-#include <sys/stropts.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -31,11 +30,18 @@
 
 #ifdef __sun
 #include <sys/audio.h>
+#include <sys/stropts.h>
 #else
 
 /* some fake declarations that allow build this plugin on systems
    other than Solaris, just to see if it compiles */
 
+#include <sys/ioctl.h>
+
+#ifndef I_FLUSH
+#define I_FLUSH 0
+#endif
+
 #define AUDIO_GETINFO 0
 #define AUDIO_SETINFO 0
 #define AUDIO_ENCODING_LINEAR 0