Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Split the audio channels into SFX and music channels. This makes the

Browse Source 
Music Channel for exploration music a basic Sink without spatial audio
functionality, which is not required.
This commit is contained in:
S Handley
2020-02-15 21:30:44 +00:00
committed by Imbris
parent 56c4b50a27
commit b739623579
11 changed files with 326 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
voxygen/src/menu/main/mod.rs
View File

@ -18,7 +18,6 @@ use ui::{Event as MainMenuEvent, MainMenuUi};
pub struct MainMenuState {
main_menu_ui: MainMenuUi,
title_music_channel: Option<usize>,
singleplayer: Option<Singleplayer>,
}
@ -27,7 +26,6 @@ impl MainMenuState {
pub fn new(global_state: &mut GlobalState) -> Self {
Self {
main_menu_ui: MainMenuUi::new(global_state),
title_music_channel: None,
singleplayer: None,
}
}
@ -44,11 +42,8 @@ impl PlayState for MainMenuState {
let mut client_init: Option<ClientInit> = None;
// Kick off title music
if self.title_music_channel.is_none()
&& global_state.settings.audio.audio_on
&& global_state.audio.music_enabled()
{
self.title_music_channel = global_state.audio.play_title_music();
if global_state.settings.audio.audio_on && global_state.audio.music_enabled() {
global_state.audio.play_title_music();
}
// Reset singleplayer server if it was running already