From ca95c17e64255db3c52055a14bd8e26931f987eb Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sat, 27 Sep 2003 22:27:12 +0000
Subject: merged in some more changes/improvements by _Q; cleanup

svn-id: r10444
---
 scumm/player_mod.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'scumm/player_mod.cpp')

diff --git a/scumm/player_mod.cpp b/scumm/player_mod.cpp
index e3ce42a3df..c541ab19d1 100644
--- a/scumm/player_mod.cpp
+++ b/scumm/player_mod.cpp
@@ -56,7 +56,7 @@ Player_MOD::~Player_MOD() {
 	for (int i = 0; i < MOD_MAXCHANS; i++) {
 		if (!_channels[i].id)
 			continue;
-		delete _channels[i].ptr;
+		free(_channels[i].ptr);
 		delete _channels[i].converter;
 		delete _channels[i].input;
 	}
@@ -77,7 +77,7 @@ void Player_MOD::clearUpdateProc() {
 	_mixamt = 0;
 }
 
-void Player_MOD::startChannel (int id, char *data, int size, int rate, uint8 vol, int loopStart, int loopEnd, int8 pan) {
+void Player_MOD::startChannel (int id, void *data, int size, int rate, uint8 vol, int loopStart, int loopEnd, int8 pan) {
 	int i;
 	if (id == 0)
 		error("player_mod - attempted to start channel id 0");
@@ -93,7 +93,7 @@ void Player_MOD::startChannel (int id, char *data, int size, int rate, uint8 vol
 	_channels[i].id = id;
 	_channels[i].vol = vol;
 	_channels[i].pan = pan;
-	_channels[i].ptr = (byte*) data;
+	_channels[i].ptr = data;
 	_channels[i].freq = rate;
 	_channels[i].input = makeLinearInputStream(SoundMixer::FLAG_AUTOFREE | (loopStart != loopEnd ? SoundMixer::FLAG_LOOP : 0), (const byte*)data, size, loopStart, loopEnd - loopStart);
 	_channels[i].converter = makeRateConverter(rate, _mixer->getOutputRate(), false, false);
-- 
cgit v1.2.3