aboutsummaryrefslogtreecommitdiff
path: root/sky/music/adlibmusic.cpp
diff options
context:
space:
mode:
authorMax Horn2004-11-27 16:18:25 +0000
committerMax Horn2004-11-27 16:18:25 +0000
commitfbaac2e27336fb17c6ef952d41e1a408d25e7bbb (patch)
tree6cd04a3e511910bf9dced7596fc9d293227f3944 /sky/music/adlibmusic.cpp
parent8ff15ae72cb4adb6b5ffc549eb7a00422308f014 (diff)
downloadscummvm-rg350-fbaac2e27336fb17c6ef952d41e1a408d25e7bbb.tar.gz
scummvm-rg350-fbaac2e27336fb17c6ef952d41e1a408d25e7bbb.tar.bz2
scummvm-rg350-fbaac2e27336fb17c6ef952d41e1a408d25e7bbb.zip
Use modern form of setupPremix
svn-id: r15916
Diffstat (limited to 'sky/music/adlibmusic.cpp')
-rw-r--r--sky/music/adlibmusic.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/sky/music/adlibmusic.cpp b/sky/music/adlibmusic.cpp
index 9e9a4860f9..9fe05fec97 100644
--- a/sky/music/adlibmusic.cpp
+++ b/sky/music/adlibmusic.cpp
@@ -26,11 +26,6 @@
namespace Sky {
-void AdlibMusic::passMixerFunc(void *param, int16 *buf, uint len) {
-
- ((AdlibMusic*)param)->premixerCall(buf, len);
-}
-
AdlibMusic::AdlibMusic(SoundMixer *pMixer, Disk *pDisk, OSystem *system)
: MusicBase(pDisk, system) {
@@ -40,7 +35,7 @@ AdlibMusic::AdlibMusic(SoundMixer *pMixer, Disk *pDisk, OSystem *system)
_opl = makeAdlibOPL(_sampleRate);
- _mixer->setupPremix(passMixerFunc, this);
+ _mixer->setupPremix(this);
}
AdlibMusic::~AdlibMusic(void) {