Peertube
/
NewPipe-app-android
mirror of https://github.com/TeamNewPipe/NewPipe/
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: audio stream cache key, code fmt

This commit is contained in:
ThetaDev 2023-05-01 00:04:04 +02:00
parent 4e837e838d
commit 22671ca16c
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
View File

@ -470,9 +470,7 @@ public class DownloadDialog extends DialogFragment
dialogBinding.audioTrackSpinner.setVisibility( dialogBinding.audioTrackSpinner.setVisibility(
isVideoOnly && wrappedAudioTracks.size() > 1 ? View.VISIBLE : View.GONE); isVideoOnly && wrappedAudioTracks.size() > 1 ? View.VISIBLE : View.GONE);
dialogBinding.defaultAudioTrackPresentText.setVisibility( dialogBinding.defaultAudioTrackPresentText.setVisibility(
!isVideoOnly && wrappedAudioTracks.size() > 1 ? View.VISIBLE : View.GONE !isVideoOnly && wrappedAudioTracks.size() > 1 ? View.VISIBLE : View.GONE);
);
} }
private void setupSubtitleSpinner() { private void setupSubtitleSpinner() {

5
app/src/main/java/org/schabi/newpipe/player/resolver/PlaybackResolver.java
View File

@ -161,6 +161,11 @@ public interface PlaybackResolver extends Resolver<StreamInfo, MediaSource> {
cacheKey.append(audioStream.getAudioTrackId()); cacheKey.append(audioStream.getAudioTrackId());
} }
if (audioStream.getAudioLocale() != null) {
cacheKey.append(" ");
cacheKey.append(audioStream.getAudioLocale().getISO3Language());
}
return cacheKey.toString(); return cacheKey.toString();
} }

3
app/src/main/java/org/schabi/newpipe/util/ListHelper.java
View File

@ -797,7 +797,8 @@ public final class ListHelper {
* @return Comparator * @return Comparator
*/ */
static Comparator<AudioStream> getAudioTrackComparator( static Comparator<AudioStream> getAudioTrackComparator(
final Locale preferredLanguage, final boolean preferOriginalAudio, final Locale preferredLanguage,
final boolean preferOriginalAudio,
final boolean preferDescriptiveAudio) { final boolean preferDescriptiveAudio) {
final String langCode = preferredLanguage.getISO3Language(); final String langCode = preferredLanguage.getISO3Language();
final List<AudioTrackType> trackTypeRanking = preferDescriptiveAudio final List<AudioTrackType> trackTypeRanking = preferDescriptiveAudio

6
app/src/test/java/org/schabi/newpipe/util/ListHelperTest.java
View File

@ -451,8 +451,10 @@ public class ListHelperTest {
} }
private static AudioStream generateAudioTrack( private static AudioStream generateAudioTrack(
@NonNull final String id, @Nullable final String trackId, @NonNull final String id,
@Nullable final Locale locale, @Nullable final AudioTrackType trackType) { @Nullable final String trackId,
@Nullable final Locale locale,
@Nullable final AudioTrackType trackType) {
return new AudioStream.Builder() return new AudioStream.Builder()
.setId(id) .setId(id)
.setContent("", true) .setContent("", true)