WinGui:

- now using C#.Net 08
- Fixed bug with VFR setting framerate when enabled.
- Fixed potential framerate bug (passing framerate without -r to the CLI)

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

1 files changed, 8 insertions, 4 deletions

diff --git a/win/C#/Functions/Common.cs b/win/C#/Functions/Common.cs
index b4b2070bb..ec6ebeefb 100644
--- a/win/C#/Functions/Common.cs
+++ b/win/C#/Functions/Common.cs
@@ -498,6 +498,7 @@ namespace Handbrake.Functions
             string vidQSetting = "";

             string twoPassEncoding = "";

             string videoFramerate = mainWindow.drp_videoFramerate.Text;

+            string vid_frame_rate = "";

             string turboH264 = "";

             string largeFile = "";

             string denoise = "";

@@ -528,9 +529,12 @@ namespace Handbrake.Functions
                 twoPassEncoding = " -2 ";

 

             if (videoFramerate == "Automatic")

-                videoFramerate = "";

+                vid_frame_rate = "";

             else

-                videoFramerate = " -r " + videoFramerate;

+            {

+                if (!mainWindow.check_vfr.Checked)

+                    vid_frame_rate = " -r " + videoFramerate;

+            }

 

             if (mainWindow.check_turbo.Checked)

                 turboH264 = " -T ";

@@ -565,7 +569,7 @@ namespace Handbrake.Functions
                 optimizeMP4 = " -O ";

 

 

-            string queryVideoSettings = videoBitrate + videoFilesize + vidQSetting + twoPassEncoding + videoFramerate + turboH264 + ipodAtom + optimizeMP4 + largeFile + denoise;

+            string queryVideoSettings = videoBitrate + videoFilesize + vidQSetting + twoPassEncoding + vid_frame_rate + turboH264 + ipodAtom + optimizeMP4 + largeFile + denoise;

             #endregion

 

             // Audio Settings Tab

@@ -699,7 +703,7 @@ namespace Handbrake.Functions
                 {

                     string path = Path.Combine(Path.GetTempPath(), "chapters.csv");

 

-                    ChapterMarkers = " --markers=" + path;

+                    ChapterMarkers = " --markers=" + "\"" + path + "\"";

                 }

             }