Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Apply master effect volume during mixing instead of sound start. #8945

Merged
merged 1 commit into from Apr 5, 2021

Conversation

PeterN
Copy link
Member

@PeterN PeterN commented Apr 4, 2021

This makes the volume control work as most players would expect, affecting
existing playing sounds as well as new sounds.

Motivation / Problem

Changing master effect volume does not have any effect on sounds that are currently playing. It's always been this way but is pretty odd and makes setting desired volume a little harder than it needs to be.

Description

This is solved by applying the current master effect volume during the mixing process, instead of at the start of playing a sound.

Limitations

There's a slight difference of using /255 vs /256. Not sure what difference this has in practical terms.

Checklist for review

Some things are not automated, and forgotten often. This list is a reminder for the reviewers.

  • The bug fix is important enough to be backported? (label: 'backport requested')
  • This PR affects the save game format? (label 'savegame upgrade')
  • This PR affects the GS/AI API? (label 'needs review: Script API')
    • ai_changelog.hpp, gs_changelog.hpp need updating.
    • The compatibility wrappers (compat_*.nut) need updating.
  • This PR affects the NewGRF API? (label 'needs review: NewGRF')

This makes the volume control work as most players would expect, affecting
existing playing sounds as well as new sounds.
@michicc
Copy link
Member

michicc commented Apr 4, 2021

Will this affect music if played through the internal mixer (like e.g. fluidsynth)?

@PeterN
Copy link
Member Author

PeterN commented Apr 4, 2021

No, the change applies to the volume levels of the standard mixer channels, rather than the final mixer output.

@michicc michicc merged commit 130a052 into OpenTTD:master Apr 5, 2021
@PeterN PeterN deleted the master-volume-post-mix branch April 5, 2021 10:47
@nielsmh nielsmh added the backport requested This PR should be backport to current release (RC / stable) label Apr 5, 2021
LordAro pushed a commit to LordAro/OpenTTD that referenced this pull request Apr 17, 2021
…OpenTTD#8945)

This makes the volume control work as most players would expect, affecting
existing playing sounds as well as new sounds.
LordAro pushed a commit that referenced this pull request Apr 18, 2021
…#8945)

This makes the volume control work as most players would expect, affecting
existing playing sounds as well as new sounds.
@LordAro LordAro added backported This PR is backported to a current release (RC / stable) and removed backport requested This PR should be backport to current release (RC / stable) labels Apr 18, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backported This PR is backported to a current release (RC / stable)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants