@@ -274,7 +274,6 @@ let PlayerOvp = "player_ovp"
274274 private( set) public var currentPlaybackStartTimestamp : Date ? //Timestamp for beginning of current playback
275275 private( set) public var storedPlaybackTime : Double = 0 //On Pause calculate playback time and clear currentPlaybackTime
276276 private var sessionSummarySent = false // Ensures we only send summary event once
277- private var pausedByAdBreak = false // Internal marker used to know whether to auto-resume after an ad break
278277
279278 // MARK: init
280279 /// Creates a media session object. This does not start a session, you can do so by calling `logMediaSessionStart`.
@@ -550,7 +549,7 @@ let PlayerOvp = "player_ovp"
550549 // MARK: ad break
551550 /// Logs that a sequence of one or more ads has begun
552551 @objc public func logAdBreakStart( adBreak: MPMediaAdBreak , options: Options ? = nil ) {
553- self . handleAdBreakStartState ( )
552+ self . pauseContentTimeIfAdBreakExclusionEnabled ( )
554553
555554 self . adBreak = adBreak
556555 let mediaEvent = self . makeMediaEvent ( name: . adBreakStart, options: options)
@@ -560,7 +559,7 @@ let PlayerOvp = "player_ovp"
560559
561560 /// Indicates that the ad break is complete
562561 @objc public func logAdBreakEnd( options: Options ? = nil ) {
563- self . handleAdBreakEndState ( )
562+ self . resumeContentTimeIfAdBreakExclusionEnabled ( )
564563
565564 let mediaEvent = self . makeMediaEvent ( name: . adBreakEnd, options: options)
566565 mediaEvent. adBreak = self . adBreak
@@ -569,23 +568,15 @@ let PlayerOvp = "player_ovp"
569568 }
570569
571570 // MARK: private helpers (ad break)
572- /// Pause content time tracking if ad-break exclusion is enabled.
573- private func handleAdBreakStartState( ) {
574- guard self . excludeAdBreaksFromContentTime,
575- self . currentPlaybackStartTimestamp != nil else { return }
576-
577- self . storedPlaybackTime += Date ( ) . timeIntervalSince ( self . currentPlaybackStartTimestamp ?? Date ( ) )
571+ private func pauseContentTimeIfAdBreakExclusionEnabled( ) {
572+ guard self . excludeAdBreaksFromContentTime, self . currentPlaybackStartTimestamp != nil else { return }
573+ self . storedPlaybackTime += Date ( ) . timeIntervalSince ( self . currentPlaybackStartTimestamp!)
578574 self . currentPlaybackStartTimestamp = nil
579- self . pausedByAdBreak = true
580575 }
581576
582- /// Resume content time tracking if previously paused due to ad break.
583- private func handleAdBreakEndState( ) {
584- guard self . excludeAdBreaksFromContentTime,
585- self . pausedByAdBreak else { return }
586-
577+ private func resumeContentTimeIfAdBreakExclusionEnabled( ) {
578+ guard self . excludeAdBreaksFromContentTime, self . currentPlaybackStartTimestamp == nil else { return }
587579 self . currentPlaybackStartTimestamp = Date ( )
588- self . pausedByAdBreak = false
589580 }
590581
591582 // MARK: ad content
0 commit comments