From a3188b4ab9956f21d111fc0b4cc76dfeef2a9f6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mr=2E=E5=96=9C?=
 <50934714+Hellobaka@users.noreply.github.com>
Date: Sat, 3 Sep 2022 22:32:03 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=8F=8C=E8=AF=AD?=
 =?UTF-8?q?=E6=AD=8C=E8=AF=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dialogs/EditLineDialog.xaml            |  7 ++++++-
 Dialogs/EditLineDialog.xaml.cs         |  4 ++++
 Models/LrcModel.cs                     | 14 ++++++++++++--
 Views/LyricEditorViewCommandBinding.cs |  2 +-
 4 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/Dialogs/EditLineDialog.xaml b/Dialogs/EditLineDialog.xaml
index fd7422c..0a2bc2c 100644
--- a/Dialogs/EditLineDialog.xaml
+++ b/Dialogs/EditLineDialog.xaml
@@ -62,6 +62,7 @@
                 <RowDefinition/>
                 <RowDefinition Height="Auto"/>
                 <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
             </Grid.RowDefinitions>
             <TextBlock Margin="0,0,0,12" Opacity="0.5">
                 <TextBlock.Style>
@@ -89,7 +90,11 @@
                     IsEnabled="False"
                     TypeList="{x:Static models:ModeType.PreType}"/>
             </Grid>
-            <StackPanel Grid.Row="3" Orientation="Horizontal"
+            <StackPanel Orientation="Horizontal" Grid.Row="3">
+                <TextBlock>双语：</TextBlock>
+                <CheckBox x:Name="Dual_languageSwitch"></CheckBox>
+            </StackPanel>
+            <StackPanel Grid.Row="4" Orientation="Horizontal"
                         HorizontalAlignment="Right"
                         Margin="0,12,0,0">
                 <Button Margin="12,0" Content="确定" MinWidth="80"
diff --git a/Dialogs/EditLineDialog.xaml.cs b/Dialogs/EditLineDialog.xaml.cs
index 87cf3da..10b02d7 100644
--- a/Dialogs/EditLineDialog.xaml.cs
+++ b/Dialogs/EditLineDialog.xaml.cs
@@ -77,6 +77,10 @@ public static string GetData()
             _data = null;
             return data;
         }
+        public static bool GetIsDualLanguage()
+        {
+            return (bool)Current.Dual_languageSwitch.IsChecked;
+        }
 
         #endregion
 
diff --git a/Models/LrcModel.cs b/Models/LrcModel.cs
index 3596257..e113bcb 100644
--- a/Models/LrcModel.cs
+++ b/Models/LrcModel.cs
@@ -182,9 +182,19 @@ private void OnLrcModelPropertyChanged([CallerMemberName] string propertyName =
 
         #region ItemOperations
 
-        public void AddLyrics(string lyrics)
+        public void AddLyrics(string lyrics, bool isDualLanguage = false)
         {
-            AddLyrics(lyrics.Split('\n'));
+            if(isDualLanguage)
+            {
+                AddLyrics(lyrics.Split('\n').Where((x, index) =>
+                {
+                    return index % 2 == 0;
+                }).ToArray());
+            }
+            else
+            {
+                AddLyrics(lyrics.Split('\n'));
+            }
         }
 
         public void AddLyrics(string[] lyrics)
diff --git a/Views/LyricEditorViewCommandBinding.cs b/Views/LyricEditorViewCommandBinding.cs
index 4a47e80..b855393 100644
--- a/Views/LyricEditorViewCommandBinding.cs
+++ b/Views/LyricEditorViewCommandBinding.cs
@@ -29,7 +29,7 @@ public void AddLyrics_Executed(object sender, ExecutedRoutedEventArgs e)
             EditLineDialog.ShowAddDialog();
             string data = EditLineDialog.GetData();
             if (string.IsNullOrEmpty(data)) return;
-            LrcModel.Current.AddLyrics(data);
+            LrcModel.Current.AddLyrics(data, EditLineDialog.GetIsDualLanguage());
         }
 
         private void CanExecute(object sender, CanExecuteRoutedEventArgs e)

