diff options
| author | Max Horn | 2003-09-27 22:27:12 +0000 |
|---|---|---|
| committer | Max Horn | 2003-09-27 22:27:12 +0000 |
| commit | ca95c17e64255db3c52055a14bd8e26931f987eb (patch) | |
| tree | f5ac35eaa00e69785bd18a3f48df2ec1225f6298 /scumm/player_mod.h | |
| parent | f9e025d13c96c4556e9c415161be51ad5379854c (diff) | |
| download | scummvm-rg350-ca95c17e64255db3c52055a14bd8e26931f987eb.tar.gz scummvm-rg350-ca95c17e64255db3c52055a14bd8e26931f987eb.tar.bz2 scummvm-rg350-ca95c17e64255db3c52055a14bd8e26931f987eb.zip | |
merged in some more changes/improvements by _Q; cleanup
svn-id: r10444
Diffstat (limited to 'scumm/player_mod.h')
| -rw-r--r-- | scumm/player_mod.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scumm/player_mod.h b/scumm/player_mod.h index f49ccefcbf..ffb1aab5a7 100644 --- a/scumm/player_mod.h +++ b/scumm/player_mod.h @@ -36,7 +36,7 @@ public: virtual ~Player_MOD(); virtual void setMasterVolume(int vol); - virtual void startChannel(int id, char *data, int size, int rate, uint8 vol, int loopStart = 0, int loopEnd = 0, int8 pan = 0); + virtual void startChannel(int id, void *data, int size, int rate, uint8 vol, int loopStart = 0, int loopEnd = 0, int8 pan = 0); virtual void stopChannel(int id); virtual void setChannelVol(int id, uint8 vol); virtual void setChannelPan(int id, int8 pan); @@ -60,10 +60,11 @@ private: uint8 vol; int8 pan; uint16 freq; - byte *ptr; + void *ptr; RateConverter *converter; AudioInputStream *input; - } _channels[MOD_MAXCHANS]; + }; + soundChan _channels[MOD_MAXCHANS]; uint8 _maxvol; |