encoder/shine: require libshine 3.1, adapt to new API

The "written" argument to shine_encode_buffer() and shine_flush() was changed from "long" to "int", which breaks API and ABI compatibility. This is a big deal, and it doesn't seem worthwile to keep support for the (broken) 3.0 release.

encoder/shine: require libshine 3.1, adapt to new API
8b7718fb · Max Kellermann · b44957ad · 8b7718fb · 8b7718fb
Commit 8b7718fb authored Aug 13, 2014 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

configure.ac configure.ac +1 -1

ShineEncoderPlugin.cxx src/encoder/plugins/ShineEncoderPlugin.cxx +3 -3

No files found.
--- a/configure.ac
+++ b/configure.ac
@@ -1447,7 +1447,7 @@ AM_CONDITIONAL(ENABLE_FLAC_ENCODER, test x$enable_flac_encoder = xyes)

 dnl ------------------------------- Shine Encoder ------------------------------

-MPD_AUTO_PKG(shine_encoder, SHINE, [shine >= 3],
+MPD_AUTO_PKG(shine_encoder, SHINE, [shine >= 3.1],
 	[shine encoder], [libshine not found])

 if test x$enable_shine_encoder = xyes; then

--- a/src/encoder/plugins/ShineEncoderPlugin.cxx
+++ b/src/encoder/plugins/ShineEncoderPlugin.cxx
@@ -172,8 +172,6 @@ bool
 ShineEncoder::WriteChunk(bool flush)
 {
 	if (flush || input_pos == frame_size) {
-		long written;
-
 		if (flush) {
 			/* fill remaining with 0s */
 			for (; input_pos < frame_size; input_pos++) {
@@ -181,6 +179,7 @@ ShineEncoder::WriteChunk(bool flush)
 			}
 		}

+		int written;
 		const uint8_t *out =
 			shine_encode_buffer(shine, stereo, &written);

@@ -229,10 +228,11 @@ static bool
 shine_encoder_flush(Encoder *_encoder, gcc_unused Error &error)
 {
 	ShineEncoder *encoder = (ShineEncoder *)_encoder;
-	long written;

 	/* flush buffers and flush shine */
 	encoder->WriteChunk(true);
+
+	int written;
 	const uint8_t *data = shine_flush(encoder->shine, &written);

 	if (written > 0)