From 8ff15ae72cb4adb6b5ffc549eb7a00422308f014 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Sat, 27 Nov 2004 16:12:11 +0000 Subject: Use modern form of setupPremix svn-id: r15915 --- scumm/player_mod.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'scumm/player_mod.cpp') 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; -- cgit v1.2.3