aboutsummaryrefslogtreecommitdiff
path: root/scumm/player_v2.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'scumm/player_v2.cpp')
-rw-r--r--scumm/player_v2.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/scumm/player_v2.cpp b/scumm/player_v2.cpp
index ea4032f41a..c1b2a6b428 100644
--- a/scumm/player_v2.cpp
+++ b/scumm/player_v2.cpp
@@ -376,7 +376,7 @@ Player_V2::Player_V2(ScummEngine *scumm, bool pcjr) {
set_pcjr(pcjr);
setMasterVolume(255);
- _mixer->setupPremix(premix_proc, this);
+ _mixer->setupPremix(this);
}
Player_V2::~Player_V2() {
@@ -792,10 +792,6 @@ void Player_V2::next_freqs(ChannelInfo *channel) {
}
}
-void Player_V2::premix_proc(void *param, int16 *buf, uint len) {
- ((Player_V2 *) param)->do_mix(buf, len);
-}
-
void Player_V2::do_mix(int16 *data, uint len) {
mutex_up();
uint step;