Move sound code to sound.rs

[mandelwow.git] / mandelwow.rs

diff --git a/mandelwow.rs b/mandelwow.rs
index 72e3f8690de7745e05c38180bc5fc901ec67b5a6..4c5d25e74bdd7fb7098a185287ab57952a74c1ed 100644 (file)
--- a/mandelwow.rs
+++ b/mandelwow.rs
@@ -12,11 +12,8 @@ use glium::index::{IndexBuffer, PrimitiveType};
 use glutin::ElementState::Pressed;
 use glutin::Event::KeyboardInput;
 use glutin::VirtualKeyCode;
 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 sound;

 mod support;
 
 #[derive(Copy, Clone)]
 mod support;
 
 #[derive(Copy, Clone)]


@@ -160,10 +157,10 @@ fn bounding_box<U>(display: &glium::Display,
         depth: glium::Depth {
             test: glium::draw_parameters::DepthTest::IfLess,
             write: true,
         depth: glium::Depth {
             test: glium::draw_parameters::DepthTest::IfLess,
             write: true,

-            .. Default::default()
+            ..Default::default()

         },
         blend: glium::Blend::alpha_blending(),
         },
         blend: glium::Blend::alpha_blending(),

-        .. Default::default()
+        ..Default::default()

     };
 
     let front_indices = IndexBuffer::new(display, PrimitiveType::LineLoop,
     };
 
     let front_indices = IndexBuffer::new(display, PrimitiveType::LineLoop,


@@ -238,10 +235,10 @@ fn mandel<U>(display: &glium::Display,
         depth: glium::Depth {
             test: glium::draw_parameters::DepthTest::IfLess,
             write: true,
         depth: glium::Depth {
             test: glium::draw_parameters::DepthTest::IfLess,
             write: true,

-            .. Default::default()
+            ..Default::default()

         },
         blend: glium::Blend::alpha_blending(),
         },
         blend: glium::Blend::alpha_blending(),

-        .. Default::default()
+        ..Default::default()

     };
 
     frame.draw(&vb, &indices, program, uniforms, &params).unwrap();
     };
 
     frame.draw(&vb, &indices, program, uniforms, &params).unwrap();


@@ -275,51 +272,8 @@ fn mandelwow(display: &glium::Display,
     }
 }
 
     }
 }
 

-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() {
 fn main() {

-    let mut xm = Vec::new();
-    File::open("flora.xm").unwrap().read_to_end(&mut xm).unwrap();
-    let _sound_player = play_xm(&xm);
+    sound::start();

 
     let display = glium::glutin::WindowBuilder::new()
         //.with_dimensions(1024, 768)
 
     let display = glium::glutin::WindowBuilder::new()
         //.with_dimensions(1024, 768)


@@ -376,8 +330,8 @@ fn main() {
             [     0.0,  0.0,      z_trans, 1.0f32]
         ];
 
             [     0.0,  0.0,      z_trans, 1.0f32]
         ];
 

-        // Draw the bounding box before the fractal, when the Z-buffer is still clear, so the lines
-        // behind the semi-translucent areas will be drawn.
+        // Draw the bounding box before the fractal, when the Z-buffer is still clear,
+        // so the lines behind the semi-translucent areas will be drawn.

         if bounding_box_enabled {
             let uniforms = uniform! {
                 model: model,
         if bounding_box_enabled {
             let uniforms = uniform! {
                 model: model,