diff --git a/new-player/src/main/java/net/newpipe/newplayer/NewPlayer.kt b/new-player/src/main/java/net/newpipe/newplayer/NewPlayer.kt index 38dc2b5..52addf7 100644 --- a/new-player/src/main/java/net/newpipe/newplayer/NewPlayer.kt +++ b/new-player/src/main/java/net/newpipe/newplayer/NewPlayer.kt @@ -45,7 +45,7 @@ enum class RepeatMode { interface NewPlayer { // preferences val preferredVideoVariants: List - val prefearedAudioVariants: List + val preferredAudioVariants: List val preferredStreamLanguage: List val exoPlayer: StateFlow diff --git a/new-player/src/main/java/net/newpipe/newplayer/NewPlayerImpl.kt b/new-player/src/main/java/net/newpipe/newplayer/NewPlayerImpl.kt index 39a932a..86611f0 100644 --- a/new-player/src/main/java/net/newpipe/newplayer/NewPlayerImpl.kt +++ b/new-player/src/main/java/net/newpipe/newplayer/NewPlayerImpl.kt @@ -62,7 +62,7 @@ class NewPlayerImpl( private val repository: MediaRepository, override val preferredVideoVariants: List = emptyList(), override val preferredStreamLanguage: List = emptyList(), - override val prefearedAudioVariants: List = emptyList(), + override val preferredAudioVariants: List = emptyList(), val httpDataSourceFactory: HttpDataSource.Factory = DefaultHttpDataSource.Factory(), ) : NewPlayer { @@ -355,7 +355,7 @@ class NewPlayerImpl( playMode, availableStreamVariants, preferredVideoVariants, - prefearedAudioVariants, + preferredAudioVariants, preferredStreamLanguage ) diff --git a/new-player/src/main/java/net/newpipe/newplayer/model/VideoPlayerUIState.kt b/new-player/src/main/java/net/newpipe/newplayer/model/VideoPlayerUIState.kt index 5f9687c..42ba523 100644 --- a/new-player/src/main/java/net/newpipe/newplayer/model/VideoPlayerUIState.kt +++ b/new-player/src/main/java/net/newpipe/newplayer/model/VideoPlayerUIState.kt @@ -63,7 +63,7 @@ data class VideoPlayerUIState( val isLoading: Boolean, val durationInMs: Long, val playbackPositionInMs: Long, - val playbackPositionInPlaylistS: Int, + val playbackPositionInPlaylistMs: Long, val fastSeekSeconds: Int, val soundVolume: Float, val brightness: Float?, // when null use system value @@ -87,7 +87,7 @@ data class VideoPlayerUIState( bufferedPercentage = 0f, isLoading = true, durationInMs = 0, - playbackPositionInPlaylistS = 0, + playbackPositionInPlaylistMs = 0, playbackPositionInMs = 0, fastSeekSeconds = 0, soundVolume = 0f, @@ -109,7 +109,7 @@ data class VideoPlayerUIState( bufferedPercentage = 0.5f, isLoading = false, durationInMs = 12000, - playbackPositionInPlaylistS = 5039, + playbackPositionInPlaylistMs = 5039, playbackPositionInMs = 400, fastSeekSeconds = 10, soundVolume = 0.5f, diff --git a/new-player/src/main/java/net/newpipe/newplayer/model/VideoPlayerViewModelImpl.kt b/new-player/src/main/java/net/newpipe/newplayer/model/VideoPlayerViewModelImpl.kt index 02bc722..ad0e35a 100644 --- a/new-player/src/main/java/net/newpipe/newplayer/model/VideoPlayerViewModelImpl.kt +++ b/new-player/src/main/java/net/newpipe/newplayer/model/VideoPlayerViewModelImpl.kt @@ -369,10 +369,10 @@ class VideoPlayerViewModelImpl @Inject constructor( progress += item.mediaMetadata.durationMs ?: throw NewPlayerException("Media Item not containing duration. Media Item in question: ${item.mediaMetadata.title}") } - progress += ((newPlayer?.currentPosition ?: 0) / 1000) + progress += (newPlayer?.currentPosition ?: 0) mutableUiState.update { it.copy( - playbackPositionInPlaylistS = progress.toInt() + playbackPositionInPlaylistMs = progress ) } } diff --git a/new-player/src/main/java/net/newpipe/newplayer/ui/videoplayer/streamselect/StreamSelectTopBar.kt b/new-player/src/main/java/net/newpipe/newplayer/ui/videoplayer/streamselect/StreamSelectTopBar.kt index 9e83e6a..93d2a4b 100644 --- a/new-player/src/main/java/net/newpipe/newplayer/ui/videoplayer/streamselect/StreamSelectTopBar.kt +++ b/new-player/src/main/java/net/newpipe/newplayer/ui/videoplayer/streamselect/StreamSelectTopBar.kt @@ -69,7 +69,7 @@ fun StreamSelectTopBar( val duration = getPlaylistDurationInMS(uiState.playList) val durationString = getTimeStringFromMs(timeSpanInMs = duration, locale) val playbackPositionString = getTimeStringFromMs( - timeSpanInMs = uiState.playbackPositionInPlaylistS.toLong() * 1000, locale = locale + timeSpanInMs = uiState.playbackPositionInPlaylistMs, locale = locale ) Text( text = "$playbackPositionString/$durationString",