Auto stash before merge of "main" and "origin/main"

This commit is contained in:
Aiden Vigue 2021-06-10 17:40:10 -07:00
parent 770ad0fbf8
commit 968bd487b3
No known key found for this signature in database
GPG Key ID: 86E07E6D0CC00721
1 changed files with 11 additions and 8 deletions

View File

@ -382,13 +382,16 @@ class PlayerViewController: UIViewController, VLCMediaDelegate, VLCMediaPlayerDe
mediaPlayer.media = VLCMedia(url: playbackItem.videoUrl) mediaPlayer.media = VLCMedia(url: playbackItem.videoUrl)
mediaPlayer.play() mediaPlayer.play()
// 1 second = 10,000,000 ticks //1 second = 10,000,000 ticks
let startTicks = round(Double(manifest.userData?.playbackPositionTicks ?? 0), toNearest: 10_000_000) let rawStartTicks = manifest.userData?.playbackPositionTicks ?? 0
let startSeconds = Int32(startTicks) / 10_000_000
mediaPlayer.jumpForward(startSeconds)
// Pause and load captions into memory. if(rawStartTicks != 0) {
let startSeconds = rawStartTicks / 10_000_000
mediaPlayer.jumpForward(Int32(startSeconds))
}
//Pause and load captions into memory.
mediaPlayer.pause() mediaPlayer.pause()
subtitleTrackArray.forEach { sub in subtitleTrackArray.forEach { sub in
if sub.id != -1 && sub.delivery == .external && sub.codec != "subrip" { if sub.id != -1 && sub.delivery == .external && sub.codec != "subrip" {