aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/sfx/mixer
diff options
context:
space:
mode:
authorFilippos Karapetis2009-02-17 13:51:52 +0000
committerFilippos Karapetis2009-02-17 13:51:52 +0000
commitd39d83e525d4a62e5b73727c65c7864d0adf2865 (patch)
tree20f77c124ac2429d22ab9ed3b3005dad9b185ef0 /engines/sci/sfx/mixer
parentb8d2c41cdd5b6a1af38aec3f0f0ccda4c2c304f0 (diff)
downloadscummvm-rg350-d39d83e525d4a62e5b73727c65c7864d0adf2865.tar.gz
scummvm-rg350-d39d83e525d4a62e5b73727c65c7864d0adf2865.tar.bz2
scummvm-rg350-d39d83e525d4a62e5b73727c65c7864d0adf2865.zip
Replaced sci_free() with free() - it's OK to free a NULL pointer, so the checking that sci_free() performed is not necessary
svn-id: r38406
Diffstat (limited to 'engines/sci/sfx/mixer')
-rw-r--r--engines/sci/sfx/mixer/soft.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/sci/sfx/mixer/soft.cpp b/engines/sci/sfx/mixer/soft.cpp
index 20a4bdc7ad..c736aa3c00 100644
--- a/engines/sci/sfx/mixer/soft.cpp
+++ b/engines/sci/sfx/mixer/soft.cpp
@@ -216,7 +216,7 @@ _mix_unsubscribe(sfx_pcm_mixer_t *self, sfx_pcm_feed_t *feed) {
feed->destroy(feed);
if (fs->buf)
- sci_free(fs->buf);
+ free(fs->buf);
self->feeds_nr--;
@@ -255,16 +255,16 @@ mix_exit(sfx_pcm_mixer_t *self) {
_mix_unsubscribe(self, self->feeds[0].feed);
if (P->outbuf)
- sci_free(P->outbuf);
+ free(P->outbuf);
if (P->writebuf)
- sci_free(P->writebuf);
+ free(P->writebuf);
if (P->compbuf_l)
- sci_free(P->compbuf_l);
+ free(P->compbuf_l);
if (P->compbuf_l)
- sci_free(P->compbuf_r);
+ free(P->compbuf_r);
- sci_free(P);
+ free(P);
self->private_bits /* = P */ = NULL;
RELEASE_LOCK();