[Scummvm-cvs-logs] scummvm master -> c2efa8d9c48aef0d183c72ee2aad87245d08f715
sev-
sev at scummvm.org
Wed Jun 1 06:49:56 CEST 2016
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
47b2a3a237 ACCESS: Reduce audio header dependencies
c2efa8d9c4 Merge pull request #768 from salty-horse/access_audio
Commit: 47b2a3a2373642cc343ac8defe4b86bff2507aab
https://github.com/scummvm/scummvm/commit/47b2a3a2373642cc343ac8defe4b86bff2507aab
Author: Ori Avtalion (ori at avtalion.name)
Date: 2016-05-29T20:11:34+03:00
Commit Message:
ACCESS: Reduce audio header dependencies
Changed paths:
engines/access/sound.cpp
engines/access/sound.h
diff --git a/engines/access/sound.cpp b/engines/access/sound.cpp
index 448f630..cf52bc5 100644
--- a/engines/access/sound.cpp
+++ b/engines/access/sound.cpp
@@ -35,10 +35,12 @@
namespace Access {
SoundManager::SoundManager(AccessEngine *vm, Audio::Mixer *mixer) : _vm(vm), _mixer(mixer) {
+ _effectsHandle = new Audio::SoundHandle();
}
SoundManager::~SoundManager() {
clearSounds();
+ delete _effectsHandle;
}
void SoundManager::clearSounds() {
@@ -49,8 +51,8 @@ void SoundManager::clearSounds() {
_soundTable.clear();
- if (_mixer->isSoundHandleActive(_effectsHandle))
- _mixer->stopHandle(_effectsHandle);
+ if (_mixer->isSoundHandleActive(*_effectsHandle))
+ _mixer->stopHandle(*_effectsHandle);
while (_queue.size()) {
delete _queue[0]._stream;
@@ -159,8 +161,8 @@ void SoundManager::playSound(Resource *res, int priority, bool loop, int soundIn
_queue.push_back(QueuedSound(audioStream, soundIndex));
}
- if (!_mixer->isSoundHandleActive(_effectsHandle))
- _mixer->playStream(Audio::Mixer::kSFXSoundType, &_effectsHandle,
+ if (!_mixer->isSoundHandleActive(*_effectsHandle))
+ _mixer->playStream(Audio::Mixer::kSFXSoundType, _effectsHandle,
_queue[0]._stream, -1, _mixer->kMaxChannelVolume, 0,
DisposeAfterUse::NO);
}
@@ -168,20 +170,20 @@ void SoundManager::playSound(Resource *res, int priority, bool loop, int soundIn
void SoundManager::checkSoundQueue() {
debugC(5, kDebugSound, "checkSoundQueue");
- if (_queue.empty() || _mixer->isSoundHandleActive(_effectsHandle))
+ if (_queue.empty() || _mixer->isSoundHandleActive(*_effectsHandle))
return;
delete _queue[0]._stream;
_queue.remove_at(0);
if (_queue.size() && _queue[0]._stream)
- _mixer->playStream(Audio::Mixer::kSFXSoundType, &_effectsHandle,
+ _mixer->playStream(Audio::Mixer::kSFXSoundType, _effectsHandle,
_queue[0]._stream, -1, _mixer->kMaxChannelVolume, 0,
DisposeAfterUse::NO);
}
bool SoundManager::isSFXPlaying() {
- return _mixer->isSoundHandleActive(_effectsHandle);
+ return _mixer->isSoundHandleActive(*_effectsHandle);
}
void SoundManager::loadSounds(Common::Array<RoomInfo::SoundIdent> &sounds) {
@@ -198,7 +200,7 @@ void SoundManager::loadSounds(Common::Array<RoomInfo::SoundIdent> &sounds) {
void SoundManager::stopSound() {
debugC(3, kDebugSound, "stopSound");
- _mixer->stopHandle(_effectsHandle);
+ _mixer->stopHandle(*_effectsHandle);
}
void SoundManager::freeSounds() {
diff --git a/engines/access/sound.h b/engines/access/sound.h
index d82ee95..d75540d 100644
--- a/engines/access/sound.h
+++ b/engines/access/sound.h
@@ -24,7 +24,6 @@
#define ACCESS_SOUND_H
#include "common/scummsys.h"
-#include "audio/mixer.h"
#include "access/files.h"
#include "audio/midiplayer.h"
@@ -32,6 +31,7 @@
namespace Audio {
class AudioStream;
+class SoundHandle;
}
namespace Access {
@@ -57,7 +57,7 @@ class SoundManager {
private:
AccessEngine *_vm;
Audio::Mixer *_mixer;
- Audio::SoundHandle _effectsHandle;
+ Audio::SoundHandle *_effectsHandle;
Common::Array<QueuedSound> _queue;
void clearSounds();
Commit: c2efa8d9c48aef0d183c72ee2aad87245d08f715
https://github.com/scummvm/scummvm/commit/c2efa8d9c48aef0d183c72ee2aad87245d08f715
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-06-01T06:49:53+02:00
Commit Message:
Merge pull request #768 from salty-horse/access_audio
ACCESS: Reduce audio header dependencies
Changed paths:
engines/access/sound.cpp
engines/access/sound.h
More information about the Scummvm-git-logs
mailing list