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

Add play_music call to audiofrontend

Browse Source
This commit is contained in:
Louis Pearson 2019-08-31 15:39:40 -06:00
parent 132d108086
commit 41cd20aaf8
3 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
voxygen/src/audio/channel.rs
View File

@ -29,7 +29,7 @@ impl Channel {
sink, sink,
audio_type: AudioType::Music, audio_type: AudioType::Music,
state: ChannelState::Playing, state: ChannelState::Playing,
fader: Fader::fade_in(0.25), fader: Fader::fade_in(0.0),
} }
} }

20
voxygen/src/audio/mod.rs
View File

@ -74,7 +74,25 @@ impl AudioFrontend {
if let Some(device) = &self.audio_device { if let Some(device) = &self.audio_device {
let sink = SpatialSink::new(device, [0.0, 0.0, 0.0], LEFT_EAR, RIGHT_EAR); let sink = SpatialSink::new(device, [0.0, 0.0, 0.0], LEFT_EAR, RIGHT_EAR);
let file = assets::load_file(&sound, &["wav", "ogg"]).unwrap(); let file = assets::load_file(&sound, &["wav"]).unwrap();
let sound = Decoder::new(file).unwrap();
sink.append(sound);
self.channels.push(Channel::sfx(id, sink));
}
id
}
pub fn play_music(&mut self, sound: String) -> usize {
let id = self.next_channel_id;
self.next_channel_id += 1;
if let Some(device) = &self.audio_device {
let sink = SpatialSink::new(device, [0.0, 0.0, 0.0], LEFT_EAR, RIGHT_EAR);
let file = assets::load_file(&sound, &["ogg"]).unwrap();
let sound = Decoder::new(file).unwrap(); let sound = Decoder::new(file).unwrap();
sink.append(sound); sink.append(sound);

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

@ -34,7 +34,7 @@ impl PlayState for MainMenuState {
// Used for client creation. // Used for client creation.
let mut client_init: Option<ClientInit> = None; let mut client_init: Option<ClientInit> = None;
let music = global_state.audio.play_sound("voxygen.audio.soundtrack.veloren_title_tune-3".to_string()); let music = global_state.audio.play_music("voxygen.audio.soundtrack.veloren_title_tune-3".to_string());
global_state.audio.stop_channel(music, Fader::fade_out(10.0)); global_state.audio.stop_channel(music, Fader::fade_out(10.0));
loop { loop {