Skip to content
Snippets Groups Projects
Commit 64f448e3 authored by Jeremy Soller's avatar Jeremy Soller
Browse files

Merge branch 'scummvm' into 'master'

scummvm: Disable audio by dropping audio streams

See merge request !191
parents 3cc4a305 5818775f
No related branches found
No related tags found
1 merge request!191scummvm: Disable audio by dropping audio streams
diff -rupNw source-original/audio/mixer.cpp source/audio/mixer.cpp
--- source-original/audio/mixer.cpp 2017-12-08 23:21:10.000000000 +0100
+++ source/audio/mixer.cpp 2018-12-06 02:03:37.151198853 +0100
@@ -237,7 +237,9 @@ void MixerImpl::playStream(
}
- assert(_mixerReady);
+ if (autofreeStream == DisposeAfterUse::YES)
+ delete stream;
+ return;
// Prevent duplicate sounds
if (id != -1) {
diff -rupNw source-original/common/stream.cpp source/common/stream.cpp
--- source-original/common/stream.cpp 2017-12-08 23:21:10.000000000 +0100
+++ source/common/stream.cpp 2018-11-28 00:36:53.474637267 +0100
+++ source/common/stream.cpp 2018-12-06 02:01:50.454108198 +0100
@@ -95,7 +95,7 @@ bool MemoryReadStream::seek(int32 offs,
break;
}
......@@ -12,7 +26,7 @@ diff -rupNw source-original/common/stream.cpp source/common/stream.cpp
_eos = false;
diff -rupNw source-original/configure source/configure
--- source-original/configure 2017-12-08 23:21:13.000000000 +0100
+++ source/configure 2018-11-28 00:35:33.000000000 +0100
+++ source/configure 2018-12-06 02:01:50.458108239 +0100
@@ -3610,7 +3610,7 @@ case $_host_os in
amigaos* | cygwin* | dreamcast | ds | gamecube | mingw* | n64 | ps2 | ps3 | psp2 | psp | wii | wince)
_posix=no
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment