[Scummvm-cvs-logs] SF.net SVN: scummvm:[39608] scummvm/trunk/engines/parallaction
peres001 at users.sourceforge.net
peres001 at users.sourceforge.net
Sun Mar 22 16:25:55 CET 2009
Revision: 39608
http://scummvm.svn.sourceforge.net/scummvm/?rev=39608&view=rev
Author: peres001
Date: 2009-03-22 15:25:55 +0000 (Sun, 22 Mar 2009)
Log Message:
-----------
Changed Disk code to provide SeekableReadStream's to sound routines as well.
Modified Paths:
--------------
scummvm/trunk/engines/parallaction/disk.h
scummvm/trunk/engines/parallaction/disk_br.cpp
scummvm/trunk/engines/parallaction/disk_ns.cpp
scummvm/trunk/engines/parallaction/sound_br.cpp
scummvm/trunk/engines/parallaction/sound_ns.cpp
Modified: scummvm/trunk/engines/parallaction/disk.h
===================================================================
--- scummvm/trunk/engines/parallaction/disk.h 2009-03-22 13:50:51 UTC (rev 39607)
+++ scummvm/trunk/engines/parallaction/disk.h 2009-03-22 15:25:55 UTC (rev 39608)
@@ -76,7 +76,7 @@
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 @@
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 @@
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 @@
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 @@
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);
};
Modified: scummvm/trunk/engines/parallaction/disk_br.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/disk_br.cpp 2009-03-22 13:50:51 UTC (rev 39607)
+++ scummvm/trunk/engines/parallaction/disk_br.cpp 2009-03-22 15:25:55 UTC (rev 39608)
@@ -401,7 +401,7 @@
}
-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::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");
}
Modified: scummvm/trunk/engines/parallaction/disk_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/disk_ns.cpp 2009-03-22 13:50:51 UTC (rev 39607)
+++ scummvm/trunk/engines/parallaction/disk_ns.cpp 2009-03-22 15:25:55 UTC (rev 39608)
@@ -548,7 +548,7 @@
}
-Common::ReadStream* DosDisk_ns::loadSound(const char* name) {
+Common::SeekableReadStream* DosDisk_ns::loadSound(const char* name) {
return NULL;
}
@@ -1195,7 +1195,7 @@
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);
Modified: scummvm/trunk/engines/parallaction/sound_br.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/sound_br.cpp 2009-03-22 13:50:51 UTC (rev 39607)
+++ scummvm/trunk/engines/parallaction/sound_br.cpp 2009-03-22 15:25:55 UTC (rev 39608)
@@ -42,8 +42,8 @@
/*
* 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() {
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 @@
if (_musicFile.empty()) {
return;
}
-
+
Common::SeekableReadStream *s = _vm->_disk->loadMusic(_musicFile.c_str());
assert(s);
_midiPlayer->play(s);
@@ -448,7 +448,7 @@
}
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 @@
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 @@
_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 @@
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 @@
case SC_SETSFXVOLUME:
_sfxVolume = n;
break;
-
+
case SC_PAUSE:
pause(b);
break;
Modified: scummvm/trunk/engines/parallaction/sound_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/sound_ns.cpp 2009-03-22 13:50:51 UTC (rev 39607)
+++ scummvm/trunk/engines/parallaction/sound_ns.cpp 2009-03-22 15:25:55 UTC (rev 39608)
@@ -379,7 +379,7 @@
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 @@
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::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 @@
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 @@
case SC_SETSFXVOLUME:
_sfxVolume = n;
break;
-
+
case SC_PAUSE:
pause(b);
break;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list