ZVISION: Removed 'packed' audio handling from RawZorkStream.

Moved it to the factory method for creating Audio Streams

2 files changed, 27 insertions, 41 deletions

diff --git a/engines/zvision/zork_raw.cpp b/engines/zvision/zork_raw.cpp
index 9f71b7602c..78913a7262 100644
--- a/engines/zvision/zork_raw.cpp
+++ b/engines/zvision/zork_raw.cpp
@@ -29,6 +29,7 @@
 #include "common/bufferedstream.h"
 #include "common/util.h"
 #include "audio/audiostream.h"
+#include "audio/decoders/raw.h"
 
 #include "zvision/zork_raw.h"
 #include "zvision/zvision.h"
@@ -40,21 +41,20 @@ namespace ZVision {
 const int16 RawZorkStream::_stepAdjustmentTable[8] = {-1, -1, -1, 1, 4, 7, 10, 12};
 
 const int32 RawZorkStream::_amplitudeLookupTable[89] = {0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E,
-                                                       0x0010, 0x0011, 0x0013, 0x0015, 0x0017, 0x0019, 0x001C, 0x001F,
-                                                       0x0022, 0x0025, 0x0029, 0x002D, 0x0032, 0x0037, 0x003C, 0x0042,
-                                                       0x0049, 0x0050, 0x0058, 0x0061, 0x006B, 0x0076, 0x0082, 0x008F,
-                                                       0x009D, 0x00AD, 0x00BE, 0x00D1, 0x00E6, 0x00FD, 0x0117, 0x0133, 
-                                                       0x0151, 0x0173, 0x0198, 0x01C1, 0x01EE, 0x0220, 0x0256, 0x0292,
-                                                       0x02D4, 0x031C, 0x036C, 0x03C3, 0x0424, 0x048E, 0x0502, 0x0583, 
-                                                       0x0610, 0x06AB, 0x0756, 0x0812, 0x08E0, 0x09C3, 0x0ABD, 0x0BD0,
-                                                       0x0CFF, 0x0E4C, 0x0FBA, 0x114C, 0x1307, 0x14EE, 0x1706, 0x1954, 
-                                                       0x1BDC, 0x1EA5, 0x21B6, 0x2515, 0x28CA, 0x2CDF, 0x315B, 0x364B,
-                                                       0x3BB9, 0x41B2, 0x4844, 0x4F7E, 0x5771, 0x602F, 0x69CE, 0x7462, 0x7FFF};
-
-RawZorkStream::RawZorkStream(uint32 rate, bool stereo, bool packed, DisposeAfterUse::Flag disposeStream, Common::SeekableReadStream *stream)
+                                                        0x0010, 0x0011, 0x0013, 0x0015, 0x0017, 0x0019, 0x001C, 0x001F,
+                                                        0x0022, 0x0025, 0x0029, 0x002D, 0x0032, 0x0037, 0x003C, 0x0042,
+                                                        0x0049, 0x0050, 0x0058, 0x0061, 0x006B, 0x0076, 0x0082, 0x008F,
+                                                        0x009D, 0x00AD, 0x00BE, 0x00D1, 0x00E6, 0x00FD, 0x0117, 0x0133, 
+                                                        0x0151, 0x0173, 0x0198, 0x01C1, 0x01EE, 0x0220, 0x0256, 0x0292,
+                                                        0x02D4, 0x031C, 0x036C, 0x03C3, 0x0424, 0x048E, 0x0502, 0x0583, 
+                                                        0x0610, 0x06AB, 0x0756, 0x0812, 0x08E0, 0x09C3, 0x0ABD, 0x0BD0,
+                                                        0x0CFF, 0x0E4C, 0x0FBA, 0x114C, 0x1307, 0x14EE, 0x1706, 0x1954, 
+                                                        0x1BDC, 0x1EA5, 0x21B6, 0x2515, 0x28CA, 0x2CDF, 0x315B, 0x364B,
+                                                        0x3BB9, 0x41B2, 0x4844, 0x4F7E, 0x5771, 0x602F, 0x69CE, 0x7462, 0x7FFF};
+
+RawZorkStream::RawZorkStream(uint32 rate, bool stereo, DisposeAfterUse::Flag disposeStream, Common::SeekableReadStream *stream)
 		: _rate(rate),
 		  _stereo(stereo),
