AUDIO: Simplify RawStream code.

This drops the (unused) ability to play based on a list of input blocks. This
was formely only used by the NDS specific VOC streaming code, which has been
removed in 9fa9f68789ef51e078cb8631e06bead13cae13f2.

2 files changed, 33 insertions, 144 deletions

diff --git a/test/audio/helper.h b/test/audio/helper.h
index 5080c79eef..77dc63b619 100644
--- a/test/audio/helper.h
+++ b/test/audio/helper.h
@@ -24,40 +24,7 @@ static T *createSine(const int sampleRate, const int time) {
 }
 
 template<typename T>
-static Common::SeekableReadStream *createPartitionStream(T *sine, const int samples, Audio::RawStreamBlockList &blockList) {
-	const int block1Len = samples / 2;
-	const int block1Size = block1Len * sizeof(T);
-	const int block2Len = samples - block1Len;
-	const int block2Size = block2Len * sizeof(T);
-
-	const int bufferLen = samples * 2;
-	const int bufferSize = bufferLen * sizeof(T);
-	T *partition = (T *)calloc(1, bufferSize);
-
-	Audio::RawStreamBlock block;
-
-	// The will layout the buffer like the following:
-	// [Zero], [Part2], [Zero], [Part1]
-
-	// The first part of the stream is at the end of the memory buffer
-	block.pos = bufferSize - block1Size;
-	block.len = block1Len;
-	memcpy(partition + bufferLen - block1Len, sine, block1Size);
-	blockList.push_back(block);
-
-	// The second part of the stream is near the beginning of the memory buffer
-	block.pos = block2Size;
-	block.len = block2Len;
-	memcpy(partition + block2Len, sine + block1Len, block2Size);
-	blockList.push_back(block);
-
-	free(sine);
-
-	return new Common::MemoryReadStream((const byte *)partition, bufferSize, DisposeAfterUse::YES);
-}
-
-template<typename T>
-static Audio::SeekableAudioStream *createSineStream(const int sampleRate, const int time, int16 **comp, bool le, bool isStereo, bool makePartition = false) {
+static Audio::SeekableAudioStream *createSineStream(const int sampleRate, const int time, int16 **comp, bool le, bool isStereo) {
 	T *sine = createSine<T>(sampleRate, time * (isStereo ? 2 : 1));
 
 	const bool isUnsigned = !std::numeric_limits<T>::is_signed;
@@ -88,22 +55,12 @@ static Audio::SeekableAudioStream *createSineStream(const int sampleRate, const
 	}
 
 	Audio::SeekableAudioStream *s = 0;
-	if (makePartition) {
-		Audio::RawStreamBlockList blockList;
-		Common::SeekableReadStream *sD = createPartitionStream<T>(sine, samples, blockList);
-		s = Audio::makeRawStream(sD, blockList, sampleRate,
-		                             (is16Bits ? Audio::FLAG_16BITS : 0)
-		                             | (isUnsigned ? Audio::FLAG_UNSIGNED : 0)
-		                             | (le ? Audio::FLAG_LITTLE_ENDIAN : 0)
-		                             | (isStereo ? Audio::FLAG_STEREO : 0));
-	} else {
-		Common::SeekableReadStream *sD = new Common::MemoryReadStream((const byte *)sine, sizeof(T) * samples, DisposeAfterUse::YES);
-		s = Audio::makeRawStream(sD, sampleRate,
-		                             (is16Bits ? Audio::FLAG_16BITS : 0)
-		                             | (isUnsigned ? Audio::FLAG_UNSIGNED : 0)
-		                             | (le ? Audio::FLAG_LITTLE_ENDIAN : 0)
-		                             | (isStereo ? Audio::FLAG_STEREO : 0));
-	}
+	Common::SeekableReadStream *sD = new Common::MemoryReadStream((const byte *)sine, sizeof(T) * samples, DisposeAfterUse::YES);
+	s = Audio::makeRawStream(sD, sampleRate,
+	                             (is16Bits ? Audio::FLAG_16BITS : 0)
+	                             | (isUnsigned ? Audio::FLAG_UNSIGNED : 0)
+	                             | (le ? Audio::FLAG_LITTLE_ENDIAN : 0)
+	                             | (isStereo ? Audio::FLAG_STEREO : 0));
 
 	return s;
 }
diff --git a/test/audio/raw.h b/test/audio/raw.h
index 51ec067f7e..e7cb42ac44 100644
--- a/test/audio/raw.h
+++ b/test/audio/raw.h
@@ -8,9 +8,9 @@ class RawStreamTestSuite : public CxxTest::TestSuite
 {
 private:
 	template<typename T>
-	void readBufferTestTemplate(const int sampleRate, const int time, const bool le, const bool isStereo, const bool makePartition = false) {
+	void readBufferTestTemplate(const int sampleRate, const int time, const bool le, const bool isStereo) {
 		int16 *sine;
-		Audio::SeekableAudioStream *s = createSineStream<int8>(sampleRate, time, &sine, le, isStereo, makePartition);
+		Audio::SeekableAudioStream *s = createSineStream<int8>(sampleRate, time, &sine, le, isStereo);
 
 		const int totalSamples = sampleRate * time * (isStereo ? 2 : 1);
 		int16 *buffer = new int16[totalSamples];
@@ -68,57 +68,13 @@ public:
 		readBufferTestTemplate<uint16>(11025, 2, true, true);
 	}
 
-	void test_read_buffer_8_bit_signed_mono_parted() {
-		readBufferTestTemplate<int8>(11025, 2, false, false, true);
-	}
-
-	void test_read_buffer_8_bit_signed_stereo_parted() {
-		readBufferTestTemplate<int8>(11025, 2, false, true, true);
-	}
-
-	void test_read_buffer_8_bit_unsigned_mono_parted() {
-		readBufferTestTemplate<uint8>(11025, 2, false, false, true);
-	}
-
-	void test_read_buffer_16_bit_signed_be_mono_parted() {
-		readBufferTestTemplate<int16>(11025, 2, false, false, true);
-	}
-
-	void test_read_buffer_16_bit_signed_be_stereo_parted() {
-		readBufferTestTemplate<int16>(11025, 2, false, true, true);
-	}
-
-	void test_read_buffer_16_bit_unsigned_be_mono_parted() {
-		readBufferTestTemplate<uint16>(11025, 2, false, false, true);
-	}
-
-	void test_read_buffer_16_bit_unsigned_be_stereo_parted() {
-		readBufferTestTemplate<uint16>(11025, 2, false, true, true);
-	}
-
-	void test_read_buffer_16_bit_signed_le_mono_parted() {
-		readBufferTestTemplate<int16>(11025, 2, true, false, true);
-	}
-
-	void test_read_buffer_16_bit_signed_le_stereo_parted() {
-		readBufferTestTemplate<int16>(11025, 2, true, true, true);
-	}
-
-	void test_read_buffer_16_bit_unsigned_le_mono_parted() {
-		readBufferTestTemplate<uint16>(11025, 2, true, false, true);
-	}
-
-	void test_read_buffer_16_bit_unsigned_le_stereo_parted() {
-		readBufferTestTemplate<uint16>(11025, 2, true, true, true);
-	}
-
 private:
-	void partialReadTest(const bool makePartition) {
+	void partialReadTest() {
 		const int sampleRate = 11025;
 		const int time = 4;
 
 		int16 *sine;
-		Audio::SeekableAudioStream *s = createSineStream<int8>(sampleRate, time, &sine, false, false, makePartition);
+		Audio::SeekableAudioStream *s = createSineStream<int8>(sampleRate, time, &sine, false, false);
 		int16 *buffer = new int16[sampleRate * time];
 
 		TS_ASSERT_EQUALS(s->readBuffer(buffer, sampleRate), sampleRate);
@@ -139,15 +95,11 @@ private:
 	}
 public:
 	void test_partial_read() {
-		partialReadTest(false);
-	}
-
-	void test_partial_read_parted() {
-		partialReadTest(true);
+		partialReadTest();
 	}
 
 private:
-	void readAfterEndTest(const bool makePartition) {
+	void readAfterEndTest() {
 		const int sampleRate = 11025;
 		const int time = 1;
 		Audio::SeekableAudioStream *s = createSineStream<int8>(sampleRate, time, 0, false, false);
@@ -165,18 +117,14 @@ private:
 
 public:
 	void test_read_after_end() {
-		readAfterEndTest(false);
-	}
-
-	void test_read_after_end_parted() {
-		readAfterEndTest(true);
+		readAfterEndTest();
 	}
 
 private:
-	void rewindTest(const bool makePartition) {
+	void rewindTest() {
 		const int sampleRate = 11025;
 		const int time = 2;
-		Audio::SeekableAudioStream *s = createSineStream<int8>(sampleRate, time, 0, false, false, makePartition);
+		Audio::SeekableAudioStream *s = createSineStream<int8>(sampleRate, time, 0, false, false);
 		int16 *buffer = new int16[sampleRate * time];
 
 		TS_ASSERT_EQUALS(s->readBuffer(buffer, sampleRate * time), sampleRate * time);
@@ -193,15 +141,11 @@ private:
 	}
 public:
 	void test_rewind() {
-		rewindTest(false);
-	}
-
-	void test_rewind_parted() {
-		rewindTest(true);
+		rewindTest();
 	}
 
 private:
-	void lengthTest(const bool makePartition) {
+	void lengthTest() {
 		int sampleRate = 0;
 		const int time = 4;
 
@@ -209,66 +153,62 @@ private:
 
 		// 11025 Hz tests
 		sampleRate = 11025;
-		s = createSineStream<int8>(sampleRate, time, 0, false, false, makePartition);
+		s = createSineStream<int8>(sampleRate, time, 0, false, false);
 		TS_ASSERT_EQUALS(s->getLength().totalNumberOfFrames(), sampleRate * time);
 		delete s;
 
-		s = createSineStream<uint16>(sampleRate, time, 0, false, false, makePartition);
+		s = createSineStream<uint16>(sampleRate, time, 0, false, false);
 		TS_ASSERT_EQUALS(s->getLength().totalNumberOfFrames(), sampleRate * time);
 		delete s;
 
 		// 48000 Hz tests
 		sampleRate = 48000;
-		s = createSineStream<int8>(sampleRate, time, 0, false, false, makePartition);
+		s = createSineStream<int8>(sampleRate, time, 0, false, false);
 		TS_ASSERT_EQUALS(s->getLength().totalNumberOfFrames(), sampleRate * time);
 		delete s;
 
-		s = createSineStream<uint16>(sampleRate, time, 0, true, false, makePartition);
+		s = createSineStream<uint16>(sampleRate, time, 0, true, false);
 		TS_ASSERT_EQUALS(s->getLength().totalNumberOfFrames(), sampleRate * time);
 		delete s;
 
 		// 11840 Hz tests
 		sampleRate = 11840;
-		s = createSineStream<int8>(sampleRate, time, 0, false, false, makePartition);
+		s = createSineStream<int8>(sampleRate, time, 0, false, false);
 		TS_ASSERT_EQUALS(s->getLength().totalNumberOfFrames(), sampleRate * time);
 		delete s;
 
-		s = createSineStream<uint16>(sampleRate, time, 0, false, false, makePartition);
+		s = createSineStream<uint16>(sampleRate, time, 0, false, false);
 		TS_ASSERT_EQUALS(s->getLength().totalNumberOfFrames(), sampleRate * time);
 		delete s;
 
 		// 11111 Hz tests
 		sampleRate = 11111;
-		s = createSineStream<int8>(sampleRate, time, 0, false, false, makePartition);
+		s = createSineStream<int8>(sampleRate, time, 0, false, false);
 		TS_ASSERT_EQUALS(s->getLength().totalNumberOfFrames(), sampleRate * time);
 		delete s;
 
-		s = createSineStream<uint16>(sampleRate, time, 0, false, false, makePartition);
+		s = createSineStream<uint16>(sampleRate, time, 0, false, false);
 		TS_ASSERT_EQUALS(s->getLength().totalNumberOfFrames(), sampleRate * time);
 		delete s;
 
 		// 22050 Hz stereo test
 		sampleRate = 22050;
-		s = createSineStream<int8>(sampleRate, time, 0, false, true, makePartition);
+		s = createSineStream<int8>(sampleRate, time, 0, false, true);
 		TS_ASSERT_EQUALS(s->getLength().totalNumberOfFrames(), sampleRate * time);
 		delete s;
 
-		s = createSineStream<uint16>(sampleRate, time, 0, true, true, makePartition);
+		s = createSineStream<uint16>(sampleRate, time, 0, true, true);
 		TS_ASSERT_EQUALS(s->getLength().totalNumberOfFrames(), sampleRate * time);
 		delete s;
 	}
 
 public:
 	void test_length() {
-		lengthTest(false);
-	}
-
-	void test_length_parted() {
-		lengthTest(true);
+		lengthTest();
 	}
 
 private:
-	void seekTest(const int sampleRate, const int time, const bool isStereo, const bool makePartition) {
+	void seekTest(const int sampleRate, const int time, const bool isStereo) {
 		const int totalFrames = sampleRate * time * (isStereo ? 2 : 1);
 		int readData = 0, offset = 0;
 
@@ -276,7 +216,7 @@ private:
 		Audio::SeekableAudioStream *s = 0;
 		int16 *sine = 0;
 
-		s = createSineStream<int8>(sampleRate, time, &sine, false, isStereo, makePartition);
+		s = createSineStream<int8>(sampleRate, time, &sine, false, isStereo);
 
 		// Seek to 500ms
 		const Audio::Timestamp a(0, 1, 2);
@@ -341,18 +281,10 @@ private:
 
 public:
 	void test_seek_mono() {
-		seekTest(11025, 2, false, false);
+		seekTest(11025, 2, false);
 	}
 
 	void test_seek_stereo() {
-		seekTest(11025, 2, true, false);
-	}
-
-	void test_seek_mono_parted() {
-		seekTest(11025, 2, false, true);
-	}
-
-	void test_seek_stereo_parted() {
-		seekTest(11025, 2, true, true);
+		seekTest(11025, 2, true);
 	}
 };