Skip to content

Commit d89a3c6

Browse files
committed
Remove "default" from audio track already present message
We don't know if, on muxed video streams we get for all services which support multiple audio languages, that the audio language returned is the original one or not, even if it should be the case. In order to avoid saying potential false information, this word has been removed from the string resource (ID and value) and the corresponding layout ID in the download dialog.
1 parent 22671ca commit d89a3c6

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ private void setupAudioSpinner() {
448448
dialogBinding.audioStreamSpinner.setVisibility(View.VISIBLE);
449449
dialogBinding.audioTrackSpinner.setVisibility(
450450
wrappedAudioTracks.size() > 1 ? View.VISIBLE : View.GONE);
451-
dialogBinding.defaultAudioTrackPresentText.setVisibility(View.GONE);
451+
dialogBinding.audioTrackPresentInVideoText.setVisibility(View.GONE);
452452
}
453453

454454
private void setupVideoSpinner() {
@@ -469,7 +469,7 @@ private void onVideoStreamSelected() {
469469

470470
dialogBinding.audioTrackSpinner.setVisibility(
471471
isVideoOnly && wrappedAudioTracks.size() > 1 ? View.VISIBLE : View.GONE);
472-
dialogBinding.defaultAudioTrackPresentText.setVisibility(
472+
dialogBinding.audioTrackPresentInVideoText.setVisibility(
473473
!isVideoOnly && wrappedAudioTracks.size() > 1 ? View.VISIBLE : View.GONE);
474474
}
475475

@@ -484,7 +484,7 @@ private void setupSubtitleSpinner() {
484484
setRadioButtonsState(true);
485485
dialogBinding.audioStreamSpinner.setVisibility(View.GONE);
486486
dialogBinding.audioTrackSpinner.setVisibility(View.GONE);
487-
dialogBinding.defaultAudioTrackPresentText.setVisibility(View.GONE);
487+
dialogBinding.audioTrackPresentInVideoText.setVisibility(View.GONE);
488488
}
489489

490490

app/src/main/res/layout/download_dialog.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,22 +94,22 @@
9494
tools:visibility="gone" />
9595

9696
<org.schabi.newpipe.views.NewPipeTextView
97-
android:id="@+id/default_audio_track_present_text"
97+
android:id="@+id/audio_track_present_in_video_text"
9898
android:layout_width="match_parent"
9999
android:layout_height="wrap_content"
100100
android:layout_below="@+id/audio_stream_spinner"
101101
android:layout_marginLeft="24dp"
102102
android:layout_marginRight="24dp"
103103
android:layout_marginBottom="12dp"
104104
android:gravity="center"
105-
android:text="@string/default_audio_track_present"
105+
android:text="@string/audio_track_present_in_video"
106106
android:textSize="12sp" />
107107

108108
<org.schabi.newpipe.views.NewPipeTextView
109109
android:id="@+id/threads_text_view"
110110
android:layout_width="match_parent"
111111
android:layout_height="wrap_content"
112-
android:layout_below="@+id/default_audio_track_present_text"
112+
android:layout_below="@+id/audio_track_present_in_video_text"
113113
android:layout_marginLeft="24dp"
114114
android:layout_marginRight="24dp"
115115
android:layout_marginBottom="6dp"

app/src/main/res/values/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -767,7 +767,7 @@
767767
<string name="enumeration_comma">,</string>
768768
<string name="toggle_all">Toggle all</string>
769769
<string name="streams_not_yet_supported_removed">Streams which are not yet supported by the downloader are not shown</string>
770-
<string name="default_audio_track_present">The default audio track should be already present in this stream</string>
770+
<string name="audio_track_present_in_video">An audio track should be already present in this stream</string>
771771
<string name="selected_stream_external_player_not_supported">The selected stream is not supported by external players</string>
772772
<string name="no_audio_streams_available_for_external_players">No audio streams are available for external players</string>
773773
<string name="no_video_streams_available_for_external_players">No video streams are available for external players</string>

0 commit comments

Comments
 (0)