Update upon review, remove unnecessary self.

iina · Feb 19, 2020 · 4fd6424 · 4fd6424
1 parent f80485d
commit 4fd6424
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 42 deletions.
diff --git a/iina/MainWindowController.swift b/iina/MainWindowController.swift
@@ -2655,34 +2655,34 @@ class MainWindowController: PlayerWindowController, NSWindowDelegate {
     switch cmd {
     case .togglePIP:
       if #available(macOS 10.12, *) {
-        self.menuTogglePIP(.dummy)
+        menuTogglePIP(.dummy)
       }
     case .videoPanel:
-      self.menuShowVideoQuickSettings(.dummy)
+      menuShowVideoQuickSettings(.dummy)
     case .audioPanel:
-      self.menuShowAudioQuickSettings(.dummy)
+      menuShowAudioQuickSettings(.dummy)
     case .subPanel:
-      self.menuShowSubQuickSettings(.dummy)
+      menuShowSubQuickSettings(.dummy)
     case .playlistPanel:
-      self.menuShowPlaylistPanel(.dummy)
+      menuShowPlaylistPanel(.dummy)
     case .chapterPanel:
-      self.menuShowChaptersPanel(.dummy)
+      menuShowChaptersPanel(.dummy)
     case .toggleMusicMode:
-      self.menuSwitchToMiniPlayer(.dummy)
+      menuSwitchToMiniPlayer(.dummy)
     case .deleteCurrentFileHard:
-      self.menuActionHandler.menuDeleteCurrentFileHard(.dummy)
+      menuActionHandler.menuDeleteCurrentFileHard(.dummy)
     case .biggerWindow:
       let item = NSMenuItem()
       item.tag = 11
-      self.menuChangeWindowSize(item)
+      menuChangeWindowSize(item)
     case .smallerWindow:
       let item = NSMenuItem()
       item.tag = 10
-      self.menuChangeWindowSize(item)
+      menuChangeWindowSize(item)
     case .fitToScreen:
       let item = NSMenuItem()
       item.tag = 3
-      self.menuChangeWindowSize(item)
+      menuChangeWindowSize(item)
     default:
       break
     }

diff --git a/iina/MiniPlayerWindowController.swift b/iina/MiniPlayerWindowController.swift
@@ -303,23 +303,23 @@ class MiniPlayerWindowController: PlayerWindowController, NSWindowDelegate, NSPo
   // MARK: - Sync UI with playback
   @objc
   override func updateTitle() {
-    let (mediaTitle, mediaAlbum, mediaArtist) = self.player.getMusicMetadata()
-    self.titleLabel.stringValue = mediaTitle
-    self.window?.title = mediaTitle
+    let (mediaTitle, mediaAlbum, mediaArtist) = player.getMusicMetadata()
+    titleLabel.stringValue = mediaTitle
+    window?.title = mediaTitle
     // hide artist & album label when info not available
     if mediaArtist.isEmpty && mediaAlbum.isEmpty {
-      self.titleLabelTopConstraint.constant = 6 + 10
-      self.artistAlbumLabel.stringValue = ""
+      titleLabelTopConstraint.constant = 6 + 10
+      artistAlbumLabel.stringValue = ""
     } else {
-      self.titleLabelTopConstraint.constant = 6
+      titleLabelTopConstraint.constant = 6
       if mediaArtist.isEmpty || mediaAlbum.isEmpty {
-        self.artistAlbumLabel.stringValue = "\(mediaArtist)\(mediaAlbum)"
+        artistAlbumLabel.stringValue = "\(mediaArtist)\(mediaAlbum)"
       } else {
-        self.artistAlbumLabel.stringValue = "\(mediaArtist) - \(mediaAlbum)"
+        artistAlbumLabel.stringValue = "\(mediaArtist) - \(mediaAlbum)"
       }
     }
-    self.titleLabel.scroll()
-    self.artistAlbumLabel.scroll()
+    titleLabel.scroll()
+    artistAlbumLabel.scroll()
   }
 
   override func updateVolume() {
@@ -430,7 +430,7 @@ class MiniPlayerWindowController: PlayerWindowController, NSWindowDelegate, NSPo
     super.handleIINACommand(cmd)
     switch cmd {
     case .toggleMusicMode:
-      self.menuSwitchToMiniPlayer(.dummy)
+      menuSwitchToMiniPlayer(.dummy)
     default:
       break
     }

diff --git a/iina/PlayerWindowController.swift b/iina/PlayerWindowController.swift
@@ -61,19 +61,16 @@ class PlayerWindowController: NSWindowController {
 
     setMaterial(Preference.enum(for: .themeMaterial))
 
-    notificationCenter(.default, addObserverfor: .iinaMediaTitleChanged, object: player) { [unowned self] _ in
+    notificationCenter(.default, addObserverForName: .iinaMediaTitleChanged, object: player) { [unowned self] _ in
         self.updateTitle()
     }
 
     updateVolume()
   }
 
-  internal func notificationCenter(_ center: NotificationCenter, addObserverfor name: NSNotification.Name, object: Any? = nil, using block: @escaping (Notification) -> Void) {
+  internal func notificationCenter(_ center: NotificationCenter, addObserverForName name: Notification.Name, object: Any? = nil, using block: @escaping (Notification) -> Void) {
     let observer = center.addObserver(forName: name, object: object, queue: .main, using: block)
-    if notificationObservers[center] == nil {
-      notificationObservers[center] = []
-    }
-    notificationObservers[center]!.append(observer)
+    notificationObservers[center, default: []].append(observer)
   }
 
 
@@ -144,32 +141,28 @@ class PlayerWindowController: NSWindowController {
   /** This method will not set `isOntop`! */
   func setWindowFloatingOnTop(_ onTop: Bool) {
     guard let window = window else { return }
-    if onTop {
-      window.level = .iinaFloating
-    } else {
-      window.level = .normal
-    }
+    window.level = onTop ? .iinaFloating : .normal
   }
 
   internal func handleIINACommand(_ cmd: IINACommand) {
-    let appDeletate = (NSApp.delegate! as! AppDelegate)
+    let appDelegate = (NSApp.delegate! as! AppDelegate)
     switch cmd {
     case .openFile:
-      appDeletate.openFile(self)
+      appDelegate.openFile(self)
     case .openURL:
-      appDeletate.openURL(self)
+      appDelegate.openURL(self)
     case .flip:
-      self.menuActionHandler.menuToggleFlip(.dummy)
+      menuActionHandler.menuToggleFlip(.dummy)
     case .mirror:
-      self.menuActionHandler.menuToggleMirror(.dummy)
+      menuActionHandler.menuToggleMirror(.dummy)
     case .saveCurrentPlaylist:
-      self.menuActionHandler.menuSavePlaylist(.dummy)
+      menuActionHandler.menuSavePlaylist(.dummy)
     case .deleteCurrentFile:
-      self.menuActionHandler.menuDeleteCurrentFile(.dummy)
+      menuActionHandler.menuDeleteCurrentFile(.dummy)
     case .findOnlineSubs:
-      self.menuActionHandler.menuFindOnlineSub(.dummy)
+      menuActionHandler.menuFindOnlineSub(.dummy)
     case .saveDownloadedSub:
-      self.menuActionHandler.saveDownloadedSub(.dummy)
+      menuActionHandler.saveDownloadedSub(.dummy)
     default:
       break
     }