Skip to content

Commit

Permalink
Updated HandBrake x64 core to 1.0.0 .
Browse files Browse the repository at this point in the history
  • Loading branch information
RandomEngy committed Dec 29, 2016
1 parent 67fa7dc commit 4ab86a9
Show file tree
Hide file tree
Showing 9 changed files with 579 additions and 578 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ Installer/BuiltInstallers/*
Flags/*
packages/*
Import/*
HandBrakeInterop.XmlSerializers.dll
.vs
*.pdn
*/bin/*
Expand Down
Binary file modified Lib/x64/hb.dll
Binary file not shown.
52 changes: 26 additions & 26 deletions VidCoder/App.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,19 +33,19 @@ public partial class App : Application
{
public static bool IsPrimaryInstance { get; private set; }

private static Mutex mutex;

static App()
{
if (CommonUtilities.Beta)
{
mutex = new Mutex(true, "VidCoderBetaPrimaryInstanceMutex");
}
else
{
mutex = new Mutex(true, "VidCoderPrimaryInstanceMutex");
}
}
private static Mutex mutex;

static App()
{
if (CommonUtilities.Beta)
{
mutex = new Mutex(true, "VidCoderBetaPrimaryInstanceMutex");
}
else
{
mutex = new Mutex(true, "VidCoderPrimaryInstanceMutex");
}
}

protected override void OnStartup(StartupEventArgs e)
{
Expand All @@ -54,14 +54,14 @@ protected override void OnStartup(StartupEventArgs e)
#endif
base.OnStartup(e);

OperatingSystem OS = Environment.OSVersion;
if (OS.Version.Major <= 5)
OperatingSystem OS = Environment.OSVersion;
if (OS.Version.Major <= 5)
{
MessageBox.Show(MiscRes.UnsupportedOSError, MiscRes.NoticeMessageTitle, MessageBoxButton.OK, MessageBoxImage.Warning);
MessageBox.Show(MiscRes.UnsupportedOSError, MiscRes.NoticeMessageTitle, MessageBoxButton.OK, MessageBoxImage.Warning);
this.Shutdown();
return;
}
this.Shutdown();
return;
}

#if PSEUDOLOCALIZER_ENABLED
Delay.PseudoLocalizer.Enable(typeof(CommonRes));
Expand All @@ -79,17 +79,17 @@ protected override void OnStartup(StartupEventArgs e)

JsonSettings.SetDefaultSerializationSettings();

// Takes about 50ms
Config.EnsureInitialized(Database.Connection);
// Takes about 50ms
Config.EnsureInitialized(Database.Connection);

var interfaceLanguageCode = Config.InterfaceLanguageCode;
if (!string.IsNullOrWhiteSpace(interfaceLanguageCode))
{
var cultureInfo = new CultureInfo(interfaceLanguageCode);
Thread.CurrentThread.CurrentCulture = cultureInfo;
Thread.CurrentThread.CurrentUICulture = cultureInfo;
CultureInfo.DefaultThreadCurrentCulture = cultureInfo;
CultureInfo.DefaultThreadCurrentUICulture = cultureInfo;
CultureInfo.DefaultThreadCurrentCulture = cultureInfo;
CultureInfo.DefaultThreadCurrentUICulture = cultureInfo;
}

if (Config.UseCustomPreviewFolder && FileUtilities.HasWriteAccessOnFolder(Config.PreviewOutputFolder))
Expand Down Expand Up @@ -117,10 +117,10 @@ protected override void OnStartup(StartupEventArgs e)
Ioc.Get<IWindowManager>().OpenWindow(mainVM);
mainVM.OnLoaded();

if (e.Args.Length > 0)
{
mainVM.HandlePaths(new List<string> { e.Args[0] });
}
if (e.Args.Length > 0)
{
mainVM.HandlePaths(new List<string> { e.Args[0] });
}

if (!Utilities.IsPortable && IsPrimaryInstance)
{
Expand Down
2 changes: 1 addition & 1 deletion VidCoder/Model/UpdateState.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ public enum UpdateState
UpToDate,
InstallerReady,
Failed,
NotSupported32BitOS
NotSupported32BitOS
}
}
Loading

0 comments on commit 4ab86a9

Please sign in to comment.