Add support for secondary audio track type

TeamNewPipe · Nov 17, 2024 · 1f63477 · 1f63477
1 parent a962e6d
commit 1f63477
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 16 deletions.
diff --git a/app/src/main/java/org/schabi/newpipe/util/ListHelper.java b/app/src/main/java/org/schabi/newpipe/util/ListHelper.java
@@ -48,10 +48,12 @@ public final class ListHelper {
     private static final Set<String> HIGH_RESOLUTION_LIST = Set.of("1440p", "2160p");
     // Audio track types in order of priority. 0=lowest, n=highest
     private static final List<AudioTrackType> AUDIO_TRACK_TYPE_RANKING =
-            List.of(AudioTrackType.DESCRIPTIVE, AudioTrackType.DUBBED, AudioTrackType.ORIGINAL);
+            List.of(AudioTrackType.DESCRIPTIVE, AudioTrackType.SECONDARY, AudioTrackType.DUBBED,
+                    AudioTrackType.ORIGINAL);
     // Audio track types in order of priority when descriptive audio is preferred.
     private static final List<AudioTrackType> AUDIO_TRACK_TYPE_RANKING_DESCRIPTIVE =
-            List.of(AudioTrackType.ORIGINAL, AudioTrackType.DUBBED, AudioTrackType.DESCRIPTIVE);
+            List.of(AudioTrackType.ORIGINAL, AudioTrackType.DUBBED, AudioTrackType.SECONDARY,
+                    AudioTrackType.DESCRIPTIVE);
 
     /**
      * List of supported YouTube Itag ids.

diff --git a/app/src/main/java/org/schabi/newpipe/util/Localization.java b/app/src/main/java/org/schabi/newpipe/util/Localization.java
@@ -342,25 +342,20 @@ public static String audioTrackName(@NonNull final Context context, final AudioS
 
         if (track.getAudioTrackType() != null) {
             final String trackType = audioTrackType(context, track.getAudioTrackType());
-            if (trackType != null) {
-                return context.getString(R.string.audio_track_name, name, trackType);
-            }
+            return context.getString(R.string.audio_track_name, name, trackType);
         }
         return name;
     }
 
-    @Nullable
+    @NonNull
     private static String audioTrackType(@NonNull final Context context,
-                                         final AudioTrackType trackType) {
-        switch (trackType) {
-            case ORIGINAL:
-                return context.getString(R.string.audio_track_type_original);
-            case DUBBED:
-                return context.getString(R.string.audio_track_type_dubbed);
-            case DESCRIPTIVE:
-                return context.getString(R.string.audio_track_type_descriptive);
-        }
-        return null;
+                                         @NonNull final AudioTrackType trackType) {
+        return switch (trackType) {
+            case ORIGINAL -> context.getString(R.string.audio_track_type_original);
+            case DUBBED -> context.getString(R.string.audio_track_type_dubbed);
+            case DESCRIPTIVE -> context.getString(R.string.audio_track_type_descriptive);
+            case SECONDARY -> context.getString(R.string.audio_track_type_secondary);
+        };
     }
 
     /*//////////////////////////////////////////////////////////////////////////

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -816,6 +816,7 @@
     <string name="audio_track_type_original">original</string>
     <string name="audio_track_type_dubbed">dubbed</string>
     <string name="audio_track_type_descriptive">descriptive</string>
+    <string name="audio_track_type_secondary">secondary</string>
     <string name="channel_tab_videos">Videos</string>
     <string name="channel_tab_tracks">Tracks</string>
     <string name="channel_tab_shorts">Shorts</string>