WinGui: Strip out some unused code.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6821 b64f7644-9d1e-0410-96f1-a4d463321fa5

5 files changed, 11 insertions, 142 deletions

diff --git a/win/CS/HandBrake.ApplicationServices/Services/Encode/LibEncode.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/LibEncode.cs
index 42f72f509..6bc9ed884 100644
--- a/win/CS/HandBrake.ApplicationServices/Services/Encode/LibEncode.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/Encode/LibEncode.cs
@@ -138,7 +138,7 @@ namespace HandBrake.ApplicationServices.Services.Encode
 

                 ServiceLogMessage("Scanning title for encoding ... ");

 

-                this.instance.StartScan(job.ScannedSourcePath, job.Configuration.PreviewScanCount, job.Task.Title);

+                this.instance.StartScan(job.ScannedSourcePath, job.Configuration.PreviewScanCount, TimeSpan.FromSeconds(job.Configuration.MinScanDuration), job.Task.Title);

             }

             catch (Exception exc)

             {

@@ -234,7 +234,7 @@ namespace HandBrake.ApplicationServices.Services.Encode
             try

             {

                 ServiceLogMessage("Starting Encode ...");

-                instance.StartEncode(encodeJob, scannedTitle, job.Configuration.PreviewScanCount);

+                instance.StartEncode(encodeJob, scannedTitle);

             }

             catch (Exception exc)

             {

diff --git a/win/CS/HandBrake.ApplicationServices/Services/Scan/Model/Title.cs b/win/CS/HandBrake.ApplicationServices/Services/Scan/Model/Title.cs
index 1798b582a..cde8fece8 100644
--- a/win/CS/HandBrake.ApplicationServices/Services/Scan/Model/Title.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/Scan/Model/Title.cs
@@ -54,7 +54,11 @@ namespace HandBrake.ApplicationServices.Services.Scan.Model
         /// </summary>

         public int TitleNumber { get; set; }

 

-        public int RescanTitleNumber { get; set; }

+        /// <summary>

+        /// Gets or sets the type.

+        /// HB_DVD_TYPE, HB_BD_TYPE, HB_STREAM_TYPE, HB_FF_STREAM_TYPE

+        /// </summary>

+        public int Type { get; set; }

 

         /// <summary>

         /// Gets or sets Playlist.

diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs
index 4d9b6791b..6920295cb 100644
--- a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs
+++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs
@@ -181,54 +181,6 @@ namespace HandBrake.Interop
         }

 

         /// <summary>

-        /// Starts scanning the given path.

-        /// </summary>

-        /// <param name="path">

-        /// The path to the video to scan.

-        /// </param>

-        /// <param name="previewCount">

-        /// The number of preview images to make.

-        /// </param>

-        /// <param name="minDuration">

-        /// The minimum duration of a title to show up on the scan.

-        /// </param>

-        public void StartScan(string path, int previewCount, TimeSpan minDuration)

-        {

-            this.StartScan(path, previewCount, minDuration, 0);

-        }

-

-        /// <summary>

-        /// Starts a scan for the given input path.

-        /// </summary>

-        /// <param name="path">

-        /// The path of the video to scan.

-        /// </param>

-        /// <param name="previewCount">

-        /// The number of preview images to generate for each title while scanning.

-        /// </param>

-        public void StartScan(string path, int previewCount)

-        {

-            this.StartScan(path, previewCount, TimeSpan.FromSeconds(10), 0);

-        }

-

-        /// <summary>

-        /// Starts a scan of the given path.

-        /// </summary>

-        /// <param name="path">

-        /// The path of the video to scan.

-        /// </param>

-        /// <param name="previewCount">

-        /// The number of preview images to generate for each title while scanning.

-        /// </param>

-        /// <param name="titleIndex">

-        /// The title index to scan (1-based, 0 for all titles).

-        /// </param>

-        public void StartScan(string path, int previewCount, int titleIndex)

-        {

-            this.StartScan(path, previewCount, TimeSpan.Zero, titleIndex);

-        }

-

-        /// <summary>

         /// Starts a scan of the given path.

         /// </summary>

         /// <param name="path">

@@ -380,47 +332,14 @@ namespace HandBrake.Interop
         /// <summary>

         /// Starts an encode with the given job.

         /// </summary>

-        /// <param name="jobToStart">

-        /// The job to start.

-        /// </param>

-        /// <param name="title">

-        /// The title.

-        /// </param>

-        /// <param name="scanPreviewCount">

-        /// The scan Preview Count.

-        /// </param>

-        [HandleProcessCorruptedStateExceptions] 

-        public void StartEncode(EncodeJob jobToStart, Title title, int scanPreviewCount)

-        {

-            this.StartEncode(jobToStart, title, false, 0, 0, 0, scanPreviewCount);

-        }

-

-        /// <summary>

-        /// Starts an encode with the given job.

-        /// </summary>

         /// <param name="job">

         /// The job to start.

         /// </param>

         /// <param name="title">

         /// The title.

         /// </param>

-        /// <param name="preview">

-        /// The scan Preview Count.

-        /// </param>

-        /// <param name="previewNumber">

-        /// Preview Feature: Preview to encode

-        /// </param>

-        /// <param name="previewSeconds">

-        /// Number of seconds to encode for the preview

-        /// </param>

-        /// <param name="overallSelectedLengthSeconds">

-        /// The overall Selected Length Seconds.

-        /// </param>

-        /// <param name="scanPreviewCount">

-        /// Number of previews

-        /// </param>

-        [HandleProcessCorruptedStateExceptions] 

-        public void StartEncode(EncodeJob job, Title title, bool preview, int previewNumber, int previewSeconds, double overallSelectedLengthSeconds, int scanPreviewCount)

+        [HandleProcessCorruptedStateExceptions]

+        public void StartEncode(EncodeJob job, Title title)

         {

             JsonEncodeObject encodeObject = EncodeFactory.Create(job, title);

 

diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Interfaces/IHandBrakeInstance.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Interfaces/IHandBrakeInstance.cs
index 40dd3de11..e74ea81e8 100644
--- a/win/CS/HandBrake.Interop/HandBrakeInterop/Interfaces/IHandBrakeInstance.cs
+++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Interfaces/IHandBrakeInstance.cs
@@ -109,62 +109,7 @@ namespace HandBrake.Interop.Interfaces
         /// <param name="title">

         /// The title.

         /// </param>

-        /// <param name="scanPreviewCount">

-        /// The scan Preview Count.

-        /// </param>

-        void StartEncode(EncodeJob jobToStart, Title title, int scanPreviewCount);

-

-        /// <summary>

-        /// Starts an encode with the given job.

-        /// </summary>

-        /// <param name="job">

-        /// The job to start.

-        /// </param>

-        /// <param name="title">

-        /// The title.

-        /// </param>

-        /// <param name="preview">

-        /// True if this is a preview encode.

-        /// </param>

-        /// <param name="previewNumber">

-        /// The preview number to start the encode at (0-based).

-        /// </param>

-        /// <param name="previewSeconds">

-        /// The number of seconds in the preview.

-        /// </param>

-        /// <param name="overallSelectedLengthSeconds">

-        /// The currently selected encode length. Used in preview

-        /// for calculating bitrate when the target size would be wrong.

-        /// </param>

-        /// <param name="scanPreviewCount">

-        /// The scan Preview Count.

-        /// </param>

-        void StartEncode(EncodeJob job, Title title, bool preview, int previewNumber, int previewSeconds, double overallSelectedLengthSeconds, int scanPreviewCount);

-

-        /// <summary>

-        /// Starts scanning the given path.

-        /// </summary>

-        /// <param name="path">

-        /// The path to the video to scan.

-        /// </param>

-        /// <param name="previewCount">

-        /// The number of preview images to make.

-        /// </param>

-        void StartScan(string path, int previewCount);

-

-        /// <summary>

-        /// Starts a scan of the given path.

-        /// </summary>

-        /// <param name="path">

-        /// The path of the video to scan.

-        /// </param>

-        /// <param name="previewCount">

-        /// The number of previews to make on each title.

-        /// </param>

-        /// <param name="titleIndex">

-        /// The title index to scan (1-based, 0 for all titles).

-        /// </param>

-        void StartScan(string path, int previewCount, int titleIndex);

+        void StartEncode(EncodeJob jobToStart, Title title);

 

         /// <summary>

         /// Starts a scan of the given path.

diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Json/Scan/TitleList.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Json/Scan/TitleList.cs
index c65962c66..cff3b3035 100644
--- a/win/CS/HandBrake.Interop/HandBrakeInterop/Json/Scan/TitleList.cs
+++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Json/Scan/TitleList.cs
@@ -93,6 +93,7 @@ namespace HandBrake.Interop.Json.Scan
 

         /// <summary>

         /// Gets or sets the type.

+        ///  HB_DVD_TYPE, HB_BD_TYPE, HB_STREAM_TYPE, HB_FF_STREAM_TYPE

         /// </summary>

         public int Type { get; set; }