From 61bd85d1ef395a8990152a9c59ac38b8016989c4 Mon Sep 17 00:00:00 2001 From: randomengy <david.rickard@gmail.com> Date: Sun, 12 Jun 2011 17:40:18 +0000 Subject: StyleCop fixes. Also removed copying hb.dll step to fix build error. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4049 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- win/CS/HandBrake.Interop/HandBrakeInterop.sln | 10 +++++ .../HandBrakeInterop/Converters.cs | 14 +++---- .../HandBrakeInterop/EncodeCompletedEventArgs.cs | 9 ++--- .../HandBrakeInterop/EncodeProgressEventArgs.cs | 9 ++--- .../HandBrakeInterop/HandBrakeInstance.cs | 23 ++++------- .../HandBrakeInterop/HandBrakeInterop.csproj | 4 +- .../HandBrakeInterop/HandBrakeUtils.cs | 13 +++---- .../HandBrakeInterop/HbLib/HbFunctions.cs | 4 +- .../HandBrakeInterop/HbLib/Misc.cs | 4 +- .../HandBrakeInterop/HbLib/NativeConstants.cs | 4 +- .../HandBrakeInterop/HbLib/hb_audio.cs | 4 +- .../HandBrakeInterop/HbLib/hb_chapter_s.cs | 4 +- .../HandBrakeInterop/HbLib/hb_handle_s.cs | 4 +- .../HandBrakeInterop/HbLib/hb_job_s.cs | 8 ++-- .../HandBrakeInterop/HbLib/hb_subtitle.cs | 4 +- .../HandBrakeInterop/HbLib/hb_title_s.cs | 4 +- .../HandBrakeInterop/InteropUtilities.cs | 1 + .../HandBrakeInterop/MarshalingConstants.cs | 7 +--- .../HandBrakeInterop/MessageLoggedEventArgs.cs | 9 ++--- .../HandBrakeInterop/Model/Cropping.cs | 7 +--- .../HandBrakeInterop/Model/EncodeJob.cs | 13 +++---- .../HandBrakeInterop/Model/Encoding/Anamorphic.cs | 10 ++--- .../Model/Encoding/AudioEncoder.cs | 10 ++--- .../Model/Encoding/AudioEncoding.cs | 12 +++--- .../HandBrakeInterop/Model/Encoding/Decomb.cs | 7 +--- .../HandBrakeInterop/Model/Encoding/Deinterlace.cs | 7 +--- .../HandBrakeInterop/Model/Encoding/Denoise.cs | 7 +--- .../HandBrakeInterop/Model/Encoding/Detelecine.cs | 7 +--- .../Model/Encoding/EncodingProfile.cs | 9 ++--- .../HandBrakeInterop/Model/Encoding/Mixdown.cs | 10 ++--- .../Model/Encoding/OutputExtension.cs | 7 +--- .../Model/Encoding/OutputFormat.cs | 11 ++---- .../Model/Encoding/VideoEncodeRateType.cs | 7 +--- .../Model/Encoding/VideoEncoder.cs | 10 ++--- .../HandBrakeInterop/Model/Limits.cs | 7 +--- .../HandBrakeInterop/Model/Size.cs | 7 +--- .../HandBrakeInterop/Model/SourceSubtitle.cs | 7 +--- .../HandBrakeInterop/Model/SrtSubtitle.cs | 7 +--- .../HandBrakeInterop/Model/Subtitles.cs | 9 ++--- .../HandBrakeInterop/Model/VideoRangeType.cs | 10 ++--- .../HandBrakeInterop/ScanProgressEventArgs.cs | 9 ++--- .../HandBrakeInterop/SourceData/AudioCodec.cs | 7 +--- .../HandBrakeInterop/SourceData/AudioTrack.cs | 25 +++++++----- .../HandBrakeInterop/SourceData/Chapter.cs | 11 ++---- .../HandBrakeInterop/SourceData/InputType.cs | 10 ++--- .../HandBrakeInterop/SourceData/Subtitle.cs | 16 ++++---- .../HandBrakeInterop/SourceData/SubtitleSource.cs | 7 +--- .../HandBrakeInterop/SourceData/SubtitleType.cs | 7 +--- .../HandBrakeInterop/SourceData/Title.cs | 44 +++++++++++----------- .../HandBrakeInterop/Utilities.cs | 12 +++--- 50 files changed, 182 insertions(+), 286 deletions(-) (limited to 'win') diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop.sln b/win/CS/HandBrake.Interop/HandBrakeInterop.sln index 5973725a9..194b8f5a9 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop.sln +++ b/win/CS/HandBrake.Interop/HandBrakeInterop.sln @@ -16,23 +16,33 @@ Global CategoryFile = HandBrakeInterop.vsmdi EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Mixed Platforms = Debug|Mixed Platforms Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 + Release|Mixed Platforms = Release|Mixed Platforms Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 + {F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Debug|Mixed Platforms.Build.0 = Debug|x86 {F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Debug|x64.ActiveCfg = Debug|x64 {F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Debug|x64.Build.0 = Debug|x64 {F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Debug|x86.ActiveCfg = Debug|x86 {F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Debug|x86.Build.0 = Debug|x86 + {F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Release|Mixed Platforms.ActiveCfg = Release|x86 + {F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Release|Mixed Platforms.Build.0 = Release|x86 {F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Release|x64.ActiveCfg = Release|x64 {F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Release|x64.Build.0 = Release|x64 {F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Release|x86.ActiveCfg = Release|x86 {F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Release|x86.Build.0 = Release|x86 + {D721824C-CAFA-40B1-83C9-83E4B1215D60}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {D721824C-CAFA-40B1-83C9-83E4B1215D60}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU {D721824C-CAFA-40B1-83C9-83E4B1215D60}.Debug|x64.ActiveCfg = Debug|Any CPU {D721824C-CAFA-40B1-83C9-83E4B1215D60}.Debug|x64.Build.0 = Debug|Any CPU {D721824C-CAFA-40B1-83C9-83E4B1215D60}.Debug|x86.ActiveCfg = Debug|Any CPU + {D721824C-CAFA-40B1-83C9-83E4B1215D60}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {D721824C-CAFA-40B1-83C9-83E4B1215D60}.Release|Mixed Platforms.Build.0 = Release|Any CPU {D721824C-CAFA-40B1-83C9-83E4B1215D60}.Release|x64.ActiveCfg = Release|Any CPU {D721824C-CAFA-40B1-83C9-83E4B1215D60}.Release|x86.ActiveCfg = Release|Any CPU EndGlobalSection diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Converters.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Converters.cs index 691c97701..78cc12845 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Converters.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Converters.cs @@ -1,11 +1,11 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using HandBrake.SourceData; - -namespace HandBrake.Interop +namespace HandBrake.Interop { + using System; + using System.Collections.Generic; + using System.Linq; + using System.Text; + using HandBrake.SourceData; + public static class Converters { private static Dictionary<double, int> vrates = new Dictionary<double, int> diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/EncodeCompletedEventArgs.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/EncodeCompletedEventArgs.cs index f35a449a1..77c5b0a85 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/EncodeCompletedEventArgs.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/EncodeCompletedEventArgs.cs @@ -1,10 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace HandBrake.Interop +namespace HandBrake.Interop { + using System; + public class EncodeCompletedEventArgs : EventArgs { public bool Error { get; set; } diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/EncodeProgressEventArgs.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/EncodeProgressEventArgs.cs index 484ea7b7b..9f8da0d9e 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/EncodeProgressEventArgs.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/EncodeProgressEventArgs.cs @@ -1,10 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace HandBrake.Interop +namespace HandBrake.Interop { + using System; + public class EncodeProgressEventArgs : EventArgs { public float FractionComplete { get; set; } diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs index 1d8d63a2e..d8db397fc 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs @@ -118,7 +118,7 @@ public event EventHandler<EncodeCompletedEventArgs> EncodeCompleted; /// <summary> - /// Destructor. + /// Finalizes an instance of the HandBrakeInstance class. /// </summary> ~HandBrakeInstance() { @@ -126,7 +126,7 @@ } /// <summary> - /// The list of titles on this instance. + /// Gets the list of titles on this instance. /// </summary> public List<Title> Titles { @@ -137,7 +137,7 @@ } /// <summary> - /// The number of previews created during scan. + /// Gets the number of previews created during scan. /// </summary> public int PreviewCount { @@ -161,7 +161,7 @@ /// <summary> /// Initializes this instance. /// </summary> - /// <param name="verbosity"></param> + /// <param name="verbosity">The code for the logging verbosity to use.</param> public void Initialize(int verbosity) { HandBrakeUtils.RegisterLogger(); @@ -736,10 +736,6 @@ this.EncodeProgress(this, progressEventArgs); } } - else if (state.state == NativeConstants.HB_STATE_MUXING) - { - //System.Diagnostics.Debug.WriteLine("Muxing..."); - } else if (state.state == NativeConstants.HB_STATE_WORKDONE) { InteropUtilities.FreeMemory(this.encodeAllocatedMemory); @@ -1082,7 +1078,7 @@ foreach (Tuple<AudioEncoding, int> outputTrack in outputTrackList) { - audioList.Add(ConvertAudioBack(outputTrack.Item1, titleAudio[outputTrack.Item2 - 1], outputTrack.Item2, numTracks++, allocatedMemory)); + audioList.Add(ConvertAudioBack(outputTrack.Item1, titleAudio[outputTrack.Item2 - 1], numTracks++, allocatedMemory)); } NativeList nativeAudioList = InteropUtilities.ConvertListBack<hb_audio_s>(audioList); @@ -1166,7 +1162,6 @@ subtitleConfig.src_codeset = srtSubtitle.CharacterCode; subtitleConfig.src_filename = srtSubtitle.FileName; subtitleConfig.offset = srtSubtitle.Offset; - //subtitleConfig.dest = hb_subtitle_config_s_subdest.PASSTHRUSUB; subtitleConfig.default_track = srtSubtitle.Default ? 1 : 0; int srtAddSucceded = HBFunctions.hb_srt_add(ref nativeJob, ref subtitleConfig, srtSubtitle.LanguageCode); @@ -1309,15 +1304,13 @@ /// </summary> /// <param name="encoding">The encoding to apply.</param> /// <param name="baseStruct">The base native structure.</param> - /// <param name="track"></param> - /// <param name="outputTrack"></param> + /// <param name="outputTrack">The output track number (0-based).</param> /// <param name="allocatedMemory">The collection of allocated memory.</param> /// <returns>The resulting native audio structure.</returns> - private hb_audio_s ConvertAudioBack(AudioEncoding encoding, hb_audio_s baseStruct, int track, int outputTrack, List<IntPtr> allocatedMemory) + private hb_audio_s ConvertAudioBack(AudioEncoding encoding, hb_audio_s baseStruct, int outputTrack, List<IntPtr> allocatedMemory) { hb_audio_s nativeAudio = baseStruct; - //nativeAudio.config.input.track = track; nativeAudio.config.output.track = outputTrack; if (encoding.Encoder == AudioEncoder.Passthrough) @@ -1557,7 +1550,7 @@ if (profile.KeepDisplayAspect) { - if (profile.Width == 0 && profile.Height == 0 || profile.Width == 0) + if ((profile.Width == 0 && profile.Height == 0) || profile.Width == 0) { width = (int)((double)height * croppedAspectRatio); if (profile.MaxWidth > 0 && width > profile.MaxWidth) diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInterop.csproj b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInterop.csproj index 24668cadd..5f0815e85 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInterop.csproj +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInterop.csproj @@ -200,7 +200,7 @@ Other similar extension points exist, see Microsoft.Common.targets. <Target Name="BeforeBuild"> </Target>--> - <Target Name="AfterBuild"> + <!--<Target Name="AfterBuild"> <Copy SourceFiles="..\..\Lib\$(Platform)\hb.dll" DestinationFolder="$(OutDir)" /> - </Target> + </Target>--> </Project> \ No newline at end of file diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeUtils.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeUtils.cs index 89134b4ab..3a48037e1 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeUtils.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeUtils.cs @@ -1,11 +1,10 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using HandBrake.SourceData; - -namespace HandBrake.Interop +namespace HandBrake.Interop { + using System; + using System.Collections.Generic; + using System.Linq; + using HandBrake.SourceData; + public static class HandBrakeUtils { /// <summary> diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/HbFunctions.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/HbFunctions.cs index fa5a321ca..dda6876f3 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/HbFunctions.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/HbFunctions.cs @@ -1,4 +1,6 @@ -using System; +// <auto-generated /> + +using System; using System.Collections.Generic; using System.Linq; using System.Runtime.InteropServices; diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/Misc.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/Misc.cs index 7d742f6c9..5b275399f 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/Misc.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/Misc.cs @@ -1,4 +1,6 @@ -using System; +// <auto-generated /> + +using System; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/NativeConstants.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/NativeConstants.cs index 8d097b33e..8ab215cae 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/NativeConstants.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/NativeConstants.cs @@ -1,4 +1,6 @@ -namespace HandBrake.Interop +// <auto-generated /> + +namespace HandBrake.Interop { public partial class NativeConstants { diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_audio.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_audio.cs index 6992d1ffd..6e9aff471 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_audio.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_audio.cs @@ -1,4 +1,6 @@ -using System; +// <auto-generated /> + +using System; using System.Collections.Generic; using System.Linq; using System.Runtime.InteropServices; diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_chapter_s.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_chapter_s.cs index fd3762398..05a42b923 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_chapter_s.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_chapter_s.cs @@ -1,4 +1,6 @@ -using System.Runtime.InteropServices; +// <auto-generated /> + +using System.Runtime.InteropServices; namespace HandBrake.Interop { diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_handle_s.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_handle_s.cs index dd56681bb..089afd377 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_handle_s.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_handle_s.cs @@ -1,4 +1,6 @@ -using System; +// <auto-generated /> + +using System; using System.Runtime.InteropServices; namespace HandBrake.Interop diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_job_s.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_job_s.cs index c12352e04..d33bd4723 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_job_s.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_job_s.cs @@ -1,4 +1,6 @@ -using System; +// <auto-generated /> + +using System; using System.Runtime.InteropServices; namespace HandBrake.Interop @@ -80,10 +82,6 @@ namespace HandBrake.Interop /// int public int pass; - /// char* - //[MarshalAs(UnmanagedType.LPStr)] - //public string x264opts; - public IntPtr advanced_opts; /// int diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_subtitle.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_subtitle.cs index f5a830cc4..e784f3ce6 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_subtitle.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_subtitle.cs @@ -1,4 +1,6 @@ -using System; +// <auto-generated /> + +using System; using System.Runtime.InteropServices; namespace HandBrake.Interop diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_title_s.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_title_s.cs index 856cdcfbb..dddcdadf5 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_title_s.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_title_s.cs @@ -1,4 +1,6 @@ -using System; +// <auto-generated /> + +using System; using System.Runtime.InteropServices; namespace HandBrake.Interop diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/InteropUtilities.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/InteropUtilities.cs index 4102e5eb7..c04854959 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/InteropUtilities.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/InteropUtilities.cs @@ -45,6 +45,7 @@ /// <summary> /// Creats a new, empty native HandBrake list. /// </summary> + /// <param name="capacity">The capacity of the new list.</param> /// <returns>The new native list.</returns> public static NativeList CreateNativeList(int capacity) { diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/MarshalingConstants.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/MarshalingConstants.cs index 67fd8d177..df7c953ad 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/MarshalingConstants.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/MarshalingConstants.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace HandBrake.Interop +namespace HandBrake.Interop { public static class MarshalingConstants { diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/MessageLoggedEventArgs.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/MessageLoggedEventArgs.cs index 6976fedc6..98bd94aaf 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/MessageLoggedEventArgs.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/MessageLoggedEventArgs.cs @@ -1,10 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace HandBrake.Interop +namespace HandBrake.Interop { + using System; + public class MessageLoggedEventArgs : EventArgs { public string Message { get; set; } diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Cropping.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Cropping.cs index 2b95a0e11..efd979fc4 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Cropping.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Cropping.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace HandBrake.Interop +namespace HandBrake.Interop { public class Cropping { diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/EncodeJob.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/EncodeJob.cs index 850f6ea2e..7d1b8234a 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/EncodeJob.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/EncodeJob.cs @@ -1,11 +1,10 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Xml.Serialization; - -namespace HandBrake.Interop +namespace HandBrake.Interop { + using System; + using System.Collections.Generic; + using System.Linq; + using System.Xml.Serialization; + public class EncodeJob { public SourceType SourceType { get; set; } diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Anamorphic.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Anamorphic.cs index b6d3d110f..772a908a5 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Anamorphic.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Anamorphic.cs @@ -1,11 +1,7 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Text; - -namespace HandBrake.Interop +namespace HandBrake.Interop { + using System.ComponentModel.DataAnnotations; + public enum Anamorphic { [Display(Name = "None")] diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/AudioEncoder.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/AudioEncoder.cs index 159ed7c30..aff0a30d5 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/AudioEncoder.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/AudioEncoder.cs @@ -1,11 +1,7 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Text; - -namespace HandBrake.Interop +namespace HandBrake.Interop { + using System.ComponentModel.DataAnnotations; + public enum AudioEncoder { [Display(Name = "AAC (faac)")] diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/AudioEncoding.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/AudioEncoding.cs index 0821749b5..49be026d4 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/AudioEncoding.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/AudioEncoding.cs @@ -1,10 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace HandBrake.Interop +namespace HandBrake.Interop { + using System; + public class AudioEncoding { public int InputNumber { get; set; } @@ -14,10 +11,11 @@ namespace HandBrake.Interop /// Gets or sets the bitrate (in kbps) of this track. /// </summary> public int Bitrate { get; set; } + public Mixdown Mixdown { get; set; } /// <summary> - /// Obsolete. Use SampleRateRaw instead. + /// Gets or sets the sample rate. Obsolete. Use SampleRateRaw instead. /// </summary> [Obsolete("This property is ignored and only exists for backwards compatibility. Use SampleRateRaw instead.")] public string SampleRate { get; set; } diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Decomb.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Decomb.cs index 5fa9bda74..24cb66fb4 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Decomb.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Decomb.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace HandBrake.Interop +namespace HandBrake.Interop { public enum Decomb { diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Deinterlace.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Deinterlace.cs index ee08ba10d..2a5c97290 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Deinterlace.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Deinterlace.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace HandBrake.Interop +namespace HandBrake.Interop { public enum Deinterlace { diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Denoise.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Denoise.cs index 7b59ae1b8..509e165a2 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Denoise.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Denoise.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace HandBrake.Interop +namespace HandBrake.Interop { public enum Denoise { diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Detelecine.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Detelecine.cs index fe9e543c4..6075718c6 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Detelecine.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Detelecine.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace HandBrake.Interop +namespace HandBrake.Interop { public enum Detelecine { diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/EncodingProfile.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/EncodingProfile.cs index d4275b4d2..7f071bb81 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/EncodingProfile.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/EncodingProfile.cs @@ -1,10 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace HandBrake.Interop +namespace HandBrake.Interop { + using System.Collections.Generic; + public class EncodingProfile { public EncodingProfile() diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Mixdown.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Mixdown.cs index 838c7066b..5731d5de2 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Mixdown.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Mixdown.cs @@ -1,11 +1,7 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Text; - -namespace HandBrake.Interop +namespace HandBrake.Interop { + using System.ComponentModel.DataAnnotations; + public enum Mixdown { [Display(Name = "Dolby Pro Logic II")] diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/OutputExtension.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/OutputExtension.cs index cd82aab2e..df2319262 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/OutputExtension.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/OutputExtension.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace HandBrake.Interop +namespace HandBrake.Interop { public enum OutputExtension { diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/OutputFormat.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/OutputFormat.cs index f842fe474..741abcb0d 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/OutputFormat.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/OutputFormat.cs @@ -1,12 +1,7 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Text; -using System.ComponentModel; - -namespace HandBrake.Interop +namespace HandBrake.Interop { + using System.ComponentModel.DataAnnotations; + public enum OutputFormat { [Display(Name = "MP4")] diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/VideoEncodeRateType.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/VideoEncodeRateType.cs index ae08402d4..13859b574 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/VideoEncodeRateType.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/VideoEncodeRateType.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace HandBrake.Interop +namespace HandBrake.Interop { public enum VideoEncodeRateType { diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/VideoEncoder.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/VideoEncoder.cs index 923f446e1..6a5c13821 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/VideoEncoder.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/VideoEncoder.cs @@ -1,11 +1,7 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Text; - -namespace HandBrake.Interop +namespace HandBrake.Interop { + using System.ComponentModel.DataAnnotations; + public enum VideoEncoder { [Display(Name = "H.264 (x264)")] diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Limits.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Limits.cs index 9fdc373f5..d462aaabd 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Limits.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Limits.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace HandBrake.Interop +namespace HandBrake.Interop { public class Limits { diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Size.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Size.cs index 3f9736c86..966935a22 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Size.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Size.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace HandBrake.Interop +namespace HandBrake.Interop { public class Size { diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/SourceSubtitle.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/SourceSubtitle.cs index e07811cc8..7a8689ae9 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/SourceSubtitle.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/SourceSubtitle.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace HandBrake.Interop +namespace HandBrake.Interop { public class SourceSubtitle { diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/SrtSubtitle.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/SrtSubtitle.cs index 1d80e1f0b..b2aad8b24 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/SrtSubtitle.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/SrtSubtitle.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace HandBrake.Interop +namespace HandBrake.Interop { public class SrtSubtitle { diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Subtitles.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Subtitles.cs index a9c1750e0..585198295 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Subtitles.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Subtitles.cs @@ -1,10 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace HandBrake.Interop +namespace HandBrake.Interop { + using System.Collections.Generic; + public class Subtitles { public List<SrtSubtitle> SrtSubtitles { get; set; } diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/VideoRangeType.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/VideoRangeType.cs index d0e967fbc..3e6684e91 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/VideoRangeType.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/VideoRangeType.cs @@ -1,11 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.ComponentModel.DataAnnotations; - -namespace HandBrake.Interop +namespace HandBrake.Interop { + using System.ComponentModel.DataAnnotations; + public enum VideoRangeType { [Display(Name = "Chapters")] diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/ScanProgressEventArgs.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/ScanProgressEventArgs.cs index 4177ff1b7..e9f06715a 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/ScanProgressEventArgs.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/ScanProgressEventArgs.cs @@ -1,10 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace HandBrake.Interop +namespace HandBrake.Interop { + using System; + public class ScanProgressEventArgs : EventArgs { public int CurrentTitle { get; set; } diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/AudioCodec.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/AudioCodec.cs index ee5f8133d..a2bb5a105 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/AudioCodec.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/AudioCodec.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace HandBrake.SourceData +namespace HandBrake.SourceData { // Only contains 2 real codecs at the moment as those are what we care about. More will be added later. public enum AudioCodec diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/AudioTrack.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/AudioTrack.cs index a7b7926c1..5940159dc 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/AudioTrack.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/AudioTrack.cs @@ -4,11 +4,6 @@ Homepage: <http://handbrake.fr>. It may be used under the terms of the GNU General Public License. */ -using System; -using System.Collections.Generic; -using System.IO; -using System.Text.RegularExpressions; - namespace HandBrake.SourceData { /// <summary> @@ -17,7 +12,7 @@ namespace HandBrake.SourceData public class AudioTrack { /// <summary> - /// The track number of this Audio Track + /// Gets or sets the track number of this Audio Track /// </summary> public int TrackNumber { get; set; } @@ -27,12 +22,18 @@ namespace HandBrake.SourceData public AudioCodec Codec { get; set; } /// <summary> - /// The language (if detected) of this Audio Track + /// Gets or sets the language (if detected) of this Audio Track /// </summary> public string Language { get; set; } + /// <summary> + /// Gets or sets the language code for this audio track. + /// </summary> public string LanguageCode { get; set; } + /// <summary> + /// Gets or sets the description for this audio track. + /// </summary> public string Description { get; set; } /// <summary> @@ -41,15 +42,18 @@ namespace HandBrake.SourceData public int ChannelLayout { get; set; } /// <summary> - /// The frequency (in Hz) of this Audio Track + /// Gets or sets the frequency (in Hz) of this Audio Track /// </summary> public int SampleRate { get; set; } /// <summary> - /// The bitrate (in bits/sec) of this Audio Track. + /// Gets or sets the bitrate (in bits/sec) of this Audio Track. /// </summary> public int Bitrate { get; set; } + /// <summary> + /// Gets the display string for this audio track. + /// </summary> public string Display { get @@ -58,6 +62,9 @@ namespace HandBrake.SourceData } } + /// <summary> + /// Gets the display string for this audio track (not including track number) + /// </summary> public string NoTrackDisplay { get diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/Chapter.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/Chapter.cs index 74d3703e0..18a606b6a 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/Chapter.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/Chapter.cs @@ -4,25 +4,22 @@ Homepage: <http://handbrake.fr>. It may be used under the terms of the GNU General Public License. */ -using System; -using System.Collections.Generic; -using System.IO; -using System.Text.RegularExpressions; - namespace HandBrake.SourceData { + using System; + /// <summary> /// An object representing a Chapter aosciated with a Title, in a DVD /// </summary> public class Chapter { /// <summary> - /// The number of this Chapter, in regards to its parent Title + /// Gets or sets the number of this Chapter, in regards to its parent Title /// </summary> public int ChapterNumber { get; set; } /// <summary> - /// The length in time this Chapter spans + /// Gets or sets the length in time this Chapter spans /// </summary> public TimeSpan Duration { get; set; } diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/InputType.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/InputType.cs index b96b4f174..c8379852f 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/InputType.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/InputType.cs @@ -1,11 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.ComponentModel.DataAnnotations; - -namespace HandBrake.SourceData +namespace HandBrake.SourceData { + using System.ComponentModel.DataAnnotations; + public enum InputType { [Display(Name = "File")] diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/Subtitle.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/Subtitle.cs index 5f100db30..0d4ce3068 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/Subtitle.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/Subtitle.cs @@ -4,10 +4,6 @@ Homepage: <http://handbrake.fr>. It may be used under the terms of the GNU General Public License. */ -using System.Collections.Generic; -using System.IO; -using System.Text.RegularExpressions; - namespace HandBrake.SourceData { /// <summary> @@ -16,22 +12,28 @@ namespace HandBrake.SourceData public class Subtitle { /// <summary> - /// The track number of this Subtitle + /// Gets or sets the track number of this Subtitle /// </summary> public int TrackNumber { get; set; } /// <summary> - /// The language (if detected) of this Subtitle + /// Gets or sets the language (if detected) of this Subtitle /// </summary> public string Language { get; set; } /// <summary> - /// Langauage Code + /// Gets or sets the Langauage Code. /// </summary> public string LanguageCode { get; set; } + /// <summary> + /// Gets or sets the subtitle type. + /// </summary> public SubtitleType SubtitleType { get; set; } + /// <summary> + /// Gets or sets the subtitle source. + /// </summary> public SubtitleSource SubtitleSource { get; set; } /// <summary> diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/SubtitleSource.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/SubtitleSource.cs index b884b8a32..04d267950 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/SubtitleSource.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/SubtitleSource.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace HandBrake.SourceData +namespace HandBrake.SourceData { public enum SubtitleSource { diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/SubtitleType.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/SubtitleType.cs index 2c4471e99..07c2c1107 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/SubtitleType.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/SubtitleType.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace HandBrake.SourceData +namespace HandBrake.SourceData { public enum SubtitleType { diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/Title.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/Title.cs index c8b296825..2dfc1a418 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/Title.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/Title.cs @@ -4,15 +4,15 @@ Homepage: <http://handbrake.fr>. It may be used under the terms of the GNU General Public License. */ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.Text.RegularExpressions; -using HandBrake.Interop; - namespace HandBrake.SourceData { + using System; + using System.Collections.Generic; + using System.Globalization; + using System.IO; + using System.Text.RegularExpressions; + using HandBrake.Interop; + /// <summary> /// An object that represents a single Title of a DVD /// </summary> @@ -24,7 +24,7 @@ namespace HandBrake.SourceData private readonly List<Subtitle> subtitles; /// <summary> - /// The constructor for this object + /// Initializes a new instance of the Title class. /// </summary> public Title() { @@ -39,7 +39,7 @@ namespace HandBrake.SourceData public InputType InputType { get; set; } /// <summary> - /// Collection of chapters in this Title + /// Gets a collection of chapters in this Title /// </summary> public List<Chapter> Chapters { @@ -47,7 +47,7 @@ namespace HandBrake.SourceData } /// <summary> - /// Collection of audio tracks associated with this Title + /// Gets a collection of audio tracks associated with this Title /// </summary> public List<AudioTrack> AudioTracks { @@ -55,7 +55,7 @@ namespace HandBrake.SourceData } /// <summary> - /// Collection of subtitles associated with this Title + /// Gets a collection of subtitles associated with this Title /// </summary> public List<Subtitle> Subtitles { @@ -63,22 +63,22 @@ namespace HandBrake.SourceData } /// <summary> - /// The track number of this Title (1-based). + /// Gets or sets the track number of this Title (1-based). /// </summary> public int TitleNumber { get; set; } /// <summary> - /// The length in time of this Title + /// Gets or sets the length in time of this Title /// </summary> public TimeSpan Duration { get; set; } /// <summary> - /// The resolution (width/height) of this Title + /// Gets or sets the resolution (width/height) of this Title /// </summary> public Size Resolution { get; set; } /// <summary> - /// The aspect ratio of this Title + /// Gets or sets the aspect ratio of this Title /// </summary> public double AspectRatio { get; set; } @@ -88,17 +88,12 @@ namespace HandBrake.SourceData public int AngleCount { get; set; } /// <summary> - /// Par Value + /// Gets or sets the pixel aspect ratio. /// </summary> public Size ParVal { get; set; } /// <summary> - /// The automatically detected crop region for this Title. - /// This is an int array with 4 items in it as so: - /// 0: - /// 1: - /// 2: - /// 3: + /// Gets or sets the automatically detected crop region for this Title. /// </summary> public Cropping AutoCropDimensions { get; set; } @@ -113,7 +108,7 @@ namespace HandBrake.SourceData public double Framerate { get; set; } /// <summary> - /// The total number of frames in this title. + /// Gets the total number of frames in this title. /// </summary> public int Frames { @@ -133,6 +128,9 @@ namespace HandBrake.SourceData this.Duration.Minutes, this.Duration.Seconds); } + /// <summary> + /// Gets the display string for this title. + /// </summary> public string Display { get diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Utilities.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Utilities.cs index 41ab39da5..7e9ee4311 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Utilities.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Utilities.cs @@ -1,10 +1,10 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace HandBrake.Interop +namespace HandBrake.Interop { + using System; + using System.Collections.Generic; + using System.Linq; + using System.Text; + public static class Utilities { public static int GreatestCommonFactor(int a, int b) -- cgit v1.2.3