diff options
| -rw-r--r-- | win/CS/HandBrakeWPF/Services/EncodeServiceWrapper.cs | 2 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/UserSettingConstants.cs | 5 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs | 23 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/Views/OptionsView.xaml | 14 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/defaultsettings.xml | 8 |
5 files changed, 4 insertions, 48 deletions
diff --git a/win/CS/HandBrakeWPF/Services/EncodeServiceWrapper.cs b/win/CS/HandBrakeWPF/Services/EncodeServiceWrapper.cs index 6a3ab8070..bfcf24fc4 100644 --- a/win/CS/HandBrakeWPF/Services/EncodeServiceWrapper.cs +++ b/win/CS/HandBrakeWPF/Services/EncodeServiceWrapper.cs @@ -48,7 +48,7 @@ namespace HandBrakeWPF.Services /// </param>
public EncodeServiceWrapper(IUserSettingService userSettingService)
{
- var useLibHb = AppArguments.UseLibHb ? AppArguments.UseLibHb : userSettingService.GetUserSetting<bool>(UserSettingConstants.UseLibHb);
+ var useLibHb = true;
var useProcessIsolation =
userSettingService.GetUserSetting<bool>(UserSettingConstants.EnableProcessIsolation);
var port = userSettingService.GetUserSetting<string>(UserSettingConstants.ServerPort);
diff --git a/win/CS/HandBrakeWPF/UserSettingConstants.cs b/win/CS/HandBrakeWPF/UserSettingConstants.cs index e2e258c00..fb3f6a04b 100644 --- a/win/CS/HandBrakeWPF/UserSettingConstants.cs +++ b/win/CS/HandBrakeWPF/UserSettingConstants.cs @@ -107,11 +107,6 @@ namespace HandBrakeWPF public const string ServerPort = "ServerPort";
/// <summary>
- /// Enable the use of LibHb instead of HandBrakeCLI
- /// </summary>
- public const string UseLibHb = "UseLibHb";
-
- /// <summary>
/// Growl Encodes
/// </summary>
public const string GrowlEncode = "GrowlEncode";
diff --git a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs index 51e30fdb1..77132cf11 100644 --- a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs @@ -271,11 +271,6 @@ namespace HandBrakeWPF.ViewModels private int serverPort;
/// <summary>
- /// Backing field for EnableLibHb
- /// </summary>
- private bool enableLibHb;
-
- /// <summary>
/// The show advanced tab backing field.
/// </summary>
private bool showAdvancedTab;
@@ -1100,22 +1095,6 @@ namespace HandBrakeWPF.ViewModels /// <summary>
/// Gets or sets a value indicating whether enable lib hb.
/// </summary>
- public bool EnableLibHb
- {
- get
- {
- return this.enableLibHb;
- }
- set
- {
- this.enableLibHb = value;
- this.NotifyOfPropertyChange(() => this.EnableLibHb);
- }
- }
-
- /// <summary>
- /// Gets or sets a value indicating whether enable lib hb.
- /// </summary>
public bool ShowAdvancedTab
{
get
@@ -1567,7 +1546,6 @@ namespace HandBrakeWPF.ViewModels int.TryParse(userSettingService.GetUserSetting<string>(UserSettingConstants.ServerPort), out port);
this.ServerPort = port;
this.EnableProcessIsolation = userSettingService.GetUserSetting<bool>(UserSettingConstants.EnableProcessIsolation);
- this.EnableLibHb = userSettingService.GetUserSetting<bool>(UserSettingConstants.UseLibHb);
}
/// <summary>
@@ -1630,7 +1608,6 @@ namespace HandBrakeWPF.ViewModels userSettingService.SetUserSetting(UserSettingConstants.DisableLibDvdNav, this.DisableLibdvdNav);
userSettingService.SetUserSetting(UserSettingConstants.EnableProcessIsolation, this.EnableProcessIsolation);
userSettingService.SetUserSetting(UserSettingConstants.ServerPort, this.ServerPort.ToString(CultureInfo.InvariantCulture));
- userSettingService.SetUserSetting(UserSettingConstants.UseLibHb, this.EnableLibHb);
}
/// <summary>
diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml index f2fe2fa02..2315eea55 100644 --- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml +++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml @@ -328,19 +328,11 @@ <StackPanel Orientation="Vertical" Margin="0,10,0,20" Visibility="Visible">
- <TextBlock Text="Encode Engine" FontSize="14" Margin="0,0,0,10"/>
+ <TextBlock Text="Encode Engine" FontSize="14" Margin="0,0,0,10" Visibility="Collapsed"/>
<StackPanel Orientation="Vertical" Margin="20,0,0,0">
-
- <CheckBox Content="Use LibHB instead of HandBrakeCLI.exe for encoding." Margin="0,5,0,5" IsChecked="{Binding EnableLibHb}" />
- <TextBlock Text="LibHB" FontWeight="Bold" />
- <TextBlock Text="Accessing LibHB directly, allows the app to pause and restart encodes. Process isolation is not currently supported, so a crash will prevent the rest of the queue from completing."
- TextWrapping="Wrap" Margin="10,0,10,5"/>
- <TextBlock Text="HandBrakeCLI.exe" FontWeight="Bold" />
- <TextBlock Text="Using HandBrakeCLI.exe provides process isolation so a crash during an encode won't prevent the rest of the queue from completing. You won't however be able to pause encodes."
- TextWrapping="Wrap" Margin="10,0,10,5"/>
-
-
+
+
<CheckBox Content="Enable Process Isolation (Run Encodes via an intermediate service)" Margin="20,10,0,0" IsChecked="{Binding EnableProcessIsolation}" Visibility="Collapsed" />
<StackPanel Orientation="Horizontal" Margin="0,10,0,0" Visibility="Collapsed">
<TextBlock Text="Server Port:" VerticalAlignment="Center" />
diff --git a/win/CS/HandBrakeWPF/defaultsettings.xml b/win/CS/HandBrakeWPF/defaultsettings.xml index afffb4c8a..10424ed87 100644 --- a/win/CS/HandBrakeWPF/defaultsettings.xml +++ b/win/CS/HandBrakeWPF/defaultsettings.xml @@ -386,14 +386,6 @@ </item>
<item>
<key>
- <string>UseLibHb</string>
- </key>
- <value>
- <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">true</anyType>
- </value>
- </item>
- <item>
- <key>
<string>ShowAdvancedTab</string>
</key>
<value>
|