Compare commits

85 Commits
Author SHA1 Message Date
Tichau a6baaba462 Merge remote-tracking branch 'refs/remotes/origin/development' 2016-04-24 19:10:52 +02:00
Tichau 22655e58a5 Change version number to 0.7 2016-04-24 19:09:24 +02:00
Tichau d19a8f19d0 Fixed: Installer now wait the end of the post install init to validate the installation 2016-04-24 19:09:04 +02:00
Tichau 7c2e97d6c1 Move gif file 2016-04-24 18:25:57 +02:00
Adrien Allard 1b5484f5d7 Add gif that resume the functioning of FileConverter 2016-04-24 12:42:08 +02:00
Tichau 9467da8dd0 Fix spelling issue in changelog 2016-04-22 19:14:38 +02:00
Tichau 020ee655dd Update application screenshots 2016-04-22 18:58:39 +02:00
Tichau 279c075790 Change diagnostics folder name for something more readable 2016-04-22 08:43:07 +02:00
Tichau 1c91123ccb Integration of cancel/fail/success icons. 2016-04-22 08:28:26 +02:00
Tichau a38c1bb338 Add fail and success icon resources 2016-04-22 08:27:43 +02:00
Adrien Allard 647f04b1ee Export cancel icon 2016-04-21 13:44:40 +02:00
Tichau e9035fc43f Add cancel icon 2016-04-21 08:40:47 +02:00
Tichau 538eea34f3 Move To Gif preset just after video preset. 2016-04-21 08:26:03 +02:00
Tichau 17cc4c8dcf Reduce the maximum number of simultaneous conversions. 2016-04-21 08:18:56 +02:00
Tichau 357a3b6d6c Fixed: Fatal exception. 2016-04-21 08:18:07 +02:00
Tichau bbd893e46f Add log conversion exception. 2016-04-21 08:17:43 +02:00
Tichau 04b1bbdd06 Update version number to 0.7 2016-04-20 19:05:54 +02:00
Tichau ce1ad3181e Update change log 2016-04-20 19:05:35 +02:00
Tichau 15235a6382 Update default settings 2016-04-20 19:03:03 +02:00
Tichau b3e26812f3 Update changelog 2016-04-20 08:45:08 +02:00
Tichau 2bc4cbddaa Stylecop 2016-04-20 08:44:56 +02:00
Tichau e447410a1e Add cancel conversion button (for ffmpeg conversion only) 2016-04-20 08:37:38 +02:00
Tichau c0d7c404b2 Update resharper settings 2016-04-19 19:14:07 +02:00
Tichau 23dcc2067d Fixed: issue with the path generator
Fixed: Issue where the path generator was unable to create a valid path
if the input file was at the root of a drive.
2016-04-19 19:13:51 +02:00
Tichau 093c5a1c6d Add mpeg input format 2016-04-19 18:50:15 +02:00
Tichau acaba53b3f Update changelog 2016-04-19 08:45:26 +02:00
Tichau 946b6fc3f4 Fixed: Video Scaling doesn't work with specific video size.
Fixed: Issue where video can't be compressed using H.264 codec (mp4 or
mkv presets) when its size (width or height) is not divisible by 2
(append a lot when the user try to scale a video) (github issue #2).
2016-04-19 08:44:55 +02:00
Tichau e0beb08a09 New version of ffmpeg (3.0) 2016-04-16 17:47:17 +02:00
Tichau a8741693f5 Fixed: Avoid simultaneous read on cd drive 2016-04-14 19:19:48 +02:00
Tichau 03fa599a9b Fixed: false positive error tests with some vob files. 2016-04-14 19:18:41 +02:00
Tichau 4a87c62992 Fixed: false positive error tests with some vob files. 2016-04-14 18:57:06 +02:00
Tichau fe7c3d37a7 Add vob, oga and ogv input types. 2016-04-14 18:56:21 +02:00
Tichau 0ac9af89ec Fixed: Settings import problems when application upgrade. 2016-04-11 19:19:05 +02:00
Tichau a48917614e Update changelog 2016-04-11 08:36:19 +02:00
Tichau c5aa5efca4 Add feedback to indicate that the application will automatically terminate (github issue #1). 2016-04-11 08:36:08 +02:00
Tichau 49520eb2f6 Fix an issue where converting a video in ogg doesn't extract audio 2016-04-08 20:15:35 +02:00
Tichau 3ae020866d Add enable audio option for mkv, mp4 and webm formats. 2016-04-08 08:41:03 +02:00
Tichau df7834dec8 Update change log 2016-03-01 08:26:57 +01:00
Tichau 666af8a37b Refactor conversion preset settings definition to avoid duplicate. 2016-02-24 08:21:30 +01:00
Tichau 8e1f73f745 Update resharper settings 2016-02-24 08:09:25 +01:00
Tichau 569d4198ed Add enable audio option for avi output format 2016-02-24 08:09:11 +01:00
Tichau 73ae27644d Ignore ffmpeg progress parsing if no duration has been found. 2016-02-23 19:02:03 +01:00
Adrien Allard 780ca19ae3 Fixed: scale and rotate videos. 2016-02-23 11:41:13 +01:00
Tichau 35fa417695 Add gif input type 2016-02-23 10:44:57 +01:00
Tichau 6f06f2943b Add gif output type 2016-02-23 10:44:29 +01:00
Tichau 9d648d7975 Add Webm output format 2016-02-19 18:28:33 +01:00
Adrien Allard 95d141dd69 Add INSTALLLOCATION registry key (for windows certification purpose) 2016-02-19 15:31:56 +01:00
Adrien Allard bf724d0dd3 Stylecop 2016-02-19 14:09:21 +01:00
Tichau a51d07a893 Handle session terminating for windows certification purpose. 2016-02-18 19:19:00 +01:00
Tichau a583053379 Fixed: Clamp to power of 2 option now clamp to the nearest po2 size 2016-02-18 18:51:24 +01:00
Adrien Allard 37f976f65b Update version file (for auto upgrade system) to 0.6 2016-02-18 09:33:11 +01:00
Tichau ff20b26a03 Fix spell issues in change log. 2016-02-18 08:36:50 +01:00
Tichau af4c708652 Change application version to 0.6 2016-02-18 08:19:02 +01:00
Tichau 7539a7e448 New screenshot 2016-02-17 21:14:05 +01:00
Tichau beb64eb1de New screenshots 2016-02-17 21:13:18 +01:00
Tichau 585ea47702 Rename settings entry in context menu 2016-02-17 20:59:51 +01:00
Tichau 9dee8067a0 Update default settings. 2016-02-17 20:48:14 +01:00
Tichau 6728cdd509 Fixed: Magick dll packing in installer. 2016-02-17 20:30:07 +01:00
Tichau 2cf4c690be Update changelog 2016-02-17 19:15:30 +01:00
Tichau 560364d320 Remove pdf from input type list. 2016-02-17 19:12:52 +01:00
Tichau c59ff01a73 New default settings 2016-02-17 19:12:40 +01:00
Tichau 245411bd8b Stylecop 2016-02-17 18:52:16 +01:00
Tichau 73fface5cb Change the possible scale factors.
This encourage the user to use pixel perfect ratio.
2016-02-17 18:48:30 +01:00
Adrien Allard c53a886353 Update the readme file. 2016-02-17 12:36:36 +01:00
Adrien Allard 0abd3da8d6 Update changelog. 2016-02-17 12:28:09 +01:00
Tichau 04adacee45 Add image and video rotation. 2016-02-16 19:28:48 +01:00
Tichau f4f4a4c357 Rebind JPG quality slider. 2016-02-15 19:12:19 +01:00
Tichau 5c9a931558 Add exr input type 2016-02-15 18:41:00 +01:00
Tichau 2161f170fc Add new input type (m4v) 2016-02-15 08:45:54 +01:00
Tichau 7674071fce Stylecop 2016-02-15 08:42:20 +01:00
Tichau 6a1dc7a847 Add Mp4 output type. 2016-02-15 08:38:30 +01:00
Tichau 347d34ff28 Add clamp to power of 2 option (for jpg and png conversion) 2016-02-12 08:29:48 +01:00
Tichau ffc81bc378 Add progress update in ImageMagick conversions. 2016-02-11 18:52:32 +01:00
Tichau 0fd9e3d801 Fixed: Missing default values for png preset. 2016-02-02 18:39:15 +01:00
Tichau 7a4666aa15 Better error handling 2016-02-02 08:51:36 +01:00
Tichau 6594d95120 Add possibility to convert all images to ico (no restriction on size anymore) 2016-02-02 08:51:23 +01:00
Tichau ad051308e1 Add support for input types psd, tga and svg. 2016-02-02 08:50:27 +01:00
Tichau dda464c64e Fixed; Settings version number is now updated. 2016-01-25 08:26:25 +01:00
Tichau 7fc4646c19 Update version number to 0.5.1 2016-01-22 18:32:28 +01:00
Tichau 424abe9aa4 Fixed: issue with installer
Issue where the installer detect the utilisation of the extension dll in
explorer, ask to the user to restart it and fail to do it.
2016-01-22 08:33:24 +01:00
Tichau 21b6187812 Use NuGet pakages. 2016-01-22 08:16:32 +01:00
Tichau b2501a1a04 Fixed issue where aac bitrate was not saved. 2016-01-14 08:15:49 +01:00
Tichau e8a01c91f2 Post installation settings initialization
Fixed: Issue where it is impossible to delete a conversion preset define
in default settings.
Fixed: Issue where the windows context menu does not contains user
preset after an application upgrade.
2016-01-13 20:17:55 +01:00
Tichau efed37b4dc Rename default settings file. 2016-01-13 08:20:27 +01:00
Tichau 1289db0bfa Change version file for auto upgrade 2016-01-12 22:50:14 +01:00
66 changed files with 2354 additions and 10870 deletions

No files matched your search

+100 -55
View File
@@ -31,7 +31,7 @@ namespace FileConverter
private static readonly Version Version = new Version()
{
Major = 0,
Minor = 5,
Minor = 7,
Patch = 0,
};
@@ -41,6 +41,7 @@ namespace FileConverter
private bool needToRunConversionThread;
private bool cancelAutoExit;
private bool isSessionEnding;
private UpgradeVersionDescription upgradeVersionDescription = null;
public Application()
@@ -48,6 +49,8 @@ namespace FileConverter
this.ConvertionJobs = this.conversionJobs.AsReadOnly();
}
public event EventHandler<ApplicationTerminateArgs> OnApplicationTerminate;
public static Version ApplicationVersion
{
get
@@ -89,6 +92,11 @@ namespace FileConverter
public void CancelAutoExit()
{
this.cancelAutoExit = true;
if (this.OnApplicationTerminate != null)
{
this.OnApplicationTerminate.Invoke(this, new ApplicationTerminateArgs(float.NaN));
}
}
protected override void OnStartup(StartupEventArgs e)
@@ -109,8 +117,8 @@ namespace FileConverter
base.OnExit(e);
Debug.Log("Exit application.");
if (this.upgradeVersionDescription != null && this.upgradeVersionDescription.NeedToUpgrade)
if (!this.isSessionEnding && this.upgradeVersionDescription != null && this.upgradeVersionDescription.NeedToUpgrade)
{
Debug.Log("A new version of file converter has been found: {0}.", this.upgradeVersionDescription.LatestVersion);
@@ -136,8 +144,10 @@ namespace FileConverter
// Start process.
Debug.Log("Start file converter upgrade from version {0} to {1}.", ApplicationVersion, this.upgradeVersionDescription.LatestVersion);
System.Diagnostics.ProcessStartInfo startInfo = new System.Diagnostics.ProcessStartInfo(installerPath);
startInfo.UseShellExecute = true;
System.Diagnostics.ProcessStartInfo startInfo = new System.Diagnostics.ProcessStartInfo(installerPath)
{
UseShellExecute = true,
};
Debug.Log("Start upgrade process: {0}{1}.", System.IO.Path.GetFileName(startInfo.FileName), startInfo.Arguments);
System.Diagnostics.Process process = new System.Diagnostics.Process
@@ -152,52 +162,35 @@ namespace FileConverter
Debug.Release();
}
protected override void OnSessionEnding(SessionEndingCancelEventArgs e)
{
base.OnSessionEnding(e);
this.isSessionEnding = true;
this.Shutdown();
}
private void Initialize()
{
Diagnostics.Debug.Log("The number of processors on this computer is {0}. Set the default number of conversion threads to {0}", Environment.ProcessorCount);
this.numberOfConversionThread = Environment.ProcessorCount;
// Load settigns.
Debug.Log("Load settings...");
this.Settings = Settings.Load();
if (this.Settings == null)
{
Diagnostics.Debug.LogError("The application will now shutdown. If you want to fix the problem yourself please edit or delete the file: C:\\Users\\UserName\\AppData\\Local\\FileConverter\\Settings.user.xml.");
Dispatcher.BeginInvoke((Action)(() => Application.Current.Shutdown()));
return;
}
Diagnostics.Debug.Log("File Converter v" + ApplicationVersion.ToString());
this.numberOfConversionThread = System.Math.Max(1, Environment.ProcessorCount / 2);
Diagnostics.Debug.Log("The number of processors on this computer is {0}. Set the default number of conversion threads to {0}", this.numberOfConversionThread);
// Retrieve arguments.
Debug.Log("Retrieve arguments...");
string[] args = Environment.GetCommandLineArgs();
#if (DEBUG)
if (args.Length <= 1)
{
//System.Array.Resize(ref args, 8);
//args[1] = "--conversion-preset";
//args[2] = "To Ogg";
//args[3] = "--verbose";
//args[4] = @"D:\Test\TrailerV2 compressed.mkv";
//args[4] = @"D:\Test\image.png";
//args[4] = @"E:\Track01.cda";
//args[4] = @"D:\Test\Track01.mp3";
//args[5] = @"D:\Test\Track02.mp3";
//args[6] = @"D:\Test\Track03.mp3";
//args[7] = @"D:\Test\Track04.mp3";
System.Array.Resize(ref args, 2);
args[1] = "--settings";
//System.Array.Resize(ref args, 5);
//args[1] = "--conversion-preset";
//args[2] = "To Jpg";
//args[3] = "--verbose";
//args[4] = @"D:\Test\Test avec accents héhé\imagé.png";
////System.Array.Resize(ref args, 5);
////args[1] = "--conversion-preset";
////args[2] = "To Png";
////args[3] = "--verbose";
////args[4] = @"D:\Test\images\Mario Big.png";
}
#endif
// Log arguments.
for (int index = 0; index < args.Length; index++)
{
string argument = args[index];
@@ -215,13 +208,17 @@ namespace FileConverter
return;
}
ConversionPreset conversionPreset = null;
List<string> filePaths = new List<string>();
// Parse arguments.
List<string> filePaths = new List<string>();
string conversionPresetName = null;
for (int index = 1; index < args.Length; index++)
{
string argument = args[index];
if (string.IsNullOrEmpty(argument))
{
continue;
}
if (argument.StartsWith("--"))
{
// This is an optional parameter.
@@ -229,6 +226,11 @@ namespace FileConverter
switch (parameterTitle)
{
case "post-install-init":
Settings.PostInstallationInitialization();
Dispatcher.BeginInvoke((Action)(() => Application.Current.Shutdown()));
return;
case "version":
Console.Write(ApplicationVersion.ToString());
Dispatcher.BeginInvoke((Action)(() => Application.Current.Shutdown()));
@@ -252,14 +254,7 @@ namespace FileConverter
return;
}
conversionPreset = this.Settings.GetPresetFromName(args[index + 1]);
if (conversionPreset == null)
{
Debug.LogError("Invalid conversion preset '{0}'. (code 0x02)", args[index + 1]);
Dispatcher.BeginInvoke((Action)(() => Application.Current.Shutdown()));
return;
}
conversionPresetName = args[index + 1];
index++;
continue;
@@ -281,6 +276,17 @@ namespace FileConverter
}
}
// Load settigns.
Debug.Log("Load settings...");
this.Settings = Settings.Load();
if (this.Settings == null)
{
Diagnostics.Debug.LogError("The application will now shutdown. If you want to fix the problem yourself please edit or delete the file: C:\\Users\\UserName\\AppData\\Local\\FileConverter\\Settings.user.xml.");
Dispatcher.BeginInvoke((Action)(() => Application.Current.Shutdown()));
return;
}
// Check upgrade.
if (this.Settings.CheckUpgradeAtStartup)
{
long fileTime = Registry.GetValue<long>(Registry.Keys.LastUpdateCheckDate);
@@ -293,6 +299,18 @@ namespace FileConverter
}
}
ConversionPreset conversionPreset = null;
if (!string.IsNullOrEmpty(conversionPresetName))
{
conversionPreset = this.Settings.GetPresetFromName(conversionPresetName);
if (conversionPreset == null)
{
Debug.LogError("Invalid conversion preset '{0}'. (code 0x02)", conversionPresetName);
Dispatcher.BeginInvoke((Action)(() => Application.Current.Shutdown()));
return;
}
}
if (conversionPreset != null)
{
// Create convertion jobs.
@@ -384,13 +402,33 @@ namespace FileConverter
allConversionsSucceed &= this.conversionJobs[index].State == ConversionJob.ConversionState.Done;
}
if (this.cancelAutoExit)
{
return;
}
if (allConversionsSucceed)
{
System.Threading.Thread.Sleep((int)this.Settings.DurationBetweenEndOfConversionsAndApplicationExit * 1000);
if (this.cancelAutoExit)
float remainingTime = this.Settings.DurationBetweenEndOfConversionsAndApplicationExit;
while (remainingTime > 0f)
{
return;
if (this.OnApplicationTerminate != null)
{
this.OnApplicationTerminate.Invoke(this, new ApplicationTerminateArgs(remainingTime));
}
System.Threading.Thread.Sleep(1000);
remainingTime--;
if (this.cancelAutoExit)
{
return;
}
}
if (this.OnApplicationTerminate != null)
{
this.OnApplicationTerminate.Invoke(this, new ApplicationTerminateArgs(remainingTime));
}
Dispatcher.BeginInvoke((Action)(() => Application.Current.Shutdown()));
@@ -412,7 +450,14 @@ namespace FileConverter
return;
}
conversionJob.StartConvertion();
try
{
conversionJob.StartConvertion();
}
catch (Exception exception)
{
Debug.LogError("Failure during conversion: {0}", exception.ToString());
}
if (conversionJob.State == ConversionJob.ConversionState.Done && !System.IO.File.Exists(conversionJob.OutputFilePath))
{
@@ -0,0 +1,18 @@
// <copyright file="ApplicationTerminateArgs.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
namespace FileConverter
{
public class ApplicationTerminateArgs : System.EventArgs
{
public ApplicationTerminateArgs(float remainingTimeBeforeTermination)
{
this.RemainingTimeBeforeTermination = remainingTimeBeforeTermination;
}
public float RemainingTimeBeforeTermination
{
get;
private set;
}
}
}
@@ -0,0 +1,34 @@
// <copyright file="CancelConversionJobCommand.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
namespace FileConverter.ConversionJobs
{
using System;
using System.Windows.Input;
public class CancelConversionJobCommand : ICommand
{
private readonly ConversionJob conversionJob;
public CancelConversionJobCommand(ConversionJob conversionJob)
{
this.conversionJob = conversionJob;
}
public event EventHandler CanExecuteChanged;
public bool CanExecute(object parameter)
{
if (this.conversionJob == null)
{
return false;
}
return this.conversionJob.IsCancelable && this.conversionJob.State == ConversionJob.ConversionState.InProgress;
}
public void Execute(object parameter)
{
this.conversionJob?.Cancel();
}
}
}
@@ -9,6 +9,6 @@ namespace FileConverter.ConversionJobs
{
None = 0x00,
CdaExtraction = 0x01,
CdDriveExtraction = 0x01,
}
}
@@ -16,6 +16,7 @@ namespace FileConverter.ConversionJobs
private string errorMessage = string.Empty;
private string initialInputPath = string.Empty;
private string userState = string.Empty;
private CancelConversionJobCommand cancelCommand;
public ConversionJob()
{
@@ -126,6 +127,31 @@ namespace FileConverter.ConversionJobs
protected set;
}
public CancelConversionJobCommand CancelCommand
{
get
{
if (this.cancelCommand == null)
{
this.cancelCommand = new CancelConversionJobCommand(this);
}
return this.cancelCommand;
}
}
public bool IsCancelable
{
get;
protected set;
}
protected bool CancelIsRequested
{
get;
private set;
}
protected virtual InputPostConversionAction InputPostConversionAction
{
get
@@ -141,7 +167,7 @@ namespace FileConverter.ConversionJobs
public virtual bool CanStartConversion(ConversionFlags conversionFlags)
{
return true;
return (conversionFlags & ConversionFlags.CdDriveExtraction) == 0;
}
public void PrepareConversion(string inputFilePath, string outputFilePath = null)
@@ -225,6 +251,12 @@ namespace FileConverter.ConversionJobs
return;
}
// Check if the input file is located on a cd drive.
if (PathHelpers.IsOnCDDrive(this.InputFilePath))
{
this.StateFlags = ConversionFlags.CdDriveExtraction;
}
this.Initialize();
if (this.State == ConversionState.Unknown)
@@ -253,7 +285,16 @@ namespace FileConverter.ConversionJobs
this.State = ConversionState.InProgress;
this.Convert();
try
{
this.Convert();
}
catch (Exception exception)
{
this.ConversionFailed(exception.Message);
}
this.StateFlags = ConversionFlags.None;
if (this.State == ConversionState.Failed)
{
@@ -265,6 +306,17 @@ namespace FileConverter.ConversionJobs
}
}
public virtual void Cancel()
{
if (!this.IsCancelable || this.State != ConversionState.InProgress)
{
return;
}
this.CancelIsRequested = true;
this.ConversionFailed("Canceled.");
}
protected virtual void Convert()
{
}
@@ -277,9 +329,17 @@ namespace FileConverter.ConversionJobs
{
Debug.Log("Conversion Failed.");
if (System.IO.File.Exists(this.OutputFilePath))
try
{
System.IO.File.Delete(this.OutputFilePath);
if (System.IO.File.Exists(this.OutputFilePath))
{
System.IO.File.Delete(this.OutputFilePath);
}
}
catch (Exception exception)
{
Debug.Log("Can't delete file '{0}' after conversion job failure.", this.OutputFilePath);
Debug.Log("An exception as been thrown: {0}.", exception.ToString());
}
}
@@ -323,6 +383,8 @@ namespace FileConverter.ConversionJobs
protected void ConversionFailed(string exitingMessage)
{
Debug.Log("Fail: {0}", exitingMessage);
if (this.State == ConversionState.Failed)
{
// Already failed, don't override informations.
@@ -6,20 +6,29 @@ namespace FileConverter.ConversionJobs
{
public static ConversionJob Create(ConversionPreset conversionPreset, string inputFilePath)
{
ConversionJob conversionJob = null;
string extension = System.IO.Path.GetExtension(inputFilePath);
extension = extension.ToLowerInvariant().Substring(1, extension.Length - 1);
if (extension == "cda")
{
conversionJob = new ConversionJob_ExtractCDA(conversionPreset);
}
else
{
conversionJob = new ConversionJob_FFMPEG(conversionPreset);
return new ConversionJob_ExtractCDA(conversionPreset);
}
return conversionJob;
if (conversionPreset.OutputType == OutputType.Ico)
{
return new ConversionJob_Ico(conversionPreset);
}
if (conversionPreset.OutputType == OutputType.Gif)
{
return new ConversionJob_Gif(conversionPreset);
}
if (PathHelpers.GetExtensionCategory(extension) == PathHelpers.InputCategoryNames.Image)
{
return new ConversionJob_ImageMagick(conversionPreset);
}
return new ConversionJob_FFMPEG(conversionPreset);
}
}
}
@@ -35,12 +35,7 @@ namespace FileConverter.ConversionJobs
return InputPostConversionAction.None;
}
}
public override bool CanStartConversion(ConversionFlags conversionFlags)
{
return (conversionFlags & ConversionFlags.CdaExtraction) == 0;
}
protected override void Initialize()
{
base.Initialize();
@@ -108,8 +103,6 @@ namespace FileConverter.ConversionJobs
this.compressionConversionJob = ConversionJobFactory.Create(this.ConversionPreset, this.intermediateFilePath);
this.compressionConversionJob.PrepareConversion(this.intermediateFilePath, this.OutputFilePath);
this.compressionThread = new Thread(this.CompressAsync);
this.StateFlags = ConversionFlags.CdaExtraction;
}
protected override void Convert()
@@ -3,11 +3,84 @@
namespace FileConverter.ConversionJobs
{
using System;
using System.Globalization;
using FileConverter.Controls;
public partial class ConversionJob_FFMPEG
{
private static string Encapsulate(string optionName, string args)
{
if (string.IsNullOrEmpty(args))
{
return string.Empty;
}
return string.Format("{0} \"{1}\"", optionName, args);
}
private static string ComputeTransformArgs(ConversionPreset conversionPreset)
{
float scaleFactor = conversionPreset.GetSettingsValue<float>(ConversionPreset.ConversionSettingKeys.VideoScale);
string scaleArgs = string.Empty;
if (conversionPreset.OutputType == OutputType.Mkv || conversionPreset.OutputType == OutputType.Mp4)
{
// This presets use h264 codec, the size of the video need to be divisible by 2.
scaleArgs = string.Format("scale=trunc(iw*{0}/2)*2:trunc(ih*{0}/2)*2", scaleFactor.ToString("#.##", CultureInfo.InvariantCulture));
}
else if (Math.Abs(scaleFactor - 1f) >= 0.005f)
{
scaleArgs = string.Format("scale=iw*{0}:ih*{0}", scaleFactor.ToString("#.##", CultureInfo.InvariantCulture));
}
float rotationAngleInDegrees = conversionPreset.GetSettingsValue<float>(ConversionPreset.ConversionSettingKeys.VideoRotation);
string rotationArgs = string.Empty;
if (Math.Abs(rotationAngleInDegrees - 0f) >= 0.05f)
{
// Transpose:
// 0: 90 CounterClockwise and vertical flip
// 1: 90 Clockwise
// 2: 90 CounterClockwise
// 3: 90 Clockwise and vertical flip
if (Math.Abs(rotationAngleInDegrees - 90f) <= 0.05f)
{
rotationArgs = "transpose=2";
}
else if (Math.Abs(rotationAngleInDegrees - 180f) <= 0.05f)
{
rotationArgs = "vflip,hflip";
}
else if (Math.Abs(rotationAngleInDegrees - 270f) <= 0.05f)
{
rotationArgs = "transpose=1";
}
else
{
Diagnostics.Debug.LogError("Unsupported rotation: {0}°", rotationAngleInDegrees);
}
}
// Build vf args content (scale=..., transpose=...)
string transformArgs = string.Empty;
if (!string.IsNullOrEmpty(scaleArgs))
{
transformArgs += scaleArgs;
}
if (!string.IsNullOrEmpty(rotationArgs))
{
if (!string.IsNullOrEmpty(transformArgs))
{
transformArgs += ",";
}
transformArgs += rotationArgs;
}
return transformArgs;
}
/// <summary>
/// Convert bitrate in <c>mp3</c> encoder quality index.
/// </summary>
@@ -263,5 +336,17 @@ namespace FileConverter.ConversionJobs
throw new Exception("Unknown VBR bitrate.");
}
/// <summary>
/// Convert video quality index to H264 constant rate factor.
/// </summary>
/// <param name="quality">The quality index.</param>
/// <returns>Returns the H264 constant rate factor.</returns>
/// The range of the quantizer scale is 0-63: lower values mean better quality.
/// https://trac.ffmpeg.org/wiki/Encode/VP9
private int WebmQualityToCRF(int quality)
{
return 63 - quality;
}
}
}
@@ -3,6 +3,7 @@
namespace FileConverter.ConversionJobs
{
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Globalization;
using System.IO;
@@ -20,14 +21,18 @@ namespace FileConverter.ConversionJobs
private ProcessStartInfo ffmpegProcessStartInfo;
private List<FFMpegPass> ffmpegArgumentStringByPass = new List<FFMpegPass>();
public ConversionJob_FFMPEG() : base()
{
this.IsCancelable = true;
}
public ConversionJob_FFMPEG(ConversionPreset conversionPreset) : base(conversionPreset)
{
this.IsCancelable = true;
}
protected virtual string FfmpegPath
{
get
@@ -63,7 +68,11 @@ namespace FileConverter.ConversionJobs
this.ffmpegProcessStartInfo.RedirectStandardOutput = true;
this.ffmpegProcessStartInfo.RedirectStandardError = true;
string arguments = string.Empty;
this.FillFFMpegArgumentsList();
}
protected virtual void FillFFMpegArgumentsList()
{
switch (this.ConversionPreset.OutputType)
{
case OutputType.Aac:
@@ -71,7 +80,33 @@ namespace FileConverter.ConversionJobs
// https://trac.ffmpeg.org/wiki/Encode/AAC
int audioEncodingBitrate = this.ConversionPreset.GetSettingsValue<int>(ConversionPreset.ConversionSettingKeys.AudioBitrate);
string encoderArgs = string.Format("-c:a aac -q:a {0}", this.AACBitrateToQualityIndex(audioEncodingBitrate));
arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs);
string arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs);
this.ffmpegArgumentStringByPass.Add(new FFMpegPass(arguments));
}
break;
case OutputType.Avi:
{
// https://trac.ffmpeg.org/wiki/Encode/MPEG-4
int videoEncodingQuality = this.ConversionPreset.GetSettingsValue<int>(ConversionPreset.ConversionSettingKeys.VideoQuality);
int audioEncodingBitrate = this.ConversionPreset.GetSettingsValue<int>(ConversionPreset.ConversionSettingKeys.AudioBitrate);
string transformArgs = ConversionJob_FFMPEG.ComputeTransformArgs(this.ConversionPreset);
string audioArgs = "-an";
if (this.ConversionPreset.GetSettingsValue<bool>(ConversionPreset.ConversionSettingKeys.EnableAudio))
{
audioArgs = string.Format("-c:a libmp3lame -qscale:a {0}", this.MP3VBRBitrateToQualityIndex(audioEncodingBitrate));
}
// Compute final arguments.
string videoFilteringArgs = ConversionJob_FFMPEG.Encapsulate("-vf", transformArgs);
string encoderArgs = string.Format("-c:v mpeg4 -vtag xvid -qscale:v {0} {1} {2}", this.MPEG4QualityToQualityIndex(videoEncodingQuality), audioArgs, videoFilteringArgs);
string arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs);
this.ffmpegArgumentStringByPass.Add(new FFMpegPass(arguments));
}
break;
@@ -80,7 +115,40 @@ namespace FileConverter.ConversionJobs
{
// http://taer-naguur.blogspot.fr/2013/11/flac-audio-encoding-with-ffmpeg.html
string encoderArgs = string.Format("-compression_level 12");
string arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs);
this.ffmpegArgumentStringByPass.Add(new FFMpegPass(arguments));
}
break;
case OutputType.Gif:
{
// http://blog.pkh.me/p/21-high-quality-gif-with-ffmpeg.html
string fileName = Path.GetFileName(this.InputFilePath);
string tempPath = Path.GetTempPath();
string paletteFilePath = PathHelpers.GenerateUniquePath(tempPath + fileName + " - palette.png");
string transformArgs = ConversionJob_FFMPEG.ComputeTransformArgs(this.ConversionPreset);
// fps.
int framesPerSecond = this.ConversionPreset.GetSettingsValue<int>(ConversionPreset.ConversionSettingKeys.VideoFramesPerSecond);
if (!string.IsNullOrEmpty(transformArgs))
{
transformArgs += ",";
}
transformArgs += string.Format("fps={0}", framesPerSecond);
// Generate palette.
string encoderArgs = string.Format("-vf \"{0},palettegen\"", transformArgs);
string arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, paletteFilePath, encoderArgs);
this.ffmpegArgumentStringByPass.Add(new FFMpegPass("Indexing colors", arguments, paletteFilePath));
// Create gif.
encoderArgs = string.Format("-i \"{0}\" -lavfi \"{1},paletteuse\"", paletteFilePath, transformArgs);
arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs);
this.ffmpegArgumentStringByPass.Add(new FFMpegPass(arguments));
}
break;
@@ -88,7 +156,29 @@ namespace FileConverter.ConversionJobs
case OutputType.Ico:
{
string encoderArgs = string.Empty;
arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs);
string arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs);
this.ffmpegArgumentStringByPass.Add(new FFMpegPass(arguments));
}
break;
case OutputType.Jpg:
{
int encodingQuality = this.ConversionPreset.GetSettingsValue<int>(ConversionPreset.ConversionSettingKeys.ImageQuality);
float scaleFactor = this.ConversionPreset.GetSettingsValue<float>(ConversionPreset.ConversionSettingKeys.ImageScale);
string scaleArgs = string.Empty;
if (Math.Abs(scaleFactor - 1f) >= 0.005f)
{
scaleArgs = string.Format("-vf scale=iw*{0}:ih*{0}", scaleFactor.ToString("#.##", CultureInfo.InvariantCulture));
}
string encoderArgs = string.Format("-q:v {0} {1}", this.JPGQualityToQualityIndex(encodingQuality), scaleArgs);
string arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs);
this.ffmpegArgumentStringByPass.Add(new FFMpegPass(arguments));
}
break;
@@ -112,31 +202,15 @@ namespace FileConverter.ConversionJobs
break;
}
arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs);
}
string arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs);
break;
case OutputType.Avi:
{
// https://trac.ffmpeg.org/wiki/Encode/MPEG-4
int videoEncodingQuality = this.ConversionPreset.GetSettingsValue<int>(ConversionPreset.ConversionSettingKeys.VideoQuality);
int audioEncodingBitrate = this.ConversionPreset.GetSettingsValue<int>(ConversionPreset.ConversionSettingKeys.AudioBitrate);
float scaleFactor = this.ConversionPreset.GetSettingsValue<float>(ConversionPreset.ConversionSettingKeys.VideoScale);
string scaleArgs = string.Empty;
if (Math.Abs(scaleFactor - 1f) >= 0.005f)
{
scaleArgs = string.Format("-vf scale=iw*{0}:ih*{0}", scaleFactor.ToString("#.##", CultureInfo.InvariantCulture));
}
string encoderArgs = string.Format("-c:v mpeg4 -vtag xvid -qscale:v {0} -c:a libmp3lame -qscale:a {1} {2}", this.MPEG4QualityToQualityIndex(videoEncodingQuality), this.MP3VBRBitrateToQualityIndex(audioEncodingBitrate), scaleArgs);
arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs);
this.ffmpegArgumentStringByPass.Add(new FFMpegPass(arguments));
}
break;
case OutputType.Mkv:
case OutputType.Mp4:
{
// https://trac.ffmpeg.org/wiki/Encode/H.264
// https://trac.ffmpeg.org/wiki/Encode/AAC
@@ -144,15 +218,25 @@ namespace FileConverter.ConversionJobs
string videoEncodingSpeed = this.ConversionPreset.GetSettingsValue<string>(ConversionPreset.ConversionSettingKeys.VideoEncodingSpeed);
int audioEncodingBitrate = this.ConversionPreset.GetSettingsValue<int>(ConversionPreset.ConversionSettingKeys.AudioBitrate);
float scaleFactor = this.ConversionPreset.GetSettingsValue<float>(ConversionPreset.ConversionSettingKeys.VideoScale);
string scaleArgs = string.Empty;
if (Math.Abs(scaleFactor - 1f) >= 0.005f)
string transformArgs = ConversionJob_FFMPEG.ComputeTransformArgs(this.ConversionPreset);
string videoFilteringArgs = ConversionJob_FFMPEG.Encapsulate("-vf", transformArgs);
string audioArgs = "-an";
if (this.ConversionPreset.GetSettingsValue<bool>(ConversionPreset.ConversionSettingKeys.EnableAudio))
{
scaleArgs = string.Format("-vf scale=iw*{0}:ih*{0}", scaleFactor.ToString("#.##", CultureInfo.InvariantCulture));
audioArgs = string.Format("-c:a aac -qscale:a {0}", this.AACBitrateToQualityIndex(audioEncodingBitrate));
}
string encoderArgs = string.Format("-c:v libx264 -preset {0} -crf {1} -c:a aac -q:a {2} {3}", this.H264EncodingSpeedToPreset(videoEncodingSpeed), this.H264QualityToCRF(videoEncodingQuality), this.AACBitrateToQualityIndex(audioEncodingBitrate), scaleArgs);
arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs);
string encoderArgs = string.Format(
"-c:v libx264 -preset {0} -crf {1} {2} {3}",
this.H264EncodingSpeedToPreset(videoEncodingSpeed),
this.H264QualityToCRF(videoEncodingQuality),
audioArgs,
videoFilteringArgs);
string arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs);
this.ffmpegArgumentStringByPass.Add(new FFMpegPass(arguments));
}
break;
@@ -160,8 +244,10 @@ namespace FileConverter.ConversionJobs
case OutputType.Ogg:
{
int encodingQuality = this.ConversionPreset.GetSettingsValue<int>(ConversionPreset.ConversionSettingKeys.AudioBitrate);
string encoderArgs = string.Format("-codec:a libvorbis -qscale:a {0}", this.OGGVBRBitrateToQualityIndex(encodingQuality));
arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs);
string encoderArgs = string.Format("-vn -codec:a libvorbis -qscale:a {0}", this.OGGVBRBitrateToQualityIndex(encodingQuality));
string arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs);
this.ffmpegArgumentStringByPass.Add(new FFMpegPass(arguments));
}
break;
@@ -178,25 +264,9 @@ namespace FileConverter.ConversionJobs
// http://www.howtogeek.com/203979/is-the-png-format-lossless-since-it-has-a-compression-parameter/
string encoderArgs = string.Format("-compression_level 100 {0}", scaleArgs);
arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs);
}
string arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs);
break;
case OutputType.Jpg:
{
int encodingQuality = this.ConversionPreset.GetSettingsValue<int>(ConversionPreset.ConversionSettingKeys.ImageQuality);
float scaleFactor = this.ConversionPreset.GetSettingsValue<float>(ConversionPreset.ConversionSettingKeys.ImageScale);
string scaleArgs = string.Empty;
if (Math.Abs(scaleFactor - 1f) >= 0.005f)
{
scaleArgs = string.Format("-vf scale=iw*{0}:ih*{0}", scaleFactor.ToString("#.##", CultureInfo.InvariantCulture));
}
string encoderArgs = string.Format("-q:v {0} {1}", this.JPGQualityToQualityIndex(encodingQuality), scaleArgs);
arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs);
this.ffmpegArgumentStringByPass.Add(new FFMpegPass(arguments));
}
break;
@@ -205,21 +275,69 @@ namespace FileConverter.ConversionJobs
{
EncodingMode encodingMode = this.ConversionPreset.GetSettingsValue<EncodingMode>(ConversionPreset.ConversionSettingKeys.AudioEncodingMode);
string encoderArgs = string.Format("-acodec {0}", this.WAVEncodingToCodecArgument(encodingMode));
arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs);
string arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs);
this.ffmpegArgumentStringByPass.Add(new FFMpegPass(arguments));
}
break;
case OutputType.Webm:
{
// https://trac.ffmpeg.org/wiki/Encode/VP9
int videoEncodingQuality = this.ConversionPreset.GetSettingsValue<int>(ConversionPreset.ConversionSettingKeys.VideoQuality);
int audioEncodingQuality = this.ConversionPreset.GetSettingsValue<int>(ConversionPreset.ConversionSettingKeys.AudioBitrate);
string encodingArgs = string.Empty;
if (videoEncodingQuality == 63)
{
// Replace maximum quality settings by lossless compression.
encodingArgs = "-lossless 1";
}
else
{
encodingArgs = string.Format("-crf {0} -b:v 0", this.WebmQualityToCRF(videoEncodingQuality));
}
string transformArgs = ConversionJob_FFMPEG.ComputeTransformArgs(this.ConversionPreset);
string videoFilteringArgs = ConversionJob_FFMPEG.Encapsulate("-vf", transformArgs);
string audioArgs = "-an";
if (this.ConversionPreset.GetSettingsValue<bool>(ConversionPreset.ConversionSettingKeys.EnableAudio))
{
audioArgs = string.Format("-c:a libvorbis -qscale:a {0}", this.OGGVBRBitrateToQualityIndex(audioEncodingQuality));
}
string encoderArgs = string.Format(
"-c:v libvpx-vp9 {0} {1} {2}",
encodingArgs,
audioArgs,
videoFilteringArgs);
string arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs);
this.ffmpegArgumentStringByPass.Add(new FFMpegPass(arguments));
}
break;
default:
throw new NotImplementedException("Converter not implemented for output file type " + this.ConversionPreset.OutputType);
throw new NotImplementedException("Converter not implemented for output file type " +
this.ConversionPreset.OutputType);
}
if (string.IsNullOrEmpty(arguments))
if (this.ffmpegArgumentStringByPass.Count == 0)
{
throw new Exception("Invalid ffmpeg process arguments.");
throw new Exception("No ffmpeg arguments generated.");
}
this.ffmpegProcessStartInfo.Arguments = arguments;
for (int index = 0; index < this.ffmpegArgumentStringByPass.Count; index++)
{
if (string.IsNullOrEmpty(this.ffmpegArgumentStringByPass[index].Arguments))
{
throw new Exception("Invalid ffmpeg process arguments.");
}
}
}
protected override void Convert()
@@ -229,37 +347,63 @@ namespace FileConverter.ConversionJobs
throw new Exception("The conversion preset must be valid.");
}
this.UserState = "Conversion";
Diagnostics.Debug.Log("Execute command: {0} {1}.", this.ffmpegProcessStartInfo.FileName, this.ffmpegProcessStartInfo.Arguments);
Diagnostics.Debug.Log(string.Empty);
try
for (int index = 0; index < this.ffmpegArgumentStringByPass.Count; index++)
{
using (Process exeProcess = Process.Start(this.ffmpegProcessStartInfo))
FFMpegPass currentPass = this.ffmpegArgumentStringByPass[index];
this.UserState = currentPass.Name;
this.ffmpegProcessStartInfo.Arguments = currentPass.Arguments;
Diagnostics.Debug.Log("Execute command: {0} {1}.", this.ffmpegProcessStartInfo.FileName, this.ffmpegProcessStartInfo.Arguments);
Diagnostics.Debug.Log(string.Empty);
try
{
using (StreamReader reader = exeProcess.StandardError)
using (Process exeProcess = Process.Start(this.ffmpegProcessStartInfo))
{
while (!reader.EndOfStream)
using (StreamReader reader = exeProcess.StandardError)
{
string result = reader.ReadLine();
while (!reader.EndOfStream)
{
if (this.CancelIsRequested && !exeProcess.HasExited)
{
exeProcess.Kill();
}
this.ParseFFMPEGOutput(result);
string result = reader.ReadLine();
Diagnostics.Debug.Log("ffmpeg output: {0}", result);
this.ParseFFMPEGOutput(result);
Diagnostics.Debug.Log("ffmpeg output: {0}", result);
}
}
}
exeProcess.WaitForExit();
exeProcess.WaitForExit();
}
}
catch
{
this.ConversionFailed("Failed to launch FFMPEG process.");
throw;
}
}
catch
{
this.ConversionFailed("Failed to launch FFMPEG process.");
throw;
}
Diagnostics.Debug.Log(string.Empty);
// Clean intermediate files.
for (int index = 0; index < this.ffmpegArgumentStringByPass.Count; index++)
{
FFMpegPass currentPass = this.ffmpegArgumentStringByPass[index];
if (string.IsNullOrEmpty(currentPass.FileToDelete))
{
continue;
}
Diagnostics.Debug.Log("Delete intermediate file {0}.", currentPass.FileToDelete);
File.Delete(currentPass.FileToDelete);
}
}
private void ParseFFMPEGOutput(string input)
@@ -276,26 +420,58 @@ namespace FileConverter.ConversionJobs
return;
}
match = this.progressRegex.Match(input);
if (match.Success && match.Groups.Count >= 7)
if (this.fileDuration.Ticks > 0)
{
int size = int.Parse(match.Groups[1].Value);
int hours = int.Parse(match.Groups[2].Value);
int minutes = int.Parse(match.Groups[3].Value);
int seconds = int.Parse(match.Groups[4].Value);
int milliseconds = int.Parse(match.Groups[5].Value);
float bitrate = 0f;
float.TryParse(match.Groups[6].Value, out bitrate);
match = this.progressRegex.Match(input);
if (match.Success && match.Groups.Count >= 7)
{
int size = int.Parse(match.Groups[1].Value);
int hours = int.Parse(match.Groups[2].Value);
int minutes = int.Parse(match.Groups[3].Value);
int seconds = int.Parse(match.Groups[4].Value);
int milliseconds = int.Parse(match.Groups[5].Value) * 10;
float bitrate = 0f;
float.TryParse(match.Groups[6].Value, out bitrate);
this.actualConvertedDuration = new TimeSpan(0, hours, minutes, seconds, milliseconds);
this.actualConvertedDuration = new TimeSpan(0, hours, minutes, seconds, milliseconds);
this.Progress = this.actualConvertedDuration.Ticks / (float)this.fileDuration.Ticks;
return;
this.Progress = this.actualConvertedDuration.Ticks / (float)this.fileDuration.Ticks;
return;
}
}
if (input.Contains("Exiting.") || input.Contains("Error") || input.Contains("Unsupported dimensions") || input.Contains("No such file or directory"))
{
this.ConversionFailed(input);
if (input.StartsWith("Error while decoding stream") && input.EndsWith("Invalid data found when processing input"))
{
// It is normal for a transport stream to start with a broken frame.
// https://trac.ffmpeg.org/ticket/1622
}
else
{
this.ConversionFailed(input);
}
}
}
private struct FFMpegPass
{
public string Name;
public string Arguments;
public string FileToDelete;
public FFMpegPass(string name, string arguments, string fileToDelete)
{
this.Name = name;
this.Arguments = arguments;
this.FileToDelete = fileToDelete;
}
public FFMpegPass(string arguments)
{
this.Name = "Conversion";
this.Arguments = arguments;
this.FileToDelete = string.Empty;
}
}
}
@@ -0,0 +1,122 @@
// <copyright file="ConversionJob_Gif.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
namespace FileConverter.ConversionJobs
{
using System;
using System.IO;
using System.Threading.Tasks;
public class ConversionJob_Gif : ConversionJob
{
private string intermediateFilePath = string.Empty;
private ConversionJob pngConversionJob = null;
private ConversionJob gifConversionJob = null;
public ConversionJob_Gif(ConversionPreset conversionPreset) : base(conversionPreset)
{
}
protected override void Initialize()
{
base.Initialize();
if (this.ConversionPreset == null)
{
throw new Exception("The conversion preset must be valid.");
}
string extension = System.IO.Path.GetExtension(this.InputFilePath);
extension = extension.ToLowerInvariant().Substring(1, extension.Length - 1);
string inputFilePath = string.Empty;
// If the output is an image start to convert it into png before send it to ffmpeg.
if (PathHelpers.GetExtensionCategory(extension) == PathHelpers.InputCategoryNames.Image && extension != "png")
{
// Generate intermediate file path.
string fileName = Path.GetFileName(this.OutputFilePath);
string tempPath = Path.GetTempPath();
this.intermediateFilePath = PathHelpers.GenerateUniquePath(tempPath + fileName + ".png");
// Convert input in png file to send it to ffmpeg for the gif conversion.
ConversionPreset intermediatePreset = new ConversionPreset("To compatible image", OutputType.Png, this.ConversionPreset.InputTypes.ToArray());
this.pngConversionJob = ConversionJobFactory.Create(intermediatePreset, this.InputFilePath);
this.pngConversionJob.PrepareConversion(this.InputFilePath, this.intermediateFilePath);
inputFilePath = this.intermediateFilePath;
}
else
{
inputFilePath = this.InputFilePath;
}
// Convert png file into ico.
this.gifConversionJob = new ConversionJob_FFMPEG(this.ConversionPreset);
this.gifConversionJob.PrepareConversion(inputFilePath, this.OutputFilePath);
}
protected override void Convert()
{
if (this.ConversionPreset == null)
{
throw new Exception("The conversion preset must be valid.");
}
Task updateProgress = this.UpdateProgress();
if (this.pngConversionJob != null)
{
this.UserState = "Read input image";
Diagnostics.Debug.Log(string.Empty);
Diagnostics.Debug.Log("Convert image to PNG (intermediate format).");
this.pngConversionJob.StartConvertion();
if (this.pngConversionJob.State != ConversionState.Done)
{
this.ConversionFailed(this.pngConversionJob.ErrorMessage);
return;
}
}
Diagnostics.Debug.Log(string.Empty);
Diagnostics.Debug.Log("Convert png intermediate image to gif.");
this.gifConversionJob.StartConvertion();
if (this.gifConversionJob.State != ConversionState.Done)
{
this.ConversionFailed(this.gifConversionJob.ErrorMessage);
return;
}
if (!string.IsNullOrEmpty(this.intermediateFilePath))
{
Diagnostics.Debug.Log("Delete intermediate file {0}.", this.intermediateFilePath);
File.Delete(this.intermediateFilePath);
}
updateProgress.Wait();
}
private async Task UpdateProgress()
{
while (this.gifConversionJob.State != ConversionState.Done &&
this.gifConversionJob.State != ConversionState.Failed)
{
if (this.pngConversionJob != null && this.pngConversionJob.State == ConversionState.InProgress)
{
this.Progress = this.pngConversionJob.Progress;
}
if (this.gifConversionJob != null && this.gifConversionJob.State == ConversionState.InProgress)
{
this.Progress = this.gifConversionJob.Progress;
this.UserState = this.gifConversionJob.UserState;
}
await Task.Delay(40);
}
}
}
}
@@ -0,0 +1,76 @@
// <copyright file="ConversionJob_Ico.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
namespace FileConverter.ConversionJobs
{
using System;
using System.IO;
public class ConversionJob_Ico : ConversionJob
{
private string intermediateFilePath;
private ConversionJob pngConversionJob;
private ConversionJob icoConversionJob;
public ConversionJob_Ico(ConversionPreset conversionPreset) : base(conversionPreset)
{
}
protected override void Initialize()
{
base.Initialize();
if (this.ConversionPreset == null)
{
throw new Exception("The conversion preset must be valid.");
}
// Generate intermediate file path.
string fileName = Path.GetFileName(this.OutputFilePath);
string tempPath = Path.GetTempPath();
this.intermediateFilePath = PathHelpers.GenerateUniquePath(tempPath + fileName + ".png");
// Convert input in png file to send it to ffmpeg for the ico conversion.
ConversionPreset intermediatePreset = new ConversionPreset("To compatible image", OutputType.Png, this.ConversionPreset.InputTypes.ToArray());
intermediatePreset.SetSettingsValue(ConversionPreset.ConversionSettingKeys.ImageClampSizePowerOf2, "True");
intermediatePreset.SetSettingsValue(ConversionPreset.ConversionSettingKeys.ImageMaximumSize, "256");
this.pngConversionJob = ConversionJobFactory.Create(intermediatePreset, this.InputFilePath);
this.pngConversionJob.PrepareConversion(this.InputFilePath, this.intermediateFilePath);
// Convert png file into ico.
this.icoConversionJob = new ConversionJob_FFMPEG(this.ConversionPreset);
this.icoConversionJob.PrepareConversion(this.intermediateFilePath, this.OutputFilePath);
}
protected override void Convert()
{
if (this.ConversionPreset == null)
{
throw new Exception("The conversion preset must be valid.");
}
Diagnostics.Debug.Log(string.Empty);
Diagnostics.Debug.Log("Convert image to PNG (intermediate format).");
this.pngConversionJob.StartConvertion();
if (this.pngConversionJob.State != ConversionState.Done)
{
this.ConversionFailed(this.pngConversionJob.ErrorMessage);
return;
}
Diagnostics.Debug.Log(string.Empty);
Diagnostics.Debug.Log("Convert png intermediate image to ICO.");
this.icoConversionJob.StartConvertion();
if (this.icoConversionJob.State != ConversionState.Done)
{
this.ConversionFailed(this.icoConversionJob.ErrorMessage);
return;
}
Diagnostics.Debug.Log("Delete intermediate file {0}.", this.intermediateFilePath);
File.Delete(this.intermediateFilePath);
}
}
}
@@ -0,0 +1,111 @@
// <copyright file="ConversionJob_ImageMagick.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
namespace FileConverter.ConversionJobs
{
using System;
using FileConverter.Diagnostics;
using ImageMagick;
public class ConversionJob_ImageMagick : ConversionJob
{
public ConversionJob_ImageMagick() : base()
{
}
public ConversionJob_ImageMagick(ConversionPreset conversionPreset) : base(conversionPreset)
{
}
protected override void Initialize()
{
base.Initialize();
if (this.ConversionPreset == null)
{
throw new Exception("The conversion preset must be valid.");
}
}
protected override void Convert()
{
if (this.ConversionPreset == null)
{
throw new Exception("The conversion preset must be valid.");
}
using (MagickImage image = new MagickImage(this.InputFilePath))
{
image.Progress += this.Image_Progress;
Debug.Log("Load image {0} succeed.", this.InputFilePath);
float scaleFactor = this.ConversionPreset.GetSettingsValue<float>(ConversionPreset.ConversionSettingKeys.ImageScale);
if (Math.Abs(scaleFactor - 1f) >= 0.005f)
{
Debug.Log("Apply scale factor: {0}%.", scaleFactor * 100);
image.Scale(new Percentage(scaleFactor * 100f));
}
float rotateAngleInDegrees = this.ConversionPreset.GetSettingsValue<float>(ConversionPreset.ConversionSettingKeys.ImageRotation);
if (Math.Abs(rotateAngleInDegrees - 0f) >= 0.05f)
{
Debug.Log("Apply rotation: {0}°.", rotateAngleInDegrees);
image.Rotate(rotateAngleInDegrees);
}
bool clampSizeToPowerOf2 = this.ConversionPreset.GetSettingsValue<bool>(ConversionPreset.ConversionSettingKeys.ImageClampSizePowerOf2);
if (clampSizeToPowerOf2)
{
int referenceSize = System.Math.Min(image.Width, image.Height);
int size = 2;
while (size * 2 <= referenceSize)
{
size *= 2;
}
Debug.Log("Clamp size to the nearest power of 2 size (from {0}x{1} to {2}x{2}).", image.Width, image.Height, size);
image.Scale(size, size);
}
int maximumSize = this.ConversionPreset.GetSettingsValue<int>(ConversionPreset.ConversionSettingKeys.ImageMaximumSize);
if (maximumSize > 0)
{
int width = System.Math.Min(image.Width, maximumSize);
int height = System.Math.Min(image.Height, maximumSize);
Debug.Log("Clamp size to maximum size of {2}x{2} (from {0}x{1} to {2}x{3}).", image.Width, image.Height, width, height);
image.Scale(width, height);
}
Debug.Log("Convert image (output: {0}).", this.OutputFilePath);
switch (this.ConversionPreset.OutputType)
{
case OutputType.Png:
image.Quality = 100;
break;
case OutputType.Jpg:
image.Quality = this.ConversionPreset.GetSettingsValue<int>(ConversionPreset.ConversionSettingKeys.ImageQuality);
break;
default:
this.ConversionFailed(string.Format("Unsupported output format {0}.", this.ConversionPreset.OutputType));
image.Progress -= this.Image_Progress;
return;
}
image.Write(this.OutputFilePath);
image.Progress -= this.Image_Progress;
}
}
private void Image_Progress(object sender, ProgressEventArgs eventArgs)
{
this.Progress = (float)eventArgs.Progress.ToDouble() / 100f;
}
}
}
@@ -11,6 +11,7 @@ namespace FileConverter
using FileConverter.Annotations;
using FileConverter.Controls;
using FileConverter.Diagnostics;
using FileConverter.ValueConverters;
[XmlRoot]
@@ -95,6 +96,13 @@ namespace FileConverter
}
}
[XmlAttribute]
public bool IsDefaultSettings
{
get;
set;
} = false;
[XmlElement]
public List<string> InputTypes
{
@@ -355,6 +363,11 @@ namespace FileConverter
{
string settingsValue = this.GetSettingsValue(settingsKey);
if (settingsValue == null)
{
return default(T);
}
Type type = typeof(T);
if (type.IsEnum)
{
@@ -391,84 +404,13 @@ namespace FileConverter
private bool IsRelevantSetting(string settingsKey)
{
switch (this.OutputType)
{
case OutputType.Wav:
switch (settingsKey)
{
case ConversionPreset.ConversionSettingKeys.AudioEncodingMode:
return true;
}
break;
case OutputType.Mp3:
switch (settingsKey)
{
case ConversionPreset.ConversionSettingKeys.AudioEncodingMode:
case ConversionPreset.ConversionSettingKeys.AudioBitrate:
return true;
}
break;
case OutputType.Ogg:
switch (settingsKey)
{
case ConversionPreset.ConversionSettingKeys.AudioBitrate:
return true;
}
break;
case OutputType.Avi:
switch (settingsKey)
{
case ConversionPreset.ConversionSettingKeys.AudioBitrate:
case ConversionPreset.ConversionSettingKeys.VideoQuality:
case ConversionPreset.ConversionSettingKeys.VideoScale:
return true;
}
break;
case OutputType.Mkv:
switch (settingsKey)
{
case ConversionPreset.ConversionSettingKeys.AudioBitrate:
case ConversionPreset.ConversionSettingKeys.VideoQuality:
case ConversionPreset.ConversionSettingKeys.VideoScale:
case ConversionPreset.ConversionSettingKeys.VideoEncodingSpeed:
return true;
}
break;
case OutputType.Jpg:
switch (settingsKey)
{
case ConversionPreset.ConversionSettingKeys.ImageQuality:
case ConversionPreset.ConversionSettingKeys.ImageScale:
return true;
}
break;
case OutputType.Png:
switch (settingsKey)
{
case ConversionPreset.ConversionSettingKeys.ImageScale:
return true;
}
break;
}
return false;
return this.Settings.ContainsKey(settingsKey);
}
private void InitializeDefaultSettings(OutputType outputType)
{
this.settings.Clear();
switch (outputType)
{
case OutputType.Aac:
@@ -479,25 +421,41 @@ namespace FileConverter
case OutputType.Flac:
break;
case OutputType.Gif:
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoScale, "1");
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoRotation, "0");
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoFramesPerSecond, "15");
break;
case OutputType.Png:
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageScale, "1");
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageRotation, "0");
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageClampSizePowerOf2, "False");
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageMaximumSize, "0");
break;
case OutputType.Jpg:
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageQuality, "25");
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageQuality, "90");
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageScale, "1");
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageRotation, "0");
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageClampSizePowerOf2, "False");
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageMaximumSize, "0");
break;
case OutputType.Avi:
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.EnableAudio, "True");
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoQuality, "20");
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoScale, "1");
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoRotation, "0");
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioBitrate, "190");
break;
case OutputType.Mkv:
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.EnableAudio, "True");
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoQuality, "28");
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoEncodingSpeed, "Medium");
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoScale, "1");
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoRotation, "0");
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioBitrate, "128");
break;
@@ -506,6 +464,15 @@ namespace FileConverter
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioBitrate, "190");
break;
case OutputType.Mp4:
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.EnableAudio, "True");
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoQuality, "28");
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoEncodingSpeed, "Medium");
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoScale, "1");
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoRotation, "0");
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioBitrate, "128");
break;
case OutputType.Ogg:
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioBitrate, "160");
break;
@@ -514,6 +481,14 @@ namespace FileConverter
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioEncodingMode, EncodingMode.Wav16.ToString(), true);
break;
case OutputType.Webm:
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.EnableAudio, "True");
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioBitrate, "160");
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoQuality, "40");
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoScale, "1");
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoRotation, "0");
break;
default:
throw new System.Exception("Missing default settings for type " + outputType);
}
@@ -668,9 +643,17 @@ namespace FileConverter
public const string AudioBitrate = "AudioBitrate";
public const string ImageQuality = "ImageQuality";
public const string ImageScale = "ImageScale";
public const string ImageRotation = "ImageRotation";
public const string ImageClampSizePowerOf2 = "ImageClampSizePowerOf2";
public const string ImageMaximumSize = "ImageMaximumSize";
public const string VideoQuality = "VideoQuality";
public const string VideoEncodingSpeed = "VideoEncodingSpeed";
public const string VideoScale = "VideoScale";
public const string VideoRotation = "VideoRotation";
public const string VideoFramesPerSecond = "VideoFramesPerSecond";
public const string EnableAudio = "EnableAudio";
public const string EnableVideo = "EnableVideo";
}
}
}
@@ -1,6 +1,5 @@
// <copyright file="Debug.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
namespace FileConverter.Diagnostics
{
using System;
@@ -23,7 +22,7 @@ namespace FileConverter.Diagnostics
// Delete old diagnostics folder (1 day).
DateTime expirationDate = DateTime.Now.Subtract(new TimeSpan(1, 0, 0, 0));
string[] diagnosticsDirectories = Directory.GetDirectories(path, "Diagnostics.*");
string[] diagnosticsDirectories = Directory.GetDirectories(path, "Diagnostics-*");
for (int index = 0; index < diagnosticsDirectories.Length; index++)
{
string directory = diagnosticsDirectories[index];
@@ -34,7 +33,9 @@ namespace FileConverter.Diagnostics
}
}
Debug.diagnosticsFolderPath = Path.Combine(path, "Diagnostics." + Process.GetCurrentProcess().Id);
string diagnosticsFolderName = $"Diagnostics-{DateTime.Now.Hour}h{DateTime.Now.Minute}m{DateTime.Now.Second}s";
Debug.diagnosticsFolderPath = Path.Combine(path, diagnosticsFolderName);
Debug.diagnosticsFolderPath = PathHelpers.GenerateUniquePath(Debug.diagnosticsFolderPath);
Directory.CreateDirectory(Debug.diagnosticsFolderPath);
}
+22 -1
View File
@@ -46,6 +46,10 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Accessibility" />
<Reference Include="Magick.NET-Q16-AnyCPU, Version=7.0.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=MSIL">
<HintPath>..\..\packages\Magick.NET-Q16-AnyCPU.7.0.0.0101\lib\net40-client\Magick.NET-Q16-AnyCPU.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Markdown.Xaml">
<HintPath>..\..\Middleware\Markdown.Xaml.dll</HintPath>
</Reference>
@@ -83,14 +87,19 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</ApplicationDefinition>
<Compile Include="ApplicationTerminateArgs.cs" />
<Compile Include="Controls\EncodingQualitySliderControl.xaml.cs">
<DependentUpon>EncodingQualitySliderControl.xaml</DependentUpon>
</Compile>
<Compile Include="ConversionJobs\CancelConversionJobCommand.cs" />
<Compile Include="ConversionJobs\ConversionFlags.cs" />
<Compile Include="ConversionJobs\ConversionJob_ExtractCDA.cs" />
<Compile Include="ConversionJobs\ConversionJobFactory.cs" />
<Compile Include="ConversionJobs\ConversionJob_FFMPEG.Converters.cs" />
<Compile Include="ConversionJobs\ConversionJob_FFMPEG.cs" />
<Compile Include="ConversionJobs\ConversionJob_Gif.cs" />
<Compile Include="ConversionJobs\ConversionJob_Ico.cs" />
<Compile Include="ConversionJobs\ConversionJob_ImageMagick.cs" />
<Compile Include="ConversionPreset\ConversionSettingsOverride.cs" />
<Compile Include="ConversionPreset\ConversionSettings.cs" />
<Compile Include="Diagnostics\DiagnosticsData.cs" />
@@ -103,6 +112,7 @@
<DependentUpon>Resources.en.resx</DependentUpon>
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<ExcludeFromStyleCop>True</ExcludeFromStyleCop>
</Compile>
<Compile Include="Registry.cs" />
<Compile Include="Settings.Settings.cs" />
@@ -119,6 +129,7 @@
<Compile Include="ValueConverters\Generic\EqualsConverter.cs" />
<Compile Include="ValueConverters\Generic\CollectionContainsElementToBool.cs" />
<Compile Include="ValueConverters\Generic\FormatStringConverter.cs" />
<Compile Include="ValueConverters\Generic\ValueToString.cs" />
<Compile Include="ValueConverters\Generic\StringToValueType.cs" />
<Compile Include="ValueConverters\InputTypesToBool.cs" />
<Compile Include="Settings.cs" />
@@ -205,6 +216,7 @@
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -226,10 +238,19 @@
<ItemGroup>
<Resource Include="Resources\ContextMenuScreenshot.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\CancelIcon.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\SuccessIcon.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\FailIcon.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>copy /Y "$(SolutionDir)Middleware\ffmpeg.exe" "$(TargetDir)ffmpeg.exe"
copy /Y "$(ProjectDir)Settings.xml" "$(TargetDir)Settings.xml"</PostBuildEvent>
copy /Y "$(ProjectDir)Settings.default.xml" "$(TargetDir)Settings.default.xml"</PostBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
+3
View File
@@ -9,12 +9,15 @@ namespace FileConverter
Aac,
Avi,
Flac,
Gif,
Ico,
Jpg,
Mkv,
Mp3,
Mp4,
Ogg,
Png,
Wav,
Webm,
}
}
+46 -4
View File
@@ -23,6 +23,28 @@ namespace FileConverter
return PathHelpers.driveLetterRegex.Match(path).Groups[0].Value;
}
public static bool IsOnCDDrive(string path)
{
string pathDriveLetter = GetPathDriveLetter(path);
if (string.IsNullOrEmpty(pathDriveLetter))
{
return false;
}
char driveLetter = pathDriveLetter[0];
char[] driveLetters = Ripper.CDDrive.GetCDDriveLetters();
for (int index = 0; index < driveLetters.Length; index++)
{
if (driveLetters[index] == driveLetter)
{
return true;
}
}
return false;
}
public static int GetCDATrackNumber(string path)
{
Match match = PathHelpers.cdaTrackNumberRegex.Match(path);
@@ -83,29 +105,42 @@ namespace FileConverter
case "flac":
case "mp3":
case "m4a":
case "oga":
case "ogg":
case "wav":
case "wma":
return InputCategoryNames.Audio;
case "3gp":
case "avi":
case "bik":
case "3gp":
case "flv":
case "m4v":
case "mp4":
case "mpeg":
case "mov":
case "mkv":
case "ogv":
case "vob":
case "webm":
case "wmv":
return InputCategoryNames.Video;
case "bmp":
case "exr":
case "ico":
case "jpg":
case "jpeg":
case "png":
case "psd":
case "tga":
case "tiff":
case "svg":
case "xcf":
return InputCategoryNames.Image;
case "gif":
return InputCategoryNames.AnimatedImage;
}
return InputCategoryNames.Misc;
@@ -130,13 +165,18 @@ namespace FileConverter
case OutputType.Avi:
case OutputType.Mkv:
return category == InputCategoryNames.Video;
case OutputType.Mp4:
case OutputType.Webm:
return category == InputCategoryNames.Video || category == InputCategoryNames.AnimatedImage;
case OutputType.Ico:
case OutputType.Png:
case OutputType.Jpg:
case OutputType.Png:
return category == InputCategoryNames.Image;
case OutputType.Gif:
return category == InputCategoryNames.Image || category == InputCategoryNames.Video || category == InputCategoryNames.AnimatedImage;
default:
return false;
}
@@ -160,6 +200,8 @@ namespace FileConverter
public const string Audio = "Audio";
public const string Video = "Video";
public const string Image = "Image";
public const string AnimatedImage = "Animated Image";
public const string Misc = "Misc";
}
}
@@ -60,6 +60,24 @@ namespace FileConverter.Properties {
}
}
/// <summary>
/// Looks up a localized string similar to 90° counter clockwise rotation.
/// </summary>
public static string NinetyDegreesRotationTooltip {
get {
return ResourceManager.GetString("NinetyDegreesRotationTooltip", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to 180° rotation.
/// </summary>
public static string OneEightyDegreesRotationTooltip {
get {
return ResourceManager.GetString("OneEightyDegreesRotationTooltip", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to C:\Music\Artist\Album\Song.wav.
/// </summary>
@@ -91,6 +109,15 @@ namespace FileConverter.Properties {
}
}
/// <summary>
/// Looks up a localized string similar to 90° clockwise rotation.
/// </summary>
public static string TwoSeventyDegreesRotationTooltip {
get {
return ResourceManager.GetString("TwoSeventyDegreesRotationTooltip", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Define the ratio &apos;file size&apos; versus &apos;video quality&apos;. A lower value will give you a smaller file, a greater value give you a better video quality..
/// </summary>
@@ -108,5 +135,14 @@ namespace FileConverter.Properties {
return ResourceManager.GetString("VideoEncodingSpeedTooltip", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to No rotation.
/// </summary>
public static string ZeroDegreesRotationTooltip {
get {
return ResourceManager.GetString("ZeroDegreesRotationTooltip", resourceCulture);
}
}
}
}
@@ -117,6 +117,12 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="NinetyDegreesRotationTooltip" xml:space="preserve">
<value>90° counter clockwise rotation</value>
</data>
<data name="OneEightyDegreesRotationTooltip" xml:space="preserve">
<value>180° rotation</value>
</data>
<data name="OuputFileNameTemplateSample" xml:space="preserve">
<value>C:\Music\Artist\Album\Song.wav</value>
</data>
@@ -136,10 +142,16 @@ Special paths:
(p:v): my videos path
(p:p): my pictures path</value>
</data>
<data name="TwoSeventyDegreesRotationTooltip" xml:space="preserve">
<value>90° clockwise rotation</value>
</data>
<data name="VideoEncodingQualityTooltip" xml:space="preserve">
<value>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.</value>
</data>
<data name="VideoEncodingSpeedTooltip" xml:space="preserve">
<value>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.</value>
</data>
<data name="ZeroDegreesRotationTooltip" xml:space="preserve">
<value>No rotation</value>
</data>
</root>
@@ -117,6 +117,12 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="NinetyDegreesRotationTooltip" xml:space="preserve">
<value>90° counter clockwise rotation</value>
</data>
<data name="OneEightyDegreesRotationTooltip" xml:space="preserve">
<value>180° rotation</value>
</data>
<data name="OuputFileNameTemplateSample" xml:space="preserve">
<value>C:\Music\Artist\Album\Song.wav</value>
</data>
@@ -136,10 +142,16 @@ Special paths:
(p:v): my videos path
(p:p): my pictures path</value>
</data>
<data name="TwoSeventyDegreesRotationTooltip" xml:space="preserve">
<value>90° clockwise rotation</value>
</data>
<data name="VideoEncodingQualityTooltip" xml:space="preserve">
<value>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.</value>
</data>
<data name="VideoEncodingSpeedTooltip" xml:space="preserve">
<value>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.</value>
</data>
<data name="ZeroDegreesRotationTooltip" xml:space="preserve">
<value>No rotation</value>
</data>
</root>
+1 -1
View File
@@ -197,7 +197,7 @@ namespace FileConverter
public static class Keys
{
public static string LastUpdateCheckDate = "LastUpdateCheckDate";
public static readonly string LastUpdateCheckDate = "LastUpdateCheckDate";
}
}
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 551 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

+80 -6
View File
@@ -93,7 +93,7 @@ namespace FileConverter
}
}
public static Settings Load()
public static void PostInstallationInitialization()
{
Settings defaultSettings = null;
@@ -115,6 +115,7 @@ namespace FileConverter
Diagnostics.Debug.LogError("Default settings not found at path {0}. You should try to reinstall the application.", defaultFilePath);
}
// Load user settings if exists.
Settings userSettings = null;
string userFilePath = Settings.GetUserSettingsFilePath();
if (File.Exists(userFilePath))
@@ -125,7 +126,56 @@ namespace FileConverter
}
catch (Exception)
{
MessageBoxResult messageBoxResult = MessageBox.Show("Can't load file converter user settings. Do you want to fall back to default settings ?", "Error", MessageBoxButton.YesNo, MessageBoxImage.Exclamation);
System.IO.File.Delete(userFilePath);
}
if (userSettings != null)
{
if (userSettings.SerializationVersion != Version)
{
Diagnostics.Debug.Log("File converter settings has been imported from version {0} to version {1}.", userSettings.SerializationVersion, Version);
userSettings.SerializationVersion = Version;
}
// Remove default settings.
if (userSettings.ConversionPresets != null)
{
for (int index = userSettings.ConversionPresets.Count - 1; index >= 0; index--)
{
if (userSettings.ConversionPresets[index].IsDefaultSettings)
{
userSettings.ConversionPresets.RemoveAt(index);
}
}
}
}
}
Settings settings = userSettings != null ? userSettings.Merge(defaultSettings) : defaultSettings;
settings.Save();
}
public static Settings Load()
{
Settings settings = null;
string userFilePath = Settings.GetUserSettingsFilePath();
if (File.Exists(userFilePath))
{
Settings userSettings = null;
try
{
XmlHelpers.LoadFromFile<Settings>("Settings", userFilePath, out userSettings);
settings = userSettings;
}
catch (Exception)
{
MessageBoxResult messageBoxResult =
MessageBox.Show(
"Can't load file converter user settings. Do you want to fall back to default settings ?",
"Error",
MessageBoxButton.YesNo,
MessageBoxImage.Exclamation);
if (messageBoxResult == MessageBoxResult.Yes)
{
System.IO.File.Delete(userFilePath);
@@ -140,10 +190,34 @@ namespace FileConverter
if (userSettings != null && userSettings.SerializationVersion != Version)
{
Diagnostics.Debug.Log("File converter settings has been imported from version {0} to version {1}.", userSettings.SerializationVersion, Version);
userSettings.SerializationVersion = Version;
userSettings.Save();
}
}
else
{
// Load the default settings.
string defaultFilePath = Settings.GetDefaultSettingsFilePath();
if (File.Exists(defaultFilePath))
{
Settings defaultSettings = null;
try
{
XmlHelpers.LoadFromFile<Settings>("Settings", defaultFilePath, out defaultSettings);
settings = defaultSettings;
}
catch (Exception exception)
{
Diagnostics.Debug.LogError("Fail to load file converter default settings. {0}", exception.Message);
}
}
else
{
Diagnostics.Debug.LogError("Default settings not found at path {0}. You should try to reinstall the application.", defaultFilePath);
}
}
return userSettings != null ? userSettings.Merge(defaultSettings) : defaultSettings;
return settings;
}
public ConversionPreset GetPresetFromName(string presetName)
@@ -170,7 +244,7 @@ namespace FileConverter
// Write the settings in registry.
if (Settings.IsInAdmininstratorPrivileges)
{
// We are in admin mode, write reigstry ...
// We are in admin mode, write registry ...
bool succeed = Settings.ApplyRegistryModifications(registryEntries);
if (succeed)
{
@@ -301,7 +375,7 @@ namespace FileConverter
Directory.CreateDirectory(path);
}
path = Path.Combine(path, "Settings.xml");
path = Path.Combine(path, "Settings.default.xml");
return path;
}
@@ -409,7 +483,7 @@ namespace FileConverter
{
return this;
}
for (int index = 0; index < settings.conversionPresets.Count; index++)
{
ConversionPreset conversionPreset = settings.conversionPresets[index];
@@ -0,0 +1,506 @@
<?xml version="1.0" encoding="utf-8"?>
<Settings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" SerializationVersion="1">
<ExitApplicationWhenConversionsFinished>true</ExitApplicationWhenConversionsFinished>
<DurationBetweenEndOfConversionsAndApplicationExit>3</DurationBetweenEndOfConversionsAndApplicationExit>
<ConversionPreset Name="To Mkv" OutputType="Mkv" IsDefaultSettings="true">
<InputTypes>3gp</InputTypes>
<InputTypes>avi</InputTypes>
<InputTypes>bik</InputTypes>
<InputTypes>flv</InputTypes>
<InputTypes>m4v</InputTypes>
<InputTypes>mkv</InputTypes>
<InputTypes>mov</InputTypes>
<InputTypes>mp4</InputTypes>
<InputTypes>mpeg</InputTypes>
<InputTypes>ogv</InputTypes>
<InputTypes>webm</InputTypes>
<InputTypes>wmv</InputTypes>
<InputTypes>gif</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="EnableAudio" Value="True" />
<Settings Key="VideoQuality" Value="30" />
<Settings Key="VideoEncodingSpeed" Value="Medium" />
<Settings Key="VideoScale" Value="1" />
<Settings Key="VideoRotation" Value="0" />
<Settings Key="AudioBitrate" Value="155" />
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="To Mp4" OutputType="Mp4" IsDefaultSettings="true">
<InputTypes>avi</InputTypes>
<InputTypes>bik</InputTypes>
<InputTypes>flv</InputTypes>
<InputTypes>mkv</InputTypes>
<InputTypes>mov</InputTypes>
<InputTypes>mp4</InputTypes>
<InputTypes>3gp</InputTypes>
<InputTypes>webm</InputTypes>
<InputTypes>wmv</InputTypes>
<InputTypes>m4v</InputTypes>
<InputTypes>mpeg</InputTypes>
<InputTypes>ogv</InputTypes>
<InputTypes>gif</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="EnableAudio" Value="True" />
<Settings Key="VideoQuality" Value="30" />
<Settings Key="VideoEncodingSpeed" Value="Medium" />
<Settings Key="VideoScale" Value="1" />
<Settings Key="VideoRotation" Value="0" />
<Settings Key="AudioBitrate" Value="155" />
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="To Mp4 (low quality)" OutputType="Mp4" IsDefaultSettings="true">
<InputTypes>3gp</InputTypes>
<InputTypes>avi</InputTypes>
<InputTypes>bik</InputTypes>
<InputTypes>flv</InputTypes>
<InputTypes>m4v</InputTypes>
<InputTypes>mkv</InputTypes>
<InputTypes>mov</InputTypes>
<InputTypes>mp4</InputTypes>
<InputTypes>mpeg</InputTypes>
<InputTypes>ogv</InputTypes>
<InputTypes>webm</InputTypes>
<InputTypes>wmv</InputTypes>
<InputTypes>gif</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="EnableAudio" Value="True" />
<Settings Key="VideoQuality" Value="20" />
<Settings Key="VideoEncodingSpeed" Value="Medium" />
<Settings Key="VideoScale" Value="1" />
<Settings Key="VideoRotation" Value="0" />
<Settings Key="AudioBitrate" Value="96" />
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="To Mp4 (rotate left)" OutputType="Mp4" IsDefaultSettings="true">
<InputTypes>gif</InputTypes>
<InputTypes>3gp</InputTypes>
<InputTypes>avi</InputTypes>
<InputTypes>bik</InputTypes>
<InputTypes>flv</InputTypes>
<InputTypes>m4v</InputTypes>
<InputTypes>mkv</InputTypes>
<InputTypes>mov</InputTypes>
<InputTypes>mp4</InputTypes>
<InputTypes>mpeg</InputTypes>
<InputTypes>ogv</InputTypes>
<InputTypes>webm</InputTypes>
<InputTypes>wmv</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="EnableAudio" Value="True" />
<Settings Key="VideoQuality" Value="30" />
<Settings Key="VideoEncodingSpeed" Value="Medium" />
<Settings Key="VideoScale" Value="1" />
<Settings Key="VideoRotation" Value="90" />
<Settings Key="AudioBitrate" Value="155" />
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="To Mp4 (rotate right)" OutputType="Mp4" IsDefaultSettings="true">
<InputTypes>avi</InputTypes>
<InputTypes>bik</InputTypes>
<InputTypes>flv</InputTypes>
<InputTypes>mkv</InputTypes>
<InputTypes>mov</InputTypes>
<InputTypes>mp4</InputTypes>
<InputTypes>3gp</InputTypes>
<InputTypes>webm</InputTypes>
<InputTypes>wmv</InputTypes>
<InputTypes>m4v</InputTypes>
<InputTypes>mpeg</InputTypes>
<InputTypes>ogv</InputTypes>
<InputTypes>gif</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="EnableAudio" Value="True" />
<Settings Key="VideoQuality" Value="30" />
<Settings Key="VideoEncodingSpeed" Value="Medium" />
<Settings Key="VideoScale" Value="1" />
<Settings Key="VideoRotation" Value="270" />
<Settings Key="AudioBitrate" Value="155" />
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="To Webm" OutputType="Webm" IsDefaultSettings="true">
<InputTypes>avi</InputTypes>
<InputTypes>bik</InputTypes>
<InputTypes>flv</InputTypes>
<InputTypes>mkv</InputTypes>
<InputTypes>mov</InputTypes>
<InputTypes>mp4</InputTypes>
<InputTypes>3gp</InputTypes>
<InputTypes>webm</InputTypes>
<InputTypes>wmv</InputTypes>
<InputTypes>m4v</InputTypes>
<InputTypes>mpeg</InputTypes>
<InputTypes>ogv</InputTypes>
<InputTypes>gif</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="EnableAudio" Value="True" />
<Settings Key="AudioBitrate" Value="160" />
<Settings Key="VideoQuality" Value="40" />
<Settings Key="VideoScale" Value="1" />
<Settings Key="VideoRotation" Value="0" />
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="To Avi" OutputType="Avi" IsDefaultSettings="true">
<InputTypes>3gp</InputTypes>
<InputTypes>avi</InputTypes>
<InputTypes>bik</InputTypes>
<InputTypes>flv</InputTypes>
<InputTypes>m4v</InputTypes>
<InputTypes>mkv</InputTypes>
<InputTypes>mov</InputTypes>
<InputTypes>mp4</InputTypes>
<InputTypes>mpeg</InputTypes>
<InputTypes>ogv</InputTypes>
<InputTypes>webm</InputTypes>
<InputTypes>wmv</InputTypes>
<InputTypes>gif</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="EnableAudio" Value="True" />
<Settings Key="VideoQuality" Value="27" />
<Settings Key="VideoScale" Value="1" />
<Settings Key="VideoRotation" Value="0" />
<Settings Key="AudioBitrate" Value="190" />
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="To Gif" OutputType="Gif" IsDefaultSettings="true">
<InputTypes>bmp</InputTypes>
<InputTypes>exr</InputTypes>
<InputTypes>ico</InputTypes>
<InputTypes>jpg</InputTypes>
<InputTypes>jpeg</InputTypes>
<InputTypes>png</InputTypes>
<InputTypes>psd</InputTypes>
<InputTypes>svg</InputTypes>
<InputTypes>tga</InputTypes>
<InputTypes>tiff</InputTypes>
<InputTypes>xcf</InputTypes>
<InputTypes>3gp</InputTypes>
<InputTypes>avi</InputTypes>
<InputTypes>bik</InputTypes>
<InputTypes>flv</InputTypes>
<InputTypes>m4v</InputTypes>
<InputTypes>mkv</InputTypes>
<InputTypes>mov</InputTypes>
<InputTypes>mp4</InputTypes>
<InputTypes>mpeg</InputTypes>
<InputTypes>ogv</InputTypes>
<InputTypes>webm</InputTypes>
<InputTypes>wmv</InputTypes>
<InputTypes>gif</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="VideoScale" Value="1" />
<Settings Key="VideoRotation" Value="0" />
<Settings Key="VideoFramesPerSecond" Value="15" />
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="To Gif (low quality)" OutputType="Gif" IsDefaultSettings="true">
<InputTypes>bmp</InputTypes>
<InputTypes>exr</InputTypes>
<InputTypes>ico</InputTypes>
<InputTypes>jpg</InputTypes>
<InputTypes>jpeg</InputTypes>
<InputTypes>png</InputTypes>
<InputTypes>psd</InputTypes>
<InputTypes>svg</InputTypes>
<InputTypes>tga</InputTypes>
<InputTypes>tiff</InputTypes>
<InputTypes>xcf</InputTypes>
<InputTypes>3gp</InputTypes>
<InputTypes>avi</InputTypes>
<InputTypes>bik</InputTypes>
<InputTypes>flv</InputTypes>
<InputTypes>m4v</InputTypes>
<InputTypes>mkv</InputTypes>
<InputTypes>mov</InputTypes>
<InputTypes>mp4</InputTypes>
<InputTypes>mpeg</InputTypes>
<InputTypes>ogv</InputTypes>
<InputTypes>webm</InputTypes>
<InputTypes>wmv</InputTypes>
<InputTypes>gif</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="VideoScale" Value="0,75" />
<Settings Key="VideoRotation" Value="0" />
<Settings Key="VideoFramesPerSecond" Value="10" />
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="To Ogg" OutputType="Ogg" IsDefaultSettings="true">
<InputTypes>aac</InputTypes>
<InputTypes>aiff</InputTypes>
<InputTypes>ape</InputTypes>
<InputTypes>flac</InputTypes>
<InputTypes>m4a</InputTypes>
<InputTypes>mp3</InputTypes>
<InputTypes>wma</InputTypes>
<InputTypes>wav</InputTypes>
<InputTypes>3gp</InputTypes>
<InputTypes>avi</InputTypes>
<InputTypes>bik</InputTypes>
<InputTypes>flv</InputTypes>
<InputTypes>m4v</InputTypes>
<InputTypes>mkv</InputTypes>
<InputTypes>mov</InputTypes>
<InputTypes>mp4</InputTypes>
<InputTypes>mpeg</InputTypes>
<InputTypes>ogv</InputTypes>
<InputTypes>webm</InputTypes>
<InputTypes>wmv</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="AudioBitrate" Value="160" />
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="To Flac" OutputType="Flac" IsDefaultSettings="true">
<InputTypes>wav</InputTypes>
<InputTypes>ape</InputTypes>
<InputTypes>wma</InputTypes>
<InputTypes>aiff</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="To Wav" OutputType="Wav" IsDefaultSettings="true">
<InputTypes>aac</InputTypes>
<InputTypes>aiff</InputTypes>
<InputTypes>ape</InputTypes>
<InputTypes>flac</InputTypes>
<InputTypes>m4a</InputTypes>
<InputTypes>mp3</InputTypes>
<InputTypes>ogg</InputTypes>
<InputTypes>wma</InputTypes>
<InputTypes>avi</InputTypes>
<InputTypes>bik</InputTypes>
<InputTypes>flv</InputTypes>
<InputTypes>mkv</InputTypes>
<InputTypes>mov</InputTypes>
<InputTypes>mp4</InputTypes>
<InputTypes>3gp</InputTypes>
<InputTypes>webm</InputTypes>
<InputTypes>wmv</InputTypes>
<InputTypes>m4v</InputTypes>
<InputTypes>oga</InputTypes>
<InputTypes>ogv</InputTypes>
<InputTypes>mpeg</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="AudioEncodingMode" Value="Wav16" />
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="To Mp3" OutputType="Mp3" IsDefaultSettings="true">
<InputTypes>aac</InputTypes>
<InputTypes>aiff</InputTypes>
<InputTypes>ape</InputTypes>
<InputTypes>flac</InputTypes>
<InputTypes>m4a</InputTypes>
<InputTypes>ogg</InputTypes>
<InputTypes>wma</InputTypes>
<InputTypes>avi</InputTypes>
<InputTypes>bik</InputTypes>
<InputTypes>flv</InputTypes>
<InputTypes>mkv</InputTypes>
<InputTypes>mov</InputTypes>
<InputTypes>mp4</InputTypes>
<InputTypes>wav</InputTypes>
<InputTypes>3gp</InputTypes>
<InputTypes>webm</InputTypes>
<InputTypes>wmv</InputTypes>
<InputTypes>m4v</InputTypes>
<InputTypes>mpeg</InputTypes>
<InputTypes>ogv</InputTypes>
<InputTypes>oga</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="AudioEncodingMode" Value="Mp3VBR" />
<Settings Key="AudioBitrate" Value="190" />
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="To Aac" OutputType="Aac" IsDefaultSettings="true">
<InputTypes>aiff</InputTypes>
<InputTypes>ape</InputTypes>
<InputTypes>m4a</InputTypes>
<InputTypes>mp3</InputTypes>
<InputTypes>ogg</InputTypes>
<InputTypes>wma</InputTypes>
<InputTypes>avi</InputTypes>
<InputTypes>bik</InputTypes>
<InputTypes>flv</InputTypes>
<InputTypes>mkv</InputTypes>
<InputTypes>mov</InputTypes>
<InputTypes>mp4</InputTypes>
<InputTypes>wav</InputTypes>
<InputTypes>flac</InputTypes>
<InputTypes>3gp</InputTypes>
<InputTypes>webm</InputTypes>
<InputTypes>wmv</InputTypes>
<InputTypes>m4v</InputTypes>
<InputTypes>mpeg</InputTypes>
<InputTypes>ogv</InputTypes>
<InputTypes>oga</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="AudioBitrate" Value="128" />
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="Extract DVD to Mp4" OutputType="Mp4" IsDefaultSettings="true">
<InputTypes>vob</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="EnableAudio" Value="True" />
<Settings Key="VideoQuality" Value="30" />
<Settings Key="VideoEncodingSpeed" Value="Medium" />
<Settings Key="VideoScale" Value="1" />
<Settings Key="VideoRotation" Value="0" />
<Settings Key="AudioBitrate" Value="155" />
<OutputFileNameTemplate>(p:v)DVD Extraction\(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="Extract DVD to Mkv" OutputType="Mkv" IsDefaultSettings="true">
<InputTypes>vob</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="EnableAudio" Value="True" />
<Settings Key="VideoQuality" Value="30" />
<Settings Key="VideoEncodingSpeed" Value="Medium" />
<Settings Key="VideoScale" Value="1" />
<Settings Key="VideoRotation" Value="0" />
<Settings Key="AudioBitrate" Value="155" />
<OutputFileNameTemplate>(p:v)DVD Extraction\(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="Extract DVD to Flac" OutputType="Flac" IsDefaultSettings="true">
<InputTypes>vob</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<OutputFileNameTemplate>(p:m)DVD Extraction\(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="Extract DVD to Ogg" OutputType="Ogg" IsDefaultSettings="true">
<InputTypes>vob</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="AudioBitrate" Value="192" />
<OutputFileNameTemplate>(p:m)DVD Extraction\(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="Extract DVD to Mp3" OutputType="Mp3" IsDefaultSettings="true">
<InputTypes>vob</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="AudioEncodingMode" Value="Mp3VBR" />
<Settings Key="AudioBitrate" Value="225" />
<OutputFileNameTemplate>(p:m)DVD Extraction\(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="Extract CDA to Flac" OutputType="Flac" IsDefaultSettings="true">
<InputTypes>cda</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<OutputFileNameTemplate>(p:m)CDA Extraction\(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="Extract CDA to Ogg" OutputType="Ogg" IsDefaultSettings="true">
<InputTypes>cda</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="AudioBitrate" Value="192" />
<OutputFileNameTemplate>(p:m)CDA Extraction\(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="Extract CDA to Mp3" OutputType="Mp3" IsDefaultSettings="true">
<InputTypes>cda</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="AudioEncodingMode" Value="Mp3VBR" />
<Settings Key="AudioBitrate" Value="225" />
<OutputFileNameTemplate>(p:m)CDA Extraction\(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="To Png" OutputType="Png" IsDefaultSettings="true">
<InputTypes>bmp</InputTypes>
<InputTypes>exr</InputTypes>
<InputTypes>ico</InputTypes>
<InputTypes>jpg</InputTypes>
<InputTypes>jpeg</InputTypes>
<InputTypes>png</InputTypes>
<InputTypes>psd</InputTypes>
<InputTypes>svg</InputTypes>
<InputTypes>tga</InputTypes>
<InputTypes>tiff</InputTypes>
<InputTypes>xcf</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="ImageScale" Value="1" />
<Settings Key="ImageRotation" Value="0" />
<Settings Key="ImageClampSizePowerOf2" Value="False" />
<Settings Key="ImageMaximumSize" Value="0" />
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="To small Png (25%)" OutputType="Png" IsDefaultSettings="true">
<InputTypes>bmp</InputTypes>
<InputTypes>exr</InputTypes>
<InputTypes>ico</InputTypes>
<InputTypes>jpg</InputTypes>
<InputTypes>jpeg</InputTypes>
<InputTypes>png</InputTypes>
<InputTypes>psd</InputTypes>
<InputTypes>svg</InputTypes>
<InputTypes>tga</InputTypes>
<InputTypes>tiff</InputTypes>
<InputTypes>xcf</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="ImageScale" Value="0,25" />
<Settings Key="ImageRotation" Value="0" />
<Settings Key="ImageClampSizePowerOf2" Value="False" />
<Settings Key="ImageMaximumSize" Value="0" />
<OutputFileNameTemplate>(p)(f)-small</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="To Png (rotate left)" OutputType="Png" IsDefaultSettings="true">
<InputTypes>bmp</InputTypes>
<InputTypes>exr</InputTypes>
<InputTypes>ico</InputTypes>
<InputTypes>jpg</InputTypes>
<InputTypes>jpeg</InputTypes>
<InputTypes>png</InputTypes>
<InputTypes>psd</InputTypes>
<InputTypes>svg</InputTypes>
<InputTypes>tga</InputTypes>
<InputTypes>tiff</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="ImageScale" Value="1" />
<Settings Key="ImageRotation" Value="90" />
<Settings Key="ImageClampSizePowerOf2" Value="False" />
<Settings Key="ImageMaximumSize" Value="0" />
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="To Png (rotate right)" OutputType="Png" IsDefaultSettings="true">
<InputTypes>bmp</InputTypes>
<InputTypes>exr</InputTypes>
<InputTypes>ico</InputTypes>
<InputTypes>jpg</InputTypes>
<InputTypes>jpeg</InputTypes>
<InputTypes>png</InputTypes>
<InputTypes>psd</InputTypes>
<InputTypes>svg</InputTypes>
<InputTypes>tga</InputTypes>
<InputTypes>tiff</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="ImageScale" Value="1" />
<Settings Key="ImageRotation" Value="270" />
<Settings Key="ImageClampSizePowerOf2" Value="False" />
<Settings Key="ImageMaximumSize" Value="0" />
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="To Jpg" OutputType="Jpg" IsDefaultSettings="true">
<InputTypes>bmp</InputTypes>
<InputTypes>exr</InputTypes>
<InputTypes>ico</InputTypes>
<InputTypes>jpg</InputTypes>
<InputTypes>jpeg</InputTypes>
<InputTypes>png</InputTypes>
<InputTypes>psd</InputTypes>
<InputTypes>svg</InputTypes>
<InputTypes>tga</InputTypes>
<InputTypes>tiff</InputTypes>
<InputTypes>xcf</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="ImageQuality" Value="40" />
<Settings Key="ImageScale" Value="1" />
<Settings Key="ImageRotation" Value="0" />
<Settings Key="ImageClampSizePowerOf2" Value="False" />
<Settings Key="ImageMaximumSize" Value="0" />
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="To Ico" OutputType="Ico" IsDefaultSettings="true">
<InputTypes>bmp</InputTypes>
<InputTypes>exr</InputTypes>
<InputTypes>ico</InputTypes>
<InputTypes>jpg</InputTypes>
<InputTypes>jpeg</InputTypes>
<InputTypes>png</InputTypes>
<InputTypes>psd</InputTypes>
<InputTypes>svg</InputTypes>
<InputTypes>tga</InputTypes>
<InputTypes>tiff</InputTypes>
<InputTypes>xcf</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
<CheckUpgradeAtStartup>true</CheckUpgradeAtStartup>
</Settings>
-216
View File
@@ -1,216 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Settings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" SerializationVersion="0">
<ExitApplicationWhenConversionsFinished>true</ExitApplicationWhenConversionsFinished>
<DurationBetweenEndOfConversionsAndApplicationExit>3</DurationBetweenEndOfConversionsAndApplicationExit>
<ConversionPreset Name="To Mkv" OutputType="Mkv">
<InputTypes>avi</InputTypes>
<InputTypes>bik</InputTypes>
<InputTypes>flv</InputTypes>
<InputTypes>mkv</InputTypes>
<InputTypes>mov</InputTypes>
<InputTypes>mp4</InputTypes>
<InputTypes>3gp</InputTypes>
<InputTypes>webm</InputTypes>
<InputTypes>wmv</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="VideoQuality" Value="30" />
<Settings Key="VideoEncodingSpeed" Value="Medium" />
<Settings Key="VideoScale" Value="1" />
<Settings Key="AudioBitrate" Value="155" />
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="To Mkv (low quality)" OutputType="Mkv">
<InputTypes>avi</InputTypes>
<InputTypes>bik</InputTypes>
<InputTypes>flv</InputTypes>
<InputTypes>mkv</InputTypes>
<InputTypes>mov</InputTypes>
<InputTypes>mp4</InputTypes>
<InputTypes>3gp</InputTypes>
<InputTypes>webm</InputTypes>
<InputTypes>wmv</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="VideoQuality" Value="20" />
<Settings Key="VideoEncodingSpeed" Value="Medium" />
<Settings Key="VideoScale" Value="1" />
<Settings Key="AudioBitrate" Value="96" />
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="To Avi" OutputType="Avi">
<InputTypes>avi</InputTypes>
<InputTypes>bik</InputTypes>
<InputTypes>flv</InputTypes>
<InputTypes>mkv</InputTypes>
<InputTypes>mov</InputTypes>
<InputTypes>mp4</InputTypes>
<InputTypes>3gp</InputTypes>
<InputTypes>webm</InputTypes>
<InputTypes>wmv</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="VideoQuality" Value="27" />
<Settings Key="VideoScale" Value="1" />
<Settings Key="AudioBitrate" Value="190" />
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="To Ogg" OutputType="Ogg">
<InputTypes>aac</InputTypes>
<InputTypes>aiff</InputTypes>
<InputTypes>ape</InputTypes>
<InputTypes>flac</InputTypes>
<InputTypes>m4a</InputTypes>
<InputTypes>mp3</InputTypes>
<InputTypes>wma</InputTypes>
<InputTypes>avi</InputTypes>
<InputTypes>bik</InputTypes>
<InputTypes>flv</InputTypes>
<InputTypes>mkv</InputTypes>
<InputTypes>mov</InputTypes>
<InputTypes>mp4</InputTypes>
<InputTypes>wav</InputTypes>
<InputTypes>3gp</InputTypes>
<InputTypes>webm</InputTypes>
<InputTypes>wmv</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="AudioBitrate" Value="160" />
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="To Flac" OutputType="Flac">
<InputTypes>avi</InputTypes>
<InputTypes>bik</InputTypes>
<InputTypes>flv</InputTypes>
<InputTypes>mkv</InputTypes>
<InputTypes>mov</InputTypes>
<InputTypes>mp4</InputTypes>
<InputTypes>wav</InputTypes>
<InputTypes>ape</InputTypes>
<InputTypes>3gp</InputTypes>
<InputTypes>webm</InputTypes>
<InputTypes>wmv</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="To Wav" OutputType="Wav">
<InputTypes>aac</InputTypes>
<InputTypes>aiff</InputTypes>
<InputTypes>ape</InputTypes>
<InputTypes>flac</InputTypes>
<InputTypes>m4a</InputTypes>
<InputTypes>mp3</InputTypes>
<InputTypes>ogg</InputTypes>
<InputTypes>wma</InputTypes>
<InputTypes>avi</InputTypes>
<InputTypes>bik</InputTypes>
<InputTypes>flv</InputTypes>
<InputTypes>mkv</InputTypes>
<InputTypes>mov</InputTypes>
<InputTypes>mp4</InputTypes>
<InputTypes>3gp</InputTypes>
<InputTypes>webm</InputTypes>
<InputTypes>wmv</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="AudioEncodingMode" Value="Wav16" />
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="To Mp3" OutputType="Mp3">
<InputTypes>aac</InputTypes>
<InputTypes>aiff</InputTypes>
<InputTypes>ape</InputTypes>
<InputTypes>flac</InputTypes>
<InputTypes>m4a</InputTypes>
<InputTypes>ogg</InputTypes>
<InputTypes>wma</InputTypes>
<InputTypes>avi</InputTypes>
<InputTypes>bik</InputTypes>
<InputTypes>flv</InputTypes>
<InputTypes>mkv</InputTypes>
<InputTypes>mov</InputTypes>
<InputTypes>mp4</InputTypes>
<InputTypes>wav</InputTypes>
<InputTypes>3gp</InputTypes>
<InputTypes>webm</InputTypes>
<InputTypes>wmv</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="AudioEncodingMode" Value="Mp3VBR" />
<Settings Key="AudioBitrate" Value="190" />
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="To Aac" OutputType="Aac">
<InputTypes>aiff</InputTypes>
<InputTypes>ape</InputTypes>
<InputTypes>m4a</InputTypes>
<InputTypes>mp3</InputTypes>
<InputTypes>ogg</InputTypes>
<InputTypes>wma</InputTypes>
<InputTypes>avi</InputTypes>
<InputTypes>bik</InputTypes>
<InputTypes>flv</InputTypes>
<InputTypes>mkv</InputTypes>
<InputTypes>mov</InputTypes>
<InputTypes>mp4</InputTypes>
<InputTypes>wav</InputTypes>
<InputTypes>flac</InputTypes>
<InputTypes>3gp</InputTypes>
<InputTypes>webm</InputTypes>
<InputTypes>wmv</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="Extract CDA to Flac" OutputType="Flac">
<InputTypes>cda</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<OutputFileNameTemplate>(p:m)CDA Extraction\(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="Extract CDA to Ogg" OutputType="Ogg">
<InputTypes>cda</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="AudioBitrate" Value="192" />
<OutputFileNameTemplate>(p:m)CDA Extraction\(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="Extract CDA to Mp3" OutputType="Mp3">
<InputTypes>cda</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="AudioEncodingMode" Value="Mp3VBR" />
<Settings Key="AudioBitrate" Value="225" />
<OutputFileNameTemplate>(p:m)CDA Extraction\(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="To Png" OutputType="Png">
<InputTypes>bmp</InputTypes>
<InputTypes>tiff</InputTypes>
<InputTypes>ico</InputTypes>
<InputTypes>jpg</InputTypes>
<InputTypes>jpeg</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="ImageScale" Value="1" />
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="To Jpg" OutputType="Jpg">
<InputTypes>bmp</InputTypes>
<InputTypes>png</InputTypes>
<InputTypes>tiff</InputTypes>
<InputTypes>ico</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="ImageQuality" Value="25" />
<Settings Key="ImageScale" Value="1" />
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="To Ico (max 256x256)" OutputType="Ico">
<InputTypes>bmp</InputTypes>
<InputTypes>jpg</InputTypes>
<InputTypes>jpeg</InputTypes>
<InputTypes>png</InputTypes>
<InputTypes>tiff</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="To small Png" OutputType="Png">
<InputTypes>bmp</InputTypes>
<InputTypes>jpg</InputTypes>
<InputTypes>jpeg</InputTypes>
<InputTypes>png</InputTypes>
<InputTypes>tiff</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="ImageScale" Value="0,2" />
<OutputFileNameTemplate>(p)(f)-small</OutputFileNameTemplate>
</ConversionPreset>
<CheckUpgradeAtStartup>true</CheckUpgradeAtStartup>
</Settings>
@@ -41,8 +41,12 @@ namespace FileConverter.ValueConverters
string fileName = System.IO.Path.GetFileName(inputPathWithoutExtension);
string parentDirectory = System.IO.Path.GetDirectoryName(inputPathWithoutExtension);
string[] directories = parentDirectory.Split(System.IO.Path.DirectorySeparatorChar);
parentDirectory += System.IO.Path.DirectorySeparatorChar;
if (!parentDirectory.EndsWith(System.IO.Path.DirectorySeparatorChar.ToString()))
{
parentDirectory += System.IO.Path.DirectorySeparatorChar;
}
string[] directories = parentDirectory.Substring(0, parentDirectory.Length - 1).Split(System.IO.Path.DirectorySeparatorChar);
// Generate output path from template.
string outputPath = outputFileTemplate;
@@ -0,0 +1,21 @@
// <copyright file="ValueToString.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
namespace FileConverter.ValueConverters.Generic
{
using System;
using System.Globalization;
using System.Windows.Data;
public class ValueToString : IValueConverter
{
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
return value?.ToString();
}
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
{
throw new NotImplementedException();
}
}
}
@@ -31,6 +31,12 @@ namespace FileConverter.Windows
set;
}
public DataTemplate Mp4SettingsDataTemplate
{
get;
set;
}
public DataTemplate OggSettingsDataTemplate
{
get;
@@ -43,6 +49,12 @@ namespace FileConverter.Windows
set;
}
public DataTemplate GifSettingsDataTemplate
{
get;
set;
}
public DataTemplate JpgSettingsDataTemplate
{
get;
@@ -61,6 +73,12 @@ namespace FileConverter.Windows
set;
}
public DataTemplate WebmSettingsDataTemplate
{
get;
set;
}
public override DataTemplate SelectTemplate(object item, DependencyObject container)
{
if (item == null)
@@ -78,6 +96,9 @@ namespace FileConverter.Windows
case OutputType.Avi:
return this.AviSettingsDataTemplate;
case OutputType.Gif:
return this.GifSettingsDataTemplate;
case OutputType.Jpg:
return this.JpgSettingsDataTemplate;
@@ -87,6 +108,9 @@ namespace FileConverter.Windows
case OutputType.Mp3:
return this.Mp3SettingsDataTemplate;
case OutputType.Mp4:
return this.Mp4SettingsDataTemplate;
case OutputType.Ogg:
return this.OggSettingsDataTemplate;
@@ -95,6 +119,9 @@ namespace FileConverter.Windows
case OutputType.Wav:
return this.WavSettingsDataTemplate;
case OutputType.Webm:
return this.WebmSettingsDataTemplate;
}
return this.DefaultDataTemplate;
@@ -4,11 +4,20 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:FileConverter"
xmlns:valueConverters="clr-namespace:FileConverter.ValueConverters"
xmlns:conversionJobs="clr-namespace:FileConverter.ConversionJobs" mc:Ignorable="d" x:Class="FileConverter.MainWindow"
x:Name="FileConverterMainWindow" Height="500" Width="950" MinHeight="250" MinWidth="450" WindowStartupLocation="CenterScreen" Icon="/FileConverter;component/Resources/ApplicationIcon.ico">
xmlns:conversionJobs="clr-namespace:FileConverter.ConversionJobs"
xmlns:generic="clr-namespace:FileConverter.ValueConverters.Generic"
mc:Ignorable="d" x:Class="FileConverter.MainWindow"
x:Name="FileConverterMainWindow" Height="500" Width="950" MinHeight="250" MinWidth="500" WindowStartupLocation="CenterScreen" Icon="/FileConverter;component/Resources/ApplicationIcon.ico">
<Window.Resources>
<valueConverters:ApplicationVersionToApplicationName x:Key="ApplicationVersionToApplicationName"/>
<valueConverters:ConversionStateToBrush x:Key="ConversionStateToColor" />
<generic:ValueConverterGroup x:Key="EnumEqualsToVisibility">
<generic:ValueToString/>
<generic:EqualsConverter/>
<!--<generic:BoolInverterConverter/>-->
<generic:BoolToVisibility/>
</generic:ValueConverterGroup>
</Window.Resources>
<Window.Title>
<Binding Converter="{StaticResource ApplicationVersionToApplicationName}" Mode="OneWay" Path="(local:Application.ApplicationVersion)"/>
@@ -27,7 +36,10 @@
<ColumnDefinition Width="100" />
</Grid.ColumnDefinitions>
<Label x:Name="Title" Grid.Column="0" Content="Files to convert" VerticalAlignment="Top" Height="30" FontSize="16" FontWeight="Bold"/>
<DockPanel Grid.Column="0">
<Label Content="Files to convert" VerticalAlignment="Top" Height="30" FontSize="16" FontWeight="Bold"/>
<Label Content="{Binding InformationMessage, ElementName=FileConverterMainWindow}" VerticalAlignment="Top" Height="30" FontSize="13.333" HorizontalAlignment="Right"/>
</DockPanel>
<Button x:Name="DiagnosticsButton" Grid.Column="1" Content="Logs" Margin="3,3" Click="DiagnosticsButton_OnClick"/>
<Button x:Name="SettingsButton" Grid.Column="2" Content="Settings" Margin="3,3" Click="SettingsButton_OnClick"/>
</Grid>
@@ -36,8 +48,13 @@
<ItemsControl x:Name="ConverterJobsList">
<ItemsControl.ItemTemplate>
<DataTemplate>
<DockPanel Background="{Binding State, ConverterParameter=Background, Converter={StaticResource ConversionStateToColor}}" Margin="0,4">
<Grid Margin="10">
<Grid Background="{Binding State, ConverterParameter=Background, Converter={StaticResource ConversionStateToColor}}" Margin="0,4">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="70"/>
</Grid.ColumnDefinitions>
<Grid Margin="10" Grid.Column="0">
<Grid.RowDefinitions>
<RowDefinition Height="20" />
<RowDefinition Height="Auto" />
@@ -61,7 +78,15 @@
<ProgressBar Grid.Row="1" Grid.Column="1" Height="18" Width="Auto" Minimum="0" Maximum="1" SmallChange="0.001" Value="{Binding Progress, Mode=OneWay}" Foreground="{Binding State, ConverterParameter=Foreground, Converter={StaticResource ConversionStateToColor}}" HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch" MinWidth="100" LargeChange="0.1" />
</Grid>
</DockPanel>
<Button Margin="5" Grid.Column="1" Background="WhiteSmoke" Foreground="#FF3E3E3E" Visibility="{Binding State, Converter={StaticResource EnumEqualsToVisibility}, ConverterParameter=|InProgress|Collapsed}" Command="{Binding CancelCommand}" ToolTip="Cancel">
<Button.Content>
<Image Source="/FileConverter;component/Resources/CancelIcon.png" Width="48" Height="48" />
</Button.Content>
</Button>
<Image Margin="5" Grid.Column="1" Source="/FileConverter;component/Resources/SuccessIcon.png" Width="48" Height="48" Visibility="{Binding State, Converter={StaticResource EnumEqualsToVisibility}, ConverterParameter=|Done|Collapsed}"/>
<Image Margin="5" Grid.Column="1" Source="/FileConverter;component/Resources/FailIcon.png" Width="48" Height="48" Visibility="{Binding State, Converter={StaticResource EnumEqualsToVisibility}, ConverterParameter=|Failed|Collapsed}"/>
</Grid>
</DataTemplate>
</ItemsControl.ItemTemplate>
<ItemsControl.DataContext>
@@ -15,12 +15,16 @@ namespace FileConverter
private SettingsWindow settingsWindow;
private UpgradeWindow upgradeWindow;
private string informationMessage;
public MainWindow()
{
this.InitializeComponent();
Application application = Application.Current as Application;
application.OnApplicationTerminate += this.Application_OnApplicationTerminate;
this.ConverterJobsList.ItemsSource = application.ConvertionJobs;
if (application.HideMainWindow)
@@ -42,6 +46,20 @@ namespace FileConverter
public event PropertyChangedEventHandler PropertyChanged;
public string InformationMessage
{
get
{
return this.informationMessage;
}
private set
{
this.informationMessage = value;
this.OnPropertyChanged();
}
}
public void OnNewVersionReleased(UpgradeVersionDescription upgradeVersionDescription)
{
this.ShowUpgradeWindow();
@@ -121,5 +139,30 @@ namespace FileConverter
application?.CancelAutoExit();
this.upgradeWindow.Show();
}
private void Application_OnApplicationTerminate(object sender, ApplicationTerminateArgs eventArgs)
{
if (float.IsNaN(eventArgs.RemainingTimeBeforeTermination))
{
this.InformationMessage = string.Empty;
return;
}
int remaingingSeconds = (int)eventArgs.RemainingTimeBeforeTermination;
if (remaingingSeconds >= 2)
{
this.InformationMessage = string.Format("The application will automatically terminate in {0} seconds.", remaingingSeconds);
}
else if (remaingingSeconds == 1)
{
this.InformationMessage = string.Format("The application will automatically terminate in {0} second.", remaingingSeconds);
}
if (remaingingSeconds <= 0)
{
this.InformationMessage = string.Format("The application is terminating.");
}
}
}
}
@@ -109,6 +109,52 @@
</DockPanel>
</StackPanel>
</DataTemplate>
<DataTemplate x:Key="GifSettingsDataTemplate">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Label Content="Frames per second :" Grid.Row="0" Grid.Column="0" HorizontalContentAlignment="Right"/>
<Slider x:Name="QualitySlider" Grid.Row="0" Grid.Column="1" Value="{Binding SelectedPreset.Settings, ConverterParameter=VideoFramesPerSecond|System.Int32, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay}"
Margin="0,2,0,0" VerticalAlignment="Top" AutoToolTipPlacement="TopLeft" IsSnapToTickEnabled="True" IsSelectionRangeEnabled="True" SelectionStart="10" SelectionEnd="20" Minimum="1" Maximum="30" TickPlacement="BottomRight" SmallChange="1" LargeChange="4" TickFrequency="1" Foreground="#004B82" />
<!-- Scale -->
<Label Content="Scale :" Grid.Row="1" Grid.Column="0" HorizontalAlignment="Right"/>
<Grid Grid.Row="1" Grid.Column="1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="60"/>
</Grid.ColumnDefinitions>
<Slider x:Name="ScaleSlider" Grid.Column="0" Value="{Binding SelectedPreset.Settings, ConverterParameter=VideoScale|System.Double, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay}" Margin="0,2,0,0" VerticalAlignment="Top" IsSnapToTickEnabled="True" Minimum="0.075" Maximum="2" SmallChange="0.075" LargeChange="0.25" TickPlacement="BottomRight" Ticks="0.075 0.125 0.25 0.5 0.75 1 1.25 1.5 1.75 2" Foreground="#004B82"/>
<Label Grid.Column="1">
<Label.Content>
<MultiBinding Converter="{StaticResource FormatStringConverter}" Mode="OneWay">
<MultiBinding.ConverterParameter>{0:P0}</MultiBinding.ConverterParameter>
<Binding ElementName="ScaleSlider" Path="Value" Mode="OneWay"/>
</MultiBinding>
</Label.Content>
</Label>
</Grid>
<!--Rotate-->
<Label Content="Rotate :" Grid.Row="2" Grid.Column="0" HorizontalAlignment="Right"/>
<StackPanel Grid.Row="2" Grid.Column="1" Orientation="Horizontal">
<RadioButton Content="None" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|0, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.ZeroDegreesRotationTooltip}" Margin="0,7,7,7"/>
<RadioButton Content="90°" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|90, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.NinetyDegreesRotationTooltip}" Margin="7"/>
<RadioButton Content="180°" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|180, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.OneEightyDegreesRotationTooltip}" Margin="7"/>
<RadioButton Content="270°" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|270, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.TwoSeventyDegreesRotationTooltip}" Margin="7"/>
</StackPanel>
</Grid>
</DataTemplate>
<DataTemplate x:Key="AviSettingsDataTemplate">
<Grid>
@@ -122,10 +168,11 @@
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<DockPanel Grid.Row="0" Grid.Column="0">
<Label Content="Video" FontWeight="Bold" />
<Label Content="Video" FontWeight="Bold" Margin="17,0,0,0" />
<Label Content="(Xvid)" FontWeight="Light" Foreground="#004B82" />
</DockPanel>
@@ -133,13 +180,14 @@
<Slider x:Name="QualitySlider" Grid.Row="1" Grid.Column="1" Value="{Binding SelectedPreset.Settings, ConverterParameter=VideoQuality|System.Double, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay}"
Margin="0,2,0,0" VerticalAlignment="Top" AutoToolTipPlacement="TopLeft" IsSnapToTickEnabled="True" IsSelectionRangeEnabled="True" SelectionStart="20" SelectionEnd="28" Minimum="0" Maximum="30" TickPlacement="BottomRight" SmallChange="1" LargeChange="5" TickFrequency="1" Foreground="#004B82" />
<!-- Scale -->
<Label Content="Scale :" Grid.Row="2" Grid.Column="0" HorizontalAlignment="Right"/>
<Grid Grid.Row="2" Grid.Column="1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="60"/>
</Grid.ColumnDefinitions>
<Slider x:Name="ScaleSlider" Grid.Column="0" Value="{Binding SelectedPreset.Settings, ConverterParameter=VideoScale|System.Double, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay}" Margin="0,2,0,0" VerticalAlignment="Top" IsSnapToTickEnabled="True" Minimum="0.01" Maximum="2" SmallChange="0.01" LargeChange="0.1" TickFrequency="0.01" Foreground="#004B82"/>
<Slider x:Name="ScaleSlider" Grid.Column="0" Value="{Binding SelectedPreset.Settings, ConverterParameter=VideoScale|System.Double, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay}" Margin="0,2,0,0" VerticalAlignment="Top" IsSnapToTickEnabled="True" Minimum="0.075" Maximum="2" SmallChange="0.075" LargeChange="0.25" TickPlacement="BottomRight" Ticks="0.075 0.125 0.25 0.5 0.75 1 1.25 1.5 1.75 2" Foreground="#004B82"/>
<Label Grid.Column="1">
<Label.Content>
<MultiBinding Converter="{StaticResource FormatStringConverter}" Mode="OneWay">
@@ -150,13 +198,23 @@
</Label>
</Grid>
<DockPanel Grid.Row="3" Grid.Column="0" >
<Label Content="Audio" FontWeight="Bold" />
<Label Content="(Mp3)" FontWeight="Light" Foreground="#004B82" />
<!--Rotate-->
<Label Content="Rotate :" Grid.Row="3" Grid.Column="0" HorizontalAlignment="Right"/>
<StackPanel Grid.Row="3" Grid.Column="1" Orientation="Horizontal">
<RadioButton Content="None" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|0, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.ZeroDegreesRotationTooltip}" Margin="0,7,7,7"/>
<RadioButton Content="90°" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|90, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.NinetyDegreesRotationTooltip}" Margin="7"/>
<RadioButton Content="180°" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|180, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.OneEightyDegreesRotationTooltip}" Margin="7"/>
<RadioButton Content="270°" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|270, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.TwoSeventyDegreesRotationTooltip}" Margin="7"/>
</StackPanel>
<DockPanel Grid.Row="4" Grid.Column="0">
<CheckBox IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=EnableAudio|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay}" Margin="0,6,0,0" />
<Label Content="Audio" FontWeight="Bold" IsEnabled="{Binding SelectedPreset.Settings, ConverterParameter=EnableAudio|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=OneWay}"/>
<Label Content="(Mp3)" FontWeight="Light" Foreground="#004B82" IsEnabled="{Binding SelectedPreset.Settings, ConverterParameter=EnableAudio|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=OneWay}"/>
</DockPanel>
<Label Content="Quality :" Grid.Row="4" Grid.Column="0" HorizontalContentAlignment="Right"/>
<controls:EncodingQualitySliderControl Grid.Row="4" Grid.Column="1" x:Name="EncodingQualitySlider" EncodingMode="Mp3VBR"
<Label Content="Quality :" Grid.Row="5" Grid.Column="0" HorizontalContentAlignment="Right" IsEnabled="{Binding SelectedPreset.Settings, ConverterParameter=EnableAudio|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=OneWay}"/>
<controls:EncodingQualitySliderControl Grid.Row="5" Grid.Column="1" x:Name="EncodingQualitySlider" EncodingMode="Mp3VBR" IsEnabled="{Binding SelectedPreset.Settings, ConverterParameter=EnableAudio|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=OneWay}"
Bitrate="{Binding SelectedPreset.Settings, ConverterParameter=AudioBitrate|System.Double, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay}" />
</Grid>
</DataTemplate>
@@ -174,10 +232,11 @@
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<DockPanel Grid.Row="0" Grid.Column="0">
<Label Content="Video" FontWeight="Bold" />
<Label Content="Video" FontWeight="Bold" Margin="17,0,0,0"/>
<Label Content="(H.264)" FontWeight="Light" Foreground="#004B82" />
</DockPanel>
@@ -204,7 +263,70 @@
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="60"/>
</Grid.ColumnDefinitions>
<Slider x:Name="ScaleSlider" Grid.Column="0" Value="{Binding SelectedPreset.Settings, ConverterParameter=VideoScale|System.Double, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay}" Margin="0,2,0,0" VerticalAlignment="Top" IsSnapToTickEnabled="True" Minimum="0.01" Maximum="2" SmallChange="0.01" LargeChange="0.1" TickFrequency="0.01" Foreground="#004B82"/>
<Slider x:Name="ScaleSlider" Grid.Column="0" Value="{Binding SelectedPreset.Settings, ConverterParameter=VideoScale|System.Double, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay}" Margin="0,2,0,0" VerticalAlignment="Top" IsSnapToTickEnabled="True" Minimum="0.075" Maximum="2" SmallChange="0.075" LargeChange="0.25" TickPlacement="BottomRight" Ticks="0.075 0.125 0.25 0.5 0.75 1 1.25 1.5 1.75 2" Foreground="#004B82"/>
<Label Grid.Column="1">
<Label.Content>
<MultiBinding Converter="{StaticResource FormatStringConverter}" Mode="OneWay">
<MultiBinding.ConverterParameter>{0:P1}</MultiBinding.ConverterParameter>
<Binding ElementName="ScaleSlider" Path="Value" Mode="OneWay"/>
</MultiBinding>
</Label.Content>
</Label>
</Grid>
<!--Rotate-->
<Label Content="Rotate :" Grid.Row="4" Grid.Column="0" HorizontalAlignment="Right"/>
<StackPanel Grid.Row="4" Grid.Column="1" Orientation="Horizontal">
<RadioButton Content="None" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|0, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.ZeroDegreesRotationTooltip}" Margin="0,7,7,7"/>
<RadioButton Content="90°" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|90, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.NinetyDegreesRotationTooltip}" Margin="7"/>
<RadioButton Content="180°" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|180, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.OneEightyDegreesRotationTooltip}" Margin="7"/>
<RadioButton Content="270°" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|270, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.TwoSeventyDegreesRotationTooltip}" Margin="7"/>
</StackPanel>
<DockPanel Grid.Row="5" Grid.Column="0">
<CheckBox IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=EnableAudio|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay}" Margin="0,6,0,0" />
<Label Content="Audio" FontWeight="Bold" IsEnabled="{Binding SelectedPreset.Settings, ConverterParameter=EnableAudio|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=OneWay}"/>
<Label Content="(AAC)" FontWeight="Light" Foreground="#004B82" IsEnabled="{Binding SelectedPreset.Settings, ConverterParameter=EnableAudio|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=OneWay}"/>
</DockPanel>
<Label Content="Quality :" Grid.Row="6" Grid.Column="0" HorizontalContentAlignment="Right" IsEnabled="{Binding SelectedPreset.Settings, ConverterParameter=EnableAudio|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=OneWay}"/>
<controls:EncodingQualitySliderControl Grid.Row="6" Grid.Column="1" x:Name="EncodingQualitySlider" EncodingMode="AacVBR" IsEnabled="{Binding SelectedPreset.Settings, ConverterParameter=EnableAudio|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=OneWay}"
Bitrate="{Binding SelectedPreset.Settings, ConverterParameter=AudioBitrate|System.Double, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay, TargetNullValue=128}" />
</Grid>
</DataTemplate>
<DataTemplate x:Key="WebmSettingsDataTemplate">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<DockPanel Grid.Row="0" Grid.Column="0">
<Label Content="Video" FontWeight="Bold" Margin="17,0,0,0" />
<Label Content="(vp9)" FontWeight="Light" Foreground="#004B82" />
</DockPanel>
<Label Content="Quality :" Grid.Row="1" Grid.Column="0" ToolTip="{x:Static project:Resources.VideoEncodingQualityTooltip}" HorizontalContentAlignment="Right"/>
<Slider x:Name="QualitySlider" Grid.Row="1" Grid.Column="1" Value="{Binding SelectedPreset.Settings, ConverterParameter=VideoQuality|System.Double, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay}"
Margin="0,2,0,0" VerticalAlignment="Top" AutoToolTipPlacement="TopLeft" IsSnapToTickEnabled="True" IsSelectionRangeEnabled="True" SelectionStart="20" SelectionEnd="40" Minimum="0" Maximum="63" TickPlacement="BottomRight" SmallChange="1" LargeChange="5" TickFrequency="1" Foreground="#004B82" />
<!-- Scale -->
<Label Content="Scale :" Grid.Row="2" Grid.Column="0" HorizontalAlignment="Right"/>
<Grid Grid.Row="2" Grid.Column="1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="60"/>
</Grid.ColumnDefinitions>
<Slider x:Name="ScaleSlider" Grid.Column="0" Value="{Binding SelectedPreset.Settings, ConverterParameter=VideoScale|System.Double, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay}" Margin="0,2,0,0" VerticalAlignment="Top" IsSnapToTickEnabled="True" Minimum="0.075" Maximum="2" SmallChange="0.075" LargeChange="0.25" TickPlacement="BottomRight" Ticks="0.075 0.125 0.25 0.5 0.75 1 1.25 1.5 1.75 2" Foreground="#004B82"/>
<Label Grid.Column="1">
<Label.Content>
<MultiBinding Converter="{StaticResource FormatStringConverter}" Mode="OneWay">
@@ -215,14 +337,24 @@
</Label>
</Grid>
<DockPanel Grid.Row="4" Grid.Column="0" >
<Label Content="Audio" FontWeight="Bold" />
<Label Content="(AAC)" FontWeight="Light" Foreground="#004B82" />
<!--Rotate-->
<Label Content="Rotate :" Grid.Row="3" Grid.Column="0" HorizontalAlignment="Right"/>
<StackPanel Grid.Row="3" Grid.Column="1" Orientation="Horizontal">
<RadioButton Content="None" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|0, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.ZeroDegreesRotationTooltip}" Margin="0,7,7,7"/>
<RadioButton Content="90°" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|90, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.NinetyDegreesRotationTooltip}" Margin="7"/>
<RadioButton Content="180°" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|180, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.OneEightyDegreesRotationTooltip}" Margin="7"/>
<RadioButton Content="270°" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|270, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.TwoSeventyDegreesRotationTooltip}" Margin="7"/>
</StackPanel>
<DockPanel Grid.Row="4" Grid.Column="0">
<CheckBox IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=EnableAudio|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay}" Margin="0,6,0,0" />
<Label Content="Audio" FontWeight="Bold" IsEnabled="{Binding SelectedPreset.Settings, ConverterParameter=EnableAudio|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=OneWay}"/>
<Label Content="(Ogg vorbis)" FontWeight="Light" Foreground="#004B82" IsEnabled="{Binding SelectedPreset.Settings, ConverterParameter=EnableAudio|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=OneWay}"/>
</DockPanel>
<Label Content="Quality :" Grid.Row="5" Grid.Column="0" HorizontalContentAlignment="Right"/>
<controls:EncodingQualitySliderControl Grid.Row="5" Grid.Column="1" x:Name="EncodingQualitySlider" EncodingMode="AacVBR"
Bitrate="{Binding SelectedPreset.Settings, ConverterParameter=AudioBitrate|System.Double, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay, TargetNullValue=128}" />
<Label Content="Quality :" Grid.Row="5" Grid.Column="0" HorizontalContentAlignment="Right" IsEnabled="{Binding SelectedPreset.Settings, ConverterParameter=EnableAudio|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=OneWay}"/>
<controls:EncodingQualitySliderControl Grid.Row="5" Grid.Column="1" x:Name="EncodingQualitySlider" EncodingMode="OggVBR" IsEnabled="{Binding SelectedPreset.Settings, ConverterParameter=EnableAudio|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=OneWay}"
Bitrate="{Binding SelectedPreset.Settings, ConverterParameter=AudioBitrate|System.Double, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay}" />
</Grid>
</DataTemplate>
@@ -235,11 +367,12 @@
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<!--Quality-->
<Label Content="Quality :" Grid.Row="0" Grid.Column="0" HorizontalAlignment="Right"/>
<Slider Grid.Row="0" Grid.Column="1" x:Name="QualitySlider" Value="{Binding SelectedPreset.Settings, ConverterParameter=ImageQuality|System.Double, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay, TargetNullValue=25}"
Margin="0,2,0,0" VerticalAlignment="Top" AutoToolTipPlacement="TopLeft" IsSnapToTickEnabled="True" IsSelectionRangeEnabled="True" SelectionStart="20" SelectionEnd="30" Minimum="0" Maximum="30" TickPlacement="BottomRight" SmallChange="3" LargeChange="6" TickFrequency="1" Foreground="#004B82" />
Margin="0,2,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" />
<!--Scale-->
<Label Content="Scale :" Grid.Row="1" Grid.Column="0" HorizontalAlignment="Right"/>
<Grid Grid.Row="1" Grid.Column="1">
@@ -247,16 +380,29 @@
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="60"/>
</Grid.ColumnDefinitions>
<Slider x:Name="ScaleSlider" Grid.Column="0" Value="{Binding SelectedPreset.Settings, ConverterParameter=ImageScale|System.Double, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay}" Margin="0,2,0,0" VerticalAlignment="Top" IsSnapToTickEnabled="True" Minimum="0.01" Maximum="2" SmallChange="0.01" LargeChange="0.1" TickFrequency="0.01" Foreground="#004B82"/>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Slider x:Name="ScaleSlider" Grid.Column="0" Value="{Binding SelectedPreset.Settings, ConverterParameter=ImageScale|System.Double, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay}" Margin="0,2,0,0" VerticalAlignment="Top" IsSnapToTickEnabled="True" Minimum="0.075" Maximum="16" SmallChange="0.075" LargeChange="0.25" TickPlacement="BottomRight" Ticks="0.075 0.125 0.25 0.5 0.75 1 1.25 1.5 1.75 2 3 4 6 8 12 16" Foreground="#004B82"/>
<Label Grid.Column="1">
<Label.Content>
<MultiBinding Converter="{StaticResource FormatStringConverter}" Mode="OneWay">
<MultiBinding.ConverterParameter>{0:P0}</MultiBinding.ConverterParameter>
<MultiBinding.ConverterParameter>{0:P1}</MultiBinding.ConverterParameter>
<Binding ElementName="ScaleSlider" Path="Value" Mode="OneWay"/>
</MultiBinding>
</Label.Content>
</Label>
<CheckBox Grid.Row="1" Grid.Column="0" Content="Clamp to lowest power of 2 size" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=ImageClampSizePowerOf2|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay}" />
</Grid>
<!--Rotate-->
<Label Content="Rotate :" Grid.Row="2" Grid.Column="0" HorizontalAlignment="Right"/>
<StackPanel Grid.Row="2" Grid.Column="1" Orientation="Horizontal">
<RadioButton Content="None" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=ImageRotation|0, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.ZeroDegreesRotationTooltip}" Margin="0,7,7,7"/>
<RadioButton Content="90°" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=ImageRotation|90, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.NinetyDegreesRotationTooltip}" Margin="7"/>
<RadioButton Content="180°" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=ImageRotation|180, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.OneEightyDegreesRotationTooltip}" Margin="7"/>
<RadioButton Content="270°" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=ImageRotation|270, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.TwoSeventyDegreesRotationTooltip}" Margin="7"/>
</StackPanel>
</Grid>
</DataTemplate>
@@ -268,6 +414,7 @@
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<!--Scale-->
<Label Content="Scale :" Grid.Row="0" Grid.Column="0" HorizontalAlignment="Right"/>
@@ -276,16 +423,30 @@
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="60"/>
</Grid.ColumnDefinitions>
<Slider x:Name="ScaleSlider" Grid.Column="0" Value="{Binding SelectedPreset.Settings, ConverterParameter=ImageScale|System.Double, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay}" Margin="0,2,0,0" VerticalAlignment="Top" IsSnapToTickEnabled="True" Minimum="0.01" Maximum="2" SmallChange="0.01" LargeChange="0.1" TickFrequency="0.01" Foreground="#004B82"/>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Slider x:Name="ScaleSlider" Grid.Column="0" Value="{Binding SelectedPreset.Settings, ConverterParameter=ImageScale|System.Double, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay}" Margin="0,2,0,0" VerticalAlignment="Top" IsSnapToTickEnabled="True" Minimum="0.075" Maximum="16" SmallChange="0.075" LargeChange="0.25" TickPlacement="BottomRight" Ticks="0.075 0.125 0.25 0.5 0.75 1 1.25 1.5 1.75 2 3 4 6 8 12 16" Foreground="#004B82"/>
<Label Grid.Column="1">
<Label.Content>
<MultiBinding Converter="{StaticResource FormatStringConverter}" Mode="OneWay">
<MultiBinding.ConverterParameter>{0:P0}</MultiBinding.ConverterParameter>
<MultiBinding.ConverterParameter>{0:P1}</MultiBinding.ConverterParameter>
<Binding ElementName="ScaleSlider" Path="Value" Mode="OneWay"/>
</MultiBinding>
</Label.Content>
</Label>
<CheckBox Grid.Row="1" Grid.Column="0" Content="Clamp to lowest power of 2 size" Margin="5" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=ImageClampSizePowerOf2|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay}" />
</Grid>
<!--Rotate-->
<Label Content="Rotate :" Grid.Row="1" Grid.Column="0" HorizontalAlignment="Right"/>
<StackPanel Grid.Row="1" Grid.Column="1" Orientation="Horizontal">
<RadioButton Content="None" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=ImageRotation|0, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.ZeroDegreesRotationTooltip}" Margin="0,7,7,7"/>
<RadioButton Content="90°" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=ImageRotation|90, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.NinetyDegreesRotationTooltip}" Margin="7"/>
<RadioButton Content="180°" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=ImageRotation|180, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.OneEightyDegreesRotationTooltip}" Margin="7"/>
<RadioButton Content="270°" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=ImageRotation|270, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.TwoSeventyDegreesRotationTooltip}" Margin="7"/>
</StackPanel>
</Grid>
</DataTemplate>
@@ -293,12 +454,15 @@
DefaultDataTemplate="{StaticResource EmptyDataTemplate}"
AacSettingsDataTemplate="{StaticResource AacSettingsDataTemplate}"
AviSettingsDataTemplate="{StaticResource AviSettingsDataTemplate}"
GifSettingsDataTemplate="{StaticResource GifSettingsDataTemplate}"
JpgSettingsDataTemplate="{StaticResource JpgSettingsDataTemplate}"
MkvSettingsDataTemplate="{StaticResource MkvSettingsDataTemplate}"
Mp3SettingsDataTemplate="{StaticResource Mp3SettingsDataTemplate}"
Mp4SettingsDataTemplate="{StaticResource MkvSettingsDataTemplate}"
OggSettingsDataTemplate="{StaticResource OggSettingsDataTemplate}"
PngSettingsDataTemplate="{StaticResource PngSettingsDataTemplate}"
WavSettingsDataTemplate="{StaticResource WavSettingsDataTemplate}" />
WavSettingsDataTemplate="{StaticResource WavSettingsDataTemplate}"
WebmSettingsDataTemplate="{StaticResource WebmSettingsDataTemplate}" />
</Window.Resources>
<Window.Title>
<Binding Converter="{StaticResource ApplicationVersionToApplicationName}" Mode="OneWay" Path="(local:Application.ApplicationVersion)"/>
@@ -41,10 +41,13 @@ namespace FileConverter
OutputType.Flac,
OutputType.Wav,
OutputType.Mkv,
OutputType.Mp4,
OutputType.Webm,
OutputType.Avi,
OutputType.Ico,
OutputType.Jpg,
OutputType.Png,
OutputType.Gif,
};
this.OutputFormats.ItemsSource = outputTypes;
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Magick.NET-Q16-AnyCPU" version="7.0.0.0101" targetFramework="net45" />
</packages>
@@ -133,7 +133,7 @@ namespace FileConverterExtension
{
ToolStripMenuItem subItem = new ToolStripMenuItem
{
Text = "Settings",
Text = "Configure presets...",
};
fileConverterItem.DropDownItems.Add(subItem);
@@ -46,8 +46,9 @@
</DefineConstants>
</PropertyGroup>
<ItemGroup>
<Reference Include="SharpShell">
<HintPath>..\..\Middleware\SharpShell\SharpShell.dll</HintPath>
<Reference Include="SharpShell, Version=2.2.0.0, Culture=neutral, PublicKeyToken=f14dc899472fe6fb, processorArchitecture=MSIL">
<HintPath>..\..\packages\SharpShell.2.2.0.0\lib\net40\SharpShell.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
@@ -63,7 +64,7 @@
<Compile Include="FileConverterExtension.cs" />
<Compile Include="PresetDefinition.cs" />
<Compile Include="Properties\AssemblyInfo.cs">
<ExcludeFromStyleCop>true</ExcludeFromStyleCop>
<ExcludeFromStyleCop>true</ExcludeFromStyleCop>
</Compile>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
@@ -82,6 +83,7 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<None Include="Resources\ApplicationIcon-16x16.ico" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
@@ -92,4 +94,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="SharpShell" version="2.2.0.0" targetFramework="net45" />
</packages>
+33
View File
@@ -1,5 +1,38 @@
# Change Log
## Version 0.7
- New: Possibility to encode videos using VP9 video codec and Ogg vorbis audio codec in a webm container.
- New: Possibility to convert videos and images to gif.
- New: Possibility to convert gif files to videos.
- New: Possibility to remove audio from video files (mkv, mp4, avi and webm output file formats).
- New: Add feedback to indicate that the application will automatically terminate (after conversions) (github issue #1).
- New: Support new video input formats: ogv and mpeg.
- New: Support new audio input format: oga.
- New: Possibility to cancel some conversion jobs (gif/cda and image conversion jobs are not cancelable for now).
- Fixed: Issue where video can't be compressed using H.264 codec (mp4 or mkv presets) when its size (width or height) is not divisible by 2 (append a lot when the user tries to scale a video) (github issue #2).
- Fixed: Issue where "Clamp to power of 2 size" option didn't work well with images that already have a power of 2 size.
- Fixed: Issue where conversion progress was not updated correctly (for converters based on ffmpeg).
- Fixed: Issue where converting a video into the ogg format did not extract audio in an ogg file correctly.
- Fixed: Issue where simultaneous read on the same CD drive was performed when files from differents conversions come from the same drive (other than cda extraction preset).
- Fixed: Issue where the path generator was unable to create a valid path if the input file was at the root of a drive.
- Tech: Annotate the conversion presets to know if there are default preset or user preset in order to improve the upgrade process.
## Version 0.6
- New: Possibility to encode videos using H.264 video codec and AAC audio codec in a mp4 container (more portable than mkv).
- New: Support new image input file formats: psd, tga, svg and exr.
- New: Support new video input file format: m4v.
- New: Possibility to rotate images and videos.
- New: Remove restriction on image size to convert to ico file format (it is now possible to convert all images to ico).
- New: Add "Clamp to power of 2 size" option in image conversion.
- New: Support input images encoded in 16 bits or 32 bits per color channel.
- Fixed: Issue where the installer detects the utilisation of the extension dll in explorer, ask the user to restart it and fail to do it.
- Fixed: Issue where it is impossible to delete a conversion preset defined in default settings.
- Fixed: Issue where the Windows context menu does not contain user preset after an application upgrade.
- Fixed: Issue where some registry keys remain after file converter uninstallation.
- Fixed: Issue where aac bitrate was not saved.
- Fixed: Issue where settings serialization version was not updated.
- Change: Allow the user to scale images until 1600% size (useful to scale pixel art images).
## Version 0.5
- New: Software update system. The application now checks if a new version of File Converter is available.
- New: Possibility to scale images and videos.
+37
View File
@@ -10,6 +10,7 @@
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ABSTRACT_ACCESSORHOLDER_ON_SINGLE_LINE/@EntryValue">False</s:Boolean>
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_ACCESSOR_ATTRIBUTE_ON_SAME_LINE/@EntryValue">False</s:Boolean>
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_ACCESSOR_ON_SINGLE_LINE/@EntryValue">False</s:Boolean>
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_LINES/@EntryValue">False</s:Boolean>
<s:String x:Key="/Default/CodeStyle/CSharpVarKeywordUsage/ForBuiltInTypes/@EntryValue">UseExplicitType</s:String>
<s:String x:Key="/Default/CodeStyle/CSharpVarKeywordUsage/ForOtherTypes/@EntryValue">UseExplicitType</s:String>
<s:String x:Key="/Default/CodeStyle/CSharpVarKeywordUsage/ForSimpleTypes/@EntryValue">UseExplicitType</s:String>
@@ -20,6 +21,42 @@
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=MethodPropertyEvent/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb_AaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FCONSTRUCTOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FFUNCTION/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FGLOBAL_005FVARIABLE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FLABEL/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FLOCAL_005FVARIABLE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FOBJECT_005FPROPERTY_005FOF_005FFUNCTION/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FPARAMETER/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FCLASS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FENUM/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FENUM_005FMEMBER/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FINTERFACE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="I" Suffix="" Style="AaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FINTERFACE_005FFOR_005FJS_005FGLOBAL_005FVARIABLE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FMODULE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FMODULE_005FEXPORTED/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FMODULE_005FLOCAL/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPRIVATE_005FMEMBER_005FACCESSOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPRIVATE_005FSTATIC_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPRIVATE_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPRIVATE_005FTYPE_005FMETHOD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPROTECTED_005FMEMBER_005FACCESSOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPROTECTED_005FSTATIC_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPROTECTED_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPROTECTED_005FTYPE_005FMETHOD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPUBLIC_005FMEMBER_005FACCESSOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPUBLIC_005FSTATIC_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPUBLIC_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPUBLIC_005FTYPE_005FMETHOD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FTYPE_005FPARAMETER/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="T" Suffix="" Style="AaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FHTML_005FCONTROL/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FTAG_005FNAME/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FTAG_005FPREFIX/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=NAMESPACE_005FALIAS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FRESOURCE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/UpdatesManger/IsDownloadUpdateDataAllowed/@EntryValue">False</s:Boolean></wpf:ResourceDictionary>
-30
View File
@@ -1,30 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<?if $(var.Platform) = x64 ?>
<?define Win64 = "yes" ?>
<?else ?>
<?define Win64 = "no" ?>
<?endif ?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Fragment>
<DirectoryRef Id="INSTALLFOLDER">
<Component Id="FileConverterExtension.dll" Guid="{FEF385C4-C43F-44F9-92E2-06578A8BD96E}" Win64="$(var.Win64)">
<Class Id="{AF9B72B5-F4E4-44B0-A3D9-B55B748EFE90}" Context="InprocServer32" Description="FileConverterExtension.FileConverterExtension" ThreadingModel="both" ForeignServer="mscoree.dll">
<ProgId Id="FileConverterExtension.FileConverterExtension" Description="FileConverterExtension.FileConverterExtension" />
</Class>
<File Id="FileConverterExtension.dll" KeyPath="yes" Source="..\Application\FileConverterExtension\bin\$(var.Configuration)\FileConverterExtension.dll" />
<RegistryValue Root="HKCR" Key="*\shellex\ContextMenuHandlers\FileConverterExtension" Value="{af9b72b5-f4e4-44b0-a3d9-b55b748efe90}" Type="string" Action="write" />
<RegistryValue Root="HKCR" Key="CLSID\{AF9B72B5-F4E4-44B0-A3D9-B55B748EFE90}\Implemented Categories\{62C8FE65-4EBB-45e7-B440-6E39B2CDBF29}" Value="" Type="string" Action="write" />
<RegistryValue Root="HKCR" Key="CLSID\{AF9B72B5-F4E4-44B0-A3D9-B55B748EFE90}\InprocServer32\1.0.0.0" Name="Class" Value="FileConverterExtension.FileConverterExtension" Type="string" Action="write" />
<RegistryValue Root="HKCR" Key="CLSID\{AF9B72B5-F4E4-44B0-A3D9-B55B748EFE90}\InprocServer32\1.0.0.0" Name="Assembly" Value="FileConverterExtension, Version=1.0.0.0, Culture=neutral, PublicKeyToken=15400b1c4b948c8a" Type="string" Action="write" />
<RegistryValue Root="HKCR" Key="CLSID\{AF9B72B5-F4E4-44B0-A3D9-B55B748EFE90}\InprocServer32\1.0.0.0" Name="RuntimeVersion" Value="v4.0.30319" Type="string" Action="write" />
<RegistryValue Root="HKCR" Key="CLSID\{AF9B72B5-F4E4-44B0-A3D9-B55B748EFE90}\InprocServer32\1.0.0.0" Name="CodeBase" Value="file:///[#FileConverterExtension.dll]" Type="string" Action="write" />
<RegistryValue Root="HKCR" Key="CLSID\{AF9B72B5-F4E4-44B0-A3D9-B55B748EFE90}\InprocServer32" Name="Class" Value="FileConverterExtension.FileConverterExtension" Type="string" Action="write" />
<RegistryValue Root="HKCR" Key="CLSID\{AF9B72B5-F4E4-44B0-A3D9-B55B748EFE90}\InprocServer32" Name="Assembly" Value="FileConverterExtension, Version=1.0.0.0, Culture=neutral, PublicKeyToken=15400b1c4b948c8a" Type="string" Action="write" />
<RegistryValue Root="HKCR" Key="CLSID\{AF9B72B5-F4E4-44B0-A3D9-B55B748EFE90}\InprocServer32" Name="RuntimeVersion" Value="v4.0.30319" Type="string" Action="write" />
<RegistryValue Root="HKCR" Key="CLSID\{AF9B72B5-F4E4-44B0-A3D9-B55B748EFE90}\InprocServer32" Name="CodeBase" Value="file:///[#FileConverterExtension.dll]" Type="string" Action="write" />
</Component>
</DirectoryRef>
</Fragment>
</Wix>
-1
View File
@@ -1 +0,0 @@
"C:\Program Files (x86)\Wix Toolset v3.9\bin\Heat.exe" file "..\Application\FileConverterExtension\bin\Release\FileConverterExtension.dll" -dr INSTALLFOLDER -srd -gg -sfrag -suid -out "Extension.wxs" -b "..\Application\FileConverterExtension\bin\Release\"
+3 -1
View File
@@ -30,7 +30,6 @@
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
</PropertyGroup>
<ItemGroup>
<Compile Include="Extension.wxs" />
<Compile Include="Product.wxs" />
</ItemGroup>
<ItemGroup>
@@ -49,6 +48,9 @@
<RefTargetDir>INSTALLFOLDER</RefTargetDir>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Content Include="packages.config" />
</ItemGroup>
<Import Project="$(WixTargetsPath)" />
<!--
To modify your build process, add your task inside one of the targets below and uncomment it.
+45 -97
View File
@@ -12,12 +12,13 @@
<!-- Upgrade documentation: http://wixtoolset.org/documentation/manual/v3/howtos/updates/major_upgrade.html -->
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Product Id="*" Name="$(var.ProductName)" Language="1033" Version="0.5.0" Manufacturer="AAllard" UpgradeCode="e3ca717b-a897-418a-bbef-5c7e35c76e4b">
<Product Id="*" Name="$(var.ProductName)" Language="1033" Version="0.7" Manufacturer="AAllard" UpgradeCode="e3ca717b-a897-418a-bbef-5c7e35c76e4b">
<Package Id="*" InstallerVersion="200" Compressed="yes" InstallScope="perMachine" Platform="x64" />
<Icon Id="icon.ico" SourceFile="..\Resources\ApplicationIcon.ico"/>
<Property Id="ARPPRODUCTICON" Value="icon.ico" />
<SetProperty Id="ARPINSTALLLOCATION" Value="[ApplicationFolder]" After="CostFinalize" />
<MajorUpgrade Schedule="afterInstallInitialize" DowngradeErrorMessage="A later version of [ProductName] is already installed. Setup will now exit." />
<Media Id="1" Cabinet="CabFile.cab" EmbedCab="yes" />
@@ -26,13 +27,21 @@
<ComponentGroupRef Id="ProductComponents" />
</Feature>
<Feature Id="ShellExtensionFeature" Title="ShellExtension" Level="1" AllowAdvertise="no">
<ComponentRef Id="FileConverterExtension.dll" />
</Feature>
<CustomAction Id="InstallShell" FileKey="srm.exe" ExeCommand='install "[INSTALLFOLDER]\FileConverterExtension.dll" -codebase' Execute="deferred" Return="check" Impersonate="no" />
<CustomAction Id="UninstallShell" FileKey="srm.exe" ExeCommand='uninstall "[INSTALLFOLDER]\FileConverterExtension.dll"' Execute="deferred" Return="check" Impersonate="no" />
<CustomAction Id='PostInstallInit' FileKey='FileConverter.exe' ExeCommand='--post-install-init' Return='asyncWait' />
<InstallExecuteSequence>
<Custom Action="InstallShell" After="InstallFiles">NOT Installed</Custom>
<Custom Action="UninstallShell" Before="RemoveFiles">(NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")</Custom>
<Custom Action="PostInstallInit" After="InstallFinalize">NOT Installed</Custom>
</InstallExecuteSequence>
<UIRef Id="WixUI_InstallDir" />
<Property Id="MSIUSEREALADMINDETECTION" Value="1" />
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER" />
<Property Id="MSIRESTARTMANAGERCONTROL" Value="Disable" /> <!-- This avoid an issue where the installer detect the utilisation of the extension dll in explorer and then, ask to the user to restart these applications. The restart fails. -->
<WixVariable Id="WixUILicenseRtf" Value="License.rtf" />
<WixVariable Id="WixUIBannerBmp" Value="..\Resources\Installer\Banner.bmp" />
<WixVariable Id="WixUIDialogBmp" Value="..\Resources\Installer\UI.bmp" />
@@ -52,21 +61,42 @@
<Fragment>
<ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
<!-- Resources -->
<!-- Application -->
<Component Guid="{142FBD60-90A7-4753-95CE-7B2A2E20B785}" Win64="$(var.Win64)">
<File Id="FileConverter.exe" Source="$(var.FileConverter.TargetPath)" KeyPath="yes" />
</Component>
<!-- Extension -->
<Component Guid="{AA5EA6F7-C443-488B-8E48-7CF000B9AD2A}" Win64="$(var.Win64)">
<File Id="FileConverterExtension.dll" KeyPath="yes" Source="..\Application\FileConverterExtension\bin\$(var.Configuration)\FileConverterExtension.dll" />
</Component>
<Component Guid="{9BF0AC45-A586-41C9-BA93-6048B46DA65F}" Win64="$(var.Win64)">
<File Id="SharpShell.dll" KeyPath="yes" Source="..\Middleware\SharpShell\SharpShell.dll" />
<File Id="SharpShell.dll" KeyPath="yes" Source="..\packages\SharpShell.2.2.0.0\lib\net40\SharpShell.dll" />
</Component>
<Component Guid="{EC580BEF-F962-42BD-B46D-4E4C126F2641}" Win64="$(var.Win64)">
<File Id="srm.exe" Source="..\packages\SharpShellTools.2.2.0.0\lib\srm.exe" KeyPath="yes" />
</Component>
<!-- Third parties -->
<Component Guid="{1790B82E-86BC-4B95-AA1D-9859FF3B6CA4}" Win64="$(var.Win64)">
<File Source="..\Middleware\ffmpeg.exe" KeyPath="yes" />
</Component>
<Component Guid="{C59B7F72-D8D6-47A3-B1D9-515CBC9FCE6F}" Win64="$(var.Win64)">
<File Id="Magick.NET.dll" KeyPath="yes" Source="..\Application\FileConverter\bin\$(var.Configuration)\Magick.NET-Q16-AnyCPU.dll" />
</Component>
<Component Guid="{E1B1C09C-B089-40D8-859B-0E55F640CAE1}" Win64="$(var.Win64)">
<File Id="Markdown.Xaml.dll" KeyPath="yes" Source="..\Middleware\Markdown.Xaml.dll" />
</Component>
<Component Guid="{AA5EA6F7-C443-488B-8E48-7CF000B9AD2A}" Win64="$(var.Win64)">
<File Source="$(var.FileConverter.TargetPath)" KeyPath="yes" />
<Component Guid="{55CD0B47-D5B0-4F0C-A54E-3E11DF345B48}" Win64="$(var.Win64)">
<File Id="Ripper.dll" KeyPath="yes" Source="..\Middleware\Ripper.dll" />
</Component>
<Component Guid="{1790B82E-86BC-4B95-AA1D-9859FF3B6CA4}" Win64="$(var.Win64)">
<File Source="..\Middleware\ffmpeg.exe" KeyPath="yes" />
<Component Guid="{3CE6CF1B-431C-41FD-8381-3F73EDAF7B8A}" Win64="$(var.Win64)">
<File Id="yeti.mmedia.dll" KeyPath="yes" Source="..\Middleware\yeti.mmedia.dll" />
</Component>
<!-- Configuration and documentation -->
<Component Guid="{86AEF5B3-C25B-4662-BAEF-20969D1821A5}" Win64="$(var.Win64)">
<File Source="..\Application\FileConverter\Settings.xml" KeyPath="yes" />
<File Source="..\Application\FileConverter\Settings.default.xml" KeyPath="yes" />
</Component>
<Component Guid="{A5158756-A107-4010-9E2F-3C0333F5A5F6}" Win64="$(var.Win64)">
<File Source="..\README.md" KeyPath="yes" />
@@ -77,94 +107,12 @@
<Component Guid="{6378238B-E44F-414B-A7AE-7E72CFA8616D}" Win64="$(var.Win64)">
<File Source="..\LICENSE.md" KeyPath="yes" />
</Component>
<Component Guid="{55CD0B47-D5B0-4F0C-A54E-3E11DF345B48}" Win64="$(var.Win64)">
<File Id="Ripper.dll" KeyPath="yes" Source="..\Middleware\Ripper.dll" />
</Component>
<Component Guid="{3CE6CF1B-431C-41FD-8381-3F73EDAF7B8A}" Win64="$(var.Win64)">
<File Id="yeti.mmedia.dll" KeyPath="yes" Source="..\Middleware\yeti.mmedia.dll" />
</Component>
<!-- Registry entries -->
<Component Id="RegistryEntries" Guid="{C3EF3D67-0206-4DBD-B2EA-78FF2E290093}">
<RegistryKey Root="HKCU" Key="Software\FileConverter">
<RegistryKey Root="HKCU" Key="Software\FileConverter" Action="createAndRemoveOnUninstall">
<RegistryValue Name="Path" Type="string" Value="[INSTALLFOLDER]FileConverter.exe"/>
<RegistryValue Name="CompatibleInputExtensions" Type="string" Value="3gp;aac;aiff;ape;avi;bik;bmp;cda;flac;flv;ico;jpg;jpeg;m4a;mkv;mov;mp3;mp4;ogg;png;tiff;wav;webm;wma;wmv"/>
</RegistryKey>
<RegistryKey Root="HKCU" Key="Software\FileConverter\3gp">
<RegistryValue Name="Presets" Type="string" Value="To Mkv;To Mkv (low quality);To Avi;To Ogg;To Flac;To Wav;To Mp3;To Aac"/>
</RegistryKey>
<RegistryKey Root="HKCU" Key="Software\FileConverter\aac">
<RegistryValue Name="Presets" Type="string" Value="To Ogg;To Wav;To Mp3"/>
</RegistryKey>
<RegistryKey Root="HKCU" Key="Software\FileConverter\aiff">
<RegistryValue Name="Presets" Type="string" Value="To Ogg;To Wav;To Mp3;To Aac"/>
</RegistryKey>
<RegistryKey Root="HKCU" Key="Software\FileConverter\ape">
<RegistryValue Name="Presets" Type="string" Value="To Ogg;To Flac;To Wav;To Mp3;To Aac"/>
</RegistryKey>
<RegistryKey Root="HKCU" Key="Software\FileConverter\avi">
<RegistryValue Name="Presets" Type="string" Value="To Mkv;To Mkv (low quality);To Avi;To Ogg;To Flac;To Wav;To Mp3;To Aac"/>
</RegistryKey>
<RegistryKey Root="HKCU" Key="Software\FileConverter\bik">
<RegistryValue Name="Presets" Type="string" Value="To Mkv;To Mkv (low quality);To Avi;To Ogg;To Flac;To Wav;To Mp3;To Aac"/>
</RegistryKey>
<RegistryKey Root="HKCU" Key="Software\FileConverter\bmp">
<RegistryValue Name="Presets" Type="string" Value="To Png;To Jpg;To Ico (max 256x256);To small Png"/>
</RegistryKey>
<RegistryKey Root="HKCU" Key="Software\FileConverter\cda">
<RegistryValue Name="Presets" Type="string" Value="Extract CDA to Flac;Extract CDA to Ogg;Extract CDA to Mp3"/>
</RegistryKey>
<RegistryKey Root="HKCU" Key="Software\FileConverter\flac">
<RegistryValue Name="Presets" Type="string" Value="To Ogg;To Wav;To Mp3;To Aac"/>
</RegistryKey>
<RegistryKey Root="HKCU" Key="Software\FileConverter\flv">
<RegistryValue Name="Presets" Type="string" Value="To Mkv;To Mkv (low quality);To Avi;To Ogg;To Flac;To Wav;To Mp3;To Aac"/>
</RegistryKey>
<RegistryKey Root="HKCU" Key="Software\FileConverter\ico">
<RegistryValue Name="Presets" Type="string" Value="To Png;To Jpg"/>
</RegistryKey>
<RegistryKey Root="HKCU" Key="Software\FileConverter\jpeg">
<RegistryValue Name="Presets" Type="string" Value="To Png;To Ico (max 256x256);To small Png"/>
</RegistryKey>
<RegistryKey Root="HKCU" Key="Software\FileConverter\jpg">
<RegistryValue Name="Presets" Type="string" Value="To Png;To Ico (max 256x256);To small Png"/>
</RegistryKey>
<RegistryKey Root="HKCU" Key="Software\FileConverter\m4a">
<RegistryValue Name="Presets" Type="string" Value="To Ogg;To Wav;To Mp3;To Aac"/>
</RegistryKey>
<RegistryKey Root="HKCU" Key="Software\FileConverter\mkv">
<RegistryValue Name="Presets" Type="string" Value="To Mkv;To Mkv (low quality);To Avi;To Ogg;To Flac;To Wav;To Mp3;To Aac"/>
</RegistryKey>
<RegistryKey Root="HKCU" Key="Software\FileConverter\mov">
<RegistryValue Name="Presets" Type="string" Value="To Mkv;To Mkv (low quality);To Avi;To Ogg;To Flac;To Wav;To Mp3;To Aac"/>
</RegistryKey>
<RegistryKey Root="HKCU" Key="Software\FileConverter\mp3">
<RegistryValue Name="Presets" Type="string" Value="To Ogg;To Wav;To Aac"/>
</RegistryKey>
<RegistryKey Root="HKCU" Key="Software\FileConverter\mp4">
<RegistryValue Name="Presets" Type="string" Value="To Mkv;To Mkv (low quality);To Avi;To Ogg;To Flac;To Wav;To Mp3;To Aac"/>
</RegistryKey>
<RegistryKey Root="HKCU" Key="Software\FileConverter\ogg">
<RegistryValue Name="Presets" Type="string" Value="To Wav;To Mp3;To Aac"/>
</RegistryKey>
<RegistryKey Root="HKCU" Key="Software\FileConverter\png">
<RegistryValue Name="Presets" Type="string" Value="To Jpg;To Ico (max 256x256);To small Png"/>
</RegistryKey>
<RegistryKey Root="HKCU" Key="Software\FileConverter\tiff">
<RegistryValue Name="Presets" Type="string" Value="To Png;To Jpg;To Ico (max 256x256);To small Png"/>
</RegistryKey>
<RegistryKey Root="HKCU" Key="Software\FileConverter\wav">
<RegistryValue Name="Presets" Type="string" Value="To Ogg;To Flac;To Mp3;To Aac"/>
</RegistryKey>
<RegistryKey Root="HKCU" Key="Software\FileConverter\webm">
<RegistryValue Name="Presets" Type="string" Value="To Mkv;To Mkv (low quality);To Avi;To Ogg;To Flac;To Wav;To Mp3;To Aac"/>
</RegistryKey>
<RegistryKey Root="HKCU" Key="Software\FileConverter\wma">
<RegistryValue Name="Presets" Type="string" Value="To Ogg;To Wav;To Mp3;To Aac"/>
</RegistryKey>
<RegistryKey Root="HKCU" Key="Software\FileConverter\wmv">
<RegistryValue Name="Presets" Type="string" Value="To Mkv;To Mkv (low quality);To Avi;To Ogg;To Flac;To Wav;To Mp3;To Aac"/>
<RegistryValue Name="CompatibleInputExtensions" Type="string" Value="3gp;aac;aiff;ape;avi;bik;bmp;cda;exr;flac;flv;gif;ico;jpg;jpeg;m4a;m4v;mkv;mov;mp3;mp4;mpeg;oga;ogg;ogv;png;psd;svg;tga;tiff;vob;wav;webm;wma;wmv"/>
</RegistryKey>
</Component>
</ComponentGroup>
+4
View File
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="SharpShellTools" version="2.2.0.0" />
</packages>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large. Load diff
Binary file not shown.
+5 -13
View File
@@ -5,19 +5,7 @@
You can download it here: [www.file-converter.org](http://file-converter.org/?from=readme.md).
## Supported file formats
Category | Supported output formats | Compatible input formats
------------|---------------------------|--------------------------------------------------------------------------------------------
Audio | aac, flac, mp3, ogg, wav | 3gp, aiff, ape, avi, bik, cda, flac, flv, m4a, mkv, mov, mp3, mp4, ogg, wav, wma, webm, wmv
Video | avi, mkv | 3gp, avi, bik, flv, mkv, mov, mp4, webm, wmv
Image | ico, jpg, png, | bmp, ico, jpg, jpeg, png, tiff
*Note: If your source file is a video, the conversion to an audio format will extract the audio part of the video.*
*Note 2: The mkv output file format encodes video using H.264 encoder for video and AAC encoder for audio.*
*Note 3: The avi output file format encodes video using Xvid encoder for video and Mp3 encoder for audio.*
You can find more information about what's in File converter and how to use it on the [wiki](https://github.com/Tichau/FileConverter/wiki).
## Thanks
@@ -26,6 +14,10 @@ File converter uses the following middlewares:
**ffmpeg** as file conversion software.
Thanks to ffmpeg devs for this awesome open source file conversion tool. [Web site link](https://www.ffmpeg.org/)
**ImageMagick** as image edition and conversion software.
Thanks to image magick devs for this awesome open source image edition software suite. [Web site link](http://imagemagick.net/)
And thanks to dlemstra for the C# wrapper of this software. [CodePlex link](https://magick.codeplex.com/)
**SharpShell** to easily create windows context menu extensions.
Thanks to Dave Kerr for his work on SharpShell. [CodePlex link](https://sharpshell.codeplex.com/)
Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

+66
View File
@@ -0,0 +1,66 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="48"
height="48"
viewBox="0 0 48.000001 48.000001"
id="svg2"
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="CancelIcon.svg"
inkscape:export-filename="C:\Users\aallard\Documents\GitHub\FileConverter\Resources\CancelIcon.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
<defs
id="defs4" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="8"
inkscape:cx="29.858285"
inkscape:cy="23.115955"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
units="px"
inkscape:window-width="1853"
inkscape:window-height="1058"
inkscape:window-x="59"
inkscape:window-y="-8"
inkscape:window-maximized="1" />
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-1004.3622)">
<path
style="opacity:1;fill:#d32f2f;fill-opacity:0.94117647;stroke:none"
d="M 24 0 A 24 24 0 0 0 0 24 A 24 24 0 0 0 24 48 A 24 24 0 0 0 48 24 A 24 24 0 0 0 24 0 z M 24 4 A 20 20 0 0 1 44 24 A 20 20 0 0 1 40.560547 35.203125 L 10.087891 9.6328125 A 20 20 0 0 1 24 4 z M 7.4394531 12.796875 L 37.912109 38.367188 A 20 20 0 0 1 24 44 A 20 20 0 0 1 4 24 A 20 20 0 0 1 7.4394531 12.796875 z "
transform="translate(0,1004.3622)"
id="path3338" />
</g>
</svg>

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 551 B

+88
View File
@@ -0,0 +1,88 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="48"
height="48"
viewBox="0 0 48.000001 48.000001"
id="svg2"
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="FailIcon.svg"
inkscape:export-filename="C:\Users\Adrien\Documents\GitHub\FileConverter\Resources\FailIcon.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
<defs
id="defs4" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="8"
inkscape:cx="29.858285"
inkscape:cy="28.115955"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
units="px"
inkscape:window-width="1289"
inkscape:window-height="745"
inkscape:window-x="69"
inkscape:window-y="-8"
inkscape:window-maximized="1" />
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-1004.3622)">
<flowRoot
xml:space="preserve"
id="flowRoot4348"
style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#f44336;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
transform="translate(0,1004.3622)"><flowRegion
id="flowRegion4350"><rect
id="rect4352"
width="24"
height="44.75"
x="12"
y="2.625"
style="fill:#f44336;fill-opacity:1;" /></flowRegion><flowPara
id="flowPara4354">!</flowPara></flowRoot> <flowRoot
xml:space="preserve"
id="flowRoot4356"
style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#d32f2f;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
transform="matrix(1.6923977,0,0,1.6923977,15.004532,977.45445)"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"><flowRegion
id="flowRegion4358"><rect
id="rect4360"
width="49.5"
height="47.5"
x="0.875"
y="0.875"
style="fill:#d32f2f;fill-opacity:1;" /></flowRegion><flowPara
id="flowPara4362"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'MS UI Gothic';-inkscape-font-specification:'MS UI Gothic';fill:#d32f2f;fill-opacity:1;">!</flowPara></flowRoot> </g>
</svg>

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 376 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 37 KiB

After

Width:  |  Height:  |  Size: 40 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

+67
View File
@@ -0,0 +1,67 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="48"
height="48"
viewBox="0 0 48.000001 48.000001"
id="svg2"
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="SuccessIcon.svg"
inkscape:export-filename="C:\Users\Adrien\Documents\GitHub\FileConverter\Resources\SuccessIcon.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
<defs
id="defs4" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="8"
inkscape:cx="29.858285"
inkscape:cy="28.115955"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
units="px"
inkscape:window-width="1289"
inkscape:window-height="745"
inkscape:window-x="69"
inkscape:window-y="-8"
inkscape:window-maximized="1" />
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-1004.3622)">
<path
style="fill:none;fill-rule:evenodd;stroke:#4caf50;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 2.125,1031.1122 13.625,19 29.875,-43.5"
id="path3342"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccc" />
</g>
</svg>

After

Width:  |  Height:  |  Size: 2.1 KiB

+2 -2
View File
@@ -1,4 +1,4 @@
<Version>
<Latest Major="0" Minor="4" Patch="1"/>
<URL>http://github.com/Tichau/FileConverter/releases/download/v0.4/FileConverter-0.4-x64-setup.msi</URL>
<Latest Major="0" Minor="6" Patch="0"/>
<URL>https://github.com/Tichau/FileConverter/releases/download/v0.6/FileConverter-0.6-x64-setup.msi</URL>
</Version>