]> granicus.if.org Git - handbrake/commitdiff
WinGui: A Stylecop cleanup pass on Interop Library. Note, moved the Eventargs into...
authorsr55 <sr55.hb@outlook.com>
Tue, 12 Feb 2013 20:37:59 +0000 (20:37 +0000)
committersr55 <sr55.hb@outlook.com>
Tue, 12 Feb 2013 20:37:59 +0000 (20:37 +0000)
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5248 b64f7644-9d1e-0410-96f1-a4d463321fa5

34 files changed:
win/CS/HandBrake.ApplicationServices/Services/LibEncode.cs
win/CS/HandBrake.ApplicationServices/Services/LibScan.cs
win/CS/HandBrake.Interop/HandBrakeInterop/Converters.cs
win/CS/HandBrake.Interop/HandBrakeInterop/EventArgs/EncodeCompletedEventArgs.cs [moved from win/CS/HandBrake.Interop/HandBrakeInterop/EncodeCompletedEventArgs.cs with 91% similarity]
win/CS/HandBrake.Interop/HandBrakeInterop/EventArgs/EncodeProgressEventArgs.cs [moved from win/CS/HandBrake.Interop/HandBrakeInterop/EncodeProgressEventArgs.cs with 91% similarity]
win/CS/HandBrake.Interop/HandBrakeInterop/EventArgs/MessageLoggedEventArgs.cs [moved from win/CS/HandBrake.Interop/HandBrakeInterop/MessageLoggedEventArgs.cs with 88% similarity]
win/CS/HandBrake.Interop/HandBrakeInterop/EventArgs/ScanProgressEventArgs.cs [moved from win/CS/HandBrake.Interop/HandBrakeInterop/ScanProgressEventArgs.cs with 91% similarity]
win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs
win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInterop.csproj
win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeUtils.cs
win/CS/HandBrake.Interop/HandBrakeInterop/Interfaces/IHandBrakeInstance.cs
win/CS/HandBrake.Interop/HandBrakeInterop/InteropUtilities.cs
win/CS/HandBrake.Interop/HandBrakeInterop/LanguageCodes.cs
win/CS/HandBrake.Interop/HandBrakeInterop/MarshalingConstants.cs
win/CS/HandBrake.Interop/HandBrakeInterop/Model/BitrateLimits.cs
win/CS/HandBrake.Interop/HandBrakeInterop/Model/EncodeJob.cs
win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoders.cs
win/CS/HandBrake.Interop/HandBrakeInterop/Model/RangeLimits.cs
win/CS/HandBrake.Interop/HandBrakeInterop/Model/Size.cs
win/CS/HandBrake.Interop/HandBrakeInterop/Model/SourceSubtitle.cs
win/CS/HandBrake.Interop/HandBrakeInterop/Model/SourceType.cs
win/CS/HandBrake.Interop/HandBrakeInterop/Model/SrtSubtitle.cs
win/CS/HandBrake.Interop/HandBrakeInterop/Model/Subtitles.cs
win/CS/HandBrake.Interop/HandBrakeInterop/Model/VideoRangeType.cs
win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/AudioCodec.cs
win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/AudioTrack.cs
win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/Chapter.cs
win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/InputType.cs
win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/Subtitle.cs
win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/SubtitleSource.cs
win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/SubtitleType.cs
win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/Title.cs
win/CS/HandBrake.Interop/HandBrakeInterop/Utilities.cs
win/CS/HandBrake.Interop/HandBrakeInterop/libgcc_s_sjlj-1.dll [deleted file]

index 320b96f1ba4f2226b845b6c8e7d3bdf822a9c9a4..0d1998a5994eea1050c8b43b2e89605aebc98f34 100644 (file)
@@ -11,12 +11,14 @@ namespace HandBrake.ApplicationServices.Services
 {\r
     using System;\r
     using System.Diagnostics;\r
+    using System.Globalization;\r
 \r
     using HandBrake.ApplicationServices.Model;\r
     using HandBrake.ApplicationServices.Services.Base;\r
     using HandBrake.ApplicationServices.Services.Interfaces;\r
     using HandBrake.ApplicationServices.Utilities;\r
     using HandBrake.Interop;\r
+    using HandBrake.Interop.EventArgs;\r
     using HandBrake.Interop.Interfaces;\r
     using HandBrake.Interop.Model;\r
 \r
@@ -174,8 +176,8 @@ namespace HandBrake.ApplicationServices.Services
             {\r
                 this.IsEncoding = false;\r
                 this.instance.StopEncode();\r
-            } \r
-            catch(Exception)\r
+            }\r
+            catch (Exception)\r
             {\r
                 // Do Nothing.\r
             }\r
@@ -239,7 +241,7 @@ namespace HandBrake.ApplicationServices.Services
         /// <param name="e">\r
         /// The Interop.EncodeProgressEventArgs.\r
         /// </param>\r
