COMMON: Split common/stream.h into several headers

svn-id: r54385

9 files changed, 11 insertions, 8 deletions

diff --git a/engines/scumm/file.cpp b/engines/scumm/file.cpp
index 08feb7ffd5..95b99d22bd 100644
--- a/engines/scumm/file.cpp
+++ b/engines/scumm/file.cpp
@@ -27,6 +27,8 @@
 
 #include "scumm/scumm.h"
 
+#include "common/substream.h"
+
 namespace Scumm {
 
 #pragma mark -
diff --git a/engines/scumm/file.h b/engines/scumm/file.h
index c37c2f036e..1dcd3cd7a8 100644
--- a/engines/scumm/file.h
+++ b/engines/scumm/file.h
@@ -27,6 +27,7 @@
 #define SCUMM_FILE_H
 
 #include "common/file.h"
+#include "common/memstream.h"
 
 #include "scumm/detection.h"
 
diff --git a/engines/scumm/file_nes.h b/engines/scumm/file_nes.h
index 274ec02ed0..df2528c357 100644
--- a/engines/scumm/file_nes.h
+++ b/engines/scumm/file_nes.h
@@ -27,6 +27,7 @@
 #define SCUMM_FILE_NES_H
 
 #include "common/file.h"
+#include "common/memstream.h"
 
 #include "scumm/file.h"
 
diff --git a/engines/scumm/he/cup_player_he.cpp b/engines/scumm/he/cup_player_he.cpp
index 87afe5fd90..fedbdbf377 100644
--- a/engines/scumm/he/cup_player_he.cpp
+++ b/engines/scumm/he/cup_player_he.cpp
@@ -26,6 +26,7 @@
 #ifdef ENABLE_HE
 
 #include "common/system.h"
+#include "common/memstream.h"
 #include "sound/audiostream.h"
 #include "sound/mixer.h"
 #include "sound/decoders/raw.h"
diff --git a/engines/scumm/he/resource_he.cpp b/engines/scumm/he/resource_he.cpp
index f7a7d3a567..70663b1b33 100644
--- a/engines/scumm/he/resource_he.cpp
+++ b/engines/scumm/he/resource_he.cpp
@@ -832,7 +832,7 @@ int Win32ResExtractor::convertIcons(byte *data, int datasize, byte **cursor, int
 	uint32 c, d;
 	int completed;
 	int matched = 0;
-	MemoryReadStream *in = new MemoryReadStream(data, datasize);
+	Common::MemoryReadStream *in = new Common::MemoryReadStream(data, datasize);
 
 	if (!in->read(&dir, sizeof(Win32CursorIconFileDir)- sizeof(Win32CursorIconFileDirEntry)))
 		goto cleanup;
diff --git a/engines/scumm/he/resource_he.h b/engines/scumm/he/resource_he.h
index 65190ea41c..b3f3479406 100644
--- a/engines/scumm/he/resource_he.h
+++ b/engines/scumm/he/resource_he.h
@@ -147,9 +147,6 @@ public:
 	bool _arg_raw;
 	Common::String _fileName;
 	CachedCursor _cursorCache[MAX_CACHED_CURSORS];
-
-	typedef Common::MemoryReadStream MemoryReadStream;
-
 };
 
 class Win32ResExtractor : public ResExtractor {
diff --git a/engines/scumm/imuse_digi/dimuse_sndmgr.cpp b/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
index 24cac8707b..1d4769a7f5 100644
--- a/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
+++ b/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
@@ -700,7 +700,7 @@ int32 ImuseDigiSndMgr::getDataFromRegion(SoundDesc *soundDesc, int region, byte
 			assert(len);
 
 			if (!soundDesc->compressedStream) {
-				Common::MemoryReadStream *tmp = cmpFile->readStream(len);
+				Common::SeekableReadStream *tmp = cmpFile->readStream(len);
 				assert(tmp);
 #ifdef USE_FLAC
 				if (soundMode == 3)
diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp
index 2d5a84900b..7273f9f871 100644
--- a/engines/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
@@ -24,6 +24,7 @@
  */
 
 #include "common/config-manager.h"
+#include "common/memstream.h"
 #include "common/savefile.h"
 #include "common/system.h"
 #include "common/zlib.h"
diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp
index 380b52031f..ee8825d946 100644
--- a/engines/scumm/sound.cpp
+++ b/engines/scumm/sound.cpp
@@ -598,7 +598,7 @@ void Sound::startTalkSound(uint32 offset, uint32 b, int mode, Audio::SoundHandle
 #ifdef USE_MAD
 			{
 			assert(size > 0);
-			Common::MemoryReadStream *tmp = _sfxFile->readStream(size);
+			Common::SeekableReadStream *tmp = _sfxFile->readStream(size);
 			assert(tmp);
 			input = Audio::makeMP3Stream(tmp, DisposeAfterUse::YES);
 			}
@@ -608,7 +608,7 @@ void Sound::startTalkSound(uint32 offset, uint32 b, int mode, Audio::SoundHandle
 #ifdef USE_VORBIS
 			{
 			assert(size > 0);
-			Common::MemoryReadStream *tmp = _sfxFile->readStream(size);
+			Common::SeekableReadStream *tmp = _sfxFile->readStream(size);
 			assert(tmp);
 			input = Audio::makeVorbisStream(tmp, DisposeAfterUse::YES);
 			}
@@ -618,7 +618,7 @@ void Sound::startTalkSound(uint32 offset, uint32 b, int mode, Audio::SoundHandle
 #ifdef USE_FLAC
 			{
 			assert(size > 0);
-			Common::MemoryReadStream *tmp = _sfxFile->readStream(size);
+			Common::SeekableReadStream *tmp = _sfxFile->readStream(size);
 			assert(tmp);
 			input = Audio::makeFLACStream(tmp, DisposeAfterUse::YES);
 			}