WinGui:

- Moving from mkv to mp4 now leaves only 1 vobsub track on the list. Any others are removed.

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

diff --git a/win/C#/Controls/Subtitles.cs b/win/C#/Controls/Subtitles.cs
index 4fa1186a374ba17a0e21a8ab52657a05dc6f4ee1..56edcc852aaa9d76724912f65d76245ba983bdf0 100644 (file)
--- a/win/C#/Controls/Subtitles.cs
+++ b/win/C#/Controls/Subtitles.cs
@@ -13,8 +13,28 @@ namespace Handbrake.Controls
         public Subtitles()\r
         {\r
             InitializeComponent();\r
+\r
+        }\r
+\r
+        private int fileContainer;\r
+        public void setContainer(int value)\r
+        {\r
+            fileContainer = value;\r
+            Boolean trigger = false;\r
+            if (fileContainer != 2)\r
+                foreach (ListViewItem item in lv_subList.Items)\r
+                {\r
+                    if (item.SubItems[1].Text.Contains("Bitmap"))\r
+                    {\r
+                        if (trigger)\r
+                            lv_subList.Items.Remove(item);\r
+                        trigger = true;\r
+                    }\r
+                }\r
         }\r
-        public int setContainer { get; set; }\r
+\r
+\r
+\r
 \r
         // Controls\r
         private void btn_addSubTrack_Click(object sender, EventArgs e)\r
@@ -42,7 +62,7 @@ namespace Handbrake.Controls
             }\r
 \r
             Boolean addTrack = true;\r
-            if (setContainer == 0 || setContainer == 1)\r
+            if (fileContainer == 0 || fileContainer == 1)\r
             {\r
                 burnedVal = "Yes";  // MP4 must have bitmap subs burned in.\r
 \r
@@ -53,7 +73,7 @@ namespace Handbrake.Controls
                         if (item.SubItems[1].Text.Contains("Bitmap"))\r
                         {\r
                             MessageBox.Show(this,\r
-                                            "MP4 files can only have 1 bitmap track. If you wish to have multiple bitmap tracks you should consider using MKV if suitable.",\r
+                                            "More than one vobsub is not supported in mp4... Your first vobsub track will now be used.",\r
                                             "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
                             addTrack = false;\r
                         }\r
@@ -114,7 +134,7 @@ namespace Handbrake.Controls
 \r
         private void drp_subtitleTracks_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
-             // Update an item in the  list if required.\r
+            // Update an item in the  list if required.\r
             if (lv_subList.Items.Count != 0 && lv_subList.SelectedIndices.Count != 0)\r
             {\r
                 lv_subList.Items[lv_subList.SelectedIndices[0]].SubItems[1].Text = drp_subtitleTracks.SelectedItem.ToString();\r
@@ -123,7 +143,7 @@ namespace Handbrake.Controls
         }\r
         private void check_forced_CheckedChanged(object sender, EventArgs e)\r
         {\r
-               // Update an item in the  list if required.\r
+            // Update an item in the  list if required.\r
             if (lv_subList.Items.Count != 0 && lv_subList.SelectedIndices.Count != 0)\r
             {\r
                 lv_subList.Items[lv_subList.SelectedIndices[0]].SubItems[2].Text = check_forced.Checked ? "Yes" : "No";\r
@@ -132,7 +152,7 @@ namespace Handbrake.Controls
         }\r
         private void check_burned_CheckedChanged(object sender, EventArgs e)\r
         {\r
-           // Update an item in the  list if required.\r
+            // Update an item in the  list if required.\r
             if (lv_subList.Items.Count != 0 && lv_subList.SelectedIndices.Count != 0)\r
             {\r
                 if (check_burned.Checked) // Make sure we only have 1 burned track\r
@@ -213,5 +233,5 @@ namespace Handbrake.Controls
             }\r
         }\r
 \r
-     }\r
+    }\r
 }\r

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 11d50ff2534df0f69bd6c0b0626ee7504bcd3117..6bc52152cebd8bcabaf7c89671bac8a90f93319f 100644 (file)
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -1211,7 +1211,6 @@ namespace Handbrake
             this.Subtitles.BackColor = System.Drawing.Color.Transparent;\r
             this.Subtitles.Location = new System.Drawing.Point(0, 0);\r
             this.Subtitles.Name = "Subtitles";\r
-            this.Subtitles.setContainer = 0;\r
             this.Subtitles.Size = new System.Drawing.Size(722, 310);\r
             this.Subtitles.TabIndex = 0;\r
             // \r

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 40aa39034e87f0b6df2742b1d780bde8ce780818..91e509aff76a206604693a00c2791689d20d81c5 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -973,7 +973,7 @@ namespace Handbrake
                 setExtension(".mkv");\r
 \r
             audioPanel.setAudioByContainer(drop_format.Text);\r
-            Subtitles.setContainer = drop_format.SelectedIndex;\r
+            Subtitles.setContainer(drop_format.SelectedIndex);\r
 \r
             string oldval;\r
             if ((drop_format.Text.Contains("MP4")) || (drop_format.Text.Contains("M4V")))\r