Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
cookbook
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
redox-os
cookbook
Commits
5818775f
Commit
5818775f
authored
6 years ago
by
Nagy Tibor
Browse files
Options
Downloads
Patches
Plain Diff
scummvm: Disable audio by dropping audio streams
parent
3cc4a305
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!191
scummvm: Disable audio by dropping audio streams
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
recipes/scummvm/01_redox.patch
+16
-2
16 additions, 2 deletions
recipes/scummvm/01_redox.patch
with
16 additions
and
2 deletions
recipes/scummvm/01_redox.patch
+
16
−
2
View file @
5818775f
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
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-original/common/stream.cpp 2017-12-08 23:21:10.000000000 +0100
+++ source/common/stream.cpp 2018-1
1-28 00:36
:5
3
.4
74637267
+0100
+++ source/common/stream.cpp 2018-1
2-06 02:01
:5
0
.4
54108198
+0100
@@ -95,7 +95,7 @@
bool MemoryReadStream::seek(int32 offs,
@@ -95,7 +95,7 @@
bool MemoryReadStream::seek(int32 offs,
break;
break;
}
}
...
@@ -12,7 +26,7 @@ diff -rupNw source-original/common/stream.cpp source/common/stream.cpp
...
@@ -12,7 +26,7 @@ diff -rupNw source-original/common/stream.cpp source/common/stream.cpp
_eos = false;
_eos = false;
diff -rupNw source-original/configure source/configure
diff -rupNw source-original/configure source/configure
--- source-original/configure 2017-12-08 23:21:13.000000000 +0100
--- source-original/configure 2017-12-08 23:21:13.000000000 +0100
+++ source/configure 2018-1
1-28 00:35:33.000000000
+0100
+++ source/configure 2018-1
2-06 02:01:50.458108239
+0100
@@ -3610,7 +3610,7 @@
case $_host_os in
@@ -3610,7 +3610,7 @@
case $_host_os in
amigaos* | cygwin* | dreamcast | ds | gamecube | mingw* | n64 | ps2 | ps3 | psp2 | psp | wii | wince)
amigaos* | cygwin* | dreamcast | ds | gamecube | mingw* | n64 | ps2 | ps3 | psp2 | psp | wii | wince)
_posix=no
_posix=no
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment