1
0
Fork 0
mirror of https://github.com/librespot-org/librespot.git synced 2025-10-06 03:50:06 +02:00

Merge branch 'master' into jackaudio

This commit is contained in:
Sasha Hilton 2018-02-02 05:12:36 +01:00 committed by GitHub
commit 407e23b311
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
27 changed files with 823 additions and 579 deletions

View file

@ -2,9 +2,6 @@
#![cfg_attr(feature = "cargo-clippy", allow(unused_io_amount))]
// TODO: many items from tokio-core::io have been deprecated in favour of tokio-io
#![allow(deprecated)]
#[macro_use] extern crate log;
#[macro_use] extern crate serde_json;
#[macro_use] extern crate serde_derive;
@ -13,7 +10,6 @@ extern crate base64;
extern crate crypto;
extern crate futures;
extern crate hyper;
extern crate mdns;
extern crate num_bigint;
extern crate protobuf;
extern crate rand;
@ -37,6 +33,15 @@ extern crate libpulse_sys;
#[cfg(feature = "jackaudio-backend")]
extern crate jack;
#[cfg(feature = "libc")]
extern crate libc;
#[cfg(feature = "with-dns-sd")]
extern crate dns_sd;
#[cfg(not(feature = "with-dns-sd"))]
extern crate mdns;
pub mod audio_backend;
pub mod discovery;
pub mod keymaster;