instead of 'int channels', use 'bool stereo' (less extensible, but then I don't think we'll ever support 5.1 sound :-)); fixed a bug in st_rate_flow where it sometimes would overflow the output buffer; made CopyRateConverter a template, too, increasing efficency

svn-id: r9239

1 files changed, 3 insertions, 1 deletions

diff --git a/sound/rate.h b/sound/rate.h
index 809042a8b2..72ae5a6021 100644
--- a/sound/rate.h
+++ b/sound/rate.h
@@ -81,15 +81,17 @@ public:
 	virtual int drain(st_sample_t *obuf, st_size_t *osamp, st_volume_t vol);
 };
 
+template<bool stereo>
 class CopyRateConverter : public RateConverter {
 public:
 	virtual int flow(AudioInputStream &input, st_sample_t *obuf, st_size_t *osamp, st_volume_t vol) {
 		int16 tmp;
 		st_size_t len = *osamp;
+		assert(input.isStereo() == stereo);
 		while (!input.eof() && len--) {
 			tmp = input.read() * vol / 256;
 			clampedAdd(*obuf++, tmp);
-			if (input.isStereo())
+			if (stereo)
 				tmp = input.read() * vol / 256;
 			clampedAdd(*obuf++, tmp);
 		}