diff options
author | Max Horn | 2004-10-11 22:27:26 +0000 |
---|---|---|
committer | Max Horn | 2004-10-11 22:27:26 +0000 |
commit | 42863d5cc24a89e955b91804cdfbafeeb8dd404b (patch) | |
tree | fa2df482a134ebc6d648be261034a2329143850a /scumm/player_v2.cpp | |
parent | bdf66b1a072b93bfb128f7a6368b500b81d0036f (diff) | |
download | scummvm-rg350-42863d5cc24a89e955b91804cdfbafeeb8dd404b.tar.gz scummvm-rg350-42863d5cc24a89e955b91804cdfbafeeb8dd404b.tar.bz2 scummvm-rg350-42863d5cc24a89e955b91804cdfbafeeb8dd404b.zip |
cleanup / updated some comments
svn-id: r15524
Diffstat (limited to 'scumm/player_v2.cpp')
-rw-r--r-- | scumm/player_v2.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scumm/player_v2.cpp b/scumm/player_v2.cpp index f9940086e2..bf6bde1f4c 100644 --- a/scumm/player_v2.cpp +++ b/scumm/player_v2.cpp @@ -382,7 +382,7 @@ Player_V2::Player_V2(ScummEngine *scumm, bool pcjr) { Player_V2::~Player_V2() { mutex_up(); // Detach the premix callback handler - _mixer->setupPremix(0, 0); + _mixer->setupPremix(0); mutex_down(); _system->deleteMutex (_mutex); } @@ -537,10 +537,6 @@ int Player_V2::getSoundStatus(int nr) const { } -void Player_V2::premix_proc(void *param, int16 *buf, uint len) { - ((Player_V2 *) param)->do_mix(buf, len); -} - void Player_V2::clear_channel(int i) { ChannelInfo *channel = &_channels[i]; memset(channel, 0, sizeof(ChannelInfo)); @@ -796,6 +792,10 @@ 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; |