From 93640465dcd8495291437e32b071eeae00698904 Mon Sep 17 00:00:00 2001
From: Paul Lietar <paul@lietar.net>
Date: Wed, 27 Jan 2016 10:40:00 +0000
Subject: [PATCH] Import librespot_protocol as protocol.

---
 src/authentication.rs | 4 ++--
 src/lib.rs            | 2 +-
 src/mercury.rs        | 2 +-
 src/metadata.rs       | 4 ++--
 src/spirc.rs          | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/authentication.rs b/src/authentication.rs
index 06197e67..d27d7f9f 100644
--- a/src/authentication.rs
+++ b/src/authentication.rs
@@ -14,8 +14,8 @@ use rustc_serialize::base64::FromBase64;
 
 use connection::{PlainConnection, CipherConnection};
 use diffie_hellman::DHLocalKeys;
-use librespot_protocol as protocol;
-use librespot_protocol::authentication::AuthenticationType;
+use protocol;
+use protocol::authentication::AuthenticationType;
 use session::Session;
 use util;
 
diff --git a/src/lib.rs b/src/lib.rs
index aea658e1..df45e32e 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -26,7 +26,7 @@ extern crate vorbis;
 #[cfg(feature = "dns-sd")]
 extern crate dns_sd;
 
-extern crate librespot_protocol;
+extern crate librespot_protocol as protocol;
 
 #[macro_use]pub mod util;
 mod audio_decrypt;
diff --git a/src/mercury.rs b/src/mercury.rs
index 09e9d50e..3cbf1139 100644
--- a/src/mercury.rs
+++ b/src/mercury.rs
@@ -6,7 +6,7 @@ use std::io::{Cursor, Read, Write};
 use std::mem::replace;
 use std::sync::mpsc;
 
-use librespot_protocol as protocol;
+use protocol;
 use session::Session;
 use connection::PacketHandler;
 
diff --git a/src/metadata.rs b/src/metadata.rs
index d4a5ddfd..0bac6ee3 100644
--- a/src/metadata.rs
+++ b/src/metadata.rs
@@ -1,12 +1,12 @@
 use eventual::{Async, Future};
 use protobuf;
 
-use librespot_protocol as protocol;
+use protocol;
 use mercury::{MercuryRequest, MercuryMethod};
 use util::{SpotifyId, FileId, StrChunksExt};
 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 {
     list.chunks(2).any(|cc| cc == country)
diff --git a/src/spirc.rs b/src/spirc.rs
index f6ef8d9b..887f277e 100644
--- a/src/spirc.rs
+++ b/src/spirc.rs
@@ -10,8 +10,8 @@ use player::{Player, PlayerState};
 
 use std::sync::{Mutex, Arc};
 
-use librespot_protocol as protocol;
-pub use librespot_protocol::spirc::PlayStatus;
+use protocol;
+pub use protocol::spirc::PlayStatus;
 
 pub struct SpircManager(Arc<Mutex<SpircInternal>>);