SOUND: Use DisposablePtr in LoopingAudioStream

xoreos · Oct 29, 2016 · 8b33165 · 8b33165
1 parent 146bd9a
commit 8b33165
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/sound/audiostream.cpp b/src/sound/audiostream.cpp
@@ -57,12 +57,10 @@
 namespace Sound {
 
 LoopingAudioStream::LoopingAudioStream(RewindableAudioStream *stream, size_t loops, bool disposeAfterUse)
-    : _parent(stream), _disposeAfterUse(disposeAfterUse), _loops(loops), _completeIterations(0) {
+    : _parent(stream, disposeAfterUse), _loops(loops), _completeIterations(0) {
 }
 
 LoopingAudioStream::~LoopingAudioStream() {
-	if (_disposeAfterUse)
-		delete _parent;
 }
 
 size_t LoopingAudioStream::readBuffer(int16 *buffer, const size_t numSamples) {

diff --git a/src/sound/audiostream.h b/src/sound/audiostream.h
@@ -54,6 +54,7 @@
 
 #include "src/common/util.h"
 #include "src/common/types.h"
+#include "src/common/disposableptr.h"
 
 namespace Sound {
 
@@ -183,8 +184,7 @@ class LoopingAudioStream : public AudioStream {
 	uint64 getDurationOnce() const;
 
 private:
-	RewindableAudioStream *_parent;
-	bool _disposeAfterUse;
+	Common::DisposablePtr<RewindableAudioStream> _parent;
 
 	size_t _loops;
 	size_t _completeIterations;