WinGui:

- Enabled the Frame to Frame encode mode.

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

diff --git a/win/C#/Parsing/Title.cs b/win/C#/Parsing/Title.cs
index f81819d..b588e64 100644 (file)
--- a/win/C#/Parsing/Title.cs
+++ b/win/C#/Parsing/Title.cs
@@ -24,6 +24,7 @@ namespace Handbrake.Parsing
         private readonly List<Subtitle> m_subtitles;\r
         private List<String> m_angles = new List<string>();\r
         private float m_aspectRatio;\r
+        private float m_fps;\r
         private int[] m_autoCrop;\r
         private string source;\r
         private TimeSpan m_duration;\r
@@ -130,6 +131,14 @@ namespace Handbrake.Parsing
         {\r
             get { return m_angles; }\r
         }\r
+\r
+        /// <summary>\r
+        /// Collection of Angles in this Title\r
+        /// </summary>\r
+        public float Fps\r
+        {\r
+            get { return m_fps; }\r
+        }\r
   \r
         /// <summary>\r
         /// Override of the ToString method to provide an easy way to use this object in the UI\r
@@ -186,6 +195,7 @@ namespace Handbrake.Parsing
                 thisTitle.m_resolution = new Size(int.Parse(m.Groups[1].Value), int.Parse(m.Groups[2].Value));\r
                 thisTitle.m_parVal = new Size(int.Parse(m.Groups[3].Value), int.Parse(m.Groups[4].Value));\r
                 thisTitle.m_aspectRatio = float.Parse(m.Groups[5].Value, Culture);\r
+                thisTitle.m_fps = float.Parse(m.Groups[6].Value, Culture);\r
             }\r
 \r
             // Get autocrop region for this title\r

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 127aa04..b6fda2d 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -881,7 +881,7 @@ namespace Handbrake
             }\r
 \r
             sourcePath = Path.GetFileName(file);\r
-            StartScan(file,0);\r
+            StartScan(file, 0);\r
         }\r
         private void drp_dvdtitle_Click(object sender, EventArgs e)\r
         {\r
@@ -891,6 +891,7 @@ namespace Handbrake
         private void drp_dvdtitle_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
             UnRegisterPresetEventHandler();\r
+            drop_mode.SelectedIndex = 0;\r
 \r
             PictureSettings.lbl_Aspect.Text = "Select a Title"; // Reset some values on the form\r
             drop_chapterStart.Items.Clear();\r
@@ -1048,10 +1049,24 @@ namespace Handbrake
             int start, end;\r
             int.TryParse(drop_chapterStart.Text, out start);\r
             int.TryParse(drop_chapterFinish.Text, out end);\r
+            double duration = end - start;\r
+\r
+            switch (drop_mode.SelectedIndex)\r
+            {\r
+                case 1:\r
+                    lbl_duration.Text = TimeSpan.FromSeconds(duration).ToString();\r
+                    return;\r
+                case 2:\r
+                    if (selectedTitle != null)\r
+                    {\r
+                        duration = duration / selectedTitle.Fps;\r
+                        lbl_duration.Text = TimeSpan.FromSeconds(duration).ToString();\r
+                    }\r
+                    else\r
+                        lbl_duration.Text = "--:--:--";\r
 \r
-            int duration = end - start;\r
-            TimeSpan dur = TimeSpan.FromSeconds(duration);\r
-            lbl_duration.Text = dur.ToString();\r
+                    return;\r
+            }\r
         }\r
         private void drop_mode_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
@@ -1085,8 +1100,15 @@ namespace Handbrake
                     }\r
                     return;\r
                 case 2:\r
-                    MessageBox.Show("This feature is not implemented yet! Switching Back to Chapters Mode.", "", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
-                    drop_mode.SelectedIndex = 0;\r
+                    this.drop_chapterStart.TextChanged += new System.EventHandler(this.SecondsOrFramesChanged);\r
+                    this.drop_chapterFinish.TextChanged += new System.EventHandler(this.SecondsOrFramesChanged);\r
+                    drop_chapterStart.DropDownStyle = ComboBoxStyle.Simple;\r
+                    drop_chapterFinish.DropDownStyle = ComboBoxStyle.Simple;\r
+                    if (selectedTitle != null)\r
+                    {\r
+                        drop_chapterStart.Text = "0";\r
+                        drop_chapterFinish.Text = (selectedTitle.Fps * selectedTitle.Duration.TotalSeconds).ToString();\r
+                    }\r
                     return;\r
             }\r
         }\r