summaryrefslogtreecommitdiffstats
path: root/win/CS/HandBrakeWPF/Views
diff options
context:
space:
mode:
authorsr55 <[email protected]>2015-01-11 18:12:28 +0000
committersr55 <[email protected]>2015-01-11 18:12:28 +0000
commit04392778932f7e6f424039f30d775ac4e1fd7b2b (patch)
treefa07d529e0a7fbb720173f40ae925e492ab117cb /win/CS/HandBrakeWPF/Views
parent095576f3fbb5c96c9ef58fe45af9390bf718e1dd (diff)
WinGui: Make LibHB a first class citizen for encoding. (Now on by default). Update for JSON API changes. Bug fixes in subtitles and twopass encoding.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6732 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrakeWPF/Views')
-rw-r--r--win/CS/HandBrakeWPF/Views/OptionsView.xaml12
1 files changed, 10 insertions, 2 deletions
diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
index 900a7af7d..f2fe2fa02 100644
--- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
@@ -328,11 +328,19 @@
<StackPanel Orientation="Vertical" Margin="0,10,0,20" Visibility="Visible">
- <TextBlock Text="Alpha Features" FontSize="14" Margin="0,0,0,10"/>
+ <TextBlock Text="Encode Engine" FontSize="14" Margin="0,0,0,10"/>
<StackPanel Orientation="Vertical" Margin="20,0,0,0">
- <CheckBox Content="Use LibHB for Encoding (uses hb.dll instead of HandBrakeCLI.exe)" Margin="0,5,0,0" IsChecked="{Binding EnableLibHb}" />
+ <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" />