feat(seek): add secondary subs seeking keybindings [Fixes #104]

Author: umlx5h

FlyleafLib/MediaPlayer/Player.Keys.cs

@@ -488,6 +488,17 @@ public Action GetKeyBindingAction(KeyBindingAction action)
             case KeyBindingAction.SubsPrevSeekFallback:
                 return player.Subtitles.PrevSeekFallback;
 
+            case KeyBindingAction.SubsCurSeek2:
+                return player.Subtitles.CurSeek2;
+            case KeyBindingAction.SubsPrevSeek2:
+                return player.Subtitles.PrevSeek2;
+            case KeyBindingAction.SubsNextSeek2:
+                return player.Subtitles.NextSeek2;
+            case KeyBindingAction.SubsNextSeekFallback2:
+                return player.Subtitles.NextSeekFallback2;
+            case KeyBindingAction.SubsPrevSeekFallback2:
+                return player.Subtitles.PrevSeekFallback2;
+
             case KeyBindingAction.SpeedAdd:
                 return player.SpeedUp;
 
@@ -720,6 +731,7 @@ public enum KeyBindingAction
     SeekForward4,
     [Description("Seek backwards (4)")]
     SeekBackward4,
+
     [Description("Seek to the previous subtitle")]
     SubsPrevSeek,
     [Description("Seek to the current subtitle")]
@@ -731,6 +743,17 @@ public enum KeyBindingAction
     [Description("Seek to the next subtitle or seek forwards")]
     SubsNextSeekFallback,
 
+    [Description("Seek to the previous secondary subtitle")]
+    SubsPrevSeek2,
+    [Description("Seek to the current secondary subtitle")]
+    SubsCurSeek2,
+    [Description("Seek to the next secondary subtitle")]
+    SubsNextSeek2,
+    [Description("Seek to the previous secondary subtitle or seek backwards")]
+    SubsPrevSeekFallback2,
+    [Description("Seek to the next secondary subtitle or seek forwards")]
+    SubsNextSeekFallback2,
+
     [Description("Speed Up (1)")]
     SpeedAdd,
     [Description("Speed Up (2)")]

FlyleafLib/MediaPlayer/Subtitles.cs

@@ -779,60 +779,77 @@ public void ToggleVisibilitySecondary()
         Config.Subtitles[1].Visible = !Config.Subtitles[1].Visible;
     }
 
-    private bool _prevSeek()
+    private bool _prevSeek(int subIndex)
     {
-        var prev = _player.SubtitlesManager[0].GetPrev();
+        var prev = _player.SubtitlesManager[subIndex].GetPrev();
         if (prev is not null)
         {
-            _player.SeekAccurate(prev.StartTime, 0);
+            _player.SeekAccurate(prev.StartTime, subIndex);
             return true;
         }
 
         return false;
     }
 
-    public void PrevSeek() => _prevSeek();
+    public void PrevSeek() => _prevSeek(0);
+    public void PrevSeek2() => _prevSeek(1);
 
     public void PrevSeekFallback()
     {
-        bool seeked = _prevSeek();
-        if (!seeked)
+        if (!_prevSeek(0))
+        {
+            _player.SeekBackward2();
+        }
+    }
+    public void PrevSeekFallback2()
+    {
+        if (!_prevSeek(1))
         {
             _player.SeekBackward2();
         }
     }
 
-    public void CurSeek()
+    private void _curSeek(int subIndex)
     {
-        var cur = _player.SubtitlesManager[0].GetCurrent();
+        var cur = _player.SubtitlesManager[subIndex].GetCurrent();
         if (cur is not null)
         {
-            _player.SeekAccurate(cur.StartTime, 0);
+            _player.SeekAccurate(cur.StartTime, subIndex);
         }
         else
         {
             // fallback to prevSeek (same as mpv)
-            PrevSeek();
+            _prevSeek(subIndex);
         }
     }
 
-    private bool _nextSeek()
+    public void CurSeek() => _curSeek(0);
+    public void CurSeek2() => _curSeek(1);
+
+    private bool _nextSeek(int subIndex)
     {
-        var next = _player.SubtitlesManager[0].GetNext();
+        var next = _player.SubtitlesManager[subIndex].GetNext();
         if (next is not null)
         {
-            _player.SeekAccurate(next.StartTime, 0);
+            _player.SeekAccurate(next.StartTime, subIndex);
             return true;
         }
         return false;
     }
 
-    public void NextSeek() => _nextSeek();
+    public void NextSeek() => _nextSeek(0);
+    public void NextSeek2() => _nextSeek(1);
 
     public void NextSeekFallback()
     {
-        bool seeked = _nextSeek();
-        if (!seeked)
+        if (!_nextSeek(0))
+        {
+            _player.SeekForward2();
+        }
+    }
+    public void NextSeekFallback2()
+    {
+        if (!_nextSeek(1))
         {
             _player.SeekForward2();
         }

LLPlayer/Services/AppActions.cs

@@ -894,7 +894,13 @@ public static KeyBindingActionGroup ToGroup(this KeyBindingAction action)
             case KeyBindingAction.SubsNextSeek:
             case KeyBindingAction.SubsPrevSeekFallback:
             case KeyBindingAction.SubsNextSeekFallback:
+            case KeyBindingAction.SubsPrevSeek2:
+            case KeyBindingAction.SubsCurSeek2:
+            case KeyBindingAction.SubsNextSeek2:
+            case KeyBindingAction.SubsPrevSeekFallback2:
+            case KeyBindingAction.SubsNextSeekFallback2:
                 return KeyBindingActionGroup.Subtitles;
+
             case KeyBindingAction.ShowNextFrame:
             case KeyBindingAction.ShowPrevFrame:
             case KeyBindingAction.SpeedAdd:

LLPlayer/Views/SettingsDialog.xaml

@@ -52,7 +52,7 @@
                     <TreeViewItem Tag="SettingsAudio">
                         <TreeViewItem.Header>
                             <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
-                                <materialDesign:PackIcon Kind="Headphones" Width="24" Height="24" Margin="0 0 8 0" />
+                                <materialDesign:PackIcon Kind="MusicBox" Width="24" Height="24" Margin="0 0 8 0" />
                                 <TextBlock Text="Audio" VerticalAlignment="Center" />
                             </StackPanel>
                         </TreeViewItem.Header>