Persephone/Base.lproj/Main.storyboard

@@ -3,7 +3,6 @@
     <dependencies>
         <deployment identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
-        <capability name="System colors introduced in macOS 10.14" minToolsVersion="10.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -779,7 +778,7 @@
                                             <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                             <tableColumns>
                                                 <tableColumn identifier="songTitleColumn" width="222" minWidth="128" maxWidth="1000" id="0Co-uF-CCB">
-                                                    <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" title="Title">
+                                                    <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border">
                                                         <font key="font" metaFont="smallSystem"/>
                                                         <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
@@ -800,7 +799,7 @@
                                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="QUEUE" id="Mqf-uh-ibl">
                                                                         <font key="font" metaFont="smallSystemBold"/>
-                                                                        <color key="textColor" name="controlAccentColor" catalog="System" colorSpace="catalog"/>
+                                                                        <color key="textColor" name="headerColor" catalog="System" colorSpace="catalog"/>
                                                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                                     </textFieldCell>
                                                                 </textField>
@@ -815,7 +814,7 @@
                                                                     <constraints>
                                                                         <constraint firstAttribute="width" constant="17" id="UFf-Fg-9Qg"/>
                                                                     </constraints>
-                                                                    <imageCell key="cell" refusesFirstResponder="YES" imageScaling="proportionallyDown" image="playButton" id="ckK-gW-Vhx"/>
+                                                                    <imageCell key="cell" refusesFirstResponder="YES" imageScaling="proportionallyDown" image="NSActionTemplate" id="ckK-gW-Vhx"/>
                                                                 </imageView>
                                                                 <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="i0h-bn-auJ">
                                                                     <rect key="frame" x="25" y="0.0" width="197" height="17"/>
@@ -842,7 +841,7 @@
                                                     </prototypeCellViews>
                                                 </tableColumn>
                                                 <tableColumn identifier="songArtistColumn" width="222" minWidth="128" maxWidth="1000" id="SPM-QP-DX8">
-                                                    <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Artist">
+                                                    <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
                                                         <font key="font" metaFont="smallSystem"/>
                                                         <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>

Persephone/MPDClient.swift

@@ -73,7 +73,6 @@ class MPDClient {
 
     self.delegate?.didUpdateState(mpdClient: self, state: self.status!.state())
     self.delegate?.didUpdateQueue(mpdClient: self, queue: self.queue)
-    self.delegate?.didUpdateQueuePos(mpdClient: self, song: self.status!.song())
     idle()
   }
 
