Use mpv property "chapter" to determine the current chapter

Ref: #2404
iina · Apr 5, 2019 · 091d4e7 · 091d4e7
1 parent 4830603
commit 091d4e7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/iina/MPVController.swift b/iina/MPVController.swift
@@ -771,6 +771,7 @@ class MPVController: NSObject {
       player.syncUI(.playButton)
 
     case MPVProperty.chapter:
+      player.info.chapter = Int(getInt(MPVProperty.chapter))
       player.syncUI(.time)
       player.syncUI(.chapterList)
       player.postNotification(.iinaMediaTitleChanged)

diff --git a/iina/PlaybackInfo.swift b/iina/PlaybackInfo.swift
@@ -169,6 +169,7 @@ class PlaybackInfo {
 
   var playlist: [MPVPlaylistItem] = []
   var chapters: [MPVChapter] = []
+  var chapter = 0
 
   var matchedSubs: [String: [URL]] = [:]
   var currentSubsInfo: [FileInfo] = []

diff --git a/iina/PlaylistViewController.swift b/iina/PlaylistViewController.swift
@@ -525,12 +525,7 @@ class PlaylistViewController: NSViewController, NSTableViewDataSource, NSTableVi
 
       if identifier == .isChosen {
         // left column
-        let currentPos = info.videoPosition!
-        if currentPos.between(chapter.time, nextChapterTime) {
-          v.textField?.stringValue = Constants.String.play
-        } else {
-          v.textField?.stringValue = ""
-        }
+        v.textField?.stringValue = (info.chapter == row) ? Constants.String.play : ""
         return v
       } else if identifier == .trackName {
         // right column