aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--engines/made/pmvplayer.cpp2
-rw-r--r--engines/made/pmvplayer.h2
-rw-r--r--engines/mohawk/video/qt_player.cpp4
-rw-r--r--engines/mohawk/video/qt_player.h2
-rw-r--r--engines/tinsel/bmv.cpp2
-rw-r--r--engines/tinsel/bmv.h2
-rw-r--r--graphics/video/avi_decoder.cpp4
-rw-r--r--graphics/video/avi_decoder.h4
-rw-r--r--graphics/video/coktelvideo/coktelvideo.cpp8
-rw-r--r--graphics/video/coktelvideo/coktelvideo.h2
-rw-r--r--graphics/video/smk_decoder.cpp6
-rw-r--r--graphics/video/smk_decoder.h4
-rw-r--r--sound/audiostream.cpp20
-rw-r--r--sound/audiostream.h6
14 files changed, 34 insertions, 34 deletions
diff --git a/engines/made/pmvplayer.cpp b/engines/made/pmvplayer.cpp
index c0dad218c0..b0b1f0d70f 100644
--- a/engines/made/pmvplayer.cpp
+++ b/engines/made/pmvplayer.cpp
@@ -102,7 +102,7 @@ bool PmvPlayer::play(const char *filename) {
// TODO: Sound can still be a little choppy. A bug in the decoder or -
// perhaps more likely - do we have to implement double buffering to
// get it to work well?
- _audioStream = Audio::makeQueuedAudioStream(soundFreq, false);
+ _audioStream = Audio::makeQueuingAudioStream(soundFreq, false);
while (!_vm->shouldQuit() && !_aborted && !_fd->eos() && frameNumber < frameCount) {
diff --git a/engines/made/pmvplayer.h b/engines/made/pmvplayer.h
index bfdda4fa2e..3a5295711d 100644
--- a/engines/made/pmvplayer.h
+++ b/engines/made/pmvplayer.h
@@ -50,7 +50,7 @@ protected:
MadeEngine *_vm;
Audio::Mixer *_mixer;
Common::File *_fd;
- Audio::QueuedAudioStream *_audioStream;
+ Audio::QueuingAudioStream *_audioStream;
Audio::SoundHandle _audioStreamHandle;
byte _paletteRGB[768];
Graphics::Surface *_surface;
diff --git a/engines/mohawk/video/qt_player.cpp b/engines/mohawk/video/qt_player.cpp
index d9d4a68dac..2f4c54abc4 100644
--- a/engines/mohawk/video/qt_player.cpp
+++ b/engines/mohawk/video/qt_player.cpp
@@ -148,7 +148,7 @@ void QTPlayer::reset() {
stopAudio();
if (_audioStreamIndex >= 0) {
_curAudioChunk = 0;
- _audStream = Audio::makeQueuedAudioStream(_streams[_audioStreamIndex]->sample_rate, _streams[_audioStreamIndex]->channels == 2);
+ _audStream = Audio::makeQueuingAudioStream(_streams[_audioStreamIndex]->sample_rate, _streams[_audioStreamIndex]->channels == 2);
}
startAudio();
}
@@ -304,7 +304,7 @@ bool QTPlayer::loadFile(Common::SeekableReadStream *stream) {
}
if (_audioStreamIndex >= 0 && checkAudioCodecSupport(_streams[_audioStreamIndex]->codec_tag)) {
- _audStream = Audio::makeQueuedAudioStream(_streams[_audioStreamIndex]->sample_rate, _streams[_audioStreamIndex]->channels == 2);
+ _audStream = Audio::makeQueuingAudioStream(_streams[_audioStreamIndex]->sample_rate, _streams[_audioStreamIndex]->channels == 2);
_curAudioChunk = 0;
// Make sure the bits per sample transfers to the sample size
diff --git a/engines/mohawk/video/qt_player.h b/engines/mohawk/video/qt_player.h
index 5ff27a57c5..2d8f87f479 100644
--- a/engines/mohawk/video/qt_player.h
+++ b/engines/mohawk/video/qt_player.h
@@ -246,7 +246,7 @@ protected:
void resetInternal();
uint32 getFrameDuration();
- Audio::QueuedAudioStream *_audStream;
+ Audio::QueuingAudioStream *_audStream;
int8 _videoStreamIndex;
int8 _audioStreamIndex;
uint _curAudioChunk;
diff --git a/engines/tinsel/bmv.cpp b/engines/tinsel/bmv.cpp
index 0a6e6536a0..0bb13c2fab 100644
--- a/engines/tinsel/bmv.cpp
+++ b/engines/tinsel/bmv.cpp
@@ -423,7 +423,7 @@ void BMVPlayer::MoviePalette(int paletteOffset) {
}
void BMVPlayer::InitialiseMovieSound() {
- _audioStream = Audio::makeQueuedAudioStream(22050, true);
+ _audioStream = Audio::makeQueuingAudioStream(22050, true);
audioStarted = false;
}
diff --git a/engines/tinsel/bmv.h b/engines/tinsel/bmv.h
index 82aadd5748..a0359d497d 100644
--- a/engines/tinsel/bmv.h
+++ b/engines/tinsel/bmv.h
@@ -113,7 +113,7 @@ class BMVPlayer {
bool audioStarted;
- Audio::QueuedAudioStream *_audioStream;
+ Audio::QueuingAudioStream *_audioStream;
Audio::SoundHandle _audioHandle;
int nextMaintain;
diff --git a/graphics/video/avi_decoder.cpp b/graphics/video/avi_decoder.cpp
index f949d612df..7416d86310 100644
--- a/graphics/video/avi_decoder.cpp
+++ b/graphics/video/avi_decoder.cpp
@@ -431,10 +431,10 @@ Codec *AviDecoder::createCodec() {
return NULL;
}
-Audio::QueuedAudioStream *AviDecoder::createAudioStream() {
+Audio::QueuingAudioStream *AviDecoder::createAudioStream() {
if (_wvInfo.tag == AVI_WAVE_FORMAT_PCM) {
- return Audio::makeQueuedAudioStream(AUDIO_RATE, false);
+ return Audio::makeQueuingAudioStream(AUDIO_RATE, false);
}
if (_wvInfo.tag != 0) // No sound
diff --git a/graphics/video/avi_decoder.h b/graphics/video/avi_decoder.h
index 81d2bceffc..e8d38fefb7 100644
--- a/graphics/video/avi_decoder.h
+++ b/graphics/video/avi_decoder.h
@@ -216,8 +216,8 @@ private:
void handlePalChange();
Audio::SoundHandle *_audHandle;
- Audio::QueuedAudioStream *_audStream;
- Audio::QueuedAudioStream *createAudioStream();
+ Audio::QueuingAudioStream *_audStream;
+ Audio::QueuingAudioStream *createAudioStream();
// Helper functions
static byte char2num(char c);
diff --git a/graphics/video/coktelvideo/coktelvideo.cpp b/graphics/video/coktelvideo/coktelvideo.cpp
index d4412c4b5a..ccaf72cce7 100644
--- a/graphics/video/coktelvideo/coktelvideo.cpp
+++ b/graphics/video/coktelvideo/coktelvideo.cpp
@@ -201,7 +201,7 @@ bool Imd::assessAudioProperties() {
_soundStage = 1;
_hasSound = true;
- _audioStream = Audio::makeQueuedAudioStream(_soundFreq, false);
+ _audioStream = Audio::makeQueuingAudioStream(_soundFreq, false);
} else
_frameLength = 1000 / _frameRate;
@@ -1276,7 +1276,7 @@ bool Vmd::assessAudioProperties() {
_soundStage = 1;
- _audioStream = Audio::makeQueuedAudioStream(_soundFreq, _soundStereo != 0);
+ _audioStream = Audio::makeQueuingAudioStream(_soundFreq, _soundStereo != 0);
return true;
}
@@ -1562,9 +1562,9 @@ void Vmd::seekFrame(int32 frame, int16 whence, bool restart) {
// FIXME: This code didn't check the stereo flag at all and always generated
// mono data. Is that on purpose? If so, just remove this comment.
// If it was by accident, remove the assert and replace "false" in the call
- // to makeQueuedAudioStream() below by "_soundStereo > 0".
+ // to makeQueuingAudioStream() below by "_soundStereo > 0".
assert(_soundStereo == 0);
- _audioStream = Audio::makeQueuedAudioStream(_soundFreq, false);
+ _audioStream = Audio::makeQueuingAudioStream(_soundFreq, false);
}
// Seek
diff --git a/graphics/video/coktelvideo/coktelvideo.h b/graphics/video/coktelvideo/coktelvideo.h
index 352abf282d..f0165cfb76 100644
--- a/graphics/video/coktelvideo/coktelvideo.h
+++ b/graphics/video/coktelvideo/coktelvideo.h
@@ -341,7 +341,7 @@ protected:
uint8 _soundStage; // (0: no sound, 1: loaded, 2: playing)
uint32 _skipFrames;
- Audio::QueuedAudioStream *_audioStream;
+ Audio::QueuingAudioStream *_audioStream;
Audio::SoundHandle _audioHandle;
// Current video state
diff --git a/graphics/video/smk_decoder.cpp b/graphics/video/smk_decoder.cpp
index 551b75b828..1a313b9f2e 100644
--- a/graphics/video/smk_decoder.cpp
+++ b/graphics/video/smk_decoder.cpp
@@ -465,7 +465,7 @@ bool SmackerDecoder::loadFile(const char *fileName) {
_header.audioInfo[i].sampleRate = audioInfo & 0xFFFFFF;
if (_header.audioInfo[i].hasAudio && i == 0) {
- _audioStream = Audio::makeQueuedAudioStream(_header.audioInfo[0].sampleRate, _header.audioInfo[0].isStereo);
+ _audioStream = Audio::makeQueuingAudioStream(_header.audioInfo[0].sampleRate, _header.audioInfo[0].isStereo);
}
}
@@ -577,7 +577,7 @@ bool SmackerDecoder::decodeNextFrame() {
flags = flags | Audio::Mixer::FLAG_STEREO;
_audioStream->queueBuffer(soundBuffer, chunkSize, flags);
- // The sound buffer will be deleted by QueuedAudioStream
+ // The sound buffer will be deleted by QueuingAudioStream
}
if (!_audioStarted) {
@@ -831,7 +831,7 @@ void SmackerDecoder::queueCompressedBuffer(byte *buffer, uint32 bufferSize,
if (_header.audioInfo[0].isStereo)
flags = flags | Audio::Mixer::FLAG_STEREO;
_audioStream->queueBuffer(unpackedBuffer, unpackedSize, flags);
- // unpackedBuffer will be deleted by QueuedAudioStream
+ // unpackedBuffer will be deleted by QueuingAudioStream
}
void SmackerDecoder::unpackPalette() {
diff --git a/graphics/video/smk_decoder.h b/graphics/video/smk_decoder.h
index 5bebf3a14f..443d063138 100644
--- a/graphics/video/smk_decoder.h
+++ b/graphics/video/smk_decoder.h
@@ -30,7 +30,7 @@
#include "sound/mixer.h"
namespace Audio {
- class QueuedAudioStream;
+ class QueuingAudioStream;
}
namespace Graphics {
@@ -115,7 +115,7 @@ private:
Audio::Mixer::SoundType _soundType;
Audio::Mixer *_mixer;
bool _audioStarted;
- Audio::QueuedAudioStream *_audioStream;
+ Audio::QueuingAudioStream *_audioStream;
Audio::SoundHandle _audioHandle;
BigHuffmanTree *_MMapTree;
diff --git a/sound/audiostream.cpp b/sound/audiostream.cpp
index 16c5ff673a..6928638c35 100644
--- a/sound/audiostream.cpp
+++ b/sound/audiostream.cpp
@@ -769,7 +769,7 @@ AppendableAudioStream *makeAppendableAudioStream(int rate, byte _flags) {
#pragma mark -
-class QueuedAudioStreamImpl : public QueuedAudioStream {
+class QueuingAudioStreamImpl : public QueuingAudioStream {
private:
/**
* We queue a number of (pointers to) audio stream objects.
@@ -813,9 +813,9 @@ private:
Common::Queue<StreamHolder> _queue;
public:
- QueuedAudioStreamImpl(int rate, bool stereo)
+ QueuingAudioStreamImpl(int rate, bool stereo)
: _rate(rate), _stereo(stereo), _finished(false) {}
- ~QueuedAudioStreamImpl();
+ ~QueuingAudioStreamImpl();
// Implement the AudioStream API
virtual int readBuffer(int16 *buffer, const int numSamples);
@@ -827,7 +827,7 @@ public:
}
virtual bool endOfStream() const { return _finished; }
- // Implement the QueuedAudioStream API
+ // Implement the QueuingAudioStream API
virtual void queueAudioStream(AudioStream *stream, bool disposeAfterUse);
virtual void finish() { _finished = true; }
@@ -837,7 +837,7 @@ public:
}
};
-QueuedAudioStreamImpl::~QueuedAudioStreamImpl() {
+QueuingAudioStreamImpl::~QueuingAudioStreamImpl() {
while (!_queue.empty()) {
StreamHolder tmp = _queue.pop();
if (tmp._disposeAfterUse)
@@ -845,15 +845,15 @@ QueuedAudioStreamImpl::~QueuedAudioStreamImpl() {
}
}
-void QueuedAudioStreamImpl::queueAudioStream(AudioStream *stream, bool disposeAfterUse) {
+void QueuingAudioStreamImpl::queueAudioStream(AudioStream *stream, bool disposeAfterUse) {
if ((stream->getRate() != getRate()) || (stream->isStereo() != isStereo()))
- error("QueuedAudioStreamImpl::queueAudioStream: stream has mismatched parameters");
+ error("QueuingAudioStreamImpl::queueAudioStream: stream has mismatched parameters");
Common::StackLock lock(_mutex);
_queue.push(StreamHolder(stream, disposeAfterUse));
}
-int QueuedAudioStreamImpl::readBuffer(int16 *buffer, const int numSamples) {
+int QueuingAudioStreamImpl::readBuffer(int16 *buffer, const int numSamples) {
Common::StackLock lock(_mutex);
int samplesDecoded = 0;
@@ -873,8 +873,8 @@ int QueuedAudioStreamImpl::readBuffer(int16 *buffer, const int numSamples) {
-QueuedAudioStream *makeQueuedAudioStream(int rate, bool stereo) {
- return new QueuedAudioStreamImpl(rate, stereo);
+QueuingAudioStream *makeQueuingAudioStream(int rate, bool stereo) {
+ return new QueuingAudioStreamImpl(rate, stereo);
}
diff --git a/sound/audiostream.h b/sound/audiostream.h
index 7ffbeab5cb..192dc249bf 100644
--- a/sound/audiostream.h
+++ b/sound/audiostream.h
@@ -320,7 +320,7 @@ public:
AppendableAudioStream *makeAppendableAudioStream(int rate, byte flags);
-class QueuedAudioStream : public Audio::AudioStream {
+class QueuingAudioStream : public Audio::AudioStream {
public:
/**
@@ -359,9 +359,9 @@ public:
};
/**
- * Factory function for an QueuedAudioStream.
+ * Factory function for an QueuingAudioStream.
*/
-QueuedAudioStream *makeQueuedAudioStream(int rate, bool stereo);
+QueuingAudioStream *makeQueuingAudioStream(int rate, bool stereo);
/**
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 07:49:55 +0000