From dfb4fb4a069734ae093e7cc705049ba60bc95846 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mr=2E=E5=96=9C?=
 <50934714+Hellobaka@users.noreply.github.com>
Date: Sat, 3 Sep 2022 22:32:45 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=80=8D=E9=80=9F=E6=92=AD=E6=94=BE=20?=
 =?UTF-8?q?=E6=92=AD=E6=94=BE=E6=8C=89=E9=92=AE=E5=9B=BE=E6=A0=87=E4=B8=8E?=
 =?UTF-8?q?=E6=96=87=E6=9C=AC=E9=9A=8F=E6=92=AD=E6=94=BE=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E5=8F=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Views/PlaybackView.xaml.cs           | 12 ++++++--
 Views/PlaybackViewCommandBinding.cs  |  2 +-
 Views/PlaybackViewDataContext.cs     | 44 +++++++++++++++++++++++++++-
 Windows/MainWindow.xaml              | 33 ++++++++++++++++-----
 Windows/MainWindow.xaml.cs           |  7 ++++-
 Windows/MainWindowCommandBindings.cs |  9 ++++++
 6 files changed, 94 insertions(+), 13 deletions(-)

diff --git a/Views/PlaybackView.xaml.cs b/Views/PlaybackView.xaml.cs
index 2bd0ac6..3b9e997 100644
--- a/Views/PlaybackView.xaml.cs
+++ b/Views/PlaybackView.xaml.cs
@@ -30,7 +30,7 @@ public partial class PlaybackView : UserControl, IDockSource
 
         public PlaybackView()
         {
-            InitializeComponent();
+            InitializeComponent();            
             VideoElement.PositionChanged += (o, args) =>
                 Position.Time = (long)args.Position.TotalMilliseconds;
             VideoElement.MediaOpened += (o, args) =>
@@ -38,11 +38,17 @@ public PlaybackView()
             VideoElement.MediaFailed += (o, args) => Console.WriteLine(@"[FFME] MediaFailed : " + args.ErrorException);
             VideoElement.MediaEnded += async (o, args) =>
             {
-                await VideoElement.Seek(TimeSpan.Zero);
-                await VideoElement.Play();
+                //await VideoElement.Seek(TimeSpan.Zero);
+                //await VideoElement.Play();
             };
             //VideoElement.RenderingVideo += RenderPreviewOnVideo;
             Position.OnPositionActiveChanged += () => SeekToPosition(Position.Time);
+            PlaySpeedChanged += PlaybackView_PlaySpeedChanged;
+        }
+
+        private void PlaybackView_PlaySpeedChanged(double speed)
+        {
+            VideoElement.SpeedRatio = speed;
         }
 
         private void RenderPreviewOnVideo(object sender, RenderingVideoEventArgs e)
diff --git a/Views/PlaybackViewCommandBinding.cs b/Views/PlaybackViewCommandBinding.cs
index 767afe7..a8dd8ef 100644
--- a/Views/PlaybackViewCommandBinding.cs
+++ b/Views/PlaybackViewCommandBinding.cs
@@ -60,7 +60,7 @@ private async void Commands_LoadMedia(object sender, ExecutedRoutedEventArgs e)
             Playing = true;
             //MediaPlayer.Play(new Media(_libVLC, fileDialog.FileName));
             await VideoElement.Open(new Uri(fileDialog.FileName));
-            await VideoElement.Play();
+            //await VideoElement.Play();
         }
 
         private async void Command_UnloadMedia(object sender, ExecutedRoutedEventArgs e)
