aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
Diffstat (limited to 'engines/scumm')
-rw-r--r--engines/scumm/he/cup_player_he.cpp4
-rw-r--r--engines/scumm/he/sound_he.cpp10
-rw-r--r--engines/scumm/imuse_digi/dimuse.cpp9
-rw-r--r--engines/scumm/player_mod.cpp2
-rw-r--r--engines/scumm/smush/smush_mixer.cpp7
-rw-r--r--engines/scumm/smush/smush_player.cpp5
-rw-r--r--engines/scumm/sound.cpp8
7 files changed, 24 insertions, 21 deletions
diff --git a/engines/scumm/he/cup_player_he.cpp b/engines/scumm/he/cup_player_he.cpp
index ea8f9e9f8a..fcf3c5477e 100644
--- a/engines/scumm/he/cup_player_he.cpp
+++ b/engines/scumm/he/cup_player_he.cpp
@@ -169,10 +169,10 @@ void CUP_Player::updateSfx() {
uint8 *soundData = _sfxBuffer + offset;
if (READ_BE_UINT32(soundData) == MKID_BE('DATA')) {
uint32 soundSize = READ_BE_UINT32(soundData + 4);
- uint32 flags = Audio::Mixer::FLAG_UNSIGNED;
+ uint32 flags = Audio::FLAG_UNSIGNED;
uint32 loopEnd = 0;
if (sfx->flags & kSfxFlagLoop) {
- flags |= Audio::Mixer::FLAG_LOOP;
+ flags |= Audio::FLAG_LOOP;
loopEnd = soundSize - 8;
}
_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &sfxChannel->handle,
diff --git a/engines/scumm/he/sound_he.cpp b/engines/scumm/he/sound_he.cpp
index 64487568c3..5b19322290 100644
--- a/engines/scumm/he/sound_he.cpp
+++ b/engines/scumm/he/sound_he.cpp
@@ -532,7 +532,7 @@ void SoundHE::playHESound(int soundID, int heOffset, int heChannel, int heFlags)
byte *ptr, *spoolPtr;
int size = -1;
int priority, rate;
- byte flags = Audio::Mixer::FLAG_UNSIGNED;
+ byte flags = Audio::FLAG_UNSIGNED;
Audio::Mixer::SoundType type = Audio::Mixer::kSFXSoundType;
if (soundID > _vm->_numSounds)
@@ -636,7 +636,7 @@ void SoundHE::playHESound(int soundID, int heOffset, int heChannel, int heFlags)
// TODO: Extra sound flags
if (heFlags & 1) {
- flags |= Audio::Mixer::FLAG_LOOP;
+ flags |= Audio::FLAG_LOOP;
_heChannel[heChannel].timer = 0;
} else {
_heChannel[heChannel].timer = size * 1000 / rate;
@@ -644,7 +644,7 @@ void SoundHE::playHESound(int soundID, int heOffset, int heChannel, int heFlags)
_mixer->stopHandle(_heSoundChannels[heChannel]);
if (compType == 17) {
- Audio::AudioStream *voxStream = Audio::makeADPCMStream(&memStream, false, size, Audio::kADPCMMSIma, rate, (flags & Audio::Mixer::FLAG_STEREO) ? 2 : 1, blockAlign);
+ Audio::AudioStream *voxStream = Audio::makeADPCMStream(&memStream, false, size, Audio::kADPCMMSIma, rate, (flags & Audio::FLAG_STEREO) ? 2 : 1, blockAlign);
// FIXME: Get rid of this crude hack to turn a ADPCM stream into a raw stream.
// It seems it is only there to allow looping -- if that is true, we certainly
@@ -666,7 +666,7 @@ void SoundHE::playHESound(int soundID, int heOffset, int heChannel, int heFlags)
// makeADPCMStream returns a stream in native endianness, but RawMemoryStream
// defaults to big endian. If we're on a little endian system, set the LE flag.
#ifdef SCUMM_LITTLE_ENDIAN
- flags |= Audio::Mixer::FLAG_LITTLE_ENDIAN;
+ flags |= Audio::FLAG_LITTLE_ENDIAN;
#endif
stream = Audio::makeRawMemoryStream(sound + heOffset, size - heOffset, DisposeAfterUse::YES, rate, flags, 0, 0);
} else {
@@ -722,7 +722,7 @@ void SoundHE::playHESound(int soundID, int heOffset, int heChannel, int heFlags)
// TODO: Extra sound flags
if (heFlags & 1) {
- flags |= Audio::Mixer::FLAG_LOOP;
+ flags |= Audio::FLAG_LOOP;
_heChannel[heChannel].timer = 0;
} else {
_heChannel[heChannel].timer = size * 1000 / rate;
diff --git a/engines/scumm/imuse_digi/dimuse.cpp b/engines/scumm/imuse_digi/dimuse.cpp
index 43c72bc7ad..55fc66f058 100644
--- a/engines/scumm/imuse_digi/dimuse.cpp
+++ b/engines/scumm/imuse_digi/dimuse.cpp
@@ -35,6 +35,7 @@
#include "sound/audiostream.h"
#include "sound/mixer.h"
+#include "sound/raw.h"
namespace Scumm {
@@ -78,13 +79,13 @@ IMuseDigital::~IMuseDigital() {
int32 IMuseDigital::makeMixerFlags(int32 flags) {
int32 mixerFlags = 0;
if (flags & kFlagUnsigned)
- mixerFlags |= Audio::Mixer::FLAG_UNSIGNED;
+ mixerFlags |= Audio::FLAG_UNSIGNED;
if (flags & kFlag16Bits)
- mixerFlags |= Audio::Mixer::FLAG_16BITS;
+ mixerFlags |= Audio::FLAG_16BITS;
if (flags & kFlagLittleEndian)
- mixerFlags |= Audio::Mixer::FLAG_LITTLE_ENDIAN;
+ mixerFlags |= Audio::FLAG_LITTLE_ENDIAN;
if (flags & kFlagStereo)
- mixerFlags |= Audio::Mixer::FLAG_STEREO;
+ mixerFlags |= Audio::FLAG_STEREO;
return mixerFlags;
}
diff --git a/engines/scumm/player_mod.cpp b/engines/scumm/player_mod.cpp
index 4e878768ef..9364ce0ee5 100644
--- a/engines/scumm/player_mod.cpp
+++ b/engines/scumm/player_mod.cpp
@@ -95,7 +95,7 @@ void Player_MOD::startChannel(int id, void *data, int size, int rate, uint8 vol,
_channels[i].pan = pan;
_channels[i].freq = rate;
_channels[i].ctr = 0;
- _channels[i].input = Audio::makeRawMemoryStream((const byte*)data, size, DisposeAfterUse::YES, rate, (loopStart != loopEnd ? Audio::Mixer::FLAG_LOOP : 0), loopStart, loopEnd);
+ _channels[i].input = Audio::makeRawMemoryStream((const byte*)data, size, DisposeAfterUse::YES, rate, (loopStart != loopEnd ? Audio::FLAG_LOOP : 0), loopStart, loopEnd);
// read the first sample
_channels[i].input->readBuffer(&_channels[i].pos, 1);
}
diff --git a/engines/scumm/smush/smush_mixer.cpp b/engines/scumm/smush/smush_mixer.cpp
index a9b5e6077e..33285c7626 100644
--- a/engines/scumm/smush/smush_mixer.cpp
+++ b/engines/scumm/smush/smush_mixer.cpp
@@ -33,6 +33,7 @@
#include "scumm/imuse/imuse.h"
#include "sound/mixer.h"
+#include "sound/raw.h"
namespace Scumm {
@@ -112,11 +113,11 @@ bool SmushMixer::handleFrame() {
int32 size = _channels[i].chan->getAvailableSoundDataSize();
byte *data = _channels[i].chan->getSoundData();
- byte flags = stereo ? Audio::Mixer::FLAG_STEREO : 0;
+ byte flags = stereo ? Audio::FLAG_STEREO : 0;
if (is_16bit) {
- flags |= Audio::Mixer::FLAG_16BITS;
+ flags |= Audio::FLAG_16BITS;
} else {
- flags |= Audio::Mixer::FLAG_UNSIGNED;
+ flags |= Audio::FLAG_UNSIGNED;
}
if (_mixer->isReady()) {
diff --git a/engines/scumm/smush/smush_player.cpp b/engines/scumm/smush/smush_player.cpp
index 871ce76803..e8470aaf04 100644
--- a/engines/scumm/smush/smush_player.cpp
+++ b/engines/scumm/smush/smush_player.cpp
@@ -50,8 +50,9 @@
#include "scumm/insane/insane.h"
#include "sound/mixer.h"
-#include "sound/vorbis.h"
#include "sound/mp3.h"
+#include "sound/raw.h"
+#include "sound/vorbis.h"
#include "common/zlib.h"
@@ -472,7 +473,7 @@ void SmushPlayer::handleIACT(int32 subSize, Common::SeekableReadStream &b) {
_IACTstream = Audio::makeQueuingAudioStream(22050, true);
_vm->_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_IACTchannel, _IACTstream);
}
- _IACTstream->queueBuffer(output_data, 0x1000, DisposeAfterUse::YES, Audio::Mixer::FLAG_STEREO | Audio::Mixer::FLAG_16BITS);
+ _IACTstream->queueBuffer(output_data, 0x1000, DisposeAfterUse::YES, Audio::FLAG_STEREO | Audio::FLAG_16BITS);
bsize -= len;
d_src += len;
diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp
index 788be2d0d6..988be35af8 100644
--- a/engines/scumm/sound.cpp
+++ b/engines/scumm/sound.cpp
@@ -164,7 +164,7 @@ void Sound::playSound(int soundID) {
Audio::AudioStream *stream;
int size = -1;
int rate;
- byte flags = Audio::Mixer::FLAG_UNSIGNED;
+ byte flags = Audio::FLAG_UNSIGNED;
if (_vm->_game.id == GID_LOOM && _vm->_game.platform == Common::kPlatformPCEngine) {
if (soundID >= 13 && soundID <= 32) {
@@ -351,7 +351,7 @@ void Sound::playSound(int soundID) {
size -= waveSize;
if (loopEnd > 0)
- flags |= Audio::Mixer::FLAG_LOOP;
+ flags |= Audio::FLAG_LOOP;
stream = Audio::makeRawMemoryStream(sound, waveSize, DisposeAfterUse::YES, rate, flags, loopStart, loopEnd);
_mixer->playInputStream(Audio::Mixer::kSFXSoundType, NULL, stream, soundID, 255, 0);
@@ -442,7 +442,7 @@ void Sound::playSound(int soundID) {
// so maybe this is not really a problem.
loopStart = READ_BE_UINT16(ptr + 10) - READ_BE_UINT16(ptr + 8);
loopEnd = READ_BE_UINT16(ptr + 14);
- flags |= Audio::Mixer::FLAG_LOOP;
+ flags |= Audio::FLAG_LOOP;
}
memcpy(sound, ptr + READ_BE_UINT16(ptr + 8), size);
@@ -659,7 +659,7 @@ void Sound::startTalkSound(uint32 offset, uint32 b, int mode, Audio::SoundHandle
#endif
break;
default:
- input = Audio::makeVOCStream(*_sfxFile, Audio::Mixer::FLAG_UNSIGNED);
+ input = Audio::makeVOCStream(*_sfxFile, Audio::FLAG_UNSIGNED);
break;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-13 11:19:44 +0000