diff --git a/Cargo.lock b/Cargo.lock index 54be236b..d5f96a7b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -14,14 +14,6 @@ dependencies = [ "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "aster" -version = "0.41.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "syntex_syntax 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "base64" version = "0.5.2" @@ -62,11 +54,6 @@ name = "bitflags" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "bitflags" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "bitflags" version = "1.0.1" @@ -324,7 +311,6 @@ dependencies = [ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "num-bigint 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", "protobuf 1.4.3 (registry+https://github.com/rust-lang/crates.io-index)", - "protobuf_macros 0.6.0 (git+https://github.com/plietar/rust-protobuf-macros)", "rand 0.3.20 (registry+https://github.com/rust-lang/crates.io-index)", "rpassword 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", @@ -371,7 +357,6 @@ dependencies = [ "mdns 0.2.0 (git+https://github.com/plietar/rust-mdns)", "num-bigint 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", "protobuf 1.4.3 (registry+https://github.com/rust-lang/crates.io-index)", - "protobuf_macros 0.6.0 (git+https://github.com/plietar/rust-protobuf-macros)", "rand 0.3.20 (registry+https://github.com/rust-lang/crates.io-index)", "rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", @@ -655,16 +640,6 @@ name = "protobuf" version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "protobuf_macros" -version = "0.6.0" -source = "git+https://github.com/plietar/rust-protobuf-macros#f186dc5a16c0d79f14c319ac8ce30b06de0cefee" -dependencies = [ - "aster 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)", - "syntex 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)", - "syntex_syntax 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "quick-error" version = "1.2.1" @@ -833,48 +808,6 @@ dependencies = [ "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "syntex" -version = "0.58.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "syntex_errors 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)", - "syntex_syntax 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "syntex_errors" -version = "0.58.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", - "syntex_pos 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)", - "term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "syntex_pos" -version = "0.58.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "syntex_syntax" -version = "0.58.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "bitflags 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", - "syntex_errors 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)", - "syntex_pos 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "take" version = "0.1.0" @@ -892,15 +825,6 @@ dependencies = [ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "term" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "termios" version = "0.2.2" @@ -1177,14 +1101,12 @@ dependencies = [ [metadata] "checksum aho-corasick 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d6531d44de723825aa81398a6415283229725a00fa30713812ab9323faa82fc4" "checksum alsa 0.0.1 (git+https://github.com/plietar/rust-alsa)" = "" -"checksum aster 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ccfdf7355d9db158df68f976ed030ab0f6578af811f5a7bb6dcf221ec24e0e0" "checksum base64 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "30e93c03064e7590d0466209155251b90c22e37fab1daf2771582598b5827557" "checksum base64 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "229d032f1a99302697f10b27167ae6d03d49d032e6a8e2550e8d3fc13356d2b4" "checksum bit-set 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d9bf6104718e80d7b26a68fdbacff3481cfc05df670821affc7e9cbc1884400c" "checksum bit-vec 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "02b4ff8b16e6076c3e14220b39fbc1fabb6737522281a388998046859400895f" "checksum bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "32866f4d103c4e438b1db1158aa1b1a80ee078e5d77a59a2f906fd62a577389c" "checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d" -"checksum bitflags 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1370e9fc2a6ae53aea8b7a5110edbd08836ed87c88736dfabccade1c2b44bff4" "checksum bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b3c30d3802dfb7281680d6285f2ccdaa8c2d8fee41f93805dba5c4cf50dc23cf" "checksum byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0fc10e8cc6b2580fda3f36eb6dc5316657f812a3df879a44a66fc9f0fdbc4855" "checksum byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "652805b7e73fada9d85e9a6682a4abd490cb52d96aeecc12e33a0de34dfd0d23" @@ -1241,7 +1163,6 @@ dependencies = [ "checksum portaudio-rs 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "029e0ab393b44b2d825efbc755cae51c36be7a99d91356b2052be0ed05836636" "checksum portaudio-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5194a4fa953b4ffd851c320ef6f0484cd7278cb7169ea9d6c433e49b23f7b7f5" "checksum protobuf 1.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bec26e67194b7d991908145fdf21b7cae8b08423d96dcb9e860cd31f854b9506" -"checksum protobuf_macros 0.6.0 (git+https://github.com/plietar/rust-protobuf-macros)" = "" "checksum quick-error 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eda5fe9b71976e62bc81b781206aaa076401769b2143379d3eb2118388babac4" "checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a" "checksum rand 0.3.20 (registry+https://github.com/rust-lang/crates.io-index)" = "512870020642bb8c221bf68baa1b2573da814f6ccfe5c9699b1c303047abe9b1" @@ -1265,13 +1186,8 @@ dependencies = [ "checksum smallvec 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4c8cbcd6df1e117c2210e13ab5109635ad68a929fcbb8964dc965b76cb5ee013" "checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad" "checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6" -"checksum syntex 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a8f5e3aaa79319573d19938ea38d068056b826db9883a5d47f86c1cecc688f0e" -"checksum syntex_errors 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)" = "867cc5c2d7140ae7eaad2ae9e8bf39cb18a67ca651b7834f88d46ca98faadb9c" -"checksum syntex_pos 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)" = "13ad4762fe52abc9f4008e85c4fb1b1fe3aa91ccb99ff4826a439c7c598e1047" -"checksum syntex_syntax 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6e0e4dbae163dd98989464c23dd503161b338790640e11537686f2ef0f25c791" "checksum take 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b157868d8ac1f56b64604539990685fa7611d8fa9e5476cf0c02cf34d32917c5" "checksum tempfile 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "11ce2fe9db64b842314052e2421ac61a73ce41b898dc8e3750398b219c5fc1e0" -"checksum term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "fa63644f74ce96fbeb9b794f66aff2a52d601cbd5e80f4b97123e3899f4570f1" "checksum termios 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d5d9cf598a6d7ce700a4e6a9199da127e6819a61e64b68609683cc9a01b5683a" "checksum thread_local 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "279ef31c19ededf577bfd12dfae728040a21f635b06a24cd670ff510edd38963" "checksum time 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "a15375f1df02096fb3317256ce2cee6a1f42fc84ea5ad5fc8c421cfe40c73098" diff --git a/Cargo.toml b/Cargo.toml index 5d680896..5e392695 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -55,7 +55,6 @@ url = "1.3" [build-dependencies] rand = "0.3.13" vergen = "0.1.0" -protobuf_macros = { git = "https://github.com/plietar/rust-protobuf-macros", features = ["with-syntex"] } [replace] "rust-crypto:0.2.36" = { git = "https://github.com/awmath/rust-crypto.git", branch = "avx2" } diff --git a/connect/Cargo.toml b/connect/Cargo.toml index c529b616..e1f00b59 100644 --- a/connect/Cargo.toml +++ b/connect/Cargo.toml @@ -2,7 +2,6 @@ name = "librespot-connect" version = "0.1.0" authors = ["Paul Lietar "] -build = "build.rs" [dependencies.librespot-core] path = "../core" @@ -29,9 +28,6 @@ url = "1.3" dns-sd = { version = "0.1.3", optional = true } mdns = { git = "https://github.com/plietar/rust-mdns", optional = true } -[build-dependencies] -protobuf_macros = { git = "https://github.com/plietar/rust-protobuf-macros", features = ["with-syntex"] } - [features] default = ["mdns"] with-dns-sd = ["dns-sd"] diff --git a/connect/build.rs b/connect/build.rs deleted file mode 100644 index e8df45d5..00000000 --- a/connect/build.rs +++ /dev/null @@ -1,13 +0,0 @@ -extern crate protobuf_macros; - -use std::env; -use std::path::PathBuf; - -fn main() { - let out = PathBuf::from(env::var("OUT_DIR").unwrap()); - - protobuf_macros::expand("src/lib.in.rs", &out.join("lib.rs")).unwrap(); - - println!("cargo:rerun-if-changed=src/lib.in.rs"); - println!("cargo:rerun-if-changed=src/spirc.rs"); -} diff --git a/connect/src/lib.in.rs b/connect/src/lib.in.rs deleted file mode 100644 index 9dc5e82c..00000000 --- a/connect/src/lib.in.rs +++ /dev/null @@ -1,2 +0,0 @@ -#[allow(unused_mut)] -pub mod spirc; diff --git a/connect/src/lib.rs b/connect/src/lib.rs index 97fff8d8..27ec2b03 100644 --- a/connect/src/lib.rs +++ b/connect/src/lib.rs @@ -24,5 +24,4 @@ extern crate librespot_playback as playback; extern crate librespot_protocol as protocol; pub mod discovery; - -include!(concat!(env!("OUT_DIR"), "/lib.rs")); +pub mod spirc; diff --git a/connect/src/spirc.rs b/connect/src/spirc.rs index 2b88249c..d7d0d6be 100644 --- a/connect/src/spirc.rs +++ b/connect/src/spirc.rs @@ -64,71 +64,110 @@ fn now_ms() -> i64 { } fn initial_state() -> State { - protobuf_init!(protocol::spirc::State::new(), { - repeat: false, - shuffle: false, - status: PlayStatus::kPlayStatusStop, - position_ms: 0, - position_measured_at: 0, - }) + let mut frame = protocol::spirc::State::new(); + frame.set_repeat(false); + frame.set_shuffle(false); + frame.set_status(PlayStatus::kPlayStatusStop); + frame.set_position_ms(0); + frame.set_position_measured_at(0); + frame } fn initial_device_state(config: ConnectConfig, volume: u16) -> DeviceState { - protobuf_init!(DeviceState::new(), { - sw_version: version::version_string(), - is_active: false, - can_play: true, - volume: volume as u32, - name: config.name, - capabilities => [ - @{ - typ: protocol::spirc::CapabilityType::kCanBePlayer, - intValue => [1] - }, - @{ - typ: protocol::spirc::CapabilityType::kDeviceType, - intValue => [config.device_type as i64] - }, - @{ - typ: protocol::spirc::CapabilityType::kGaiaEqConnectId, - intValue => [1] - }, - @{ - typ: protocol::spirc::CapabilityType::kSupportsLogout, - intValue => [0] - }, - @{ - typ: protocol::spirc::CapabilityType::kIsObservable, - intValue => [1] - }, - @{ - typ: protocol::spirc::CapabilityType::kVolumeSteps, - intValue => [64] - }, - @{ - typ: protocol::spirc::CapabilityType::kSupportedContexts, - stringValue => [ - "album", - "playlist", - "search", - "inbox", - "toplist", - "starred", - "publishedstarred", - "track", - ] - }, - @{ - typ: protocol::spirc::CapabilityType::kSupportedTypes, - stringValue => [ - "audio/local", - "audio/track", - "local", - "track", - ] - } - ], - }) + { + let mut msg = DeviceState::new(); + msg.set_sw_version(version::version_string()); + msg.set_is_active(false); + msg.set_can_play(true); + msg.set_volume(volume as u32); + msg.set_name(config.name); + { + let repeated = msg.mut_capabilities(); + { + let msg = repeated.push_default(); + msg.set_typ(protocol::spirc::CapabilityType::kCanBePlayer); + { + let repeated = msg.mut_intValue(); + repeated.push(1) + }; + msg + }; + { + let msg = repeated.push_default(); + msg.set_typ(protocol::spirc::CapabilityType::kDeviceType); + { + let repeated = msg.mut_intValue(); + repeated.push(config.device_type as i64) + }; + msg + }; + { + let msg = repeated.push_default(); + msg.set_typ(protocol::spirc::CapabilityType::kGaiaEqConnectId); + { + let repeated = msg.mut_intValue(); + repeated.push(1) + }; + msg + }; + { + let msg = repeated.push_default(); + msg.set_typ(protocol::spirc::CapabilityType::kSupportsLogout); + { + let repeated = msg.mut_intValue(); + repeated.push(0) + }; + msg + }; + { + let msg = repeated.push_default(); + msg.set_typ(protocol::spirc::CapabilityType::kIsObservable); + { + let repeated = msg.mut_intValue(); + repeated.push(1) + }; + msg + }; + { + let msg = repeated.push_default(); + msg.set_typ(protocol::spirc::CapabilityType::kVolumeSteps); + { + let repeated = msg.mut_intValue(); + repeated.push(64) + }; + msg + }; + { + let msg = repeated.push_default(); + msg.set_typ(protocol::spirc::CapabilityType::kSupportedContexts); + { + let repeated = msg.mut_stringValue(); + repeated.push(::std::convert::Into::into("album")); + repeated.push(::std::convert::Into::into("playlist")); + repeated.push(::std::convert::Into::into("search")); + repeated.push(::std::convert::Into::into("inbox")); + repeated.push(::std::convert::Into::into("toplist")); + repeated.push(::std::convert::Into::into("starred")); + repeated.push(::std::convert::Into::into("publishedstarred")); + repeated.push(::std::convert::Into::into("track")) + }; + msg + }; + { + let msg = repeated.push_default(); + msg.set_typ(protocol::spirc::CapabilityType::kSupportedTypes); + { + let repeated = msg.mut_stringValue(); + repeated.push(::std::convert::Into::into("audio/local")); + repeated.push(::std::convert::Into::into("audio/track")); + repeated.push(::std::convert::Into::into("local")); + repeated.push(::std::convert::Into::into("track")) + }; + msg + }; + }; + msg + } } fn volume_to_mixer(volume: u16) -> u16 { @@ -678,17 +717,14 @@ struct CommandSender<'a> { impl<'a> CommandSender<'a> { fn new(spirc: &'a mut SpircTask, cmd: MessageType) -> CommandSender { - let frame = protobuf_init!(protocol::spirc::Frame::new(), { - version: 1, - protocol_version: "2.0.0", - ident: spirc.ident.clone(), - seq_nr: spirc.sequence.get(), - typ: cmd, - - device_state: spirc.device.clone(), - state_update_id: now_ms(), - }); - + let mut frame = protocol::spirc::Frame::new(); + frame.set_version(1); + frame.set_protocol_version(::std::convert::Into::into("2.0.0")); + frame.set_ident(spirc.ident.clone()); + frame.set_seq_nr(spirc.sequence.get()); + frame.set_typ(cmd); + frame.set_device_state(spirc.device.clone()); + frame.set_state_update_id(now_ms()); CommandSender { spirc: spirc, frame: frame,