libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-09 19:32:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SAGA2: Add sound/music handles for SoundQueue

Browse Source
This commit is contained in:
a/ 2021-06-29 02:12:13 +09:00 committed by Eugene Sandulenko
parent 06d708fd9a
commit f37fceb82b
No known key found for this signature in database
GPG Key ID: 014D387312D34F08
3 changed files with 79 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/saga2/audio.cpp
View File

@ -111,6 +111,7 @@ bool audioInterface::goodMIDICard(void) {
void audioInterface::queueSound(soundSegment s, decoderSet *, int16 loopFactor, sampleLocation where) {
warning("STUB: audioInterface::queueSound(%d, @%d,%d)", s, where.x, where.y);
audio->queue.pushSound(s);
}
void audioInterface::queueLoop(soundSegment s, decoderSet *sDec, int16 loopFactor, sampleLocation where) {
@ -132,6 +133,7 @@ void audioInterface::queueVoice(soundSegment s, decoderSet *, sampleLocation whe
void audioInterface::queueVoice(soundSegment s[], decoderSet *, sampleLocation where) {
warning("STUB: audioInterface::queueVoice(soundSegment [], decoderSet *, sampleLocation)");
audio->queue.pushVoice(s);
}
void audioInterface::stopVoice(void) {

90
engines/saga2/audqueue.h
View File

@ -29,54 +29,114 @@
#include "audio/mixer.h"
#include "saga2/saga2.h"
#include "saga2/fta.h"
#include "saga2/shorten.h"
#include "saga2/hresmgr.h"
namespace Saga2 {
Common::SeekableReadStream *loadResourceToStream(hResContext *con, uint32 id, const char desc[]);
extern hResContext *voiceRes;
extern hResContext *soundRes;
extern hResContext *musicRes;
class SoundQueue {
private:
Common::Queue<soundSegment> _voiceQueue;
Common::Queue<soundSegment> _speechQueue;
Common::Queue<soundSegment> _sfxQueue;
Common::Queue<soundSegment> _bgmQueue;
Audio::SoundHandle _speechSoundHandle;
Audio::SoundHandle _sfxSoundHandle;
Audio::SoundHandle _bgmSoundHandle;
public:
void pushVoice(soundSegment s) {
_voiceQueue.push(s);
_speechQueue.push(s);
}
void pushVoice(soundSegment s[]) {
soundSegment *p = s;
while (*p) {
_voiceQueue.push(*p);
_speechQueue.push(*p);
p++;
}
}
void pushSound(soundSegment s) {
_sfxQueue.push(s);
}
void pushMusic(soundSegment s) {
_bgmQueue.push(s);
}
void playNext() {
if (_voiceQueue.size()) {
soundSegment s = _voiceQueue.pop();
Common::SeekableReadStream *stream = loadResourceToStream(voiceRes, s, "voice data");
if (_speechQueue.size()) {
soundSegment s = _speechQueue.pop();
playSpeech(s);
}
Audio::AudioStream *aud = makeShortenStream(*stream);
g_system->getMixer()->playStream(Audio::Mixer::kSpeechSoundType, &_speechSoundHandle, aud);
delete stream;
if (_sfxQueue.size()) {
soundSegment s = _sfxQueue.pop();
playSound(s);
}
}
bool isPlaying() {
void playSpeech(soundSegment s) {
Common::SeekableReadStream *stream = loadResourceToStream(voiceRes, s, "voice data");
Audio::AudioStream *aud = makeShortenStream(*stream);
g_system->getMixer()->playStream(Audio::Mixer::kSpeechSoundType, &_speechSoundHandle, aud);
delete stream;
}
void playSound(soundSegment s) {
warning("STUB: SoundQueue::playSound");
#if 0
Common::SeekableReadStream *stream = loadResourceToStream(soundRes, s, "voice data");
Audio::AudioStream *aud = makeShortenStream(*stream);
g_system->getMixer()->playStream(Audio::Mixer::kSpeechSoundType, &_sfxSoundHandle, aud);
delete stream;
#endif
}
void playMusic(soundSegment s) {
warning("STUB: SoundQueue::playMusic");
#if 0
Common::SeekableReadStream *stream = loadResourceToStream(musicRes, s, "voice data");
Audio::AudioStream *aud = makeShortenStream(*stream);
g_system->getMixer()->playStream(Audio::Mixer::kSpeechSoundType, &_bgmSoundHandle, aud);
delete stream;
#endif
}
bool isSpeechPlaying() {
return g_system->getMixer()->isSoundHandleActive(_speechSoundHandle);
}
bool isSoundPlaying() {
return g_system->getMixer()->isSoundHandleActive(_sfxSoundHandle);
}
bool isMusicPlaying() {
return g_system->getMixer()->isSoundHandleActive(_bgmSoundHandle);
}
bool isPlaying() {
return isSpeechPlaying() || isSoundPlaying() || isMusicPlaying();
}
int getSize() {
return _voiceQueue.size();
return _speechQueue.size() + _sfxQueue.size() + _bgmQueue.size();
}
};

5
engines/saga2/noise.cpp
View File

@ -576,7 +576,7 @@ bool sayVoiceAt(uint32 s[], Point32 p) {
debugC(1, kDebugSound, "], %d,%d)", p.x, p.y);
audio->queue.pushVoice(s);
audio->queueVoice(s, voiceDec, p);
return true;
}
@ -633,9 +633,8 @@ void moveLoop(Location loc) {
bool stillDoingVoice(uint32 sampno) {
warning("STUB: stillDoingVoice(%s)", tag2str(sampno));
return audio->queue.isPlaying();
// return (audio->saying(sampno));
return audio->queue.isSpeechPlaying();
}