COMMON: Split common/stream.h into several headers

svn-id: r54385

4 files changed, 9 insertions, 8 deletions

diff --git a/engines/made/database.cpp b/engines/made/database.cpp
index 51308cb7e5..2aa378edf5 100644
--- a/engines/made/database.cpp
+++ b/engines/made/database.cpp
@@ -275,7 +275,7 @@ void GameDatabase::openFromRed(const char *redFilename, const char *filename) {
 	_isRedSource = true;
 	_filename = filename;
 	_redFilename = redFilename;
-	Common::MemoryReadStream *fileS = RedReader::loadFromRed(redFilename, filename);
+	Common::SeekableReadStream *fileS = RedReader::loadFromRed(redFilename, filename);
 	if (!fileS)
 		error("GameDatabase::openFromRed() Could not load %s from %s", filename, redFilename);
 	load(*fileS);
@@ -289,7 +289,7 @@ void GameDatabase::reload() {
 			error("GameDatabase::reload() Could not open %s", _filename.c_str());
 		reloadFromStream(fd);
 	} else {
-		Common::MemoryReadStream *fileS = RedReader::loadFromRed(_redFilename.c_str(), _filename.c_str());
+		Common::SeekableReadStream *fileS = RedReader::loadFromRed(_redFilename.c_str(), _filename.c_str());
 		if (!fileS)
 			error("GameDatabase::openFromRed() Could not load %s from %s", _filename.c_str(), _redFilename.c_str());
 		reloadFromStream(*fileS);
diff --git a/engines/made/redreader.cpp b/engines/made/redreader.cpp
index 4ca8d27eab..3d36b69a28 100644
--- a/engines/made/redreader.cpp
+++ b/engines/made/redreader.cpp
@@ -24,11 +24,11 @@
  */
 
 #include "made/redreader.h"
+#include "common/memstream.h"
 
 namespace Made {
 
-
-Common::MemoryReadStream *RedReader::load(const char *redFilename, const char *filename) {
+Common::SeekableReadStream *RedReader::load(const char *redFilename, const char *filename) {
 
 	Common::File fd;
 	FileEntry fileEntry;
@@ -49,9 +49,9 @@ Common::MemoryReadStream *RedReader::load(const char *redFilename, const char *f
 
 }
 
-Common::MemoryReadStream *RedReader::loadFromRed(const char *redFilename, const char *filename) {
+Common::SeekableReadStream *RedReader::loadFromRed(const char *redFilename, const char *filename) {
 	RedReader* red = new RedReader();
-	Common::MemoryReadStream* stream = red->load(redFilename, filename);
+	Common::SeekableReadStream *stream = red->load(redFilename, filename);
 	delete red;
 	return stream;
 }
diff --git a/engines/made/redreader.h b/engines/made/redreader.h
index b734ca02e1..a6e72c4e00 100644
--- a/engines/made/redreader.h
+++ b/engines/made/redreader.h
@@ -34,8 +34,8 @@ namespace Made {
 
 class RedReader {
 public:
-	Common::MemoryReadStream *load(const char *redFilename, const char *filename);
-	static Common::MemoryReadStream *loadFromRed(const char *redFilename, const char *filename);
+	Common::SeekableReadStream *load(const char *redFilename, const char *filename);
+	static Common::SeekableReadStream *loadFromRed(const char *redFilename, const char *filename);
 private:
 	struct FileEntry {
 		uint32 compSize, origSize;
diff --git a/engines/made/resource.cpp b/engines/made/resource.cpp
index ecc2378f15..6140e7e0de 100644
--- a/engines/made/resource.cpp
+++ b/engines/made/resource.cpp
@@ -24,6 +24,7 @@
  */
 
 #include "common/endian.h"
+#include "common/memstream.h"
 #include "sound/mixer.h"
 #include "sound/decoders/raw.h"