diff options
| author | Max Horn | 2004-11-27 16:12:11 +0000 |
|---|---|---|
| committer | Max Horn | 2004-11-27 16:12:11 +0000 |
| commit | 8ff15ae72cb4adb6b5ffc549eb7a00422308f014 (patch) | |
| tree | f57566eeb03371e3e95c509d7d835371392a450f /scumm/player_mod.cpp | |
| parent | ba74a8e7f657cf795046a5cf6a7ead701fd4194e (diff) | |
| download | scummvm-rg350-8ff15ae72cb4adb6b5ffc549eb7a00422308f014.tar.gz scummvm-rg350-8ff15ae72cb4adb6b5ffc549eb7a00422308f014.tar.bz2 scummvm-rg350-8ff15ae72cb4adb6b5ffc549eb7a00422308f014.zip | |
Use modern form of setupPremix
svn-id: r15915
Diffstat (limited to 'scumm/player_mod.cpp')
| -rw-r--r-- | scumm/player_mod.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/scumm/player_mod.cpp b/scumm/player_mod.cpp index 3102df1cd1..61f4d700d2 100644 --- a/scumm/player_mod.cpp +++ b/scumm/player_mod.cpp @@ -22,7 +22,6 @@ #include "stdafx.h" #include "scumm/player_mod.h" -#include "sound/audiostream.h" #include "sound/mixer.h" #include "sound/rate.h" @@ -46,7 +45,7 @@ Player_MOD::Player_MOD(ScummEngine *scumm) { _playproc = NULL; _playparam = NULL; - _mixer->setupPremix(premix_proc, this); + _mixer->setupPremix(this); } Player_MOD::~Player_MOD() { @@ -146,10 +145,6 @@ void Player_MOD::setChannelFreq(int id, int freq) { } } -void Player_MOD::premix_proc(void *param, int16 *buf, uint len) { - ((Player_MOD *) param)->do_mix(buf, len); -} - void Player_MOD::do_mix(int16 *data, uint len) { int i; int dpos = 0; |