aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
Diffstat (limited to 'engines/scumm')
-rw-r--r--engines/scumm/he/resource_he.cpp2
-rw-r--r--engines/scumm/he/sound_he.cpp4
-rw-r--r--engines/scumm/imuse_digi/dimuse.h6
-rw-r--r--engines/scumm/imuse_digi/dimuse_script.cpp2
-rw-r--r--engines/scumm/imuse_digi/dimuse_sndmgr.cpp6
-rw-r--r--engines/scumm/imuse_digi/dimuse_sndmgr.h2
-rw-r--r--engines/scumm/imuse_digi/dimuse_track.cpp2
-rw-r--r--engines/scumm/player_mod.cpp2
-rw-r--r--engines/scumm/player_mod.h4
-rw-r--r--engines/scumm/player_nes.h2
-rw-r--r--engines/scumm/player_v2.h2
-rw-r--r--engines/scumm/saveload.cpp4
-rw-r--r--engines/scumm/smush/smush_player.cpp4
-rw-r--r--engines/scumm/sound.cpp14
-rw-r--r--engines/scumm/sound.h2
15 files changed, 29 insertions, 29 deletions
diff --git a/engines/scumm/he/resource_he.cpp b/engines/scumm/he/resource_he.cpp
index 4e3dd59c9c..dadc6ea7b7 100644
--- a/engines/scumm/he/resource_he.cpp
+++ b/engines/scumm/he/resource_he.cpp
@@ -1777,7 +1777,7 @@ int ScummEngine_v72he::getSoundResourceSize(int id) {
size = READ_BE_UINT32(ptr + 4);
Common::MemoryReadStream stream(ptr, size);
- if (!loadWAVFromStream(stream, size, rate, flags)) {
+ if (!Audio::loadWAVFromStream(stream, size, rate, flags)) {
error("getSoundResourceSize: Not a valid WAV file");
}
} else {
diff --git a/engines/scumm/he/sound_he.cpp b/engines/scumm/he/sound_he.cpp
index 9519087efe..23224354c0 100644
--- a/engines/scumm/he/sound_he.cpp
+++ b/engines/scumm/he/sound_he.cpp
@@ -538,12 +538,12 @@ void SoundHE::playHESound(int soundID, int heOffset, int heChannel, int heFlags)
size = READ_LE_UINT32(ptr + 4);
Common::MemoryReadStream stream(ptr, size);
- if (!loadWAVFromStream(stream, size, rate, flags, &compType, &blockAlign)) {
+ if (!Audio::loadWAVFromStream(stream, size, rate, flags, &compType, &blockAlign)) {
error("playHESound: Not a valid WAV file (%d)", soundID);
}
if (compType == 17) {
- AudioStream *voxStream = makeADPCMStream(&stream, size, kADPCMMSIma, rate, (flags & Audio::Mixer::FLAG_STEREO) ? 2 : 1, blockAlign);
+ Audio::AudioStream *voxStream = Audio::makeADPCMStream(&stream, size, Audio::kADPCMMSIma, rate, (flags & Audio::Mixer::FLAG_STEREO) ? 2 : 1, blockAlign);
sound = (char *)malloc(size * 4);
size = voxStream->readBuffer((int16*)sound, size * 2);
diff --git a/engines/scumm/imuse_digi/dimuse.h b/engines/scumm/imuse_digi/dimuse.h
index fed2e48457..2a254958b6 100644
--- a/engines/scumm/imuse_digi/dimuse.h
+++ b/engines/scumm/imuse_digi/dimuse.h
@@ -80,7 +80,7 @@ private:
ImuseDigiSndMgr::soundStruct *soundHandle;
Audio::SoundHandle handle;
AppendableAudioStream *stream;
- AudioStream *stream2;
+ Audio::AudioStream *stream2;
Track();
};
@@ -106,7 +106,7 @@ private:
void callback();
void switchToNextRegion(Track *track);
int allocSlot(int priority);
- void startSound(int soundId, const char *soundName, int soundType, int volGroupId, AudioStream *input, int hookId, int volume, int priority);
+ void startSound(int soundId, const char *soundName, int soundType, int volGroupId, Audio::AudioStream *input, int hookId, int volume, int priority);
void selectVolumeGroup(int soundId, int volGroupId);
int32 getPosInMs(int soundId);
@@ -135,7 +135,7 @@ public:
void setAudioNames(int32 num, char *names);
- void startVoice(int soundId, AudioStream *input);
+ void startVoice(int soundId, Audio::AudioStream *input);
void startVoice(int soundId, const char *soundName);
void startMusic(int soundId, int volume);
void startMusic(const char *soundName, int soundId, int hookId, int volume);
diff --git a/engines/scumm/imuse_digi/dimuse_script.cpp b/engines/scumm/imuse_digi/dimuse_script.cpp
index 0feecd122f..69bbac57c5 100644
--- a/engines/scumm/imuse_digi/dimuse_script.cpp
+++ b/engines/scumm/imuse_digi/dimuse_script.cpp
@@ -208,7 +208,7 @@ void IMuseDigital::refreshScripts() {
}
}
-void IMuseDigital::startVoice(int soundId, AudioStream *input) {
+void IMuseDigital::startVoice(int soundId, Audio::AudioStream *input) {
debug(5, "startVoiceStream(%d)", soundId);
startSound(soundId, "", 0, IMUSE_VOLGRP_VOICE, input, 0, 127, 127);
}
diff --git a/engines/scumm/imuse_digi/dimuse_sndmgr.cpp b/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
index 29b70a4763..19d34eabc9 100644
--- a/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
+++ b/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
@@ -163,7 +163,7 @@ void ImuseDigiSndMgr::prepareSound(byte *ptr, soundStruct *sound) {
int time_constant = ptr[offset];
offset += 2;
len -= 2;
- sound->freq = getSampleRateFromVOCRate(time_constant);
+ sound->freq = Audio::getSampleRateFromVOCRate(time_constant);
sound->region[sound->numRegions].offset = offset;
sound->region[sound->numRegions].length = len;
sound->numRegions++;
@@ -614,11 +614,11 @@ int32 ImuseDigiSndMgr::getDataFromRegion(soundStruct *soundHandle, int region, b
if (!soundHandle->compressedStream) {
#ifdef USE_VORBIS
if (oggMode)
- soundHandle->compressedStream = makeVorbisStream(cmpFile, len);
+ soundHandle->compressedStream = Audio::makeVorbisStream(cmpFile, len);
#endif
#ifdef USE_MAD
if (!oggMode)
- soundHandle->compressedStream = makeMP3Stream(cmpFile, len);
+ soundHandle->compressedStream = Audio::makeMP3Stream(cmpFile, len);
#endif
assert(soundHandle->compressedStream);
}
diff --git a/engines/scumm/imuse_digi/dimuse_sndmgr.h b/engines/scumm/imuse_digi/dimuse_sndmgr.h
index 5844fa0c1b..efae717d60 100644
--- a/engines/scumm/imuse_digi/dimuse_sndmgr.h
+++ b/engines/scumm/imuse_digi/dimuse_sndmgr.h
@@ -85,7 +85,7 @@ public:
int type;
int volGroupId;
int disk;
- AudioStream *compressedStream;
+ Audio::AudioStream *compressedStream;
bool compressed;
char lastFileName[24];
};
diff --git a/engines/scumm/imuse_digi/dimuse_track.cpp b/engines/scumm/imuse_digi/dimuse_track.cpp
index d1bd5b8923..a203ee878a 100644
--- a/engines/scumm/imuse_digi/dimuse_track.cpp
+++ b/engines/scumm/imuse_digi/dimuse_track.cpp
@@ -67,7 +67,7 @@ int IMuseDigital::allocSlot(int priority) {
return trackId;
}
-void IMuseDigital::startSound(int soundId, const char *soundName, int soundType, int volGroupId, AudioStream *input, int hookId, int volume, int priority) {
+void IMuseDigital::startSound(int soundId, const char *soundName, int soundType, int volGroupId, Audio::AudioStream *input, int hookId, int volume, int priority) {
debug(5, "IMuseDigital::startSound(%d)", soundId);
int l = allocSlot(priority);
diff --git a/engines/scumm/player_mod.cpp b/engines/scumm/player_mod.cpp
index 773d34732d..9a22aaa1e0 100644
--- a/engines/scumm/player_mod.cpp
+++ b/engines/scumm/player_mod.cpp
@@ -92,7 +92,7 @@ void Player_MOD::startChannel(int id, void *data, int size, int rate, uint8 vol,
_channels[i].vol = vol;
_channels[i].pan = pan;
_channels[i].freq = rate;
- _channels[i].input = makeLinearInputStream(rate, Audio::Mixer::FLAG_AUTOFREE | (loopStart != loopEnd ? Audio::Mixer::FLAG_LOOP : 0), (const byte*)data, size, loopStart, loopEnd - loopStart);
+ _channels[i].input = Audio::makeLinearInputStream(rate, Audio::Mixer::FLAG_AUTOFREE | (loopStart != loopEnd ? Audio::Mixer::FLAG_LOOP : 0), (const byte*)data, size, loopStart, loopEnd - loopStart);
_channels[i].converter = Audio::makeRateConverter(rate, _mixer->getOutputRate(), false, false);
}
diff --git a/engines/scumm/player_mod.h b/engines/scumm/player_mod.h
index 317bf7fd6e..5caa27e23a 100644
--- a/engines/scumm/player_mod.h
+++ b/engines/scumm/player_mod.h
@@ -36,7 +36,7 @@ namespace Scumm {
/**
* Generic Amiga MOD mixer - provides a 60Hz 'update' routine.
*/
-class Player_MOD : public AudioStream {
+class Player_MOD : public Audio::AudioStream {
public:
Player_MOD(ScummEngine *scumm);
virtual ~Player_MOD();
@@ -73,7 +73,7 @@ private:
int8 pan;
uint16 freq;
Audio::RateConverter *converter;
- AudioStream *input;
+ Audio::AudioStream *input;
};
Audio::Mixer *_mixer;
diff --git a/engines/scumm/player_nes.h b/engines/scumm/player_nes.h
index 17a11b2fe3..c7788bb6b1 100644
--- a/engines/scumm/player_nes.h
+++ b/engines/scumm/player_nes.h
@@ -43,7 +43,7 @@ static const int NUMCHANS = 4;
/**
* Scumm NES sound/music driver.
*/
-class Player_NES : public AudioStream, public MusicEngine {
+class Player_NES : public Audio::AudioStream, public MusicEngine {
public:
Player_NES(ScummEngine *scumm);
virtual ~Player_NES();
diff --git a/engines/scumm/player_v2.h b/engines/scumm/player_v2.h
index 160400e06a..02a74e7bc0 100644
--- a/engines/scumm/player_v2.h
+++ b/engines/scumm/player_v2.h
@@ -76,7 +76,7 @@ struct channel_data {
* This simulates the pc speaker sound, which is driven by the 8253 (square
* wave generator) and a low-band filter.
*/
-class Player_V2 : public AudioStream, public MusicEngine {
+class Player_V2 : public Audio::AudioStream, public MusicEngine {
public:
Player_V2(ScummEngine *scumm, bool pcjr);
virtual ~Player_V2();
diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp
index d6594f1a55..dc13319c2b 100644
--- a/engines/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
@@ -871,7 +871,7 @@ void ScummEngine::saveOrLoad(Serializer *s) {
// as AudioCDManager::Status::playing, and MSVC6 has
// a fit with that. This typedef simplifies the notation
// to something MSVC6 can grasp.
- typedef AudioCDManager::Status AudioCDManager_Status;
+ typedef Audio::AudioCDManager::Status AudioCDManager_Status;
const SaveLoadEntry audioCDEntries[] = {
MKLINE(AudioCDManager_Status, playing, sleUint32, VER(24)),
MKLINE(AudioCDManager_Status, track, sleInt32, VER(24)),
@@ -1140,7 +1140,7 @@ void ScummEngine::saveOrLoad(Serializer *s) {
// Save/load the Audio CD status
//
if (s->getVersion() >= VER(24)) {
- AudioCDManager::Status info;
+ Audio::AudioCDManager::Status info;
if (s->isSaving())
info = AudioCD.getStatus();
s->saveLoadArrayOf(&info, 1, sizeof(info), audioCDEntries);
diff --git a/engines/scumm/smush/smush_player.cpp b/engines/scumm/smush/smush_player.cpp
index 7e846f4b12..9edf776989 100644
--- a/engines/scumm/smush/smush_player.cpp
+++ b/engines/scumm/smush/smush_player.cpp
@@ -1270,7 +1270,7 @@ void SmushPlayer::tryCmpFile(const char *filename) {
if (_compressedFile.isOpen()) {
int size = _compressedFile.size();
_compressedFileMode = true;
- _vm->_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_compressedFileSoundHandle, makeMP3Stream(&_compressedFile, size));
+ _vm->_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_compressedFileSoundHandle, Audio::makeMP3Stream(&_compressedFile, size));
return;
}
#endif
@@ -1281,7 +1281,7 @@ void SmushPlayer::tryCmpFile(const char *filename) {
if (_compressedFile.isOpen()) {
int size = _compressedFile.size();
_compressedFileMode = true;
- _vm->_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_compressedFileSoundHandle, makeVorbisStream(&_compressedFile, size));
+ _vm->_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_compressedFileSoundHandle, Audio::makeVorbisStream(&_compressedFile, size));
return;
}
#endif
diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp
index bdb4e658a1..b32686a215 100644
--- a/engines/scumm/sound.cpp
+++ b/engines/scumm/sound.cpp
@@ -272,10 +272,10 @@ void Sound::playSound(int soundID) {
// We'd have to add the 'Creative Voice File' header for this, though,
// or make readVOCFromMemory() less strict.
- VocBlockHeader &voc_block_hdr = *(VocBlockHeader *)ptr;
+ Audio::VocBlockHeader &voc_block_hdr = *(Audio::VocBlockHeader *)ptr;
assert(voc_block_hdr.blocktype == 1);
size = voc_block_hdr.size[0] + (voc_block_hdr.size[1] << 8) + (voc_block_hdr.size[2] << 16) - 2;
- rate = getSampleRateFromVOCRate(voc_block_hdr.sr);
+ rate = Audio::getSampleRateFromVOCRate(voc_block_hdr.sr);
assert(voc_block_hdr.pack == 0);
// Allocate a sound buffer, copy the data into it, and play
@@ -600,29 +600,29 @@ void Sound::startTalkSound(uint32 offset, uint32 b, int mode, Audio::SoundHandle
}
if (!_soundsPaused && _vm->_mixer->isReady()) {
- AudioStream *input = NULL;
+ Audio::AudioStream *input = NULL;
switch (_soundMode) {
case kMP3Mode:
#ifdef USE_MAD
assert(size > 0);
- input = makeMP3Stream(_sfxFile, size);
+ input = Audio::makeMP3Stream(_sfxFile, size);
#endif
break;
case kVorbisMode:
#ifdef USE_VORBIS
assert(size > 0);
- input = makeVorbisStream(_sfxFile, size);
+ input = Audio::makeVorbisStream(_sfxFile, size);
#endif
break;
case kFlacMode:
#ifdef USE_FLAC
assert(size > 0);
- input = makeFlacStream(_sfxFile, size);
+ input = Audio::makeFlacStream(_sfxFile, size);
#endif
break;
default:
- input = makeVOCStream(*_sfxFile);
+ input = Audio::makeVOCStream(*_sfxFile);
}
if (!input) {
diff --git a/engines/scumm/sound.h b/engines/scumm/sound.h
index bf28cc9f3a..8d09d4a7b4 100644
--- a/engines/scumm/sound.h
+++ b/engines/scumm/sound.h
@@ -136,7 +136,7 @@ protected:
* An audio stream to which additional data can be appended on-the-fly.
* Used by SMUSH and iMuseDigital.
*/
-class AppendableAudioStream : public AudioStream {
+class AppendableAudioStream : public Audio::AudioStream {
public:
virtual void append(const byte *data, uint32 len) = 0;
virtual void finish() = 0;
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-11 18:20:02 +0000