[Scummvm-cvs-logs] CVS: scummvm/sword1 music.h,1.1,1.2 music.cpp,1.4,1.5
Max Horn
fingolfin at users.sourceforge.net
Thu Dec 18 17:09:18 CET 2003
Update of /cvsroot/scummvm/scummvm/sword1
In directory sc8-pr-cvs1:/tmp/cvs-serv25922/sword1
Modified Files:
music.h music.cpp
Log Message:
unregister the premix proc when you go away
Index: music.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/music.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- music.h 16 Dec 2003 02:09:25 -0000 1.1
+++ music.h 19 Dec 2003 01:08:30 -0000 1.2
@@ -32,11 +32,11 @@
#define WAVEHEADERSIZE 0x2C
class SoundMixer;
-//class File;
class SwordMusic {
public:
SwordMusic(OSystem *system, SoundMixer *pMixer);
+ ~SwordMusic();
void stream(void);
void startMusic(int32 tuneId, int32 loopFlag);
void fadeDown(void);
Index: music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/music.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- music.cpp 18 Dec 2003 13:17:33 -0000 1.4
+++ music.cpp 19 Dec 2003 01:08:30 -0000 1.5
@@ -40,6 +40,10 @@
assert(_mixer->getOutputRate() == 22050);
}
+SwordMusic::~SwordMusic() {
+ _mixer->setupPremix(0, 0);
+}
+
void SwordMusic::passMixerFunc(void *param, int16 *buf, uint len) {
((SwordMusic*)param)->mixer(buf, len);
}
More information about the Scummvm-git-logs
mailing list