From 669e24c3f6e1810ab13e4e89486385810b4c2971 Mon Sep 17 00:00:00 2001
From: Dan Barber <github@danbarber.me>
Date: Fri, 8 Feb 2019 13:33:50 -0500
Subject: [PATCH] Few more tweaks

---
 Persephone/AppDelegate.swift                     | 2 +-
 Persephone/Controllers/QueueViewController.swift | 2 +-
 Persephone/Controllers/WindowController.swift    | 5 +----
 Persephone/MPDClient/Models/Song.swift           | 4 ++--
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/Persephone/AppDelegate.swift b/Persephone/AppDelegate.swift
index 1c7a403..f1aee74 100644
--- a/Persephone/AppDelegate.swift
+++ b/Persephone/AppDelegate.swift
@@ -11,7 +11,7 @@ import Cocoa
 @NSApplicationMain
 class AppDelegate: NSObject, NSApplicationDelegate {
   static let mpdClient = MPDClient(
-    withDelegate: NotificationsController() as MPDClientDelegate
+    withDelegate: NotificationsController()
   )
  
   func applicationDidFinishLaunching(_ aNotification: Notification) {
diff --git a/Persephone/Controllers/QueueViewController.swift b/Persephone/Controllers/QueueViewController.swift
index ad2682e..01b86d9 100644
--- a/Persephone/Controllers/QueueViewController.swift
+++ b/Persephone/Controllers/QueueViewController.swift
@@ -134,7 +134,7 @@ class QueueViewController: NSViewController, NSOutlineViewDataSource, NSOutlineV
     if index > 0 {
       return SongItem(song: queue[index - 1], queuePos: index - 1)
     } else {
-      return ""
+      return false
     }
   }
 
diff --git a/Persephone/Controllers/WindowController.swift b/Persephone/Controllers/WindowController.swift
index 903485c..6ec5816 100644
--- a/Persephone/Controllers/WindowController.swift
+++ b/Persephone/Controllers/WindowController.swift
@@ -10,10 +10,7 @@ import Cocoa
 
 class WindowController: NSWindowController {
   enum TransportAction: Int {
-    case prevTrack = 0
-    case playPause = 1
-    case stop = 2
-    case nextTrack = 3
+    case prevTrack, playPause, stop, nextTrack
   }
 
   let playIcon = NSImage(named: NSImage.Name("playButton"))
diff --git a/Persephone/MPDClient/Models/Song.swift b/Persephone/MPDClient/Models/Song.swift
index 606ddbb..3b43d5b 100644
--- a/Persephone/MPDClient/Models/Song.swift
+++ b/Persephone/MPDClient/Models/Song.swift
@@ -16,7 +16,7 @@ extension MPDClient {
     enum TagType: Int {
       case unknown = -1
       case artist, album, albumArtist, title, track, name,
-      genre, date, composer, performer, comment, disc
+        genre, date, composer, performer, comment, disc
 
       case musicBrainzArtistId
       case musicBrainzAlbumId
@@ -43,7 +43,7 @@ extension MPDClient {
 
     func getTag(_ tagType: TagType) -> String {
       let mpdTagType = mpd_tag_type(rawValue: Int32(tagType.rawValue))
-      
+
       guard let tag = mpd_song_get_tag(mpdSong, mpdTagType, 0)
         else { return "" }