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

Maintain list of connected devices.

Browse source
This commit is contained in:
Simon Persson 2016-02-13 02:09:15 +01:00
parent 526c54702b
commit 958d0c74d4
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/spirc.rs
View file

@ -9,6 +9,7 @@ use mercury::{MercuryRequest, MercuryMethod};
use player::{Player, PlayerState}; use player::{Player, PlayerState};
use std::sync::{Mutex, Arc}; use std::sync::{Mutex, Arc};
use std::collections::HashMap;
use protocol; use protocol;
pub use protocol::spirc::PlayStatus; pub use protocol::spirc::PlayStatus;
@ -37,6 +38,8 @@ struct SpircInternal {
tracks: Vec<SpotifyId>, tracks: Vec<SpotifyId>,
index: u32, index: u32,
devices: HashMap<String, String>,
} }
impl SpircManager { impl SpircManager {
@ -66,6 +69,8 @@ impl SpircManager {
tracks: Vec::new(), tracks: Vec::new(),
index: 0, index: 0,
devices: HashMap::new(),
}))) })))
} }
@ -118,7 +123,7 @@ impl SpircInternal {
} }
} }
fn handle(&mut self, frame: protocol::spirc::Frame) { fn handle(&mut self, mut frame: protocol::spirc::Frame) {
if frame.get_ident() == self.ident || if frame.get_ident() == self.ident ||
(frame.get_recipient().len() > 0 && !frame.get_recipient().contains(&self.ident)) { (frame.get_recipient().len() > 0 && !frame.get_recipient().contains(&self.ident)) {
return; return;
@ -128,6 +133,11 @@ impl SpircInternal {
self.last_command_ident = frame.get_ident().to_owned(); self.last_command_ident = frame.get_ident().to_owned();
self.last_command_msgid = frame.get_seq_nr(); self.last_command_msgid = frame.get_seq_nr();
} }
if frame.has_ident() && !frame.has_goodbye() && frame.has_device_state() {
self.devices.insert(frame.take_ident(), frame.take_device_state().take_name());
}
match frame.get_typ() { match frame.get_typ() {
protocol::spirc::MessageType::kMessageTypeHello => { protocol::spirc::MessageType::kMessageTypeHello => {
self.notify(false, Some(frame.get_ident())); self.notify(false, Some(frame.get_ident()));
@ -172,6 +182,10 @@ impl SpircInternal {
self.is_active = false; self.is_active = false;
self.player.stop(); self.player.stop();
} }
if frame.has_ident() && frame.has_goodbye() {
self.devices.remove(&frame.take_ident());
}
} }
protocol::spirc::MessageType::kMessageTypeVolume => { protocol::spirc::MessageType::kMessageTypeVolume => {
self.player.volume(frame.get_volume() as u16); self.player.volume(frame.get_volume() as u16);