Skip to content

feat: Auto-load option for external subtitles for network videos (#664) #680

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Shra1V32 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: Auto-load option for external subtitles for network videos (#664) #680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/src/main/java/com/brouken/player/PlayerActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1973,7 +1973,7 @@ void searchSubtitles() {
if (mPrefs.mediaUri == null)
return;

if (Utils.isSupportedNetworkUri(mPrefs.mediaUri) && Utils.isProgressiveContainerUri(mPrefs.mediaUri)) {
if (mPrefs.subtitleAutoSearch && Utils.isSupportedNetworkUri(mPrefs.mediaUri) && Utils.isProgressiveContainerUri(mPrefs.mediaUri)) {
SubtitleUtils.clearCache(this);
if (SubtitleFinder.isUriCompatible(mPrefs.mediaUri)) {
subtitleFinder = new SubtitleFinder(PlayerActivity.this, mPrefs.mediaUri);
Expand Down Expand Up @@ -2317,4 +2317,4 @@ private void updateButtonRotation() {
}
}
}
}
}
3 changes: 3 additions & 0 deletions app/src/main/java/com/brouken/player/Prefs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ class Prefs {
private static final String PREF_KEY_LANGUAGE_AUDIO = "languageAudio";
private static final String PREF_KEY_SUBTITLE_STYLE_EMBEDDED = "subtitleStyleEmbedded";
private static final String PREF_KEY_SUBTITLE_STYLE_BOLD = "subtitleStyleBold";
private static final String PREF_KEY_SUBTITLE_AUTO_SEARCH = "subtitleAutoSearch";

public static final String TRACK_DEFAULT = "default";
public static final String TRACK_DEVICE = "device";
Expand Down Expand Up @@ -81,6 +82,7 @@ class Prefs {
public String languageAudio = TRACK_DEVICE;
public boolean subtitleStyleEmbedded = true;
public boolean subtitleStyleBold = false;
public boolean subtitleAutoSearch = false;

private LinkedHashMap positions;

Expand Down Expand Up @@ -130,6 +132,7 @@ public void loadUserPreferences() {
languageAudio = mSharedPreferences.getString(PREF_KEY_LANGUAGE_AUDIO, languageAudio);
subtitleStyleEmbedded = mSharedPreferences.getBoolean(PREF_KEY_SUBTITLE_STYLE_EMBEDDED, subtitleStyleEmbedded);
subtitleStyleBold = mSharedPreferences.getBoolean(PREF_KEY_SUBTITLE_STYLE_BOLD, subtitleStyleBold);
subtitleAutoSearch = mSharedPreferences.getBoolean(PREF_KEY_SUBTITLE_AUTO_SEARCH, subtitleAutoSearch);
}

public void updateMedia(final Context context, final Uri uri, final String type) {
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,7 @@
<string name="pref_subtitle_style_bold">Bold style</string>
<string name="pref_subtitle_style_bold_on">Use bold typeface as regular</string>
<string name="pref_subtitle_style_bold_off">Use default regular typeface</string>
<string name="pref_subtitle_autosearch">Guess subtitles from video name</string>
<string name="pref_subtitle_autosearch_on">For network videos, try to load subtitles with common names (e.g., video.srt)</string>
<string name="pref_subtitle_autosearch_off">Do not guess subtitles from video name</string>
</resources>
7 changes: 7 additions & 0 deletions app/src/main/res/xml/root_preferences.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,13 @@
android:summaryOff="@string/pref_subtitle_style_bold_off"
app:title="@string/pref_subtitle_style_bold" />

<SwitchPreferenceCompat
app:key="subtitleAutoSearch"
app:defaultValue="false"
android:summaryOn="@string/pref_subtitle_autosearch_on"
android:summaryOff="@string/pref_subtitle_autosearch_off"
app:title="@string/pref_subtitle_autosearch" />

<Preference
app:title="@string/pref_captioning_preferences">
<intent android:action="android.settings.CAPTIONING_SETTINGS" />
Expand Down