summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
Diffstat (limited to 'win')
-rw-r--r--win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs28
-rw-r--r--win/CS/HandBrakeWPF/HandBrakeWPF.csproj2
-rw-r--r--win/CS/HandBrakeWPF/UserSettingConstants.cs5
-rw-r--r--win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs26
-rw-r--r--win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs11
-rw-r--r--win/CS/HandBrakeWPF/Views/OptionsView.xaml3
-rw-r--r--win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml3
7 files changed, 18 insertions, 60 deletions
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs
index 6c4e26ede..1bc9445f3 100644
--- a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs
+++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs
@@ -829,13 +829,13 @@ namespace HandBrake.Interop
IntPtr titleSetPtr = HBFunctions.hb_get_title_set(this.hbHandle);
hb_title_set_s titleSet = InteropUtilities.ToStructureFromPtr<hb_title_set_s>(titleSetPtr);
this.originalTitles = titleSet.list_title.ToListFromHandBrakeList<hb_title_s>();
-
- foreach (hb_title_s title in this.originalTitles)
- {
- this.titles.Add(this.ConvertTitle(title));
- }
-
- if (this.originalTitles.Count > 0)
+
+ foreach (hb_title_s title in this.originalTitles)
+ {
+ this.titles.Add(this.ConvertTitle(title));
+ }
+
+ if (this.originalTitles.Count > 0)
{
this.featureTitle = titleSet.feature;
}
@@ -1874,13 +1874,13 @@ namespace HandBrake.Interop
AspectRatio = title.aspect,
AngleCount = title.angle_count,
VideoCodecName = title.video_codec_name,
- Framerate = ((double)title.rate) / title.rate_base,
- FramerateNumerator = title.rate,
- FramerateDenominator = title.rate_base,
- Path = Encoding.UTF8.GetString(title.path).TrimEnd('\0')
- };
-
- switch (title.type)
+ Framerate = ((double)title.rate) / title.rate_base,
+ FramerateNumerator = title.rate,
+ FramerateDenominator = title.rate_base,
+ Path = Encoding.UTF8.GetString(title.path).TrimEnd('\0')
+ };
+
+ switch (title.type)
{
case hb_title_type_anon.HB_STREAM_TYPE:
newTitle.InputType = InputType.Stream;
diff --git a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
index 3eb9c9faa..4fd168aee 100644
--- a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
+++ b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
@@ -74,7 +74,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug32|x86' ">
<DebugSymbols>true</DebugSymbols>
- <OutputPath>bin\x86\Debug31\</OutputPath>
+ <OutputPath>bin\x86\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
diff --git a/win/CS/HandBrakeWPF/UserSettingConstants.cs b/win/CS/HandBrakeWPF/UserSettingConstants.cs
index 77f45379f..80bebe4b3 100644
--- a/win/CS/HandBrakeWPF/UserSettingConstants.cs
+++ b/win/CS/HandBrakeWPF/UserSettingConstants.cs
@@ -256,11 +256,6 @@ namespace HandBrakeWPF
/// </summary>
public const string ClearCompletedFromQueue = "ClearCompletedFromQueue";
- /// <summary>
- /// The enable static preview.
- /// </summary>
- public const string EnableStaticPreview = "EnableStaticPreview";
-
#endregion
}
} \ No newline at end of file
diff --git a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
index 85e74ed20..bb303aef5 100644
--- a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
@@ -281,11 +281,6 @@ namespace HandBrakeWPF.ViewModels
private bool showAdvancedTab;
/// <summary>
- /// The enable static preview.
- /// </summary>
- private bool enableStaticPreview;
-
- /// <summary>
/// The remove punctuation.
/// </summary>
private bool removePunctuation;
@@ -1134,22 +1129,6 @@ namespace HandBrakeWPF.ViewModels
}
}
- /// <summary>
- /// Gets or sets a value indicating whether enable static preview.
- /// </summary>
- public bool EnableStaticPreview
- {
- get
- {
- return this.enableStaticPreview;
- }
- set
- {
- this.enableStaticPreview = value;
- this.NotifyOfPropertyChange(() => this.EnableStaticPreview);
- }
- }
-
#endregion
#region Video
@@ -1591,9 +1570,7 @@ namespace HandBrakeWPF.ViewModels
this.MinLength = this.userSettingService.GetUserSetting<int>(UserSettingConstants.MinScanDuration);
// Use dvdnav
- this.DisableLibdvdNav = userSettingService.GetUserSetting<bool>(UserSettingConstants.DisableLibDvdNav);
-
- this.EnableStaticPreview = userSettingService.GetUserSetting<bool>(UserSettingConstants.EnableStaticPreview);
+ this.DisableLibdvdNav = userSettingService.GetUserSetting<bool>(UserSettingConstants.DisableLibDvdNav);
int port;
int.TryParse(userSettingService.GetUserSetting<string>(UserSettingConstants.ServerPort), out port);
@@ -1652,7 +1629,6 @@ namespace HandBrakeWPF.ViewModels
userSettingService.SetUserSetting(UserSettingConstants.PreviewScanCount, this.SelectedPreviewCount);
userSettingService.SetUserSetting(UserSettingConstants.X264Step, double.Parse(this.SelectedGranulairty, CultureInfo.InvariantCulture));
userSettingService.SetUserSetting(UserSettingConstants.ShowAdvancedTab, this.ShowAdvancedTab);
- userSettingService.SetUserSetting(UserSettingConstants.EnableStaticPreview, this.EnableStaticPreview);
int value;
if (int.TryParse(this.MinLength.ToString(CultureInfo.InvariantCulture), out value))
diff --git a/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
index cc6421d28..d1ca9e65a 100644
--- a/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
@@ -324,17 +324,6 @@ namespace HandBrakeWPF.ViewModels
}
}
- /// <summary>
- /// Gets a value indicating whether is picture preview enabled.
- /// </summary>
- public bool IsPicturePreviewEnabled
- {
- get
- {
- return this.UserSettingService.GetUserSetting<bool>(UserSettingConstants.EnableStaticPreview);
- }
- }
-
#endregion
#region Task Properties
diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
index f891da8ee..20bea31e6 100644
--- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
@@ -331,8 +331,7 @@
<TextBlock Text="Alpha Features" FontSize="14" Margin="0,0,0,10"/>
<StackPanel Orientation="Vertical" Margin="20,0,0,0">
- <CheckBox Content="Enable Static Preview" Margin="0,5,0,0" IsChecked="{Binding EnableStaticPreview}" />
-
+
<CheckBox Content="Use LibHB for Encoding (uses hb.dll instead of HandBrakeCLI.exe)" Margin="0,5,0,0" IsChecked="{Binding EnableLibHb}" Visibility="Collapsed" />
<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">
diff --git a/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml b/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml
index 65d6dc1af..23f9885c7 100644
--- a/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml
@@ -153,8 +153,7 @@
</StackPanel>
<!-- Preview Panel -->
- <StackPanel Name="PreviewPanel" Margin="0,5,0,0" VerticalAlignment="Top" HorizontalAlignment="Stretch" Grid.Row="1" Grid.Column="0"
- Visibility="{Binding IsPicturePreviewEnabled, Converter={StaticResource boolToVisConverter}}">
+ <StackPanel Name="PreviewPanel" Margin="0,5,0,0" VerticalAlignment="Top" HorizontalAlignment="Stretch" Grid.Row="1" Grid.Column="0">
<Label Content="Output" FontWeight="Bold" />
<Grid Margin="5,0,0,0">
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-23 16:31:07 +0000