@@ -191,7 +190,6 @@ class MPDClient {
     if mpdIdle.contains(.player) {
       self.fetchStatus()
       self.delegate?.didUpdateState(mpdClient: self, state: self.status!.state())
-      self.delegate?.didUpdateQueuePos(mpdClient: self, song: self.status!.song())
     }
     if !mpdIdle.isEmpty {
       self.idle()

Persephone/QueueController.swift

@@ -11,12 +11,6 @@ import mpdclient
 
 class QueueController: NSViewController, NSOutlineViewDataSource, NSOutlineViewDelegate {
   var queue: [MPDClient.Song] = []
-  var queuePos: Int32 = -1
-
-  struct SongItem {
-    var song: MPDClient.Song
-    var queuePos: Int
-  }
 
   override func viewDidLoad() {
     super.viewDidLoad()
@@ -29,13 +23,6 @@ class QueueController: NSViewController, NSOutlineViewDataSource, NSOutlineViewD
       name: MPDClient.queueChanged,
       object: AppDelegate.mpdClient
     )
-
-    NotificationCenter.default.addObserver(
-      self,
-      selector: #selector(queuePosChanged(_:)),
-      name: MPDClient.queuePosChanged,
-      object: AppDelegate.mpdClient
-    )
   }
 
   @objc func queueChanged(_ notification: Notification) {
@@ -47,33 +34,6 @@ class QueueController: NSViewController, NSOutlineViewDataSource, NSOutlineViewD
     queueView.reloadData()
   }
 
-  @objc func queuePosChanged(_ notification: Notification) {
-    guard let queuePos = notification.userInfo?[MPDClient.queuePosKey] as? Int32
-      else { return }
-
-    if self.queuePos > -1 {
-      let oldSongRow = queueView.rowView(atRow: Int(self.queuePos + 1), makeIfNecessary: true)
-      let oldSongTitleCell = oldSongRow?.view(atColumn: 0) as! NSTableCellView
-      let oldSongArtistCell = oldSongRow?.view(atColumn: 1) as! NSTableCellView
-      oldSongTitleCell.textField?.font = NSFont.systemFont(ofSize: 13, weight: .regular)
-      oldSongArtistCell.textField?.font = NSFont.systemFont(ofSize: 13, weight: .regular)
-    }
-
-    let oldQueuePos = self.queuePos
-    self.queuePos = queuePos
-
-    let songRow = queueView.rowView(atRow: Int(self.queuePos + 1), makeIfNecessary: true)
-    let songTitleCell = songRow?.view(atColumn: 0) as! NSTableCellView
-    let songArtistCell = songRow?.view(atColumn: 1) as! NSTableCellView
-    songTitleCell.textField?.font = NSFont.systemFont(ofSize: 13, weight: .bold)
-    songArtistCell.textField?.font = NSFont.systemFont(ofSize: 13, weight: .bold)
-
-    queueView.reloadData(
-      forRowIndexes: [Int(oldQueuePos + 1), Int(queuePos + 1)],
-      columnIndexes: [0, 1]
-    )
-  }
-
   func outlineView(_ outlineView: NSOutlineView, numberOfChildrenOfItem item: Any?) -> Int {
     return queue.count + 1
   }
@@ -84,36 +44,31 @@ class QueueController: NSViewController, NSOutlineViewDataSource, NSOutlineViewD
 
   func outlineView(_ outlineView: NSOutlineView, child index: Int, ofItem item: Any?) -> Any {
     if index > 0 {
-      return SongItem(song: queue[index - 1], queuePos: index - 1)
+      return queue[index - 1]
     } else {
       return ""
     }
   }
 
   func outlineView(_ outlineView: NSOutlineView, viewFor tableColumn: NSTableColumn?, item: Any) -> NSView? {
-    if let songItem = item as? SongItem {
+    if let song = item as? MPDClient.Song {
       switch tableColumn?.identifier.rawValue {
       case "songTitleColumn":
         let cellView = outlineView.makeView(
-          withIdentifier: NSUserInterfaceItemIdentifier("songTitleCell"),
+          withIdentifier: NSUserInterfaceItemIdentifier(rawValue: "songTitleCell"),
           owner: self
         ) as! NSTableCellView
 
-        cellView.textField?.stringValue = songItem.song.getTag(MPD_TAG_TITLE)
+        cellView.textField?.stringValue = song.getTag(MPD_TAG_TITLE)
-        if songItem.queuePos == self.queuePos {
-          cellView.imageView?.image = NSImage(named: NSImage.Name("playButton"))
-        } else {
-          cellView.imageView?.image = nil
-        }
 
         return cellView
       case "songArtistColumn":
         let cellView = outlineView.makeView(
-          withIdentifier: NSUserInterfaceItemIdentifier("songArtistCell"),
+          withIdentifier: NSUserInterfaceItemIdentifier(rawValue: "songArtistCell"),
           owner: self
         ) as! NSTableCellView
 
-        cellView.textField?.stringValue = songItem.song.getTag(MPD_TAG_ARTIST)
+        cellView.textField?.stringValue = song.getTag(MPD_TAG_ARTIST)
 
         return cellView
       default:
@@ -122,7 +77,7 @@ class QueueController: NSViewController, NSOutlineViewDataSource, NSOutlineViewD
     } else {
       if tableColumn?.identifier.rawValue == "songTitleColumn" {
         let cellView = outlineView.makeView(
-          withIdentifier: NSUserInterfaceItemIdentifier("queueHeadingCell"),
+          withIdentifier: NSUserInterfaceItemIdentifier(rawValue: "queueHeadingCell"),
           owner: self
         ) as! NSTableCellView
 

Persephone/WindowController.swift

@@ -43,9 +43,9 @@ class WindowController: NSWindowController {
     transportControls.setEnabled([MPD_STATE_PLAY, MPD_STATE_PAUSE].contains(state), forSegment: 3)
 
     if [MPD_STATE_PAUSE, MPD_STATE_STOP, MPD_STATE_UNKNOWN].contains(state) {
-      transportControls.setImage(NSImage(named: NSImage.Name("playButton")), forSegment: 1)
+      transportControls.setImage(NSImage(named: NSImage.Name(rawValue: "playButton")), forSegment: 1)
     } else {
-      transportControls.setImage(NSImage(named: NSImage.Name("pauseButton")), forSegment: 1)
+      transportControls.setImage(NSImage(named: NSImage.Name(rawValue: "pauseButton")), forSegment: 1)
     }
   }
 

README.md

@@ -2,8 +2,6 @@
 
 An MPD client for macOS, written in Swift.
 
-![Screenshot](Resources/screenshot.png)
-
 ## Setup
 
 Run `bin/setup` before opening the Xcode project.