From 19ae8fcbfc13e63652d19ae6018801eef7664642 Mon Sep 17 00:00:00 2001 From: Henrik Friedrichsen Date: Mon, 4 Mar 2019 00:29:48 +0100 Subject: [PATCH] rename player events --- src/events.rs | 2 +- src/main.rs | 2 +- src/spotify.rs | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/events.rs b/src/events.rs index e4d3014..a8781a8 100644 --- a/src/events.rs +++ b/src/events.rs @@ -5,7 +5,7 @@ use spotify::PlayerState; pub enum Event { QueueUpdate, - PlayState(PlayerState), + Player(PlayerState), } pub type EventSender = Sender; diff --git a/src/main.rs b/src/main.rs index 561c6a9..dbca4c3 100644 --- a/src/main.rs +++ b/src/main.rs @@ -162,7 +162,7 @@ fn main() { trace!("event received"); match event { Event::QueueUpdate => queue.redraw(&mut cursive), - Event::PlayState(state) => spotify.updatestate(state), + Event::Player(state) => spotify.updatestate(state), } } } diff --git a/src/spotify.rs b/src/spotify.rs index 22d81eb..7d5bf81 100644 --- a/src/spotify.rs +++ b/src/spotify.rs @@ -95,15 +95,15 @@ impl futures::Future for Worker { } WorkerCommand::Play => { self.player.play(); - self.events.send(Event::PlayState(PlayerState::Playing)); + self.events.send(Event::Player(PlayerState::Playing)); } WorkerCommand::Pause => { self.player.pause(); - self.events.send(Event::PlayState(PlayerState::Paused)); + self.events.send(Event::Player(PlayerState::Paused)); } WorkerCommand::Stop => { self.player.stop(); - self.events.send(Event::PlayState(PlayerState::Stopped)); + self.events.send(Event::Player(PlayerState::Stopped)); } } } @@ -120,9 +120,9 @@ impl futures::Future for Worker { self.play_task = Box::new(self.player.load(trackid, false, 0)); self.player.play(); - self.events.send(Event::PlayState(PlayerState::Playing)); + self.events.send(Event::Player(PlayerState::Playing)); } else { - self.events.send(Event::PlayState(PlayerState::Stopped)); + self.events.send(Event::Player(PlayerState::Stopped)); } } Ok(Async::NotReady) => (),