diff options
| author | jstebbins <[email protected]> | 2008-09-24 15:26:05 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2008-09-24 15:26:05 +0000 |
| commit | b880ebe93ec5dedd22c77cc3a80d88a061ec82d3 (patch) | |
| tree | afc98139aca2b3e46c2fd94994dc7202edc69185 /gtk/src/hb-backend.c | |
| parent | ec46b71d92bb233dbbe73627b16305efb3662e40 (diff) | |
LinGui: vfr checkbox is toast.
detelecine && same-as-source now triggers vfr
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1753 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'gtk/src/hb-backend.c')
| -rw-r--r-- | gtk/src/hb-backend.c | 29 |
1 files changed, 9 insertions, 20 deletions
diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c index 1471181ba..3959dce89 100644 --- a/gtk/src/hb-backend.c +++ b/gtk/src/hb-backend.c @@ -2645,22 +2645,6 @@ ghb_validate_video(signal_user_data_t *ud) vcodec = HB_VCODEC_XVID; ghb_ui_update(ud, "video_codec", ghb_int64_value(vcodec)); } - gboolean decomb; - gboolean vfr; - decomb = ghb_settings_get_boolean(ud->settings, "decomb"); - vfr = ghb_settings_get_boolean(ud->settings, "variable_frame_rate"); - if (decomb && !vfr) - { - message = g_strdup_printf( - "Decomb is intended to be used in conjunction\n" - "with variable frame rate.\n\n" - "Would you like me to enable VFR for you?"); - if (ghb_message_dialog(GTK_MESSAGE_WARNING, message, "No", "Yes")) - { - ghb_ui_update(ud, "variable_frame_rate", ghb_boolean_value(TRUE)); - } - g_free(message); - } return TRUE; } @@ -3089,10 +3073,15 @@ ghb_add_job(GValue *js, gint unique_id) job->pixel_ratio = 0; job->modulus = 2; } - job->vfr = ghb_settings_get_boolean(js, "variable_frame_rate"); /* Add selected filters */ job->filters = hb_list_init(); - if( ghb_settings_get_boolean(js, "detelecine" ) || job->vfr ) + gint vrate = ghb_settings_combo_int(js, "framerate"); + if( vrate == 0 && ghb_settings_get_boolean(js, "detelecine" ) ) + job->vfr = 1; + else + job->vfr = 0; + + if( ghb_settings_get_boolean(js, "detelecine" ) ) { hb_filter_detelecine.settings = NULL; if (tweaks) @@ -3204,10 +3193,10 @@ ghb_add_job(GValue *js, gint unique_id) if (job->mux == HB_MUX_AVI) { job->vfr = FALSE; + job->cfr = 1; } - gint vrate = ghb_settings_combo_int(js, "framerate"); - if( vrate == 0 || job->vfr ) + if( vrate == 0 ) { job->vrate = title->rate; job->vrate_base = title->rate_base; |