projects
/
mandelwow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move text rendering shaders out of line.
[mandelwow.git]
/
sound.rs
diff --git
a/sound.rs
b/sound.rs
index 859decf8bd42cf3fff97b6a36a32dc31b6e9ce02..9f116ad05f531cdaef992ee07b0d760020b670e0 100644
(file)
--- a/
sound.rs
+++ b/
sound.rs
@@
-33,7
+33,7
@@
fn play_xm(raw_xm: &[u8]) -> SoundPlayer {
samples: Some(4096), // 85ms
};
let device = sdl_audio.open_playback(None, &desired_spec, |actual_spec| {
samples: Some(4096), // 85ms
};
let device = sdl_audio.open_playback(None, &desired_spec, |actual_spec| {
- let xm = XMContext::new(
&
raw_xm, actual_spec.freq as u32).unwrap();
+ let xm = XMContext::new(raw_xm, actual_spec.freq as u32).unwrap();
XmCallback {
xm: xm,
XmCallback {
xm: xm,
@@
-59,16
+59,14
@@
pub fn start() -> SoundPlayer {
println!("Couldn't open module {}: {:?}", filename, err);
},
}
println!("Couldn't open module {}: {:?}", filename, err);
},
}
- return SoundPlayer { device: None };
+ SoundPlayer { device: None }
}
pub fn hit_event(player: &mut SoundPlayer) -> f32 {
use std::ops::Deref;
}
pub fn hit_event(player: &mut SoundPlayer) -> f32 {
use std::ops::Deref;
- let maybe_audio_device = &mut player.device;
- let audio_device = &mut maybe_audio_device.as_mut().unwrap();
- let audio_device_lock = audio_device.lock();
+ let audio_device_lock = player.device.as_mut().unwrap().lock();
let xm_callback = audio_device_lock.deref();
let xm = &xm_callback.xm;
let n_samples = xm.latest_trigger_of_instrument(0x1D);
let xm_callback = audio_device_lock.deref();
let xm = &xm_callback.xm;
let n_samples = xm.latest_trigger_of_instrument(0x1D);
- return n_samples as f32 / SAMPLE_RATE as f32;
+ n_samples as f32 / SAMPLE_RATE as f32
}
}