diff options
author | jstebbins <[email protected]> | 2010-06-28 15:59:31 +0000 |
---|---|---|
committer | jstebbins <[email protected]> | 2010-06-28 15:59:31 +0000 |
commit | 007b591efce31dcf65d23c8d3782d054b45717da (patch) | |
tree | f533b4f31bc1a2ec92ca37d4293758faad7fde36 /gtk/src/hb-backend.c | |
parent | 554ff68202cbc5d5d2081505b4a381f341f7c416 (diff) |
LinGui: Add max width/height widgets to preset save dialog
These are only visible when autosize is disabled, meaning the user
has chosen to set specific video dimensions. These values are used
when a preset or title is loaded to set the default storage dimensions.
This allows setting arbitrary PictureWidth/PictureHeight in the preset
which was not previously possible. The values were previously limited
to what the currently loaded source would allow you to enter into
the picture settings width/height fields.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3417 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'gtk/src/hb-backend.c')
-rw-r--r-- | gtk/src/hb-backend.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c index 81742f2ee..1dee59666 100644 --- a/gtk/src/hb-backend.c +++ b/gtk/src/hb-backend.c @@ -3600,12 +3600,6 @@ ghb_set_scale(signal_user_data_t *ud, gint mode) if (ud->scale_busy) return; ud->scale_busy = TRUE; - if (!ud->dont_clear_presets && (keep_width || keep_height)) - { - ghb_settings_set_int(ud->settings, "PictureWidth", 0); - ghb_settings_set_int(ud->settings, "PictureHeight", 0); - } - // First configure widgets mod = ghb_settings_combo_int(ud->settings, "PictureModulus"); pic_par = ghb_settings_combo_int(ud->settings, "PicturePAR"); @@ -3708,10 +3702,13 @@ ghb_set_scale(signal_user_data_t *ud, gint mode) { width = ghb_settings_get_int(ud->settings, "scale_width"); height = ghb_settings_get_int(ud->settings, "scale_height"); - max_width = MOD_DOWN( - ghb_settings_get_int(ud->settings, "PictureWidth"), mod); - max_height = MOD_DOWN( - ghb_settings_get_int(ud->settings, "PictureHeight"), mod); + if (mode & GHB_PIC_USE_MAX) + { + max_width = MOD_DOWN( + ghb_settings_get_int(ud->settings, "PictureWidth"), mod); + max_height = MOD_DOWN( + ghb_settings_get_int(ud->settings, "PictureHeight"), mod); + } } g_debug("max_width %d, max_height %d\n", max_width, max_height); |