rename player events

This commit is contained in:
Henrik Friedrichsen
2019-03-04 00:29:48 +01:00
parent bb8326af88
commit 19ae8fcbfc
3 changed files with 7 additions and 7 deletions

View File

@@ -5,7 +5,7 @@ use spotify::PlayerState;
pub enum Event { pub enum Event {
QueueUpdate, QueueUpdate,
PlayState(PlayerState), Player(PlayerState),
} }
pub type EventSender = Sender<Event>; pub type EventSender = Sender<Event>;

View File

@@ -162,7 +162,7 @@ fn main() {
trace!("event received"); trace!("event received");
match event { match event {
Event::QueueUpdate => queue.redraw(&mut cursive), Event::QueueUpdate => queue.redraw(&mut cursive),
Event::PlayState(state) => spotify.updatestate(state), Event::Player(state) => spotify.updatestate(state),
} }
} }
} }

View File

@@ -95,15 +95,15 @@ impl futures::Future for Worker {
} }
WorkerCommand::Play => { WorkerCommand::Play => {
self.player.play(); self.player.play();
self.events.send(Event::PlayState(PlayerState::Playing)); self.events.send(Event::Player(PlayerState::Playing));
} }
WorkerCommand::Pause => { WorkerCommand::Pause => {
self.player.pause(); self.player.pause();
self.events.send(Event::PlayState(PlayerState::Paused)); self.events.send(Event::Player(PlayerState::Paused));
} }
WorkerCommand::Stop => { WorkerCommand::Stop => {
self.player.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.play_task = Box::new(self.player.load(trackid, false, 0));
self.player.play(); self.player.play();
self.events.send(Event::PlayState(PlayerState::Playing)); self.events.send(Event::Player(PlayerState::Playing));
} else { } else {
self.events.send(Event::PlayState(PlayerState::Stopped)); self.events.send(Event::Player(PlayerState::Stopped));
} }
} }
Ok(Async::NotReady) => (), Ok(Async::NotReady) => (),