diff options
| author | sr55 <[email protected]> | 2009-06-09 21:48:37 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2009-06-09 21:48:37 +0000 |
| commit | 71bc820e642a7afaf80046e0288220cbbfec23e8 (patch) | |
| tree | 0c4fd8f6acae2cbdec727c39672d85e6b8149758 | |
| parent | 83b9605f2df83c23a32d2b4a9444a1ddf7d82a8e (diff) | |
WinGui:
- Fix the QueryGenerator setting incorrect width/height values for anamorphic modes.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2509 b64f7644-9d1e-0410-96f1-a4d463321fa5
| -rw-r--r-- | win/C#/Controls/PictureSettings.cs | 29 | ||||
| -rw-r--r-- | win/C#/Functions/QueryGenerator.cs | 8 |
2 files changed, 6 insertions, 31 deletions
diff --git a/win/C#/Controls/PictureSettings.cs b/win/C#/Controls/PictureSettings.cs index e642eaf2a..7704a366a 100644 --- a/win/C#/Controls/PictureSettings.cs +++ b/win/C#/Controls/PictureSettings.cs @@ -10,33 +10,6 @@ namespace Handbrake.Controls // - Fix MAX Width / Height Code.
// - Tie in the cropping controls.
- /* Custom Anamorphic Mode
- *
- * DISPLAY WIDTH STORAGE WIDTH PIXEL WIDTH
- * HEIGHT KEEP ASPECT PIXEL HEIGHT
- *
- * --- NOT KEEPING DISPLAY ASPECT ---
- * Changing STORAGE WIDTH changes DISPLAY WIDTH to STORAGE WIDTH * PIXEL WIDTH / PIXEL HEIGHT
- * Changing PIXEL dimensions changes DISPLAY WIDTH to STORAGE WIDTH * PIXEL WIDTH / PIXEL HEIGHT
- * Changing DISPLAY WIDTH changes PIXEL WIDTH to DISPLAY WIDTH and PIXEL HEIGHT to STORAGE WIDTH
- * Changing HEIGHT just....changes the height.
- *
- * --- KEEPING DISPLAY ASPECT RATIO ---
- * DAR = DISPLAY WIDTH / DISPLAY HEIGHT (cache after every modification)
- * Disable editing: PIXEL WIDTH, PIXEL HEIGHT
- * Changing DISPLAY WIDTH:
- * Changes HEIGHT to keep DAR
- * Changes PIXEL WIDTH to new DISPLAY WIDTH
- * Changes PIXEL HEIGHT to STORAGE WIDTH
- * Changing HEIGHT
- * Changes DISPLAY WIDTH to keep DAR
- * Changes PIXEL WIDTH to new DISPLAY WIDTH
- * Changes PIXEL HEIGHT to STORAGE WIDTH
- * Changing STORAGE_WIDTH:
- * Changes PIXEL WIDTH to DISPLAY WIDTH
- * Changes PIXEL HEIGHT to new STORAGE WIDTH
- */
-
public partial class PictureSettings : UserControl
{
// Globals
@@ -47,7 +20,7 @@ namespace Handbrake.Controls public Title selectedTitle { get; set; }
private Boolean heightChangeGuard;
private Boolean looseAnamorphicHeightGuard;
- private Boolean heightModJumpGaurd = false;
+ private Boolean heightModJumpGaurd;
// Window Setup
public PictureSettings()
diff --git a/win/C#/Functions/QueryGenerator.cs b/win/C#/Functions/QueryGenerator.cs index a60ad3112..16b2ace3f 100644 --- a/win/C#/Functions/QueryGenerator.cs +++ b/win/C#/Functions/QueryGenerator.cs @@ -122,7 +122,8 @@ namespace Handbrake.Functions {
if (mainWindow.pictureSettings.text_width.Text != "")
- query += " -w " + mainWindow.pictureSettings.text_width.Text;
+ if (mainWindow.pictureSettings.drp_anamorphic.SelectedIndex != 1) // Prevent usage for strict anamorphic
+ query += " -w " + mainWindow.pictureSettings.text_width.Text;
}
else
{
@@ -134,12 +135,13 @@ namespace Handbrake.Functions if (mainWindow.maxHeight == 0)
{
if (mainWindow.pictureSettings.text_height.Text != "")
- query += " -l " + mainWindow.pictureSettings.text_height.Text;
+ if (mainWindow.pictureSettings.drp_anamorphic.SelectedIndex == 0 || mainWindow.pictureSettings.drp_anamorphic.SelectedIndex == 3) // Prevent usage for strict anamorphic
+ query += " -l " + mainWindow.pictureSettings.text_height.Text;
}
else
{
if (mainWindow.pictureSettings.text_height.Text != "")
- query += " -Y " + mainWindow.pictureSettings.text_height.Text;
+ query += " -Y " + mainWindow.pictureSettings.text_height.Text;
}
string cropTop = mainWindow.pictureSettings.crop_top.Text;
|