Skip to content

Commit 2d011ea

Browse files
authored
Fixed code style, reduced condition checking
1 parent b991d4e commit 2d011ea

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

ios/RNTrackPlayer/RNTrackPlayer.swift

+8-7
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ public class RNTrackPlayer: RCTEventEmitter {
185185
player.event.playbackEnd.addListener(self) { [weak self] reason in
186186
guard let `self` = self else { return }
187187

188-
if (reason == .playedUntilEnd) {
188+
if reason == .playedUntilEnd {
189189
// playbackEnd is called twice at the end of a track;
190190
// we ignore .skippedToNext and only fire an event
191191
// for .playedUntilEnd
@@ -194,14 +194,15 @@ public class RNTrackPlayer: RCTEventEmitter {
194194
"position": self.player.currentTime,
195195
"nextTrack": (self.player.nextItems.first as? Track)?.id,
196196
])
197+
198+
if self.player.nextItems.count == 0 {
199+
self.sendEvent(withName: "playback-queue-ended", body: [
200+
"track": (self.player.currentItem as? Track)?.id,
201+
"position": self.player.currentTime,
202+
])
203+
}
197204
}
198205

199-
if reason == .playedUntilEnd && self.player.nextItems.count == 0 {
200-
self.sendEvent(withName: "playback-queue-ended", body: [
201-
"track": (self.player.currentItem as? Track)?.id,
202-
"position": self.player.currentTime,
203-
])
204-
}
205206
}
206207

207208
player.remoteCommandController.handleChangePlaybackPositionCommand = { [weak self] event in

0 commit comments

Comments
 (0)