From 48efab4e5abd8954b7167074b46ff078f6e0d7f4 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sun, 11 Mar 2012 00:51:20 +0100
Subject: COMMON: Rename SafeSubReadStream to SafeSeekableSubReadStream.

It actually inherits from SeekableSubReadStream, so it should be named
accordingly.
---
 engines/gob/dataio.cpp   | 2 +-
 engines/sword2/music.cpp | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'engines')

diff --git a/engines/gob/dataio.cpp b/engines/gob/dataio.cpp
index 1633a1edb7..2071c0f1be 100644
--- a/engines/gob/dataio.cpp
+++ b/engines/gob/dataio.cpp
@@ -414,7 +414,7 @@ Common::SeekableReadStream *DataIO::getFile(File &file) {
 		return 0;
 
 	Common::SeekableReadStream *rawData =
-		new Common::SafeSubReadStream(&file.archive->file, file.offset, file.offset + file.size);
+		new Common::SafeSeekableSubReadStream(&file.archive->file, file.offset, file.offset + file.size);
 
 	if (file.compression == 0)
 		return rawData;
diff --git a/engines/sword2/music.cpp b/engines/sword2/music.cpp
index 40a4021a5c..62fb3d244d 100644
--- a/engines/sword2/music.cpp
+++ b/engines/sword2/music.cpp
@@ -160,19 +160,19 @@ static Audio::AudioStream *getAudioStream(SoundFileHandle *fh, const char *base,
 			return makeCLUStream(&fh->file, enc_len);
 #ifdef USE_MAD
 	case kMP3Mode: {
-		Common::SafeSubReadStream *tmp = new Common::SafeSubReadStream(&fh->file, pos, pos + enc_len);
+		Common::SafeSeekableSubReadStream *tmp = new Common::SafeSeekableSubReadStream(&fh->file, pos, pos + enc_len);
 		return Audio::makeMP3Stream(tmp, DisposeAfterUse::YES);
 		}
 #endif
 #ifdef USE_VORBIS
 	case kVorbisMode: {
-		Common::SafeSubReadStream *tmp = new Common::SafeSubReadStream(&fh->file, pos, pos + enc_len);
+		Common::SafeSeekableSubReadStream *tmp = new Common::SafeSeekableSubReadStream(&fh->file, pos, pos + enc_len);
 		return Audio::makeVorbisStream(tmp, DisposeAfterUse::YES);
 		}
 #endif
 #ifdef USE_FLAC
 	case kFLACMode: {
-		Common::SafeSubReadStream *tmp = new Common::SafeSubReadStream(&fh->file, pos, pos + enc_len);
+		Common::SafeSeekableSubReadStream *tmp = new Common::SafeSeekableSubReadStream(&fh->file, pos, pos + enc_len);
 		return Audio::makeFLACStream(tmp, DisposeAfterUse::YES);
 		}
 #endif
-- 
cgit v1.2.3