v1.2.9.1-alpha

Removed -f m4a Fixed Batch extension
MattMcManis · Oct 23, 2018 · fdbfdf9 · fdbfdf9
1 parent da99556
commit fdbfdf9
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 20 deletions.
diff --git a/source/Axiom/Axiom/FFmpeg.cs b/source/Axiom/Axiom/FFmpeg.cs
@@ -156,8 +156,8 @@ public static String OnePassArgs(MainWindow mainwindow)
                     "\r\n\r\n" + 
                     MainWindow.ThreadDetect(mainwindow),
 
-                    "\r\n\r\n" + "\"" + 
-                    MainWindow.OutputPath(mainwindow) + "\""
+                    "\r\n\r\n" + 
+                    "\"" + MainWindow.OutputPath(mainwindow) + "\""
                 };
 
                 // Join List with Spaces

diff --git a/source/Axiom/Axiom/Format.cs b/source/Axiom/Axiom/Format.cs
@@ -229,7 +229,7 @@ public static String ForceFormat(MainWindow mainwindow)
             }
             else if ((string)mainwindow.cboFormat.SelectedItem == "m4a")
             {
-                format = "-f m4a";
+                format = string.Empty;
             }
             else if ((string)mainwindow.cboFormat.SelectedItem == "ogg")
             {

diff --git a/source/Axiom/Axiom/FormatControls.cs b/source/Axiom/Axiom/FormatControls.cs
@@ -1176,7 +1176,6 @@ public static void MediaType(MainWindow mainwindow)
                 mainwindow.volumeDownButton.IsEnabled = true;
 
                 // Limiter
-                //mainwindow.tglAudioLimiter.IsEnabled = true;
                 mainwindow.slAudioLimiter.IsEnabled = true;
 
                 // Audio Stream
@@ -1319,10 +1318,6 @@ public static void MediaType(MainWindow mainwindow)
                 // Limiter
                 mainwindow.slAudioLimiter.IsEnabled = false;
                 mainwindow.slAudioLimiter.Value = 1;
-                //mainwindow.tglAudioLimiter.IsChecked = false;
-                //mainwindow.tglAudioLimiter.IsEnabled = false;
-                //mainwindow.audioLimiter.Text = string.Empty;
-
             }
 
             // -------------------------
@@ -1386,15 +1381,12 @@ public static void MediaType(MainWindow mainwindow)
                 // Limiter
                 mainwindow.slAudioLimiter.IsEnabled = false;
                 mainwindow.slAudioLimiter.Value = 1;
-                //mainwindow.tglAudioLimiter.IsChecked = false;
-                //mainwindow.tglAudioLimiter.IsEnabled = false;
-                //mainwindow.audioLimiter.Text = string.Empty;
             }
         }
 
 
         /// <summary>
-        /// Cut Controls (Method)
+        ///     Cut Controls (Method)
         /// </summary>
         //On Selection Change
         public static void CutControls(MainWindow mainwindow)

diff --git a/source/Axiom/Axiom/MainWindow.xaml.cs b/source/Axiom/Axiom/MainWindow.xaml.cs
@@ -764,6 +764,7 @@ public static void ClearVariables(MainWindow mainwindow)
             Format.trim = string.Empty;
             Format.trimStart = string.Empty;
             Format.trimEnd = string.Empty;
+            //batchExt = string.Empty;
 
             VideoFilters.vFilter = string.Empty;
             VideoFilters.geq = string.Empty;
@@ -1638,7 +1639,7 @@ public static void BatchExtCheck(MainWindow mainwindow)
                 mainwindow.batchExtensionTextBox.Text != "extension" &&
                 mainwindow.batchExtensionTextBox.Text != ".")
             {
-                batchExt = "." + batchExt;
+                batchExt = "." + mainwindow.batchExtensionTextBox.Text;
             }
             else
             {

diff --git a/source/Axiom/Axiom/Properties/AssemblyInfo.cs b/source/Axiom/Axiom/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.9.0")]
-[assembly: AssemblyFileVersion("1.2.9.0")]
+[assembly: AssemblyVersion("1.2.9.1")]
+[assembly: AssemblyFileVersion("1.2.9.1")]
diff --git a/source/Axiom/Axiom/Video.cs b/source/Axiom/Axiom/Video.cs
@@ -175,7 +175,7 @@ public static String HWAcceleration(MainWindow mainwindow)
         }
 
         /// <summary>
-        /// Video Codecs (Method)
+        ///     Video Codecs (Method)
         /// <summary>
         public static String VideoCodec(MainWindow mainwindow)
         {
@@ -574,7 +574,15 @@ public static String VideoBitrateCalculator(MainWindow mainwindow, string vEntry
                 // -------------------------
                 // Round Bitrate, Remove Decimals
                 // -------------------------
-                inputVideoBitrate = Math.Round(double.Parse(inputVideoBitrate)).ToString();
+                try
+                {
+                    inputVideoBitrate = Math.Round(double.Parse(inputVideoBitrate)).ToString();
+                }
+                catch
+                {
+                    inputVideoBitrate = "2000";
+                }
+
 
                 // -------------------------
                 // Add K to end of Bitrate
@@ -3206,7 +3214,7 @@ public static String Speed(MainWindow mainwindow, string pass)
                     else if ((string)mainwindow.cboSpeed.SelectedItem == "Very Fast")
                     {
                         // CRF / 2-Pass Pass 1
-                        if (pass == "single" // CRF & 1-Pass
+                        if (pass == "pass single" // CRF & 1-Pass
                          || pass == "pass 1")
                         {
                             speed = "-quality good -cpu-used 3";
@@ -3220,7 +3228,7 @@ public static String Speed(MainWindow mainwindow, string pass)
                     else if ((string)mainwindow.cboSpeed.SelectedItem == "Super Fast")
                     {
                         // CRF / 2-Pass Pass 1
-                        if (pass == "single" // CRF & 1-Pass
+                        if (pass == "pass single" // CRF & 1-Pass
                          || pass == "pass 1")
                         {
                             speed = "-quality good -cpu-used 4";
@@ -3234,7 +3242,7 @@ public static String Speed(MainWindow mainwindow, string pass)
                     else if ((string)mainwindow.cboSpeed.SelectedItem == "Ultra Fast")
                     {
                         // CRF / 2-Pass Pass 1
-                        if (pass == "single" // CRF & 1-Pass
+                        if (pass == "pass single" // CRF & 1-Pass
                          || pass == "pass 1")
                         {
                             speed = "-quality good -cpu-used 5";