avs相关功能调整

zyzsdy · Apr 11, 2018 · cd05626 · cd05626
1 parent e142984
commit cd05626
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 7 deletions.
diff --git a/NegativeEncoder/AvsBuilder.cs b/NegativeEncoder/AvsBuilder.cs
@@ -27,7 +27,14 @@ public static string BuildAvs(MainWindow mw)
             var vsfiltermodPath = System.IO.Path.Combine(mw.baseDir, "Lib\\avstools\\plugins\\VSFilterMod.dll");
             sb.AppendFormat("LoadPlugin(\"{0}\")\n", lsmashPath);
             sb.AppendFormat("LoadPlugin(\"{0}\")\n", vsfiltermodPath);
-            sb.AppendFormat("LWLibavVideoSource(\"{0}\")\n", mw.avsVideoInputTextBox.Text);
+            if(mw.avsRepeatCheckBox.IsChecked == true)
+            {
+                sb.AppendFormat("LWLibavVideoSource(\"{0}\", repeat=True)\n", mw.avsVideoInputTextBox.Text);
+            }
+            else
+            {
+                sb.AppendFormat("LWLibavVideoSource(\"{0}\")\n", mw.avsVideoInputTextBox.Text);
+            }
             sb.AppendFormat("ConvertToYV12()\n");
             if(mw.avsResizeCheckBox.IsChecked == true)
             {

diff --git a/NegativeEncoder/MainWindow.xaml b/NegativeEncoder/MainWindow.xaml
@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:NegativeEncoder"
         mc:Ignorable="d"
-        Title="消极压制" Height="600" Width="580" Loaded="Window_Loaded">
+        Title="消极压制" Height="372" Width="580" Loaded="Window_Loaded">
     <Grid>
         <TabControl>
             <TabItem Header="视频">
@@ -52,11 +52,12 @@
                     <TextBox x:Name="avsSubtitleTextBox" Height="22" Margin="49,70,89,0" VerticalAlignment="Top" PreviewDragOver="avsSubtitleTextBox_PreviewDragOver" PreviewDrop="avsSubtitleTextBox_PreviewDrop"/>
                     <Button x:Name="avsSubtitleBrowseButton" Content="浏览..." Margin="0,70,10,0" VerticalAlignment="Top" Height="22" HorizontalAlignment="Right" Width="74" Click="avsSubtitleBrowseButton_Click"/>
                     <CheckBox x:Name="avsResizeCheckBox" Content="调整大小" HorizontalAlignment="Right" Margin="0,108,245,0" VerticalAlignment="Top" Click="avsResizeCheckBox_Click"/>
-                    <TextBox x:Name="avsResizeX" HorizontalAlignment="Right" Height="22" Margin="0,106,180,0" TextWrapping="Wrap" Text="1280" VerticalAlignment="Top" Width="60"/>
-                    <TextBox x:Name="avsResizeY" HorizontalAlignment="Right" Height="22" Margin="0,106,104,0" TextWrapping="Wrap" Text="720" VerticalAlignment="Top" Width="60"/>
+                    <TextBox x:Name="avsResizeX" HorizontalAlignment="Right" Height="22" Margin="0,106,180,0" TextWrapping="Wrap" Text="1280" VerticalAlignment="Top" Width="60" TextChanged="avsResizeX_TextChanged"/>
+                    <TextBox x:Name="avsResizeY" HorizontalAlignment="Right" Height="22" Margin="0,106,104,0" TextWrapping="Wrap" Text="720" VerticalAlignment="Top" Width="60" TextChanged="avsResizeY_TextChanged"/>
                     <Label Content="x" Margin="0,102,164,0" VerticalAlignment="Top" HorizontalAlignment="Right" Width="16"/>
                     <Button x:Name="avsStartEncodingButton" Content="开始压制" Margin="0,106,10,0" VerticalAlignment="Top" Height="22" HorizontalAlignment="Right" Width="74" Click="avsStartEncodingButton_Click"/>
                     <TextBox x:Name="avsTextBox" Margin="10,143,10,9.5" TextWrapping="Wrap"/>
+                    <CheckBox x:Name="avsRepeatCheckBox" Content="Repeat" HorizontalAlignment="Left" Margin="10,108,0,0" VerticalAlignment="Top" Click="avsRepeatCheckBox_Click"/>
 
                 </Grid>
             </TabItem>

diff --git a/NegativeEncoder/MainWindow.xaml.cs b/NegativeEncoder/MainWindow.xaml.cs
@@ -674,5 +674,20 @@ private void boxStartButton_Click(object sender, RoutedEventArgs e)
                 });
             });
         }
+
+        private void avsRepeatCheckBox_Click(object sender, RoutedEventArgs e)
+        {
+            avsTextBox.Text = AvsBuilder.BuildAvs(this);
+        }
+
+        private void avsResizeX_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            if (windowIsLoaded) avsTextBox.Text = AvsBuilder.BuildAvs(this);
+        }
+
+        private void avsResizeY_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            if (windowIsLoaded) avsTextBox.Text = AvsBuilder.BuildAvs(this);
+        }
     }
 }
diff --git a/NegativeEncoder/Properties/AssemblyInfo.cs b/NegativeEncoder/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
 // 方法是按如下所示使用“*”: :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.1.0.0")]
-[assembly: AssemblyFileVersion("0.1.0.0")]
+[assembly: AssemblyVersion("0.1.1.0")]
+[assembly: AssemblyFileVersion("0.1.1.0")]
diff --git a/NegativeEncoder/Version.cs b/NegativeEncoder/Version.cs
@@ -8,7 +8,7 @@ namespace NegativeEncoder
 {
     class Version
     {
-        public const string VER = "0.1.0";
+        public const string VER = "0.1.1";
         public static string AboutText = "Negative Encoder (消极压制) v" + VER + @"
 By Zyzsdy
 
@@ -45,6 +45,11 @@ By Zyzsdy
 ---------------------------------------
 
 更新记录
+v0.1.1 (2018-4-11)
+* AvsBuilder增加repeat选项
+* 修改文本框内容时实时更新AVS
+* UI细节调整
+
 v0.1.0 (2018-4-10)
 * 修复bug
 * 更新依赖工具