-        private void InstanceEncodeProgress(object sender, Interop.EncodeProgressEventArgs e)\r
+        private void InstanceEncodeProgress(object sender, Interop.EventArgs.EncodeProgressEventArgs e)\r
         {\r
            EncodeProgressEventArgs args = new EncodeProgressEventArgs\r
             {\r
@@ -256,7 +258,7 @@ namespace HandBrake.ApplicationServices.Services
             if (this.WindowsSeven.IsWindowsSeven)\r
             {\r
                 int percent;\r
-                int.TryParse(Math.Round(e.FractionComplete).ToString(), out percent);\r
+                int.TryParse(Math.Round(e.FractionComplete).ToString(CultureInfo.InvariantCulture), out percent);\r
 \r
                 this.WindowsSeven.SetTaskBarProgress(percent);\r
             }\r
@@ -271,7 +273,7 @@ namespace HandBrake.ApplicationServices.Services
         /// <param name="e">\r
         /// The e.\r
         /// </param>\r
-        private void InstanceEncodeCompleted(object sender, Interop.EncodeCompletedEventArgs e)\r
+        private void InstanceEncodeCompleted(object sender, Interop.EventArgs.EncodeCompletedEventArgs e)\r
         {\r
             this.IsEncoding = false;\r
 \r
index c3598d922f69e93d083fd9c22add296be0cbda54..8dfb5ca126f61853d2bc97fee7776bc3302858de 100644 (file)
@@ -20,10 +20,11 @@ namespace HandBrake.ApplicationServices.Services
     using HandBrake.ApplicationServices.Services.Interfaces;\r
     using HandBrake.ApplicationServices.Utilities;\r
     using HandBrake.Interop;\r
+    using HandBrake.Interop.EventArgs;\r
     using HandBrake.Interop.Interfaces;\r
 \r
     using AudioTrack = HandBrake.ApplicationServices.Parsing.Audio;\r
-    using ScanProgressEventArgs = HandBrake.Interop.ScanProgressEventArgs;\r
+    using ScanProgressEventArgs = HandBrake.Interop.EventArgs.ScanProgressEventArgs;\r
     using Size = System.Drawing.Size;\r
 \r
     /// <summary>\r
index 00fc4e4e87d78051e256bd4f9d0242d906562ee5..1dc2a1e744c2ee5113a665f4acc74d954e08c36f 100644 (file)
@@ -17,12 +17,15 @@ namespace HandBrake.Interop
        using HandBrake.Interop.SourceData;\r
        using HandBrake.Interop.Model;\r
 \r
+    /// <summary>\r
+    /// The converters.\r
+    /// </summary>\r
     public static class Converters\r
        {\r
                /// <summary>\r
                /// Video Frame Rates\r
                /// </summary>\r
-               private static Dictionary<double, int> vrates = new Dictionary<double, int>\r
+               private static readonly Dictionary<double, int> VideoRates = new Dictionary<double, int>\r
                {\r
                        {5, 5400000},\r
                        {10, 2700000},\r
@@ -52,12 +55,12 @@ namespace HandBrake.Interop
                /// </exception>\r
                public static int FramerateToVrate(double framerate)\r
                {\r
-                       if (!vrates.ContainsKey(framerate))\r
+                       if (!VideoRates.ContainsKey(framerate))\r
                        {\r
                                throw new ArgumentException("Framerate not recognized.", "framerate");\r
                        }\r
 \r
-                       return vrates[framerate];\r
+                       return VideoRates[framerate];\r
                }\r
 \r
                /// <summary>\r
similarity index 91%
rename from win/CS/HandBrake.Interop/HandBrakeInterop/EncodeCompletedEventArgs.cs
rename to win/CS/HandBrake.Interop/HandBrakeInterop/EventArgs/EncodeCompletedEventArgs.cs
index aa71b3a14fc417d9454849f90a17020f99e62c20..2169c6e4d014bb000f4a44a8eefb37a70ba2b631 100644 (file)
@@ -7,9 +7,9 @@
 // </summary>\r
 // --------------------------------------------------------------------------------------------------------------------\r
 \r
-namespace HandBrake.Interop\r
+namespace HandBrake.Interop.EventArgs\r
 {\r
-       using System;\r
+    using System;\r
 \r
     /// <summary>\r
     /// Encode Completed Event Args\r
similarity index 91%
rename from win/CS/HandBrake.Interop/HandBrakeInterop/EncodeProgressEventArgs.cs
rename to win/CS/HandBrake.Interop/HandBrakeInterop/EventArgs/EncodeProgressEventArgs.cs
index 73802fafd4a6794af5a62aea765ba7465ba42f47..9e2883e3b8d716f9c37ff1f976484fbb250006bd 100644 (file)
@@ -7,11 +7,11 @@
 // </summary>\r
 // --------------------------------------------------------------------------------------------------------------------\r
 \r
-namespace HandBrake.Interop\r
+namespace HandBrake.Interop.EventArgs\r
 {\r
-       using System;\r
+    using System;\r
 \r
-    /// <summary>\r
+    /// <summary>s\r
     /// Encode Progress Event Args\r
     /// </summary>\r
     public class EncodeProgressEventArgs : EventArgs\r
similarity index 88%
rename from win/CS/HandBrake.Interop/HandBrakeInterop/MessageLoggedEventArgs.cs
rename to win/CS/HandBrake.Interop/HandBrakeInterop/EventArgs/MessageLoggedEventArgs.cs
index fd33c9ef3bd7cbfe7618f8b2ae00d84c218201fa..0649c52f421c09a263c322674d07b2d19cd794f8 100644 (file)
@@ -7,11 +7,11 @@
 // </summary>\r
 // --------------------------------------------------------------------------------------------------------------------\r
 \r
-namespace HandBrake.Interop\r
+namespace HandBrake.Interop.EventArgs\r
 {\r
-       using System;\r
+    using System;\r
 \r
-       /// <summary>\r
+    /// <summary>\r
        /// The Message Logged Event Args\r
        /// </summary>\r
        public class MessageLoggedEventArgs : EventArgs\r
similarity index 91%
rename from win/CS/HandBrake.Interop/HandBrakeInterop/ScanProgressEventArgs.cs
rename to win/CS/HandBrake.Interop/HandBrakeInterop/EventArgs/ScanProgressEventArgs.cs
index ce20a4f9d695a8a4e2c93639e29ff2f22a5f7200..b342c8f12a0474fd958683d205558881a2a4850f 100644 (file)
@@ -7,9 +7,9 @@
 // </summary>\r
 // --------------------------------------------------------------------------------------------------------------------\r
 \r
-namespace HandBrake.Interop\r
+namespace HandBrake.Interop.EventArgs\r
 {\r
-       using System;\r
+    using System;\r
 \r
     /// <summary>\r
     /// The Scan Progress Event Args\r
index a2bf8cef97f2bca29e463fe2bb54006704e1ad2c..0a1c8a32c2a1cf56c9a35985c836040ca654f53b 100644 (file)
@@ -17,6 +17,7 @@ namespace HandBrake.Interop
        using System.Runtime.InteropServices;\r
        using System.Windows.Media.Imaging;\r
 \r
+       using HandBrake.Interop.EventArgs;\r
        using HandBrake.Interop.HbLib;\r
        using HandBrake.Interop.Interfaces;\r
        using HandBrake.Interop.Model;\r
@@ -124,7 +125,7 @@ namespace HandBrake.Interop
                /// <summary>\r
                /// Fires when a scan has completed.\r
                /// </summary>\r
-               public event EventHandler<EventArgs> ScanCompleted;\r
+               public event EventHandler<System.EventArgs> ScanCompleted;\r
 \r
                /// <summary>\r
                /// Fires for progress updates when encoding.\r
@@ -785,7 +786,7 @@ namespace HandBrake.Interop
 \r
                                if (this.ScanCompleted != null)\r
                                {\r
-                                       this.ScanCompleted(this, new EventArgs());\r
+                                       this.ScanCompleted(this, new System.EventArgs());\r
                                }\r
                        }\r
                }\r
index 3fbeace49a9a05d1a37629aa2546147572444447..6de4a9adb7668779d22733501418515003b7c1fd 100644 (file)
   </ItemGroup>\r
   <ItemGroup>\r
     <Compile Include="Converters.cs" />\r
-    <Compile Include="EncodeCompletedEventArgs.cs" />\r
-    <Compile Include="EncodeProgressEventArgs.cs" />\r
+    <Compile Include="EventArgs\EncodeCompletedEventArgs.cs" />\r
+    <Compile Include="EventArgs\EncodeProgressEventArgs.cs" />\r
     <Compile Include="HandBrakeUtils.cs" />\r
     <Compile Include="HandBrakeInstance.cs" />\r
     <Compile Include="HbLib\HBFunctions.cs" />\r
     <Compile Include="Language.cs" />\r
     <Compile Include="LanguageCodes.cs" />\r
     <Compile Include="MarshalingConstants.cs" />\r
-    <Compile Include="MessageLoggedEventArgs.cs" />\r
+    <Compile Include="EventArgs\MessageLoggedEventArgs.cs" />\r
     <Compile Include="Model\Cropping.cs" />\r
     <Compile Include="Model\EncodeJob.cs" />\r
     <Compile Include="Model\Encoders.cs" />\r
     <Compile Include="Model\VideoRangeType.cs" />\r
     <Compile Include="NativeList.cs" />\r
     <Compile Include="Properties\AssemblyInfo.cs" />\r
-    <Compile Include="ScanProgressEventArgs.cs" />\r
+    <Compile Include="EventArgs\ScanProgressEventArgs.cs" />\r
     <Compile Include="SourceData\AudioCodec.cs" />\r
     <Compile Include="SourceData\AudioTrack.cs" />\r
     <Compile Include="SourceData\Chapter.cs" />\r
index 6fde37c57cfa342b81637a484bd5bc202b31f140..568e41a319da96e1bdf631e92c8d3803e8088852 100644 (file)
@@ -12,6 +12,8 @@ namespace HandBrake.Interop
        using System;\r
        using System.Collections.Generic;\r
        using System.Runtime.InteropServices;\r
+\r
+       using HandBrake.Interop.EventArgs;\r
        using HandBrake.Interop.HbLib;\r
        using HandBrake.Interop.Model;\r
        using HandBrake.Interop.Model.Encoding;\r
index 4d6a127bd448d835d9dde8fe8dc44285d49654eb..1b0f8b354a9b17dbe17a2bb6654dd8c819ad25f7 100644 (file)
@@ -13,6 +13,7 @@ namespace HandBrake.Interop.Interfaces
     using System.Collections.Generic;\r
     using System.Windows.Media.Imaging;\r
 \r
+    using HandBrake.Interop.EventArgs;\r
     using HandBrake.Interop.Model;\r
     using HandBrake.Interop.SourceData;\r
 \r
index de73dd607a4affdeb43f1998d65fd3d03399c884..8bf68b2e16981beaab3f7b41978754d197bcabb3 100644 (file)
@@ -106,12 +106,9 @@ namespace HandBrake.Interop
                        IntPtr nativeListInternal = Marshal.AllocHGlobal(capacity * intSize);\r
                        returnList.AllocatedMemory.Add(nativeListInternal);\r
 \r
-                       hb_list_s nativeListStruct = new hb_list_s();\r
-                       nativeListStruct.items = nativeListInternal;\r
-                       nativeListStruct.items_alloc = capacity;\r
-                       nativeListStruct.items_count = 0;\r
+                       hb_list_s nativeListStruct = new hb_list_s { items = nativeListInternal, items_alloc = capacity, items_count = 0 };\r
 \r
-                       IntPtr nativeListStructPtr = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(hb_list_s)));\r
+                   IntPtr nativeListStructPtr = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(hb_list_s)));\r
                        Marshal.StructureToPtr(nativeListStruct, nativeListStructPtr, false);\r
 \r
                        returnList.ListPtr = nativeListStructPtr;\r
@@ -135,12 +132,14 @@ namespace HandBrake.Interop
                                Marshal.WriteIntPtr(nativeListInternal, i * intSize, list[i]);\r
                        }\r
 \r
-                       hb_list_s nativeListStruct = new hb_list_s();\r
-                       nativeListStruct.items = nativeListInternal;\r
-                       nativeListStruct.items_alloc = list.Count;\r
-                       nativeListStruct.items_count = list.Count;\r
+                       hb_list_s nativeListStruct = new hb_list_s\r
+                                                        {\r
+                                                            items = nativeListInternal,\r
+                                                            items_alloc = list.Count,\r
+                                                            items_count = list.Count\r
+                                                        };\r
 \r
-                       IntPtr nativeListStructPtr = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(hb_list_s)));\r
+                   IntPtr nativeListStructPtr = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(hb_list_s)));\r
                        Marshal.StructureToPtr(nativeListStruct, nativeListStructPtr, false);\r
 \r
                        returnList.ListPtr = nativeListStructPtr;\r
