WinGui:

- Added theora support.
- Renamed the video encoders to match the mac gui.
- Made 64bit/OptimizeMP4/ipodatom invisible when non .mp4/m4v formats are in use

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

4 files changed, 89 insertions, 18 deletions

diff --git a/win/C#/Functions/Common.cs b/win/C#/Functions/Common.cs
index 825e614f1..4394fe54b 100644
--- a/win/C#/Functions/Common.cs
+++ b/win/C#/Functions/Common.cs
@@ -550,17 +550,17 @@ namespace Handbrake.Functions
 

             switch (videoEncoder)

             {

-                case "Mpeg 4":

+                case "MPEG-4 (FFmpeg)":

                     videoEncoder = " -e ffmpeg";

                     break;

-                case "Xvid":

+                case "MPEG-4 (XviD)":

                     videoEncoder = " -e xvid";

                     break;

-                case "H.264":

+                case "H.264 (x264)":

                     videoEncoder = " -e x264";

                     break;

-                case "H.264 (iPod)":

-                    videoEncoder = " -e x264b30";

+                case "VP3 (Theora)":

+                    videoEncoder = " -e theora";

                     break;

                 default:

                     videoEncoder = " -e x264";

diff --git a/win/C#/Functions/QueryParser.cs b/win/C#/Functions/QueryParser.cs
index df82fc2cc..a0550b06e 100644
--- a/win/C#/Functions/QueryParser.cs
+++ b/win/C#/Functions/QueryParser.cs
@@ -894,22 +894,19 @@ namespace Handbrake.Functions
                 switch (videoEncoderConvertion)

                 {

                     case "ffmpeg":

-                        videoEncoderConvertion = "Mpeg 4";

+                        videoEncoderConvertion = "MPEG-4 (FFmpeg)";

                         break;

                     case "xvid":

-                        videoEncoderConvertion = "Xvid";

+                        videoEncoderConvertion = "MPEG-4 (XviD)";

                         break;

                     case "x264":

-                        videoEncoderConvertion = "H.264";

+                        videoEncoderConvertion = "H.264 (x264)";

                         break;

-                    case "x264b13":

-                        videoEncoderConvertion = "H.264 Baseline 1.3";

-                        break;

-                    case "x264b30":

-                        videoEncoderConvertion = "H.264 (iPod)";

+                    case "theora":

+                        videoEncoderConvertion = "VP3 (Theora)";

                         break;

                     default:

-                        videoEncoderConvertion = "Mpeg 4";

+                        videoEncoderConvertion = "MPEG-4 (FFmpeg)";

                         break;

                 }

                 thisQuery.q_videoEncoder = videoEncoderConvertion;

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 211a0897a..2c8f70dbd 100644
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -373,9 +373,10 @@ namespace Handbrake
             this.drp_videoEncoder.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

             this.drp_videoEncoder.FormattingEnabled = true;

             this.drp_videoEncoder.Items.AddRange(new object[] {

-            "Mpeg 4",

-            "Xvid",

-            "H.264"});

+            "MPEG-4 (FFmpeg)",

+            "MPEG-4 (XviD)",

+            "H.264 (x264)",

+            "VP3 (Theora)"});

             this.drp_videoEncoder.Location = new System.Drawing.Point(99, 20);

             this.drp_videoEncoder.Name = "drp_videoEncoder";

             this.drp_videoEncoder.Size = new System.Drawing.Size(156, 21);

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 7930f5036..2ae2e1b90 100644
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -639,11 +639,32 @@ namespace Handbrake
         private void text_destination_TextChanged(object sender, EventArgs e)

         {

             setAudioByContainer(text_destination.Text);

+            setVideoByContainer(text_destination.Text);

         }

 

         // Output Settings

         private void drp_videoEncoder_SelectedIndexChanged(object sender, EventArgs e)

         {

+            if ((text_destination.Text.Contains(".mp4")) || (text_destination.Text.Contains(".m4v")))

+            {

+                check_largeFile.Enabled = true;

+                check_iPodAtom.Enabled = true;

+                check_optimiseMP4.Enabled = true;

+                check_largeFile.Visible = true;

+                check_iPodAtom.Visible = true;

+                check_optimiseMP4.Visible = true;

+            }

+            else

+            {

+                check_largeFile.Checked = false;

+                check_iPodAtom.Checked = false;

+                check_optimiseMP4.Checked = false;

+                check_largeFile.Visible = false;

+                check_iPodAtom.Visible = false;

+                check_optimiseMP4.Visible = false;

+            }

+

+

             //Turn off some options which are H.264 only when the user selects a non h.264 encoder

             if (!drp_videoEncoder.Text.Contains("H.264"))

             {

@@ -1799,7 +1820,7 @@ namespace Handbrake
         {

             string oldval = "";

 

-            if ((path.EndsWith(".mp4")) || (path.EndsWith(".mp4")))

+            if ((path.EndsWith(".mp4")) || (path.EndsWith(".m4v")))

             {

                 oldval = drp_audenc_1.Text;

                 drp_audenc_1.Items.Clear();

@@ -1944,6 +1965,58 @@ namespace Handbrake
                 }

             }

         }

+        private void setVideoByContainer(String path)

+        {

+            string oldval = "";

+

+            if ((path.EndsWith(".mp4")) || (path.EndsWith(".m4v")))

+            {

+                oldval = drp_videoEncoder.Text;

+                drp_videoEncoder.Items.Clear();

+                drp_videoEncoder.Items.Add("MPEG-4 (FFmpeg)");

+                drp_videoEncoder.Items.Add("MPEG-4 (XviD)");

+                drp_videoEncoder.Items.Add("H.264 (x264)");

+                if (oldval == "VP3 (Theora)")

+                    drp_videoEncoder.SelectedIndex = 2;

+                else

+                    drp_videoEncoder.Text = oldval;

+

+            }

+            else if (path.EndsWith(".avi"))

+            {

+                oldval = drp_videoEncoder.Text;

+                drp_videoEncoder.Items.Clear();

+                drp_videoEncoder.Items.Add("MPEG-4 (FFmpeg)");

+                drp_videoEncoder.Items.Add("MPEG-4 (XviD)");

+                drp_videoEncoder.Items.Add("H.264 (x264)");

+                if (oldval == "VP3 (Theora)")

+                    drp_videoEncoder.SelectedIndex = 2;

+                else

+                    drp_videoEncoder.Text = oldval;

+            }

+            else if (path.EndsWith(".ogm"))

+            {

+                oldval = drp_videoEncoder.Text;

+                drp_videoEncoder.Items.Clear();

+                drp_videoEncoder.Items.Add("MPEG-4 (FFmpeg)");

+                drp_videoEncoder.Items.Add("MPEG-4 (XviD)");

+                drp_videoEncoder.Items.Add("VP3 (Theora)");

+                if (oldval == "H.264 (x264)")

+                    drp_videoEncoder.SelectedIndex = 2;

+                else

+                    drp_videoEncoder.Text = oldval;

+            }

+            else if (path.EndsWith(".mkv"))

+            {

+                oldval = drp_videoEncoder.Text;

+                drp_videoEncoder.Items.Clear();

+                drp_videoEncoder.Items.Add("MPEG-4 (FFmpeg)");

+                drp_videoEncoder.Items.Add("MPEG-4 (XviD)");

+                drp_videoEncoder.Items.Add("H.264 (x264)");

+                drp_videoEncoder.Items.Add("VP3 (Theora)");

+                drp_videoEncoder.Text = oldval;

+            }

+        }

 

         // Preset system functions

         private void addPresetToList(ArrayList presetNameList)