diff --git a/Views/PlaybackViewDataContext.cs b/Views/PlaybackViewDataContext.cs
index 8ecbdb8..052a979 100644
--- a/Views/PlaybackViewDataContext.cs
+++ b/Views/PlaybackViewDataContext.cs
@@ -27,7 +27,22 @@ public bool MediaLoaded
                 OnPropertyChanged();
             }
         }
+        private double _playSpeed = 1;
 
+        public double PlaySpeed
+        {
+            get => _playSpeed;
+            set
+            {
+                if (value > 3) value = 3;
+                if (value < 0.1) value = 0.1;
+                _playSpeed = value;
+                OnPropertyChanged();
+                PlaySpeedChanged?.Invoke(_playSpeed);
+            }
+        }
+        public delegate void PlaySpeedChangedHandler(double speed);
+        public event PlaySpeedChangedHandler PlaySpeedChanged;
         public Position Position { get; } = new Position();
 
         private bool _playing;
@@ -40,15 +55,42 @@ public bool Playing
                 if (!MediaLoaded) return;
                 _playing = value;
                 if (value)
+                {
                     VideoElement.Play();
+                    PlayButtonIconType = "Pause";
+                    PlayButtonText = "暂停";
+                }
                 else
+                {
                     VideoElement.Pause();
+                    PlayButtonIconType = "Run";
+                    PlayButtonText = "播放";
+                }
                 if (value) ThemeService.Current.ChangeAccent(Accent.Orange);
                 else ThemeService.Current.ChangeAccent(Accent.Blue);
                 OnPropertyChanged();
             }
         }
-
+        public string _playButtonIconType = "Run";
+        public string PlayButtonIconType
+        {
+            get => _playButtonIconType;
+            set
+            {
+                _playButtonIconType = value;
+                OnPropertyChanged();
+            }
+        }
+        public string _playButtonText = "播放";
+        public string PlayButtonText
+        {
+            get => _playButtonText;
+            set
+            {
+                _playButtonText = value;
+                OnPropertyChanged();
+            }
+        }
         #endregion
 
         #region PropertyChanged
diff --git a/Windows/MainWindow.xaml b/Windows/MainWindow.xaml
index 56b85d3..4e40c8d 100644
--- a/Windows/MainWindow.xaml
+++ b/Windows/MainWindow.xaml
@@ -134,12 +134,31 @@
 
         <Grid Grid.Row="0">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition />
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
                 <ColumnDefinition Width="Auto" />
-                <ColumnDefinition />
+                <ColumnDefinition Width="2*"/>
             </Grid.ColumnDefinitions>
-
-            <StackPanel Grid.Column="1" HorizontalAlignment="Center" Orientation="Horizontal" Name="WndCaption"
+            <StackPanel x:Name="SpeedPanel" Orientation="Horizontal" VerticalAlignment="Center" Grid.Column="1" Margin="0,32,0,0">
+                <TextBlock VerticalAlignment="Center">倍速：</TextBlock>
+                <Slider                         
+                    ToolTip="E/P加速 Q/I减速"
+                    Width="100" 
+                    Minimum="0.1" 
+                    Maximum="3" 
+                    DataContext="{x:Static views:PlaybackView.Current}"
+                    Value="{Binding PlaySpeed}"
+                 ></Slider>
+                <TextBlock DataContext="{x:Static views:PlaybackView.Current}" VerticalAlignment="Center">
+                    <TextBlock.Text>
+                        <Binding Path="PlaySpeed" StringFormat="×{0:f2}"/>
+                    </TextBlock.Text>
+                </TextBlock>
+                <Button Margin="5,0,0,0" Name="ResetSpeed" Click="ResetSpeed_Click">
+                    重置
+                </Button>
+            </StackPanel>
+            <StackPanel Grid.Column="2" HorizontalAlignment="Center" Orientation="Horizontal" Name="WndCaption"
                         DataContext="{x:Static views:PlaybackView.Current}">
                 <Grid
                     Name="Wnd7"
