major dependency cleanup

- depend on specific librespot crates to remove clutter
- update versions

this should also help building on openbsd, as the unused librespot-connect
depended on the nix crate, which does not build on openbsd.

Cargo.toml

@@ -14,44 +14,43 @@ travis-ci = { repository = "hrkfdn/ncspot", branch = "master" }
 maintenance = { status = "actively-developed" }
 
 [dependencies]
-clap = "2.32.0"
+clap = "2.33.0"
 chrono = "0.4"
 reqwest = "0.9"
-crossbeam-channel = "0.3.8"
+crossbeam-channel = "0.4"
-directories = "1.0"
+directories = "2.0"
-failure = "0.1.3"
+failure = "0.1"
 fern = "0.5"
 futures = "0.1"
 lazy_static = "1.3.0"
+librespot-core = "0.1.0"
+librespot-playback = "0.1.0"
+librespot-protocol = "0.1.0"
 log = "0.4.0"
 rspotify = "0.7"
 serde = "1.0"
 serde_json = "1.0"
-toml = "0.4"
+toml = "0.5"
-tokio = "0.1.7"
+tokio = "0.1"
 tokio-core = "0.1"
 tokio-timer = "0.2"
 unicode-width = "0.1.5"
 dbus = { version = "0.6.4", optional = true }
-rand = "0.6.5"
+rand = "0.7"
 webbrowser = "0.5"
 clipboard = { version = "0.5", optional = true }
 url = "1.7"
 
-[dependencies.librespot]
-version = "0.1.0"
-default-features = false
-
 [dependencies.cursive]
 version = "0.13"
 default-features = false
 
 [features]
 share_clipboard = ["clipboard"]
-alsa_backend = ["librespot/alsa-backend"]
+alsa_backend = ["librespot-playback/alsa-backend"]
-pulseaudio_backend = ["librespot/pulseaudio-backend"]
+pulseaudio_backend = ["librespot-playback/pulseaudio-backend"]
-rodio_backend = ["librespot/rodio-backend"]
+rodio_backend = ["librespot-playback/rodio-backend"]
-portaudio_backend = ["librespot/portaudio-backend"]
+portaudio_backend = ["librespot-playback/portaudio-backend"]
 termion_backend = ["cursive/termion-backend"]
 mpris = ["dbus"]
 default = ["share_clipboard", "pulseaudio_backend", "mpris", "cursive/pancurses-backend"]

src/authentication.rs

@@ -5,8 +5,8 @@ use cursive::view::Identifiable;
 use cursive::views::*;
 use cursive::{CbSink, Cursive};
 
-use librespot::core::authentication::Credentials as RespotCredentials;
+use librespot_core::authentication::Credentials as RespotCredentials;
-use librespot::protocol::authentication::AuthenticationType;
+use librespot_protocol::authentication::AuthenticationType;
 
 pub fn create_credentials(path: &Path) -> Result<RespotCredentials, String> {
     let mut login_cursive = Cursive::default();

src/main.rs

@@ -9,7 +9,9 @@ extern crate failure;
 extern crate futures;
 #[macro_use]
 extern crate lazy_static;
-extern crate librespot;
+extern crate librespot_core;
+extern crate librespot_playback;
+extern crate librespot_protocol;
 extern crate rspotify;
 extern crate tokio;
 extern crate tokio_core;
@@ -43,7 +45,7 @@ use clap::{App, Arg};
 use cursive::traits::Identifiable;
 use cursive::Cursive;
 
-use librespot::core::authentication::Credentials;
+use librespot_core::authentication::Credentials;
 
 mod album;
 mod artist;

src/spotify.rs

@@ -1,16 +1,16 @@
 use config::Config;
-use librespot::core::authentication::Credentials;
+use librespot_core::authentication::Credentials;
-use librespot::core::cache::Cache;
+use librespot_core::cache::Cache;
-use librespot::core::config::SessionConfig;
+use librespot_core::config::SessionConfig;
-use librespot::core::keymaster::Token;
+use librespot_core::keymaster::Token;
-use librespot::core::mercury::MercuryError;
+use librespot_core::mercury::MercuryError;
-use librespot::core::session::Session;
+use librespot_core::session::Session;
-use librespot::core::spotify_id::SpotifyId;
+use librespot_core::spotify_id::SpotifyId;
-use librespot::playback::config::PlayerConfig;
+use librespot_playback::config::PlayerConfig;
 
-use librespot::playback::audio_backend;
+use librespot_playback::audio_backend;
-use librespot::playback::config::Bitrate;
+use librespot_playback::config::Bitrate;
-use librespot::playback::player::Player;
+use librespot_playback::player::Player;
 
 use rspotify::spotify::client::ApiError;
 use rspotify::spotify::client::Spotify as SpotifyAPI;