aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sounds/activ.wavbin382190 -> 0 bytes
-rw-r--r--sounds/mode_activated.wavbin0 -> 352844 bytes
-rw-r--r--sounds/mode_deactivated.wavbin0 -> 352844 bytes
-rw-r--r--src/sounds.rs17
4 files changed, 12 insertions, 5 deletions
diff --git a/sounds/activ.wav b/sounds/activ.wav
deleted file mode 100644
index d2a05c9..0000000
--- a/sounds/activ.wav
+++ /dev/null
Binary files differ
diff --git a/sounds/mode_activated.wav b/sounds/mode_activated.wav
new file mode 100644
index 0000000..0a8cf29
--- /dev/null
+++ b/sounds/mode_activated.wav
Binary files differ
diff --git a/sounds/mode_deactivated.wav b/sounds/mode_deactivated.wav
new file mode 100644
index 0000000..1cd1c10
--- /dev/null
+++ b/sounds/mode_deactivated.wav
Binary files differ
diff --git a/src/sounds.rs b/src/sounds.rs
index e0c1093..152e7b2 100644
--- a/src/sounds.rs
+++ b/src/sounds.rs
@@ -4,12 +4,18 @@ use rodio;
use errors::*;
-// const MODE_ACTIVATED = include_bytes!("../sounds/mode_activated.ogg");
-// const MODE_DEACTIVATED = include_bytes!("../sounds/mode_deactivated.ogg");
+const MODE_ACTIVATED: &'static [u8] = include_bytes!("../sounds/mode_activated.wav");
+const MODE_DEACTIVATED: &'static [u8] = include_bytes!("../sounds/mode_deactivated.wav");
-pub const MODE_ACTIVATED: &'static [u8] = include_bytes!("../sounds/activ.wav");
+pub fn play_mode_activated() -> Result<()> {
+ play_audio(MODE_ACTIVATED)
+}
+
+pub fn play_mode_deactivated() -> Result<()> {
+ play_audio(MODE_DEACTIVATED)
+}
-pub fn play_audio<R>(r: R) -> Result<()>
+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")?;
@@ -31,6 +37,7 @@ mod tests {
#[test]
fn play_audio_plays_audio() {
- play_audio(MODE_ACTIVATED).unwrap();
+ play_mode_activated().unwrap();
+ play_mode_deactivated().unwrap();
}
}