@@ -246,10 +265,10 @@
                               Height="80" Width="80" Padding="0" Name="Wnd4"
                               IsEnabled="{Binding MediaLoaded}" IsChecked="{Binding Playing}">
                     <Grid Height="80" Width="80">
-                        <visualIcon:Icon Type="Run" Width="35" Height="35" Size="2"
+                        <visualIcon:Icon Type="{Binding PlayButtonIconType}" Width="35" Height="35" Size="2"
                                          HorizontalAlignment="Left" VerticalAlignment="Top" Margin="4,0" />
                         <TextBlock HorizontalAlignment="Center" VerticalAlignment="Bottom"
-                                   Margin="-2,0,0,6" Text="播放/暂停" />
+                                   Margin="-2,0,0,6" Text="{Binding PlayButtonText}" />
                     </Grid>
                 </ToggleButton>
                 <!--<ToggleButton HorizontalAlignment="Right" VerticalAlignment="Bottom"
@@ -263,7 +282,7 @@
                 </ToggleButton>-->
             </StackPanel>
 
-            <Grid Grid.Column="2" Margin="0,32,0,0">
+            <Grid Grid.Column="3" Margin="0,32,0,0">
                 <Slider Margin="12" Name="Wnd6"
                         DataContext="{x:Static views:PlaybackView.Current}"
                         Minimum="0" Maximum="1"
diff --git a/Windows/MainWindow.xaml.cs b/Windows/MainWindow.xaml.cs
index 5d916ff..da97f25 100644
--- a/Windows/MainWindow.xaml.cs
+++ b/Windows/MainWindow.xaml.cs
@@ -74,7 +74,7 @@ private void OnLoaded(object sender, RoutedEventArgs e)
             IntPtr hwnd = new WindowInteropHelper(this).Handle;
             HwndSource.FromHwnd(hwnd).AddHook(WndProc);
             wndList = new List<FrameworkElement>
-                {Wnd1, Wnd2, Wnd3, Wnd4, Wnd5, Wnd6, Wnd7};
+                {Wnd1, Wnd2, Wnd3, Wnd4, Wnd5, Wnd6, Wnd7, SpeedPanel};
 
             PlaybackView.Current.DockControl.Show();
             if (!LayoutHelper<Config>.ApplyLayout(DockManager, this)) LyricEditorView.Current.DockControl.Show();
@@ -147,5 +147,10 @@ private IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref b
         private const int WM_NCHITTEST = 0x0084;
 
         #endregion
+
+        private void ResetSpeed_Click(object sender, RoutedEventArgs e)
+        {
+            PlaybackView.Current.PlaySpeed = 1.0;
+        }
     }
 }
diff --git a/Windows/MainWindowCommandBindings.cs b/Windows/MainWindowCommandBindings.cs
index 040e720..4217051 100644
--- a/Windows/MainWindowCommandBindings.cs
+++ b/Windows/MainWindowCommandBindings.cs
@@ -271,6 +271,15 @@ private void TriggerKeyPress(Key key)
                 case Key.Right:
                     PlaybackView.Current.JumpDuration(+1000);
                     break;
+                case Key.Q:
+                case Key.I:
+                    PlaybackView.Current.PlaySpeed -= 0.1;
+                    break;
+                case Key.E:
+                case Key.P:
+                    PlaybackView.Current.PlaySpeed += 0.1;
+                    break;
+
             }
         }
 

From 0cd2e883b64e5ddfff08a20099b86b97f9f0489f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mr=2E=E5=96=9C?=
 <50934714+Hellobaka@users.noreply.github.com>
