OSDN Git Service

WinGui:
authorsr55 <sr55@b64f7644-9d1e-0410-96f1-a4d463321fa5>
Thu, 8 Jan 2009 20:11:26 +0000 (20:11 +0000)
committersr55 <sr55@b64f7644-9d1e-0410-96f1-a4d463321fa5>
Thu, 8 Jan 2009 20:11:26 +0000 (20:11 +0000)
- Code cleanup. Remoes old using tags, removes unused code, cleans up some functions to make them shorter/more readable etc.

git-svn-id: svn://localhost/HandBrake/trunk@2069 b64f7644-9d1e-0410-96f1-a4d463321fa5

26 files changed:
win/C#/Functions/AppcastReader.cs
win/C#/Functions/Encode.cs
win/C#/Functions/Main.cs
win/C#/Functions/QueryParser.cs
win/C#/Parsing/AudioTrack.cs
win/C#/Parsing/Chapter.cs
win/C#/Parsing/DVD.cs
win/C#/Parsing/Parser.cs
win/C#/Parsing/Subtitle.cs
win/C#/Parsing/Title.cs
win/C#/Presets/PresetsHandler.cs
win/C#/Presets/preset.cs
win/C#/Queue/QueueHandler.cs
win/C#/Queue/QueueItem.cs
win/C#/frmAbout.cs
win/C#/frmActivityWindow.cs
win/C#/frmAddPreset.cs
win/C#/frmDownload.cs
win/C#/frmGenPreview.cs
win/C#/frmMain/PresetLoader.cs
win/C#/frmOptions.cs
win/C#/frmPreview.cs
win/C#/frmQueue.cs
win/C#/frmReadDVD.cs
win/C#/frmSplashScreen.cs
win/C#/frmUpdater.cs

index e14d2c1..11f75fe 100644 (file)
@@ -4,9 +4,6 @@
           Homepage: <http://handbrake.fr>.\r
           It may be used under the terms of the GNU General Public License. */\r
 \r
-using System;\r
-using System.Collections.Generic;\r
-using System.IO;\r
 using System.Xml;\r
 using System.Text.RegularExpressions;\r
 \r
index 99db0bc..b6a4a0a 100644 (file)
@@ -5,8 +5,6 @@
           It may be used under the terms of the GNU General Public License. */\r
 \r
 using System;\r
-using System.Collections.Generic;\r
-using System.Threading;\r
 using System.Diagnostics;\r
 using System.Windows.Forms;\r
 using System.Globalization;\r
index 52e4e0e..1f14766 100644 (file)
@@ -6,11 +6,8 @@
 \r
 using System;\r
 using System.Collections;\r
-using System.Text;\r
 using System.Windows.Forms;\r
-using System.Globalization;\r
 using System.IO;\r
-using System.Drawing;\r
 using System.Diagnostics;\r
 using System.Text.RegularExpressions;\r
 using System.Collections.Generic;\r
index ae53f46..6c1d768 100644 (file)
           It may be used under the terms of the GNU General Public License. */\r
 \r
 using System;\r
-using System.Collections.Generic;\r
-using System.Text;\r
+using System.Globalization;\r
 using System.Text.RegularExpressions;\r
 using System.Windows.Forms;\r
