From: Bernie Innocenti <bernie@codewiz.org>
Date: Wed, 21 Jun 2017 22:20:32 +0000 (-0400)
Subject: Simplify SoundPlayer's hit_event().
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=1799dcb92370aa15fa37f08623c138b3578f172d;p=mandelwow.git

Simplify SoundPlayer's hit_event().
---

diff --git a/sound.rs b/sound.rs
index 859decf..ca313b8 100644
--- a/sound.rs
+++ b/sound.rs
@@ -64,9 +64,7 @@ pub fn start() -> SoundPlayer {
 
 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);