@@ -169,12 +168,14 @@ namespace HandBrake.Interop
                                Marshal.WriteIntPtr(nativeListInternal, i * intSize, itemPtr);\r
                        }\r
 \r
-                       hb_list_s nativeListStruct = new hb_list_s();\r
-                       nativeListStruct.items = nativeListInternal;\r
-                       nativeListStruct.items_alloc = list.Count;\r
-                       nativeListStruct.items_count = list.Count;\r
+                       hb_list_s nativeListStruct = new hb_list_s\r
+                                                        {\r
+                                                            items = nativeListInternal,\r
+                                                            items_alloc = list.Count,\r
+                                                            items_count = list.Count\r
+                                                        };\r
 \r
-                       IntPtr nativeListStructPtr = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(hb_list_s)));\r
+                   IntPtr nativeListStructPtr = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(hb_list_s)));\r
                        Marshal.StructureToPtr(nativeListStruct, nativeListStructPtr, false);\r
 \r
                        returnList.ListPtr = nativeListStructPtr;\r
index 373dcb81639da27b20298d7b2336861c936912c0..7fbb7be1f205d90932c9004ea876fad7ecb00e4a 100644 (file)
@@ -10,6 +10,7 @@
 namespace HandBrake.Interop\r
 {\r
     using System.Collections.Generic;\r
+    using System.Linq;\r
 \r
     /// <summary>\r
        /// Contains utilities for converting language codes.\r
@@ -232,14 +233,7 @@ namespace HandBrake.Interop
                {\r
                        get\r
                        {\r
-                               List<Language> languages = new List<Language>();\r
-\r
-                               foreach (string languageCode in LanguageMap.Keys)\r
-                               {\r
-                                       languages.Add(new Language(languageCode));\r
-                               }\r
-\r
-                               return languages;\r
+                           return LanguageMap.Keys.Select(languageCode => new Language(languageCode)).ToList();\r
                        }\r
                }\r
 \r
index 82948f05a7698f784b104bc6654b54909173046a..05261251adeff405ca54a117d266c78a950f8c80 100644 (file)
@@ -9,7 +9,10 @@
 \r
 namespace HandBrake.Interop\r
 {\r
-       public static class MarshalingConstants\r
+    /// <summary>\r
+    /// The marshaling constants.\r
+    /// </summary>\r
+    public static class MarshalingConstants\r
        {\r
 #if X64\r
                public const int JobPaddingBytes = 49264;\r
index 8e6a49582e2340e04f846a6e4656554c553b5982..ed990596096c7c121e1346dcffec5d44f3b52ab7 100644 (file)
@@ -1,15 +1,27 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="BitrateLimits.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
+// --------------------------------------------------------------------------------------------------------------------\r
+// <copyright file="BitrateLimits.cs" company="HandBrake Project (http://handbrake.fr)">\r
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.\r
+// </copyright>\r
+// <summary>\r
+//   Defines the BitrateLimits type.\r
+// </summary>\r
 // --------------------------------------------------------------------------------------------------------------------
 
 namespace HandBrake.Interop.Model
-{
-       public class BitrateLimits
-       {
-               public int Low { get; set; }
-
-               public int High { get; set; }
+{\r
+    /// <summary>\r
+    /// The bitrate limits.\r
+    /// </summary>\r
+    public class BitrateLimits
+       {\r
+        /// <summary>\r
+        /// Gets or sets the low.\r
+        /// </summary>\r
+        public int Low { get; set; }\r
+\r
+        /// <summary>\r
+        /// Gets or sets the high.\r
+        /// </summary>\r
+        public int High { get; set; }
        }
 }
index 80c28c383bbdb45472b8ac9b56eaa40157c2ca64..9b6ed825ef1d97a5fc43723cf37836aa89f962ff 100644 (file)
 \r
 namespace HandBrake.Interop.Model\r
 {\r
-       using System;\r
-       using System.Collections.Generic;\r
-       using System.Xml.Serialization;\r
-\r
-       using HandBrake.Interop.Model.Encoding;\r
-\r
-       public class EncodeJob\r
-       {\r
-               public SourceType SourceType { get; set; }\r
-               public string SourcePath { get; set; }\r
-\r
-               /// <summary>\r
-               /// Gets or sets the 1-based index of the title to encode.\r
-               /// </summary>\r
-               public int Title { get; set; }\r
-\r
-               /// <summary>\r
-               /// Gets or sets the angle to encode. 0 for default, 1+ for specified angle.\r
-               /// </summary>\r
-               public int Angle { get; set; }\r
-\r
-               public VideoRangeType RangeType { get; set; }\r
-               public int ChapterStart { get; set; }\r
-               public int ChapterEnd { get; set; }\r
-\r
-               public double SecondsStart { get; set; }\r
-               public double SecondsEnd { get; set; }\r
-\r
-               public int FramesStart { get; set; }\r
-               public int FramesEnd { get; set; }\r
-\r
-               /// <summary>\r
-               /// Gets or sets the list of chosen audio tracks (1-based)\r
-               /// </summary>\r
-               public List<int> ChosenAudioTracks { get; set; }\r
-               public Subtitles Subtitles { get; set; }\r
-               public bool UseDefaultChapterNames { get; set; }\r
-               public List<string> CustomChapterNames { get; set; }\r
-\r
-               public string OutputPath { get; set; }\r
-\r
-               public EncodingProfile EncodingProfile { get; set; }\r
-\r
-               // The length of video to encode.\r
-               [XmlIgnore]\r
-               public TimeSpan Length { get; set; }\r
-\r
-               [XmlElement("Length")]\r
-               public string XmlLength\r
-               {\r
-                       get { return this.Length.ToString(); }\r
-                       set { this.Length = TimeSpan.Parse(value); }\r
-               }\r
-\r
-               public EncodeJob Clone()\r
-               {\r
-                       EncodeJob clone = new EncodeJob\r
-                       {\r
-                               SourceType = this.SourceType,\r
-                               SourcePath = this.SourcePath,\r
-                               Title = this.Title,\r
-                               Angle = this.Angle,\r
-                               RangeType = this.RangeType,\r
-                               ChapterStart = this.ChapterStart,\r
-                               ChapterEnd = this.ChapterEnd,\r
-                               SecondsStart = this.SecondsStart,\r
-                               SecondsEnd = this.SecondsEnd,\r
-                               FramesStart = this.FramesStart,\r
-                               FramesEnd = this.FramesEnd,\r
-                               ChosenAudioTracks = new List<int>(this.ChosenAudioTracks),\r
-                               Subtitles = this.Subtitles,\r
-                               UseDefaultChapterNames = this.UseDefaultChapterNames,\r
-                               OutputPath = this.OutputPath,\r
-                               EncodingProfile = this.EncodingProfile,\r
-                               Length = this.Length\r
-                       };\r
-\r
-                       return clone;\r
-               }\r
-       }\r
-}\r
+    using System;\r
+    using System.Collections.Generic;\r
+    using System.Xml.Serialization;\r
+\r
+    using HandBrake.Interop.Model.Encoding;\r
+\r
+    /// <summary>\r
+    /// The encode job.\r
+    /// </summary>\r
+    public class EncodeJob\r
+    {\r
+        #region Properties\r
+\r
+        /// <summary>\r
+        ///     Gets or sets the angle to encode. 0 for default, 1+ for specified angle.\r
+        /// </summary>\r
+        public int Angle { get; set; }\r
+\r
+        /// <summary>\r
+        /// Gets or sets the chapter end.\r
+        /// </summary>\r
+        public int ChapterEnd { get; set; }\r
+\r
+        /// <summary>\r
+        /// Gets or sets the chapter start.\r
+        /// </summary>\r
+        public int ChapterStart { get; set; }\r
+\r
+        /// <summary>\r
+        ///     Gets or sets the list of chosen audio tracks (1-based)\r
+        /// </summary>\r
+        public List<int> ChosenAudioTracks { get; set; }\r
+\r
+        /// <summary>\r
+        /// Gets or sets the custom chapter names.\r
+        /// </summary>\r
+        public List<string> CustomChapterNames { get; set; }\r
+\r
+        /// <summary>\r
+        /// Gets or sets the encoding profile.\r
+        /// </summary>\r
+        public EncodingProfile EncodingProfile { get; set; }\r
+\r
+        /// <summary>\r
+        /// Gets or sets the frames end.\r
+        /// </summary>\r
+        public int FramesEnd { get; set; }\r
+\r
+        /// <summary>\r
+        /// Gets or sets the frames start.\r
+        /// </summary>\r
+        public int FramesStart { get; set; }\r
+\r
+        /// <summary>\r
+        /// Gets or sets the length. The length of video to encode.\r
+        /// </summary>\r
+        [XmlIgnore]\r
+        public TimeSpan Length { get; set; }\r
+\r
+        /// <summary>\r
+        /// Gets or sets the output path.\r
+        /// </summary>\r
+        public string OutputPath { get; set; }\r
+\r
+        /// <summary>\r
+        /// Gets or sets the range type.\r
+        /// </summary>\r
+        public VideoRangeType RangeType { get; set; }\r
+\r
+        /// <summary>\r
+        /// Gets or sets the seconds end.\r
+        /// </summary>\r
+        public double SecondsEnd { get; set; }\r
+\r
+        /// <summary>\r
+        /// Gets or sets the seconds start.\r
+        /// </summary>\r
+        public double SecondsStart { get; set; }\r
+\r
+        /// <summary>\r
+        /// Gets or sets the source path.\r
+        /// </summary>\r
+        public string SourcePath { get; set; }\r
+\r
+        /// <summary>\r
+        /// Gets or sets the source type.\r
+        /// </summary>\r
+        public SourceType SourceType { get; set; }\r
+\r
+        /// <summary>\r
+        /// Gets or sets the subtitles.\r
+        /// </summary>\r
+        public Subtitles Subtitles { get; set; }\r
+\r
+        /// <summary>\r
+        ///     Gets or sets the 1-based index of the title to encode.\r
+        /// </summary>\r
+        public int Title { get; set; }\r
+\r
+        /// <summary>\r
+        /// Gets or sets a value indicating whether use default chapter names.\r
+        /// </summary>\r
+        public bool UseDefaultChapterNames { get; set; }\r
+\r
+        /// <summary>\r
+        /// Gets or sets the xml length.\r
+        /// </summary>\r
+        [XmlElement("Length")]\r
+        public string XmlLength\r
+        {\r
+            get\r
+            {\r
+                return this.Length.ToString();\r
+            }\r
+            set\r
+            {\r
+                this.Length = TimeSpan.Parse(value);\r
+            }\r
+        }\r
+\r
+        #endregion\r
+\r
+        #region Public Methods\r
+\r
+        /// <summary>\r
+        /// The clone.\r
+        /// </summary>\r
+        /// <returns>\r
+        /// The <see cref="EncodeJob"/>.\r
+        /// </returns>\r
+        public EncodeJob Clone()\r
+        {\r
+            var clone = new EncodeJob\r
+                            {\r
+                                SourceType = this.SourceType, \r
+                                SourcePath = this.SourcePath, \r
+                                Title = this.Title, \r
+                                Angle = this.Angle, \r
+                                RangeType = this.RangeType, \r
+                                ChapterStart = this.ChapterStart, \r
+                                ChapterEnd = this.ChapterEnd, \r
+                                SecondsStart = this.SecondsStart, \r
+                                SecondsEnd = this.SecondsEnd, \r
+                                FramesStart = this.FramesStart, \r
+                                FramesEnd = this.FramesEnd, \r
+                                ChosenAudioTracks = new List<int>(this.ChosenAudioTracks), \r
+                                Subtitles = this.Subtitles, \r
+                                UseDefaultChapterNames = this.UseDefaultChapterNames, \r
+                                OutputPath = this.OutputPath, \r
+                                EncodingProfile = this.EncodingProfile, \r
+                                Length = this.Length\r
+                            };\r
+\r
+            return clone;\r
+        }\r
+\r
+        #endregion\r
+    }\r
+}
\ No newline at end of file
index a5406a70a8288bf2db51dd4ff0686310618bea84..9f877cd9bdb372ed4ff9dddaab110dadbf0f14e4 100644 (file)
@@ -2,6 +2,9 @@
 // <copyright file="Encoders.cs" company="HandBrake Project (http://handbrake.fr)">\r
 //   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.\r
 // </copyright>\r
+// <summary>\r
+//   The encoders.\r
+// </summary>\r
 // --------------------------------------------------------------------------------------------------------------------\r
 \r
 namespace HandBrake.Interop.Model\r
@@ -9,17 +12,35 @@ namespace HandBrake.Interop.Model
        using System;\r
        using System.Collections.Generic;\r
        using System.Linq;\r
-       using System.Runtime.InteropServices;\r
+\r
        using HandBrake.Interop.HbLib;\r
        using HandBrake.Interop.Model.Encoding;\r
        using HandBrake.Interop.SourceData;\r
 \r
-       public static class Encoders\r
+    /// <summary>\r
+    /// The encoders.\r
+    /// </summary>\r
+    public static class Encoders\r
        {\r
-               private static List<HBAudioEncoder> audioEncoders;\r
-               private static List<HBVideoEncoder> videoEncoders;\r
-               private static List<HBMixdown> mixdowns;\r
-               private static List<int> audioBitrates; \r
+           /// <summary>\r
+           /// The audio encoders.\r
+           /// </summary>\r
+           private static List<HBAudioEncoder> audioEncoders;\r
+\r
+           /// <summary>\r
+           /// The video encoders.\r
+           /// </summary>\r
+           private static List<HBVideoEncoder> videoEncoders;\r
+\r
+           /// <summary>\r
+           /// The mixdowns.\r
+           /// </summary>\r
+           private static List<HBMixdown> mixdowns;\r
+\r
+           /// <summary>\r
+           /// The audio bitrates.\r
+           /// </summary>\r
+           private static List<int> audioBitrates; \r
 \r
                /// <summary>\r
                /// Gets a list of supported audio encoders.\r
index 6055e8eed3952d67787704de039f3be3705614fc..2c30b2b448f794a8d70e6be0a2e60eb746bc15bd 100644 (file)
@@ -1,16 +1,41 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="RangeLimits.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.Model
-{
-       public class RangeLimits
-       {
-               public float Low { get; set; }
-               public float High { get; set; }
-               public float Granularity { get; set; }
-               public bool Ascending { get; set; }
-       }
-}
+// --------------------------------------------------------------------------------------------------------------------\r
+// <copyright file="RangeLimits.cs" company="HandBrake Project (http://handbrake.fr)">\r
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.\r
+// </copyright>\r
+// <summary>\r
+//   The range limits.\r
+// </summary>\r
+// --------------------------------------------------------------------------------------------------------------------\r
+\r
+namespace HandBrake.Interop.Model\r
+{\r
+    /// <summary>\r
+    /// The range limits.\r
+    /// </summary>\r
+    public class RangeLimits\r
+    {\r
+        #region Properties\r
+\r
+        /// <summary>\r
+        /// Gets or sets a value indicating whether ascending.\r
+        /// </summary>\r
+        public bool Ascending { get; set; }\r
+\r
+        /// <summary>\r
+        /// Gets or sets the granularity.\r
+        /// </summary>\r
+        public float Granularity { get; set; }\r
+\r
+        /// <summary>\r
+        /// Gets or sets the high.\r
+        /// </summary>\r
+        public float High { get; set; }\r
+\r
+        /// <summary>\r
+        /// Gets or sets the low.\r
+        /// </summary>\r
+        public float Low { get; set; }\r
+\r
+        #endregion\r
+    }\r
+}
\ No newline at end of file
index a06894cc5b35d375ff53a7d347b128bef1518493..dcc58e0e3c6dd2262b558e54b93cdda0753f81ff 100644 (file)
@@ -9,15 +9,42 @@
 \r
 namespace HandBrake.Interop.Model\r
 {\r
-       public class Size\r
-       {\r
-               public Size(int width, int height)\r
-               {\r
-                       this.Width = width;\r
-                       this.Height = height;\r
-               }\r
+    /// <summary>\r
+    /// The size.\r
+    /// </summary>\r
+    public class Size\r
+    {\r
+        #region Constructors and Destructors\r
 \r
-               public int Width { get; set; }\r
-               public int Height { get; set; }\r
-       }\r
-}\r
+        /// <summary>\r
+        /// Initializes a new instance of the <see cref="Size"/> class.\r
+        /// </summary>\r
+        /// <param name="width">\r
+        /// The width.\r
+        /// </param>\r
+        /// <param name="height">\r
+        /// The height.\r
+        /// </param>\r
+        public Size(int width, int height)\r
+        {\r
+            this.Width = width;\r
+            this.Height = height;\r
+        }\r
+\r
+        #endregion\r
+\r
+        #region Properties\r
+\r
+        /// <summary>\r
+        /// Gets or sets the height.\r
+        /// </summary>\r
+        public int Height { get; set; }\r
+\r
+        /// <summary>\r
+        /// Gets or sets the width.\r
+        /// </summary>\r
+        public int Width { get; set; }\r
+\r
+        #endregion\r
+    }\r
+}
\ No newline at end of file
index 13344dd589688c4aefe9c7ac8915445db9111edf..2912dec1e694529b79109624b594302244b662d2 100644 (file)
@@ -9,25 +9,54 @@
 \r
 namespace HandBrake.Interop.Model\r
 {\r
-       public class SourceSubtitle\r
-       {\r
-               /// <summary>\r
-               /// Gets or sets the 1-based subtitle track number. 0 means foreign audio search.\r
-               /// </summary>\r
-               public int TrackNumber { get; set; }\r
-               public bool Default { get; set; }\r
-               public bool Forced { get; set; }\r
-               public bool BurnedIn { get; set; }\r
-\r
-               public SourceSubtitle Clone()\r
-               {\r
-                       return new SourceSubtitle\r
-                       {\r
-                               TrackNumber = this.TrackNumber,\r
-                               Default = this.Default,\r
-                               Forced = this.Forced,\r
-                               BurnedIn = this.BurnedIn\r
-                       };\r
-               }\r
-       }\r
-}\r
+    /// <summary>\r
+    /// The source subtitle.\r
+    /// </summary>\r
+    public class SourceSubtitle\r
+    {\r
+        #region Properties\r
+\r
+        /// <summary>\r
+        /// Gets or sets a value indicating whether burned in.\r
+        /// </summary>\r
+        public bool BurnedIn { get; set; }\r
+\r
+        /// <summary>\r
+        /// Gets or sets a value indicating whether default.\r
+        /// </summary>\r
+        public bool Default { get; set; }\r
+\r
+        /// <summary>\r
+        /// Gets or sets a value indicating whether forced.\r
+        /// </summary>\r
+        public bool Forced { get; set; }\r
+\r
+        /// <summary>\r
+        ///     Gets or sets the 1-based subtitle track number. 0 means foreign audio search.\r
+        /// </summary>\r
+        public int TrackNumber { get; set; }\r
+\r
+        #endregion\r
+\r
+        #region Public Methods\r
+\r
+        /// <summary>\r
+        /// The clone.\r
+        /// </summary>\r
+        /// <returns>\r
+        /// The <see cref="SourceSubtitle"/>.\r
+        /// </returns>\r
+        public SourceSubtitle Clone()\r
+        {\r
+            return new SourceSubtitle\r
+                       {\r
+                           TrackNumber = this.TrackNumber, \r
+                           Default = this.Default, \r
+                           Forced = this.Forced, \r
+                           BurnedIn = this.BurnedIn\r
+                       };\r
+        }\r
+\r
+        #endregion\r
+    }\r
+}
\ No newline at end of file
index 9ea7a07af32006d7a58a3076821d3e32da44a914..e5a49bcd13aac970fa6ba9daf5537b1070e2a84f 100644 (file)
@@ -9,11 +9,29 @@
 \r
 namespace HandBrake.Interop.Model\r
 {\r
-       public enum SourceType\r
-       {\r
-               None = 0,\r
-               File,\r
-               VideoFolder,\r
-               Dvd\r
-       }\r
+    /// <summary>\r
+    /// The source type.\r
+    /// </summary>\r
+    public enum SourceType\r
+    {\r
+        /// <summary>\r
+        /// The none.\r
+        /// </summary>\r
+        None = 0, \r
+\r
+        /// <summary>\r
+        /// The file.\r
+        /// </summary>\r
+        File, \r
+\r
+        /// <summary>\r
+        /// The video folder.\r
+        /// </summary>\r
+        VideoFolder, \r
+\r
+        /// <summary>\r
+        /// The dvd.\r
+        /// </summary>\r
+        Dvd\r
+    }\r
 }
\ No newline at end of file
index 945cc236a830b4ad9220d0ff105ee7cc7414e12c..46cc45f57a2272ffb920777c27487dc03eb85a42 100644 (file)
@@ -9,24 +9,60 @@
 \r
 namespace HandBrake.Interop.Model\r
 {\r
-       public class SrtSubtitle\r
-       {\r
-               public bool Default { get; set; }\r
-               public string FileName { get; set; }\r
-               public string LanguageCode { get; set; }\r
-               public string CharacterCode { get; set; }\r
-               public int Offset { get; set; }\r
-\r
-               public SrtSubtitle Clone()\r
-               {\r
-                       return new SrtSubtitle\r
-                       {\r
-                               Default = this.Default,\r
-                               FileName = this.FileName,\r
-                               LanguageCode = this.LanguageCode,\r
-                               CharacterCode = this.CharacterCode,\r
-                               Offset = this.Offset\r
-                       };\r
-               }\r
-       }\r
-}\r
+    /// <summary>\r
+    /// The srt subtitle.\r
+    /// </summary>\r
+    public class SrtSubtitle\r
+    {\r
+        #region Properties\r
+\r
+        /// <summary>\r
+        /// Gets or sets the character code.\r
+        /// </summary>\r
+        public string CharacterCode { get; set; }\r
+\r
+        /// <summary>\r
+        /// Gets or sets a value indicating whether default.\r
+        /// </summary>\r
+        public bool Default { get; set; }\r
+\r
+        /// <summary>\r
+        /// Gets or sets the file name.\r
+        /// </summary>\r
+        public string FileName { get; set; }\r
+\r
+        /// <summary>\r
+        /// Gets or sets the language code.\r
+        /// </summary>\r
+        public string LanguageCode { get; set; }\r
+\r
+        /// <summary>\r
+        /// Gets or sets the offset.\r
+        /// </summary>\r
+        public int Offset { get; set; }\r
+\r
+        #endregion\r
+\r
+        #region Public Methods\r
+\r
+        /// <summary>\r
+        /// The clone.\r
+        /// </summary>\r
+        /// <returns>\r
+        /// The <see cref="SrtSubtitle"/>.\r
+        /// </returns>\r
+        public SrtSubtitle Clone()\r
+        {\r
+            return new SrtSubtitle\r
+                       {\r
+                           Default = this.Default, \r
+                           FileName = this.FileName, \r
+                           LanguageCode = this.LanguageCode, \r
+                           CharacterCode = this.CharacterCode, \r
+                           Offset = this.Offset\r
+                       };\r
+        }\r
+\r
+        #endregion\r
+    }\r
+}
\ No newline at end of file
index 4289375c0f224fc193a3bbaf419bef17972bcd17..843d0d4428b8d0e60790d29a50d5cb3fc8313a92 100644 (file)
@@ -11,9 +11,23 @@ namespace HandBrake.Interop.Model
 {\r
     using System.Collections.Generic;\r
 \r
+    /// <summary>\r
+    /// The subtitles.\r
+    /// </summary>\r
     public class Subtitles\r
-       {\r
-               public List<SrtSubtitle> SrtSubtitles { get; set; }\r
-               public List<SourceSubtitle> SourceSubtitles { get; set; }\r
-       }\r
-}\r
+    {\r
+        #region Properties\r
+\r
+        /// <summary>\r
+        /// Gets or sets the source subtitles.\r
+        /// </summary>\r
+        public List<SourceSubtitle> SourceSubtitles { get; set; }\r
+\r
+        /// <summary>\r
+        /// Gets or sets the srt subtitles.\r
+        /// </summary>\r
+        public List<SrtSubtitle> SrtSubtitles { get; set; }\r
+\r
+        #endregion\r
+    }\r
+}
\ No newline at end of file
index 2a42928a5d968728aa521a1e2f56d21afa66529b..a99005e77e0770b72105489b4ce930178f409fc4 100644 (file)
@@ -11,15 +11,27 @@ namespace HandBrake.Interop.Model
 {\r
     using System.ComponentModel.DataAnnotations;\r
 \r
+    /// <summary>\r
+    /// The video range type.\r
+    /// </summary>\r
     public enum VideoRangeType\r
-       {\r
-               [Display(Name = "Chapters")]\r
-               Chapters,\r
+    {\r
+        /// <summary>\r
+        /// The chapters.\r
+        /// </summary>\r
+        [Display(Name = "Chapters")]\r
+        Chapters, \r
 \r
-               [Display(Name = "Seconds")]\r
-               Seconds,\r
+        /// <summary>\r
+        /// The seconds.\r
+        /// </summary>\r
+        [Display(Name = "Seconds")]\r
+        Seconds, \r
 \r
-               [Display(Name = "Frames")]\r
-               Frames\r
-       }\r
-}\r
+        /// <summary>\r
+        /// The frames.\r
+        /// </summary>\r
+        [Display(Name = "Frames")]\r
+        Frames\r
+    }\r
+}
\ No newline at end of file
index ad797c53dcb49f5a9e403933884aac3350b55cb8..dce9473113c652477d6e829de43bbf01b53266d3 100644 (file)
@@ -9,21 +9,45 @@
 \r
 namespace HandBrake.Interop.SourceData\r
 {\r
-       // Only contains 2 real codecs at the moment as those are what we care about. More will be added later.\r
-       public enum AudioCodec\r
-       {\r
-               Ac3,\r
+    /// <summary>\r
+    /// The audio codec.\r
+    /// Only contains 2 real codecs at the moment as those are what we care about. More will be added later.\r
+    /// </summary>\r
+    public enum AudioCodec\r
+    {\r
+        /// <summary>\r
+        /// The ac 3.\r
+        /// </summary>\r
+        Ac3, \r
 \r
-               Dts,\r
+        /// <summary>\r
+        /// The dts.\r
+        /// </summary>\r
+        Dts, \r
 \r
-               DtsHD,\r
+        /// <summary>\r
+        /// The dts hd.\r
+        /// </summary>\r
+        DtsHD, \r
 \r
-               Mp3,\r
+        /// <summary>\r
+        /// The mp 3.\r
+        /// </summary>\r
+        Mp3, \r
 \r
-               Aac,\r
+        /// <summary>\r
+        /// The aac.\r
+        /// </summary>\r
+        Aac, \r
 \r
-               Other,\r
+        /// <summary>\r
+        /// The other.\r
+        /// </summary>\r
+        Other, \r
 \r
+        /// <summary>\r
+        /// The flac.\r
+        /// </summary>\r
         Flac\r
-       }\r
-}\r
+    }\r
+}
\ No newline at end of file
index 2e78951da980c3fc4b69fd8c5e1f8deb6047f635..e20ff3003e8e8d58aec3f6fae05709f22aa3693e 100644 (file)
@@ -90,16 +90,23 @@ namespace HandBrake.Interop.SourceData
                        return this.GetDisplayString(true);\r
                }\r
 \r
