diff options
| author | sr55 <[email protected]> | 2015-05-09 18:26:07 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2015-05-09 18:26:07 +0000 |
| commit | 6e59c5d576fc695f59bf661e752c7f004ac6133b (patch) | |
| tree | 20373e59445c90320d0ac630c4d954af866ea6c6 /win | |
| parent | 5f03dc5147802546924446fb0d1d4a6ce1cd2e73 (diff) | |
WinGui: Remove some test code.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7168 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win')
| -rw-r--r-- | win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstance.cs | 4 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs | 25 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs | 2 |
3 files changed, 5 insertions, 26 deletions
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstance.cs b/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstance.cs index e46f5b30b..b44136095 100644 --- a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstance.cs +++ b/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstance.cs @@ -48,12 +48,12 @@ namespace HandBrake.ApplicationServices.Interop /// <summary>
/// The number of MS between status polls when scanning.
/// </summary>
- private const double ScanPollIntervalMs = 200;
+ private const double ScanPollIntervalMs = 250;
/// <summary>
/// The number of MS between status polls when encoding.
/// </summary>
- private const double EncodePollIntervalMs = 200;
+ private const double EncodePollIntervalMs = 250;
/// <summary>
/// The native handle to the HandBrake instance.
diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs index 41e280b9a..d5ed439bb 100644 --- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs @@ -2258,35 +2258,14 @@ namespace HandBrakeWPF.ViewModels {
if (this.queueProcessor.EncodeService.IsEncoding)
{
- long length = 0;
- double filesize = 0;
- try
- {
- length = new System.IO.FileInfo(this.Destination).Length;
- if (length != 0)
- {
- length = length / 1024 / 1024; // MB
- }
-
- double portionLeft = 100 / e.PercentComplete;
-
- filesize = Math.Round( length * portionLeft, 1);
-
- }
- catch (Exception ee)
- {
- Debug.WriteLine(ee);
- }
-
this.ProgramStatusLabel =
- string.Format("{0:00.00}% FPS: {1:000.0} Avg FPS: {2:000.0} Time Remaining: {3} Elapsed: {4:hh\\:mm\\:ss} Filesize: {6}MB" + Resources.Main_JobsPending_addon,
+ string.Format("{0:00.00}% FPS: {1:000.0} Avg FPS: {2:000.0} Time Remaining: {3} Elapsed: {4:hh\\:mm\\:ss}" + Resources.Main_JobsPending_addon,
e.PercentComplete,
e.CurrentFrameRate,
e.AverageFrameRate,
e.EstimatedTimeLeft,
e.ElapsedTime,
- this.queueProcessor.Count,
- filesize);
+ this.queueProcessor.Count);
if (lastEncodePercentage != percent && this.windowsSeven.IsWindowsSeven)
{
diff --git a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs index 47cc4f6a3..6252f53f3 100644 --- a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs @@ -40,7 +40,7 @@ namespace HandBrakeWPF.ViewModels public class VideoViewModel : ViewModelBase, IVideoViewModel
{
/*
- * Hard Code "None" in the Models for Tune.
+ * Hard Code "None" in the Models for Tune.t
* Test Everything */
#region Constants and Fields
|