remove crf flag and all uses of it

[handbrake-jp/handbrake-jp-git.git] / win / C# / Controls / AudioPanel.cs

diff --git a/win/C#/Controls/AudioPanel.cs b/win/C#/Controls/AudioPanel.cs
index d086999..b394e3c 100644 (file)
--- a/win/C#/Controls/AudioPanel.cs
+++ b/win/C#/Controls/AudioPanel.cs
@@ -18,7 +18,7 @@ namespace Handbrake.Controls
             InitializeComponent();\r
             drp_audioMix.SelectedIndex = 0;\r
         }\r
-        \r
+\r
         // Audio Track Options\r
         private void drp_audioTrack_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
@@ -130,7 +130,7 @@ namespace Handbrake.Controls
                 value = ((tb_drc.Value - 1) / 10.0) + 1;\r
 \r
             // Create a new row for the Audio list based on the currently selected items in the dropdown.\r
-            ListViewItem newTrack = new ListViewItem(getNewID().ToString());\r
+            ListViewItem newTrack = new ListViewItem(GetNewID().ToString());\r
             newTrack.SubItems.Add(drp_audioTrack.Text);\r
             newTrack.SubItems.Add(drp_audioEncoder.Text);\r
             newTrack.SubItems.Add(drp_audioMix.Text);\r
@@ -149,7 +149,7 @@ namespace Handbrake.Controls
         }\r
         private void btn_RemoveAudioTrack_Click(object sender, EventArgs e)\r
         {\r
-            removeAudioTrack();\r
+            RemoveAudioTrack();\r
         }\r
 \r
         // Audio List Menu\r
@@ -189,9 +189,9 @@ namespace Handbrake.Controls
         }\r
         private void audioList_remove_Click(object sender, EventArgs e)\r
         {\r
-            removeAudioTrack();\r
+            RemoveAudioTrack();\r
         }\r
-        private void removeAudioTrack()\r
+        private void RemoveAudioTrack()\r
         {\r
             // Remove the Item and reselect the control if the following conditions are met.\r
             if (lv_audioList.SelectedItems.Count != 0)\r
@@ -221,29 +221,64 @@ namespace Handbrake.Controls
         }\r
 \r
         // Public Functions\r
-        public void setTrackList(Parsing.Title selectedTitle)\r
+        public void SetTrackList(Parsing.Title selectedTitle)\r
         {\r
             drp_audioTrack.Items.Clear();\r
             drp_audioTrack.Items.Add("Automatic");\r
             drp_audioTrack.Items.Add("None");\r
             drp_audioTrack.Items.AddRange(selectedTitle.AudioTracks.ToArray());\r
-            drp_audioTrack.SelectedIndex = 0;\r
+\r
+            // Handle Native Language and "Dub Foreign language audio" and "Use Foreign language audio and Subtitles" Options\r
+            if (Properties.Settings.Default.NativeLanguage == "Any")\r
+                drp_audioTrack.SelectedIndex = 0;\r
+            else\r
+            {\r
+                if (Properties.Settings.Default.DubAudio) // "Dub Foreign language audio" \r
+                {\r
+                    int i = 0;\r
+                    foreach (object item in drp_audioTrack.Items)\r
+                    {\r
+                        if (item.ToString().Contains(Properties.Settings.Default.NativeLanguage))\r
+                        {\r
+                            drp_audioTrack.SelectedIndex = i;\r
+                            break;\r
+                        }\r
+\r
+                        i++;\r
+                    }\r
+\r
+                    if (drp_audioTrack.SelectedItem != null)\r
+                        foreach (ListViewItem item in lv_audioList.Items)\r
+                            item.SubItems[1].Text = drp_audioTrack.SelectedItem.ToString();\r
+                    else\r
+                    {\r
+                        drp_audioTrack.SelectedIndex = 0;\r
+                        if (drp_audioTrack.SelectedItem != null)\r
+                            foreach (ListViewItem item in lv_audioList.Items)\r
+                                item.SubItems[1].Text = drp_audioTrack.SelectedItem.ToString();\r
+                    }\r
+                }\r
+                else\r
+                    drp_audioTrack.SelectedIndex = 0; // "Use Foreign language audio and Subtitles"\r
+            }\r
             drp_audioMix.SelectedIndex = 0;\r
         }\r
-        public ListView getAudioPanel()\r
+        public ListView GetAudioPanel()\r
         {\r
             return lv_audioList;\r
         }\r
-        public void setAudioByContainer(String path)\r
+        public void SetContainer(String path)\r
         {\r
+            string oldval = drp_audioEncoder.Text;\r
             if ((path.Contains("MP4")) || (path.Contains("M4V")))\r
             {\r
-                string oldval = drp_audioEncoder.Text;\r
                 drp_audioEncoder.Items.Clear();\r
                 drp_audioEncoder.Items.Add("AAC (faac)");\r
                 drp_audioEncoder.Items.Add("AC3 Passthru");\r
                 if ((oldval != "AAC (faac)") && (oldval != "AC3 Passthru"))\r
                     drp_audioEncoder.SelectedIndex = 0;\r
+                else\r
+                    drp_audioEncoder.SelectedItem = oldval;\r
 \r
             }\r
             else if (path.Contains("MKV"))\r
@@ -254,6 +289,7 @@ namespace Handbrake.Controls
                 drp_audioEncoder.Items.Add("AC3 Passthru");\r
                 drp_audioEncoder.Items.Add("DTS Passthru");\r
                 drp_audioEncoder.Items.Add("Vorbis (vorbis)");\r
+                drp_audioEncoder.SelectedItem = oldval;\r
 \r
                 if (drp_audioEncoder.Text == string.Empty)\r
                     drp_audioEncoder.SelectedIndex = 0;\r
@@ -266,22 +302,31 @@ namespace Handbrake.Controls
                     row.SubItems[2].Text = drp_audioEncoder.Items[0].ToString();\r
             }\r
         }\r
-        public void addTrackForPreset(ListViewItem item)\r
+        public void AddTrackForPreset(ListViewItem item)\r
         {\r
             lv_audioList.Items.Add(item);\r
             if (this.AudioListChanged != null)\r
                 this.AudioListChanged(this, new EventArgs());\r
         }\r
-        public void clearAudioList()\r
+        public void ClearAudioList()\r
         {\r
             lv_audioList.Items.Clear();\r
             if (this.AudioListChanged != null)\r
                 this.AudioListChanged(this, new EventArgs());\r
         }\r
-        public int getNewID()\r
+        public int GetNewID()\r
         {\r
             return lv_audioList.Items.Count + 1;\r
         }\r
+        public Boolean RequiresM4V()\r
+        {\r
+            foreach (ListViewItem item in lv_audioList.Items)\r
+            {\r
+                if (item.SubItems[2].Text.Contains("AC3"))\r
+                    return true;\r
+            }\r
+            return false;\r
+        }\r
 \r
         // Helper Functions \r
         private void reGenerateListIDs()\r
@@ -305,7 +350,7 @@ namespace Handbrake.Controls
                     drp_audioBitrate.Items.Add("384");\r
                 else\r
                     drp_audioBitrate.Items.Remove("384");\r
-            } \r
+            }\r
             else\r
             {\r
                 drp_audioBitrate.Items.Remove("192");\r