From 9754fc0e0f1339a8597cd47f8abc39cd01477333 Mon Sep 17 00:00:00 2001
From: Andelf <andelf@gmail.com>
Date: Wed, 9 Apr 2014 12:08:50 +0800
Subject: [PATCH] fix typo in lib; add demo.rs

---
 src/demo/demo.rs      | 71 +++++++++++++++++++++++++++++++++++++++++++
 src/sdl2_mixer/lib.rs |  4 +--
 2 files changed, 73 insertions(+), 2 deletions(-)
 create mode 100644 src/demo/demo.rs

diff --git a/src/demo/demo.rs b/src/demo/demo.rs
new file mode 100644
index 00000000..a8a64d6a
--- /dev/null
+++ b/src/demo/demo.rs
@@ -0,0 +1,71 @@
+#![crate_type = "bin"]
+#![crate_id="demo"]
+
+extern crate sdl2;
+extern crate sdl2_mixer;
+
+use std::os;
+use mix = sdl2_mixer;
+
+
+fn main() {
+    let args = os::args();
+    if args.len() < 2 {
+        println!("Usage: ./demo audio.[mp3|wav|ogg]")
+    } else {
+        match dump_info(&Path::new(args[1])) {
+            _ => ()
+        }
+    }
+}
+
+fn dump_info(filename: &Path) -> Result<(), ~str> {
+    println!("linked version: {}", mix::get_linked_version());
+    sdl2::init([sdl2::InitAudio, sdl2::InitTimer]);
+    println!("inited => {}", mix::init([mix::InitMp3, mix::InitFlac]));
+
+    // TODO: 0x8010 is SDL_audio flag
+    try!(mix::open_audio(mix::DEFAULT_FREQUENCY, 0x8010u16, 2, 1024));
+    mix::allocate_channels(0);
+
+    {
+        let n = mix::get_chunk_decoders_number();
+        println!("available chunk(sample) decoders: {}", n);
+        for i in range(0, n) {
+            println!("| decoder {} => {:?}", i, mix::get_chunk_decoder(i));
+        }
+    }
+
+    {
+        let n = mix::get_music_decoders_number();
+        println!("available music decoders: {}", n);
+        for i in range(0, n) {
+            println!("| decoder {} => {:?}", i, mix::get_music_decoder(i));
+        }
+    }
+
+    println!("query spec => {}", mix::query_spec());
+
+    let music = mix::Music::from_file(filename).unwrap();
+    println!("music => {:?}", music);
+    println!("music type => {}", music.get_type());
+
+    println!("music volume => {}", mix::Music::get_volume());
+
+    println!("play => {}", music.play(1));
+
+    sdl2::timer::delay(10000);
+
+    println!("fading out ... {}", mix::Music::fade_out(4000));
+
+    sdl2::timer::delay(5000);
+
+    println!("fading in from pos ... {}", music.fade_in_from_pos(1, 10000, 100.0));
+
+    sdl2::timer::delay(5000);
+
+    mix::quit();
+    sdl2::quit();
+
+    Ok(())
+}
diff --git a/src/sdl2_mixer/lib.rs b/src/sdl2_mixer/lib.rs
index 4ce6d474..690632fa 100644
--- a/src/sdl2_mixer/lib.rs
+++ b/src/sdl2_mixer/lib.rs
@@ -605,7 +605,7 @@ impl Music {
     }
 
     // FIXME: make these class method?
-    pub fn get__volume() -> int {
+    pub fn get_volume() -> int {
         unsafe { ffi::Mix_VolumeMusic(-1) as int }
     }
 
@@ -641,7 +641,7 @@ impl Music {
         }
     }
 
-    pub fn set_cmd(command: &str) -> Result<(), ~str> {
+    pub fn set_command(command: &str) -> Result<(), ~str> {
         //! Setup a command line music player to use to play music.
         let ret = unsafe {
             ffi::Mix_SetMusicCMD(command.to_c_str().unwrap())