Skip to content

Commit d8ec980

Browse files
authored
Merge pull request #673 from Johannesd3/discovery-crate
Create separate discovery crate
2 parents 08ba3ad + 4448ce0 commit d8ec980

File tree

14 files changed

+583
-298
lines changed

14 files changed

+583
-298
lines changed

.github/workflows/test.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ jobs:
9999
- run: cargo hack --workspace --remove-dev-deps
100100
- run: cargo build -p librespot-core --no-default-features
101101
- run: cargo build -p librespot-core
102-
- run: cargo build -p librespot-connect
103-
- run: cargo build -p librespot-connect --no-default-features --features with-dns-sd
102+
- run: cargo hack build --each-feature -p librespot-discovery
103+
- run: cargo hack build --each-feature -p librespot-playback
104104
- run: cargo hack build --each-feature
105105

106106
test-windows:

CHANGELOG.md

+7-1
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
### Added
11+
* [connect], [discovery] The crate `librespot-discovery` for discovery in LAN was created. Its functionality was previously part of `librespot-connect`.
12+
1013
### Removed
1114

1215
* [librespot-audio] Removed `VorbisDecoder`, `VorbisError`, `AudioPacket`, `PassthroughDecoder`, `PassthroughError`, `AudioError`, `AudioDecoder` and the `convert` module from `librespot_audio`. The underlying crates `vorbis`, `librespot-tremor`, `lewton` and `ogg` should be used directly.
1316

1417
### Fixed
1518

16-
* [librespot-playback] Incorrect `PlayerConfig::default().normalisation_threshold` caused distortion when using dynamic volume normalisation downstream
19+
* [librespot-playback] Incorrect `PlayerConfig::default().normalisation_threshold` caused distortion when using dynamic volume normalisation downstream in librespot-connect was deprecated in favor of the `librespot-discovery` crate.
20+
21+
### Deprecated
22+
* [connect] The `discovery` module.
1723

1824
## [0.2.0] - 2021-05-04
1925

Cargo.lock

+51-9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+5-1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ path = "core"
3333
version = "0.2.0"
3434
features = ["apresolve"]
3535

36+
[dependencies.librespot-discovery]
37+
path = "discovery"
38+
version = "0.2.0"
39+
3640
[dependencies.librespot-metadata]
3741
path = "metadata"
3842
version = "0.2.0"
@@ -72,7 +76,7 @@ gstreamer-backend = ["librespot-playback/gstreamer-backend"]
7276
with-tremor = ["librespot-playback/with-tremor"]
7377
with-vorbis = ["librespot-playback/with-vorbis"]
7478

75-
with-dns-sd = ["librespot-connect/with-dns-sd"]
79+
with-dns-sd = ["librespot-discovery/with-dns-sd"]
7680

7781
default = ["rodio-backend"]
7882

connect/Cargo.toml

+7-14
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,15 @@ repository = "https://github.com/librespot-org/librespot"
88
edition = "2018"
99

1010
[dependencies]
11-
aes-ctr = "0.6"
12-
base64 = "0.13"
1311
form_urlencoded = "1.0"
14-
futures-core = "0.3"
1512
futures-util = { version = "0.3.5", default_features = false }
16-
hmac = "0.11"
17-
hyper = { version = "0.14", features = ["server", "http1", "tcp"] }
18-
libmdns = "0.6"
1913
log = "0.4"
2014
protobuf = "2.14.0"
2115
rand = "0.8"
2216
serde = { version = "1.0", features = ["derive"] }
23-
serde_json = "1.0.25"
24-
sha-1 = "0.9"
25-
tokio = { version = "1.0", features = ["macros", "rt", "sync"] }
17+
serde_json = "1.0"
18+
tokio = { version = "1.0", features = ["macros", "sync"] }
2619
tokio-stream = "0.1.1"
27-
url = "2.1"
28-
29-
dns-sd = { version = "0.1.3", optional = true }
3020

3121
[dependencies.librespot-core]
3222
path = "../core"
@@ -40,6 +30,9 @@ version = "0.2.0"
4030
path = "../protocol"
4131
version = "0.2.0"
4232

43-
[features]
44-
with-dns-sd = ["dns-sd"]
33+
[dependencies.librespot-discovery]
34+
path = "../discovery"
35+
version = "0.2.0"
4536

37+
[features]
38+
with-dns-sd = ["librespot-discovery/with-dns-sd"]

0 commit comments

Comments
 (0)