-               private string GetDisplayString(bool includeTrackNumber)\r
-               {\r
-                       if (includeTrackNumber)\r
+           /// <summary>\r
+           /// The get display string.\r
+           /// </summary>\r
+           /// <param name="includeTrackNumber">\r
+           /// The include track number.\r
+           /// </param>\r
+           /// <returns>\r
+           /// The <see cref="string"/>.\r
+           /// </returns>\r
+           private string GetDisplayString(bool includeTrackNumber)\r
+           {\r
+               if (includeTrackNumber)\r
                        {\r
                                return this.TrackNumber + " " + this.Description;\r
                        }\r
-                       else\r
-                       {\r
-                               return this.Description;\r
-                       }\r
-               }\r
+               \r
+            return this.Description;\r
+           }\r
        }\r
 }
\ No newline at end of file
index 49d2e2b852b5ad8afb8791710f551d659e283a80..efec79d75ab4921e529ed4cad9a6cc2a392ecd10 100644 (file)
@@ -10,6 +10,7 @@
 namespace HandBrake.Interop.SourceData\r
 {\r
     using System;\r
+    using System.Globalization;\r
 \r
     /// <summary>\r
        /// An object representing a Chapter aosciated with a Title, in a DVD\r
@@ -32,7 +33,7 @@ namespace HandBrake.Interop.SourceData
                /// <returns>A string formatted as: {chapter #}</returns>\r
                public override string ToString()\r
                {\r
-                       return this.ChapterNumber.ToString();\r
+                       return this.ChapterNumber.ToString(CultureInfo.InvariantCulture);\r
                }\r
        }\r
 }
