github-mirrors/librespot
1
0
Fork 0
mirror of https://github.com/librespot-org/librespot.git synced 2024-12-18 17:11:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #117 from awiouy/nit1

Browse source 
simplify dns-sd/mdns code
This commit is contained in:
Sasha Hilton 2018-02-04 20:10:09 +01:00 committed by GitHub
commit 59782fe285
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/discovery.rs
View file

@ -218,11 +218,7 @@ pub fn discovery(handle: &Handle, config: ConnectConfig, device_id: String, port
http.serve_addr_handle(&format!("0.0.0.0:{}", port).parse().unwrap(), &handle, move || Ok(discovery.clone())).unwrap() http.serve_addr_handle(&format!("0.0.0.0:{}", port).parse().unwrap(), &handle, move || Ok(discovery.clone())).unwrap()
}; };
#[cfg(feature = "with-dns-sd")] let s_port = serve.incoming_ref().local_addr().port();
let port = serve.incoming_ref().local_addr().port();
#[cfg(not(feature = "with-dns-sd"))]
let addr = serve.incoming_ref().local_addr();
let server_future = { let server_future = {
let handle = handle.clone(); let handle = handle.clone();
@ -239,7 +235,7 @@ pub fn discovery(handle: &Handle, config: ConnectConfig, device_id: String, port
"_spotify-connect._tcp", "_spotify-connect._tcp",
None, None,
None, None,
port, s_port,
&["VERSION=1.0", "CPath=/"]).unwrap(); &["VERSION=1.0", "CPath=/"]).unwrap();
#[cfg(not(feature = "with-dns-sd"))] #[cfg(not(feature = "with-dns-sd"))]
@ -249,7 +245,7 @@ pub fn discovery(handle: &Handle, config: ConnectConfig, device_id: String, port
let svc = responder.register( let svc = responder.register(
"_spotify-connect._tcp".to_owned(), "_spotify-connect._tcp".to_owned(),
config.name, config.name,
addr.port(), s_port,
&["VERSION=1.0", "CPath=/"]); &["VERSION=1.0", "CPath=/"]);
Ok(DiscoveryStream { Ok(DiscoveryStream {