Skip to content

Volume slider for voices is now "live" #15310

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.

Sign up for GitHub

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

Open
SomeTroglodyte wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −2
Open

Volume slider for voices is now "live" #15310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions core/src/com/unciv/ui/audio/MusicController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -691,5 +691,8 @@ class MusicController {
overlay = null
}

fun setOverlayVolume(volume: Float) {
overlay?.setVolume(volume)
}
//endregion
}
3 changes: 2 additions & 1 deletion core/src/com/unciv/ui/components/extensions/MusicControls.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,10 @@ interface MusicControls {
settings.citySoundsVolume = it
}

fun Table.addVoicesVolumeSlider(settings: GameSettings) =
fun Table.addVoicesVolumeSlider(settings: GameSettings, music: MusicController) =
addVolumeSlider("Leader voices volume", settings.voicesVolume) {
settings.voicesVolume = it
music.setOverlayVolume(it)
}

fun Table.addMusicVolumeSlider(settings: GameSettings, music: MusicController) =
Expand Down
2 changes: 1 addition & 1 deletion core/src/com/unciv/ui/popups/options/SoundTab.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ internal class SoundTab(
addCitySoundsVolumeSlider(settings)

if (music.isVoicesAvailable())
addVoicesVolumeSlider(settings)
addVoicesVolumeSlider(settings, music)

if (music.isMusicAvailable())
addMusicControls(settings, music)
Expand Down
Loading