Instantly share code, notes, and snippets.

Embed
What would you like to do?
diff --git a/Cargo.toml b/Cargo.toml
index a687aa1..a4e7440 100755
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,7 +11,7 @@ gfx_device_gl = "0.15.0"
gfx_window_glutin = "0.25"
cgmath = "0.16.0"
image = "0.18.0"
-rodio = "0.6.0"
+rodio = "0.7.0"
serde_json = "1.0.2"
serde_derive = "1.0.11"
serde = "1.0.11"
diff --git a/src/main.rs b/src/main.rs
index 52883ff..fc02400 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -360,7 +360,7 @@ fn main() {
GlyphBrushBuilder::using_font_bytes(include_bytes!("../resources/MunroSmall.ttf") as &[u8])
.build(factory.clone());
- let audio_endpoint = rodio::default_endpoint().unwrap();
+ let audio_endpoint = rodio::default_output_device().unwrap();
let click_sound_source = loader::create_sound("resources/click.ogg").buffered();
let settings = loader::load_settings();
let mut music = music_manager::MusicManager::new(&audio_endpoint, settings.music_volume);
diff --git a/src/music_manager.rs b/src/music_manager.rs
index d9238bd..1fd6641 100644
--- a/src/music_manager.rs
+++ b/src/music_manager.rs
@@ -3,7 +3,7 @@ use std::fs::File;
use std::io::BufReader;
use rand::{self, Rng};
-use rodio::{decoder::Decoder, Endpoint, Sink, Source};
+use rodio::{decoder::Decoder, Device, Sink, Source};
use loader;
@@ -15,7 +15,7 @@ pub struct MusicManager {
}
impl MusicManager {
- pub fn new(audio_endpoint: &Endpoint, volume: f32) -> Self {
+ pub fn new(audio_device: &Device, volume: f32) -> Self {
let mut tracks = HashMap::new();
tracks.insert("title".to_string(), "resources/ld39.ogg".to_string());
@@ -25,7 +25,7 @@ impl MusicManager {
"resources/meloncholy.ogg".to_string(),
);
- let mut sink = Sink::new(audio_endpoint);
+ let mut sink = Sink::new(audio_device);
sink.set_volume(volume);
MusicManager {
@@ -74,10 +74,10 @@ impl MusicManager {
self.sink.stop();
}
- pub fn setup_random_track_sink(&mut self, audio_endpoint: &Endpoint) {
+ pub fn setup_random_track_sink(&mut self, audio_device: &Device) {
self.sink.stop();
let volume = self.sink.volume();
- self.sink = Sink::new(audio_endpoint);
+ self.sink = Sink::new(audio_device);
self.sink.set_volume(volume);
}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment