v1.0.6.0-alpha

Added avi format Added mpeg4 codec Added space to File Renamer number count Improved Input/Output RestoreDirectory Fixed Batch inputDir on base drive C:\ Fixed Batch outputDir on base drive C:\ Fixed ScriptView window size on low resolution
MattMcManis · Apr 3, 2018 · adb042d · adb042d
1 parent 1392fa8
commit adb042d
Show file tree

Hide file tree

Showing 16 changed files with 437 additions and 93 deletions.
diff --git a/.version b/.version
@@ -1 +1 @@
-1.0.5.0-alpha
+1.0.6.0-alpha
diff --git a/source/Axiom/Axiom/App.config b/source/Axiom/Axiom/App.config
@@ -139,6 +139,12 @@
             <setting name="Left" serializeAs="String">
                 <value>0</value>
             </setting>
+            <setting name="inputDir" serializeAs="String">
+                <value />
+            </setting>
+            <setting name="outputDir" serializeAs="String">
+                <value />
+            </setting>
         </Axiom.Properties.Settings>
     </userSettings>
 </configuration>
diff --git a/source/Axiom/Axiom/AudioControls.cs b/source/Axiom/Axiom/AudioControls.cs
@@ -1347,6 +1347,10 @@ public static void AutoCopyAudioCodec(MainWindow mainwindow) // Method
                                     {
                                         mainwindow.cboAudioCodec.SelectedItem = "AC3";
                                     }
+                                    else if ((string)mainwindow.cboFormat.SelectedItem == "avi")
+                                    {
+                                        mainwindow.cboAudioCodec.SelectedItem = "LAME";
+                                    }
                                     else if ((string)mainwindow.cboFormat.SelectedItem == "ogv")
                                     {
                                         mainwindow.cboAudioCodec.SelectedItem = "Vorbis";

diff --git a/source/Axiom/Axiom/Format.cs b/source/Axiom/Axiom/Format.cs
@@ -191,6 +191,10 @@ public static String ForceFormat(MainWindow mainwindow)
             {
                 format = "-f matroska";
             }
+            else if ((string)mainwindow.cboFormat.SelectedItem == "avi")
+            {
+                format = "-f avi";
+            }
             else if ((string)mainwindow.cboFormat.SelectedItem == "ogv")
             {
                 format = "-f ogv";

diff --git a/source/Axiom/Axiom/FormatControls.cs b/source/Axiom/Axiom/FormatControls.cs
@@ -42,7 +42,7 @@ public partial class FormatControls
         public static List<string> MediaTypeItemSource = new List<string>() { "Video", "Audio", "Image", "Sequence" };
 
         // Format
-        public static List<string> FormatItemSource = new List<string>() { "webm", "mp4", "mkv", "ogv", "mp3", "m4a", "ogg", "flac", "wav", "jpg", "png" };
+        public static List<string> FormatItemSource = new List<string>() { "webm", "mp4", "mkv", "avi", "ogv", "mp3", "m4a", "ogg", "flac", "wav", "jpg", "png" };
 
         // --------------------------------------------------------------------------------------------------------
         // --------------------------------------------------------------------------------------------------------
@@ -105,6 +105,16 @@ public static void OuputFormatDefaults(MainWindow mainwindow)
                 mainwindow.cboFPS.IsEnabled = true;
                 mainwindow.cboOptimize.IsEnabled = true;
             }
+            else if ((string)mainwindow.cboFormat.SelectedItem == "avi")
+            {
+                mainwindow.cboMediaType.SelectedItem = "Video";
+                mainwindow.cboMediaType.IsEnabled = false;
+                mainwindow.cboSubtitle.SelectedItem = "all";
+                mainwindow.cboSubtitle.IsEnabled = true;
+                mainwindow.cboAudioStream.SelectedItem = "all";
+                mainwindow.cboFPS.IsEnabled = true;
+                mainwindow.cboOptimize.IsEnabled = false;
+            }
             else if ((string)mainwindow.cboFormat.SelectedItem == "ogv")
             {
                 mainwindow.cboMediaType.SelectedItem = "Video";
@@ -302,6 +312,29 @@ public static void OutputFormat(MainWindow mainwindow)
                 mainwindow.cboAudioCodec.SelectedItem = "AC3";
             }
 
+            // -------------------------
+            // AVI 
+            // -------------------------
+            else if ((string)mainwindow.cboFormat.SelectedItem == "avi")
+            {
+                // VIDEO ///////
+                VideoControls.VideoCodecItemSource = new List<string>() { "mpeg4" };
+
+                // Populate ComboBox from ItemSource
+                mainwindow.cboVideoCodec.ItemsSource = VideoControls.VideoCodecItemSource;
+
+
+                // AUDIO ///////    
+                AudioControls.AudioCodecItemSource = new List<string>() { "AAC", "AC3", "LAME", "PCM" };
+
+                // Populate ComboBox from ItemSource
+                mainwindow.cboAudioCodec.ItemsSource = AudioControls.AudioCodecItemSource;
+
+                // Set the List Defaults
+                mainwindow.cboVideoCodec.SelectedItem = "mpeg4";
+                mainwindow.cboAudioCodec.SelectedItem = "LAME";
+            }
+
             // -------------------------
             // OGV 
             // -------------------------
@@ -505,13 +538,15 @@ public static void OutputFormat(MainWindow mainwindow)
                 mainwindow.tglVBR.IsChecked = false;
             }
             // Check VBR for WebM (VBR-Only codec) (ALWAYS)
