WinGui:
authorsr55 <sr55.hb@outlook.com>
Mon, 13 Apr 2009 17:15:46 +0000 (17:15 +0000)
committersr55 <sr55.hb@outlook.com>
Mon, 13 Apr 2009 17:15:46 +0000 (17:15 +0000)
- Cut the Query Parser code down by 509 lines of code.
- Fixed issue in Preview window, (mkv files were not playing back)

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

win/C#/Functions/QueryParser.cs
win/C#/frmMain.cs
win/C#/frmMain/PresetLoader.cs
win/C#/frmPreview.cs

index 4d40ef8802d0dfd5baa2dd241040c624ea487224..2e1f470d318839b860985f0a4a417bfeade2a47c 100644 (file)
@@ -18,592 +18,87 @@ namespace Handbrake.Functions
         #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 { return q_dvdTitle; }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Returns an Int\r
-        /// DVD Chapter number or chapter range.\r
-        /// </summary>\r
-        public int DVDChapterStart\r
-        {\r
-            get { return q_chaptersStart; }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Returns an Int\r
-        /// DVD Chapter number or chapter range.\r
-        /// </summary>\r
-        public int DVDChapterFinish\r
-        {\r
-            get { return q_chaptersFinish; }\r
-        }\r
-\r
+        public int DVDTitle { get; private set; }\r
+        public int DVDChapterStart { get; private set; }\r
+        public int DVDChapterFinish { get; private set; }\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 { return q_format; }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Returns an String\r
-        /// The Video Encoder used.\r
-        /// </summary>\r
-        public string VideoEncoder\r
-        {\r
-            get { return q_videoEncoder; }\r
-        }\r
-\r
+        #region Output Settings\r
+        public string Format { get; private set; }\r
+        public Boolean LargeMP4 { get; private set; }\r
+        public Boolean IpodAtom { get; private set; }\r
+        public Boolean OptimizeMP4 { get; private set; }\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 string q_decomb;\r
-        private string q_deinterlace;\r
-        private string q_denoise;\r
-        private string 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 { return q_videoWidth; }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Returns an Int\r
-        /// The selected Height for the encoding.\r
-        /// </summary>\r
-        public int Height\r
-        {\r
-            get { return q_videoHeight; }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Returns an Int\r
-        /// The selected Width for the encoding.\r
-        /// </summary>\r
-        public int MaxWidth\r
-        {\r
-            get { return q_maxWidth; }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Returns an Int\r
-        /// The selected Height for the encoding.\r
-        /// </summary>\r
-        public int MaxHeight\r
-        {\r
-            get { return q_maxHeight; }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Returns an String\r
-        /// Cropping values.\r
-        /// </summary>\r
-        public string CropValues\r
-        {\r
-            get { return q_cropValues; }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Returns an String\r
-        /// Cropping values.\r
-        /// </summary>\r
-        public string CropTop\r
-        {\r
-            get { return q_croptop; }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Returns an String\r
-        /// Cropping values.\r
-        /// </summary>\r
-        public string CropBottom\r
-        {\r
-            get { return q_cropbottom; }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Returns an String\r
-        /// Cropping values.\r
-        /// </summary>\r
-        public string CropLeft\r
-        {\r
-            get { return q_cropLeft; }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Returns an String\r
-        /// Cropping values.\r
-        /// </summary>\r
-        public string CropRight\r
-        {\r
-            get { return q_cropRight; }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Returns a boolean to indicate wither DeTelecine is on or off\r
-        /// </summary>\r
-        public string DeTelecine\r
-        {\r
-            get { return q_detelecine; }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Returns a boolean to indicate wither DeBlock is on or off.\r
-        /// </summary>\r
-        public int DeBlock\r
-        {\r
-            get { return q_deBlock; }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Returns a string with the De-Interlace option used.\r
-        /// </summary>\r
-        public string DeInterlace\r
-        {\r
-            get { return q_deinterlace; }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Returns a string with the DeNoise option used.\r
-        /// </summary>\r
-        public string DeNoise\r
-        {\r
-            get { return q_denoise; }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Returns a string with the DeNoise option used.\r
-        /// </summary>\r
-        public string Decomb\r
-        {\r
-            get { return q_decomb; }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Returns a boolean to indicate wither Anamorphic is on or off.\r
-        /// </summary>\r
-        public Boolean Anamorphic\r
-        {\r
-            get { return q_anamorphic; }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Returns a boolean to indicate wither Anamorphic is on or off.\r
-        /// </summary>\r
-        public Boolean LooseAnamorphic\r
-        {\r
-            get { return q_looseAnamorphic; }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Returns a boolean to indicate wither Chapter Markers is on or off.\r
-        /// </summary>\r
-        public Boolean ChapterMarkers\r
-        {\r
-            get { return q_chapterMarkers; }\r
-        }\r
-\r
+        public int Width { get; private set; }\r
+        public int Height { get; private set; }\r
+        public int MaxWidth { get; private set; }\r
+        public int MaxHeight { get; private set; }\r
+        public string CropValues { get; private set; }\r
+        public string CropTop { get; private set; }\r
+        public string CropBottom { get; private set; }\r
+        public string CropLeft { get; private set; }\r
+        public string CropRight { get; private set; }\r
+        public Boolean Anamorphic { get; private set; }\r
+        public Boolean LooseAnamorphic { get; private set; }\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 float 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 { return q_grayscale; }\r
-        }\r
-\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 { return q_twoPass; }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Returns a boolean to indicate wither Chapter Markers is on or off.\r
-        /// </summary>\r
-        public Boolean TurboFirstPass\r
-        {\r
-            get { return q_turboFirst; }\r
-        }\r
-\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 { return q_largeMp4; }\r
-        }\r
-\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 { return q_ipodAtom; }\r
-        }\r
-\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 { return q_optimizeMp4; }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Returns a string with the video Framerate\r
-        /// </summary>\r
-        public string VideoFramerate\r
-        {\r
-            get { return q_videoFramerate; }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Returns a string with the average video bitrate\r
-        /// </summary>\r
-        public string AverageVideoBitrate\r
-        {\r
-            get { return q_avgBitrate; }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Returns a string with the video target size\r
-        /// </summary>\r
-        public string VideoTargetSize\r
-        {\r
-            get { return q_videoTargetSize; }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Returns a int with the video quality value\r
-        /// </summary>\r
-        public float VideoQuality\r
-        {\r
-            get { return q_videoQuality; }\r
-        }\r
+        #region Video Filters\r
+        public string DeTelecine { get; private set; }\r
+        public int DeBlock { get; private set; }\r
+        public string DeInterlace { get; private set; }\r
+        public string DeNoise { get; private set; }\r
+        public string Decomb { get; private set; }\r
+        #endregion    \r
 \r
+        #region Video Settings\r
+        public string VideoEncoder { get; private set; }\r
+        public Boolean Grayscale { get; private set; }\r
+        public Boolean TwoPass { get; private set; }\r
+        public Boolean TurboFirstPass { get; private set; }\r
+        public string VideoFramerate { get; private set; }\r
+        public string AverageVideoBitrate { get; private set; }\r
+        public string VideoTargetSize { get; private set; }\r
+        public float VideoQuality { get; private set; }\r
         #endregion\r
 \r
         #region Audio Settings\r
+        public string AudioTrack1 { get; private set; }\r
+        public string AudioTrack2 { get; private set; }\r
+        public string AudioTrack3 { get; private set; }\r
+        public string AudioTrack4 { get; private set; }\r
+        public string AudioTrackMix1 { get; private set; }\r
+        public string AudioTrackMix2 { get; private set; }\r
+        public string AudioTrackMix3 { get; private set; }\r
+        public string AudioTrackMix4 { get; private set; }\r
+        public string AudioEncoder1 { get; private set; }\r
+        public string AudioEncoder2 { get; private set; }\r
+        public string AudioEncoder3 { get; private set; }\r
+        public string AudioEncoder4 { get; private set; }\r
+        public string AudioBitrate1 { get; private set; }\r
+        public string AudioBitrate2 { get; private set; }\r
+        public string AudioBitrate3 { get; private set; }\r
+        public string AudioBitrate4 { get; private set; }\r
+        public string AudioSamplerate1 { get; private set; }\r
+        public string AudioSamplerate2 { get; private set; }\r
+        public string AudioSamplerate3 { get; private set; }\r
+        public string AudioSamplerate4 { get; private set; }\r
+        public double DRC1 { get; private set; }\r
+        public double DRC2 { get; private set; }\r
+        public double DRC3 { get; private set; }\r
+        public double DRC4 { get; private set; }\r
+        public string Subtitles { get; private set; }\r
+        public Boolean ForcedSubtitles { get; private set; }\r
+        #endregion\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 { return q_audioTrack1; }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Returns a string with the selected Audio track\r
-        /// </summary>\r
-        public string AudioTrack2\r
-        {\r
-            get { return q_audioTrack2; }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Returns a string with the selected Audio track\r
-        /// </summary>\r
-        public string AudioTrack3\r
-        {\r
-            get { return q_audioTrack3; }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Returns a string with the selected Audio track\r
-        /// </summary>\r
-        public string AudioTrack4\r
-        {\r
-            get { return q_audioTrack4; }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Returns a string with the First selected Audio track Mix\r
-        /// </summary>\r
-        public string AudioTrackMix1\r
-        {\r
-            get { return q_audioTrackMix1; }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Returns a string with the First selected Audio track Mix\r
-        /// </summary>\r
-        public string AudioTrackMix2\r
-        {\r
-            get { return q_audioTrackMix2; }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Returns a string with the First selected Audio track Mix\r
-        /// </summary>\r
-        public string AudioTrackMix3\r
-        {\r
-            get { return q_audioTrackMix3; }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Returns a string with the First selected Audio track Mix\r
-        /// </summary>\r
-        public string AudioTrackMix4\r
-        {\r
-            get { return q_audioTrackMix4; }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Returns an String\r
-        /// The Audio Encoder used.\r
-        /// </summary>\r
-        public string AudioEncoder1\r
-        {\r
-            get { return q_audioEncoder1; }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Returns an String\r
-        /// The Audio Encoder used.\r
-        /// </summary>\r
-        public string AudioEncoder2\r
-        {\r
-            get { return q_audioEncoder2; }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Returns an String\r
-        /// The Audio Encoder used.\r
-        /// </summary>\r
-        public string AudioEncoder3\r
-        {\r
-            get { return q_audioEncoder3; }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Returns an String\r
-        /// The Audio Encoder used.\r
-        /// </summary>\r
-        public string AudioEncoder4\r
-        {\r
-            get { return q_audioEncoder4; }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Returns a string with the audio bitrate\r
-        /// </summary>\r
-        public string AudioBitrate1\r
-        {\r
-            get { return q_audioBitrate1; }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Returns a string with the audio bitrate\r
-        /// </summary>\r
-        public string AudioBitrate2\r
-        {\r
-            get { return q_audioBitrate2; }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Returns a string with the audio bitrate\r
-        /// </summary>\r
-        public string AudioBitrate3\r
-        {\r
-            get { return q_audioBitrate3; }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Returns a string with the audio bitrate\r
-        /// </summary>\r
-        public string AudioBitrate4\r
-        {\r
-            get { return q_audioBitrate4; }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Returns a string with the audio sample rate\r
-        /// </summary>\r
-        public string AudioSamplerate1\r
-        {\r
-            get { return q_audioSamplerate1; }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Returns a string with the audio sample rate\r
-        /// </summary>\r
-        public string AudioSamplerate2\r
-        {\r
-            get { return q_audioSamplerate2; }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Returns a string with the audio sample rate\r
-        /// </summary>\r
-        public string AudioSamplerate3\r
-        {\r
-            get { return q_audioSamplerate3; }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Returns a string with the audio sample rate\r
-        /// </summary>\r
-        public string AudioSamplerate4\r
-        {\r
-            get { return q_audioSamplerate4; }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Returns a string with the selected subtitle track\r
-        /// </summary>\r
-        public double DRC1\r
-        {\r
-            get { return q_drc1; }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Returns a string with the selected subtitle track\r
-        /// </summary>\r
-        public double DRC2\r
-        {\r
-            get { return q_drc2; }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Returns a string with the selected subtitle track\r
-        /// </summary>\r
-        public double DRC3\r
-        {\r
-            get { return q_drc3; }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Returns a string with the selected subtitle track\r
-        /// </summary>\r
-        public double DRC4\r
-        {\r
-            get { return q_drc4; }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Returns a string with the selected subtitle track\r
-        /// </summary>\r
-        public string Subtitles\r
-        {\r
-            get { return q_subtitles; }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Returns a string with the selected subtitle track\r
-        /// </summary>\r
-        public Boolean ForcedSubtitles\r
-        {\r
-            get { return q_forcedSubs; }\r
-        }\r
-\r
+        #region Chapter Markers\r
+        public Boolean ChapterMarkers { get; private set; }\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 { return q_h264; }\r
-        }\r
-\r
-        /// <summary>\r
-        /// Returns a string with the Advanced H264 query string\r
-        /// </summary>\r
-        public Boolean Verbose\r
-        {\r
-            get { return q_verbose; }\r
-        }\r
-\r
+        public string H264Query { get; private set; }\r
+        public Boolean Verbose { get; private set; }\r
         #endregion\r
 \r
         #endregion\r
@@ -670,10 +165,10 @@ 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 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 audioTrack1Mix = Regex.Match(input, @"-6 ([0-9a-z]*)");\r
+            Match audioTrack2Mix = Regex.Match(input, @"-6 ([0-9a-z]*),([0-9a-z]*)");\r
+            Match audioTrack3Mix = Regex.Match(input, @"-6 ([0-9a-z]*),([0-9a-z]*),([0-9a-z]*)");\r
+            Match audioTrack4Mix = Regex.Match(input, @"-6 ([0-9a-z]*),([0-9a-z]*),([0-9a-z]*),([0-9a-z]*)");\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
@@ -718,99 +213,102 @@ namespace Handbrake.Functions
                 #region Source Tab\r
 \r
                 if (title.Success)\r
-                    thisQuery.q_dvdTitle = int.Parse(title.ToString().Replace("-t ", ""));\r
+                    thisQuery.DVDTitle = int.Parse(title.ToString().Replace("-t ", ""));\r
 \r
                 if (chapters.Success)\r
                 {\r
                     string[] actTitles = chapters.ToString().Replace("-c ", "").Split('-');\r
-                    thisQuery.q_chaptersStart = int.Parse(actTitles[0]);\r
+                    thisQuery.DVDChapterStart = int.Parse(actTitles[0]);\r
                     if (actTitles.Length > 1)\r
                     {\r
-                        thisQuery.q_chaptersFinish = int.Parse(actTitles[1]);\r
+                        thisQuery.DVDChapterFinish = int.Parse(actTitles[1]);\r
                     }\r
 \r
-                    if ((thisQuery.q_chaptersStart == 1) && (thisQuery.q_chaptersFinish == 0))\r
-                        thisQuery.q_chaptersFinish = thisQuery.q_chaptersStart;\r
+                    if ((thisQuery.DVDChapterStart == 1) && (thisQuery.DVDChapterFinish == 0))\r
+                        thisQuery.DVDChapterFinish = thisQuery.DVDChapterStart;\r
                 }\r
                 #endregion\r
 \r
                 #region Output Settings\r
 \r
                 if (format.Success)\r
-                    thisQuery.q_format = format.ToString().Replace("-f ", "");\r
-                thisQuery.q_largeMp4 = largerMp4.Success;\r
-                thisQuery.q_ipodAtom = ipodAtom.Success;\r
-                thisQuery.q_optimizeMp4 = optimizeMP4.Success;\r
+                    thisQuery.Format = format.ToString().Replace("-f ", "");\r
+                thisQuery.LargeMP4 = largerMp4.Success;\r
+                thisQuery.IpodAtom = ipodAtom.Success;\r
+                thisQuery.OptimizeMP4 = optimizeMP4.Success;\r
 \r
                 #endregion\r
 \r
                 #region Picture Tab\r
 \r
                 if (width.Success)\r
-                    thisQuery.q_videoWidth = int.Parse(width.ToString().Replace("-w ", ""));\r
+                    thisQuery.Width = int.Parse(width.ToString().Replace("-w ", ""));\r
 \r
                 if (height.Success)\r
-                    thisQuery.q_videoHeight = int.Parse(height.ToString().Replace("-l ", ""));\r
+                    thisQuery.Height = int.Parse(height.ToString().Replace("-l ", ""));\r
 \r
                 if (maxWidth.Success)\r
-                    thisQuery.q_maxWidth = int.Parse(maxWidth.ToString().Replace("-X ", ""));\r
+                    thisQuery.MaxWidth = int.Parse(maxWidth.ToString().Replace("-X ", ""));\r
 \r
                 if (maxHeight.Success)\r
-                    thisQuery.q_maxHeight = int.Parse(maxHeight.ToString().Replace("-Y ", ""));\r
+                    thisQuery.MaxHeight = int.Parse(maxHeight.ToString().Replace("-Y ", ""));\r
 \r
                 if (crop.Success)\r
                 {\r
-                    thisQuery.q_cropValues = crop.ToString().Replace("--crop ", "");\r
-                    string[] actCropValues = thisQuery.q_cropValues.Split(':');\r
-                    thisQuery.q_croptop = actCropValues[0];\r
-                    thisQuery.q_cropbottom = actCropValues[1];\r
-                    thisQuery.q_cropLeft = actCropValues[2];\r
-                    thisQuery.q_cropRight = actCropValues[3];\r
+                    thisQuery.CropValues = crop.ToString().Replace("--crop ", "");\r
+                    string[] actCropValues = thisQuery.CropValues.Split(':');\r
+                    thisQuery.CropTop = actCropValues[0];\r
+                    thisQuery.CropBottom = actCropValues[1];\r
+                    thisQuery.CropLeft = actCropValues[2];\r
+                    thisQuery.CropRight = actCropValues[3];\r
                 }\r
                 \r
-                thisQuery.q_anamorphic = anamorphic.Success;\r
-                thisQuery.q_looseAnamorphic = lanamorphic.Success;\r
+                thisQuery.Anamorphic = anamorphic.Success;\r
+                thisQuery.LooseAnamorphic = lanamorphic.Success;\r
 \r
                 #endregion\r
 \r
                 #region Filters\r
 \r
-                thisQuery.q_decomb = "Off";\r
+                thisQuery.Decomb = "Off";\r
                 if (decomb.Success)\r
                 {\r
-                    thisQuery.q_decomb = "Default";\r
+                    thisQuery.Decomb = "Default";\r
                     if (decombValue.Success)\r
-                        thisQuery.q_decomb = decombValue.ToString().Replace("--decomb=", "").Replace("\"", "");\r
+                        thisQuery.Decomb = decombValue.ToString().Replace("--decomb=", "").Replace("\"", "");\r
                 }\r
 \r
-                thisQuery.q_deinterlace = "None";\r
+                thisQuery.DeInterlace = "None";\r
                 if (deinterlace.Success)\r
                 {\r
-                    thisQuery.q_deinterlace = deinterlace.ToString().Replace("--deinterlace=", "").Replace("\"", "");\r
-                    thisQuery.q_deinterlace = thisQuery.q_deinterlace.Replace("fast", "Fast").Replace("slow", "Slow").Replace("slower", "Slower");\r
-                    thisQuery.q_deinterlace = thisQuery.q_deinterlace.Replace("slowest", "Slowest");\r
+                    thisQuery.DeInterlace = deinterlace.ToString().Replace("--deinterlace=", "").Replace("\"", "");\r
+                    thisQuery.DeInterlace = thisQuery.DeInterlace.Replace("fast", "Fast").Replace("slow", "Slow").Replace("slower", "Slower");\r
+                    thisQuery.DeInterlace = thisQuery.DeInterlace.Replace("slowest", "Slowest");\r
                 }\r
 \r
-                thisQuery.q_denoise = "None";\r
+                thisQuery.DeNoise = "None";\r
                 if (denoise.Success)\r
                 {\r
-                    thisQuery.q_denoise = denoise.ToString().Replace("--denoise=", "").Replace("\"", "");\r
-                    thisQuery.q_denoise = thisQuery.q_denoise.Replace("weak", "Weak").Replace("medium", "Medium").Replace("strong", "Strong");\r
+                    thisQuery.DeNoise = denoise.ToString().Replace("--denoise=", "").Replace("\"", "");\r
+                    thisQuery.DeNoise = thisQuery.DeNoise.Replace("weak", "Weak").Replace("medium", "Medium").Replace("strong", "Strong");\r
                 }\r
 \r
                 string deblockValue = "";\r
-                thisQuery.q_deBlock = 0;\r
+                thisQuery.DeBlock = 0;\r
                 if (deblock.Success)\r
                     deblockValue = deblock.ToString().Replace("--deblock=", "");\r
+\r
+                int dval = 0;\r
                 if (deblockValue != "")\r
-                    int.TryParse(deblockValue, out thisQuery.q_deBlock);\r
+                    int.TryParse(deblockValue, out dval);\r
+                thisQuery.DeBlock = dval;\r
 \r
-                thisQuery.q_detelecine = "Off";\r
+                thisQuery.DeTelecine = "Off";\r
                 if (detelecine.Success)\r
                 {\r
-                    thisQuery.q_detelecine = "Default";\r
+                    thisQuery.DeTelecine = "Default";\r
                     if (detelecineValue.Success)\r
-                        thisQuery.q_detelecine = detelecineValue.ToString().Replace("--detelecine=", "").Replace("\"", "");\r
+                        thisQuery.DeTelecine = detelecineValue.ToString().Replace("--detelecine=", "").Replace("\"", "");\r
                 }\r
 \r
                 #endregion\r
@@ -833,22 +331,22 @@ namespace Handbrake.Functions
                         videoEncoderConvertion = "MPEG-4 (FFmpeg)";\r
                         break;\r
                 }\r
-                thisQuery.q_videoEncoder = videoEncoderConvertion;\r
-                thisQuery.q_videoFramerate = videoFramerate.Success ? videoFramerate.ToString().Replace("-r ", "") : "Same as source";\r
-                thisQuery.q_grayscale = grayscale.Success;\r
-                thisQuery.q_twoPass = twoPass.Success;\r
-                thisQuery.q_turboFirst = turboFirstPass.Success;\r
+                thisQuery.VideoEncoder = videoEncoderConvertion;\r
+                thisQuery.VideoFramerate = videoFramerate.Success ? videoFramerate.ToString().Replace("-r ", "") : "Same as source";\r
+                thisQuery.Grayscale = grayscale.Success;\r
+                thisQuery.TwoPass = twoPass.Success;\r
+                thisQuery.TurboFirstPass = turboFirstPass.Success;\r
                 \r
                 if (videoBitrate.Success)\r
-                    thisQuery.q_avgBitrate = videoBitrate.ToString().Replace("-b ", "");\r
+                    thisQuery.AverageVideoBitrate = videoBitrate.ToString().Replace("-b ", "");\r
                 if (videoFilesize.Success)\r
-                    thisQuery.q_videoTargetSize = videoFilesize.ToString().Replace("-S ", "");\r
+                    thisQuery.VideoTargetSize = videoFilesize.ToString().Replace("-S ", "");\r
 \r
                 if (videoQuality.Success)\r
                 {\r
                    float qConvert = float.Parse(videoQuality.ToString().Replace("-q ", ""), Culture);\r
                     //qConvert = Math.Ceiling(qConvert);\r
-                    thisQuery.q_videoQuality = qConvert;\r
+                    thisQuery.VideoQuality = qConvert;\r
                 }\r
                 #endregion\r
 \r
@@ -856,126 +354,126 @@ namespace Handbrake.Functions
 \r
                 // Tracks\r
                 if (noAudio.Success)\r
-                    thisQuery.q_audioTrack1 = "None";\r
+                    thisQuery.AudioTrack1 = "None";\r
                 else if (audioTrack1.Success)\r
-                    thisQuery.q_audioTrack1 = "Automatic";\r
+                    thisQuery.AudioTrack1 = "Automatic";\r
 \r
                 if (audioTrack2.Success)\r
                 {\r
                     string[] audioChan = audioTrack2.ToString().Split(',');\r
-                    thisQuery.q_audioTrack2 = audioChan[1];\r
+                    thisQuery.AudioTrack2 = audioChan[1];\r
                 }\r
                 else\r
-                    thisQuery.q_audioTrack2 = "None";\r
+                    thisQuery.AudioTrack2 = "None";\r
 \r
                 if (audioTrack3.Success)\r
                 {\r
                     string[] audioChan = audioTrack3.ToString().Split(',');\r
-                    thisQuery.q_audioTrack3 = audioChan[2];\r
+                    thisQuery.AudioTrack3 = audioChan[2];\r
                 }\r
                 else\r
-                    thisQuery.q_audioTrack3 = "None";\r
+                    thisQuery.AudioTrack3 = "None";\r
 \r
                 if (audioTrack4.Success)\r
                 {\r
                     string[] audioChan = audioTrack4.ToString().Split(',');\r
-                    thisQuery.q_audioTrack4 = audioChan[3];\r
+                    thisQuery.AudioTrack4 = audioChan[3];\r
                 }\r
                 else\r
-                    thisQuery.q_audioTrack4 = "None";\r
+                    thisQuery.AudioTrack4 = "None";\r
 \r
 \r
                 // Mixdowns\r
-                thisQuery.q_audioTrackMix1 = "Automatic";\r
+                thisQuery.AudioTrackMix1 = "Automatic";\r
                 if (audioTrack1Mix.Success)\r
-                    thisQuery.q_audioTrackMix1 =\r
+                    thisQuery.AudioTrackMix1 =\r
                         getMixDown(audioTrack1Mix.ToString().Replace("-6 ", "").Replace(" ", ""));\r
 \r
-                thisQuery.q_audioTrackMix2 = "Automatic";\r
+                thisQuery.AudioTrackMix2 = "Automatic";\r
                 if (audioTrack2Mix.Success)\r
                 {\r
                     string[] audio2mix = audioTrack2Mix.ToString().Split(',');\r
-                    thisQuery.q_audioTrackMix2 = getMixDown(audio2mix[1].Trim());\r
+                    thisQuery.AudioTrackMix2 = getMixDown(audio2mix[1].Trim());\r
                 }\r
 \r
-                thisQuery.q_audioTrackMix3 = "Automatic";\r
+                thisQuery.AudioTrackMix3 = "Automatic";\r
                 if (audioTrack3Mix.Success)\r
                 {\r
                     string[] audio3mix = audioTrack3Mix.ToString().Split(',');\r
-                    thisQuery.q_audioTrackMix3 = getMixDown(audio3mix[2].Trim());\r
+                    thisQuery.AudioTrackMix3 = getMixDown(audio3mix[2].Trim());\r
                 }\r
 \r
-                thisQuery.q_audioTrackMix4 = "Automatic";\r
+                thisQuery.AudioTrackMix4 = "Automatic";\r
                 if (audioTrack4Mix.Success)\r
                 {\r
                     string[] audio4mix = audioTrack4Mix.ToString().Split(',');\r
-                    thisQuery.q_audioTrackMix4 = getMixDown(audio4mix[3].Trim());\r
+                    thisQuery.AudioTrackMix4 = getMixDown(audio4mix[3].Trim());\r
                 }\r
 \r
 \r
                 // Audio Encoders\r
                 if (audioEncoder1.Success)\r
-                    thisQuery.q_audioEncoder1 = getAudioEncoder(audioEncoder1.ToString().Replace("-E ", ""));\r
+                    thisQuery.AudioEncoder1 = getAudioEncoder(audioEncoder1.ToString().Replace("-E ", ""));\r
 \r
                 if (audioEncoder2.Success)\r
                 {\r
                     string[] audio2enc = audioEncoder2.ToString().Split(',');\r
-                    thisQuery.q_audioEncoder2 = getAudioEncoder(audio2enc[1].Trim());\r
+                    thisQuery.AudioEncoder2 = getAudioEncoder(audio2enc[1].Trim());\r
                 }\r
 \r
                 if (audioEncoder3.Success)\r
                 {\r
                     string[] audio3enc = audioEncoder3.ToString().Split(',');\r
-                    thisQuery.q_audioEncoder3 = getAudioEncoder(audio3enc[2].Trim());\r
+                    thisQuery.AudioEncoder3 = getAudioEncoder(audio3enc[2].Trim());\r
                 }\r
 \r
                 if (audioEncoder4.Success)\r
                 {\r
                     string[] audio4enc = audioEncoder4.ToString().Split(',');\r
-                    thisQuery.q_audioEncoder4 = getAudioEncoder(audio4enc[3].Trim());\r
+                    thisQuery.AudioEncoder4 = getAudioEncoder(audio4enc[3].Trim());\r
                 }\r
 \r
 \r
                 // Audio Bitrate\r
-                thisQuery.q_audioBitrate1 = "";\r
+                thisQuery.AudioBitrate1 = "";\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
+                    thisQuery.AudioBitrate1 = audioBitrate1.ToString().Replace("-B ", "").Trim();\r
+                    if (audioBitrate1.ToString().Replace("-B ", "").Trim() == "0") thisQuery.AudioBitrate1 = "Auto";\r
                 }\r
 \r
-                thisQuery.q_audioBitrate2 = "";\r
+                thisQuery.AudioBitrate2 = "";\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.AudioBitrate2 = audioBitrateSelect[1].Trim();\r
                 }\r
 \r
-                thisQuery.q_audioBitrate3 = "";\r
+                thisQuery.AudioBitrate3 = "";\r
                 if (audioBitrate3.Success && audioTrack3.Success)\r
                 {\r
                     string[] audioBitrateSelect = audioBitrate3.ToString().Split(',');\r
                     if (audioBitrateSelect[2].Trim() == "0") audioBitrateSelect[2] = "Auto";\r
-                    thisQuery.q_audioBitrate3 = audioBitrateSelect[2].Trim();\r
+                    thisQuery.AudioBitrate3 = audioBitrateSelect[2].Trim();\r
                 }\r
 \r
-                thisQuery.q_audioBitrate4 = "";\r
+                thisQuery.AudioBitrate4 = "";\r
                 if (audioBitrate4.Success)\r
                 {\r
                     string[] audioBitrateSelect = audioBitrate4.ToString().Split(',');\r
                     if (audioBitrateSelect[3].Trim() == "0") audioBitrateSelect[3] = "Auto";\r
-                    thisQuery.q_audioBitrate4 = audioBitrateSelect[3].Trim();\r
+                    thisQuery.AudioBitrate4 = audioBitrateSelect[3].Trim();\r
                 }\r
 \r
 \r
                 // Audio Sample Rate\r
                 // Make sure to change 0 to Auto\r
-                thisQuery.q_audioSamplerate1 = "Auto";\r
+                thisQuery.AudioSamplerate1 = "Auto";\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
+                    thisQuery.AudioSamplerate1 = audioSampleRate1.ToString().Replace("-R ", "").Trim();\r
+                    if (thisQuery.AudioSamplerate1 == "0") thisQuery.AudioSamplerate1 = "Auto";\r
                 }\r
 \r
 \r
@@ -983,85 +481,79 @@ namespace Handbrake.Functions
                 {\r
                     string[] audioSRSelect = audioSampleRate2.ToString().Split(',');\r
                     if (audioSRSelect[1] == "0") audioSRSelect[1] = "Auto";\r
-                    thisQuery.q_audioSamplerate2 = audioSRSelect[1].Trim();\r
+                    thisQuery.AudioSamplerate2 = audioSRSelect[1].Trim();\r
                 }\r
 \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
+                    thisQuery.AudioSamplerate3 = audioSRSelect[2].Trim();\r
                 }\r
 \r
                 if (audioSampleRate4.Success)\r
                 {\r
                     string[] audioSRSelect = audioSampleRate4.ToString().Split(',');\r
                     if (audioSRSelect[3] == "0") audioSRSelect[3] = "Auto";\r
-                    thisQuery.q_audioSamplerate4 = audioSRSelect[3].Trim();\r
+                    thisQuery.AudioSamplerate4 = audioSRSelect[3].Trim();\r
                 }\r
 \r
                 // DRC\r
                 float drcValue;\r
 \r
-                thisQuery.q_drc1 = 1;\r
+                thisQuery.DRC1 = 1;\r
                 if (drc1.Success)\r
                 {\r
                     string value = drc1.ToString().Replace("-D ", "");\r
                     float.TryParse(value, out drcValue);\r
-                    thisQuery.q_drc1 = drcValue;\r
+                    thisQuery.DRC1 = drcValue;\r
                 }\r
 \r
-                thisQuery.q_drc2 = 1;\r
+                thisQuery.DRC2 = 1;\r
                 if (drc2.Success)\r
                 {\r
                     string[] drcPoint = drc2.ToString().Split(',');\r
                     float.TryParse(drcPoint[1], out drcValue);\r
-                    thisQuery.q_drc2 = drcValue;\r
+                    thisQuery.DRC2 = drcValue;\r
                 }\r
 \r
-                thisQuery.q_drc3 = 1;\r
+                thisQuery.DRC3 = 1;\r
                 if (drc3.Success)\r
                 {\r
                     string[] drcPoint = drc3.ToString().Split(',');\r
                     float.TryParse(drcPoint[2], out drcValue);\r
-                    thisQuery.q_drc3 = drcValue;\r
+                    thisQuery.DRC3 = drcValue;\r
                 }\r
 \r
-                thisQuery.q_drc4 = 1;\r
+                thisQuery.DRC4 = 1;\r
                 if (drc4.Success)\r
                 {\r
                     string[] drcPoint = drc4.ToString().Split(',');\r
                     float.TryParse(drcPoint[3], out drcValue);\r
-                    thisQuery.q_drc4 = drcValue;\r
+                    thisQuery.DRC4 = drcValue;\r
                 }\r
 \r
                 // Subtitle Stuff\r
                 if (subtitles.Success)\r
-                    thisQuery.q_subtitles = subtitles.ToString().Replace("-s ", "");\r
+                    thisQuery.Subtitles = subtitles.ToString().Replace("-s ", "");\r
                 else\r
-                    thisQuery.q_subtitles = subScan.Success ? "Autoselect" : "None";\r
+                    thisQuery.Subtitles = subScan.Success ? "Autoselect" : "None";\r
 \r
-                thisQuery.q_forcedSubs = forcedSubtitles.Success;\r
+                thisQuery.ForcedSubtitles = forcedSubtitles.Success;\r
 \r
                 #endregion\r
 \r
                 #region Chapters Tab\r
                 if (chapterMarkersFileMode.Success || chapterMarkers.Success)\r
-                    thisQuery.q_chapterMarkers = true;\r
+                    thisQuery.ChapterMarkers = true;\r
                 #endregion\r
 \r
                 #region H.264 and other\r
 \r
-                //\r
-                //H264 Tab\r
-                //\r
                 if (x264.Success)\r
-                    thisQuery.q_h264 = x264.ToString().Replace("-x ", "");\r
+                    thisQuery.H264Query = x264.ToString().Replace("-x ", "");\r
 \r
-                //\r
-                //Progam Options\r
-                //\r
-                thisQuery.q_verbose = verbose.Success;\r
+                thisQuery.Verbose = verbose.Success;\r
 \r
                 #endregion\r
             }\r
@@ -1079,7 +571,7 @@ namespace Handbrake.Functions
 \r
         private static string getMixDown(string mixdown)\r
         {\r
-            switch (mixdown)\r
+            switch (mixdown.Trim())\r
             {\r
                 case "mono":\r
                     return "Mono";\r
@@ -1095,7 +587,6 @@ namespace Handbrake.Functions
                     return "Automatic";\r
             }\r
         }\r
-\r
         private static string getAudioEncoder(string audioEnc)\r
         {\r
             switch (audioEnc)\r
index ba71346457556fc88076df9d5a094dd6025d1722..887effb8911923ce934764b1a7792acedab1d3b2 100644 (file)
@@ -106,7 +106,7 @@ namespace Handbrake
 \r
                         // Send the query from the file to the Query Parser class, then load the preset\r
                         QueryParser presetQuery = QueryParser.Parse(query);\r
-                        presetLoader.presetLoader(this, presetQuery, Properties.Settings.Default.defaultPreset, loadPictureSettings);\r
+                        PresetLoader.presetLoader(this, presetQuery, Properties.Settings.Default.defaultPreset, loadPictureSettings);\r
 \r
                         // The x264 widgets will need updated, so do this now:\r
                         x264Panel.X264_StandardizeOptString();\r
@@ -501,7 +501,7 @@ namespace Handbrake
                         QueryParser presetQuery = QueryParser.Parse(query);\r
 \r
                         // Now load the preset\r
-                        presetLoader.presetLoader(this, presetQuery, presetName, loadPictureSettings);\r
+                        PresetLoader.presetLoader(this, presetQuery, presetName, loadPictureSettings);\r
 \r
                         // The x264 widgets will need updated, so do this now:\r
                         x264Panel.X264_StandardizeOptString();\r
index b616b2566be30ecc5faf0d8e7a8efe6eca17efa7..bb22f2394bf2e7c7031327e0e303f05bfd80bf25 100644 (file)
@@ -14,7 +14,7 @@ namespace Handbrake
         /// <param name="presetQuery">The Parsed CLI Query</param>\r
         /// <param name="name">Name of the preset</param>\r
         /// <param name="pictureSettings">Save picture settings in the preset</param>\r
-        public void presetLoader(frmMain mainWindow, Functions.QueryParser presetQuery, string name, Boolean pictureSettings)\r
+        public static void presetLoader(frmMain mainWindow, Functions.QueryParser presetQuery, string name, Boolean pictureSettings)\r
         {\r
             // ---------------------------\r
             // Setup the GUI\r
index 4591b3d6dd3464b734332e6f85cc575bb8e95441..37407c8ae60b00e6e8fceee67000dc2d42be1338 100644 (file)
@@ -113,7 +113,7 @@ namespace Handbrake
 \r
                 // Get the sample filename\r
                 if (mainWindow.text_destination.Text != "")\r
-                    currently_playing = mainWindow.text_destination.Text.Replace(".mp4", "_sample.mp4").Replace(".m4v", "_sample.m4v");\r
+                    currently_playing = mainWindow.text_destination.Text.Replace(".mp4", "_sample.mp4").Replace(".m4v", "_sample.m4v").Replace(".mkv", "_sample.mkv");;\r
 \r
                 // Play back in QT or VLC\r
                 if (playerSelection == "QT")\r