Changed Disk code to provide SeekableReadStream's to sound routines as well.

svn-id: r39608

5 files changed, 29 insertions, 29 deletions

diff --git a/engines/parallaction/disk.h b/engines/parallaction/disk.h
index d9f343ec49..c251882b08 100644
--- a/engines/parallaction/disk.h
+++ b/engines/parallaction/disk.h
@@ -76,7 +76,7 @@ public:
 	virtual void loadScenery(BackgroundInfo& info, const char* background, const char* mask, const char* path) = 0;
 	virtual Table* loadTable(const char* name) = 0;
 	virtual Common::SeekableReadStream* loadMusic(const char* name) = 0;
-	virtual Common::ReadStream* loadSound(const char* name) = 0;
+	virtual Common::SeekableReadStream* loadSound(const char* name) = 0;
 	virtual void loadMask(const char *name, MaskBuffer &buffer) { }
 	virtual void loadPath(const char *name, PathBuffer &buffer) { }
 };
@@ -140,7 +140,7 @@ public:
 	void loadScenery(BackgroundInfo& info, const char* background, const char* mask, const char* path);
 	Table* loadTable(const char* name);
 	Common::SeekableReadStream* loadMusic(const char* name);
-	Common::ReadStream* loadSound(const char* name);
+	Common::SeekableReadStream* loadSound(const char* name);
 };
 
 class AmigaDisk_ns : public Disk_ns {
@@ -176,7 +176,7 @@ public:
 	void loadScenery(BackgroundInfo& info, const char* background, const char* mask, const char* path);
 	Table* loadTable(const char* name);
 	Common::SeekableReadStream* loadMusic(const char* name);
-	Common::ReadStream* loadSound(const char* name);
+	Common::SeekableReadStream* loadSound(const char* name);
 };
 
 
@@ -232,7 +232,7 @@ public:
 	void loadScenery(BackgroundInfo& info, const char* name, const char* mask, const char* path);
 	Table* loadTable(const char* name);
 	Common::SeekableReadStream* loadMusic(const char* name);
-	Common::ReadStream* loadSound(const char* name);
+	Common::SeekableReadStream* loadSound(const char* name);
 	void loadMask(const char *name, MaskBuffer &buffer);
 	void loadPath(const char *name, PathBuffer &buffer);
 };
@@ -269,7 +269,7 @@ public:
 	void loadScenery(BackgroundInfo& info, const char* name, const char* mask, const char* path);
 	GfxObj* loadObjects(const char *name, uint8 part = 0);
 	Common::SeekableReadStream* loadMusic(const char* name);
-	Common::ReadStream* loadSound(const char* name);
+	Common::SeekableReadStream* loadSound(const char* name);
 	void loadMask(const char *name, MaskBuffer &buffer);
 };
 
diff --git a/engines/parallaction/disk_br.cpp b/engines/parallaction/disk_br.cpp
index dd07ccd303..886519c115 100644
--- a/engines/parallaction/disk_br.cpp
+++ b/engines/parallaction/disk_br.cpp
@@ -401,7 +401,7 @@ Common::SeekableReadStream* DosDisk_br::loadMusic(const char* name) {
 }
 
 