-            else if ((string)mainwindow.cboAudio.SelectedItem == "Auto" && (string)mainwindow.cboFormat.SelectedItem == "webm")
+            else if ((string)mainwindow.cboAudio.SelectedItem == "Auto" 
+                && (string)mainwindow.cboFormat.SelectedItem == "webm")
             {
                 mainwindow.tglVBR.IsEnabled = false;
                 mainwindow.tglVBR.IsChecked = true;
             }
             // Check VBR for OGV (VBR-Only codec) (ALWAYS)
-            else if ((string)mainwindow.cboAudio.SelectedItem == "Auto" && (string)mainwindow.cboFormat.SelectedItem == "ogv")
+            else if ((string)mainwindow.cboAudio.SelectedItem == "Auto" 
+                && (string)mainwindow.cboFormat.SelectedItem == "ogv")
             {
                 mainwindow.tglVBR.IsEnabled = false;
                 mainwindow.tglVBR.IsChecked = true; //doesnt work

diff --git a/source/Axiom/Axiom/MainWindow.xaml b/source/Axiom/Axiom/MainWindow.xaml
@@ -46,16 +46,15 @@
     <Grid>
 
         <!-- Browse Button -->
-        <Button x:Name="buttonBrowse" 
+        <Button x:Name="btnInput" 
                 Style="{DynamicResource ButtonCustom}"
                 HorizontalAlignment="Left" 
                 Margin="10,12,0,0" 
                 VerticalAlignment="Top" 
                 Width="75" Height="22" 
                 Cursor="Hand" 
-                Click="buttonBrowse_Click">
-            <TextBlock x:Name="buttonBrowseTextBlock" 
-                       Text="Input" 
+                Click="btnInput_Click">
+            <TextBlock Text="Input" 
                        Margin="0,-2,0,0"/>
         </Button>
 
@@ -73,16 +72,15 @@
                  TextChanged="tbxInput_TextChanged"/>
 
         <!-- Output Button -->
-        <Button x:Name="buttonOutput"
+        <Button x:Name="btnOutput"
                 Style="{DynamicResource ButtonCustom}" 
                 HorizontalAlignment="Left" 
                 Margin="10,43,0,0" VerticalAlignment="Top" 
                 Width="75"
                 Height="22"
                 Cursor="Hand" 
-                Click="buttonOutput_Click">
-            <TextBlock x:Name="buttonOutputTextBlock" 
-                       Text="Output"
+                Click="btnOutput_Click">
+            <TextBlock Text="Output"
                        Margin="0,-2,0,0"/>
         </Button>