2021-12-07 22:22:24 +00:00
|
|
|
use std::convert::TryFrom;
|
2021-02-21 18:38:44 +00:00
|
|
|
use std::future::Future;
|
2021-02-19 23:17:18 +00:00
|
|
|
use std::pin::Pin;
|
2019-03-24 14:15:14 +00:00
|
|
|
use std::time::{SystemTime, UNIX_EPOCH};
|
|
|
|
|
2019-10-08 09:31:18 +00:00
|
|
|
use crate::context::StationContext;
|
2021-05-24 13:53:32 +00:00
|
|
|
use crate::core::config::ConnectConfig;
|
2021-02-21 18:38:44 +00:00
|
|
|
use crate::core::mercury::{MercuryError, MercurySender};
|
2021-12-10 23:03:35 +00:00
|
|
|
use crate::core::session::{Session, UserAttributes};
|
2021-12-07 22:22:24 +00:00
|
|
|
use crate::core::spotify_id::SpotifyId;
|
2021-02-21 18:38:44 +00:00
|
|
|
use crate::core::util::SeqGenerator;
|
|
|
|
use crate::core::version;
|
2019-10-08 09:31:18 +00:00
|
|
|
use crate::playback::mixer::Mixer;
|
2020-01-31 21:41:11 +00:00
|
|
|
use crate::playback::player::{Player, PlayerEvent, PlayerEventChannel};
|
2021-12-10 23:03:35 +00:00
|
|
|
|
2019-10-08 09:31:18 +00:00
|
|
|
use crate::protocol;
|
2021-12-10 23:03:35 +00:00
|
|
|
use crate::protocol::explicit_content_pubsub::UserAttributesUpdate;
|
2019-10-08 09:31:18 +00:00
|
|
|
use crate::protocol::spirc::{DeviceState, Frame, MessageType, PlayStatus, State, TrackRef};
|
2021-12-10 23:03:35 +00:00
|
|
|
use crate::protocol::user_attributes::UserAttributesMutation;
|
2021-02-21 18:38:40 +00:00
|
|
|
|
2021-02-21 18:38:44 +00:00
|
|
|
use futures_util::future::{self, FusedFuture};
|
|
|
|
use futures_util::stream::FusedStream;
|
|
|
|
use futures_util::{FutureExt, StreamExt};
|
2021-02-19 23:17:18 +00:00
|
|
|
use protobuf::{self, Message};
|
|
|
|
use rand::seq::SliceRandom;
|
2021-02-21 18:38:40 +00:00
|
|
|
use tokio::sync::mpsc;
|
|
|
|
use tokio_stream::wrappers::UnboundedReceiverStream;
|
2017-11-03 01:15:27 +00:00
|
|
|
|
2020-01-31 21:41:11 +00:00
|
|
|
enum SpircPlayStatus {
|
|
|
|
Stopped,
|
2020-02-02 22:15:15 +00:00
|
|
|
LoadingPlay {
|
|
|
|
position_ms: u32,
|
|
|
|
},
|
|
|
|
LoadingPause {
|
|
|
|
position_ms: u32,
|
|
|
|
},
|
|
|
|
Playing {
|
|
|
|
nominal_start_time: i64,
|
|
|
|
preloading_of_next_track_triggered: bool,
|
|
|
|
},
|
|
|
|
Paused {
|
|
|
|
position_ms: u32,
|
|
|
|
preloading_of_next_track_triggered: bool,
|
|
|
|
},
|
2020-01-31 21:41:11 +00:00
|
|
|
}
|
|
|
|
|
2021-02-19 23:17:18 +00:00
|
|
|
type BoxedFuture<T> = Pin<Box<dyn FusedFuture<Output = T> + Send>>;
|
|
|
|
type BoxedStream<T> = Pin<Box<dyn FusedStream<Item = T> + Send>>;
|
|
|
|
|
|
|
|
struct SpircTask {
|
2016-01-20 14:11:49 +00:00
|
|
|
player: Player,
|
2019-10-08 09:31:18 +00:00
|
|
|
mixer: Box<dyn Mixer>,
|
2019-11-05 19:34:43 +00:00
|
|
|
config: SpircTaskConfig,
|
2015-07-08 19:50:44 +00:00
|
|
|
|
2017-01-20 12:56:42 +00:00
|
|
|
sequence: SeqGenerator<u32>,
|
2015-07-08 19:50:44 +00:00
|
|
|
|
|
|
|
ident: String,
|
2017-01-20 14:44:13 +00:00
|
|
|
device: DeviceState,
|
2017-01-29 14:11:20 +00:00
|
|
|
state: State,
|
2020-01-31 21:41:11 +00:00
|
|
|
play_request_id: Option<u64>,
|
|
|
|
play_status: SpircPlayStatus,
|
2016-02-13 01:09:15 +00:00
|
|
|
|
2021-02-19 23:17:18 +00:00
|
|
|
subscription: BoxedStream<Frame>,
|
2021-12-10 23:03:35 +00:00
|
|
|
user_attributes_update: BoxedStream<UserAttributesUpdate>,
|
|
|
|
user_attributes_mutation: BoxedStream<UserAttributesMutation>,
|
2021-02-20 19:59:57 +00:00
|
|
|
sender: MercurySender,
|
2021-02-21 18:38:40 +00:00
|
|
|
commands: Option<mpsc::UnboundedReceiver<SpircCommand>>,
|
|
|
|
player_events: Option<PlayerEventChannel>,
|
2017-01-20 12:56:42 +00:00
|
|
|
|
|
|
|
shutdown: bool,
|
2017-02-22 04:17:04 +00:00
|
|
|
session: Session,
|
2021-02-19 23:17:18 +00:00
|
|
|
context_fut: BoxedFuture<Result<serde_json::Value, MercuryError>>,
|
|
|
|
autoplay_fut: BoxedFuture<Result<String, MercuryError>>,
|
2018-10-12 17:15:26 +00:00
|
|
|
context: Option<StationContext>,
|
2017-01-20 12:56:42 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
pub enum SpircCommand {
|
2017-02-23 11:05:32 +00:00
|
|
|
Play,
|
|
|
|
PlayPause,
|
|
|
|
Pause,
|
|
|
|
Prev,
|
|
|
|
Next,
|
|
|
|
VolumeUp,
|
|
|
|
VolumeDown,
|
2018-02-11 17:52:53 +00:00
|
|
|
Shutdown,
|
2021-03-09 21:37:11 +00:00
|
|
|
Shuffle,
|
2017-01-20 12:56:42 +00:00
|
|
|
}
|
|
|
|
|
2019-11-05 19:34:43 +00:00
|
|
|
struct SpircTaskConfig {
|
|
|
|
autoplay: bool,
|
|
|
|
}
|
|
|
|
|
2019-03-16 15:18:38 +00:00
|
|
|
const CONTEXT_TRACKS_HISTORY: usize = 10;
|
|
|
|
const CONTEXT_FETCH_THRESHOLD: u32 = 5;
|
|
|
|
|
2021-05-24 13:53:32 +00:00
|
|
|
const VOLUME_STEPS: i64 = 64;
|
2021-05-31 20:32:39 +00:00
|
|
|
const VOLUME_STEP_SIZE: u16 = 1024; // (u16::MAX + 1) / VOLUME_STEPS
|
2021-05-24 13:53:32 +00:00
|
|
|
|
2017-01-20 12:56:42 +00:00
|
|
|
pub struct Spirc {
|
|
|
|
commands: mpsc::UnboundedSender<SpircCommand>,
|
2015-07-08 19:50:44 +00:00
|
|
|
}
|
|
|
|
|
2017-01-29 14:11:20 +00:00
|
|
|
fn initial_state() -> State {
|
2018-02-17 09:15:09 +00:00
|
|
|
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
|
2017-01-29 14:11:20 +00:00
|
|
|
}
|
2018-02-17 09:15:09 +00:00
|
|
|
|
2018-05-17 01:15:17 +00:00
|
|
|
fn initial_device_state(config: ConnectConfig) -> DeviceState {
|
2018-02-16 21:04:37 +00:00
|
|
|
{
|
|
|
|
let mut msg = DeviceState::new();
|
2021-12-09 18:00:27 +00:00
|
|
|
msg.set_sw_version(version::SEMVER.to_string());
|
2018-02-16 21:04:37 +00:00
|
|
|
msg.set_is_active(false);
|
|
|
|
msg.set_can_play(true);
|
2018-05-17 01:15:17 +00:00
|
|
|
msg.set_volume(0);
|
2018-02-16 21:04:37 +00:00
|
|
|
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();
|
2021-05-24 13:53:32 +00:00
|
|
|
if config.has_volume_ctrl {
|
|
|
|
repeated.push(VOLUME_STEPS)
|
2020-07-25 07:38:08 +00:00
|
|
|
} else {
|
2021-05-24 13:53:32 +00:00
|
|
|
repeated.push(0)
|
2020-07-25 07:38:08 +00:00
|
|
|
}
|
2018-02-16 21:04:37 +00:00
|
|
|
};
|
|
|
|
msg
|
|
|
|
};
|
2018-10-12 17:15:26 +00:00
|
|
|
{
|
|
|
|
let msg = repeated.push_default();
|
|
|
|
msg.set_typ(protocol::spirc::CapabilityType::kSupportsPlaylistV2);
|
|
|
|
{
|
|
|
|
let repeated = msg.mut_intValue();
|
2020-07-25 07:38:08 +00:00
|
|
|
repeated.push(1)
|
2018-10-12 17:15:26 +00:00
|
|
|
};
|
|
|
|
msg
|
|
|
|
};
|
2018-02-16 21:04:37 +00:00
|
|
|
{
|
|
|
|
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"));
|
2018-09-28 18:10:22 +00:00
|
|
|
repeated.push(::std::convert::Into::into("audio/episode"));
|
2018-02-16 21:04:37 +00:00
|
|
|
repeated.push(::std::convert::Into::into("local"));
|
|
|
|
repeated.push(::std::convert::Into::into("track"))
|
|
|
|
};
|
|
|
|
msg
|
|
|
|
};
|
|
|
|
};
|
|
|
|
msg
|
|
|
|
}
|
2017-01-20 14:44:13 +00:00
|
|
|
}
|
|
|
|
|
2021-03-18 16:51:50 +00:00
|
|
|
fn url_encode(bytes: impl AsRef<[u8]>) -> String {
|
|
|
|
form_urlencoded::byte_serialize(bytes.as_ref()).collect()
|
|
|
|
}
|
|
|
|
|
2017-01-20 12:56:42 +00:00
|
|
|
impl Spirc {
|
2018-02-11 17:52:53 +00:00
|
|
|
pub fn new(
|
|
|
|
config: ConnectConfig,
|
|
|
|
session: Session,
|
|
|
|
player: Player,
|
2019-10-08 09:31:18 +00:00
|
|
|
mixer: Box<dyn Mixer>,
|
2021-02-19 23:17:18 +00:00
|
|
|
) -> (Spirc, impl Future<Output = ()>) {
|
2017-02-22 04:17:04 +00:00
|
|
|
debug!("new Spirc[{}]", session.session_id());
|
|
|
|
|
2016-03-17 03:06:56 +00:00
|
|
|
let ident = session.device_id().to_owned();
|
2016-01-01 23:16:12 +00:00
|
|
|
|
2019-02-22 13:09:01 +00:00
|
|
|
// Uri updated in response to issue #288
|
2021-03-18 16:51:50 +00:00
|
|
|
debug!("canonical_username: {}", &session.username());
|
2020-05-10 20:19:40 +00:00
|
|
|
let uri = format!("hm://remote/user/{}/", url_encode(&session.username()));
|
2017-01-20 12:56:42 +00:00
|
|
|
|
2021-02-19 23:17:18 +00:00
|
|
|
let subscription = Box::pin(
|
|
|
|
session
|
|
|
|
.mercury()
|
|
|
|
.subscribe(uri.clone())
|
|
|
|
.map(Result::unwrap)
|
2021-02-21 18:38:40 +00:00
|
|
|
.map(UnboundedReceiverStream::new)
|
2021-02-19 23:17:18 +00:00
|
|
|
.flatten_stream()
|
|
|
|
.map(|response| -> Frame {
|
|
|
|
let data = response.payload.first().unwrap();
|
2021-05-09 10:59:34 +00:00
|
|
|
Frame::parse_from_bytes(data).unwrap()
|
2021-02-19 23:17:18 +00:00
|
|
|
}),
|
|
|
|
);
|
2017-01-20 12:56:42 +00:00
|
|
|
|
2021-12-10 23:03:35 +00:00
|
|
|
let user_attributes_update = Box::pin(
|
|
|
|
session
|
|
|
|
.mercury()
|
|
|
|
.listen_for("spotify:user:attributes:update")
|
|
|
|
.map(UnboundedReceiverStream::new)
|
|
|
|
.flatten_stream()
|
|
|
|
.map(|response| -> UserAttributesUpdate {
|
|
|
|
let data = response.payload.first().unwrap();
|
|
|
|
UserAttributesUpdate::parse_from_bytes(data).unwrap()
|
|
|
|
}),
|
|
|
|
);
|
|
|
|
|
|
|
|
let user_attributes_mutation = Box::pin(
|
|
|
|
session
|
|
|
|
.mercury()
|
|
|
|
.listen_for("spotify:user:attributes:mutated")
|
|
|
|
.map(UnboundedReceiverStream::new)
|
|
|
|
.flatten_stream()
|
|
|
|
.map(|response| -> UserAttributesMutation {
|
|
|
|
let data = response.payload.first().unwrap();
|
|
|
|
UserAttributesMutation::parse_from_bytes(data).unwrap()
|
|
|
|
}),
|
|
|
|
);
|
|
|
|
|
2021-02-20 19:59:57 +00:00
|
|
|
let sender = session.mercury().sender(uri);
|
2017-01-20 12:56:42 +00:00
|
|
|
|
2021-02-21 18:38:40 +00:00
|
|
|
let (cmd_tx, cmd_rx) = mpsc::unbounded_channel();
|
2017-01-20 12:56:42 +00:00
|
|
|
|
2021-05-24 13:53:32 +00:00
|
|
|
let initial_volume = config.initial_volume;
|
2019-11-05 19:34:43 +00:00
|
|
|
let task_config = SpircTaskConfig {
|
|
|
|
autoplay: config.autoplay,
|
|
|
|
};
|
2020-07-25 07:38:08 +00:00
|
|
|
|
2018-05-17 01:15:17 +00:00
|
|
|
let device = initial_device_state(config);
|
2017-01-20 14:44:13 +00:00
|
|
|
|
2020-01-31 21:41:11 +00:00
|
|
|
let player_events = player.get_player_event_channel();
|
|
|
|
|
2017-01-20 12:56:42 +00:00
|
|
|
let mut task = SpircTask {
|
2021-03-10 21:39:01 +00:00
|
|
|
player,
|
|
|
|
mixer,
|
2019-11-05 19:34:43 +00:00
|
|
|
config: task_config,
|
2015-07-08 19:50:44 +00:00
|
|
|
|
2017-01-20 12:56:42 +00:00
|
|
|
sequence: SeqGenerator::new(1),
|
2015-07-08 19:50:44 +00:00
|
|
|
|
2021-03-10 21:39:01 +00:00
|
|
|
ident,
|
2015-07-08 19:50:44 +00:00
|
|
|
|
2021-03-10 21:39:01 +00:00
|
|
|
device,
|
2017-01-29 14:11:20 +00:00
|
|
|
state: initial_state(),
|
2020-01-31 21:41:11 +00:00
|
|
|
play_request_id: None,
|
|
|
|
play_status: SpircPlayStatus::Stopped,
|
2016-02-13 01:09:15 +00:00
|
|
|
|
2021-03-10 21:39:01 +00:00
|
|
|
subscription,
|
2021-12-10 23:03:35 +00:00
|
|
|
user_attributes_update,
|
|
|
|
user_attributes_mutation,
|
2021-03-10 21:39:01 +00:00
|
|
|
sender,
|
2021-02-21 18:38:40 +00:00
|
|
|
commands: Some(cmd_rx),
|
|
|
|
player_events: Some(player_events),
|
2016-01-20 15:47:05 +00:00
|
|
|
|
2017-01-20 12:56:42 +00:00
|
|
|
shutdown: false,
|
2021-03-10 21:39:01 +00:00
|
|
|
session,
|
2018-10-12 17:15:26 +00:00
|
|
|
|
2021-02-19 23:17:18 +00:00
|
|
|
context_fut: Box::pin(future::pending()),
|
|
|
|
autoplay_fut: Box::pin(future::pending()),
|
2018-10-12 17:15:26 +00:00
|
|
|
context: None,
|
2016-01-20 15:47:05 +00:00
|
|
|
};
|
|
|
|
|
2021-05-24 13:53:32 +00:00
|
|
|
if let Some(volume) = initial_volume {
|
|
|
|
task.set_volume(volume);
|
|
|
|
} else {
|
|
|
|
let current_volume = task.mixer.volume();
|
|
|
|
task.set_volume(current_volume);
|
|
|
|
}
|
2018-05-17 01:15:17 +00:00
|
|
|
|
2018-02-11 17:52:53 +00:00
|
|
|
let spirc = Spirc { commands: cmd_tx };
|
2016-01-20 15:47:05 +00:00
|
|
|
|
2017-01-29 14:11:20 +00:00
|
|
|
task.hello();
|
2016-02-16 21:26:51 +00:00
|
|
|
|
2021-02-19 23:17:18 +00:00
|
|
|
(spirc, task.run())
|
2016-02-16 21:26:51 +00:00
|
|
|
}
|
2016-02-16 21:52:55 +00:00
|
|
|
|
2017-02-23 11:05:32 +00:00
|
|
|
pub fn play(&self) {
|
2021-02-21 18:38:40 +00:00
|
|
|
let _ = self.commands.send(SpircCommand::Play);
|
2017-02-23 11:05:32 +00:00
|
|
|
}
|
|
|
|
pub fn play_pause(&self) {
|
2021-02-21 18:38:40 +00:00
|
|
|
let _ = self.commands.send(SpircCommand::PlayPause);
|
2017-02-23 11:05:32 +00:00
|
|
|
}
|
|
|
|
pub fn pause(&self) {
|
2021-02-21 18:38:40 +00:00
|
|
|
let _ = self.commands.send(SpircCommand::Pause);
|
2017-02-23 11:05:32 +00:00
|
|
|
}
|
|
|
|
pub fn prev(&self) {
|
2021-02-21 18:38:40 +00:00
|
|
|
let _ = self.commands.send(SpircCommand::Prev);
|
2017-02-23 11:05:32 +00:00
|
|
|
}
|
|
|
|
pub fn next(&self) {
|
2021-02-21 18:38:40 +00:00
|
|
|
let _ = self.commands.send(SpircCommand::Next);
|
2017-02-23 11:05:32 +00:00
|
|
|
}
|
|
|
|
pub fn volume_up(&self) {
|
2021-02-21 18:38:40 +00:00
|
|
|
let _ = self.commands.send(SpircCommand::VolumeUp);
|
2017-02-23 11:05:32 +00:00
|
|
|
}
|
|
|
|
pub fn volume_down(&self) {
|
2021-02-21 18:38:40 +00:00
|
|
|
let _ = self.commands.send(SpircCommand::VolumeDown);
|
2017-02-23 11:05:32 +00:00
|
|
|
}
|
2017-01-29 16:25:09 +00:00
|
|
|
pub fn shutdown(&self) {
|
2021-02-21 18:38:40 +00:00
|
|
|
let _ = self.commands.send(SpircCommand::Shutdown);
|
2016-02-16 21:52:55 +00:00
|
|
|
}
|
2021-03-09 21:37:11 +00:00
|
|
|
pub fn shuffle(&self) {
|
2021-05-01 00:48:42 +00:00
|
|
|
let _ = self.commands.send(SpircCommand::Shuffle);
|
2021-03-09 21:37:11 +00:00
|
|
|
}
|
2017-01-20 12:56:42 +00:00
|
|
|
}
|
2016-02-16 21:52:55 +00:00
|
|
|
|
2021-02-19 23:17:18 +00:00
|
|
|
impl SpircTask {
|
|
|
|
async fn run(mut self) {
|
|
|
|
while !self.session.is_invalid() && !self.shutdown {
|
2021-02-21 18:38:40 +00:00
|
|
|
let commands = self.commands.as_mut();
|
|
|
|
let player_events = self.player_events.as_mut();
|
2021-02-19 23:17:18 +00:00
|
|
|
tokio::select! {
|
|
|
|
frame = self.subscription.next() => match frame {
|
|
|
|
Some(frame) => self.handle_frame(frame),
|
|
|
|
None => {
|
2020-01-23 23:12:16 +00:00
|
|
|
error!("subscription terminated");
|
2021-02-19 23:17:18 +00:00
|
|
|
break;
|
2018-10-12 17:15:26 +00:00
|
|
|
}
|
2021-02-19 23:17:18 +00:00
|
|
|
},
|
2021-12-10 23:03:35 +00:00
|
|
|
user_attributes_update = self.user_attributes_update.next() => match user_attributes_update {
|
|
|
|
Some(attributes) => self.handle_user_attributes_update(attributes),
|
|
|
|
None => {
|
|
|
|
error!("user attributes update selected, but none received");
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
},
|
|
|
|
user_attributes_mutation = self.user_attributes_mutation.next() => match user_attributes_mutation {
|
|
|
|
Some(attributes) => self.handle_user_attributes_mutation(attributes),
|
|
|
|
None => {
|
|
|
|
error!("user attributes mutation selected, but none received");
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
},
|
2021-02-21 18:38:40 +00:00
|
|
|
cmd = async { commands.unwrap().recv().await }, if commands.is_some() => if let Some(cmd) = cmd {
|
2021-02-19 23:17:18 +00:00
|
|
|
self.handle_command(cmd);
|
|
|
|
},
|
2021-02-21 18:38:40 +00:00
|
|
|
event = async { player_events.unwrap().recv().await }, if player_events.is_some() => if let Some(event) = event {
|
2021-02-19 23:17:18 +00:00
|
|
|
self.handle_player_event(event)
|
|
|
|
},
|
2021-02-20 19:59:57 +00:00
|
|
|
result = self.sender.flush(), if !self.sender.is_flushed() => if result.is_err() {
|
|
|
|
error!("Cannot flush spirc event sender.");
|
|
|
|
break;
|
2021-02-19 23:17:18 +00:00
|
|
|
},
|
|
|
|
context = &mut self.context_fut, if !self.context_fut.is_terminated() => {
|
|
|
|
match context {
|
|
|
|
Ok(value) => {
|
|
|
|
let r_context = serde_json::from_value::<StationContext>(value);
|
|
|
|
self.context = match r_context {
|
|
|
|
Ok(context) => {
|
|
|
|
info!(
|
|
|
|
"Resolved {:?} tracks from <{:?}>",
|
|
|
|
context.tracks.len(),
|
|
|
|
self.state.get_context_uri(),
|
|
|
|
);
|
|
|
|
Some(context)
|
|
|
|
}
|
|
|
|
Err(e) => {
|
|
|
|
error!("Unable to parse JSONContext {:?}", e);
|
|
|
|
None
|
|
|
|
}
|
|
|
|
};
|
|
|
|
// It needn't be so verbose - can be as simple as
|
|
|
|
// if let Some(ref context) = r_context {
|
|
|
|
// info!("Got {:?} tracks from <{}>", context.tracks.len(), context.uri);
|
|
|
|
// }
|
|
|
|
// self.context = r_context;
|
|
|
|
},
|
|
|
|
Err(err) => {
|
|
|
|
error!("ContextError: {:?}", err)
|
|
|
|
}
|
2019-03-24 15:42:00 +00:00
|
|
|
}
|
2021-02-19 23:17:18 +00:00
|
|
|
},
|
|
|
|
autoplay = &mut self.autoplay_fut, if !self.autoplay_fut.is_terminated() => {
|
|
|
|
match autoplay {
|
|
|
|
Ok(autoplay_station_uri) => {
|
|
|
|
info!("Autoplay uri resolved to <{:?}>", autoplay_station_uri);
|
|
|
|
self.context_fut = self.resolve_station(&autoplay_station_uri);
|
|
|
|
},
|
|
|
|
Err(err) => {
|
|
|
|
error!("AutoplayError: {:?}", err)
|
|
|
|
}
|
2019-03-24 15:42:00 +00:00
|
|
|
}
|
2021-02-19 23:17:18 +00:00
|
|
|
},
|
|
|
|
else => break
|
2017-01-20 12:56:42 +00:00
|
|
|
}
|
2021-02-19 23:17:18 +00:00
|
|
|
}
|
2016-02-17 19:35:52 +00:00
|
|
|
|
2021-02-20 19:59:57 +00:00
|
|
|
if self.sender.flush().await.is_err() {
|
|
|
|
warn!("Cannot flush spirc event sender.");
|
2017-01-20 12:56:42 +00:00
|
|
|
}
|
2016-02-17 19:35:52 +00:00
|
|
|
}
|
2016-01-20 15:47:05 +00:00
|
|
|
|
2019-03-24 14:15:14 +00:00
|
|
|
fn now_ms(&mut self) -> i64 {
|
|
|
|
let dur = match SystemTime::now().duration_since(UNIX_EPOCH) {
|
|
|
|
Ok(dur) => dur,
|
|
|
|
Err(err) => err.duration(),
|
|
|
|
};
|
2021-03-10 21:32:24 +00:00
|
|
|
|
|
|
|
dur.as_millis() as i64 + 1000 * self.session.time_delta()
|
2019-03-24 14:15:14 +00:00
|
|
|
}
|
|
|
|
|
2020-01-31 21:41:11 +00:00
|
|
|
fn update_state_position(&mut self, position_ms: u32) {
|
|
|
|
let now = self.now_ms();
|
|
|
|
self.state.set_position_measured_at(now as u64);
|
|
|
|
self.state.set_position_ms(position_ms);
|
|
|
|
}
|
|
|
|
|
2017-01-20 12:56:42 +00:00
|
|
|
fn handle_command(&mut self, cmd: SpircCommand) {
|
2017-02-23 11:05:32 +00:00
|
|
|
let active = self.device.get_is_active();
|
2017-01-20 12:56:42 +00:00
|
|
|
match cmd {
|
2017-02-23 11:05:32 +00:00
|
|
|
SpircCommand::Play => {
|
|
|
|
if active {
|
|
|
|
self.handle_play();
|
2020-02-07 10:11:49 +00:00
|
|
|
self.notify(None, true);
|
2017-02-23 11:05:32 +00:00
|
|
|
} else {
|
|
|
|
CommandSender::new(self, MessageType::kMessageTypePlay).send();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
SpircCommand::PlayPause => {
|
|
|
|
if active {
|
|
|
|
self.handle_play_pause();
|
2020-02-07 10:11:49 +00:00
|
|
|
self.notify(None, true);
|
2017-02-23 11:05:32 +00:00
|
|
|
} else {
|
|
|
|
CommandSender::new(self, MessageType::kMessageTypePlayPause).send();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
SpircCommand::Pause => {
|
|
|
|
if active {
|
|
|
|
self.handle_pause();
|
2020-02-07 10:11:49 +00:00
|
|
|
self.notify(None, true);
|
2017-02-23 11:05:32 +00:00
|
|
|
} else {
|
|
|
|
CommandSender::new(self, MessageType::kMessageTypePause).send();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
SpircCommand::Prev => {
|
|
|
|
if active {
|
|
|
|
self.handle_prev();
|
2020-02-07 10:11:49 +00:00
|
|
|
self.notify(None, true);
|
2017-02-23 11:05:32 +00:00
|
|
|
} else {
|
|
|
|
CommandSender::new(self, MessageType::kMessageTypePrev).send();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
SpircCommand::Next => {
|
|
|
|
if active {
|
|
|
|
self.handle_next();
|
2020-02-07 10:11:49 +00:00
|
|
|
self.notify(None, true);
|
2017-02-23 11:05:32 +00:00
|
|
|
} else {
|
|
|
|
CommandSender::new(self, MessageType::kMessageTypeNext).send();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
SpircCommand::VolumeUp => {
|
|
|
|
if active {
|
|
|
|
self.handle_volume_up();
|
2020-02-07 10:11:49 +00:00
|
|
|
self.notify(None, true);
|
2017-02-23 11:05:32 +00:00
|
|
|
} else {
|
|
|
|
CommandSender::new(self, MessageType::kMessageTypeVolumeUp).send();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
SpircCommand::VolumeDown => {
|
|
|
|
if active {
|
|
|
|
self.handle_volume_down();
|
2020-02-07 10:11:49 +00:00
|
|
|
self.notify(None, true);
|
2017-02-23 11:05:32 +00:00
|
|
|
} else {
|
|
|
|
CommandSender::new(self, MessageType::kMessageTypeVolumeDown).send();
|
|
|
|
}
|
|
|
|
}
|
2017-01-20 12:56:42 +00:00
|
|
|
SpircCommand::Shutdown => {
|
|
|
|
CommandSender::new(self, MessageType::kMessageTypeGoodbye).send();
|
|
|
|
self.shutdown = true;
|
2021-03-10 21:32:24 +00:00
|
|
|
if let Some(rx) = self.commands.as_mut() {
|
|
|
|
rx.close()
|
|
|
|
}
|
2017-01-20 12:56:42 +00:00
|
|
|
}
|
2021-03-09 21:37:11 +00:00
|
|
|
SpircCommand::Shuffle => {
|
|
|
|
CommandSender::new(self, MessageType::kMessageTypeShuffle).send();
|
|
|
|
}
|
2017-01-20 12:56:42 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-01-31 21:41:11 +00:00
|
|
|
fn handle_player_event(&mut self, event: PlayerEvent) {
|
|
|
|
// we only process events if the play_request_id matches. If it doesn't, it is
|
|
|
|
// an event that belongs to a previous track and only arrives now due to a race
|
|
|
|
// condition. In this case we have updated the state already and don't want to
|
|
|
|
// mess with it.
|
|
|
|
if let Some(play_request_id) = event.get_play_request_id() {
|
|
|
|
if Some(play_request_id) == self.play_request_id {
|
|
|
|
match event {
|
|
|
|
PlayerEvent::EndOfTrack { .. } => self.handle_end_of_track(),
|
2020-02-07 10:11:49 +00:00
|
|
|
PlayerEvent::Loading { .. } => self.notify(None, false),
|
2020-01-31 21:41:11 +00:00
|
|
|
PlayerEvent::Playing { position_ms, .. } => {
|
2020-02-02 00:07:05 +00:00
|
|
|
let new_nominal_start_time = self.now_ms() - position_ms as i64;
|
2020-01-31 21:41:11 +00:00
|
|
|
match self.play_status {
|
2020-02-02 22:15:15 +00:00
|
|
|
SpircPlayStatus::Playing {
|
|
|
|
ref mut nominal_start_time,
|
|
|
|
..
|
|
|
|
} => {
|
|
|
|
if (*nominal_start_time - new_nominal_start_time).abs() > 100 {
|
|
|
|
*nominal_start_time = new_nominal_start_time;
|
2020-01-31 21:41:11 +00:00
|
|
|
self.update_state_position(position_ms);
|
2020-02-07 10:11:49 +00:00
|
|
|
self.notify(None, true);
|
2020-01-31 21:41:11 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
SpircPlayStatus::LoadingPlay { .. }
|
|
|
|
| SpircPlayStatus::LoadingPause { .. } => {
|
|
|
|
self.state.set_status(PlayStatus::kPlayStatusPlay);
|
|
|
|
self.update_state_position(position_ms);
|
2020-02-07 10:11:49 +00:00
|
|
|
self.notify(None, true);
|
2020-01-31 21:41:11 +00:00
|
|
|
self.play_status = SpircPlayStatus::Playing {
|
|
|
|
nominal_start_time: new_nominal_start_time,
|
2020-02-02 22:15:15 +00:00
|
|
|
preloading_of_next_track_triggered: false,
|
2020-01-31 21:41:11 +00:00
|
|
|
};
|
|
|
|
}
|
|
|
|
_ => (),
|
|
|
|
};
|
|
|
|
trace!("==> kPlayStatusPlay");
|
|
|
|
}
|
|
|
|
PlayerEvent::Paused {
|
|
|
|
position_ms: new_position_ms,
|
|
|
|
..
|
|
|
|
} => {
|
|
|
|
match self.play_status {
|
|
|
|
SpircPlayStatus::Paused {
|
|
|
|
ref mut position_ms,
|
2020-02-02 22:15:15 +00:00
|
|
|
..
|
2020-01-31 21:41:11 +00:00
|
|
|
} => {
|
|
|
|
if *position_ms != new_position_ms {
|
|
|
|
*position_ms = new_position_ms;
|
|
|
|
self.update_state_position(new_position_ms);
|
2020-02-07 10:11:49 +00:00
|
|
|
self.notify(None, true);
|
2020-01-31 21:41:11 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
SpircPlayStatus::LoadingPlay { .. }
|
|
|
|
| SpircPlayStatus::LoadingPause { .. } => {
|
|
|
|
self.state.set_status(PlayStatus::kPlayStatusPause);
|
|
|
|
self.update_state_position(new_position_ms);
|
2020-02-07 10:11:49 +00:00
|
|
|
self.notify(None, true);
|
2020-01-31 21:41:11 +00:00
|
|
|
self.play_status = SpircPlayStatus::Paused {
|
|
|
|
position_ms: new_position_ms,
|
2020-02-02 22:15:15 +00:00
|
|
|
preloading_of_next_track_triggered: false,
|
2020-01-31 21:41:11 +00:00
|
|
|
};
|
|
|
|
}
|
|
|
|
_ => (),
|
|
|
|
}
|
|
|
|
trace!("==> kPlayStatusPause");
|
|
|
|
}
|
|
|
|
PlayerEvent::Stopped { .. } => match self.play_status {
|
|
|
|
SpircPlayStatus::Stopped => (),
|
|
|
|
_ => {
|
2020-02-27 01:25:25 +00:00
|
|
|
warn!("The player has stopped unexpectedly.");
|
2020-01-31 21:41:11 +00:00
|
|
|
self.state.set_status(PlayStatus::kPlayStatusStop);
|
2020-02-07 10:11:49 +00:00
|
|
|
self.notify(None, true);
|
2020-01-31 21:41:11 +00:00
|
|
|
self.play_status = SpircPlayStatus::Stopped;
|
|
|
|
}
|
|
|
|
},
|
2020-05-13 09:49:26 +00:00
|
|
|
PlayerEvent::TimeToPreloadNextTrack { .. } => self.handle_preload_next_track(),
|
2020-05-13 11:30:30 +00:00
|
|
|
PlayerEvent::Unavailable { track_id, .. } => self.handle_unavailable(track_id),
|
2020-01-31 21:41:11 +00:00
|
|
|
_ => (),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-12-10 23:03:35 +00:00
|
|
|
fn handle_user_attributes_update(&mut self, update: UserAttributesUpdate) {
|
|
|
|
trace!("Received attributes update: {:?}", update);
|
|
|
|
let attributes: UserAttributes = update
|
|
|
|
.get_pairs()
|
|
|
|
.iter()
|
|
|
|
.map(|pair| (pair.get_key().to_owned(), pair.get_value().to_owned()))
|
|
|
|
.collect();
|
|
|
|
let _ = self.session.set_user_attributes(attributes);
|
|
|
|
}
|
|
|
|
|
|
|
|
fn handle_user_attributes_mutation(&mut self, mutation: UserAttributesMutation) {
|
|
|
|
for attribute in mutation.get_fields().iter() {
|
|
|
|
let key = attribute.get_name();
|
|
|
|
if let Some(old_value) = self.session.user_attribute(key) {
|
|
|
|
let new_value = match old_value.as_ref() {
|
|
|
|
"0" => "1",
|
|
|
|
"1" => "0",
|
|
|
|
_ => &old_value,
|
|
|
|
};
|
|
|
|
self.session.set_user_attribute(key, new_value);
|
|
|
|
trace!(
|
|
|
|
"Received attribute mutation, {} was {} is now {}",
|
|
|
|
key,
|
|
|
|
old_value,
|
|
|
|
new_value
|
|
|
|
);
|
|
|
|
} else {
|
|
|
|
trace!(
|
|
|
|
"Received attribute mutation for {} but key was not found!",
|
|
|
|
key
|
|
|
|
);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-01-20 12:56:42 +00:00
|
|
|
fn handle_frame(&mut self, frame: Frame) {
|
2020-01-31 21:41:11 +00:00
|
|
|
let state_string = match frame.get_state().get_status() {
|
|
|
|
PlayStatus::kPlayStatusLoading => "kPlayStatusLoading",
|
|
|
|
PlayStatus::kPlayStatusPause => "kPlayStatusPause",
|
|
|
|
PlayStatus::kPlayStatusStop => "kPlayStatusStop",
|
|
|
|
PlayStatus::kPlayStatusPlay => "kPlayStatusPlay",
|
|
|
|
};
|
|
|
|
|
2018-02-11 17:52:53 +00:00
|
|
|
debug!(
|
2020-01-31 21:41:11 +00:00
|
|
|
"{:?} {:?} {} {} {} {}",
|
2018-02-11 17:52:53 +00:00
|
|
|
frame.get_typ(),
|
|
|
|
frame.get_device_state().get_name(),
|
|
|
|
frame.get_ident(),
|
|
|
|
frame.get_seq_nr(),
|
2020-01-31 21:41:11 +00:00
|
|
|
frame.get_state_update_id(),
|
|
|
|
state_string,
|
2018-02-11 17:52:53 +00:00
|
|
|
);
|
|
|
|
|
|
|
|
if frame.get_ident() == self.ident
|
2021-03-10 21:32:24 +00:00
|
|
|
|| (!frame.get_recipient().is_empty() && !frame.get_recipient().contains(&self.ident))
|
2018-02-11 17:52:53 +00:00
|
|
|
{
|
2016-01-20 15:47:05 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2015-07-08 19:50:44 +00:00
|
|
|
match frame.get_typ() {
|
2016-02-18 23:02:41 +00:00
|
|
|
MessageType::kMessageTypeHello => {
|
2020-02-07 10:11:49 +00:00
|
|
|
self.notify(Some(frame.get_ident()), true);
|
2015-07-08 19:50:44 +00:00
|
|
|
}
|
2017-01-29 14:11:20 +00:00
|
|
|
|
2016-02-18 23:02:41 +00:00
|
|
|
MessageType::kMessageTypeLoad => {
|
2017-01-20 14:44:13 +00:00
|
|
|
if !self.device.get_is_active() {
|
2019-03-24 14:15:14 +00:00
|
|
|
let now = self.now_ms();
|
2017-01-20 14:44:13 +00:00
|
|
|
self.device.set_is_active(true);
|
2019-03-24 14:15:14 +00:00
|
|
|
self.device.set_became_active_at(now);
|
2015-07-08 19:50:44 +00:00
|
|
|
}
|
|
|
|
|
2017-01-29 14:11:20 +00:00
|
|
|
self.update_tracks(&frame);
|
|
|
|
|
2021-03-10 21:32:24 +00:00
|
|
|
if !self.state.get_track().is_empty() {
|
2020-01-31 21:41:11 +00:00
|
|
|
let start_playing =
|
|
|
|
frame.get_state().get_status() == PlayStatus::kPlayStatusPlay;
|
|
|
|
self.load_track(start_playing, frame.get_state().get_position_ms());
|
2016-08-23 21:43:55 +00:00
|
|
|
} else {
|
2018-10-12 17:15:26 +00:00
|
|
|
info!("No more tracks left in queue");
|
2017-01-29 14:11:20 +00:00
|
|
|
self.state.set_status(PlayStatus::kPlayStatusStop);
|
2020-01-23 08:05:10 +00:00
|
|
|
self.player.stop();
|
2020-01-31 21:41:11 +00:00
|
|
|
self.play_status = SpircPlayStatus::Stopped;
|
2016-08-23 21:43:55 +00:00
|
|
|
}
|
2017-01-29 14:11:20 +00:00
|
|
|
|
2020-02-07 10:11:49 +00:00
|
|
|
self.notify(None, true);
|
2015-07-08 19:50:44 +00:00
|
|
|
}
|
2017-01-29 14:11:20 +00:00
|
|
|
|
2016-02-18 23:02:41 +00:00
|
|
|
MessageType::kMessageTypePlay => {
|
2017-02-23 11:05:32 +00:00
|
|
|
self.handle_play();
|
2020-02-07 10:11:49 +00:00
|
|
|
self.notify(None, true);
|
2017-02-23 11:05:32 +00:00
|
|
|
}
|
2017-01-29 14:11:20 +00:00
|
|
|
|
2017-02-23 11:05:32 +00:00
|
|
|
MessageType::kMessageTypePlayPause => {
|
|
|
|
self.handle_play_pause();
|
2020-02-07 10:11:49 +00:00
|
|
|
self.notify(None, true);
|
2015-07-08 19:50:44 +00:00
|
|
|
}
|
2017-01-29 14:11:20 +00:00
|
|
|
|
2016-02-18 23:02:41 +00:00
|
|
|
MessageType::kMessageTypePause => {
|
2017-02-23 11:05:32 +00:00
|
|
|
self.handle_pause();
|
2020-02-07 10:11:49 +00:00
|
|
|
self.notify(None, true);
|
2015-07-08 19:50:44 +00:00
|
|
|
}
|
2017-01-29 14:11:20 +00:00
|
|
|
|
2016-02-18 23:02:41 +00:00
|
|
|
MessageType::kMessageTypeNext => {
|
2017-02-23 11:05:32 +00:00
|
|
|
self.handle_next();
|
2020-02-07 10:11:49 +00:00
|
|
|
self.notify(None, true);
|
2016-01-14 03:27:34 +00:00
|
|
|
}
|
2017-01-29 14:11:20 +00:00
|
|
|
|
2016-02-18 23:02:41 +00:00
|
|
|
MessageType::kMessageTypePrev => {
|
2017-02-23 11:05:32 +00:00
|
|
|
self.handle_prev();
|
2020-02-07 10:11:49 +00:00
|
|
|
self.notify(None, true);
|
2017-02-23 11:05:32 +00:00
|
|
|
}
|
2017-01-29 14:11:20 +00:00
|
|
|
|
2017-02-23 11:05:32 +00:00
|
|
|
MessageType::kMessageTypeVolumeUp => {
|
|
|
|
self.handle_volume_up();
|
2020-02-07 10:11:49 +00:00
|
|
|
self.notify(None, true);
|
2017-02-23 11:05:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
MessageType::kMessageTypeVolumeDown => {
|
|
|
|
self.handle_volume_down();
|
2020-02-07 10:11:49 +00:00
|
|
|
self.notify(None, true);
|
2016-01-14 03:27:34 +00:00
|
|
|
}
|
2017-01-29 14:11:20 +00:00
|
|
|
|
2017-10-27 17:45:02 +00:00
|
|
|
MessageType::kMessageTypeRepeat => {
|
|
|
|
self.state.set_repeat(frame.get_state().get_repeat());
|
2020-02-07 10:11:49 +00:00
|
|
|
self.notify(None, true);
|
2017-10-27 17:45:02 +00:00
|
|
|
}
|
|
|
|
|
2017-11-03 01:15:27 +00:00
|
|
|
MessageType::kMessageTypeShuffle => {
|
|
|
|
self.state.set_shuffle(frame.get_state().get_shuffle());
|
2018-02-11 17:52:53 +00:00
|
|
|
if self.state.get_shuffle() {
|
2017-11-03 01:15:27 +00:00
|
|
|
let current_index = self.state.get_playing_track_index();
|
|
|
|
{
|
|
|
|
let tracks = self.state.mut_track();
|
|
|
|
tracks.swap(0, current_index as usize);
|
|
|
|
if let Some((_, rest)) = tracks.split_first_mut() {
|
2019-03-10 16:48:19 +00:00
|
|
|
let mut rng = rand::thread_rng();
|
|
|
|
rest.shuffle(&mut rng);
|
2017-11-03 01:15:27 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
self.state.set_playing_track_index(0);
|
|
|
|
} else {
|
|
|
|
let context = self.state.get_context_uri();
|
|
|
|
debug!("{:?}", context);
|
|
|
|
}
|
2020-02-07 10:11:49 +00:00
|
|
|
self.notify(None, true);
|
2017-11-03 01:15:27 +00:00
|
|
|
}
|
|
|
|
|
2016-02-18 23:02:41 +00:00
|
|
|
MessageType::kMessageTypeSeek => {
|
2020-01-31 21:41:11 +00:00
|
|
|
self.handle_seek(frame.get_position());
|
2020-02-07 10:11:49 +00:00
|
|
|
self.notify(None, true);
|
2015-07-08 19:50:44 +00:00
|
|
|
}
|
2017-01-29 14:11:20 +00:00
|
|
|
|
2016-02-18 23:02:41 +00:00
|
|
|
MessageType::kMessageTypeReplace => {
|
2017-01-29 14:11:20 +00:00
|
|
|
self.update_tracks(&frame);
|
2020-02-07 10:11:49 +00:00
|
|
|
self.notify(None, true);
|
2020-02-02 22:15:15 +00:00
|
|
|
|
|
|
|
if let SpircPlayStatus::Playing {
|
|
|
|
preloading_of_next_track_triggered,
|
|
|
|
..
|
|
|
|
}
|
|
|
|
| SpircPlayStatus::Paused {
|
|
|
|
preloading_of_next_track_triggered,
|
|
|
|
..
|
|
|
|
} = self.play_status
|
|
|
|
{
|
|
|
|
if preloading_of_next_track_triggered {
|
2020-05-10 12:31:43 +00:00
|
|
|
// Get the next track_id in the playlist
|
2020-02-02 22:15:15 +00:00
|
|
|
if let Some(track_id) = self.preview_next_track() {
|
|
|
|
self.player.preload(track_id);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2016-01-16 01:15:24 +00:00
|
|
|
}
|
2017-01-29 14:11:20 +00:00
|
|
|
|
|
|
|
MessageType::kMessageTypeVolume => {
|
2018-05-17 01:15:17 +00:00
|
|
|
self.set_volume(frame.get_volume() as u16);
|
2020-02-07 10:11:49 +00:00
|
|
|
self.notify(None, true);
|
2017-01-29 14:11:20 +00:00
|
|
|
}
|
|
|
|
|
2016-02-18 23:02:41 +00:00
|
|
|
MessageType::kMessageTypeNotify => {
|
2020-07-22 14:28:39 +00:00
|
|
|
if self.device.get_is_active()
|
|
|
|
&& frame.get_device_state().get_is_active()
|
|
|
|
&& self.device.get_became_active_at()
|
|
|
|
<= frame.get_device_state().get_became_active_at()
|
|
|
|
{
|
2017-01-20 14:44:13 +00:00
|
|
|
self.device.set_is_active(false);
|
2017-01-29 14:11:20 +00:00
|
|
|
self.state.set_status(PlayStatus::kPlayStatusStop);
|
2016-01-20 14:11:49 +00:00
|
|
|
self.player.stop();
|
2020-01-31 21:41:11 +00:00
|
|
|
self.play_status = SpircPlayStatus::Stopped;
|
2015-07-08 19:50:44 +00:00
|
|
|
}
|
|
|
|
}
|
2017-01-29 14:11:20 +00:00
|
|
|
|
2016-01-02 15:19:39 +00:00
|
|
|
_ => (),
|
2015-07-08 19:50:44 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-02-23 11:05:32 +00:00
|
|
|
fn handle_play(&mut self) {
|
2020-01-31 21:41:11 +00:00
|
|
|
match self.play_status {
|
2020-02-02 22:15:15 +00:00
|
|
|
SpircPlayStatus::Paused {
|
|
|
|
position_ms,
|
|
|
|
preloading_of_next_track_triggered,
|
|
|
|
} => {
|
2021-05-24 13:53:32 +00:00
|
|
|
// Synchronize the volume from the mixer. This is useful on
|
|
|
|
// systems that can switch sources from and back to librespot.
|
|
|
|
let current_volume = self.mixer.volume();
|
|
|
|
self.set_volume(current_volume);
|
|
|
|
|
2020-01-31 21:41:11 +00:00
|
|
|
self.player.play();
|
|
|
|
self.state.set_status(PlayStatus::kPlayStatusPlay);
|
|
|
|
self.update_state_position(position_ms);
|
|
|
|
self.play_status = SpircPlayStatus::Playing {
|
|
|
|
nominal_start_time: self.now_ms() as i64 - position_ms as i64,
|
2020-02-02 22:15:15 +00:00
|
|
|
preloading_of_next_track_triggered,
|
2020-01-31 21:41:11 +00:00
|
|
|
};
|
|
|
|
}
|
|
|
|
SpircPlayStatus::LoadingPause { position_ms } => {
|
|
|
|
self.player.play();
|
|
|
|
self.play_status = SpircPlayStatus::LoadingPlay { position_ms };
|
|
|
|
}
|
|
|
|
_ => (),
|
2017-02-23 11:05:32 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn handle_play_pause(&mut self) {
|
2020-01-31 21:41:11 +00:00
|
|
|
match self.play_status {
|
|
|
|
SpircPlayStatus::Paused { .. } | SpircPlayStatus::LoadingPause { .. } => {
|
|
|
|
self.handle_play()
|
|
|
|
}
|
|
|
|
SpircPlayStatus::Playing { .. } | SpircPlayStatus::LoadingPlay { .. } => {
|
2021-02-20 13:53:24 +00:00
|
|
|
self.handle_pause()
|
2020-01-31 21:41:11 +00:00
|
|
|
}
|
2017-02-23 11:05:32 +00:00
|
|
|
_ => (),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn handle_pause(&mut self) {
|
2020-01-31 21:41:11 +00:00
|
|
|
match self.play_status {
|
2020-02-02 22:15:15 +00:00
|
|
|
SpircPlayStatus::Playing {
|
|
|
|
nominal_start_time,
|
|
|
|
preloading_of_next_track_triggered,
|
|
|
|
} => {
|
2020-01-31 21:41:11 +00:00
|
|
|
self.player.pause();
|
|
|
|
self.state.set_status(PlayStatus::kPlayStatusPause);
|
|
|
|
let position_ms = (self.now_ms() - nominal_start_time) as u32;
|
|
|
|
self.update_state_position(position_ms);
|
2020-02-02 22:15:15 +00:00
|
|
|
self.play_status = SpircPlayStatus::Paused {
|
|
|
|
position_ms,
|
|
|
|
preloading_of_next_track_triggered,
|
|
|
|
};
|
2020-01-31 21:41:11 +00:00
|
|
|
}
|
|
|
|
SpircPlayStatus::LoadingPlay { position_ms } => {
|
|
|
|
self.player.pause();
|
|
|
|
self.play_status = SpircPlayStatus::LoadingPause { position_ms };
|
|
|
|
}
|
|
|
|
_ => (),
|
2017-02-23 11:05:32 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-01-31 21:41:11 +00:00
|
|
|
fn handle_seek(&mut self, position_ms: u32) {
|
|
|
|
self.update_state_position(position_ms);
|
|
|
|
self.player.seek(position_ms);
|
|
|
|
let now = self.now_ms();
|
|
|
|
match self.play_status {
|
|
|
|
SpircPlayStatus::Stopped => (),
|
|
|
|
SpircPlayStatus::LoadingPause {
|
|
|
|
position_ms: ref mut position,
|
|
|
|
}
|
|
|
|
| SpircPlayStatus::LoadingPlay {
|
|
|
|
position_ms: ref mut position,
|
|
|
|
}
|
|
|
|
| SpircPlayStatus::Paused {
|
|
|
|
position_ms: ref mut position,
|
2020-02-02 22:15:15 +00:00
|
|
|
..
|
2020-01-31 21:41:11 +00:00
|
|
|
} => *position = position_ms,
|
|
|
|
SpircPlayStatus::Playing {
|
|
|
|
ref mut nominal_start_time,
|
2020-02-02 22:15:15 +00:00
|
|
|
..
|
2020-01-31 21:41:11 +00:00
|
|
|
} => *nominal_start_time = now - position_ms as i64,
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
Improved next/prev handling for queued tracks.
1) A queued track is removed once it has become the current track.
Note that the track doesn't need to actually play i.e. it could
have been immediately skipped over with 'next()'. This is
implemented in 'consume_queued_track()'.
2) Queued tracks are always positioned immediately after the current
track. 1) ensures this is true for 'next()' but 'prev()' requires
all the queued tracks are actually moved for this to remain the
case.
Also fixed the case where 'prev()' on the first track would incorrectly
wrap back around to the last track even when repeat was disabled. The
correct behaviour is to remain on the first track and just seek to the
start.
For example, with the following tracks and repeat enabled:
TrackA, TrackB, TrackC-Q, TrackD-Q, TrackE
^^^^^^
Here, the result of 'prev' changes the current track from TrackB to
TrackA and the queued tracks (TrackC, TrackD) move to the position
immediately after TrackA:
TrackA, TrackC-Q, TrackD-Q, TrackB, TrackE
^^^^^^
Calling 'prev' again results in the current track wrapping back around
to TrackE and the queued tracks moving after that same track:
TrackA, TrackB, TrackE, TrackC-Q, TrackD-Q
^^^^^^
2018-02-01 00:02:12 +00:00
|
|
|
fn consume_queued_track(&mut self) -> usize {
|
|
|
|
// Removes current track if it is queued
|
|
|
|
// Returns the index of the next track
|
|
|
|
let current_index = self.state.get_playing_track_index() as usize;
|
2020-01-28 18:19:18 +00:00
|
|
|
if (current_index < self.state.get_track().len())
|
|
|
|
&& self.state.get_track()[current_index].get_queued()
|
|
|
|
{
|
Improved next/prev handling for queued tracks.
1) A queued track is removed once it has become the current track.
Note that the track doesn't need to actually play i.e. it could
have been immediately skipped over with 'next()'. This is
implemented in 'consume_queued_track()'.
2) Queued tracks are always positioned immediately after the current
track. 1) ensures this is true for 'next()' but 'prev()' requires
all the queued tracks are actually moved for this to remain the
case.
Also fixed the case where 'prev()' on the first track would incorrectly
wrap back around to the last track even when repeat was disabled. The
correct behaviour is to remain on the first track and just seek to the
start.
For example, with the following tracks and repeat enabled:
TrackA, TrackB, TrackC-Q, TrackD-Q, TrackE
^^^^^^
Here, the result of 'prev' changes the current track from TrackB to
TrackA and the queued tracks (TrackC, TrackD) move to the position
immediately after TrackA:
TrackA, TrackC-Q, TrackD-Q, TrackB, TrackE
^^^^^^
Calling 'prev' again results in the current track wrapping back around
to TrackE and the queued tracks moving after that same track:
TrackA, TrackB, TrackE, TrackC-Q, TrackD-Q
^^^^^^
2018-02-01 00:02:12 +00:00
|
|
|
self.state.mut_track().remove(current_index);
|
2020-01-23 08:05:10 +00:00
|
|
|
current_index
|
|
|
|
} else {
|
|
|
|
current_index + 1
|
2017-10-27 17:45:02 +00:00
|
|
|
}
|
Improved next/prev handling for queued tracks.
1) A queued track is removed once it has become the current track.
Note that the track doesn't need to actually play i.e. it could
have been immediately skipped over with 'next()'. This is
implemented in 'consume_queued_track()'.
2) Queued tracks are always positioned immediately after the current
track. 1) ensures this is true for 'next()' but 'prev()' requires
all the queued tracks are actually moved for this to remain the
case.
Also fixed the case where 'prev()' on the first track would incorrectly
wrap back around to the last track even when repeat was disabled. The
correct behaviour is to remain on the first track and just seek to the
start.
For example, with the following tracks and repeat enabled:
TrackA, TrackB, TrackC-Q, TrackD-Q, TrackE
^^^^^^
Here, the result of 'prev' changes the current track from TrackB to
TrackA and the queued tracks (TrackC, TrackD) move to the position
immediately after TrackA:
TrackA, TrackC-Q, TrackD-Q, TrackB, TrackE
^^^^^^
Calling 'prev' again results in the current track wrapping back around
to TrackE and the queued tracks moving after that same track:
TrackA, TrackB, TrackE, TrackC-Q, TrackD-Q
^^^^^^
2018-02-01 00:02:12 +00:00
|
|
|
}
|
2017-02-23 11:05:32 +00:00
|
|
|
|
2020-01-31 21:41:11 +00:00
|
|
|
fn preview_next_track(&mut self) -> Option<SpotifyId> {
|
2020-02-02 22:15:15 +00:00
|
|
|
self.get_track_id_to_play_from_playlist(self.state.get_playing_track_index() + 1)
|
2021-03-10 21:32:24 +00:00
|
|
|
.map(|(track_id, _)| track_id)
|
2020-01-31 21:41:11 +00:00
|
|
|
}
|
|
|
|
|
2020-05-13 09:49:26 +00:00
|
|
|
fn handle_preload_next_track(&mut self) {
|
|
|
|
// Requests the player thread to preload the next track
|
|
|
|
match self.play_status {
|
|
|
|
SpircPlayStatus::Paused {
|
|
|
|
ref mut preloading_of_next_track_triggered,
|
|
|
|
..
|
|
|
|
}
|
|
|
|
| SpircPlayStatus::Playing {
|
|
|
|
ref mut preloading_of_next_track_triggered,
|
|
|
|
..
|
|
|
|
} => {
|
|
|
|
*preloading_of_next_track_triggered = true;
|
|
|
|
if let Some(track_id) = self.preview_next_track() {
|
|
|
|
self.player.preload(track_id);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
SpircPlayStatus::LoadingPause { .. }
|
|
|
|
| SpircPlayStatus::LoadingPlay { .. }
|
|
|
|
| SpircPlayStatus::Stopped => (),
|
|
|
|
}
|
|
|
|
}
|
2020-05-27 14:24:21 +00:00
|
|
|
|
2020-05-13 11:30:30 +00:00
|
|
|
// Mark unavailable tracks so we can skip them later
|
|
|
|
fn handle_unavailable(&mut self, track_id: SpotifyId) {
|
2020-05-28 14:18:41 +00:00
|
|
|
let unavailables = self.get_track_index_for_spotify_id(&track_id, 0);
|
2020-05-13 11:30:30 +00:00
|
|
|
for &index in unavailables.iter() {
|
|
|
|
debug_assert_eq!(self.state.get_track()[index].get_gid(), track_id.to_raw());
|
|
|
|
let mut unplayable_track_ref = TrackRef::new();
|
|
|
|
unplayable_track_ref.set_gid(self.state.get_track()[index].get_gid().to_vec());
|
|
|
|
// Misuse context field to flag the track
|
|
|
|
unplayable_track_ref.set_context(String::from("NonPlayable"));
|
|
|
|
std::mem::swap(
|
|
|
|
&mut self.state.mut_track()[index],
|
|
|
|
&mut unplayable_track_ref,
|
|
|
|
);
|
|
|
|
debug!(
|
|
|
|
"Marked <{:?}> at {:?} as NonPlayable",
|
|
|
|
self.state.get_track()[index],
|
|
|
|
index,
|
|
|
|
);
|
2020-05-13 09:49:26 +00:00
|
|
|
}
|
|
|
|
self.handle_preload_next_track();
|
2020-01-31 21:41:11 +00:00
|
|
|
}
|
|
|
|
|
Improved next/prev handling for queued tracks.
1) A queued track is removed once it has become the current track.
Note that the track doesn't need to actually play i.e. it could
have been immediately skipped over with 'next()'. This is
implemented in 'consume_queued_track()'.
2) Queued tracks are always positioned immediately after the current
track. 1) ensures this is true for 'next()' but 'prev()' requires
all the queued tracks are actually moved for this to remain the
case.
Also fixed the case where 'prev()' on the first track would incorrectly
wrap back around to the last track even when repeat was disabled. The
correct behaviour is to remain on the first track and just seek to the
start.
For example, with the following tracks and repeat enabled:
TrackA, TrackB, TrackC-Q, TrackD-Q, TrackE
^^^^^^
Here, the result of 'prev' changes the current track from TrackB to
TrackA and the queued tracks (TrackC, TrackD) move to the position
immediately after TrackA:
TrackA, TrackC-Q, TrackD-Q, TrackB, TrackE
^^^^^^
Calling 'prev' again results in the current track wrapping back around
to TrackE and the queued tracks moving after that same track:
TrackA, TrackB, TrackE, TrackC-Q, TrackD-Q
^^^^^^
2018-02-01 00:02:12 +00:00
|
|
|
fn handle_next(&mut self) {
|
|
|
|
let mut new_index = self.consume_queued_track() as u32;
|
|
|
|
let mut continue_playing = true;
|
2019-03-24 15:42:00 +00:00
|
|
|
let tracks_len = self.state.get_track().len() as u32;
|
2018-10-12 17:15:26 +00:00
|
|
|
debug!(
|
|
|
|
"At track {:?} of {:?} <{:?}> update [{}]",
|
2021-10-05 20:08:26 +00:00
|
|
|
new_index + 1,
|
|
|
|
tracks_len,
|
2018-10-12 17:15:26 +00:00
|
|
|
self.state.get_context_uri(),
|
2019-03-24 15:42:00 +00:00
|
|
|
tracks_len - new_index < CONTEXT_FETCH_THRESHOLD
|
2018-10-12 17:15:26 +00:00
|
|
|
);
|
|
|
|
let context_uri = self.state.get_context_uri().to_owned();
|
2019-10-08 09:31:18 +00:00
|
|
|
if (context_uri.starts_with("spotify:station:")
|
2020-05-09 14:33:06 +00:00
|
|
|
|| context_uri.starts_with("spotify:dailymix:")
|
|
|
|
// spotify:user:xxx:collection
|
2020-05-10 20:19:40 +00:00
|
|
|
|| context_uri.starts_with(&format!("spotify:user:{}:collection",url_encode(&self.session.username()))))
|
2019-03-16 15:18:38 +00:00
|
|
|
&& ((self.state.get_track().len() as u32) - new_index) < CONTEXT_FETCH_THRESHOLD
|
2019-03-13 19:35:46 +00:00
|
|
|
{
|
2018-10-12 17:15:26 +00:00
|
|
|
self.context_fut = self.resolve_station(&context_uri);
|
|
|
|
self.update_tracks_from_context();
|
|
|
|
}
|
2019-03-24 15:42:00 +00:00
|
|
|
if new_index >= tracks_len {
|
2021-10-05 20:08:26 +00:00
|
|
|
if self.config.autoplay {
|
|
|
|
// Extend the playlist
|
|
|
|
debug!("Extending playlist <{}>", context_uri);
|
|
|
|
self.update_tracks_from_context();
|
|
|
|
self.player.set_auto_normalise_as_album(false);
|
|
|
|
} else {
|
|
|
|
new_index = 0;
|
|
|
|
continue_playing = self.state.get_repeat();
|
|
|
|
debug!(
|
|
|
|
"Looping around back to start, repeat is {}",
|
|
|
|
continue_playing
|
|
|
|
);
|
|
|
|
}
|
Improved next/prev handling for queued tracks.
1) A queued track is removed once it has become the current track.
Note that the track doesn't need to actually play i.e. it could
have been immediately skipped over with 'next()'. This is
implemented in 'consume_queued_track()'.
2) Queued tracks are always positioned immediately after the current
track. 1) ensures this is true for 'next()' but 'prev()' requires
all the queued tracks are actually moved for this to remain the
case.
Also fixed the case where 'prev()' on the first track would incorrectly
wrap back around to the last track even when repeat was disabled. The
correct behaviour is to remain on the first track and just seek to the
start.
For example, with the following tracks and repeat enabled:
TrackA, TrackB, TrackC-Q, TrackD-Q, TrackE
^^^^^^
Here, the result of 'prev' changes the current track from TrackB to
TrackA and the queued tracks (TrackC, TrackD) move to the position
immediately after TrackA:
TrackA, TrackC-Q, TrackD-Q, TrackB, TrackE
^^^^^^
Calling 'prev' again results in the current track wrapping back around
to TrackE and the queued tracks moving after that same track:
TrackA, TrackB, TrackE, TrackC-Q, TrackD-Q
^^^^^^
2018-02-01 00:02:12 +00:00
|
|
|
}
|
2017-02-23 11:05:32 +00:00
|
|
|
|
2020-01-23 08:05:10 +00:00
|
|
|
if tracks_len > 0 {
|
|
|
|
self.state.set_playing_track_index(new_index);
|
2020-01-31 21:41:11 +00:00
|
|
|
self.load_track(continue_playing, 0);
|
2020-01-28 18:19:18 +00:00
|
|
|
} else {
|
2020-01-23 08:05:10 +00:00
|
|
|
info!("Not playing next track because there are no more tracks left in queue.");
|
|
|
|
self.state.set_playing_track_index(0);
|
|
|
|
self.state.set_status(PlayStatus::kPlayStatusStop);
|
|
|
|
self.player.stop();
|
2020-01-31 21:41:11 +00:00
|
|
|
self.play_status = SpircPlayStatus::Stopped;
|
2020-01-23 08:05:10 +00:00
|
|
|
}
|
2017-02-23 11:05:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
fn handle_prev(&mut self) {
|
|
|
|
// Previous behaves differently based on the position
|
Improved next/prev handling for queued tracks.
1) A queued track is removed once it has become the current track.
Note that the track doesn't need to actually play i.e. it could
have been immediately skipped over with 'next()'. This is
implemented in 'consume_queued_track()'.
2) Queued tracks are always positioned immediately after the current
track. 1) ensures this is true for 'next()' but 'prev()' requires
all the queued tracks are actually moved for this to remain the
case.
Also fixed the case where 'prev()' on the first track would incorrectly
wrap back around to the last track even when repeat was disabled. The
correct behaviour is to remain on the first track and just seek to the
start.
For example, with the following tracks and repeat enabled:
TrackA, TrackB, TrackC-Q, TrackD-Q, TrackE
^^^^^^
Here, the result of 'prev' changes the current track from TrackB to
TrackA and the queued tracks (TrackC, TrackD) move to the position
immediately after TrackA:
TrackA, TrackC-Q, TrackD-Q, TrackB, TrackE
^^^^^^
Calling 'prev' again results in the current track wrapping back around
to TrackE and the queued tracks moving after that same track:
TrackA, TrackB, TrackE, TrackC-Q, TrackD-Q
^^^^^^
2018-02-01 00:02:12 +00:00
|
|
|
// Under 3s it goes to the previous song (starts playing)
|
|
|
|
// Over 3s it seeks to zero (retains previous play status)
|
2017-02-23 11:05:32 +00:00
|
|
|
if self.position() < 3000 {
|
Improved next/prev handling for queued tracks.
1) A queued track is removed once it has become the current track.
Note that the track doesn't need to actually play i.e. it could
have been immediately skipped over with 'next()'. This is
implemented in 'consume_queued_track()'.
2) Queued tracks are always positioned immediately after the current
track. 1) ensures this is true for 'next()' but 'prev()' requires
all the queued tracks are actually moved for this to remain the
case.
Also fixed the case where 'prev()' on the first track would incorrectly
wrap back around to the last track even when repeat was disabled. The
correct behaviour is to remain on the first track and just seek to the
start.
For example, with the following tracks and repeat enabled:
TrackA, TrackB, TrackC-Q, TrackD-Q, TrackE
^^^^^^
Here, the result of 'prev' changes the current track from TrackB to
TrackA and the queued tracks (TrackC, TrackD) move to the position
immediately after TrackA:
TrackA, TrackC-Q, TrackD-Q, TrackB, TrackE
^^^^^^
Calling 'prev' again results in the current track wrapping back around
to TrackE and the queued tracks moving after that same track:
TrackA, TrackB, TrackE, TrackC-Q, TrackD-Q
^^^^^^
2018-02-01 00:02:12 +00:00
|
|
|
// Queued tracks always follow the currently playing track.
|
|
|
|
// They should not be considered when calculating the previous
|
|
|
|
// track so extract them beforehand and reinsert them after it.
|
|
|
|
let mut queue_tracks = Vec::new();
|
|
|
|
{
|
|
|
|
let queue_index = self.consume_queued_track();
|
|
|
|
let tracks = self.state.mut_track();
|
|
|
|
while queue_index < tracks.len() && tracks[queue_index].get_queued() {
|
|
|
|
queue_tracks.push(tracks.remove(queue_index));
|
|
|
|
}
|
|
|
|
}
|
2017-02-23 11:05:32 +00:00
|
|
|
let current_index = self.state.get_playing_track_index();
|
Improved next/prev handling for queued tracks.
1) A queued track is removed once it has become the current track.
Note that the track doesn't need to actually play i.e. it could
have been immediately skipped over with 'next()'. This is
implemented in 'consume_queued_track()'.
2) Queued tracks are always positioned immediately after the current
track. 1) ensures this is true for 'next()' but 'prev()' requires
all the queued tracks are actually moved for this to remain the
case.
Also fixed the case where 'prev()' on the first track would incorrectly
wrap back around to the last track even when repeat was disabled. The
correct behaviour is to remain on the first track and just seek to the
start.
For example, with the following tracks and repeat enabled:
TrackA, TrackB, TrackC-Q, TrackD-Q, TrackE
^^^^^^
Here, the result of 'prev' changes the current track from TrackB to
TrackA and the queued tracks (TrackC, TrackD) move to the position
immediately after TrackA:
TrackA, TrackC-Q, TrackD-Q, TrackB, TrackE
^^^^^^
Calling 'prev' again results in the current track wrapping back around
to TrackE and the queued tracks moving after that same track:
TrackA, TrackB, TrackE, TrackC-Q, TrackD-Q
^^^^^^
2018-02-01 00:02:12 +00:00
|
|
|
let new_index = if current_index > 0 {
|
|
|
|
current_index - 1
|
|
|
|
} else if self.state.get_repeat() {
|
2017-02-23 11:05:32 +00:00
|
|
|
self.state.get_track().len() as u32 - 1
|
|
|
|
} else {
|
Improved next/prev handling for queued tracks.
1) A queued track is removed once it has become the current track.
Note that the track doesn't need to actually play i.e. it could
have been immediately skipped over with 'next()'. This is
implemented in 'consume_queued_track()'.
2) Queued tracks are always positioned immediately after the current
track. 1) ensures this is true for 'next()' but 'prev()' requires
all the queued tracks are actually moved for this to remain the
case.
Also fixed the case where 'prev()' on the first track would incorrectly
wrap back around to the last track even when repeat was disabled. The
correct behaviour is to remain on the first track and just seek to the
start.
For example, with the following tracks and repeat enabled:
TrackA, TrackB, TrackC-Q, TrackD-Q, TrackE
^^^^^^
Here, the result of 'prev' changes the current track from TrackB to
TrackA and the queued tracks (TrackC, TrackD) move to the position
immediately after TrackA:
TrackA, TrackC-Q, TrackD-Q, TrackB, TrackE
^^^^^^
Calling 'prev' again results in the current track wrapping back around
to TrackE and the queued tracks moving after that same track:
TrackA, TrackB, TrackE, TrackC-Q, TrackD-Q
^^^^^^
2018-02-01 00:02:12 +00:00
|
|
|
0
|
2017-02-23 11:05:32 +00:00
|
|
|
};
|
Improved next/prev handling for queued tracks.
1) A queued track is removed once it has become the current track.
Note that the track doesn't need to actually play i.e. it could
have been immediately skipped over with 'next()'. This is
implemented in 'consume_queued_track()'.
2) Queued tracks are always positioned immediately after the current
track. 1) ensures this is true for 'next()' but 'prev()' requires
all the queued tracks are actually moved for this to remain the
case.
Also fixed the case where 'prev()' on the first track would incorrectly
wrap back around to the last track even when repeat was disabled. The
correct behaviour is to remain on the first track and just seek to the
start.
For example, with the following tracks and repeat enabled:
TrackA, TrackB, TrackC-Q, TrackD-Q, TrackE
^^^^^^
Here, the result of 'prev' changes the current track from TrackB to
TrackA and the queued tracks (TrackC, TrackD) move to the position
immediately after TrackA:
TrackA, TrackC-Q, TrackD-Q, TrackB, TrackE
^^^^^^
Calling 'prev' again results in the current track wrapping back around
to TrackE and the queued tracks moving after that same track:
TrackA, TrackB, TrackE, TrackC-Q, TrackD-Q
^^^^^^
2018-02-01 00:02:12 +00:00
|
|
|
// Reinsert queued tracks after the new playing track.
|
|
|
|
let mut pos = (new_index + 1) as usize;
|
2021-03-10 21:32:24 +00:00
|
|
|
for track in queue_tracks {
|
Improved next/prev handling for queued tracks.
1) A queued track is removed once it has become the current track.
Note that the track doesn't need to actually play i.e. it could
have been immediately skipped over with 'next()'. This is
implemented in 'consume_queued_track()'.
2) Queued tracks are always positioned immediately after the current
track. 1) ensures this is true for 'next()' but 'prev()' requires
all the queued tracks are actually moved for this to remain the
case.
Also fixed the case where 'prev()' on the first track would incorrectly
wrap back around to the last track even when repeat was disabled. The
correct behaviour is to remain on the first track and just seek to the
start.
For example, with the following tracks and repeat enabled:
TrackA, TrackB, TrackC-Q, TrackD-Q, TrackE
^^^^^^
Here, the result of 'prev' changes the current track from TrackB to
TrackA and the queued tracks (TrackC, TrackD) move to the position
immediately after TrackA:
TrackA, TrackC-Q, TrackD-Q, TrackB, TrackE
^^^^^^
Calling 'prev' again results in the current track wrapping back around
to TrackE and the queued tracks moving after that same track:
TrackA, TrackB, TrackE, TrackC-Q, TrackD-Q
^^^^^^
2018-02-01 00:02:12 +00:00
|
|
|
self.state.mut_track().insert(pos, track);
|
|
|
|
pos += 1;
|
|
|
|
}
|
2017-02-23 11:05:32 +00:00
|
|
|
|
|
|
|
self.state.set_playing_track_index(new_index);
|
|
|
|
|
2020-01-31 21:41:11 +00:00
|
|
|
self.load_track(true, 0);
|
2017-02-23 11:05:32 +00:00
|
|
|
} else {
|
2020-01-31 21:41:11 +00:00
|
|
|
self.handle_seek(0);
|
2017-02-23 11:05:32 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn handle_volume_up(&mut self) {
|
2021-05-24 13:53:32 +00:00
|
|
|
let volume = (self.device.get_volume() as u16).saturating_add(VOLUME_STEP_SIZE);
|
|
|
|
self.set_volume(volume);
|
2017-02-23 11:05:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
fn handle_volume_down(&mut self) {
|
2021-05-24 13:53:32 +00:00
|
|
|
let volume = (self.device.get_volume() as u16).saturating_sub(VOLUME_STEP_SIZE);
|
|
|
|
self.set_volume(volume);
|
2017-02-23 11:05:32 +00:00
|
|
|
}
|
|
|
|
|
2017-01-29 14:11:20 +00:00
|
|
|
fn handle_end_of_track(&mut self) {
|
2018-02-09 01:05:50 +00:00
|
|
|
self.handle_next();
|
2020-02-07 10:11:49 +00:00
|
|
|
self.notify(None, true);
|
2016-01-20 13:51:35 +00:00
|
|
|
}
|
2016-01-20 15:47:05 +00:00
|
|
|
|
2017-01-29 14:11:20 +00:00
|
|
|
fn position(&mut self) -> u32 {
|
2020-01-31 21:41:11 +00:00
|
|
|
match self.play_status {
|
|
|
|
SpircPlayStatus::Stopped => 0,
|
|
|
|
SpircPlayStatus::LoadingPlay { position_ms }
|
|
|
|
| SpircPlayStatus::LoadingPause { position_ms }
|
2020-02-02 22:15:15 +00:00
|
|
|
| SpircPlayStatus::Paused { position_ms, .. } => position_ms,
|
|
|
|
SpircPlayStatus::Playing {
|
|
|
|
nominal_start_time, ..
|
|
|
|
} => (self.now_ms() - nominal_start_time) as u32,
|
2020-01-31 21:41:11 +00:00
|
|
|
}
|
2015-07-08 19:50:44 +00:00
|
|
|
}
|
|
|
|
|
2021-02-19 23:17:18 +00:00
|
|
|
fn resolve_station(&self, uri: &str) -> BoxedFuture<Result<serde_json::Value, MercuryError>> {
|
2018-10-12 17:15:26 +00:00
|
|
|
let radio_uri = format!("hm://radio-apollo/v3/stations/{}", uri);
|
|
|
|
|
|
|
|
self.resolve_uri(&radio_uri)
|
|
|
|
}
|
|
|
|
|
2021-02-19 23:17:18 +00:00
|
|
|
fn resolve_autoplay_uri(&self, uri: &str) -> BoxedFuture<Result<String, MercuryError>> {
|
2019-03-24 15:42:00 +00:00
|
|
|
let query_uri = format!("hm://autoplay-enabled/query?uri={}", uri);
|
|
|
|
let request = self.session.mercury().get(query_uri);
|
2021-02-19 23:17:18 +00:00
|
|
|
Box::pin(
|
|
|
|
async {
|
|
|
|
let response = request.await?;
|
|
|
|
|
|
|
|
if response.status_code == 200 {
|
|
|
|
let data = response
|
|
|
|
.payload
|
|
|
|
.first()
|
|
|
|
.expect("Empty autoplay uri")
|
|
|
|
.to_vec();
|
|
|
|
let autoplay_uri = String::from_utf8(data).unwrap();
|
|
|
|
Ok(autoplay_uri)
|
|
|
|
} else {
|
|
|
|
warn!("No autoplay_uri found");
|
|
|
|
Err(MercuryError)
|
|
|
|
}
|
2020-01-07 11:13:49 +00:00
|
|
|
}
|
2021-02-19 23:17:18 +00:00
|
|
|
.fuse(),
|
|
|
|
)
|
2019-03-24 15:42:00 +00:00
|
|
|
}
|
|
|
|
|
2021-02-19 23:17:18 +00:00
|
|
|
fn resolve_uri(&self, uri: &str) -> BoxedFuture<Result<serde_json::Value, MercuryError>> {
|
2018-10-12 17:15:26 +00:00
|
|
|
let request = self.session.mercury().get(uri);
|
|
|
|
|
2021-02-19 23:17:18 +00:00
|
|
|
Box::pin(
|
|
|
|
async move {
|
|
|
|
let response = request.await?;
|
2018-10-12 17:15:26 +00:00
|
|
|
|
2021-02-19 23:17:18 +00:00
|
|
|
let data = response
|
|
|
|
.payload
|
|
|
|
.first()
|
|
|
|
.expect("Empty payload on context uri");
|
2021-09-01 19:25:32 +00:00
|
|
|
let response: serde_json::Value = serde_json::from_slice(data).unwrap();
|
2021-02-19 23:17:18 +00:00
|
|
|
|
|
|
|
Ok(response)
|
|
|
|
}
|
|
|
|
.fuse(),
|
|
|
|
)
|
2018-10-12 17:15:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
fn update_tracks_from_context(&mut self) {
|
|
|
|
if let Some(ref context) = self.context {
|
|
|
|
self.context_fut = self.resolve_uri(&context.next_page_url);
|
|
|
|
|
|
|
|
let new_tracks = &context.tracks;
|
2019-03-28 14:27:50 +00:00
|
|
|
debug!("Adding {:?} tracks from context to frame", new_tracks.len());
|
|
|
|
let mut track_vec = self.state.take_track().into_vec();
|
|
|
|
if let Some(head) = track_vec.len().checked_sub(CONTEXT_TRACKS_HISTORY) {
|
|
|
|
track_vec.drain(0..head);
|
|
|
|
}
|
2021-09-01 19:25:32 +00:00
|
|
|
track_vec.extend_from_slice(new_tracks);
|
2019-10-08 09:31:18 +00:00
|
|
|
self.state
|
|
|
|
.set_track(protobuf::RepeatedField::from_vec(track_vec));
|
2019-03-28 14:27:50 +00:00
|
|
|
|
|
|
|
// Update playing index
|
|
|
|
if let Some(new_index) = self
|
|
|
|
.state
|
|
|
|
.get_playing_track_index()
|
|
|
|
.checked_sub(CONTEXT_TRACKS_HISTORY as u32)
|
2019-03-16 15:18:38 +00:00
|
|
|
{
|
2019-03-28 14:27:50 +00:00
|
|
|
self.state.set_playing_track_index(new_index);
|
2018-10-12 17:15:26 +00:00
|
|
|
}
|
2019-03-24 15:42:00 +00:00
|
|
|
} else {
|
|
|
|
warn!("No context to update from!");
|
2018-10-12 17:15:26 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-01-29 16:25:09 +00:00
|
|
|
fn update_tracks(&mut self, frame: &protocol::spirc::Frame) {
|
2019-10-09 17:49:13 +00:00
|
|
|
debug!("State: {:?}", frame.get_state());
|
2017-01-29 14:11:20 +00:00
|
|
|
let index = frame.get_state().get_playing_track_index();
|
2018-02-17 15:17:05 +00:00
|
|
|
let context_uri = frame.get_state().get_context_uri().to_owned();
|
2018-10-12 17:15:26 +00:00
|
|
|
let tracks = frame.get_state().get_track();
|
|
|
|
debug!("Frame has {:?} tracks", tracks.len());
|
2019-10-08 09:31:18 +00:00
|
|
|
if context_uri.starts_with("spotify:station:")
|
|
|
|
|| context_uri.starts_with("spotify:dailymix:")
|
|
|
|
{
|
2018-10-12 17:15:26 +00:00
|
|
|
self.context_fut = self.resolve_station(&context_uri);
|
2019-11-05 19:34:43 +00:00
|
|
|
} else if self.config.autoplay {
|
|
|
|
info!("Fetching autoplay context uri");
|
2019-03-24 15:42:00 +00:00
|
|
|
// Get autoplay_station_uri for regular playlists
|
|
|
|
self.autoplay_fut = self.resolve_autoplay_uri(&context_uri);
|
2018-10-12 17:15:26 +00:00
|
|
|
}
|
2017-01-29 14:11:20 +00:00
|
|
|
|
2021-09-20 17:22:02 +00:00
|
|
|
self.player
|
|
|
|
.set_auto_normalise_as_album(context_uri.starts_with("spotify:album:"));
|
|
|
|
|
2017-01-29 14:11:20 +00:00
|
|
|
self.state.set_playing_track_index(index);
|
2021-03-10 21:32:24 +00:00
|
|
|
self.state.set_track(tracks.iter().cloned().collect());
|
2018-02-17 15:17:05 +00:00
|
|
|
self.state.set_context_uri(context_uri);
|
2019-10-19 11:42:23 +00:00
|
|
|
// has_shuffle/repeat seem to always be true in these replace msgs,
|
|
|
|
// but to replicate the behaviour of the Android client we have to
|
|
|
|
// ignore false values.
|
|
|
|
let state = frame.get_state();
|
|
|
|
if state.get_repeat() {
|
|
|
|
self.state.set_repeat(true);
|
|
|
|
}
|
|
|
|
if state.get_shuffle() {
|
|
|
|
self.state.set_shuffle(true);
|
|
|
|
}
|
2016-01-20 15:47:05 +00:00
|
|
|
}
|
|
|
|
|
2020-05-13 11:30:30 +00:00
|
|
|
// Helper to find corresponding index(s) for track_id
|
2020-05-13 09:49:26 +00:00
|
|
|
fn get_track_index_for_spotify_id(
|
|
|
|
&self,
|
|
|
|
track_id: &SpotifyId,
|
|
|
|
start_index: usize,
|
2020-05-13 11:30:30 +00:00
|
|
|
) -> Vec<usize> {
|
|
|
|
let index: Vec<usize> = self.state.get_track()[start_index..]
|
2020-05-13 09:49:26 +00:00
|
|
|
.iter()
|
2020-05-13 11:30:30 +00:00
|
|
|
.enumerate()
|
|
|
|
.filter(|&(_, track_ref)| track_ref.get_gid() == track_id.to_raw())
|
|
|
|
.map(|(idx, _)| start_index + idx)
|
|
|
|
.collect();
|
2020-05-28 14:18:41 +00:00
|
|
|
// Sanity check
|
|
|
|
debug_assert!(!index.is_empty());
|
2020-05-13 09:49:26 +00:00
|
|
|
index
|
|
|
|
}
|
|
|
|
|
2020-05-13 11:30:30 +00:00
|
|
|
// Broken out here so we can refactor this later when we move to SpotifyObjectID or similar
|
|
|
|
fn track_ref_is_unavailable(&self, track_ref: &TrackRef) -> bool {
|
|
|
|
track_ref.get_context() == "NonPlayable"
|
|
|
|
}
|
|
|
|
|
2020-02-02 22:15:15 +00:00
|
|
|
fn get_track_id_to_play_from_playlist(&self, index: u32) -> Option<(SpotifyId, u32)> {
|
2020-05-13 11:24:30 +00:00
|
|
|
let tracks_len = self.state.get_track().len();
|
2020-02-02 22:15:15 +00:00
|
|
|
|
2021-11-18 03:15:35 +00:00
|
|
|
// Guard against tracks_len being zero to prevent
|
|
|
|
// 'index out of bounds: the len is 0 but the index is 0'
|
|
|
|
// https://github.com/librespot-org/librespot/issues/226#issuecomment-971642037
|
|
|
|
if tracks_len == 0 {
|
|
|
|
warn!("No playable track found in state: {:?}", self.state);
|
|
|
|
return None;
|
|
|
|
}
|
|
|
|
|
2020-05-13 11:24:30 +00:00
|
|
|
let mut new_playlist_index = index as usize;
|
2020-02-02 22:15:15 +00:00
|
|
|
|
|
|
|
if new_playlist_index >= tracks_len {
|
|
|
|
new_playlist_index = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
let start_index = new_playlist_index;
|
|
|
|
|
2019-10-22 10:05:35 +00:00
|
|
|
// Cycle through all tracks, break if we don't find any playable tracks
|
|
|
|
// tracks in each frame either have a gid or uri (that may or may not be a valid track)
|
|
|
|
// E.g - context based frames sometimes contain tracks with <spotify:meta:page:>
|
2020-02-02 22:15:15 +00:00
|
|
|
|
2020-05-13 11:24:30 +00:00
|
|
|
let mut track_ref = self.state.get_track()[new_playlist_index].clone();
|
2021-12-07 22:22:24 +00:00
|
|
|
let mut track_id = SpotifyId::try_from(&track_ref);
|
|
|
|
while self.track_ref_is_unavailable(&track_ref) || track_id.is_err() {
|
2020-02-02 22:15:15 +00:00
|
|
|
warn!(
|
|
|
|
"Skipping track <{:?}> at position [{}] of {}",
|
2020-05-28 14:18:41 +00:00
|
|
|
track_ref, new_playlist_index, tracks_len
|
2020-02-02 22:15:15 +00:00
|
|
|
);
|
|
|
|
|
|
|
|
new_playlist_index += 1;
|
|
|
|
if new_playlist_index >= tracks_len {
|
|
|
|
new_playlist_index = 0;
|
2019-03-13 19:35:46 +00:00
|
|
|
}
|
2015-07-08 19:50:44 +00:00
|
|
|
|
2020-02-02 22:15:15 +00:00
|
|
|
if new_playlist_index == start_index {
|
|
|
|
warn!("No playable track found in state: {:?}", self.state);
|
|
|
|
return None;
|
2019-03-13 19:35:46 +00:00
|
|
|
}
|
2020-05-13 11:24:30 +00:00
|
|
|
track_ref = self.state.get_track()[new_playlist_index].clone();
|
2021-12-07 22:22:24 +00:00
|
|
|
track_id = SpotifyId::try_from(&track_ref);
|
2019-10-09 17:49:13 +00:00
|
|
|
}
|
2015-07-08 19:50:44 +00:00
|
|
|
|
2020-02-02 22:15:15 +00:00
|
|
|
match track_id {
|
2020-05-13 11:24:30 +00:00
|
|
|
Ok(track_id) => Some((track_id, new_playlist_index as u32)),
|
2020-02-02 22:15:15 +00:00
|
|
|
Err(_) => None,
|
2017-01-29 16:25:09 +00:00
|
|
|
}
|
2020-02-02 22:15:15 +00:00
|
|
|
}
|
2017-01-29 16:25:09 +00:00
|
|
|
|
2020-02-02 22:15:15 +00:00
|
|
|
fn load_track(&mut self, start_playing: bool, position_ms: u32) {
|
|
|
|
let index = self.state.get_playing_track_index();
|
|
|
|
|
|
|
|
match self.get_track_id_to_play_from_playlist(index) {
|
|
|
|
Some((track, index)) => {
|
|
|
|
self.state.set_playing_track_index(index);
|
|
|
|
|
|
|
|
self.play_request_id = Some(self.player.load(track, start_playing, position_ms));
|
|
|
|
|
|
|
|
self.update_state_position(position_ms);
|
|
|
|
if start_playing {
|
2020-05-27 17:51:56 +00:00
|
|
|
self.state.set_status(PlayStatus::kPlayStatusPlay);
|
2020-02-02 22:15:15 +00:00
|
|
|
self.play_status = SpircPlayStatus::LoadingPlay { position_ms };
|
|
|
|
} else {
|
2020-05-27 17:51:56 +00:00
|
|
|
self.state.set_status(PlayStatus::kPlayStatusPause);
|
2020-02-02 22:15:15 +00:00
|
|
|
self.play_status = SpircPlayStatus::LoadingPause { position_ms };
|
|
|
|
}
|
|
|
|
}
|
|
|
|
None => {
|
|
|
|
self.state.set_status(PlayStatus::kPlayStatusStop);
|
|
|
|
self.player.stop();
|
|
|
|
self.play_status = SpircPlayStatus::Stopped;
|
|
|
|
}
|
2017-01-29 16:25:09 +00:00
|
|
|
}
|
2017-01-29 14:11:20 +00:00
|
|
|
}
|
2015-07-08 19:50:44 +00:00
|
|
|
|
2017-01-29 14:11:20 +00:00
|
|
|
fn hello(&mut self) {
|
|
|
|
CommandSender::new(self, MessageType::kMessageTypeHello).send();
|
|
|
|
}
|
2015-07-08 19:50:44 +00:00
|
|
|
|
2020-02-07 10:11:49 +00:00
|
|
|
fn notify(&mut self, recipient: Option<&str>, suppress_loading_status: bool) {
|
|
|
|
if suppress_loading_status && (self.state.get_status() == PlayStatus::kPlayStatusLoading) {
|
|
|
|
return;
|
|
|
|
};
|
2020-01-31 21:41:11 +00:00
|
|
|
let status_string = match self.state.get_status() {
|
|
|
|
PlayStatus::kPlayStatusLoading => "kPlayStatusLoading",
|
|
|
|
PlayStatus::kPlayStatusPause => "kPlayStatusPause",
|
|
|
|
PlayStatus::kPlayStatusStop => "kPlayStatusStop",
|
|
|
|
PlayStatus::kPlayStatusPlay => "kPlayStatusPlay",
|
|
|
|
};
|
|
|
|
trace!("Sending status to server: [{}]", status_string);
|
2017-01-29 14:11:20 +00:00
|
|
|
let mut cs = CommandSender::new(self, MessageType::kMessageTypeNotify);
|
|
|
|
if let Some(s) = recipient {
|
2021-09-01 19:25:32 +00:00
|
|
|
cs = cs.recipient(s);
|
2017-01-29 14:11:20 +00:00
|
|
|
}
|
|
|
|
cs.send();
|
|
|
|
}
|
2018-05-17 01:15:17 +00:00
|
|
|
|
|
|
|
fn set_volume(&mut self, volume: u16) {
|
|
|
|
self.device.set_volume(volume as u32);
|
2021-05-24 13:53:32 +00:00
|
|
|
self.mixer.set_volume(volume);
|
2018-05-17 01:15:17 +00:00
|
|
|
if let Some(cache) = self.session.cache() {
|
2021-01-25 09:52:06 +00:00
|
|
|
cache.save_volume(volume)
|
2018-05-17 01:15:17 +00:00
|
|
|
}
|
2020-01-31 21:41:11 +00:00
|
|
|
self.player.emit_volume_set_event(volume);
|
2018-05-17 01:15:17 +00:00
|
|
|
}
|
2015-07-08 19:50:44 +00:00
|
|
|
}
|
2016-02-16 21:25:55 +00:00
|
|
|
|
2017-02-22 04:17:04 +00:00
|
|
|
impl Drop for SpircTask {
|
|
|
|
fn drop(&mut self) {
|
|
|
|
debug!("drop Spirc[{}]", self.session.session_id());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-02-17 14:24:40 +00:00
|
|
|
struct CommandSender<'a> {
|
2017-01-20 12:56:42 +00:00
|
|
|
spirc: &'a mut SpircTask,
|
2017-02-21 21:49:45 +00:00
|
|
|
frame: protocol::spirc::Frame,
|
2016-02-17 14:24:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
impl<'a> CommandSender<'a> {
|
2017-01-20 12:56:42 +00:00
|
|
|
fn new(spirc: &'a mut SpircTask, cmd: MessageType) -> CommandSender {
|
2018-02-17 09:15:09 +00:00
|
|
|
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());
|
2019-03-24 14:15:14 +00:00
|
|
|
frame.set_state_update_id(spirc.now_ms());
|
2021-03-10 21:39:01 +00:00
|
|
|
CommandSender { spirc, frame }
|
2016-02-16 21:25:55 +00:00
|
|
|
}
|
|
|
|
|
2017-02-21 21:49:45 +00:00
|
|
|
fn recipient(mut self, recipient: &'a str) -> CommandSender {
|
|
|
|
self.frame.mut_recipient().push(recipient.to_owned());
|
2016-02-17 14:24:40 +00:00
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2017-02-21 22:46:19 +00:00
|
|
|
#[allow(dead_code)]
|
2017-02-21 21:49:45 +00:00
|
|
|
fn state(mut self, state: protocol::spirc::State) -> CommandSender<'a> {
|
|
|
|
self.frame.set_state(state);
|
2016-02-17 14:24:40 +00:00
|
|
|
self
|
|
|
|
}
|
2017-01-29 14:11:20 +00:00
|
|
|
|
2017-02-21 21:49:45 +00:00
|
|
|
fn send(mut self) {
|
2017-02-21 22:46:19 +00:00
|
|
|
if !self.frame.has_state() && self.spirc.device.get_is_active() {
|
|
|
|
self.frame.set_state(self.spirc.state.clone());
|
2016-02-17 14:24:40 +00:00
|
|
|
}
|
|
|
|
|
2021-02-20 19:59:57 +00:00
|
|
|
self.spirc.sender.send(self.frame.write_to_bytes().unwrap());
|
2016-02-17 14:24:40 +00:00
|
|
|
}
|
2016-02-16 21:25:55 +00:00
|
|
|
}
|