-Common::ReadStream* DosDisk_br::loadSound(const char* name) {
+Common::SeekableReadStream* DosDisk_br::loadSound(const char* name) {
 	debugC(5, kDebugDisk, "DosDisk_br::loadSound");
 	return 0;
 }
@@ -713,7 +713,7 @@ Common::SeekableReadStream* AmigaDisk_br::loadMusic(const char* name) {
 }
 
 
-Common::ReadStream* AmigaDisk_br::loadSound(const char* name) {
+Common::SeekableReadStream* AmigaDisk_br::loadSound(const char* name) {
 	debugC(5, kDebugDisk, "AmigaDisk_br::loadSound");
 	return tryOpenFile("sfx/" + Common::String(name), ".sfx");
 }
diff --git a/engines/parallaction/disk_ns.cpp b/engines/parallaction/disk_ns.cpp
index 8a29cdb11d..3e61b0a66c 100644
--- a/engines/parallaction/disk_ns.cpp
+++ b/engines/parallaction/disk_ns.cpp
@@ -548,7 +548,7 @@ Common::SeekableReadStream* DosDisk_ns::loadMusic(const char* name) {
 }
 
 
-Common::ReadStream* DosDisk_ns::loadSound(const char* name) {
+Common::SeekableReadStream* DosDisk_ns::loadSound(const char* name) {
 	return NULL;
 }
 
@@ -1195,7 +1195,7 @@ Common::SeekableReadStream* AmigaDisk_ns::loadMusic(const char* name) {
 	return tryOpenFile(name);
 }
 
-Common::ReadStream* AmigaDisk_ns::loadSound(const char* name) {
+Common::SeekableReadStream* AmigaDisk_ns::loadSound(const char* name) {
 	char path[PATH_LEN];
 	sprintf(path, "%s.snd", name);
 
diff --git a/engines/parallaction/sound_br.cpp b/engines/parallaction/sound_br.cpp
index 5083ead2c1..c1f8561bbe 100644
--- a/engines/parallaction/sound_br.cpp
+++ b/engines/parallaction/sound_br.cpp
@@ -42,8 +42,8 @@ namespace Parallaction {
 
 /*
  * List of calls to the original music driver.
- * 
- * 
+ *
+ *
  * 1 set music buffer segment
  * 2 set music buffer offset
  * 3 set music buffer size
@@ -400,7 +400,7 @@ DosSoundMan_br::DosSoundMan_br(Parallaction_br *vm, MidiDriver *driver) : SoundM
 DosSoundMan_br::~DosSoundMan_br() {
 	delete _midiPlayer;
 }
-	
+
 void DosSoundMan_br::playSfx(const char *filename, uint channel, bool looping, int volume) {
 	warning("SC_PLAYSFX not yet supported!");
 }
@@ -413,7 +413,7 @@ void DosSoundMan_br::playMusic() {
 	if (_musicFile.empty()) {
 		return;
 	}
-	
+
 	Common::SeekableReadStream *s = _vm->_disk->loadMusic(_musicFile.c_str());
 	assert(s);
 	_midiPlayer->play(s);
@@ -448,7 +448,7 @@ AmigaSoundMan_br::~AmigaSoundMan_br() {
 }
 
 bool AmigaSoundMan_br::loadChannelData(const char *filename, Channel *ch) {
-	Common::ReadStream *stream = _vm->_disk->loadSound(filename);
+	Common::SeekableReadStream *stream = _vm->_disk->loadSound(filename);
 	// NOTE: Sound files don't always exist
 	if (!stream)
 		return false;
@@ -492,7 +492,7 @@ void AmigaSoundMan_br::playSfx(const char *filename, uint channel, bool looping,
 		volume = ch->header.volume;
 	}
 
-	_mixer->playRaw(Audio::Mixer::kSFXSoundType, &ch->handle, ch->data, ch->dataSize, 
+	_mixer->playRaw(Audio::Mixer::kSFXSoundType, &ch->handle, ch->data, ch->dataSize,
 		ch->header.samplesPerSec, flags, -1, volume, 0, loopStart, loopEnd);
 }
 
@@ -550,10 +550,10 @@ void SoundMan_br::setMusicFile(const char *name) {
 	_musicFile = name;
 }
 
-void SoundMan_br::execute(int command, const char *parm) {	
+void SoundMan_br::execute(int command, const char *parm) {
 	uint32 n = parm ? strtoul(parm, 0, 10) : 0;
 	bool b = (n == 1) ? true : false;
-	
+
 	switch (command) {
 	case SC_PLAYMUSIC:
 		playMusic();
@@ -564,14 +564,14 @@ void SoundMan_br::execute(int command, const char *parm) {
 	case SC_SETMUSICFILE:
 		setMusicFile(parm);
 		break;
-	
+
 	case SC_PLAYSFX:
 		playSfx(parm, _sfxChannel, _sfxLooping, _sfxVolume);
-		break;	
+		break;
 	case SC_STOPSFX:
 		stopSfx(n);
 		break;
-	
+
 	case SC_SETSFXCHANNEL:
 		_sfxChannel = n;
 		break;
@@ -581,7 +581,7 @@ void SoundMan_br::execute(int command, const char *parm) {
 	case SC_SETSFXVOLUME:
 		_sfxVolume = n;
 		break;
-	
+
 	case SC_PAUSE:
 		pause(b);
 		break;
diff --git a/engines/parallaction/sound_ns.cpp b/engines/parallaction/sound_ns.cpp
index 76f6811461..769e2ced2f 100644
--- a/engines/parallaction/sound_ns.cpp
+++ b/engines/parallaction/sound_ns.cpp
@@ -379,7 +379,7 @@ void AmigaSoundMan_ns::loadChannelData(const char *filename, Channel *ch) {
 		return;
 	}
 
-	Common::ReadStream *stream = _vm->_disk->loadSound(filename);
+	Common::SeekableReadStream *stream = _vm->_disk->loadSound(filename);
 	Audio::A8SVXDecoder decoder(*stream, ch->header, ch->data, ch->dataSize);
 	decoder.decode();
 	ch->dispose = true;
@@ -416,7 +416,7 @@ void AmigaSoundMan_ns::playSfx(const char *filename, uint channel, bool looping,
 		volume = ch->header.volume;
 	}
 
-	_mixer->playRaw(Audio::Mixer::kSFXSoundType, &ch->handle, ch->data, ch->dataSize, 
+	_mixer->playRaw(Audio::Mixer::kSFXSoundType, &ch->handle, ch->data, ch->dataSize,
 		ch->header.samplesPerSec, flags, -1, volume, 0, loopStart, loopEnd);
 }
 
@@ -480,7 +480,7 @@ void SoundMan_ns::setMusicFile(const char *filename) {
 void SoundMan_ns::execute(int command, const char *parm = 0) {
 	uint32 n = strtoul(parm, 0, 10);
 	bool b = (n == 1) ? true : false;
-	
+
 	switch (command) {
 	case SC_PLAYMUSIC:
 		if (_musicType == MUSIC_CHARACTER) playCharacterMusic(parm);
@@ -491,19 +491,19 @@ void SoundMan_ns::execute(int command, const char *parm = 0) {
 		stopMusic();
 		break;
 	case SC_SETMUSICTYPE:
-		_musicType = n;			
+		_musicType = n;
 		break;
 	case SC_SETMUSICFILE:
 		setMusicFile(parm);
 		break;
-	
+
 	case SC_PLAYSFX:
 		playSfx(parm, _sfxChannel, _sfxLooping, _sfxVolume);
-		break;	
+		break;
 	case SC_STOPSFX:
 		stopSfx(n);
 		break;
-	
+
 	case SC_SETSFXCHANNEL:
 		_sfxChannel = n;
 		break;
@@ -513,7 +513,7 @@ void SoundMan_ns::execute(int command, const char *parm = 0) {
 	case SC_SETSFXVOLUME:
 		_sfxVolume = n;
 		break;
-	
+
 	case SC_PAUSE:
 		pause(b);
 		break;