aboutsummaryrefslogtreecommitdiff
path: root/sound/wave.cpp
diff options
context:
space:
mode:
authorMax Horn2010-01-19 00:56:29 +0000
committerMax Horn2010-01-19 00:56:29 +0000
commit557bb394de6619dd1f360b72333fd2ec7b3defab (patch)
treeb1166a12105d01c92edb528177d24aa5115232e5 /sound/wave.cpp
parent69be7476212916b166ac16db41253cd367fb0dcc (diff)
downloadscummvm-rg350-557bb394de6619dd1f360b72333fd2ec7b3defab.tar.gz
scummvm-rg350-557bb394de6619dd1f360b72333fd2ec7b3defab.tar.bz2
scummvm-rg350-557bb394de6619dd1f360b72333fd2ec7b3defab.zip
Get rid of Mixer::FLAG_AUTOFREE.
Also fix several recently introduced new/delete vs. malloc/free mismatches. svn-id: r47369
Diffstat (limited to 'sound/wave.cpp')
-rw-r--r--sound/wave.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/wave.cpp b/sound/wave.cpp
index d299128762..977b6953e6 100644
--- a/sound/wave.cpp
+++ b/sound/wave.cpp
@@ -188,10 +188,8 @@ RewindableAudioStream *makeWAVStream(Common::SeekableReadStream *stream, Dispose
if (disposeAfterUse == DisposeAfterUse::YES)
delete stream;
- // Since we allocated our own buffer for the data, we must set the autofree flag.
- flags |= Audio::Mixer::FLAG_AUTOFREE;
-
- return makeRawMemoryStream(data, size, rate, flags);
+ // Since we allocated our own buffer for the data, we must specify DisposeAfterUse::YES.
+ return makeRawMemoryStream(data, size, DisposeAfterUse::YES, rate, flags);
}
} // End of namespace Audio