Skip to content

Commit

Permalink
Voice commands to turn on|off|change subtitles and audio stream.
Browse files Browse the repository at this point in the history
  • Loading branch information
@AndreyPavlenko
AndreyPavlenko committed Oct 24, 2021
1 parent 56bcbd4 commit 3b9efa5
Show file tree
Hide file tree
Showing 4 changed files with 57 additions and 6 deletions.
44 changes: 44 additions & 0 deletions fermata/src/main/java/me/aap/fermata/ui/activity/VoiceCommandHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@

import me.aap.fermata.R;
import me.aap.fermata.addon.AddonManager;
import me.aap.fermata.media.engine.MediaEngine;
import me.aap.fermata.media.engine.MediaEngineManager;
import me.aap.fermata.media.engine.SubtitleStreamInfo;
import me.aap.fermata.media.service.MediaSessionCallback;
import me.aap.fermata.ui.fragment.FavoritesFragment;
import me.aap.fermata.ui.fragment.MainActivityFragment;
import me.aap.fermata.ui.fragment.MediaLibFragment;
Expand All @@ -44,6 +48,10 @@ class VoiceCommandHandler {
private final Pattern aStop;
private final Pattern aPlay;
private final Pattern aPlayFavorites;
private final Pattern aSubOn;
private final Pattern aSubOff;
private final Pattern aSubChange;
private final Pattern aAudioChange;
private final Pattern lFolders;
private final Pattern lFavorites;
private final Pattern lPlaylists;
Expand All @@ -68,6 +76,10 @@ class VoiceCommandHandler {
aStop = compile(res, R.string.vcmd_action_stop);
aPlay = compile(res, R.string.vcmd_action_play);
aPlayFavorites = compile(res, R.string.vcmd_action_play_favorites);
aSubOn = compile(res, R.string.vcmd_action_sub_on);
aSubOff = compile(res, R.string.vcmd_action_sub_off);
aSubChange = compile(res, R.string.vcmd_action_sub_change);
aAudioChange = compile(res, R.string.vcmd_action_audio_change);
lFolders = compile(res, R.string.vcmd_location_folders);
lFavorites = compile(res, R.string.vcmd_location_favorites);
lPlaylists = compile(res, R.string.vcmd_location_playlists);
Expand Down Expand Up @@ -113,6 +125,33 @@ public boolean handle(String cmd) {
return true;
}

MediaSessionCallback cb = activity.getMediaSessionCallback();
MediaEngineManager mgr = cb.getEngineManager();
MediaEngine eng;

if (mgr.isVlcPlayerSupported() && ((eng = cb.getEngine()) != null)) {
if (aSubOn.matcher(cmd).matches()) {
if (eng.getCurrentSubtitleStreamInfo() != null) return true;
List<SubtitleStreamInfo> sub = eng.getSubtitleStreamInfo();
if (!sub.isEmpty()) eng.setCurrentSubtitleStream(sub.get(0));
return true;
}
if (aSubOff.matcher(cmd).matches()) {
eng.setCurrentSubtitleStream(null);
return true;
}
if (aSubChange.matcher(cmd).matches()) {
eng.setCurrentSubtitleStream(next(eng.getSubtitleStreamInfo(),
eng.getCurrentSubtitleStreamInfo()));
return true;
}
if (aAudioChange.matcher(cmd).matches()) {
eng.setCurrentAudioStream(next(eng.getAudioStreamInfo(),
eng.getCurrentAudioStreamInfo()));
return true;
}
}

Matcher m;
PatternCompat ff = null;
if ((m = cFF.matcher(cmd)).matches()) ff = cFF;
Expand Down Expand Up @@ -273,4 +312,9 @@ private int toNum(String n) {
}
return -1;
}

private static <T> T next(List<T> l, T t) {
int idx = l.indexOf(t);
return (idx < 0) ? t : l.get((++idx == l.size()) ? 0 : idx);
}
}
11 changes: 5 additions & 6 deletions fermata/src/main/java/me/aap/fermata/ui/fragment/SettingsFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,6 @@ private PreferenceViewAdapter createAdapter() {
addSubtitlePrefs(sub2, mediaPrefs, isCar);

if (!a.isCarActivity()) {
ChangeableCondition vcEnabled = PrefCondition.create(a.getPrefs(), VOICE_CONTROl_ENABLED);
sub1 = set.subSet(o -> o.title = R.string.voice_control);
sub1.addBooleanPref(o -> {
o.title = R.string.enable;
Expand All @@ -451,28 +450,28 @@ private PreferenceViewAdapter createAdapter() {
o.subtitle = R.string.voice_control_sub_long;
o.pref = VOICE_CONTROl_FB;
o.store = a.getPrefs();
o.visibility = vcEnabled;
o.visibility = PrefCondition.create(a.getPrefs(), VOICE_CONTROl_ENABLED);
});
sub1.addBooleanPref(o -> {
o.title = R.string.voice_control_menu;
o.subtitle = R.string.voice_control_sub_long;
o.pref = VOICE_CONTROl_M;
o.store = a.getPrefs();
o.visibility = vcEnabled;
o.visibility = PrefCondition.create(a.getPrefs(), VOICE_CONTROl_ENABLED);
});
sub1.addBooleanPref(o -> {
o.title = R.string.voice_control_next;
o.subtitle = R.string.voice_control_sub_double;
o.pref = NEXT_VOICE_CONTROl;
o.store = a.getPlaybackControlPrefs();
o.visibility = vcEnabled;
o.visibility = PrefCondition.create(a.getPrefs(), VOICE_CONTROl_ENABLED);
});
sub1.addBooleanPref(o -> {
o.title = R.string.voice_control_prev;
o.subtitle = R.string.voice_control_sub_double;
o.pref = PREV_VOICE_CONTROl;
o.store = a.getPlaybackControlPrefs();
o.visibility = vcEnabled;
o.visibility = PrefCondition.create(a.getPrefs(), VOICE_CONTROl_ENABLED);
});
sub1.addStringPref(o -> {
o.title = R.string.voice_control_subst;
Expand All @@ -481,7 +480,7 @@ private PreferenceViewAdapter createAdapter() {
o.pref = VOICE_CONTROL_SUBST;
o.store = a.getPrefs();
o.maxLines = 10;
o.visibility = vcEnabled;
o.visibility = PrefCondition.create(a.getPrefs(), VOICE_CONTROl_ENABLED);
});
}

Expand Down
4 changes: 4 additions & 0 deletions fermata/src/main/res/values-ru/voice_cmd.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@
<string name="vcmd_action_stop">&action_stop;</string>
<string name="vcmd_action_play">(&action_play;)|старт</string>
<string name="vcmd_action_play_favorites">(&action_play;) (&location_favorites;)</string>
<string name="vcmd_action_sub_on">(включить|показать) субтитры?</string>
<string name="vcmd_action_sub_off">(выключить|отключить|скрыть) субтитры?</string>
<string name="vcmd_action_sub_change">(поменять|сменить|изменить) субтитры?</string>
<string name="vcmd_action_audio_change">(поменять|сменить|изменить) аудио[ -]?дорожк[уа]</string>
<string name="vcmd_location_folders">&location_folders;</string>
<string name="vcmd_location_favorites">&location_favorites;</string>
<string name="vcmd_location_playlists">&location_playlists;</string>
Expand Down
4 changes: 4 additions & 0 deletions fermata/src/main/res/values/voice_cmd.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@
<string name="vcmd_action_stop">&action_stop;</string>
<string name="vcmd_action_play">(&action_play;)|start</string>
<string name="vcmd_action_play_favorites">(&action_play;) (&location_favorites;)</string>
<string name="vcmd_action_sub_on">(((turn|switch) on)|show) subtitles?</string>
<string name="vcmd_action_sub_off">(((turn|switch) off)|hide) subtitles?</string>
<string name="vcmd_action_sub_change">change subtitles?</string>
<string name="vcmd_action_audio_change">change audio[ -]?stream</string>
<string name="vcmd_location_folders">&location_folders;</string>
<string name="vcmd_location_favorites">&location_favorites;</string>
<string name="vcmd_location_playlists">&location_playlists;</string>
Expand Down

0 comments on commit 3b9efa5

Please sign in to comment.