Date: Sat, 3 Sep 2022 22:51:55 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=8F=8C=E8=AF=AD=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=E7=A9=BA=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Models/LrcModel.cs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/Models/LrcModel.cs b/Models/LrcModel.cs
index e113bcb..a04a589 100644
--- a/Models/LrcModel.cs
+++ b/Models/LrcModel.cs
@@ -186,9 +186,10 @@ public void AddLyrics(string lyrics, bool isDualLanguage = false)
         {
             if(isDualLanguage)
             {
-                AddLyrics(lyrics.Split('\n').Where((x, index) =>
+                lyrics = lyrics.Replace("\r", "");
+                AddLyrics(lyrics.Split('\n').Where(x => string.IsNullOrEmpty(x) is false).ToList().Where((x, index) =>
                 {
-                    return index % 2 == 0;
+                    return index % 2 == 0 ;
                 }).ToArray());
             }
             else
@@ -313,6 +314,11 @@ public void RemoveLine(LrcLine line)
             if (decreaseIndex) GlobalIndex -= oldCount;
         }
 
+        public void ClearAll()
+        {
+            Current.Items.Clear();
+        }
+
         #endregion
 
     }

From d37632353e029524e046e0bb858ce8d5e3c857ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mr=2E=E5=96=9C?=
 <50934714+Hellobaka@users.noreply.github.com>
Date: Sat, 3 Sep 2022 22:52:10 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=B8=85=E7=A9=BA=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E6=AD=8C=E8=AF=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Commands/EditCommands.cs               |  6 ++++++
 Views/LyricEditorViewCommandBinding.cs | 12 ++++++++++++
 Windows/MainWindow.xaml                |  1 +
 3 files changed, 19 insertions(+)

diff --git a/Commands/EditCommands.cs b/Commands/EditCommands.cs
index d178d29..cfd5dbc 100644
--- a/Commands/EditCommands.cs
+++ b/Commands/EditCommands.cs
@@ -20,6 +20,12 @@ public static partial class UICommands
                 new KeyGesture(Key.F5, ModifierKeys.None, "F5")
             }));
 
+        public static RoutedUICommand ClearLyrics { get; } = new RoutedUICommand(
+            "清空歌词(_C)...",
+            "ClearLyrics",
+            typeof(UICommands),
+            new InputGestureCollection());
+
         public static RoutedUICommand EditSkipData { get; } = new RoutedUICommand(
             "编辑跳过单字(_E)",
             "EditSkipData",
diff --git a/Views/LyricEditorViewCommandBinding.cs b/Views/LyricEditorViewCommandBinding.cs
index b855393..e934f50 100644
--- a/Views/LyricEditorViewCommandBinding.cs
+++ b/Views/LyricEditorViewCommandBinding.cs
@@ -22,6 +22,18 @@ public void AddCommandBindings()
                 UICommands.AddLyrics,
                 AddLyrics_Executed,
                 CanExecute));
+            Application.Current.MainWindow?.CommandBindings.Add(new CommandBinding(
+                UICommands.ClearLyrics,
+                ClearLyrics_Executed,
+                CanExecute));
+        }
+
+        public void ClearLyrics_Executed(object sender, ExecutedRoutedEventArgs e)
+        {
+            if(MessageBox.Show("确认清空所有歌词吗？", "确认", MessageBoxButton.OKCancel, MessageBoxImage.Question) == MessageBoxResult.OK)
+            {
+                LrcModel.Current.ClearAll();
+            }
         }
 
         public void AddLyrics_Executed(object sender, ExecutedRoutedEventArgs e)
diff --git a/Windows/MainWindow.xaml b/Windows/MainWindow.xaml
index 4e40c8d..9bb3a6d 100644
--- a/Windows/MainWindow.xaml
+++ b/Windows/MainWindow.xaml
@@ -72,6 +72,7 @@
                             </MenuItem>
                             <MenuItem Header="编辑(_E)">
                                 <MenuItem Command="{x:Static commands:UICommands.AddLyrics}" />
+                                <MenuItem Command="{x:Static commands:UICommands.ClearLyrics}" />
                                 <Separator/>
                                 <MenuItem Command="{x:Static commands:UICommands.EditSkipData}" />
                                 <MenuItem Command="{x:Static commands:UICommands.ReloadSkipData}" />