X-Git-Url: https://codewiz.org/gitweb?p=mandelwow.git;a=blobdiff_plain;f=mandelwow.rs;h=e2de8b3490cdc1e701571558f6c2479e757cbe42;hp=f760a26266cf597c6db612d391f5a2a274f8ecf5;hb=c4c487ccc4c10d09ca00c725354f09e32b4805ec;hpb=2ced043569d420f7d14b068fe7da0408c6a46fd8

diff --git a/mandelwow.rs b/mandelwow.rs
index f760a26..e2de8b3 100644
--- a/mandelwow.rs
+++ b/mandelwow.rs
@@ -5,6 +5,7 @@
 extern crate glium;
 extern crate glutin;
 extern crate libxm;
+extern crate sdl2;
 
 use glium::{DisplayBuild, Surface};
 use glium::index::{IndexBuffer, PrimitiveType};
@@ -12,10 +13,10 @@ use glutin::ElementState::Pressed;
 use glutin::Event::KeyboardInput;
 use glutin::VirtualKeyCode;
 use libxm::XMContext;
+use sdl2::audio::{AudioCallback, AudioDevice, AudioSpecDesired};
 use std::fs::File;
 use std::io::Read;
 
-
 mod support;
 
 #[derive(Copy, Clone)]
@@ -159,10 +160,10 @@ fn bounding_box<U>(display: &glium::Display,
         depth: glium::Depth {
             test: glium::draw_parameters::DepthTest::IfLess,
             write: true,
-            .. Default::default()
+            ..Default::default()
         },
         blend: glium::Blend::alpha_blending(),
-        .. Default::default()
+        ..Default::default()
     };
 
     let front_indices = IndexBuffer::new(display, PrimitiveType::LineLoop,
@@ -237,10 +238,10 @@ fn mandel<U>(display: &glium::Display,
         depth: glium::Depth {
             test: glium::draw_parameters::DepthTest::IfLess,
             write: true,
-            .. Default::default()
+            ..Default::default()
         },
         blend: glium::Blend::alpha_blending(),
-        .. Default::default()
+        ..Default::default()
     };
 
     frame.draw(&vb, &indices, program, uniforms, &params).unwrap();
@@ -273,15 +274,52 @@ fn mandelwow(display: &glium::Display,
         mandel(&display, &mut frame, &program, &uniforms, bounds, z0);
     }
 }
-fn play_xm(raw_xm: &[u8]) {
-    let freq = 48000u32;
-    let mut xm = XMContext::new(&raw_xm, freq).unwrap();
+
+struct XmCallback {
+    xm: XMContext,
+}
+
+impl AudioCallback for XmCallback {
+    type Channel = f32;
+
+    fn callback(&mut self, out: &mut [f32]) {
+        self.xm.generate_samples(out);
+    }
+}
+
+struct SoundPlayer {
+    _device: AudioDevice<XmCallback>,
+}
+
+fn play_xm(raw_xm: &[u8]) -> SoundPlayer {
+    let sdl_context = sdl2::init().unwrap();
+    let sdl_audio = sdl_context.audio().unwrap();
+
+    let sample_rate = 48000u32;
+    let desired_spec = AudioSpecDesired {
+        freq: Some(sample_rate as i32),
+        channels: Some(2u8),
+        samples: None,
+    };
+    let device = sdl_audio.open_playback(None, &desired_spec, |actual_spec| {
+        let xm = XMContext::new(&raw_xm, actual_spec.freq as u32).unwrap();
+
+        XmCallback {
+            xm: xm,
+        }
+    }).unwrap();
+
+    device.resume();
+
+    SoundPlayer {
+        _device: device,
+    }
 }
 
 fn main() {
     let mut xm = Vec::new();
     File::open("flora.xm").unwrap().read_to_end(&mut xm).unwrap();
-    play_xm(&xm);
+    let _sound_player = play_xm(&xm);
 
     let display = glium::glutin::WindowBuilder::new()
         //.with_dimensions(1024, 768)