From 356c53bcf7100925b9f36890a9392696be76b10f Mon Sep 17 00:00:00 2001 From: jstebbins Date: Sat, 31 Mar 2012 15:37:30 +0000 Subject: [PATCH] LinGui: merge queue framerate display fix to bugfix branch git-svn-id: svn://svn.handbrake.fr/HandBrake/branches/0.9.x@4567 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- gtk/src/queuehandler.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/gtk/src/queuehandler.c b/gtk/src/queuehandler.c index 405e96a3c..978b1ec2b 100644 --- a/gtk/src/queuehandler.c +++ b/gtk/src/queuehandler.c @@ -272,17 +272,27 @@ add_to_queue_list(signal_user_data_t *ud, GValue *settings, GtkTreeIter *piter) if (strcmp("source", fps) == 0) { g_free(fps); - if (ghb_settings_combo_int(settings, "PictureDetelecine")) - fps = g_strdup("Same As Source (vfr detelecine)"); + if (ghb_settings_get_boolean(settings, "VideoFramerateCFR")) + fps = g_strdup("Same As Source (constant)"); else fps = g_strdup("Same As Source (variable)"); } else { - gchar *tmp; - tmp = g_strdup_printf("%s (constant frame rate)", fps); - g_free(fps); - fps = tmp; + if (ghb_settings_get_boolean(settings, "VideoFrameratePFR")) + { + gchar *tmp; + tmp = g_strdup_printf("Peak %s (may be lower)", fps); + g_free(fps); + fps = tmp; + } + else + { + gchar *tmp; + tmp = g_strdup_printf("%s (constant frame rate)", fps); + g_free(fps); + fps = tmp; + } } source_width = ghb_settings_get_int(settings, "source_width"); source_height = ghb_settings_get_int(settings, "source_height"); -- 2.40.0