[Scummvm-cvs-logs] CVS: residual sound.cpp,1.12,1.13 sound.h,1.9,1.10
Pawel Kolodziejski
aquadran at users.sourceforge.net
Fri Dec 10 17:56:02 CET 2004
Update of /cvsroot/scummvm/residual
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12800
Modified Files:
sound.cpp sound.h
Log Message:
not used anymore
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/sound.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- sound.cpp 10 Dec 2004 21:13:01 -0000 1.12
+++ sound.cpp 10 Dec 2004 21:16:31 -0000 1.13
@@ -257,11 +257,6 @@
return _instance;
}
-void mixerCallback(void *userdata, int16 *stream, uint len) {
- Mixer *m = static_cast<Mixer *>(userdata);
- m->getAudio(stream, len * 2);
-}
-
extern SoundMixer *g_mixer;
Mixer::Mixer() :
Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/residual/sound.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- sound.h 10 Dec 2004 21:13:02 -0000 1.9
+++ sound.h 10 Dec 2004 21:16:31 -0000 1.10
@@ -78,8 +78,6 @@
typedef std::list<ResPtr<Sound> > SoundList;
SoundList _voiceSounds, _sfxSounds;
ResPtr<Sound> _musicSound, _seqSound;
-
- friend void mixerCallback(void *userdata, uint8 *stream, int len);
};
#endif
More information about the Scummvm-git-logs
mailing list