thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move raw audio flags from sound/mixer.h to sound/raw.h

Browse source 
svn-id: r47395
This commit is contained in:
Max Horn 2010-01-19 22:30:33 +00:00
parent 68826c27da
commit dc5e08e623
48 changed files with 213 additions and 188 deletions
Download patch file Download diff file Expand all files Collapse all files

5
engines/touche/resource.cpp
View file

@ -30,6 +30,7 @@
#include "sound/mp3.h"
#include "sound/voc.h"
#include "sound/vorbis.h"
#include "sound/raw.h"
#include "sound/audiostream.h"
#include "touche/midi.h"
@ -587,7 +588,7 @@ void ToucheEngine::res_loadSound(int priority, int num) {
uint32 size;
const uint32 offs = res_getDataOffset(kResourceTypeSound, num, &size);
_fData.seek(offs);
Audio::AudioStream *stream = Audio::makeVOCStream(_fData, Audio::Mixer::FLAG_UNSIGNED);
Audio::AudioStream *stream = Audio::makeVOCStream(_fData, Audio::FLAG_UNSIGNED);
if (stream) {
_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_sfxHandle, stream);
}
@ -645,7 +646,7 @@ void ToucheEngine::res_loadSpeechSegment(int num) {
return;
}
_fSpeech[i].seek(offs);
stream = Audio::makeVOCStream(_fSpeech[i], Audio::Mixer::FLAG_UNSIGNED);
stream = Audio::makeVOCStream(_fSpeech[i], Audio::FLAG_UNSIGNED);
} else {
if (num >= 750) {
num -= 750;