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.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/encoder/plugins/ShineEncoderPlugin.cxx b/src/encoder/plugins/ShineEncoderPlugin.cxx
index 00b8eec7c..61cb8609e 100644
--- 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)