diff options
| author | sr55 <[email protected]> | 2014-05-18 19:56:12 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2014-05-18 19:56:12 +0000 |
| commit | ec522a70a2f4e584e486b9412a86a7440c2e6b50 (patch) | |
| tree | 0cc34641d2fdc3eaba8e154e3fb4d8a1de2fe6a6 /win/CS/HandBrakeWPF/ViewModels | |
| parent | 24203717648fcdeff506ac6aea100d746f7b487c (diff) | |
WinGui: Minor tidy up of options. Cleanup of some code warnings and some initial DPIAwareness code.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6198 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrakeWPF/ViewModels')
| -rw-r--r-- | win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs | 1 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs | 9 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs | 8 |
3 files changed, 6 insertions, 12 deletions
diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs index bcdb9ff27..6e6b21a1f 100644 --- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs @@ -2102,7 +2102,6 @@ namespace HandBrakeWPF.ViewModels {
this.IsEncoding = false;
-
Execute.OnUIThread(
() =>
{
diff --git a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs index 859763d3f..b279f95c5 100644 --- a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs @@ -160,7 +160,6 @@ namespace HandBrakeWPF.ViewModels }
}
-
/// <summary>
/// Gets or sets the subtitle behaviours.
/// </summary>
@@ -264,7 +263,6 @@ namespace HandBrakeWPF.ViewModels : LanguageUtilities.GetLanguageCodes(
this.SubtitleBehaviours.SelectedLangauges.ToArray());
-
List<Subtitle> availableTracks =
this.SourceTracks.Where(subtitle => iso6392Codes.Contains(subtitle.LanguageCodeClean)).ToList();
@@ -289,7 +287,6 @@ namespace HandBrakeWPF.ViewModels bool foundLanguage = false;
Subtitle track = sourceTrack;
-
foreach (var item in this.Task.SubtitleTracks)
{
if (item.SourceTrack != null && item.SourceTrack.LanguageCode != null && track.LanguageCode.Contains(item.SourceTrack.LanguageCode))
@@ -606,7 +603,11 @@ namespace HandBrakeWPF.ViewModels }
}
- this.Task.SubtitleTracks.Add(track);
+ var encodeTask = this.Task;
+ if (encodeTask != null)
+ {
+ encodeTask.SubtitleTracks.Add(track);
+ }
}
/// <summary>
diff --git a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs index 0f5a0e167..46fa83487 100644 --- a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs @@ -109,11 +109,6 @@ namespace HandBrakeWPF.ViewModels private int qsvPresetValue;
/// <summary>
- /// The extra arguments.
- /// </summary>
- private string extraArguments;
-
- /// <summary>
/// The can clear tracker.
/// </summary>
private bool canClear;
@@ -483,7 +478,7 @@ namespace HandBrakeWPF.ViewModels {
get
{
- return this.SelectedVideoEncoder == VideoEncoder.X264 || this.SelectedVideoEncoder == VideoEncoder.X265 ? "RF" : "QP";
+ return this.SelectedVideoEncoder == VideoEncoder.X264 || this.SelectedVideoEncoder == VideoEncoder.X265 ? "RF" : "QP";
}
}
@@ -965,7 +960,6 @@ namespace HandBrakeWPF.ViewModels }
}
-
/// <summary>
/// Gets or sets H265Profile.
/// </summary>
|