Mirrors/chaosflix
2
0
Fork 0
mirror of https://github.com/NiciDieNase/chaosflix synced 2024-11-26 22:20:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update explayer

Browse source
This commit is contained in:
Felix 2019-04-25 19:51:24 +02:00
parent 823bf90031
commit e4f0cf9bcf
6 changed files with 5 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/build.gradle
View file

@ -84,6 +84,8 @@ dependencies {
implementation 'com.squareup.retrofit2:retrofit:2.3.0' implementation 'com.squareup.retrofit2:retrofit:2.3.0'
implementation 'com.squareup.retrofit2:converter-gson:2.3.0' implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
api 'com.google.android.exoplayer:exoplayer:2.9.6'
implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.9.0' implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.9.0'
api "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" api "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"

3
leanback/build.gradle
View file

@ -99,8 +99,7 @@ dependencies {
implementation "com.android.support:leanback-v17:${rootProject.ext.supportLibraryVersion}" implementation "com.android.support:leanback-v17:${rootProject.ext.supportLibraryVersion}"
implementation "com.android.support:preference-leanback-v17:${rootProject.ext.supportLibraryVersion}" implementation "com.android.support:preference-leanback-v17:${rootProject.ext.supportLibraryVersion}"
implementation "com.android.support:recyclerview-v7:${rootProject.ext.supportLibraryVersion}" implementation "com.android.support:recyclerview-v7:${rootProject.ext.supportLibraryVersion}"
implementation 'com.google.android.exoplayer:exoplayer:2.6.1' implementation 'com.google.android.exoplayer:extension-leanback:2.9.6'
implementation 'com.google.android.exoplayer:extension-leanback:2.6.1'
implementation 'com.github.bumptech.glide:glide:4.6.1' implementation 'com.github.bumptech.glide:glide:4.6.1'
androidTestImplementation('com.android.support.test:rules:0.5') { androidTestImplementation('com.android.support.test:rules:0.5') {
exclude module: 'support-annotations' exclude module: 'support-annotations'

2
leanback/src/main/java/de/nicidienase/chaosflix/leanback/detail/EventDetailsFragment.kt
View file

@ -81,7 +81,7 @@ class EventDetailsFragment : DetailsSupportFragment() {
ExoPlayerFactory.newSimpleInstance( ExoPlayerFactory.newSimpleInstance(
activity, activity,
DefaultTrackSelector( DefaultTrackSelector(
AdaptiveTrackSelection.Factory(DefaultBandwidthMeter()))) AdaptiveTrackSelection.Factory()))
} }
private val player: SimpleExoPlayer by playerDelegate private val player: SimpleExoPlayer by playerDelegate
private lateinit var playerAdapter: LeanbackPlayerAdapter private lateinit var playerAdapter: LeanbackPlayerAdapter

1
touch/build.gradle
View file

@ -121,7 +121,6 @@ dependencies {
noFreeImplementation('pl.droidsonroids:casty:1.0.8') { noFreeImplementation('pl.droidsonroids:casty:1.0.8') {
exclude group: 'com.android.support', module: 'appcompat-v7' exclude group: 'com.android.support', module: 'appcompat-v7'
} }
implementation 'com.google.android.exoplayer:exoplayer:r2.5.2'
implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.9.0' implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.9.0'
implementation 'com.github.bumptech.glide:glide:4.6.1' implementation 'com.github.bumptech.glide:glide:4.6.1'

2
touch/src/main/java/de/nicidienase/chaosflix/touch/playback/ExoPlayerFragment.java
View file

@ -174,7 +174,7 @@ public class ExoPlayerFragment extends Fragment implements PlayerEventListener.P
DefaultRenderersFactory renderersFactory = new DefaultRenderersFactory(getContext(), null, DefaultRenderersFactory.EXTENSION_RENDERER_MODE_OFF); DefaultRenderersFactory renderersFactory = new DefaultRenderersFactory(getContext(), null, DefaultRenderersFactory.EXTENSION_RENDERER_MODE_OFF);
exoPlayer = ExoPlayerFactory.newSimpleInstance(renderersFactory, trackSelector, loadControl); exoPlayer = ExoPlayerFactory.newSimpleInstance(renderersFactory, trackSelector);
PlayerEventListener listener = new PlayerEventListener(exoPlayer, this); PlayerEventListener listener = new PlayerEventListener(exoPlayer, this);
exoPlayer.addVideoListener(listener); exoPlayer.addVideoListener(listener);
exoPlayer.addListener(listener); exoPlayer.addListener(listener);

10
touch/src/main/java/de/nicidienase/chaosflix/touch/playback/PlayerEventListener.java
View file

@ -23,11 +23,6 @@ class PlayerEventListener implements Player.EventListener, SimpleExoPlayer.Video
this.listener = listener; this.listener = listener;
} }
@Override
public void onTimelineChanged(Timeline timeline, Object manifest) {
}
@Override @Override
public void onTracksChanged(TrackGroupArray trackGroups, TrackSelectionArray trackSelections) { public void onTracksChanged(TrackGroupArray trackGroups, TrackSelectionArray trackSelections) {
@ -74,11 +69,6 @@ class PlayerEventListener implements Player.EventListener, SimpleExoPlayer.Video
Log.d(TAG, errorMessage, error); Log.d(TAG, errorMessage, error);
} }
@Override
public void onPositionDiscontinuity() {
}
@Override @Override
public void onPlaybackParametersChanged(PlaybackParameters playbackParameters) { public void onPlaybackParametersChanged(PlaybackParameters playbackParameters) {