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

8 files changed, 56 insertions, 71 deletions

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