Remove audio playing code

Remove code that was commented in
44f6a2d5544e3ad49e5e3c52167c045aed1d56b2. Since we weren't able to
correctly link to the Core Audio framework from the Objective-C code
using this Rust audio code, get rid of it. Instead, we play audio in the
Objective-C application.

7 files changed, 0 insertions, 77 deletions

diff --git a/Cargo.toml b/Cargo.toml
index a2f9c23..426371f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,7 +14,6 @@ libc = "0.2.43"
 log = "0.4.5"
 magic-crypt = "2.1.2"
 quick-error = "1.2.2"
-rodio = "0.8.1"
 serde = "1.0.58"
 serde_derive = "1.0.58"
 stderrlog = "0.4.1"
diff --git a/sounds/mode_activated.wav b/sounds/mode_activated.wav
deleted file mode 100644
index 0a8cf29..0000000
--- a/sounds/mode_activated.wav
+++ /dev/null
diff --git a/sounds/mode_deactivated.wav b/sounds/mode_deactivated.wav
deleted file mode 100644
index 1cd1c10..0000000
--- a/sounds/mode_deactivated.wav
+++ /dev/null
diff --git a/src/errors.rs b/src/errors.rs
index 5ee9aa6..f7f3d79 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -1,13 +1,11 @@
 use chrono;
 use magic_crypt;
-// use rodio;
 use xdg;
 
 error_chain! {
     foreign_links {
         Io(::std::io::Error);
 
-        // Rodio(rodio::decoder::DecoderError);
         Xdg(xdg::BaseDirectoriesError);
 
         DateCrypt(DateCryptError);
diff --git a/src/lib.rs b/src/lib.rs
index ec7eac2..20f4fb6 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -19,7 +19,6 @@ extern crate magic_crypt;
 
 #[macro_use]
 extern crate quick_error;
-// extern crate rodio;
 
 #[macro_use]
 extern crate serde_derive;
@@ -37,7 +36,6 @@ mod ffi;
 mod key_code;
 mod map;
 mod parser;
-// mod sounds;
 mod trial;
 
 use parser::{Action, HeadphoneButton, MapAction, MapGroup, MapKind};
diff --git a/src/map.rs b/src/map.rs
index 54da17a..5741245 100644
--- a/src/map.rs
+++ b/src/map.rs
@@ -4,22 +4,6 @@ use std::process::Command;
 
 use {Action, HeadphoneButton, MapAction, MapKind};
 use ffi::State;
-// use sounds;
-
-#[repr(C)]
-pub enum PlayAudio {
-    Yes,
-    No,
-}
-
-impl PlayAudio {
-    fn yes(&self) -> bool {
-        match self {
-            PlayAudio::Yes => true,
-            PlayAudio::No => false,
-        }
-    }
-}
 
 #[repr(C)]
 pub enum ModeChange {
@@ -43,12 +27,6 @@ pub fn run_key_action<'a>(
                     if &in_mode[..] == trigger {
                         state.in_mode = None;
 
-                        // if play_audio.yes() {
-                        //     match sounds::play_mode_deactivated() {
-                        //         Ok(_) => (),
-                        //         Err(e) => error!("{}", e),
-                        //     }
-                        // }
                         on_mode_change(ModeChange::Deactivated);
 
                         return;
@@ -69,12 +47,6 @@ pub fn run_key_action<'a>(
             if mode.is_some() {
                 state.in_mode = Some(trigger.to_vec());
 
-                // if play_audio.yes() {
-                //     match sounds::play_mode_activated() {
-                //         Ok(_) => (),
-                //         Err(e) => error!("{}", e),
-                //     }
-                // }
                 on_mode_change(ModeChange::Activated);
             }
         },
diff --git a/src/sounds.rs b/src/sounds.rs
deleted file mode 100644
index 21d5f87..0000000
--- a/src/sounds.rs
+++ /dev/null
@@ -1,44 +0,0 @@
-use std::io::Cursor;
-
-use rodio;
-
-use errors::*;
-
-const MODE_ACTIVATED: &'static [u8] = include_bytes!("../sounds/mode_activated.wav");
-const MODE_DEACTIVATED: &'static [u8] = include_bytes!("../sounds/mode_deactivated.wav");
-
-pub fn play_mode_activated() -> Result<()> {
-    play_audio(MODE_ACTIVATED)
-}
-
-pub fn play_mode_deactivated() -> Result<()> {
-    play_audio(MODE_DEACTIVATED)
-}
-
-fn play_audio<R>(r: R) -> Result<()>
-where R: AsRef<[u8]> + Send + 'static {
-    let device = rodio::default_output_device()
-        .chain_err(|| "could not find an audio output device")?;
-
-    let reader = Cursor::new(r);
-    let sink = rodio::play_once(&device, reader)
-        .chain_err(|| "error playing audio")?;
-
-    sink.sleep_until_end();
-    sink.play();
-
-    Ok(())
-}
-
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    #[ignore]
-    fn play_audio_plays_audio() {
-        play_mode_activated().unwrap();
-        play_mode_deactivated().unwrap();
-    }
-}