Skip to content

Commit

Permalink
Revert "Make ExoPlayer the default video player implementation" (#419)
Browse files Browse the repository at this point in the history
  • Loading branch information
nielsvanvelzen authored Jun 4, 2021
1 parent eedea81 commit fa6d00e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion app/src/main/java/org/jellyfin/mobile/AppPreferences.kt
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ class AppPreferences(context: Context) {

@VideoPlayerType
val videoPlayerType: String
get() = sharedPreferences.getString(Constants.PREF_VIDEO_PLAYER_TYPE, VideoPlayerType.EXO_PLAYER)!!
get() = sharedPreferences.getString(Constants.PREF_VIDEO_PLAYER_TYPE, VideoPlayerType.WEB_PLAYER)!!

val exoPlayerAllowSwipeGestures: Boolean
get() = sharedPreferences.getBoolean(Constants.PREF_EXOPLAYER_ALLOW_SWIPE_GESTURES, true)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,13 @@ class SettingsFragment : Fragment() {
titleRes = R.string.pref_category_video_player
}
val videoPlayerOptions = listOf(
SelectionItem(VideoPlayerType.EXO_PLAYER, R.string.video_player_native, R.string.video_player_native_description),
SelectionItem(VideoPlayerType.WEB_PLAYER, R.string.video_player_web, R.string.video_player_web_description),
SelectionItem(VideoPlayerType.EXO_PLAYER, R.string.video_player_native, R.string.video_player_native_description),
SelectionItem(VideoPlayerType.EXTERNAL_PLAYER, R.string.video_player_external, R.string.video_player_external_description),
)
singleChoice(Constants.PREF_VIDEO_PLAYER_TYPE, videoPlayerOptions) {
titleRes = R.string.pref_video_player_type_title
initialSelection = VideoPlayerType.EXO_PLAYER
initialSelection = VideoPlayerType.WEB_PLAYER
defaultOnSelectionChange { selection ->
swipeGesturesPreference.enabled = selection == VideoPlayerType.EXO_PLAYER
backgroundAudioPreference.enabled = selection == VideoPlayerType.EXO_PLAYER
Expand Down

0 comments on commit fa6d00e

Please sign in to comment.