mirror/zapp
0
0
Fork 0
mirror of https://github.com/mediathekview/zapp.git synced 2024-09-19 20:02:17 +02:00
Code

Fix deprecated usage of exo player api

Browse Source
This commit is contained in:
Christine Coenen 2022-02-08 21:04:06 +01:00
parent 0aa7ad4a3e
commit 1fdfcdb989
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.idea/codeStyles/Project.xml
View File

@ -30,9 +30,6 @@
<JetCodeStyleSettings>
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
</JetCodeStyleSettings>
<XML>
<option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
</XML>
<codeStyleSettings language="XML">
<indentOptions>
<option name="CONTINUATION_INDENT_SIZE" value="4" />

27
app/src/main/java/de/christinecoenen/code/zapp/app/player/Player.kt
View File

@ -4,7 +4,10 @@ package de.christinecoenen.code.zapp.app.player
import android.content.Context
import android.net.Uri
import android.support.v4.media.session.MediaSessionCompat
import com.google.android.exoplayer2.*
import com.google.android.exoplayer2.C
import com.google.android.exoplayer2.ExoPlayer
import com.google.android.exoplayer2.MediaItem
import com.google.android.exoplayer2.MediaMetadata
import com.google.android.exoplayer2.audio.AudioAttributes
import com.google.android.exoplayer2.ext.mediasession.MediaSessionConnector
import com.google.android.exoplayer2.trackselection.DefaultTrackSelector
@ -16,7 +19,9 @@ import de.christinecoenen.code.zapp.app.settings.repository.SettingsRepository
import de.christinecoenen.code.zapp.app.settings.repository.StreamQualityBucket
import de.christinecoenen.code.zapp.utils.system.NetworkConnectionHelper
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.*
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.withContext
import timber.log.Timber
import java.io.IOException
@ -33,7 +38,7 @@ class Player(
}
val exoPlayer: SimpleExoPlayer
val exoPlayer: ExoPlayer
val mediaSession: MediaSessionCompat
var currentVideoInfo: VideoInfo? = null
@ -89,7 +94,7 @@ class Player(
.setContentType(C.CONTENT_TYPE_MOVIE)
.build()
exoPlayer = SimpleExoPlayer.Builder(context)
exoPlayer = ExoPlayer.Builder(context)
.setTrackSelector(trackSelector)
.setWakeMode(C.WAKE_MODE_NETWORK)
.setAudioAttributes(audioAttributes, true)
@ -205,14 +210,14 @@ class Player(
// add subtitles if present
if (videoInfo.hasSubtitles) {
val subtitle = MediaItem.Subtitle(
Uri.parse(videoInfo.subtitleUrl),
videoInfo.subtitleUrl!!.toSubtitleMimeType(),
LANGUAGE_GERMAN,
C.SELECTION_FLAG_AUTOSELECT
)
val subtitle = MediaItem.SubtitleConfiguration
.Builder(Uri.parse(videoInfo.subtitleUrl))
.setMimeType(videoInfo.subtitleUrl!!.toSubtitleMimeType())
.setLanguage(LANGUAGE_GERMAN)
.setSelectionFlags(C.SELECTION_FLAG_AUTOSELECT)
.build()
mediaItemBuilder.setSubtitles(listOf(subtitle))
mediaItemBuilder.setSubtitleConfigurations(listOf(subtitle))
}
return mediaItemBuilder.build()