mirror of
https://github.com/librespot-org/librespot.git
synced 2024-12-18 17:11:53 +00:00
Import librespot_protocol as protocol.
This commit is contained in:
parent
ae38e60518
commit
93640465dc
5 changed files with 8 additions and 8 deletions
|
@ -14,8 +14,8 @@ use rustc_serialize::base64::FromBase64;
|
||||||
|
|
||||||
use connection::{PlainConnection, CipherConnection};
|
use connection::{PlainConnection, CipherConnection};
|
||||||
use diffie_hellman::DHLocalKeys;
|
use diffie_hellman::DHLocalKeys;
|
||||||
use librespot_protocol as protocol;
|
use protocol;
|
||||||
use librespot_protocol::authentication::AuthenticationType;
|
use protocol::authentication::AuthenticationType;
|
||||||
use session::Session;
|
use session::Session;
|
||||||
use util;
|
use util;
|
||||||
|
|
||||||
|
|
|
@ -26,7 +26,7 @@ extern crate vorbis;
|
||||||
#[cfg(feature = "dns-sd")]
|
#[cfg(feature = "dns-sd")]
|
||||||
extern crate dns_sd;
|
extern crate dns_sd;
|
||||||
|
|
||||||
extern crate librespot_protocol;
|
extern crate librespot_protocol as protocol;
|
||||||
|
|
||||||
#[macro_use]pub mod util;
|
#[macro_use]pub mod util;
|
||||||
mod audio_decrypt;
|
mod audio_decrypt;
|
||||||
|
|
|
@ -6,7 +6,7 @@ use std::io::{Cursor, Read, Write};
|
||||||
use std::mem::replace;
|
use std::mem::replace;
|
||||||
use std::sync::mpsc;
|
use std::sync::mpsc;
|
||||||
|
|
||||||
use librespot_protocol as protocol;
|
use protocol;
|
||||||
use session::Session;
|
use session::Session;
|
||||||
use connection::PacketHandler;
|
use connection::PacketHandler;
|
||||||
|
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
use eventual::{Async, Future};
|
use eventual::{Async, Future};
|
||||||
use protobuf;
|
use protobuf;
|
||||||
|
|
||||||
use librespot_protocol as protocol;
|
use protocol;
|
||||||
use mercury::{MercuryRequest, MercuryMethod};
|
use mercury::{MercuryRequest, MercuryMethod};
|
||||||
use util::{SpotifyId, FileId, StrChunksExt};
|
use util::{SpotifyId, FileId, StrChunksExt};
|
||||||
use session::Session;
|
use session::Session;
|
||||||
|
|
||||||
pub use librespot_protocol::metadata::AudioFile_Format as FileFormat;
|
pub use protocol::metadata::AudioFile_Format as FileFormat;
|
||||||
|
|
||||||
fn countrylist_contains(list: &str, country: &str) -> bool {
|
fn countrylist_contains(list: &str, country: &str) -> bool {
|
||||||
list.chunks(2).any(|cc| cc == country)
|
list.chunks(2).any(|cc| cc == country)
|
||||||
|
|
|
@ -10,8 +10,8 @@ use player::{Player, PlayerState};
|
||||||
|
|
||||||
use std::sync::{Mutex, Arc};
|
use std::sync::{Mutex, Arc};
|
||||||
|
|
||||||
use librespot_protocol as protocol;
|
use protocol;
|
||||||
pub use librespot_protocol::spirc::PlayStatus;
|
pub use protocol::spirc::PlayStatus;
|
||||||
|
|
||||||
pub struct SpircManager(Arc<Mutex<SpircInternal>>);
|
pub struct SpircManager(Arc<Mutex<SpircInternal>>);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue