diff options
| author | sr55 <[email protected]> | 2010-04-24 15:25:40 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2010-04-24 15:25:40 +0000 |
| commit | a5687f98414788475d8ba26ca6db176b0b2c5a4a (patch) | |
| tree | f657b6d13ea1e23fd7b7fbef0e00bae04da0770f | |
| parent | 1fe85f1a237d4d0242862bb92d2383c1058f6158 (diff) | |
WinGui:
- More stylecop warnings cleaned up
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3259 b64f7644-9d1e-0410-96f1-a4d463321fa5
| -rw-r--r-- | win/C#/Functions/QueryParser.cs | 229 | ||||
| -rw-r--r-- | win/C#/Model/AudioTrack.cs | 1 | ||||
| -rw-r--r-- | win/C#/Model/DriveInformation.cs | 1 | ||||
| -rw-r--r-- | win/C#/Model/Job.cs | 1 | ||||
| -rw-r--r-- | win/C#/frmQueue.cs | 22 |
5 files changed, 223 insertions, 31 deletions
diff --git a/win/C#/Functions/QueryParser.cs b/win/C#/Functions/QueryParser.cs index 4e864227e..4d01c91de 100644 --- a/win/C#/Functions/QueryParser.cs +++ b/win/C#/Functions/QueryParser.cs @@ -24,71 +24,266 @@ namespace Handbrake.Functions #region Varibles
- // Source
- public int DVDTitle { get; set; }
- public int DVDChapterStart { get; set; }
- public int DVDChapterFinish { get; set; }
+ #region Source Title / Chapters
+ /// <summary>
+ /// Gets or sets Title.
+ /// </summary>
+ public int Title { get; set; }
+
+ /// <summary>
+ /// Gets or sets ChapterStart.
+ /// </summary>
+ public int ChapterStart { get; set; }
- // Output Settings
+ /// <summary>
+ /// Gets or sets ChapterFinish.
+ /// </summary>
+ public int ChapterFinish { get; set; }
+ #endregion
+
+ #region Output Settings
+ /// <summary>
+ /// Gets or sets the file Format. e.g mkv or mp4
+ /// </summary>
public string Format { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether LargeMP4 support is enabled.
+ /// This is the 64bit MP4 file that allows >4GB files
+ /// </summary>
public bool LargeMP4 { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether IpodAtom is inserted
+ /// </summary>
public bool IpodAtom { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether OptimizeMP4 is enabed for web streaming
+ /// </summary>
public bool OptimizeMP4 { get; set; }
+ #endregion
+
+ #region Picture Settings
- // Picture Settings
+ /// <summary>
+ /// Gets or sets Width.
+ /// </summary>
public int Width { get; set; }
+
+ /// <summary>
+ /// Gets or sets Height.
+ /// </summary>
public int Height { get; set; }
+
+ /// <summary>
+ /// Gets or sets MaxWidth.
+ /// </summary>
public int MaxWidth { get; set; }
+
+ /// <summary>
+ /// Gets or sets MaxHeight.
+ /// </summary>
public int MaxHeight { get; set; }
+
+ /// <summary>
+ /// Gets or sets CropValues.
+ /// </summary>
public string CropValues { get; set; }
+
+ /// <summary>
+ /// Gets or sets CropTop.
+ /// </summary>
public string CropTop { get; set; }
+
+ /// <summary>
+ /// Gets or sets CropBottom.
+ /// </summary>
public string CropBottom { get; set; }
+
+ /// <summary>
+ /// Gets or sets CropLeft.
+ /// </summary>
public string CropLeft { get; set; }
+
+ /// <summary>
+ /// Gets or sets CropRight.
+ /// </summary>
public string CropRight { get; set; }
+
+ /// <summary>
+ /// Gets or sets AnamorphicMode.
+ /// </summary>
public int AnamorphicMode { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether KeepDisplayAsect.
+ /// </summary>
public bool KeepDisplayAsect { get; set; }
+
+ /// <summary>
+ /// Gets or sets DisplayWidthValue.
+ /// </summary>
public double DisplayWidthValue { get; set; }
+
+ /// <summary>
+ /// Gets or sets PixelAspectWidth.
+ /// </summary>
public int PixelAspectWidth { get; set; }
+
+ /// <summary>
+ /// Gets or sets PixelAspectHeight.
+ /// </summary>
public int PixelAspectHeight { get; set; }
+
+ /// <summary>
+ /// Gets or sets AnamorphicModulus.
+ /// </summary>
public int AnamorphicModulus { get; set; }
+ #endregion
+
+ #region Video Filters
- // Video Filters
+ /// <summary>
+ /// Gets or sets DeTelecine.
+ /// </summary>
public string DeTelecine { get; set; }
+
+ /// <summary>
+ /// Gets or sets DeBlock.
+ /// </summary>
public int DeBlock { get; set; }
+
+ /// <summary>
+ /// Gets or sets DeInterlace.
+ /// </summary>
public string DeInterlace { get; set; }
+
+ /// <summary>
+ /// Gets or sets DeNoise.
+ /// </summary>
public string DeNoise { get; set; }
+
+ /// <summary>
+ /// Gets or sets Decomb.
+ /// </summary>
public string Decomb { get; set; }
+ #endregion
- // Video Settings
+ #region Video Settings
+ /// <summary>
+ /// Gets or sets VideoEncoder.
+ /// </summary>
public string VideoEncoder { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether Grayscale.
+ /// </summary>
public bool Grayscale { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether TwoPass.
+ /// </summary>
public bool TwoPass { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether TurboFirstPass.
+ /// </summary>
public bool TurboFirstPass { get; set; }
+
+ /// <summary>
+ /// Gets or sets VideoFramerate.
+ /// </summary>
public string VideoFramerate { get; set; }
+
+ /// <summary>
+ /// Gets or sets AverageVideoBitrate.
+ /// </summary>
public string AverageVideoBitrate { get; set; }
+
+ /// <summary>
+ /// Gets or sets VideoTargetSize.
+ /// </summary>
public string VideoTargetSize { get; set; }
+
+ /// <summary>
+ /// Gets or sets VideoQuality.
+ /// </summary>
public float VideoQuality { get; set; }
+ #endregion
- // Audio Settings
+ #region Audio Settings
+
+ /// <summary>
+ /// Gets or sets AudioInformation.
+ /// </summary>
public ArrayList AudioInformation { get; set; }
+
+ /// <summary>
+ /// Gets or sets Subtitles.
+ /// </summary>
public string Subtitles { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether ForcedSubtitles.
+ /// </summary>
public bool ForcedSubtitles { get; set; }
+ #endregion
- // Chapter Markers
+ #region Other
+ /// <summary>
+ /// Gets or sets a value indicating whether ChapterMarkers.
+ /// </summary>
public bool ChapterMarkers { get; set; }
- // Other
+ /// <summary>
+ /// Gets or sets H264Query.
+ /// </summary>
public string H264Query { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether Verbose.
+ /// </summary>
public bool Verbose { get; set; }
+ #endregion
- // Preset Information
+ #region Preset Information
+
+ /// <summary>
+ /// Gets or sets PresetBuildNumber.
+ /// </summary>
public int PresetBuildNumber { get; set; }
+
+ /// <summary>
+ /// Gets or sets PresetDescription.
+ /// </summary>
public string PresetDescription { get; set; }
+
+ /// <summary>
+ /// Gets or sets PresetName.
+ /// </summary>
public string PresetName { get; set; }
+
+ /// <summary>
+ /// Gets or sets Type.
+ /// </summary>
public string Type { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether UsesMaxPictureSettings.
+ /// </summary>
public bool UsesMaxPictureSettings { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether UsesPictureFilters.
+ /// </summary>
public bool UsesPictureFilters { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether UsesPictureSettings.
+ /// </summary>
public bool UsesPictureSettings { get; set; }
+ #endregion
#endregion
@@ -181,19 +376,19 @@ namespace Handbrake.Functions #region Source Tab
if (title.Success)
- thisQuery.DVDTitle = int.Parse(title.ToString().Replace("-t ", string.Empty));
+ thisQuery.Title = int.Parse(title.ToString().Replace("-t ", string.Empty));
if (chapters.Success)
{
string[] actTitles = chapters.ToString().Replace("-c ", string.Empty).Split('-');
- thisQuery.DVDChapterStart = int.Parse(actTitles[0]);
+ thisQuery.ChapterStart = int.Parse(actTitles[0]);
if (actTitles.Length > 1)
{
- thisQuery.DVDChapterFinish = int.Parse(actTitles[1]);
+ thisQuery.ChapterFinish = int.Parse(actTitles[1]);
}
- if ((thisQuery.DVDChapterStart == 1) && (thisQuery.DVDChapterFinish == 0))
- thisQuery.DVDChapterFinish = thisQuery.DVDChapterStart;
+ if ((thisQuery.ChapterStart == 1) && (thisQuery.ChapterFinish == 0))
+ thisQuery.ChapterFinish = thisQuery.ChapterStart;
}
#endregion
diff --git a/win/C#/Model/AudioTrack.cs b/win/C#/Model/AudioTrack.cs index 410cfa59e..04b12ce8c 100644 --- a/win/C#/Model/AudioTrack.cs +++ b/win/C#/Model/AudioTrack.cs @@ -12,7 +12,6 @@ namespace Handbrake.Model {
/// <summary>
/// Initializes a new instance of the <see cref="AudioTrack"/> class.
- /// Audio Track instance
/// </summary>
public AudioTrack()
{
diff --git a/win/C#/Model/DriveInformation.cs b/win/C#/Model/DriveInformation.cs index f22cdf982..d7cef0ee5 100644 --- a/win/C#/Model/DriveInformation.cs +++ b/win/C#/Model/DriveInformation.cs @@ -10,7 +10,6 @@ namespace Handbrake.Model /// </summary>
public class DriveInformation
{
-
/// <summary>
/// Gets or sets A Unique ID That represemts this model.
/// </summary>
diff --git a/win/C#/Model/Job.cs b/win/C#/Model/Job.cs index a2ccc00bf..6f2721272 100644 --- a/win/C#/Model/Job.cs +++ b/win/C#/Model/Job.cs @@ -3,7 +3,6 @@ Homepage: <http://handbrake.fr>.
It may be used under the terms of the GNU General Public License. */
-
namespace Handbrake.Model
{
/// <summary>
diff --git a/win/C#/frmQueue.cs b/win/C#/frmQueue.cs index b6d19045e..89303b6cb 100644 --- a/win/C#/frmQueue.cs +++ b/win/C#/frmQueue.cs @@ -237,17 +237,17 @@ namespace Handbrake QueryParser parsed = Functions.QueryParser.Parse(qItem);
// Get the DVD Title
- string title = parsed.DVDTitle == 0 ? "Auto" : parsed.DVDTitle.ToString();
+ string title = parsed.Title == 0 ? "Auto" : parsed.Title.ToString();
// Get the DVD Chapters
string chapters;
- if (parsed.DVDChapterStart == 0)
+ if (parsed.ChapterStart == 0)
chapters = "Auto";
else
{
- chapters = parsed.DVDChapterStart.ToString();
- if (parsed.DVDChapterFinish != 0)
- chapters = chapters + " - " + parsed.DVDChapterFinish;
+ chapters = parsed.ChapterStart.ToString();
+ if (parsed.ChapterFinish != 0)
+ chapters = chapters + " - " + parsed.ChapterFinish;
}
ListViewItem item = new ListViewItem();
@@ -300,19 +300,19 @@ namespace Handbrake }
// found query is a global varible
- QueryParser parsed = Functions.QueryParser.Parse(queue.LastEncode.Query);
+ QueryParser parsed = QueryParser.Parse(queue.LastEncode.Query);
lbl_source.Text = queue.LastEncode.Source;
lbl_dest.Text = queue.LastEncode.Destination;
- lbl_title.Text = parsed.DVDTitle == 0 ? "Auto" : parsed.DVDTitle.ToString();
+ lbl_title.Text = parsed.Title == 0 ? "Auto" : parsed.Title.ToString();
- if (Equals(parsed.DVDChapterStart, 0))
+ if (Equals(parsed.ChapterStart, 0))
lbl_chapt.Text = "Auto";
else
{
- string chapters = parsed.DVDChapterStart.ToString();
- if (parsed.DVDChapterFinish != 0)
- chapters = chapters + " - " + parsed.DVDChapterFinish;
+ string chapters = parsed.ChapterStart.ToString();
+ if (parsed.ChapterFinish != 0)
+ chapters = chapters + " - " + parsed.ChapterFinish;
lbl_chapt.Text = chapters;
}
|