-		  _packed(packed),
 		  _stream(stream, disposeStream),
 		  _endOfData(false) {
 	_lastSample[0] = {0, 0};
@@ -65,18 +65,6 @@ RawZorkStream::RawZorkStream(uint32 rate, bool stereo, bool packed, DisposeAfter
 }
 
 int RawZorkStream::readBuffer(int16 *buffer, const int numSamples) {
-	if (_packed)
-		return decodeADPCM(buffer, numSamples);
-	else {
-		uint32 bytesRead = _stream->read(buffer, numSamples);
-		if (_stream->eos())
-			_endOfData = true;
-
-		return bytesRead;
-	}
-}
-
-int RawZorkStream::decodeADPCM(int16 *buffer, const int numSamples) {
 	uint16 bytesRead = 0;
 
 	// 0: Left, 1: Right
@@ -143,21 +131,19 @@ bool RawZorkStream::rewind() {
 Audio::RewindableAudioStream *makeRawZorkStream(Common::SeekableReadStream *stream,
                                                 int rate,
 								                bool stereo,
-												bool packed,
                                                 DisposeAfterUse::Flag disposeAfterUse) {
 	assert(stream->size() % 2 == 0);
-	return new RawZorkStream(rate, stereo, packed, disposeAfterUse, stream);
+	return new RawZorkStream(rate, stereo, disposeAfterUse, stream);
 }
 
 Audio::RewindableAudioStream *makeRawZorkStream(const byte *buffer, uint32 size,
                                                 int rate,
 								                bool stereo,
-												bool packed,
                                                 DisposeAfterUse::Flag disposeAfterUse) {
-	return makeRawZorkStream(new Common::MemoryReadStream(buffer, size, disposeAfterUse), rate, stereo, packed, DisposeAfterUse::YES);
+	return makeRawZorkStream(new Common::MemoryReadStream(buffer, size, disposeAfterUse), rate, stereo, DisposeAfterUse::YES);
 }
 
-Audio::RewindableAudioStream *makeRawZorkStream(const Common::String &filePath, ZVision *engine) {
+Audio::AudioStream *makeRawZorkStream(const Common::String &filePath, ZVision *engine) {
 	Common::File *file = new Common::File();
 	assert(file->open(filePath));
 
@@ -178,8 +164,15 @@ Audio::RewindableAudioStream *makeRawZorkStream(const Common::String &filePath,
 				soundParams = zgiSoundParamLookupTable[i];
 		}
 	}
-
-	return makeRawZorkStream(wrapBufferedSeekableReadStream(file, 2048, DisposeAfterUse::YES), soundParams.rate, soundParams.stereo, soundParams.packed, DisposeAfterUse::YES);
+	
+	if (soundParams.packed) {
+		byte flags = 0;
+		if (soundParams.stereo)
+			flags |= Audio::FLAG_STEREO;
+		return Audio::makeRawStream(file, soundParams.rate, flags, DisposeAfterUse::YES);
+	}
+	else
+		return makeRawZorkStream(wrapBufferedSeekableReadStream(file, 2048, DisposeAfterUse::YES), soundParams.rate, soundParams.stereo, DisposeAfterUse::YES);
 }
 
 } // End of namespace ZVision
diff --git a/engines/zvision/zork_raw.h b/engines/zvision/zork_raw.h
index 5efa27a1e3..8d4670e26c 100644
--- a/engines/zvision/zork_raw.h
+++ b/engines/zvision/zork_raw.h
@@ -61,8 +61,7 @@ const SoundParams zgiSoundParamLookupTable[5] = {{'a',0x5622, false, false},
  */
 class RawZorkStream : public Audio::RewindableAudioStream {
 public:
-	RawZorkStream(uint32 rate, bool stereo, bool packed, DisposeAfterUse::Flag disposeStream, Common::SeekableReadStream *stream);
-	RawZorkStream(const Common::String &filePath, ZVision *engine);
+	RawZorkStream(uint32 rate, bool stereo, DisposeAfterUse::Flag disposeStream, Common::SeekableReadStream *stream);
 
 	~RawZorkStream() {
 	}
@@ -75,7 +74,6 @@ private:
 	Common::DisposablePtr<Common::SeekableReadStream> _stream; // Stream to read data from
 	bool _endOfData;                                           // Whether the stream end has been reached
 	bool _stereo;
-	bool _packed;
 
 	/** 
 	 * Holds the frequency and index from the last sample
@@ -99,9 +97,6 @@ public:
 	Audio::Timestamp getLength() const { return _playtime; }
 
 	bool rewind();
-
-private:
-	int decodeADPCM(int16 *buffer, const int numSamples);
 };
 
 /**
@@ -116,7 +111,6 @@ private:
 Audio::RewindableAudioStream *makeRawZorkStream(const byte *buffer, uint32 size,
                                                 int rate,
 								                bool stereo,
-												bool packed,
                                                 DisposeAfterUse::Flag disposeAfterUse = DisposeAfterUse::YES);
 
 /**
@@ -130,10 +124,9 @@ Audio::RewindableAudioStream *makeRawZorkStream(const byte *buffer, uint32 size,
 Audio::RewindableAudioStream *makeRawZorkStream(Common::SeekableReadStream *stream,
                                                 int rate,
 								                bool stereo,
-												bool packed,
                                                 DisposeAfterUse::Flag disposeAfterUse = DisposeAfterUse::YES);
 
-Audio::RewindableAudioStream *makeRawZorkStream(const Common::String &filePath, ZVision *engine);
+Audio::AudioStream *makeRawZorkStream(const Common::String &filePath, ZVision *engine);
 
 } // End of namespace ZVision