WinGui:

- Make public settings in the parsing models. Remove some unneeded methods.

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

diff --git a/win/C#/HandBrake.ApplicationServices/Parsing/AudioTrack.cs b/win/C#/HandBrake.ApplicationServices/Parsing/AudioTrack.cs
index 0272a96af57b732e9774d1d2bb18a13102e58cd6..55cf524a5553f75aedf6fe05af6cadbda7dc3843 100644 (file)
--- a/win/C#/HandBrake.ApplicationServices/Parsing/AudioTrack.cs
+++ b/win/C#/HandBrake.ApplicationServices/Parsing/AudioTrack.cs
@@ -15,14 +15,14 @@ namespace HandBrake.ApplicationServices.Parsing
     public class AudioTrack\r
     {\r
         /// <summary>\r
-        /// Gets The track number of this Audio Track\r
+        /// Gets or sets The track number of this Audio Track\r
         /// </summary>\r
-        public int TrackNumber { get; private set; }\r
+        public int TrackNumber { get; set; }\r
 \r
         /// <summary>\r
-        /// Gets The language (if detected) of this Audio Track\r
+        /// Gets or sets The language (if detected) of this Audio Track\r
         /// </summary>\r
-        public string Language { get; private set; }\r
+        public string Language { get; set; }\r
 \r
         /// <summary>\r
         /// Gets or sets LanguageCode.\r
@@ -35,62 +35,19 @@ namespace HandBrake.ApplicationServices.Parsing
         public string Description { get; set; }\r
 \r
         /// <summary>\r
-        /// Gets The primary format of this Audio Track\r
+        /// Gets or sets The primary format of this Audio Track\r
         /// </summary>\r
-        public string Format { get; private set; }\r
+        public string Format { get; set; }\r
 \r
         /// <summary>\r
-        /// Gets The frequency (in MHz) of this Audio Track\r
+        /// Gets or sets The frequency (in MHz) of this Audio Track\r
         /// </summary>\r
-        public int SampleRate { get; private set; }\r
+        public int SampleRate { get; set; }\r
 \r
         /// <summary>\r
-        /// Gets The bitrate (in kbps) of this Audio Track\r
+        /// Gets or sets The bitrate (in kbps) of this Audio Track\r
         /// </summary>\r
-        public int Bitrate { get; private set; }\r
-\r
-        /// <summary>\r
-        /// Create a new Audio Track object\r
-        /// </summary>\r
-        /// <param name="track">\r
-        /// The track.\r
-        /// </param>\r
-        /// <param name="lang">\r
-        /// The lang.\r
-        /// </param>\r
-        /// <param name="langCode">\r
-        /// The lang code.\r
-        /// </param>\r
-        /// <param name="desc">\r
-        /// The desc.\r
-        /// </param>\r
-        /// <param name="format">\r
-        /// The format.\r
-        /// </param>\r
-        /// <param name="samplerate">\r
-        /// The samplerate.\r
-        /// </param>\r
-        /// <param name="bitrate">\r
-        /// The bitrate.\r
-        /// </param>\r
-        /// <returns>\r
-        /// A new Audio Track\r
-        /// </returns>\r
-        public static AudioTrack CreateAudioTrack(int track, string lang, string langCode, string desc, string format, int samplerate, int bitrate)\r
-        {\r
-            AudioTrack newTrack = new AudioTrack\r
-                {\r
-                    TrackNumber = track,\r
-                    Language = lang,\r
-                    LanguageCode = langCode,\r
-                    Description = desc,\r
-                    Format = format,\r
-                    SampleRate = samplerate,\r
-                    Bitrate = bitrate\r
-                };\r
-\r
-            return newTrack;\r
-        }\r
+        public int Bitrate { get; set; }\r
 \r
         /// <summary>\r
         /// Parse the CLI input to an Audio Track object\r

diff --git a/win/C#/HandBrake.ApplicationServices/Parsing/Chapter.cs b/win/C#/HandBrake.ApplicationServices/Parsing/Chapter.cs
index b39f2baa4496a3d60d716460c1ee30806cde6a1b..0545dd1d5bd4783342bab4ff998e34699727d685 100644 (file)
--- a/win/C#/HandBrake.ApplicationServices/Parsing/Chapter.cs
+++ b/win/C#/HandBrake.ApplicationServices/Parsing/Chapter.cs
@@ -16,31 +16,14 @@ namespace HandBrake.ApplicationServices.Parsing
     public class Chapter\r
     {\r
         /// <summary>\r
-        /// Gets The number of this Chapter, in regards to it's parent Title\r
+        /// Gets or sets The number of this Chapter, in regards to it's parent Title\r
         /// </summary>\r
-        public int ChapterNumber { get; private set; }\r
+        public int ChapterNumber { get; set; }\r
 \r
         /// <summary>\r
-        /// Gets The length in time this Chapter spans\r
+        /// Gets or sets The length in time this Chapter spans\r
         /// </summary>\r
-        public TimeSpan Duration { get; private set; }\r
-\r
-        /// <summary>\r
-        /// Create a chapter Object\r
-        /// </summary>\r
-        /// <param name="number">\r
-        /// The number.\r
-        /// </param>\r
-        /// <param name="duration">\r
-        /// The duration.\r
-        /// </param>\r
-        /// <returns>\r
-        /// A new Chapter Object\r
-        /// </returns>\r
-        public static Chapter CreateChapterOjbect(int number, TimeSpan duration)\r
-        {\r
-            return new Chapter { ChapterNumber = number, Duration = duration };\r
-        }\r
+        public TimeSpan Duration { get; set; }\r
 \r
         /// <summary>\r
         /// Parse a CLI string to a Chapter object\r

diff --git a/win/C#/HandBrake.ApplicationServices/Parsing/Subtitle.cs b/win/C#/HandBrake.ApplicationServices/Parsing/Subtitle.cs
index 31ec350fa5af8ae539152302d22ac82a5415afb8..f4cd657685c11eff129acc8c1dff1fd57a1b120b 100644 (file)
--- a/win/C#/HandBrake.ApplicationServices/Parsing/Subtitle.cs
+++ b/win/C#/HandBrake.ApplicationServices/Parsing/Subtitle.cs
@@ -17,24 +17,24 @@ namespace HandBrake.ApplicationServices.Parsing
     public class Subtitle\r
     {\r
         /// <summary>\r
-        /// Gets the track number of this Subtitle\r
+        /// Gets or sets the track number of this Subtitle\r
         /// </summary>\r
-        public int TrackNumber { get; private set; }\r
+        public int TrackNumber { get; set; }\r
 \r
         /// <summary>\r
-        /// Gets the The language (if detected) of this Subtitle\r
+        /// Gets or sets the The language (if detected) of this Subtitle\r
         /// </summary>\r
-        public string Language { get; private set; }\r
+        public string Language { get; set; }\r
 \r
         /// <summary>\r
-        /// Gets the Langauage Code\r
+        /// Gets or sets the Langauage Code\r
         /// </summary>\r
-        public string LanguageCode { get; private set; }\r
+        public string LanguageCode { get; set; }\r
 \r
         /// <summary>\r
-        /// Gets the Subtitle Type\r
+        /// Gets or sets the Subtitle Type\r
         /// </summary>\r
-        public SubtitleType SubtitleType { get; private set; }\r
+        public SubtitleType SubtitleType { get; set; }\r
 \r
         /// <summary>\r
         /// Gets Subtitle Type\r
@@ -47,29 +47,6 @@ namespace HandBrake.ApplicationServices.Parsing
             }\r
         }\r
 \r
-        /// <summary>\r
-        /// Create a new Subtitle Object\r
-        /// </summary>\r
-        /// <param name="track">\r
-        /// The track.\r
-        /// </param>\r
-        /// <param name="lang">\r
-        /// The lang.\r
-        /// </param>\r
-        /// <param name="langCode">\r
-        /// The lang code.\r
-        /// </param>\r
-        /// <param name="type">\r
-        /// The type.\r
-        /// </param>\r
-        /// <returns>\r
-        /// A Subtitle Object\r
-        /// </returns>\r
-        public static Subtitle CreateSubtitleObject(int track, string lang, string langCode, SubtitleType type)\r
-        {\r
-            return new Subtitle { TrackNumber = track, Language = lang, LanguageCode = langCode, SubtitleType = type };\r
-        }\r
-\r
         /// <summary>\r
         /// Parse the input strings related to subtitles\r
         /// </summary>\r

diff --git a/win/C#/HandBrake.ApplicationServices/Parsing/Title.cs b/win/C#/HandBrake.ApplicationServices/Parsing/Title.cs
index 0e2d80f6659c522b20f34c2f34d41d42e43540b0..d402ac909d5297ba2ac2ea20017bfcc39e3d9599 100644 (file)
--- a/win/C#/HandBrake.ApplicationServices/Parsing/Title.cs
+++ b/win/C#/HandBrake.ApplicationServices/Parsing/Title.cs
@@ -37,146 +37,77 @@ namespace HandBrake.ApplicationServices.Parsing
         #region Properties\r
 \r
         /// <summary>\r
-        /// Gets a Collection of chapters in this Title\r
+        /// Gets or sets a Collection of chapters in this Title\r
         /// </summary>\r
-        public List<Chapter> Chapters { get; private set; }\r
+        public List<Chapter> Chapters { get; set; }\r
 \r
         /// <summary>\r
-        /// Gets a Collection of audio tracks associated with this Title\r
+        /// Gets or sets a Collection of audio tracks associated with this Title\r
         /// </summary>\r
-        public List<AudioTrack> AudioTracks { get; private set; }\r
+        public List<AudioTrack> AudioTracks { get; set; }\r
 \r
         /// <summary>\r
-        /// Gets aCollection of subtitles associated with this Title\r
+        /// Gets or sets a Collection of subtitles associated with this Title\r
         /// </summary>\r
-        public List<Subtitle> Subtitles { get; private set; }\r
+        public List<Subtitle> Subtitles { get; set; }\r
 \r
         /// <summary>\r
-        /// Gets The track number of this Title\r
+        /// Gets or sets The track number of this Title\r
         /// </summary>\r
-        public int TitleNumber { get; private set; }\r
+        public int TitleNumber { get; set; }\r
 \r
         /// <summary>\r
-        /// Gets the length in time of this Title\r
+        /// Gets or sets the length in time of this Title\r
         /// </summary>\r
-        public TimeSpan Duration { get; private set; }\r
+        public TimeSpan Duration { get; set; }\r
 \r
         /// <summary>\r
-        /// Gets the resolution (width/height) of this Title\r
+        /// Gets or sets the resolution (width/height) of this Title\r
         /// </summary>\r
-        public Size Resolution { get; private set; }\r
+        public Size Resolution { get; set; }\r
 \r
         /// <summary>\r
-        /// Gets the aspect ratio of this Title\r
+        /// Gets or sets the aspect ratio of this Title\r
         /// </summary>\r
-        public double AspectRatio { get; private set; }\r
+        public double AspectRatio { get; set; }\r
 \r
         /// <summary>\r
-        /// Gets AngleCount.\r
+        /// Gets or sets AngleCount.\r
         /// </summary>\r
-        public int AngleCount { get; private set; }\r
+        public int AngleCount { get; set; }\r
 \r
         /// <summary>\r
-        /// Gets Par Value\r
+        /// Gets or sets Par Value\r
         /// </summary>\r
-        public Size ParVal { get; private set; }\r
+        public Size ParVal { get; set; }\r
 \r
         /// <summary>\r
-        /// Gets the automatically detected crop region for this Title.\r
+        /// Gets or sets the automatically detected crop region for this Title.\r
         /// This is an int array with 4 items in it as so:\r
         /// 0: T\r
         /// 1: B\r
         /// 2: L\r
         /// 3: R\r
         /// </summary>\r
-        public Cropping AutoCropDimensions { get; private set; }\r
+        public Cropping AutoCropDimensions { get; set; }\r
 \r
         /// <summary>\r
-        /// Gets the FPS of the source.\r
+        /// Gets or sets the FPS of the source.\r
         /// </summary>\r
-        public double Fps { get; private set; }\r
+        public double Fps { get; set; }\r
 \r
         /// <summary>\r
-        /// Gets a value indicating whether this is a MainTitle.\r
+        /// Gets or sets a value indicating whether this is a MainTitle.\r
         /// </summary>\r
-        public bool MainTitle { get; private set; }\r
+        public bool MainTitle { get; set; }\r
 \r
         /// <summary>\r
-        /// Gets the Source Name\r
+        /// Gets or sets the Source Name\r
         /// </summary>\r
-        public string SourceName { get; private set; }\r
+        public string SourceName { get; set; }\r
 \r
         #endregion\r
 \r
-        /// <summary>\r
-        /// Creates a Title\r
-        /// </summary>\r
-        /// <param name="angles">\r
-        /// The angles.\r
-        /// </param>\r
-        /// <param name="aspectRatio">\r
-        /// The aspect Ratio.\r
-        /// </param>\r
-        /// <param name="audioTracks">\r
-        /// The audio Tracks.\r
-        /// </param>\r
-        /// <param name="crop">\r
-        /// The crop.\r
-        /// </param>\r
-        /// <param name="chapters">\r
-        /// The chapters.\r
-        /// </param>\r
-        /// <param name="duration">\r
-        /// The duration.\r
-        /// </param>\r
-        /// <param name="fps">\r
-        /// The fps.\r
-        /// </param>\r
-        /// <param name="mainTitle">\r
-        /// The main Title.\r
-        /// </param>\r
-        /// <param name="parVal">\r
-        /// The par Val.\r
-        /// </param>\r
-        /// <param name="resolution">\r
-        /// The resolution.\r
-        /// </param>\r
-        /// <param name="sourceName">\r
-        /// The source Name.\r
-        /// </param>\r
-        /// <param name="subtitles">\r
-        /// The subtitles.\r
-        /// </param>\r
-        /// <param name="titleNumber">\r
-        /// The title Number.\r
-        /// </param>\r
-        /// <returns>\r
-        /// A Title Object\r
-        /// </returns>\r
-        public static Title CreateTitle(int angles, double aspectRatio, List<AudioTrack> audioTracks, Cropping crop, List<Chapter> chapters,\r
-                                 TimeSpan duration, float fps, bool mainTitle, Size parVal, Size resolution, string sourceName, List<Subtitle> subtitles,\r
-                                 int titleNumber)\r
-        {\r
-            Title title = new Title\r
-            {\r
-                AngleCount = angles,\r
-                AspectRatio = aspectRatio,\r
-                AudioTracks = audioTracks,\r
-                AutoCropDimensions = crop,\r
-                Chapters = chapters,\r
-                Duration = duration,\r
-                Fps = fps,\r
-                MainTitle = mainTitle,\r
-                ParVal = parVal,\r
-                Resolution = resolution,\r
-                SourceName = sourceName,\r
-                Subtitles = subtitles,\r
-                TitleNumber = titleNumber\r
-            };\r
-\r
-            return title;\r
-        }\r
-\r
         /// <summary>\r
         /// Parse the Title Information\r
         /// </summary>\r