[Scummvm-git-logs] scummvm master -> 9ab1ad60bf9f83479a85ba961938db7edb1317e0
dreammaster
dreammaster at scummvm.org
Sat Feb 11 03:20:13 CET 2017
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
9ab1ad60bf TITANIC: Implementing audio buffer audio stream
Commit: 9ab1ad60bf9f83479a85ba961938db7edb1317e0
https://github.com/scummvm/scummvm/commit/9ab1ad60bf9f83479a85ba961938db7edb1317e0
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-02-10T21:20:06-05:00
Commit Message:
TITANIC: Implementing audio buffer audio stream
Changed paths:
engines/titanic/sound/audio_buffer.cpp
engines/titanic/sound/audio_buffer.h
engines/titanic/sound/music_room_handler.cpp
engines/titanic/sound/music_wave.cpp
engines/titanic/sound/music_wave.h
engines/titanic/sound/wave_file.cpp
engines/titanic/sound/wave_file.h
diff --git a/engines/titanic/sound/audio_buffer.cpp b/engines/titanic/sound/audio_buffer.cpp
index aa4bb8c..029e7f0 100644
--- a/engines/titanic/sound/audio_buffer.cpp
+++ b/engines/titanic/sound/audio_buffer.cpp
@@ -46,14 +46,14 @@ byte *CAudioBuffer::getEnd() {
return _flag ? &_buffer[0] : &_buffer[_buffer.size() / 2];
}
-uint16 *CAudioBuffer::getReadPtr() {
+int16 *CAudioBuffer::getReadPtr() {
byte *ptr = getBegin();
- return (uint16 *)(ptr + (_buffer.size() / 2 - _readBytesLeft));
+ return (int16 *)(ptr + (_buffer.size() / 2 - _readBytesLeft));
}
-uint16 *CAudioBuffer::getWritePtr() {
+int16 *CAudioBuffer::getWritePtr() {
byte *ptr = getEnd();
- return (uint16 *)(ptr + (_buffer.size() / 2 - _writeBytesLeft));
+ return (int16 *)(ptr + (_buffer.size() / 2 - _writeBytesLeft));
}
void CAudioBuffer::advanceRead(int size) {
diff --git a/engines/titanic/sound/audio_buffer.h b/engines/titanic/sound/audio_buffer.h
index 32a5790..54dd807 100644
--- a/engines/titanic/sound/audio_buffer.h
+++ b/engines/titanic/sound/audio_buffer.h
@@ -64,7 +64,7 @@ public:
/**
* Gets a pointer to the start of previously written data
*/
- uint16 *getReadPtr();
+ int16 *getReadPtr();
/**
* Returns the number of bytes that can be read
@@ -80,7 +80,7 @@ public:
* Gets a pointer to the remainder of the audio buffer that
* can be written to
*/
- uint16 *getWritePtr();
+ int16 *getWritePtr();
/**
* Returns how many bytes can be written before hitting the
diff --git a/engines/titanic/sound/music_room_handler.cpp b/engines/titanic/sound/music_room_handler.cpp
index c99370f..01d074c 100644
--- a/engines/titanic/sound/music_room_handler.cpp
+++ b/engines/titanic/sound/music_room_handler.cpp
@@ -205,11 +205,11 @@ void CMusicRoomHandler::updateAudio() {
_audioBuffer->enterCriticalSection();
int size = _audioBuffer->getWriteBytesLeft();
int count;
- uint16 *ptr;
+ int16 *ptr;
if (size > 0) {
// Null out the destination write area
- uint16 *audioPtr = _audioBuffer->getWritePtr();
+ int16 *audioPtr = _audioBuffer->getWritePtr();
Common::fill(audioPtr, audioPtr + size / sizeof(uint16), 0);
for (int instrIdx = 0; instrIdx < 4; ++instrIdx) {
diff --git a/engines/titanic/sound/music_wave.cpp b/engines/titanic/sound/music_wave.cpp
index 1145864..f6ea612 100644
--- a/engines/titanic/sound/music_wave.cpp
+++ b/engines/titanic/sound/music_wave.cpp
@@ -269,7 +269,7 @@ void CMusicWave::setSize(uint total) {
_count = 0;
}
-int CMusicWave::read(uint16 *ptr, uint size) {
+int CMusicWave::read(int16 *ptr, uint size) {
if (!_size)
return 0;
@@ -278,17 +278,17 @@ int CMusicWave::read(uint16 *ptr, uint size) {
if (_waveIndex != -1) {
// Lock the specified wave file for access
- const uint16 *data = _items[_waveIndex]._waveFile->lock();
+ const int16 *data = _items[_waveIndex]._waveFile->lock();
assert(data);
- const uint16 *src = data;
+ const int16 *src = data;
// Loop through merging data from the wave file into the dest buffer
- for (uint idx = 0; idx < (size / sizeof(uint16)); ++idx, _readPos += _readIncrement) {
+ for (uint idx = 0; idx < (size / sizeof(int16)); ++idx, _readPos += _readIncrement) {
uint srcPos = _readPos >> 8;
if (srcPos >= _count)
break;
- uint16 val = READ_LE_UINT16(src + srcPos);
+ int16 val = READ_LE_UINT16(src + srcPos);
*ptr++ += val;
}
diff --git a/engines/titanic/sound/music_wave.h b/engines/titanic/sound/music_wave.h
index 5d20525..f378257 100644
--- a/engines/titanic/sound/music_wave.h
+++ b/engines/titanic/sound/music_wave.h
@@ -120,7 +120,7 @@ public:
* If there is any wave file currently specified, reads it in
* and merges it into the supplied buffer
*/
- int read(uint16 *ptr, uint size);
+ int read(int16 *ptr, uint size);
/**
* Figure out which wave file to use next
diff --git a/engines/titanic/sound/wave_file.cpp b/engines/titanic/sound/wave_file.cpp
index e49c44d..c9cadde 100644
--- a/engines/titanic/sound/wave_file.cpp
+++ b/engines/titanic/sound/wave_file.cpp
@@ -29,6 +29,40 @@
namespace Titanic {
+/**
+ * This creates a ScummVM audio stream around a CAudioBuffer buffer,
+ * allowing for streaming audio output for the music room music
+ */
+class AudioBufferStream : public Audio::SeekableAudioStream {
+private:
+ CAudioBuffer *_audioBuffer;
+public:
+ AudioBufferStream(CAudioBuffer *audioBuffer) : _audioBuffer(audioBuffer) {}
+
+ virtual int readBuffer(int16 *buffer, const int numSamples);
+ virtual bool isStereo() const { return false; }
+ virtual bool endOfData() const;
+ virtual int getRate() const { return 22050; }
+ virtual Audio::Timestamp getLength() const { return Audio::Timestamp(); }
+ virtual bool seek(const Audio::Timestamp &where) { return false; }
+};
+
+int AudioBufferStream::readBuffer(int16 *buffer, const int numSamples) {
+ int samplesToRead = MIN((const uint)numSamples, _audioBuffer->getBytesToRead() / sizeof(uint16));
+
+ const int16 *src = _audioBuffer->getReadPtr();
+ Common::copy(src, src + samplesToRead, buffer);
+ _audioBuffer->advanceRead(samplesToRead * 2);
+
+ return samplesToRead;
+}
+
+bool AudioBufferStream::endOfData() const {
+ return _audioBuffer->_disabled;
+}
+
+/*------------------------------------------------------------------------*/
+
CWaveFile::CWaveFile() : _soundManager(nullptr), _audioStream(nullptr),
_waveData(nullptr), _waveSize(0), _dataSize(0), _headerSize(0),
_rate(0), _flags(0), _soundType(Audio::Mixer::kPlainSoundType) {
@@ -43,8 +77,6 @@ CWaveFile::CWaveFile(QSoundManager *owner) : _soundManager(owner), _audioStream(
void CWaveFile::setup() {
_loadMode = LOADMODE_SCUMMVM;
- _field4 = 0;
- _field14 = 1;
_dataSize = 0;
_audioBuffer = nullptr;
_disposeAudioBuffer = DisposeAfterUse::NO;
@@ -53,7 +85,7 @@ void CWaveFile::setup() {
CWaveFile::~CWaveFile() {
if (_audioStream) {
- _soundManager->soundFreed(_soundHandle);
+ //_soundManager->soundFreed(_soundHandle);
delete _audioStream;
}
@@ -127,8 +159,8 @@ bool CWaveFile::loadMusic(CAudioBuffer *buffer, DisposeAfterUse::Flag disposeAft
_audioBuffer = buffer;
_disposeAudioBuffer = disposeAfterUse;
_loadMode = LOADMODE_AUDIO_BUFFER;
- _field14 = 0;
+ _audioStream = new AudioBufferStream(_audioBuffer);
return true;
}
@@ -164,19 +196,19 @@ void CWaveFile::reset() {
audioStream()->rewind();
}
-const uint16 *CWaveFile::lock() {
+const int16 *CWaveFile::lock() {
switch (_loadMode) {
case LOADMODE_SCUMMVM:
assert(_waveData && _rate == 22050);
assert(_flags == (Audio::FLAG_LITTLE_ENDIAN | Audio::FLAG_16BITS));
- return (uint16 *)(_waveData + _headerSize);
+ return (const int16 *)(_waveData + _headerSize);
default:
return nullptr;
}
}
-void CWaveFile::unlock(const uint16 *ptr) {
+void CWaveFile::unlock(const int16 *ptr) {
// No implementation needed in ScummVM
}
diff --git a/engines/titanic/sound/wave_file.h b/engines/titanic/sound/wave_file.h
index b530320..8edcf63 100644
--- a/engines/titanic/sound/wave_file.h
+++ b/engines/titanic/sound/wave_file.h
@@ -45,7 +45,6 @@ private:
byte _flags;
QSoundManager *_soundManager;
Audio::SeekableAudioStream *_audioStream;
- Audio::SoundHandle _soundHandle;
private:
/**
* Handles setup of fields shared by the constructors
@@ -60,8 +59,6 @@ public:
Audio::Mixer::SoundType _soundType;
LoadMode _loadMode;
- int _field4;
- int _field14;
CAudioBuffer *_audioBuffer;
DisposeAfterUse::Flag _disposeAudioBuffer;
int _channel;
@@ -127,12 +124,12 @@ public:
/**
* Lock sound data for access
*/
- const uint16 *lock();
+ const int16 *lock();
/**
* Unlock sound data after a prior call to lock
*/
- void unlock(const uint16 *ptr);
+ void unlock(const int16 *ptr);
};
} // End of namespace Titanic
More information about the Scummvm-git-logs
mailing list