Fix current time in now playing info and prevent current time values which are higher than the max time

Author: Hans Seiffert

AudioPlayerManager/Core/Public/Player/AudioPlayerManager.swift

@@ -91,7 +91,7 @@ public class AudioPlayerManager: NSObject {
 		if let _player = self.player {
 			_player.play()
 			if (updateNowPlayingInfo == true || self.didStopPlayback == true) {
-				self.updateNowPlayingInfo()
+				self.updateNowPlayingInfoIfNeeded()
 			}
 			self.didStopPlayback = false
 			self.startPlaybackTimeChangeTimer()
@@ -215,7 +215,7 @@ public class AudioPlayerManager: NSObject {
 			// Move to the beginning of the track if we aren't in the beginning.
 			self.player?.seekToTime(CMTimeMake(0, 1))
 			// Update the now playing info to show the new playback time
-			self.updateNowPlayingInfo()
+			self.updateNowPlayingInfoIfNeeded()
 			// Call the callbacks to inform about the new time
 			self.callPlaybackTimeChangeCallbacks()
 		}
@@ -393,15 +393,18 @@ public class AudioPlayerManager: NSObject {
 
 	// MARK: - Internal helper
 
-	private func updateNowPlayingInfo() {
+	private func updateNowPlayingInfoIfNeeded() {
 		if (self.useNowPlayingInfoCenter == true) {
+			// Update the current play time
+			self.currentTrack?.updateNowPlayingInfoPlaybackTime()
 			MPNowPlayingInfoCenter.defaultCenter().nowPlayingInfo = self.currentTrack?.nowPlayingInfo
 		}
 	}
 
 	// MARK: - Plaback time change callback
 
 	func callPlaybackTimeChangeCallbacks() {
+		self.updateNowPlayingInfoIfNeeded()
 		// Increase the current tracks playing time if the player is playing
 		if let _currentTrack = self.currentTrack {
 			for sender in self.playbackPositionChangeCallbacks.keys {

AudioPlayerManager/Core/Public/Track/AudioTrack.swift

@@ -57,7 +57,13 @@ public class AudioTrack : NSObject {
 
 	public func currentTimeInSeconds() -> Float {
 		if let _playerItem = self.playerItem {
-			return Float(CMTimeGetSeconds(_playerItem.currentTime()))
+			let currentTime = Float(CMTimeGetSeconds(_playerItem.currentTime()))
+			let duration = self.durationInSeconds()
+			guard (duration <= 0.0 || currentTime <= duration) else {
+				return duration
+			}
+
+			return currentTime
 		}
 		return Float(0)
 	}
@@ -101,11 +107,18 @@ public class AudioTrack : NSObject {
 		if let _playerItem = self.playerItem {
 			let timeInSeconds = CMTimeGetSeconds(_playerItem.asset.duration)
 			// Check ig the time isn't NaN. This can happen eg. for podcasts
-			let duration : NSNumber? = ((timeInSeconds.isNaN == false) ? NSNumber(integer: Int(timeInSeconds)) : nil)
+			let duration : NSNumber? = ((timeInSeconds.isNaN == false) ? NSNumber(float: Float(timeInSeconds)) : nil)
 			self.nowPlayingInfo?[MPMediaItemPropertyPlaybackDuration] = duration
 		}
 	}
 
+	public func updateNowPlayingInfoPlaybackTime() {
+		let currentTime = self.currentTimeInSeconds()
+		// Check ig the time isn't NaN.
+		let currentTimeAsNumber : NSNumber? = ((currentTime.isNaN == false) ? NSNumber(float: Float(currentTime)) : nil)
+		self.nowPlayingInfo?[MPNowPlayingInfoPropertyElapsedPlaybackTime] = currentTimeAsNumber
+	}
+
 	// MARK: - Helper
 
 	public func identifier() -> String? {