\ No newline at end of file
index a00e084bbcdd5e12dbd6ac0a11373cae8cdf61b4..aec1945337c176a131e9c14f08b79259740e2798 100644 (file)
@@ -11,6 +11,9 @@ namespace HandBrake.Interop.SourceData
 {\r
     using System.ComponentModel.DataAnnotations;\r
 \r
+    /// <summary>\r
+    /// The input type.\r
+    /// </summary>\r
     public enum InputType\r
        {\r
                [Display(Name = "File")]\r
index a8ddd8b2f3dcc3e4251e25c9d73da145523132cb..570bc174e7a85937be5d0a50abf5073f09271642 100644 (file)
@@ -48,7 +48,10 @@ namespace HandBrake.Interop.SourceData
                        return string.Format("{0} {1} ({2})", this.TrackNumber, this.Language, this.SubtitleSource);\r
                }\r
 \r
-               public string Display\r
+        /// <summary>\r
+        /// Gets the display.\r
+        /// </summary>\r
+        public string Display\r
                {\r
                        get\r
                        {\r
index f0a0b0a38f225b6d2b29a8ce715e894cf06a9221..e169e8882eb27f2323492b960b1b246bc92137cc 100644 (file)
@@ -9,7 +9,10 @@
 \r
 namespace HandBrake.Interop.SourceData\r
 {\r
-       public enum SubtitleSource\r
+    /// <summary>\r
+    /// The subtitle source.\r
+    /// </summary>\r
+    public enum SubtitleSource\r
        {\r
                VobSub,\r
                SRT,\r
index e419c445161ab57420cebd8a2016be30d1ed06a7..422f9001dac213ca565030bc03739db660f86cec 100644 (file)
@@ -9,7 +9,10 @@
 \r
 namespace HandBrake.Interop.SourceData\r
 {\r
-       public enum SubtitleType\r
+    /// <summary>\r
+    /// The subtitle type.\r
+    /// </summary>\r
+    public enum SubtitleType\r
        {\r
                Picture,\r
                Text\r
index fbe8e8532966bee42e6c9086d481cc7c5c8bce02..57201e847d6d7ba55c10fd7f1d76995ea9c5a11f 100644 (file)
@@ -140,7 +140,7 @@ namespace HandBrake.Interop.SourceData
                {\r
                        get\r
                        {\r
-                               return (int)Math.Ceiling(((double)this.Duration.TotalSeconds) * this.Framerate);\r
+                               return (int)Math.Ceiling(this.Duration.TotalSeconds * this.Framerate);\r
                        }\r
                }\r
 \r
index 084005d68655edfd58eea7413a8ac1b0fe40fff4..11246230c27ff67d9156d55dfa583c47d5dd59b2 100644 (file)
@@ -11,6 +11,9 @@ namespace HandBrake.Interop
 {\r
     using HandBrake.Interop.Model.Encoding;\r
 \r
+    /// <summary>\r
+    /// The utilities.\r
+    /// </summary>\r
     public static class Utilities\r
        {\r
         /// <summary>\r
@@ -23,6 +26,7 @@ namespace HandBrake.Interop
         /// The b.\r
         /// </param>\r
         /// <returns>\r
+        /// The greatest common factor\r
         /// </returns>\r
         public static int GreatestCommonFactor(int a, int b)\r
                {\r
@@ -40,10 +44,8 @@ namespace HandBrake.Interop
                        {\r
                                return GreatestCommonFactor(a % b, b);\r
                        }\r
-                       else\r
-                       {\r
-                               return GreatestCommonFactor(a, b % a);\r
-                       }\r
+            \r
+            return GreatestCommonFactor(a, b % a);\r
                }\r
 \r
                /// <summary>\r
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/libgcc_s_sjlj-1.dll b/win/CS/HandBrake.Interop/HandBrakeInterop/libgcc_s_sjlj-1.dll
deleted file mode 100644 (file)
index b86e5df..0000000
Binary files a/win/CS/HandBrake.Interop/HandBrakeInterop/libgcc_s_sjlj-1.dll and /dev/null differ