diff --git a/Application/FileConverter/ConversionJobs/VideoEncodingSpeed.cs b/Application/FileConverter/ConversionJobs/VideoEncodingSpeed.cs
new file mode 100644
index 0000000..c299927
--- /dev/null
+++ b/Application/FileConverter/ConversionJobs/VideoEncodingSpeed.cs
@@ -0,0 +1,17 @@
+// // License: http://www.gnu.org/licenses/gpl.html GPL version 3.
+
+namespace FileConverter.ConversionJobs
+{
+ public enum VideoEncodingSpeed
+ {
+ UltraFast,
+ SuperFast,
+ VeryFast,
+ Faster,
+ Fast,
+ Medium,
+ Slow,
+ Slower,
+ VerySlow,
+ }
+}
\ No newline at end of file
diff --git a/Application/FileConverter/FileConverter.csproj b/Application/FileConverter/FileConverter.csproj
index 0661cb5..52447d2 100644
--- a/Application/FileConverter/FileConverter.csproj
+++ b/Application/FileConverter/FileConverter.csproj
@@ -102,6 +102,7 @@
+
@@ -117,6 +118,7 @@
Resources.fr.resx
+
diff --git a/Application/FileConverter/Properties/Resources.Designer.cs b/Application/FileConverter/Properties/Resources.Designer.cs
index cfd74de..6cb89d3 100644
--- a/Application/FileConverter/Properties/Resources.Designer.cs
+++ b/Application/FileConverter/Properties/Resources.Designer.cs
@@ -676,6 +676,60 @@ namespace FileConverter.Properties {
}
}
+ ///
+ /// Looks up a localized string similar to Faster.
+ ///
+ public static string VideoEncodingSpeedFasterName {
+ get {
+ return ResourceManager.GetString("VideoEncodingSpeedFasterName", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Fast.
+ ///
+ public static string VideoEncodingSpeedFastName {
+ get {
+ return ResourceManager.GetString("VideoEncodingSpeedFastName", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Medium.
+ ///
+ public static string VideoEncodingSpeedMediumName {
+ get {
+ return ResourceManager.GetString("VideoEncodingSpeedMediumName", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Slower.
+ ///
+ public static string VideoEncodingSpeedSlowerName {
+ get {
+ return ResourceManager.GetString("VideoEncodingSpeedSlowerName", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Slow.
+ ///
+ public static string VideoEncodingSpeedSlowName {
+ get {
+ return ResourceManager.GetString("VideoEncodingSpeedSlowName", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Super Fast.
+ ///
+ public static string VideoEncodingSpeedSuperFastName {
+ get {
+ return ResourceManager.GetString("VideoEncodingSpeedSuperFastName", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Define the ratio 'file size' versus 'compression duration'. A slow compression will give you a smaller file (for the same video quality) than a faster compression..
///
@@ -685,6 +739,33 @@ namespace FileConverter.Properties {
}
}
+ ///
+ /// Looks up a localized string similar to Ultra Fast.
+ ///
+ public static string VideoEncodingSpeedUltraFastName {
+ get {
+ return ResourceManager.GetString("VideoEncodingSpeedUltraFastName", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Very Fast.
+ ///
+ public static string VideoEncodingSpeedVeryFastName {
+ get {
+ return ResourceManager.GetString("VideoEncodingSpeedVeryFastName", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Very Slow.
+ ///
+ public static string VideoEncodingSpeedVerySlowName {
+ get {
+ return ResourceManager.GetString("VideoEncodingSpeedVerySlowName", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Video.
///
diff --git a/Application/FileConverter/Properties/Resources.fr.resx b/Application/FileConverter/Properties/Resources.fr.resx
index 6c215b5..0686432 100644
--- a/Application/FileConverter/Properties/Resources.fr.resx
+++ b/Application/FileConverter/Properties/Resources.fr.resx
@@ -331,9 +331,36 @@ Special paths:
Define the ratio 'file size' versus 'video quality'. A lower value will give you a smaller file, a greater value give you a better video quality.
+
+ Faster
+
+
+ Fast
+
+
+ Medium
+
+
+ Slower
+
+
+ Slow
+
+
+ Super Fast
+
Define the ratio 'file size' versus 'compression duration'. A slow compression will give you a smaller file (for the same video quality) than a faster compression.
+
+ Ultra Fast
+
+
+ Very Fast
+
+
+ Very Slow
+
Video
diff --git a/Application/FileConverter/Properties/Resources.resx b/Application/FileConverter/Properties/Resources.resx
index 6893306..6a4d7b8 100644
--- a/Application/FileConverter/Properties/Resources.resx
+++ b/Application/FileConverter/Properties/Resources.resx
@@ -331,9 +331,36 @@ Special paths:
Define the ratio 'file size' versus 'video quality'. A lower value will give you a smaller file, a greater value give you a better video quality.
+
+ Faster
+
+
+ Fast
+
+
+ Medium
+
+
+ Slower
+
+
+ Slow
+
+
+ Super Fast
+
Define the ratio 'file size' versus 'compression duration'. A slow compression will give you a smaller file (for the same video quality) than a faster compression.
+
+ Ultra Fast
+
+
+ Very Fast
+
+
+ Very Slow
+
Video
diff --git a/Application/FileConverter/ValueConverters/Generic/StringToEnum.cs b/Application/FileConverter/ValueConverters/Generic/StringToEnum.cs
index 16d7441..d11984f 100644
--- a/Application/FileConverter/ValueConverters/Generic/StringToEnum.cs
+++ b/Application/FileConverter/ValueConverters/Generic/StringToEnum.cs
@@ -34,7 +34,7 @@ namespace FileConverter.ValueConverters.Generic
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
{
- throw new NotImplementedException();
+ return value?.ToString();
}
}
}
diff --git a/Application/FileConverter/Windows/SettingsWindow.xaml b/Application/FileConverter/Windows/SettingsWindow.xaml
index 9fcc62a..ed9b6fe 100644
--- a/Application/FileConverter/Windows/SettingsWindow.xaml
+++ b/Application/FileConverter/Windows/SettingsWindow.xaml
@@ -336,16 +336,14 @@
Margin="0,2,0,0" VerticalAlignment="Top" AutoToolTipPlacement="TopLeft" IsSnapToTickEnabled="True" IsSelectionRangeEnabled="True" SelectionStart="20" SelectionEnd="33" Minimum="0" Maximum="51" TickPlacement="BottomRight" SmallChange="1" LargeChange="6" TickFrequency="1" Foreground="#004B82" />
-
- Ultra Fast
- Super Fast
- Very Fast
- Faster
- Fast
- Medium
- Slow
- Slower
- Very Slow
+
+
+
+
+
+
@@ -471,7 +469,7 @@
+ Margin="0,5,0,0" VerticalAlignment="Top" AutoToolTipPlacement="TopLeft" IsSnapToTickEnabled="True" IsSelectionRangeEnabled="True" SelectionStart="30" SelectionEnd="100" Minimum="0" Maximum="100" TickPlacement="BottomRight" SmallChange="5" LargeChange="15" TickFrequency="5" Foreground="#004B82" />
diff --git a/Application/FileConverter/Windows/SettingsWindow.xaml.cs b/Application/FileConverter/Windows/SettingsWindow.xaml.cs
index 988d14f..a4feb87 100644
--- a/Application/FileConverter/Windows/SettingsWindow.xaml.cs
+++ b/Application/FileConverter/Windows/SettingsWindow.xaml.cs
@@ -1,6 +1,5 @@
// License: http://www.gnu.org/licenses/gpl.html GPL version 3.
-
namespace FileConverter
{
using System;
@@ -15,6 +14,7 @@ namespace FileConverter
using FileConverter.Annotations;
using FileConverter.Commands;
+ using FileConverter.ConversionJobs;
using Microsoft.Win32;
///
@@ -168,6 +168,19 @@ namespace FileConverter
InputPostConversionAction.Delete,
};
+ public VideoEncodingSpeed[] VideoEncodingSpeeds => new[]
+ {
+ VideoEncodingSpeed.UltraFast,
+ VideoEncodingSpeed.SuperFast,
+ VideoEncodingSpeed.VeryFast,
+ VideoEncodingSpeed.Faster,
+ VideoEncodingSpeed.Fast,
+ VideoEncodingSpeed.Medium,
+ VideoEncodingSpeed.Slow,
+ VideoEncodingSpeed.Slower,
+ VideoEncodingSpeed.VerySlow,
+ };
+
public string AboutSectionContent
{
get