diff --git a/Cargo.lock b/Cargo.lock index 47e3a046..297e998d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -290,17 +290,6 @@ version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41e67cd8309bbd06cd603a9e693a784ac2e5d1e955f11286e355089fcab3047c" -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - [[package]] name = "autocfg" version = "1.3.0" @@ -1018,7 +1007,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "82b825228dce83e7156c7cd189bcfe5ef8014320deca7dd619787fe594946426" dependencies = [ - "env_logger 0.10.2", + "env_logger", "log", "muldiv", "once_cell", @@ -1576,18 +1565,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "env_logger" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" -dependencies = [ - "atty", - "humantime", - "log", - "termcolor", -] - [[package]] name = "env_logger" version = "0.10.2" @@ -1685,7 +1662,7 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" dependencies = [ - "memoffset 0.9.1", + "memoffset", "rustc_version", ] @@ -1991,15 +1968,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "getopts" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" -dependencies = [ - "unicode-width", -] - [[package]] name = "getrandom" version = "0.2.15" @@ -2213,7 +2181,7 @@ dependencies = [ "base32", "bytes", "chrono", - "env_logger 0.10.2", + "env_logger", "futures", "gio", "gst-plugin-version-helper", @@ -2684,7 +2652,7 @@ dependencies = [ "once_cell", "rtsp-types", "sdp-types", - "socket2 0.5.7", + "socket2", "thiserror", "tokio", "tokio-stream", @@ -2720,7 +2688,8 @@ dependencies = [ "gst-plugin-version-helper", "gstreamer", "gstreamer-base", - "librespot", + "librespot-core", + "librespot-playback", "once_cell", "tokio", "url", @@ -2773,7 +2742,7 @@ dependencies = [ "rand", "rustix", "slab", - "socket2 0.5.7", + "socket2", "waker-fn", "winapi", ] @@ -3564,15 +3533,6 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - [[package]] name = "hermit-abi" version = "0.3.9" @@ -3610,17 +3570,6 @@ dependencies = [ "digest 0.10.7", ] -[[package]] -name = "hostname" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" -dependencies = [ - "libc", - "match_cfg", - "winapi", -] - [[package]] name = "hrtf" version = "0.8.1" @@ -3729,7 +3678,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.5.7", + "socket2", "tokio", "tower-service", "tracing", @@ -3847,7 +3796,7 @@ dependencies = [ "http-body 1.0.1", "hyper 1.4.1", "pin-project-lite", - "socket2 0.5.7", + "socket2", "tokio", "tower", "tower-service", @@ -3926,16 +3875,6 @@ dependencies = [ "unicode-normalization", ] -[[package]] -name = "if-addrs" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbc0fa01ffc752e9dbc72818cdb072cd028b86be5e09dd04c5a643704fe101a9" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "image" version = "0.24.9" @@ -4155,53 +4094,6 @@ version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" -[[package]] -name = "libmdns" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b04ae6b56b3b19ade26f0e7e7c1360a1713514f326c5ed0797cf2c109c9e010" -dependencies = [ - "byteorder", - "futures-util", - "hostname", - "if-addrs", - "log", - "multimap", - "nix", - "rand", - "socket2 0.4.10", - "thiserror", - "tokio", - "winapi", -] - -[[package]] -name = "librespot" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea4c9952ef48968f8184a4a87f8576982426ebe623342d5a28f7d9c4978e4a44" -dependencies = [ - "base64 0.13.1", - "env_logger 0.9.3", - "futures-util", - "getopts", - "hex", - "hyper 0.14.30", - "librespot-audio", - "librespot-connect", - "librespot-core", - "librespot-discovery", - "librespot-metadata", - "librespot-playback", - "librespot-protocol", - "log", - "rpassword", - "sha-1", - "thiserror", - "tokio", - "url", -] - [[package]] name = "librespot-audio" version = "0.4.2" @@ -4218,27 +4110,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "librespot-connect" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ffafb6a443e9445ccb3d5d591573b5b1da3c89a9b8846c63ba2c3710210d3ec" -dependencies = [ - "form_urlencoded", - "futures-util", - "librespot-core", - "librespot-discovery", - "librespot-playback", - "librespot-protocol", - "log", - "protobuf", - "rand", - "serde", - "serde_json", - "tokio", - "tokio-stream", -] - [[package]] name = "librespot-core" version = "0.4.2" @@ -4280,28 +4151,6 @@ dependencies = [ "vergen", ] -[[package]] -name = "librespot-discovery" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aa877d18f6150364012cb4be5682d62d7c712c88bae2d0d01720fd7c15e2f06" -dependencies = [ - "aes-ctr", - "base64 0.13.1", - "form_urlencoded", - "futures-core", - "hmac 0.11.0", - "hyper 0.14.30", - "libmdns", - "librespot-core", - "log", - "rand", - "serde_json", - "sha-1", - "thiserror", - "tokio", -] - [[package]] name = "librespot-metadata" version = "0.4.2" @@ -4456,12 +4305,6 @@ dependencies = [ "nom", ] -[[package]] -name = "match_cfg" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" - [[package]] name = "matchers" version = "0.1.0" @@ -4497,15 +4340,6 @@ version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" -[[package]] -name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg", -] - [[package]] name = "memoffset" version = "0.9.1" @@ -4594,9 +4428,6 @@ name = "multimap" version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" -dependencies = [ - "serde", -] [[package]] name = "nanorand" @@ -4639,19 +4470,6 @@ version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" -[[package]] -name = "nix" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" -dependencies = [ - "bitflags 1.3.2", - "cc", - "cfg-if", - "libc", - "memoffset 0.6.5", -] - [[package]] name = "nnnoiseless" version = "0.5.1" @@ -5643,18 +5461,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "rpassword" -version = "6.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bf099a1888612545b683d2661a1940089f6c2e5a8e38979b2159da876bfd956" -dependencies = [ - "libc", - "serde", - "serde_json", - "winapi", -] - [[package]] name = "rtsp-types" version = "0.1.2" @@ -6179,16 +5985,6 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c" -[[package]] -name = "socket2" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "socket2" version = "0.5.7" @@ -6500,7 +6296,7 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.7", + "socket2", "tokio-macros", "windows-sys 0.52.0", ] diff --git a/audio/spotify/Cargo.toml b/audio/spotify/Cargo.toml index 5f22f9c5..593115bf 100644 --- a/audio/spotify/Cargo.toml +++ b/audio/spotify/Cargo.toml @@ -13,7 +13,7 @@ gst.workspace = true gst-base.workspace = true librespot-core = "0.4" librespot-playback = "0.4" -tokio = "1.0" +tokio = { version = "1", features = ["rt-multi-thread"] } futures = "0.3" anyhow = "1.0" url = "2.3"