Browse Source

Disable subtitles tracks while casting

pipelines/135724
Nicolas Pomepuy 5 years ago
parent
commit
b8818c413f
  1. 1
      application/resources/src/main/res/values/strings.xml
  2. 1
      application/vlc-android/res/layout/player_overlay_track_item.xml
  3. 14
      application/vlc-android/src/org/videolan/vlc/gui/dialogs/VideoTracksDialog.kt

1
application/resources/src/main/res/values/strings.xml

@ -779,5 +779,6 @@
<string name="audio_delay_global">Audio delay set to %s ms for all videos</string>
<string name="warning_stream_speed">Increasing playback speed over 1 for streams may cause stuttering</string>
<string name="go_to_folder">Browse parent</string>
<string name="no_sub_renderer">Subtitles are not yet supported while casting</string>
</resources>

1
application/vlc-android/res/layout/player_overlay_track_item.xml

@ -43,6 +43,7 @@
android:layout_marginTop="24dp"
android:gravity="center_vertical"
android:text="@string/no_track"
android:textAlignment="center"
android:textColor="@color/white_transparent_50"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"

14
application/vlc-android/src/org/videolan/vlc/gui/dialogs/VideoTracksDialog.kt

@ -91,11 +91,17 @@ class VideoTracksDialog : VLCBottomSheetDialogFragment() {
binding.audioTracks.trackList.adapter = trackAdapter
}
playbackService.spuTracks?.let { trackList ->
val trackAdapter = TrackAdapter(trackList as Array<MediaPlayer.TrackDescription>, trackList.firstOrNull { it.id == playbackService.spuTrack })
trackAdapter.setOnTrackSelectedListener { track ->
trackSelectionListener.invoke(track.id, TrackType.SPU)
if (!playbackService.hasRenderer()) {
val trackAdapter = TrackAdapter(trackList as Array<MediaPlayer.TrackDescription>, trackList.firstOrNull { it.id == playbackService.spuTrack })
trackAdapter.setOnTrackSelectedListener { track ->
trackSelectionListener.invoke(track.id, TrackType.SPU)
}
binding.subtitleTracks.trackList.adapter = trackAdapter
} else {
binding.subtitleTracks.emptyView.text = getString(R.string.no_sub_renderer)
binding.subtitleTracks.emptyView.setVisible()
binding.subtitleTracks.trackMore.setGone()
}
binding.subtitleTracks.trackList.adapter = trackAdapter
if (trackList.isEmpty()) binding.subtitleTracks.emptyView.setVisible()
}
if (playbackService.spuTracks == null) binding.subtitleTracks.emptyView.setVisible()

Loading…
Cancel
Save