-using System.Globalization;\r
 \r
 namespace Handbrake.Functions\r
 {\r
-    class QueryParser\r
+    internal class QueryParser\r
     {\r
-        static readonly private CultureInfo Culture = new CultureInfo("en-US", false);\r
+        private static readonly CultureInfo Culture = new CultureInfo("en-US", false);\r
 \r
-        // All the Main Window GUI options\r
         #region Varibles\r
 \r
         #region Source\r
+\r
+        private int q_chaptersFinish;\r
+        private int q_chaptersStart;\r
         private int q_dvdTitle;\r
+\r
         /// <summary>\r
         /// Returns an Integer\r
         /// DVD Title number.\r
         /// </summary>\r
         public int DVDTitle\r
         {\r
-            get\r
-            {\r
-                return this.q_dvdTitle;\r
-            }\r
+            get { return q_dvdTitle; }\r
         }\r
 \r
-        private int q_chaptersStart;\r
         /// <summary>\r
         /// Returns an Int\r
         /// DVD Chapter number or chapter range.\r
         /// </summary>\r
         public int DVDChapterStart\r
         {\r
-            get\r
-            {\r
-                return this.q_chaptersStart;\r
-            }\r
+            get { return q_chaptersStart; }\r
         }\r
 \r
-        private int q_chaptersFinish;\r
         /// <summary>\r
         /// Returns an Int\r
         /// DVD Chapter number or chapter range.\r
         /// </summary>\r
         public int DVDChapterFinish\r
         {\r
-            get\r
-            {\r
-                return this.q_chaptersFinish;\r
-            }\r
+            get { return q_chaptersFinish; }\r
         }\r
-#endregion\r
+\r
+        #endregion\r
 \r
         #region Destination\r
+\r
         private string q_format;\r
+        private string q_videoEncoder;\r
+\r
         /// <summary>\r
         /// Returns a String \r
         /// Full path of the destination.\r
         /// </summary>\r
         public string Format\r
         {\r
-            get\r
-            {\r
-                return this.q_format;\r
-            }\r
+            get { return q_format; }\r
         }\r
 \r
-        private string q_videoEncoder;\r
         /// <summary>\r
         /// Returns an String\r
         /// The Video Encoder used.\r
         /// </summary>\r
         public string VideoEncoder\r
         {\r
-            get\r
-            {\r
-                return this.q_videoEncoder;\r
-            }\r
+            get { return q_videoEncoder; }\r
         }\r
+\r
         #endregion\r
 \r
         #region Picture Settings\r
+\r
+        private Boolean q_anamorphic;\r
+        private Boolean q_chapterMarkers;\r
+        private string q_cropbottom;\r
+        private string q_cropLeft;\r
+        private string q_cropRight;\r
+        private string q_croptop;\r
+        private string q_cropValues;\r
+        private int q_deBlock;\r
+        private Boolean q_decomb;\r
+        private string q_deinterlace;\r
+        private string q_denoise;\r
+        private Boolean q_detelecine;\r
+        private Boolean q_looseAnamorphic;\r
+        private int q_maxHeight;\r
+        private int q_maxWidth;\r
+        private int q_videoHeight;\r
         private int q_videoWidth;\r
+\r
         /// <summary>\r
         /// Returns an Int\r
         /// The selected Width for the encoding.\r
         /// </summary>\r
         public int Width\r
         {\r
-            get\r
-            {\r
-                return this.q_videoWidth;\r
-            }\r
+            get { return q_videoWidth; }\r
         }\r
 \r
-        private int q_videoHeight;\r
         /// <summary>\r
         /// Returns an Int\r
         /// The selected Height for the encoding.\r
         /// </summary>\r
         public int Height\r
         {\r
-            get\r
-            {\r
-                return this.q_videoHeight;\r
-            }\r
+            get { return q_videoHeight; }\r
         }\r
 \r
-        private int q_maxWidth;\r
         /// <summary>\r
         /// Returns an Int\r
         /// The selected Width for the encoding.\r
         /// </summary>\r
         public int MaxWidth\r
         {\r
-            get\r
-            {\r
-                return this.q_maxWidth;\r
-            }\r
+            get { return q_maxWidth; }\r
         }\r
 \r
-        private int q_maxHeight;\r
         /// <summary>\r
         /// Returns an Int\r
         /// The selected Height for the encoding.\r
         /// </summary>\r
         public int MaxHeight\r
         {\r
-            get\r
-            {\r
-                return this.q_maxHeight;\r
-            }\r
+            get { return q_maxHeight; }\r
         }\r
 \r
-        private string q_cropValues;\r
         /// <summary>\r
         /// Returns an String\r
         /// Cropping values.\r
         /// </summary>\r
         public string CropValues\r
         {\r
-            get\r
-            {\r
-                return this.q_cropValues;\r
-            }\r
+            get { return q_cropValues; }\r
         }\r
 \r
-        private string q_croptop;\r
         /// <summary>\r
         /// Returns an String\r
         /// Cropping values.\r
         /// </summary>\r
         public string CropTop\r
         {\r
-            get\r
-            {\r
-                return this.q_croptop;\r
-            }\r
+            get { return q_croptop; }\r
         }\r
 \r
-        private string q_cropbottom;\r
         /// <summary>\r
         /// Returns an String\r
         /// Cropping values.\r
         /// </summary>\r
         public string CropBottom\r
         {\r
-            get\r
-            {\r
-                return this.q_cropbottom;\r
-            }\r
+            get { return q_cropbottom; }\r
         }\r
 \r
-        private string q_cropLeft;\r
         /// <summary>\r
         /// Returns an String\r
         /// Cropping values.\r
         /// </summary>\r
         public string CropLeft\r
         {\r
-            get\r
-            {\r
-                return this.q_cropLeft;\r
-            }\r
+            get { return q_cropLeft; }\r
         }\r
 \r
-        private string q_cropRight;\r
         /// <summary>\r
         /// Returns an String\r
         /// Cropping values.\r
         /// </summary>\r
         public string CropRight\r
         {\r
-            get\r
-            {\r
-                return this.q_cropRight;\r
-            }\r
+            get { return q_cropRight; }\r
         }\r
 \r
-        private Boolean q_detelecine;\r
         /// <summary>\r
         /// Returns a boolean to indicate wither DeTelecine is on or off\r
         /// </summary>\r
         public Boolean DeTelecine\r
         {\r
-            get\r
-            {\r
-                return this.q_detelecine;\r
-            }\r
+            get { return q_detelecine; }\r
         }\r
 \r
-        private int q_deBlock;\r
         /// <summary>\r
         /// Returns a boolean to indicate wither DeBlock is on or off.\r
         /// </summary>\r
         public int DeBlock\r
         {\r
-            get\r
-            {\r
-                return this.q_deBlock;\r
-            }\r
+            get { return q_deBlock; }\r
         }\r
 \r
-        private string q_deinterlace;\r
         /// <summary>\r
         /// Returns a string with the De-Interlace option used.\r
         /// </summary>\r
         public string DeInterlace\r
         {\r
-            get\r
-            {\r
-                return this.q_deinterlace;\r
-            }\r
+            get { return q_deinterlace; }\r
         }\r
 \r
-        private string q_denoise;\r
         /// <summary>\r
         /// Returns a string with the DeNoise option used.\r
         /// </summary>\r
         public string DeNoise\r
         {\r
-            get\r
-            {\r
-                return this.q_denoise;\r
-            }\r
+            get { return q_denoise; }\r
         }\r
 \r
-        private Boolean q_decomb;\r
         /// <summary>\r
         /// Returns a string with the DeNoise option used.\r
         /// </summary>\r
         public Boolean Decomb\r
         {\r
-            get\r
-            {\r
-                return this.q_decomb;\r
-            }\r
+            get { return q_decomb; }\r
         }\r
 \r
-        private Boolean q_anamorphic;\r
         /// <summary>\r
         /// Returns a boolean to indicate wither Anamorphic is on or off.\r
         /// </summary>\r
         public Boolean Anamorphic\r
         {\r
-            get\r
-            {\r
-                return this.q_anamorphic;\r
-            }\r
+            get { return q_anamorphic; }\r
         }\r
 \r
-        private Boolean q_looseAnamorphic;\r
         /// <summary>\r
         /// Returns a boolean to indicate wither Anamorphic is on or off.\r
         /// </summary>\r
         public Boolean LooseAnamorphic\r
         {\r
-            get\r
-            {\r
-                return this.q_looseAnamorphic;\r
-            }\r
+            get { return q_looseAnamorphic; }\r
         }\r
 \r
-        private Boolean q_chapterMarkers;\r
         /// <summary>\r
         /// Returns a boolean to indicate wither Chapter Markers is on or off.\r
         /// </summary>\r
         public Boolean ChapterMarkers\r
         {\r
-            get\r
-            {\r
-                return this.q_chapterMarkers;\r
-            }\r
+            get { return q_chapterMarkers; }\r
         }\r
+\r
         #endregion\r
 \r
         #region Video Settings\r
+\r
+        private string q_avgBitrate;\r
         private Boolean q_grayscale;\r
+        private Boolean q_ipodAtom;\r
+        private Boolean q_largeMp4;\r
+        private Boolean q_optimizeMp4;\r
+        private Boolean q_turboFirst;\r
+\r
+        private Boolean q_twoPass;\r
+        private string q_videoFramerate;\r
+        private int q_videoQuality;\r
+        private string q_videoTargetSize;\r
+\r
         /// <summary>\r
         /// Returns a boolean to indicate wither Grayscale is on or off.\r
         /// </summary>\r
         public Boolean Grayscale\r
         {\r
-            get\r
-            {\r
-                return this.q_grayscale;\r
-            }\r
+            get { return q_grayscale; }\r
         }\r
 \r
-        private Boolean q_twoPass;\r
         /// <summary>\r
         /// Returns a boolean to indicate wither Two Pass Encoding is on or off.\r
         /// </summary>\r
         public Boolean TwoPass\r
         {\r
-            get\r
-            {\r
-                return this.q_twoPass;\r
-            }\r
+            get { return q_twoPass; }\r
         }\r
 \r
-        private Boolean q_turboFirst;\r
         /// <summary>\r
         /// Returns a boolean to indicate wither Chapter Markers is on or off.\r
         /// </summary>\r
         public Boolean TurboFirstPass\r
         {\r
-            get\r
-            {\r
-                return this.q_turboFirst;\r
-            }\r
+            get { return q_turboFirst; }\r
         }\r
 \r
-        private Boolean q_largeMp4;\r
         /// <summary>\r
         /// Returns a boolean to indicate wither Larger MP4 files is on or off.\r
         /// </summary>\r
         public Boolean LargeMP4\r
         {\r
-            get\r
-            {\r
-                return this.q_largeMp4;\r
-            }\r
+            get { return q_largeMp4; }\r
         }\r
 \r
-        private Boolean q_ipodAtom;\r
         /// <summary>\r
         /// Returns a boolean to indicate wither Larger MP4 files is on or off.\r
         /// </summary>\r
         public Boolean IpodAtom\r
         {\r
-            get\r
-            {\r
-                return this.q_ipodAtom;\r
-            }\r
+            get { return q_ipodAtom; }\r
         }\r
 \r
-        private Boolean q_optimizeMp4;\r
         /// <summary>\r
         /// Returns a boolean to indicate wither Larger MP4 files is on or off.\r
         /// </summary>\r
         public Boolean OptimizeMP4\r
         {\r
-            get\r
-            {\r
-                return this.q_optimizeMp4;\r
-            }\r
+            get { return q_optimizeMp4; }\r
         }\r
 \r
-        private string q_videoFramerate;\r
         /// <summary>\r
         /// Returns a string with the video Framerate\r
         /// </summary>\r
         public string VideoFramerate\r
         {\r
-            get\r
-            {\r
-                return this.q_videoFramerate;\r
-            }\r
+            get { return q_videoFramerate; }\r
         }\r
 \r
-        private string q_avgBitrate;\r
         /// <summary>\r
         /// Returns a string with the average video bitrate\r
         /// </summary>\r
         public string AverageVideoBitrate\r
         {\r
-            get\r
-            {\r
-                return this.q_avgBitrate;\r
-            }\r
+            get { return q_avgBitrate; }\r
         }\r
 \r
-        private string q_videoTargetSize;\r
         /// <summary>\r
         /// Returns a string with the video target size\r
         /// </summary>\r
         public string VideoTargetSize\r
         {\r
-            get\r
-            {\r
-                return this.q_videoTargetSize;\r
-            }\r
+            get { return q_videoTargetSize; }\r
         }\r
 \r
-        private int q_videoQuality;\r
         /// <summary>\r
         /// Returns a int with the video quality value\r
         /// </summary>\r
         public int VideoQuality\r
         {\r
-            get\r
-            {\r
-                return this.q_videoQuality;\r
-            }\r
+            get { return q_videoQuality; }\r
         }\r
 \r
         #endregion\r
 \r
         #region Audio Settings\r
+\r
+        private string q_audioBitrate1;\r
+        private string q_audioBitrate2;\r
+        private string q_audioBitrate3;\r
+        private string q_audioBitrate4;\r
+        private string q_audioEncoder1;\r
+        private string q_audioEncoder2;\r
+        private string q_audioEncoder3;\r
+        private string q_audioEncoder4;\r
+        private string q_audioSamplerate1;\r
+        private string q_audioSamplerate2;\r
+        private string q_audioSamplerate3;\r
+        private string q_audioSamplerate4;\r
         private string q_audioTrack1;\r
+        private string q_audioTrack2;\r
+        private string q_audioTrack3;\r
+        private string q_audioTrack4;\r
+        private string q_audioTrackMix1;\r
+        private string q_audioTrackMix2;\r
+        private string q_audioTrackMix3;\r
+        private string q_audioTrackMix4;\r
+        private double q_drc1;\r
+        private double q_drc2;\r
+        private double q_drc3;\r
+        private double q_drc4;\r
+        private Boolean q_forcedSubs;\r
+        private string q_subtitles;\r
+\r
         /// <summary>\r
         /// Returns a string with the selected Audio track\r
         /// </summary>\r
         public string AudioTrack1\r
         {\r
-            get\r
-            {\r
-                return this.q_audioTrack1;\r
-            }\r
+            get { return q_audioTrack1; }\r
         }\r
 \r
-        private string q_audioTrack2;\r
         /// <summary>\r
         /// Returns a string with the selected Audio track\r
         /// </summary>\r
         public string AudioTrack2\r
         {\r
-            get\r
-            {\r
-                return this.q_audioTrack2;\r
-            }\r
+            get { return q_audioTrack2; }\r
         }\r
 \r
-        private string q_audioTrack3;\r
         /// <summary>\r
         /// Returns a string with the selected Audio track\r
         /// </summary>\r
         public string AudioTrack3\r
         {\r
-            get\r
-            {\r
-                return this.q_audioTrack3;\r
-            }\r
+            get { return q_audioTrack3; }\r
         }\r
 \r
-        private string q_audioTrack4;\r
         /// <summary>\r
         /// Returns a string with the selected Audio track\r
         /// </summary>\r
         public string AudioTrack4\r
         {\r
-            get\r
-            {\r
-                return this.q_audioTrack4;\r
-            }\r
+            get { return q_audioTrack4; }\r
         }\r
 \r
-        private string q_audioTrackMix1;\r
         /// <summary>\r
         /// Returns a string with the First selected Audio track Mix\r
         /// </summary>\r
         public string AudioTrackMix1\r
         {\r
-            get\r
-            {\r
-                return this.q_audioTrackMix1;\r
-            }\r
+            get { return q_audioTrackMix1; }\r
         }\r
 \r
-        private string q_audioTrackMix2;\r
         /// <summary>\r
         /// Returns a string with the First selected Audio track Mix\r
         /// </summary>\r
         public string AudioTrackMix2\r
         {\r
-            get\r
-            {\r
-                return this.q_audioTrackMix2;\r
-            }\r
+            get { return q_audioTrackMix2; }\r
         }\r
 \r
-        private string q_audioTrackMix3;\r
         /// <summary>\r
         /// Returns a string with the First selected Audio track Mix\r
         /// </summary>\r
         public string AudioTrackMix3\r
         {\r
-            get\r
-            {\r
-                return this.q_audioTrackMix3;\r
-            }\r
+            get { return q_audioTrackMix3; }\r
         }\r
 \r
-        private string q_audioTrackMix4;\r
         /// <summary>\r
         /// Returns a string with the First selected Audio track Mix\r
         /// </summary>\r
         public string AudioTrackMix4\r
         {\r
-            get\r
-            {\r
-                return this.q_audioTrackMix4;\r
-            }\r
+            get { return q_audioTrackMix4; }\r
         }\r
 \r
-        private string q_audioEncoder1;\r
         /// <summary>\r
         /// Returns an String\r
         /// The Audio Encoder used.\r
         /// </summary>\r
         public string AudioEncoder1\r
         {\r
-            get\r
-            {\r
-                return this.q_audioEncoder1;\r
-            }\r
+            get { return q_audioEncoder1; }\r
         }\r
 \r
-        private string q_audioEncoder2;\r
         /// <summary>\r
         /// Returns an String\r
         /// The Audio Encoder used.\r
         /// </summary>\r
         public string AudioEncoder2\r
         {\r
-            get\r
-            {\r
-                return this.q_audioEncoder2;\r
-            }\r
+            get { return q_audioEncoder2; }\r
         }\r
 \r
-        private string q_audioEncoder3;\r
         /// <summary>\r
         /// Returns an String\r
         /// The Audio Encoder used.\r
         /// </summary>\r
         public string AudioEncoder3\r
         {\r
-            get\r
-            {\r
-                return this.q_audioEncoder3;\r
-            }\r
+            get { return q_audioEncoder3; }\r
         }\r
 \r
-        private string q_audioEncoder4;\r
         /// <summary>\r
         /// Returns an String\r
         /// The Audio Encoder used.\r
         /// </summary>\r
         public string AudioEncoder4\r
         {\r
-            get\r
-            {\r
-                return this.q_audioEncoder4;\r
-            }\r
+            get { return q_audioEncoder4; }\r
         }\r
 \r
-        private string q_audioBitrate1;\r
         /// <summary>\r
         /// Returns a string with the audio bitrate\r
         /// </summary>\r
         public string AudioBitrate1\r
         {\r
-            get\r
-            {\r
-                return this.q_audioBitrate1;\r
-            }\r
+            get { return q_audioBitrate1; }\r
         }\r
 \r
-        private string q_audioBitrate2;\r
         /// <summary>\r
         /// Returns a string with the audio bitrate\r
         /// </summary>\r
         public string AudioBitrate2\r
         {\r
-            get\r
-            {\r
-                return this.q_audioBitrate2;\r
-            }\r
+            get { return q_audioBitrate2; }\r
         }\r
 \r
-        private string q_audioBitrate3;\r
         /// <summary>\r
         /// Returns a string with the audio bitrate\r
         /// </summary>\r
         public string AudioBitrate3\r
         {\r
-            get\r
-            {\r
-                return this.q_audioBitrate3;\r
-            }\r
+            get { return q_audioBitrate3; }\r
         }\r
 \r
-        private string q_audioBitrate4;\r
         /// <summary>\r
         /// Returns a string with the audio bitrate\r
         /// </summary>\r
         public string AudioBitrate4\r
         {\r
-            get\r
-            {\r
-                return this.q_audioBitrate4;\r
-            }\r
+            get { return q_audioBitrate4; }\r
         }\r
 \r
-        private string q_audioSamplerate1;\r
         /// <summary>\r
         /// Returns a string with the audio sample rate\r
         /// </summary>\r
         public string AudioSamplerate1\r
         {\r
-            get\r
-            {\r
-                return this.q_audioSamplerate1;\r
-            }\r
+            get { return q_audioSamplerate1; }\r
         }\r
 \r
-        private string q_audioSamplerate2;\r
         /// <summary>\r
         /// Returns a string with the audio sample rate\r
         /// </summary>\r
         public string AudioSamplerate2\r
         {\r
-            get\r
-            {\r
-                return this.q_audioSamplerate2;\r
-            }\r
+            get { return q_audioSamplerate2; }\r
         }\r
 \r
-        private string q_audioSamplerate3;\r
         /// <summary>\r
         /// Returns a string with the audio sample rate\r
         /// </summary>\r
         public string AudioSamplerate3\r
         {\r
-            get\r
-            {\r
-                return this.q_audioSamplerate3;\r
-            }\r
+            get { return q_audioSamplerate3; }\r
         }\r
 \r
-        private string q_audioSamplerate4;\r
         /// <summary>\r
         /// Returns a string with the audio sample rate\r
         /// </summary>\r
         public string AudioSamplerate4\r
         {\r
-            get\r
-            {\r
-                return this.q_audioSamplerate4;\r
-            }\r
+            get { return q_audioSamplerate4; }\r
         }\r
 \r
-        private double q_drc1;\r
         /// <summary>\r
         /// Returns a string with the selected subtitle track\r
         /// </summary>\r
         public double DRC1\r
         {\r
-            get\r
-            {\r
-                return this.q_drc1;\r
-            }\r
+            get { return q_drc1; }\r
         }\r
 \r
-        private double q_drc2;\r
         /// <summary>\r
         /// Returns a string with the selected subtitle track\r
         /// </summary>\r
         public double DRC2\r
         {\r
-            get\r
-            {\r
-                return this.q_drc2;\r
-            }\r
+            get { return q_drc2; }\r
         }\r
 \r
-        private double q_drc3;\r
         /// <summary>\r
         /// Returns a string with the selected subtitle track\r
         /// </summary>\r
         public double DRC3\r
         {\r
-            get\r
-            {\r
-                return this.q_drc3;\r
-            }\r
+            get { return q_drc3; }\r
         }\r
 \r
-        private double q_drc4;\r
         /// <summary>\r
         /// Returns a string with the selected subtitle track\r
         /// </summary>\r
         public double DRC4\r
         {\r
-            get\r
-            {\r
-                return this.q_drc4;\r
-            }\r
+            get { return q_drc4; }\r
         }\r
 \r
-        private string q_subtitles;\r
         /// <summary>\r
         /// Returns a string with the selected subtitle track\r
         /// </summary>\r
         public string Subtitles\r
         {\r
-            get\r
-            {\r
-                return this.q_subtitles;\r
-            }\r
+            get { return q_subtitles; }\r
         }\r
 \r
-        private Boolean q_forcedSubs;\r
         /// <summary>\r
         /// Returns a string with the selected subtitle track\r
         /// </summary>\r
         public Boolean ForcedSubtitles\r
         {\r
-            get\r
-            {\r
-                return this.q_forcedSubs;\r
-            }\r
+            get { return q_forcedSubs; }\r
         }\r
 \r
         #endregion\r
 \r
         #region Other\r
+\r
         private string q_h264;\r
+        private Boolean q_verbose;\r
+\r
         /// <summary>\r
         /// Returns a string with the Advanced H264 query string\r
         /// </summary>\r
         public string H264Query\r
         {\r
-            get\r
-            {\r
-                return this.q_h264;\r
-            }\r
+            get { return q_h264; }\r
         }\r
-        private Boolean q_verbose;\r
+\r
         /// <summary>\r
         /// Returns a string with the Advanced H264 query string\r
         /// </summary>\r
         public Boolean Verbose\r
         {\r
-            get\r
-            {\r
-                return this.q_verbose;\r
-            }\r
+            get { return q_verbose; }\r
         }\r
+\r
         #endregion\r
 \r
         #endregion\r
 \r
+        // All the Main Window GUI options\r
+\r
         /// <summary>\r
         /// Takes in a query which can be in any order and parses it. \r
         /// All varibles are then set so they can be used elsewhere.\r
@@ -781,9 +618,10 @@ namespace Handbrake.Functions
         /// <returns>A Parsed Query</returns>\r
         public static QueryParser Parse(String input)\r
         {\r
-            QueryParser thisQuery = new QueryParser();\r
+            var thisQuery = new QueryParser();\r
 \r
             #region Regular Expressions\r
+\r
             // Useful Destination Finder\r
             //Regex r1 = new Regex(@"(-i)(?:\s\"")([a-zA-Z0-9?';!^%&*()_\-:\\\s\.]+)(?:\"")");\r
             //Match source = r1.Match(input.Replace('"', '\"'));\r
@@ -830,15 +668,16 @@ namespace Handbrake.Functions
             Match audioTrack3 = Regex.Match(input, @"-a ([0-9]*),([0-9]*),([0-9]*)");\r
             Match audioTrack4 = Regex.Match(input, @"-a ([0-9]*),([0-9]*),([0-9]*),([0-9]*)");\r
 \r
-            Match audioTrack1Mix = Regex.Match(input, @"-6 ([0-9a-z0-9]*)");  \r
+            Match audioTrack1Mix = Regex.Match(input, @"-6 ([0-9a-z0-9]*)");\r
             Match audioTrack2Mix = Regex.Match(input, @"-6 ([0-9a-z0-9]*),([0-9a-z0-9]*)");\r
             Match audioTrack3Mix = Regex.Match(input, @"-6 ([0-9a-z0-9]*),([0-9a-z0-9]*),([0-9a-z0-9]*)");\r
-            Match audioTrack4Mix = Regex.Match(input, @"-6 ([0-9a-z0-9]*),([0-9a-z0-9]*),([0-9a-z0-9]*),([0-9a-z0-9]*)"); \r
+            Match audioTrack4Mix = Regex.Match(input, @"-6 ([0-9a-z0-9]*),([0-9a-z0-9]*),([0-9a-z0-9]*),([0-9a-z0-9]*)");\r
 \r
             Match audioEncoder1 = Regex.Match(input, @"-E ([a-zA-Z0-9+]*)");\r
             Match audioEncoder2 = Regex.Match(input, @"-E ([a-zA-Z0-9+]*),([a-zA-Z0-9+]*)");\r
             Match audioEncoder3 = Regex.Match(input, @"-E ([a-zA-Z0-9+]*),([a-zA-Z0-9+]*),([a-zA-Z0-9+]*)");\r
-            Match audioEncoder4 = Regex.Match(input, @"-E ([a-zA-Z0-9+]*),([a-zA-Z0-9+]*),([a-zA-Z0-9+]*),([a-zA-Z0-9+]*)");\r
+            Match audioEncoder4 = Regex.Match(input,\r
+                                              @"-E ([a-zA-Z0-9+]*),([a-zA-Z0-9+]*),([a-zA-Z0-9+]*),([a-zA-Z0-9+]*)");\r
 \r
             Match audioBitrate1 = Regex.Match(input, @"-B ([0-9auto]*)");\r
             Match audioBitrate2 = Regex.Match(input, @"-B ([0-9auto]*),([0-9auto]*)");\r
@@ -864,18 +703,21 @@ namespace Handbrake.Functions
 \r
             //Program Options\r
             Match verbose = Regex.Match(input, @" -v");\r
+\r
             #endregion\r
 \r
             #region Set Varibles\r
+\r
             try\r
             {\r
                 #region Source Tab\r
-                if (title.Success != false)\r
-                           thisQuery.q_dvdTitle = int.Parse(title.ToString().Replace("-t ", ""));\r
 \r
-                if (chapters.Success != false)\r
+                if (title.Success)\r
+                    thisQuery.q_dvdTitle = int.Parse(title.ToString().Replace("-t ", ""));\r
+\r
+                if (chapters.Success)\r
                 {\r
-                    string[] actTitles = new string[2];\r
+                    var actTitles = new string[2];\r
                     actTitles = chapters.ToString().Replace("-c ", "").Split('-');\r
                     thisQuery.q_chaptersStart = int.Parse(actTitles[0]);\r
                     if (actTitles.Length > 1)\r
@@ -887,7 +729,7 @@ namespace Handbrake.Functions
                         thisQuery.q_chaptersFinish = thisQuery.q_chaptersStart;\r
                 }\r
 \r
-                if (format.Success != false)\r
+                if (format.Success)\r
                     thisQuery.q_format = format.ToString().Replace("-f ", "");\r
 \r
                 #endregion\r
@@ -919,22 +761,22 @@ namespace Handbrake.Functions
 \r
                 #region Picture Tab\r
 \r
-                if (width.Success != false)\r
+                if (width.Success)\r
                     thisQuery.q_videoWidth = int.Parse(width.ToString().Replace("-w ", ""));\r
 \r
-                if (height.Success != false)\r
+                if (height.Success)\r
                     thisQuery.q_videoHeight = int.Parse(height.ToString().Replace("-l ", ""));\r
 \r
-                if (maxWidth.Success != false)\r
+                if (maxWidth.Success)\r
                     thisQuery.q_maxWidth = int.Parse(maxWidth.ToString().Replace("-X ", ""));\r
 \r
-                if (maxHeight.Success != false)\r
+                if (maxHeight.Success)\r
                     thisQuery.q_maxHeight = int.Parse(maxHeight.ToString().Replace("-Y ", ""));\r
 \r
-                if (crop.Success != false)\r
+                if (crop.Success)\r
                 {\r
                     thisQuery.q_cropValues = crop.ToString().Replace("--crop ", "");\r
-                    string[] actCropValues = new string[3];\r
+                    var actCropValues = new string[3];\r
                     actCropValues = thisQuery.q_cropValues.Split(':');\r
                     thisQuery.q_croptop = actCropValues[0];\r
                     thisQuery.q_cropbottom = actCropValues[1];\r
@@ -945,7 +787,7 @@ namespace Handbrake.Functions
                 // Deblock Slider\r
                 string deblockValue = "";\r
                 thisQuery.q_deBlock = 0;\r
-                if (deblock.Success != false)\r
+                if (deblock.Success)\r
                     deblockValue = deblock.ToString().Replace("--deblock=", "");\r
 \r
                 if (deblockValue != "")\r
@@ -955,9 +797,9 @@ namespace Handbrake.Functions
                 thisQuery.q_decomb = decomb.Success;\r
 \r
                 thisQuery.q_deinterlace = "None";\r
-                if (deinterlace.Success != false)\r
+                if (deinterlace.Success)\r
                 {\r
-                    switch (deinterlace.ToString().Replace("--deinterlace=", "").Replace("\"",""))\r
+                    switch (deinterlace.ToString().Replace("--deinterlace=", "").Replace("\"", ""))\r
                     {\r
                         case "fast":\r
                             thisQuery.q_deinterlace = "Fast";\r
@@ -978,7 +820,7 @@ namespace Handbrake.Functions
                 }\r
 \r
                 thisQuery.q_denoise = "None";\r
-                if (denoise.Success != false)\r
+                if (denoise.Success)\r
                 {\r
                     switch (denoise.ToString().Replace("--denoise=", "").Replace("\"", ""))\r
                     {\r
@@ -995,36 +837,36 @@ namespace Handbrake.Functions
                             thisQuery.q_denoise = "None";\r
                             break;\r
                     }\r
-\r
                 }\r
                 thisQuery.q_anamorphic = anamorphic.Success;\r
-                if (chapterMarkersFileMode.Success == true || chapterMarkers.Success == true)\r
+                if (chapterMarkersFileMode.Success || chapterMarkers.Success)\r
                     thisQuery.q_chapterMarkers = true;\r
-                \r
+\r
                 thisQuery.q_looseAnamorphic = lanamorphic.Success;\r
 \r
                 #endregion\r
-     \r
+\r
                 #region Video Settings Tab\r
+\r
                 thisQuery.q_grayscale = grayscale.Success;\r
                 thisQuery.q_twoPass = twoPass.Success;\r
                 thisQuery.q_turboFirst = turboFirstPass.Success;\r
                 thisQuery.q_largeMp4 = largerMp4.Success;\r
-                if (videoFramerate.Success != false)\r
+                if (videoFramerate.Success)\r
                     thisQuery.q_videoFramerate = videoFramerate.ToString().Replace("-r ", "");\r
                 else\r
                     thisQuery.q_videoFramerate = "Same as source";\r
 \r
-                if (videoBitrate.Success != false)\r
+                if (videoBitrate.Success)\r
                     thisQuery.q_avgBitrate = videoBitrate.ToString().Replace("-b ", "");\r
-                if (videoFilesize.Success != false)\r
+                if (videoFilesize.Success)\r
                     thisQuery.q_videoTargetSize = videoFilesize.ToString().Replace("-S ", "");\r
 \r
                 double qConvert = 0;\r
-                if (videoQuality.Success != false)\r
+                if (videoQuality.Success)\r
                 {\r
-                    qConvert = double.Parse(videoQuality.ToString().Replace("-q ", ""), Culture) * 100;\r
-                    qConvert = System.Math.Ceiling(qConvert);\r
+                    qConvert = double.Parse(videoQuality.ToString().Replace("-q ", ""), Culture)*100;\r
+                    qConvert = Math.Ceiling(qConvert);\r
                     thisQuery.q_videoQuality = int.Parse(qConvert.ToString());\r
                 }\r
                 thisQuery.q_ipodAtom = ipodAtom.Success;\r
@@ -1037,7 +879,7 @@ namespace Handbrake.Functions
                 // Tracks\r
                 thisQuery.q_audioTrack1 = "Automatic";\r
 \r
-                if (audioTrack2.Success != false)\r
+                if (audioTrack2.Success)\r
                 {\r
                     string[] audioChan = audioTrack2.ToString().Split(',');\r
                     thisQuery.q_audioTrack2 = audioChan[1];\r
@@ -1045,7 +887,7 @@ namespace Handbrake.Functions
                 else\r
                     thisQuery.q_audioTrack2 = "None";\r
 \r
-                if (audioTrack3.Success != false)\r
+                if (audioTrack3.Success)\r
                 {\r
                     string[] audioChan = audioTrack3.ToString().Split(',');\r
                     thisQuery.q_audioTrack3 = audioChan[2];\r
@@ -1053,7 +895,7 @@ namespace Handbrake.Functions
                 else\r
                     thisQuery.q_audioTrack3 = "None";\r
 \r
-                if (audioTrack4.Success != false)\r
+                if (audioTrack4.Success)\r
                 {\r
                     string[] audioChan = audioTrack4.ToString().Split(',');\r
                     thisQuery.q_audioTrack4 = audioChan[3];\r
@@ -1061,51 +903,52 @@ namespace Handbrake.Functions
                 else\r
                     thisQuery.q_audioTrack4 = "None";\r
 \r
-    \r
+\r
                 // Mixdowns\r
                 thisQuery.q_audioTrackMix1 = "Automatic";\r
-                if (audioTrack1Mix.Success != false)\r
-                    thisQuery.q_audioTrackMix1 = getMixDown(audioTrack1Mix.ToString().Replace("-6 ", "").Replace(" ", ""));\r
+                if (audioTrack1Mix.Success)\r
+                    thisQuery.q_audioTrackMix1 =\r
+                        getMixDown(audioTrack1Mix.ToString().Replace("-6 ", "").Replace(" ", ""));\r
 \r
                 thisQuery.q_audioTrackMix2 = "Automatic";\r
-                if (audioTrack2Mix.Success != false)\r
+                if (audioTrack2Mix.Success)\r
                 {\r
                     string[] audio2mix = audioTrack2Mix.ToString().Split(',');\r
                     thisQuery.q_audioTrackMix2 = getMixDown(audio2mix[1].Trim());\r
                 }\r
 \r
                 thisQuery.q_audioTrackMix3 = "Automatic";\r
-                if (audioTrack3Mix.Success != false)\r
+                if (audioTrack3Mix.Success)\r
                 {\r
                     string[] audio3mix = audioTrack3Mix.ToString().Split(',');\r
                     thisQuery.q_audioTrackMix3 = getMixDown(audio3mix[2].Trim());\r
                 }\r
 \r
                 thisQuery.q_audioTrackMix4 = "Automatic";\r
-                if (audioTrack4Mix.Success != false)\r
+                if (audioTrack4Mix.Success)\r
                 {\r
                     string[] audio4mix = audioTrack4Mix.ToString().Split(',');\r
                     thisQuery.q_audioTrackMix4 = getMixDown(audio4mix[3].Trim());\r
                 }\r
-                \r
+\r
 \r
                 // Audio Encoders\r
-                if (audioEncoder1.Success != false)\r
+                if (audioEncoder1.Success)\r
                     thisQuery.q_audioEncoder1 = getAudioEncoder(audioEncoder1.ToString().Replace("-E ", ""));\r
 \r
-                if (audioEncoder2.Success != false)\r
+                if (audioEncoder2.Success)\r
                 {\r
                     string[] audio2enc = audioEncoder2.ToString().Split(',');\r
                     thisQuery.q_audioEncoder2 = getAudioEncoder(audio2enc[1].Trim());\r
                 }\r
 \r
-                if (audioEncoder3.Success != false)\r
+                if (audioEncoder3.Success)\r
                 {\r
                     string[] audio3enc = audioEncoder3.ToString().Split(',');\r
                     thisQuery.q_audioEncoder3 = getAudioEncoder(audio3enc[2].Trim());\r
                 }\r
 \r
-                if (audioEncoder4.Success != false)\r
+                if (audioEncoder4.Success)\r
                 {\r
                     string[] audio4enc = audioEncoder4.ToString().Split(',');\r
                     thisQuery.q_audioEncoder4 = getAudioEncoder(audio4enc[3].Trim());\r
@@ -1114,22 +957,22 @@ namespace Handbrake.Functions
 \r
                 // Audio Bitrate\r
                 thisQuery.q_audioBitrate1 = "";\r
-                if (audioBitrate1.Success != false)\r
+                if (audioBitrate1.Success)\r
                 {\r
                     thisQuery.q_audioBitrate1 = audioBitrate1.ToString().Replace("-B ", "").Trim();\r
                     if (audioBitrate1.ToString().Replace("-B ", "").Trim() == "0") thisQuery.q_audioBitrate1 = "Auto";\r
                 }\r
 \r
                 thisQuery.q_audioBitrate2 = "";\r
-                if (audioBitrate2.Success != false && audioTrack2.Success == true)\r
+                if (audioBitrate2.Success && audioTrack2.Success)\r
                 {\r
                     string[] audioBitrateSelect = audioBitrate2.ToString().Split(',');\r
                     if (audioBitrateSelect[1].Trim() == "0") audioBitrateSelect[1] = "Auto";\r
-                    thisQuery.q_audioBitrate2 = audioBitrateSelect[1].Trim();                      \r
+                    thisQuery.q_audioBitrate2 = audioBitrateSelect[1].Trim();\r
                 }\r
 \r
                 thisQuery.q_audioBitrate3 = "";\r
-                if (audioBitrate3.Success != false && audioTrack3.Success == true)\r
+                if (audioBitrate3.Success && audioTrack3.Success)\r
                 {\r
                     string[] audioBitrateSelect = audioBitrate3.ToString().Split(',');\r
                     if (audioBitrateSelect[2].Trim() == "0") audioBitrateSelect[2] = "Auto";\r
@@ -1137,7 +980,7 @@ namespace Handbrake.Functions
                 }\r
 \r
                 thisQuery.q_audioBitrate4 = "";\r
-                if (audioBitrate4.Success != false)\r
+                if (audioBitrate4.Success)\r
                 {\r
                     string[] audioBitrateSelect = audioBitrate4.ToString().Split(',');\r
                     if (audioBitrateSelect[3].Trim() == "0") audioBitrateSelect[3] = "Auto";\r
@@ -1148,28 +991,28 @@ namespace Handbrake.Functions
                 // Audio Sample Rate\r
                 // Make sure to change 0 to Auto\r
                 thisQuery.q_audioSamplerate1 = "Auto";\r
-                if (audioSampleRate1.Success != false)\r
+                if (audioSampleRate1.Success)\r
                 {\r
                     thisQuery.q_audioSamplerate1 = audioSampleRate1.ToString().Replace("-R ", "").Trim();\r
                     if (thisQuery.q_audioSamplerate1 == "0") thisQuery.q_audioSamplerate1 = "Auto";\r
                 }\r
-                    \r
 \r
-                if (audioSampleRate2.Success != false)\r
+\r
+                if (audioSampleRate2.Success)\r
                 {\r
                     string[] audioSRSelect = audioSampleRate2.ToString().Split(',');\r
                     if (audioSRSelect[1] == "0") audioSRSelect[1] = "Auto";\r
                     thisQuery.q_audioSamplerate2 = audioSRSelect[1].Trim();\r
                 }\r
 \r
-                if (audioSampleRate3.Success != false)\r
+                if (audioSampleRate3.Success)\r
                 {\r
                     string[] audioSRSelect = audioSampleRate3.ToString().Split(',');\r
                     if (audioSRSelect[2] == "0") audioSRSelect[2] = "Auto";\r
                     thisQuery.q_audioSamplerate3 = audioSRSelect[2].Trim();\r
                 }\r
 \r
-                if (audioSampleRate4.Success != false)\r
+                if (audioSampleRate4.Success)\r
                 {\r
                     string[] audioSRSelect = audioSampleRate4.ToString().Split(',');\r
                     if (audioSRSelect[3] == "0") audioSRSelect[3] = "Auto";\r
@@ -1180,15 +1023,15 @@ namespace Handbrake.Functions
                 float drcValue;\r
 \r
                 thisQuery.q_drc1 = 1;\r
-                if (drc1.Success != false)\r
+                if (drc1.Success)\r
                 {\r
                     string value = drc1.ToString().Replace("-D ", "");\r
                     float.TryParse(value, out drcValue);\r
                     thisQuery.q_drc1 = drcValue;\r
                 }\r
-               \r
-                thisQuery.q_drc2 = 1;   \r
-                if (drc2.Success != false)\r
+\r
+                thisQuery.q_drc2 = 1;\r
+                if (drc2.Success)\r
                 {\r
                     string[] drcPoint = drc2.ToString().Split(',');\r
                     float.TryParse(drcPoint[1], out drcValue);\r
@@ -1196,7 +1039,7 @@ namespace Handbrake.Functions
                 }\r
 \r
                 thisQuery.q_drc3 = 1;\r
-                if (drc3.Success != false)\r
+                if (drc3.Success)\r
                 {\r
                     string[] drcPoint = drc3.ToString().Split(',');\r
                     float.TryParse(drcPoint[2], out drcValue);\r
@@ -1204,7 +1047,7 @@ namespace Handbrake.Functions
                 }\r
 \r
                 thisQuery.q_drc4 = 1;\r
-                if (drc4.Success != false)\r
+                if (drc4.Success)\r
                 {\r
                     string[] drcPoint = drc4.ToString().Split(',');\r
                     float.TryParse(drcPoint[3], out drcValue);\r
@@ -1212,7 +1055,7 @@ namespace Handbrake.Functions
                 }\r
 \r
                 // Subtitle Stuff\r
-                if (subtitles.Success != false)\r
+                if (subtitles.Success)\r
                     thisQuery.q_subtitles = subtitles.ToString().Replace("-s ", "");\r
                 else\r
                 {\r
@@ -1227,22 +1070,27 @@ namespace Handbrake.Functions
                 #endregion\r
 \r
                 #region H.264 and other\r
+\r
                 //\r
                 //H264 Tab\r
                 //\r
-                if (x264.Success != false)\r
+                if (x264.Success)\r
                     thisQuery.q_h264 = x264.ToString().Replace("-x ", "");\r
 \r
                 //\r
                 //Progam Options\r
                 //\r
                 thisQuery.q_verbose = verbose.Success;\r
+\r
                 #endregion\r
             }\r
             catch (Exception exc)\r
             {\r
-                MessageBox.Show("An error has occured in the Query Parser. Please report this error on the forum in the 'Windows' support section. \n\n" + exc.ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
+                MessageBox.Show(\r
+                    "An error has occured in the Query Parser. Please report this error on the forum in the 'Windows' support section. \n\n" +\r
+                    exc, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
             }\r
+\r
             #endregion\r
 \r
             return thisQuery;\r
@@ -1266,6 +1114,7 @@ namespace Handbrake.Functions
                     return "Automatic";\r
             }\r
         }\r
+\r
         private static string getAudioEncoder(string audioEnc)\r
         {\r
             switch (audioEnc)\r
index 493fb4d..d2d6f3f 100644 (file)
@@ -16,76 +16,59 @@ namespace Handbrake.Parsing
     /// </summary>\r
     public class AudioTrack\r
     {\r
+        private int m_bitrate;\r
+        private string m_format;\r
+        private int m_frequency;\r
+        private string m_language;\r
+        private string m_subFormat;\r
         private int m_trackNumber;\r
+\r
         /// <summary>\r
         /// The track number of this Audio Track\r
         /// </summary>\r
         public int TrackNumber\r
         {\r
-            get\r
-            {\r
-                return this.m_trackNumber;\r
-            }\r
+            get { return m_trackNumber; }\r
         }\r
 \r
-        private string m_language;\r
         /// <summary>\r
         /// The language (if detected) of this Audio Track\r
         /// </summary>\r
         public string Language\r
         {\r
-            get\r
-            {\r
-                return this.m_language;\r
-            }\r
+            get { return m_language; }\r
         }\r
 \r
-        private string m_format;\r
         /// <summary>\r
         /// The primary format of this Audio Track\r
         /// </summary>\r
         public string Format\r
         {\r
-            get\r
-            {\r
-                return this.m_format;\r
-            }\r
+            get { return m_format; }\r
         }\r
 \r
-        private string m_subFormat;\r
         /// <summary>\r
         /// Additional format info for this Audio Track\r
         /// </summary>\r
         public string SubFormat\r
         {\r
-            get\r
-            {\r
-                return this.m_subFormat;\r
-            }\r
+            get { return m_subFormat; }\r
         }\r
 \r
-        private int m_frequency;\r
         /// <summary>\r
         /// The frequency (in MHz) of this Audio Track\r
         /// </summary>\r
         public int Frequency\r
         {\r
-            get\r
-            {\r
-                return this.m_frequency;\r
-            }\r
+            get { return m_frequency; }\r
         }\r
 \r
-        private int m_bitrate;\r
         /// <summary>\r
         /// The bitrate (in kbps) of this Audio Track\r
         /// </summary>\r
         public int Bitrate\r
         {\r
-            get\r
-            {\r
-                return this.m_bitrate;\r
-            }\r
+            get { return m_bitrate; }\r
         }\r
 \r
         /// <summary>\r
@@ -94,32 +77,33 @@ namespace Handbrake.Parsing
         /// <returns>A string formatted as: {track #} {language} ({format}) ({sub-format})</returns>\r
         public override string ToString()\r
         {\r
-            if (this.m_subFormat == null)\r
-                return string.Format("{0} {1} ({2})", this.m_trackNumber, this.m_language, this.m_format);\r
+            if (m_subFormat == null)\r
+                return string.Format("{0} {1} ({2})", m_trackNumber, m_language, m_format);\r
             else\r
-                return string.Format("{0} {1} ({2}) ({3})", this.m_trackNumber, this.m_language, this.m_format, this.m_subFormat);\r
+                return string.Format("{0} {1} ({2}) ({3})", m_trackNumber, m_language, m_format, m_subFormat);\r
         }\r
 \r
         public static AudioTrack Parse(StringReader output)\r
         {\r
-            String audio_track= output.ReadLine();\r
-            Match m = Regex.Match(audio_track, @"^    \+ ([0-9]*), ([A-Za-z0-9]*) \((.*)\) \((.*)\), ([0-9]*)Hz, ([0-9]*)bps");\r
+            String audio_track = output.ReadLine();\r
+            Match m = Regex.Match(audio_track,\r
+                                  @"^    \+ ([0-9]*), ([A-Za-z0-9]*) \((.*)\) \((.*)\), ([0-9]*)Hz, ([0-9]*)bps");\r
             Match y = Regex.Match(audio_track, @"^    \+ ([0-9]*), ([A-Za-z0-9]*) \((.*)\)");\r
             if (m.Success)\r
             {\r
-                AudioTrack thisTrack = new AudioTrack();\r
-                thisTrack.m_trackNumber = int.Parse(m.Groups[1].Value.Trim().ToString());\r
+                var thisTrack = new AudioTrack();\r
+                thisTrack.m_trackNumber = int.Parse(m.Groups[1].Value.Trim());\r
                 thisTrack.m_language = m.Groups[2].Value;\r
                 thisTrack.m_format = m.Groups[3].Value;\r
                 thisTrack.m_subFormat = m.Groups[4].Value;\r
-                thisTrack.m_frequency = int.Parse(m.Groups[5].Value.Trim().ToString());\r
-                thisTrack.m_bitrate = int.Parse(m.Groups[6].Value.Trim().ToString());\r
+                thisTrack.m_frequency = int.Parse(m.Groups[5].Value.Trim());\r
+                thisTrack.m_bitrate = int.Parse(m.Groups[6].Value.Trim());\r
                 return thisTrack;\r
             }\r
             else if (y.Success)\r
             {\r
-                AudioTrack thisTrack = new AudioTrack();\r
-                thisTrack.m_trackNumber = int.Parse(y.Groups[1].Value.Trim().ToString());\r
+                var thisTrack = new AudioTrack();\r
+                thisTrack.m_trackNumber = int.Parse(y.Groups[1].Value.Trim());\r
                 thisTrack.m_language = y.Groups[2].Value;\r
                 thisTrack.m_format = y.Groups[3].Value;\r
                 return thisTrack;\r
@@ -130,10 +114,10 @@ namespace Handbrake.Parsing
 \r
         public static AudioTrack[] ParseList(StringReader output)\r
         {\r
-            List<AudioTrack> tracks = new List<AudioTrack>();\r
+            var tracks = new List<AudioTrack>();\r
             while (true)\r
             {\r
-                AudioTrack thisTrack = AudioTrack.Parse(output);\r
+                AudioTrack thisTrack = Parse(output);\r
                 if (thisTrack != null)\r
                     tracks.Add(thisTrack);\r
                 else\r
@@ -142,4 +126,4 @@ namespace Handbrake.Parsing
             return tracks.ToArray();\r
         }\r
     }\r
-}\r
+}
\ No newline at end of file
index 5269675..301fa57 100644 (file)
@@ -17,27 +17,23 @@ namespace Handbrake.Parsing
     public class Chapter\r
     {\r
         private int m_chapterNumber;\r
+\r
+        private TimeSpan m_duration;\r
+\r
         /// <summary>\r
         /// The number of this Chapter, in regards to it's parent Title\r
         /// </summary>\r
         public int ChapterNumber\r
         {\r
-            get\r
-            {\r
-                return this.m_chapterNumber;\r
-            }\r
+            get { return m_chapterNumber; }\r
         }\r
 \r
-        private TimeSpan m_duration;\r
         /// <summary>\r
         /// The length in time this Chapter spans\r
         /// </summary>\r
         public TimeSpan Duration\r
         {\r
-            get\r
-            {\r
-                return this.m_duration;\r
-            }\r
+            get { return m_duration; }\r
         }\r
 \r
         /// <summary>\r
@@ -46,16 +42,17 @@ namespace Handbrake.Parsing
         /// <returns>A string formatted as: {chapter #}</returns>\r
         public override string ToString()\r
         {\r
-            return this.m_chapterNumber.ToString();\r
+            return m_chapterNumber.ToString();\r
         }\r
 \r
         public static Chapter Parse(StringReader output)\r
         {\r
-            Match m = Regex.Match(output.ReadLine(), @"^    \+ ([0-9]*): cells ([0-9]*)->([0-9]*), ([0-9]*) blocks, duration ([0-9]{2}:[0-9]{2}:[0-9]{2})");\r
+            Match m = Regex.Match(output.ReadLine(),\r
+                                  @"^    \+ ([0-9]*): cells ([0-9]*)->([0-9]*), ([0-9]*) blocks, duration ([0-9]{2}:[0-9]{2}:[0-9]{2})");\r
             if (m.Success)\r
             {\r
-                Chapter thisChapter = new Chapter();\r
-                thisChapter.m_chapterNumber = int.Parse(m.Groups[1].Value.Trim().ToString());\r
+                var thisChapter = new Chapter();\r
+                thisChapter.m_chapterNumber = int.Parse(m.Groups[1].Value.Trim());\r
                 thisChapter.m_duration = TimeSpan.Parse(m.Groups[5].Value);\r
                 return thisChapter;\r
             }\r
@@ -65,7 +62,7 @@ namespace Handbrake.Parsing
 \r
         public static Chapter[] ParseList(StringReader output)\r
         {\r
-            List<Chapter> chapters = new List<Chapter>();\r
+            var chapters = new List<Chapter>();\r
 \r
             // this is to read the "  + chapters:" line from the buffer\r
             // so we can start reading the chapters themselvs\r
@@ -74,7 +71,7 @@ namespace Handbrake.Parsing
             while (true)\r
             {\r
                 // Start of the chapter list for this Title\r
-                Chapter thisChapter = Chapter.Parse(output);\r
+                Chapter thisChapter = Parse(output);\r
 \r
                 if (thisChapter != null)\r
                     chapters.Add(thisChapter);\r
@@ -84,4 +81,4 @@ namespace Handbrake.Parsing
             return chapters.ToArray();\r
         }\r
     }\r
-}\r
+}
\ No newline at end of file
index d0802e4..31fe2de 100644 (file)
@@ -4,47 +4,41 @@
           Homepage: <http://handbrake.fr>.\r
           It may be used under the terms of the GNU General Public License. */\r
 \r
-using System;\r
 using System.Collections.Generic;\r
-using System.Windows.Forms;\r
 using System.IO;\r
 \r
 namespace Handbrake.Parsing\r
 {\r
-\r
     /// <summary>\r
     /// An object representing a scanned DVD\r
     /// </summary>\r
     public class DVD\r
     {\r
+        private readonly List<Title> m_titles;\r
 \r
-        private List<Title> m_titles;\r
         /// <summary>\r
-        /// Collection of Titles associated with this DVD\r
+        /// Default constructor for this object\r
         /// </summary>\r
-        public List<Title> Titles\r
+        public DVD()\r
         {\r
-            get\r
-            {\r
-                return this.m_titles;\r
-            }\r
+            m_titles = new List<Title>();\r
         }\r
 \r
         /// <summary>\r
-        /// Default constructor for this object\r
+        /// Collection of Titles associated with this DVD\r
         /// </summary>\r
-        public DVD()\r
+        public List<Title> Titles\r
         {\r
-            this.m_titles = new List<Title>();\r
+            get { return m_titles; }\r
         }\r
 \r
         public static DVD Parse(StreamReader output)\r
         {\r
-            DVD thisDVD = new DVD();\r
+            var thisDVD = new DVD();\r
 \r
             while (!output.EndOfStream)\r
             {\r
-                if ((char)output.Peek() == '+')\r
+                if ((char) output.Peek() == '+')\r
                     thisDVD.m_titles.AddRange(Title.ParseList(output.ReadToEnd()));\r
                 else\r
                     output.ReadLine();\r
@@ -53,4 +47,4 @@ namespace Handbrake.Parsing
             return thisDVD;\r
         }\r
     }\r
-}\r
+}
\ No newline at end of file
index bbafc92..24dcef4 100644 (file)
@@ -4,11 +4,8 @@
           Homepage: <http://handbrake.fr>.\r
           It may be used under the terms of the GNU General Public License. */\r
 \r
-using System;\r
-using System.Collections.Generic;\r
 using System.IO;\r
 using System.Text.RegularExpressions;\r
-using System.Windows.Forms;\r
 \r
 namespace Handbrake.Parsing\r
 {\r
index c5a722b..71e0012 100644 (file)
@@ -4,7 +4,6 @@
           Homepage: <http://handbrake.fr>.\r
           It may be used under the terms of the GNU General Public License. */\r
 \r
-using System;\r
 using System.Collections.Generic;\r
 using System.IO;\r
 using System.Text.RegularExpressions;\r
@@ -16,28 +15,23 @@ namespace Handbrake.Parsing
     /// </summary>\r
     public class Subtitle\r
     {\r
+        private string m_language;\r
         private int m_trackNumber;\r
+\r
         /// <summary>\r
         /// The track number of this Subtitle\r
         /// </summary>\r
         public int TrackNumber\r
         {\r
-            get\r
-            {\r
-                return this.m_trackNumber;\r
-            }\r
+            get { return m_trackNumber; }\r
         }\r
 \r
-        private string m_language;\r
         /// <summary>\r
         /// The language (if detected) of this Subtitle\r
         /// </summary>\r
         public string Language\r
         {\r
-            get\r
-            {\r
-                return this.m_language;\r
-            }\r
+            get { return m_language; }\r
         }\r
 \r
         /// <summary>\r
@@ -46,7 +40,7 @@ namespace Handbrake.Parsing
         /// <returns>A string formatted as: {track #} {language}</returns>\r
         public override string ToString()\r
         {\r
-            return string.Format("{0} {1}", this.m_trackNumber, this.m_language);\r
+            return string.Format("{0} {1}", m_trackNumber, m_language);\r
         }\r
 \r
         public static Subtitle Parse(StringReader output)\r
@@ -56,8 +50,8 @@ namespace Handbrake.Parsing
             Match m = Regex.Match(curLine, @"^    \+ ([0-9]*), ([A-Za-z, ]*) \((.*)\)");\r
             if (m.Success && !curLine.Contains("HandBrake has exited."))\r
             {\r
-                Subtitle thisSubtitle = new Subtitle();\r
-                thisSubtitle.m_trackNumber = int.Parse(m.Groups[1].Value.Trim().ToString());\r
+                var thisSubtitle = new Subtitle();\r
+                thisSubtitle.m_trackNumber = int.Parse(m.Groups[1].Value.Trim());\r
                 thisSubtitle.m_language = m.Groups[2].Value;\r
                 return thisSubtitle;\r
             }\r
@@ -67,10 +61,10 @@ namespace Handbrake.Parsing
 \r
         public static Subtitle[] ParseList(StringReader output)\r
         {\r
-            List<Subtitle> subtitles = new List<Subtitle>();\r
-            while ((char)output.Peek() != '+')\r
+            var subtitles = new List<Subtitle>();\r
+            while ((char) output.Peek() != '+')\r
             {\r
-                Subtitle thisSubtitle = Subtitle.Parse(output);\r
+                Subtitle thisSubtitle = Parse(output);\r
 \r
                 if (thisSubtitle != null)\r
                     subtitles.Add(thisSubtitle);\r
@@ -80,4 +74,4 @@ namespace Handbrake.Parsing
             return subtitles.ToArray();\r
         }\r
     }\r
-}\r
+}
\ No newline at end of file
index 6f0f6ff..74ccab7 100644 (file)
@@ -7,10 +7,9 @@
 using System;\r
 using System.Collections.Generic;\r
 using System.Drawing;\r
+using System.Globalization;\r
 using System.IO;\r
-using System.Windows.Forms;\r
 using System.Text.RegularExpressions;\r
-using System.Globalization;\r
 \r
 namespace Handbrake.Parsing\r
 {\r
@@ -19,91 +18,82 @@ namespace Handbrake.Parsing
     /// </summary>\r
     public class Title\r
     {\r
-        private List<Chapter> m_chapters;\r
+        private static readonly CultureInfo Culture = new CultureInfo("en-US", false);\r
+        private readonly List<AudioTrack> m_audioTracks;\r
+        private readonly List<Chapter> m_chapters;\r
+        private readonly List<Subtitle> m_subtitles;\r
+        private float m_aspectRatio;\r
+        private int[] m_autoCrop;\r
+        private TimeSpan m_duration;\r
+        private Size m_resolution;\r
+        private int m_titleNumber;\r
+\r
+        /// <summary>\r
+        /// The constructor for this object\r
+        /// </summary>\r
+        public Title()\r
+        {\r
+            m_audioTracks = new List<AudioTrack>();\r
+            m_chapters = new List<Chapter>();\r
+            m_subtitles = new List<Subtitle>();\r
+        }\r
+\r
         /// <summary>\r
         /// Collection of chapters in this Title\r
         /// </summary>\r
         public List<Chapter> Chapters\r
         {\r
-            get\r
-            {\r
-                return this.m_chapters;\r
-            }\r
+            get { return m_chapters; }\r
         }\r
 \r
-        private List<AudioTrack> m_audioTracks;\r
         /// <summary>\r
         /// Collection of audio tracks associated with this Title\r
         /// </summary>\r
         public List<AudioTrack> AudioTracks\r
         {\r
-            get\r
-            {\r
-                return this.m_audioTracks;\r
-            }\r
+            get { return m_audioTracks; }\r
         }\r
 \r
-        private List<Subtitle> m_subtitles;\r
         /// <summary>\r
         /// Collection of subtitles associated with this Title\r
         /// </summary>\r
         public List<Subtitle> Subtitles\r
         {\r
-            get\r
-            {\r
-                return this.m_subtitles;\r
-            }\r
+            get { return m_subtitles; }\r
         }\r
 \r
-        private int m_titleNumber;\r
         /// <summary>\r
         /// The track number of this Title\r
         /// </summary>\r
         public int TitleNumber\r
         {\r
-            get\r
-            {\r
-                return this.m_titleNumber;\r
-            }\r
+            get { return m_titleNumber; }\r
         }\r
 \r
-        private TimeSpan m_duration;\r
         /// <summary>\r
         /// The length in time of this Title\r
         /// </summary>\r
         public TimeSpan Duration\r
         {\r
-            get\r
-            {\r
-                return this.m_duration;\r
-            }\r
+            get { return m_duration; }\r
         }\r
 \r
-        private Size m_resolution;\r
         /// <summary>\r
         /// The resolution (width/height) of this Title\r
         /// </summary>\r
         public Size Resolution\r
         {\r
-            get\r
-            {\r
-                return this.m_resolution;\r
-            }\r
+            get { return m_resolution; }\r
         }\r
 \r
-        private float m_aspectRatio;\r
         /// <summary>\r
         /// The aspect ratio of this Title\r
         /// </summary>\r
         public float AspectRatio\r
         {\r
-            get\r
-            {\r
-                return this.m_aspectRatio;\r
-            }\r
+            get { return m_aspectRatio; }\r
         }\r
 \r
-        private int[] m_autoCrop;\r
         /// <summary>\r
         /// The automatically detected crop region for this Title.\r
         /// This is an int array with 4 items in it as so:\r
@@ -114,20 +104,7 @@ namespace Handbrake.Parsing
         /// </summary>\r
         public int[] AutoCropDimensions\r
         {\r
-            get\r
-            {\r
-                return this.m_autoCrop;\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
-        /// The constructor for this object\r
-        /// </summary>\r
-        public Title()\r
-        {\r
-            this.m_audioTracks = new List<AudioTrack>();\r
-            this.m_chapters = new List<Chapter>();\r
-            this.m_subtitles = new List<Subtitle>();\r
+            get { return m_autoCrop; }\r
         }\r
 \r
         /// <summary>\r
@@ -136,20 +113,18 @@ namespace Handbrake.Parsing
         /// <returns>A string representing this track in the format: {title #} (00:00:00)</returns>\r
         public override string ToString()\r
         {\r
-            return string.Format("{0} ({1:00}:{2:00}:{3:00})", this.m_titleNumber, this.m_duration.Hours,\r
-             this.m_duration.Minutes, this.m_duration.Seconds);\r
+            return string.Format("{0} ({1:00}:{2:00}:{3:00})", m_titleNumber, m_duration.Hours,\r
+                                 m_duration.Minutes, m_duration.Seconds);\r
         }\r
 \r
-        static readonly private CultureInfo Culture = new CultureInfo("en-US", false);\r
-\r
         public static Title Parse(StringReader output)\r
         {\r
-            Title thisTitle = new Title();\r
+            var thisTitle = new Title();\r
 \r
             Match m = Regex.Match(output.ReadLine(), @"^\+ title ([0-9]*):");\r
             // Match track number for this title\r
             if (m.Success)\r
-                thisTitle.m_titleNumber = int.Parse(m.Groups[1].Value.Trim().ToString());\r
+                thisTitle.m_titleNumber = int.Parse(m.Groups[1].Value.Trim());\r
 \r
             String testData = output.ReadLine();\r
 \r
@@ -160,7 +135,8 @@ namespace Handbrake.Parsing
                 thisTitle.m_duration = TimeSpan.Parse(m.Groups[1].Value);\r
 \r
             // Get resolution, aspect ratio and FPS for this title\r
-            m = Regex.Match(output.ReadLine(), @"^  \+ size: ([0-9]*)x([0-9]*), aspect: ([0-9]*\.[0-9]*), ([0-9]*\.[0-9]*) fps");\r
+            m = Regex.Match(output.ReadLine(),\r
+                            @"^  \+ size: ([0-9]*)x([0-9]*), aspect: ([0-9]*\.[0-9]*), ([0-9]*\.[0-9]*) fps");\r
             if (m.Success)\r
             {\r
                 thisTitle.m_resolution = new Size(int.Parse(m.Groups[1].Value), int.Parse(m.Groups[2].Value));\r
@@ -170,7 +146,11 @@ namespace Handbrake.Parsing
             // Get autocrop region for this title\r
             m = Regex.Match(output.ReadLine(), @"^  \+ autocrop: ([0-9]*)/([0-9]*)/([0-9]*)/([0-9]*)");\r
             if (m.Success)\r
-                thisTitle.m_autoCrop = new int[4] { int.Parse(m.Groups[1].Value), int.Parse(m.Groups[2].Value), int.Parse(m.Groups[3].Value), int.Parse(m.Groups[4].Value) };\r
+                thisTitle.m_autoCrop = new int[4]\r
+                                           {\r
+                                               int.Parse(m.Groups[1].Value), int.Parse(m.Groups[2].Value),\r
+                                               int.Parse(m.Groups[3].Value), int.Parse(m.Groups[4].Value)\r
+                                           };\r
 \r
             thisTitle.m_chapters.AddRange(Chapter.ParseList(output));\r
 \r
@@ -183,8 +163,8 @@ namespace Handbrake.Parsing
 \r
         public static Title[] ParseList(string output)\r
         {\r
-            List<Title> titles = new List<Title>();\r
-            StringReader sr = new StringReader(output);\r
+            var titles = new List<Title>();\r
+            var sr = new StringReader(output);\r
 \r
             while (sr.Peek() == '+' || sr.Peek() == ' ')\r
             {\r
@@ -192,10 +172,10 @@ namespace Handbrake.Parsing
                 if (sr.Peek() == ' ') // If the character is a space, then chances are it's the combing detected line.\r
                     sr.ReadLine(); // Skip over it\r
                 else\r
-                    titles.Add(Title.Parse(sr));              \r
+                    titles.Add(Parse(sr));\r
             }\r
 \r
             return titles.ToArray();\r
         }\r
     }\r
-}\r
+}
\ No newline at end of file
index 171b313..7bf3f90 100644 (file)
@@ -1,6 +1,5 @@
 using System;\r
 using System.Collections.Generic;\r
-using System.Text;\r
 using System.Windows.Forms;\r
 using System.IO;\r
 using System.Text.RegularExpressions;\r
index ee98342..3468932 100644 (file)
@@ -1,66 +1,32 @@
 using System;\r
-using System.Collections.Generic;\r
-using System.Text;\r
-using System.Windows.Forms;\r
-using System.IO;\r
-using System.Text.RegularExpressions;\r
-using System.Diagnostics;\r
 \r
 namespace Handbrake.Presets\r
 {\r
     public class Preset\r
     {\r
-\r
-        private int level = 0;\r
-        private string category = null;\r
-        private string name;\r
-        private string query;\r
-        private Boolean pictureSettings;\r
-\r
         /// <summary>\r
         /// Get or Set the preset's level. This indicated if it is a root or child node\r
         /// </summary>\r
-        public int Level\r
-        {\r
-            get { return level; }\r
-            set { this.level = value; }\r
-        }\r
+        public int Level { get; set; }\r
 \r
         /// <summary>\r
         /// Get or Set the category which the preset resides under\r
         /// </summary>\r
-        public string Category\r
-        {\r
-            get { return category; }\r
-            set { this.category = value; }\r
-        }\r
+        public string Category { get; set; }\r
 \r
         /// <summary>\r
         /// Get or Set the preset name\r
         /// </summary>\r
-        public string Name\r
-        {\r
-            get { return name; }\r
-            set { this.name = value; }\r
-        }\r
+        public string Name { get; set; }\r
 \r
         /// <summary>\r
         /// Get or set the preset query\r
         /// </summary>\r
-        public string Query\r
-        {\r
-            get { return query; }\r
-            set { this.query = value; }\r
-        }\r
+        public string Query { get; set; }\r
 \r
         /// <summary>\r
         /// Get or set the usage of Picture Settings in presets.\r
         /// </summary>\r
-        public Boolean PictureSettings\r
-        {\r
-            get { return pictureSettings; }\r
-            set { this.pictureSettings = value; }\r
-        }\r
-\r
+        public Boolean PictureSettings { get; set; }\r
     }\r
 }
\ No newline at end of file
index aabce4f..3317fb8 100644 (file)
@@ -1,7 +1,5 @@
 using System;\r
 using System.Collections.Generic;\r
-using System.Text;\r
-using System.Collections;\r
 using System.IO;\r
 using System.Windows.Forms;\r
 using System.Xml.Serialization;\r
index 1639b16..e71e308 100644 (file)
@@ -1,50 +1,25 @@
-using System;\r
-using System.Collections.Generic;\r
-using System.Text;\r
-\r
-namespace Handbrake.Queue\r
+namespace Handbrake.Queue\r
 {\r
     public class QueueItem\r
     {\r
-        private int id;\r
-        private string query;\r
-        private string source;\r
-        private string destination;\r
-\r
         /// <summary>\r
         /// Get or Set the job id.\r
         /// </summary>\r
-        public int Id\r
-        {\r
-            get { return id; }\r
-            set { this.id = value; }\r
-        }\r
+        public int Id { get; set; }\r
 \r
         /// <summary>\r
         /// Get or Set the query string.\r
         /// </summary>\r
-        public string Query\r
-        {\r
-            get { return query; }\r
-            set { this.query = value; }\r
-        }\r
+        public string Query { get; set; }\r
 \r
         /// <summary>\r
         /// Get or set the source file of encoding\r
         /// </summary>\r
-        public string Source\r
-        {\r
-            get { return source; }\r
-            set { this.source = value; }\r
-        }\r
+        public string Source { get; set; }\r
 \r
         /// <summary>\r
         /// Get or set the destination for the file to be encoded.\r
         /// </summary>\r
-        public string Destination\r
-        {\r
-            get { return destination; }\r
-            set { this.destination = value; }\r
-        }\r
+        public string Destination { get; set; }\r
     }\r
-}\r
+}
\ No newline at end of file
index 1657cad..efc503b 100644 (file)
@@ -5,13 +5,7 @@
           It may be used under the terms of the GNU General Public License. */\r
 \r
 using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel;\r
-using System.Data;\r
-using System.Drawing;\r
-using System.Text;\r
 using System.Windows.Forms;\r
-using System.Diagnostics;\r
 \r
 namespace Handbrake\r
 {\r
@@ -28,10 +22,5 @@ namespace Handbrake
         {\r
             this.Close();\r
         }\r
-\r
-        private void label_credits_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)\r
-        {\r
-            Process.Start("http://handbrake.frtrac/wiki/x264Options");\r
-        }\r
     }\r
 }
\ No newline at end of file
index d1a1376..1ad4e09 100644 (file)
@@ -5,16 +5,10 @@
           It may be used under the terms of the GNU General Public License. */\r
 \r
 using System;\r
-using System.Collections;\r
 using System.Collections.Generic;\r
-using System.ComponentModel;\r
-using System.Data;\r
-using System.Drawing;\r
-using System.Text;\r
 using System.Windows.Forms;\r
 using System.IO;\r
 using System.Threading;\r
-using System.Diagnostics;\r
 using System.Runtime.InteropServices;\r
 using Microsoft.Win32;\r
 \r
index 67dbfa9..a4def19 100644 (file)
@@ -5,13 +5,7 @@
           It may be used under the terms of the GNU General Public License. */\r
 \r
 using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel;\r
-using System.Data;\r
-using System.Drawing;\r
-using System.Text;\r
 using System.Windows.Forms;\r
-using System.IO;\r
 \r
 namespace Handbrake\r
 {\r
index 459348d..e055140 100644 (file)
@@ -5,7 +5,6 @@
           It may be used under the terms of the GNU General Public License. */\r
 \r
 using System;\r
-using System.Collections.Generic;\r
 using System.Windows.Forms;\r
 using System.Net;\r
 using System.IO;\r
index 1731a63..a7768a1 100644 (file)
@@ -1,9 +1,4 @@
 using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel;\r
-using System.Data;\r
-using System.Drawing;\r
-using System.Text;\r
 using System.Windows.Forms;\r
 using System.Threading;\r
 using System.Diagnostics;\r
@@ -14,7 +9,7 @@ namespace Handbrake
     public partial class frmGenPreview : Form\r
     {\r
         private delegate void UpdateHandler();\r
-        Handbrake.QueryGenerator queryGen = new Handbrake.QueryGenerator();\r
+        QueryGenerator queryGen = new QueryGenerator();\r
         Functions.Encode process = new Functions.Encode();\r
         Process hbProc;\r
         frmMain mainWindow;\r
index 3a574b9..aa05cc8 100644 (file)
@@ -1,6 +1,4 @@
 using System;\r
-using System.Collections.Generic;\r
-using System.Text;\r
 using System.Windows.Forms;\r
 using System.Drawing;\r
 \r
index ff2fab0..dae22fe 100644 (file)
@@ -5,11 +5,6 @@
           It may be used under the terms of the GNU General Public License. */\r
 \r
 using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel;\r
-using System.Data;\r
-using System.Drawing;\r
-using System.Text;\r
 using System.Windows.Forms;\r
 \r
 namespace Handbrake\r
index c7d442d..e00bcd9 100644 (file)
@@ -1,15 +1,8 @@
 using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel;\r
-using System.Data;\r
-using System.Drawing;\r
-using System.Text;\r
 using System.Windows.Forms;\r
 using System.Threading;\r
 using System.Diagnostics;\r
 using System.Runtime.InteropServices;\r
-\r
-using QTOControlLib;\r
 using QTOLibrary;\r
 \r
 namespace Handbrake\r
@@ -17,7 +10,7 @@ namespace Handbrake
     public partial class frmPreview : Form\r
     {\r
 \r
-        Handbrake.QueryGenerator hb_common_func = new Handbrake.QueryGenerator();\r
+        QueryGenerator hb_common_func = new QueryGenerator();\r
         Functions.Encode process = new Functions.Encode();\r
         private delegate void UpdateUIHandler();\r
         String currently_playing = "";\r
index 2fb6169..1a9f30c 100644 (file)
@@ -6,16 +6,8 @@
 \r
 using System;\r
 using System.Collections.Generic;\r
-using System.Collections;\r
 using System.ComponentModel;\r
-using System.Data;\r
-using System.Drawing;\r
-using System.Text;\r
 using System.Windows.Forms;\r
-using System.Threading;\r
-using System.Diagnostics;\r
-using System.Runtime.InteropServices;\r
-using System.IO;\r
 \r
 namespace Handbrake\r
 {\r
index 4763934..56bf5af 100644 (file)
@@ -5,16 +5,10 @@
           It may be used under the terms of the GNU General Public License. */\r
 \r
 using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel;\r
-using System.Data;\r
-using System.Drawing;\r
-using System.Text;\r
 using System.Windows.Forms;\r
 using System.IO;\r
 using System.Threading;\r
 using System.Diagnostics;\r
-using System.Collections;\r
 \r
 \r
 namespace Handbrake\r
@@ -27,7 +21,6 @@ namespace Handbrake
         private delegate void UpdateUIHandler();\r
         Process hbproc;\r
         Functions.Main hb_common_func = new Functions.Main();\r
-        Functions.Encode process = new Functions.Encode();\r
 \r
         public frmReadDVD(string inputFile, frmMain parent)\r
         {\r
index 6525072..dca8bd2 100644 (file)
@@ -4,14 +4,7 @@
           Homepage: <http://handbrake.fr>.\r
           It may be used under the terms of the GNU General Public License. */\r
 \r
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel;\r
-using System.Data;\r
-using System.Drawing;\r
-using System.Text;\r
 using System.Windows.Forms;\r
-using System.Threading;\r
 \r
 namespace Handbrake\r
 {\r
index 271e17b..8496fa5 100644 (file)
@@ -6,9 +6,6 @@
 \r
 using System;\r
 using System.Windows.Forms;\r
-using System.IO;\r
-using System.Xml;\r
-using System.Net;\r
 \r
 namespace Handbrake\r
 {\r