[Scummvm-cvs-logs] CVS: scummvm/sword1 animation.cpp,1.36,1.37 credits.cpp,1.10,1.11 sound.cpp,1.43,1.44 sound.h,1.17,1.18
Max Horn
fingolfin at users.sourceforge.net
Sat Mar 12 10:57:13 CET 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sound audiocd.cpp,1.16,1.17 audiocd.h,1.8,1.9 flac.cpp,1.6,1.7 mixer.cpp,1.184,1.185 mixer.h,1.97,1.98 mp3.cpp,1.17,1.18 vorbis.cpp,1.21,1.22
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sky intro.cpp,1.55,1.56 intro.h,1.7,1.8 sound.cpp,1.49,1.50 sound.h,1.26,1.27
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/sword1
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9326/sword1
Modified Files:
animation.cpp credits.cpp sound.cpp sound.h
Log Message:
PlayingSoundHandle -> SoundHandle; also, turned the handle activity check into a mixer method
Index: animation.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/animation.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- animation.cpp 11 Mar 2005 15:30:26 -0000 1.36
+++ animation.cpp 12 Mar 2005 18:56:07 -0000 1.37
@@ -70,7 +70,7 @@
}
bool AnimationState::soundFinished(void) {
- return !_bgSound.isActive();
+ return !_snd->isSoundHandleActive(_bgSound);
}
AudioStream *AnimationState::createAudioStream(const char *name, void *arg) {
Index: credits.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/credits.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- credits.cpp 9 Mar 2005 18:12:49 -0000 1.10
+++ credits.cpp 12 Mar 2005 18:56:07 -0000 1.11
@@ -112,7 +112,7 @@
_system->updateScreen();
// everything's initialized, time to render and show the credits.
- PlayingSoundHandle bgSound;
+ SoundHandle bgSound;
_mixer->playInputStream(SoundMixer::kMusicSoundType, &bgSound, bgSoundStream, 0);
int relDelay = 0;
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/sound.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- sound.cpp 9 Mar 2005 18:12:50 -0000 1.43
+++ sound.cpp 12 Mar 2005 18:56:07 -0000 1.44
@@ -100,7 +100,7 @@
if (_fxQueue[cnt2].delay == 0)
playSample(&_fxQueue[cnt2]);
} else {
- if (!_fxQueue[cnt2].handle.isActive()) { // sound finished
+ if (!_mixer->isSoundHandleActive(_fxQueue[cnt2].handle)) { // sound finished
_resMan->resClose(_fxList[_fxQueue[cnt2].id].sampleId);
if (cnt2 != _endOfQueue-1)
_fxQueue[cnt2] = _fxQueue[_endOfQueue - 1];
@@ -130,7 +130,7 @@
}
bool Sound::speechFinished(void) {
- return !_speechHandle.isActive();
+ return !_mixer->isSoundHandleActive(_speechHandle);
}
void Sound::newScreen(uint32 screen) {
Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/sound.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- sound.h 1 Jan 2005 16:09:25 -0000 1.17
+++ sound.h 12 Mar 2005 18:56:07 -0000 1.18
@@ -42,7 +42,7 @@
struct QueueElement {
uint32 id, delay;
- PlayingSoundHandle handle;
+ SoundHandle handle;
};
struct RoomVol {
@@ -101,7 +101,7 @@
uint32 _cowHeaderSize;
uint8 _currentCowFile;
CowMode _cowMode;
- PlayingSoundHandle _speechHandle, _fxHandle;
+ SoundHandle _speechHandle, _fxHandle;
Common::RandomSource _rnd;
QueueElement _fxQueue[MAX_FXQ_LENGTH];
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sound audiocd.cpp,1.16,1.17 audiocd.h,1.8,1.9 flac.cpp,1.6,1.7 mixer.cpp,1.184,1.185 mixer.h,1.97,1.98 mp3.cpp,1.17,1.18 vorbis.cpp,1.21,1.22
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sky intro.cpp,1.55,1.56 intro.h,1.7,1.8 sound.cpp,1.49,1.50 sound.h,1.26,1.27
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list