minor code cleanups

This commit is contained in:
Henrik Friedrichsen
2019-11-02 23:16:02 +01:00
parent 31a8119749
commit 6bf1d662dc
4 changed files with 4 additions and 4 deletions

View File

@@ -215,7 +215,7 @@ fn run_dbus_server(spotify: Arc<Spotify>, queue: Arc<Queue>, rx: mpsc::Receiver<
f.property::<i64, _>("Position", ()) f.property::<i64, _>("Position", ())
.access(Access::Read) .access(Access::Read)
.on_get(move |iter, _| { .on_get(move |iter, _| {
iter.append(progress.as_secs() as i64 * 1_000_000); iter.append(progress.as_micros() as i64);
Ok(()) Ok(())
}) })
}; };

View File

@@ -22,7 +22,7 @@ enum ContextMenuAction {
} }
impl ContextMenu { 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(); let mut content: SelectView<ContextMenuAction> = SelectView::new().autojump();
if let Some(a) = item.artist() { if let Some(a) = item.artist() {
content.add_item("Show artist", ContextMenuAction::ShowItem(Box::new(a))); content.add_item("Show artist", ContextMenuAction::ShowItem(Box::new(a)));

View File

@@ -404,7 +404,7 @@ impl<I: ListItem + Clone> ViewExt for ListView<I> {
return match view { return match view {
Some(view) => Ok(CommandResult::View(view)), Some(view) => Ok(CommandResult::View(view)),
None => { None => {
let contextmenu = ContextMenu::new(&target, queue, library); let contextmenu = ContextMenu::new(&*target, queue, library);
Ok(CommandResult::Modal(Box::new(contextmenu))) Ok(CommandResult::Modal(Box::new(contextmenu)))
} }
}; };

View File

@@ -119,7 +119,7 @@ impl View for StatusBar {
if let Some(ref t) = self.queue.get_current() { if let Some(ref t) = self.queue.get_current() {
let elapsed = self.spotify.get_current_progress(); 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!( let formatted_elapsed = format!(
"{:02}:{:02}", "{:02}:{:02}",