From 6bf1d662dca6df94fceff28c734aaaa7dbc9b24e Mon Sep 17 00:00:00 2001
From: Henrik Friedrichsen <henrik@affekt.org>
Date: Sat, 2 Nov 2019 23:16:02 +0100
Subject: [PATCH] minor code cleanups

---
 src/mpris.rs          | 2 +-
 src/ui/contextmenu.rs | 2 +-
 src/ui/listview.rs    | 2 +-
 src/ui/statusbar.rs   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/mpris.rs b/src/mpris.rs
index d369be9..1db2391 100644
--- a/src/mpris.rs
+++ b/src/mpris.rs
@@ -215,7 +215,7 @@ fn run_dbus_server(spotify: Arc<Spotify>, queue: Arc<Queue>, rx: mpsc::Receiver<
         f.property::<i64, _>("Position", ())
             .access(Access::Read)
             .on_get(move |iter, _| {
-                iter.append(progress.as_secs() as i64 * 1_000_000);
+                iter.append(progress.as_micros() as i64);
                 Ok(())
             })
     };
diff --git a/src/ui/contextmenu.rs b/src/ui/contextmenu.rs
index 01a1d36..daa5199 100644
--- a/src/ui/contextmenu.rs
+++ b/src/ui/contextmenu.rs
@@ -22,7 +22,7 @@ enum ContextMenuAction {
 }
 
 impl ContextMenu {
-    pub fn new(item: &Box<dyn ListItem>, queue: Arc<Queue>, library: Arc<Library>) -> Self {
+    pub fn new(item: &dyn ListItem, queue: Arc<Queue>, library: Arc<Library>) -> Self {
         let mut content: SelectView<ContextMenuAction> = SelectView::new().autojump();
         if let Some(a) = item.artist() {
             content.add_item("Show artist", ContextMenuAction::ShowItem(Box::new(a)));
diff --git a/src/ui/listview.rs b/src/ui/listview.rs
index 8038fc3..11e8e6c 100644
--- a/src/ui/listview.rs
+++ b/src/ui/listview.rs
@@ -404,7 +404,7 @@ impl<I: ListItem + Clone> ViewExt for ListView<I> {
                     return match view {
                         Some(view) => Ok(CommandResult::View(view)),
                         None => {
-                            let contextmenu = ContextMenu::new(&target, queue, library);
+                            let contextmenu = ContextMenu::new(&*target, queue, library);
                             Ok(CommandResult::Modal(Box::new(contextmenu)))
                         }
                     };
diff --git a/src/ui/statusbar.rs b/src/ui/statusbar.rs
index 5a12e0a..e6c49b1 100644
--- a/src/ui/statusbar.rs
+++ b/src/ui/statusbar.rs
@@ -119,7 +119,7 @@ impl View for StatusBar {
 
         if let Some(ref t) = self.queue.get_current() {
             let elapsed = self.spotify.get_current_progress();
-            let elapsed_ms = elapsed.as_secs() as u32 * 1000 + elapsed.subsec_millis();
+            let elapsed_ms = elapsed.as_millis() as u32;
 
             let formatted_elapsed = format!(
                 "{:02}:{:02}",