yetangitu/librespot
1
0
Fork 0
mirror of https://github.com/librespot-org/librespot.git synced 2025-10-04 10:19:27 +02:00
Code Issues Releases Wiki Activity

Move spirc to tokio

Browse source
This commit is contained in:
Paul Lietar 2017-01-20 12:56:42 +00:00
parent d62a154786
commit bcedfefaa9
5 changed files with 186 additions and 175 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/main.rs
View file

@ -9,14 +9,13 @@ extern crate tokio_core;
use env_logger::LogBuilder;
use std::io::{stderr, Write};
use std::process::exit;
use std::thread;
use std::env;
use std::path::PathBuf;
use std::str::FromStr;
use futures::Future;
use tokio_core::reactor::Core;
use librespot::spirc::SpircManager;
use librespot::spirc::Spirc;
use librespot::authentication::{get_credentials, Credentials};
use librespot::audio_backend::{self, Sink, BACKENDS};
use librespot::cache::{Cache, DefaultCache, NoCache};
@ -158,22 +157,19 @@ fn main() {
let connection = Session::connect(config, credentials, cache, handle);
let task = connection.and_then(move |(session, task)| {
let task = connection.and_then(move |session| {
let player = Player::new(session.clone(), move || {
(backend)(device)
});
let spirc = SpircManager::new(session.clone(), player);
let spirc_signal = spirc.clone();
let (spirc, task) = Spirc::new(session.clone(), player);
let spirc = ::std::cell::RefCell::new(spirc);
ctrlc::set_handler(move || {
spirc_signal.send_goodbye();
exit(0);
spirc.borrow_mut().shutdown();
});
thread::spawn(move || spirc.run());
task
task.map_err(|()| panic!("spirc error"))
});
core.run(task).unwrap()