From d7ad9f1db50b3739767588e1cdfe14e0a3ae963b Mon Sep 17 00:00:00 2001 From: jstebbins Date: Wed, 24 Sep 2008 15:26:05 +0000 Subject: [PATCH] LinGui: vfr checkbox is toast. detelecine && same-as-source now triggers vfr git-svn-id: svn://localhost/HandBrake/trunk@1753 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- gtk/src/callbacks.c | 16 +------ gtk/src/ghb.ui | 19 +-------- gtk/src/hb-backend.c | 29 ++++--------- gtk/src/internal_defaults.xml | 2 - gtk/src/makedeps.c | 3 -- gtk/src/resource_data.h | 99 +------------------------------------------ gtk/src/resources.plist | 87 +------------------------------------ gtk/src/standard_presets.xml | 36 ---------------- gtk/src/widget_deps | 6 --- gtk/src/widget_reverse_deps | 24 ----------- 10 files changed, 16 insertions(+), 305 deletions(-) diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c index 98b107b2..a1babd4d 100644 --- a/gtk/src/callbacks.c +++ b/gtk/src/callbacks.c @@ -1372,20 +1372,6 @@ vcodec_changed_cb(GtkWidget *widget, signal_user_data_t *ud) gtk_range_set_range (GTK_RANGE(qp), vqmin, vqmax); } -void -vfr_changed_cb(GtkWidget *widget, signal_user_data_t *ud) -{ - //const gchar *name = gtk_widget_get_name(widget); - //g_debug("setting_widget_changed_cb () %s", name); - ghb_widget_to_setting(ud->settings, widget); - check_dependency(ud, widget); - clear_presets_selection(ud); - if (ghb_settings_get_boolean(ud->settings, "variable_frame_rate")) - { - ghb_ui_update(ud, "framerate", ghb_int64_value(0)); - } -} - // subtitles have their differ from other settings in that // the selection is updated automaitcally when the title // changes. I don't want the preset selection changed as @@ -4486,7 +4472,7 @@ gboolean queue_key_press_cb( GValue *settings; gint status; - g_message("queue_key_press_cb ()"); + g_debug("queue_key_press_cb ()"); treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "queue_list")); store = gtk_tree_view_get_model(treeview); diff --git a/gtk/src/ghb.ui b/gtk/src/ghb.ui index dfc4430f..4bb77a59 100644 --- a/gtk/src/ghb.ui +++ b/gtk/src/ghb.ui @@ -1703,21 +1703,6 @@ - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Variable Frame Rate - True - True - - - - False - 2 - - - True True @@ -1727,7 +1712,7 @@ - 3 + 2 @@ -1748,7 +1733,7 @@ - 4 + 3 diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c index 1471181b..3959dce8 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; diff --git a/gtk/src/internal_defaults.xml b/gtk/src/internal_defaults.xml index 7b784200..ed66ec15 100644 --- a/gtk/src/internal_defaults.xml +++ b/gtk/src/internal_defaults.xml @@ -174,8 +174,6 @@ two_pass - variable_frame_rate - video_bitrate 1800 video_codec diff --git a/gtk/src/makedeps.c b/gtk/src/makedeps.c index e3460ef1..433068a7 100644 --- a/gtk/src/makedeps.c +++ b/gtk/src/makedeps.c @@ -37,9 +37,6 @@ static dependency_t dep_map[] = {"container", "large_mp4", "mp4|m4v", FALSE}, {"container", "http_optimize_mp4", "mp4|m4v", FALSE}, {"container", "ipod_file", "mp4|m4v", FALSE}, - {"container", "variable_frame_rate", "avi", TRUE}, - {"variable_frame_rate", "framerate", "TRUE", TRUE}, - {"variable_frame_rate", "detelecine", "TRUE", TRUE}, {"decomb", "deinterlace", "TRUE", TRUE}, {"decomb", "tweak_deinterlace", "TRUE", TRUE}, {"autocrop", "crop_top", "FALSE", FALSE}, diff --git a/gtk/src/resource_data.h b/gtk/src/resource_data.h index 88f54d16..490dc8bd 100644 --- a/gtk/src/resource_data.h +++ b/gtk/src/resource_data.h @@ -2696,33 +2696,6 @@ " </child>\n" " <child>\n" " <object class="GtkCheckBu" -"tton" id="variable_frame_rate">\n" -" <property name="visible" -"">True</property>\n" -" <property name="can_foc" -"us">True</property>\n" -" <property name="events&" -"quot;>GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_B" -"UTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n" -" <property name="label&q" -"uot; translatable="yes">Variable Frame Rate</property&g" -"t;\n" -" <property name="active&" -"quot;>True</property>\n" -" <property name="draw_in" -"dicator">True</property>\n" -" <signal handler="vfr_ch" -"anged_cb" name="toggled"/>\n" -" </object>\n" -" <packing>\n" -" <property name="expand&" -"quot;>False</property>\n" -" <property name="positio" -"n">2</property>\n" -" </packing>\n" -" </child>\n" -" <child>\n" -" <object class="GtkCheckBu" "tton" id="two_pass">\n" " <property name="visible" "">True</property>\n" @@ -2740,7 +2713,7 @@ " </object>\n" " <packing>\n" " <property name="positio" -"n">3</property>\n" +"n">2</property>\n" " </packing>\n" " </child>\n" " <child>\n" @@ -2777,7 +2750,7 @@ " </object>\n" " <packing>\n" " <property name="positio" -"n">4</property>\n" +"n">3</property>\n" " </packing>\n" " </child>\n" " <child>\n" @@ -10127,8 +10100,6 @@ " \n" " two_pass\n" " \n" -" variable_frame_rate\n" -" \n" " video_bitrate\n" " 1800\n" " video_codec\n" @@ -10207,8 +10178,6 @@ " \n" " two_pass\n" " \n" -" variable_frame_rate\n" -" \n" " video_bitrate\n" " 1000\n" " video_codec\n" @@ -10293,8 +10262,6 @@ " none\n" " two_pass\n" " \n" -" variable_frame_rate\n" -" \n" " video_bitrate\n" " 2500\n" " video_codec\n" @@ -10368,8 +10335,6 @@ " \n" " two_pass\n" " \n" -" variable_frame_rate\n" -" \n" " video_bitrate\n" " 1800\n" " video_codec\n" @@ -10443,8 +10408,6 @@ " \n" " two_pass\n" " \n" -" variable_frame_rate\n" -" \n" " video_bitrate\n" " 512\n" " video_codec\n" @@ -10517,8 +10480,6 @@ " \n" " two_pass\n" " \n" -" variable_frame_rate\n" -" \n" " video_bitrate\n" " 1600\n" " video_codec\n" @@ -10589,8 +10550,6 @@ " none\n" " two_pass\n" " \n" -" variable_frame_rate\n" -" \n" " video_bitrate\n" " 1000\n" " video_codec\n" @@ -10663,8 +10622,6 @@ " \n" " two_pass\n" " \n" -" variable_frame_rate\n" -" \n" " video_bitrate\n" " 2000\n" " video_codec\n" @@ -10739,8 +10696,6 @@ " \n" " two_pass\n" " \n" -" variable_frame_rate\n" -" \n" " video_bitrate\n" " 1600\n" " video_codec\n" @@ -10812,8 +10767,6 @@ " \n" " two_pass\n" " \n" -" variable_frame_rate\n" -" \n" " video_bitrate\n" " 1800\n" " video_codec\n" @@ -10886,8 +10839,6 @@ " \n" " two_pass\n" " \n" -" variable_frame_rate\n" -" \n" " video_bitrate\n" " 1500\n" " video_codec\n" @@ -10955,8 +10906,6 @@ " none\n" " two_pass\n" " \n" -" variable_frame_rate\n" -" \n" " video_bitrate\n" " 2500\n" " video_codec\n" @@ -11026,8 +10975,6 @@ " none\n" " two_pass\n" " \n" -" variable_frame_rate\n" -" \n" " video_bitrate\n" " 1024\n" " video_codec\n" @@ -11100,8 +11047,6 @@ " \n" " two_pass\n" " \n" -" variable_frame_rate\n" -" \n" " video_bitrate\n" " 2000\n" " video_codec\n" @@ -11174,8 +11119,6 @@ " \n" " two_pass\n" " \n" -" variable_frame_rate\n" -" \n" " video_bitrate\n" " 1300\n" " video_codec\n" @@ -11244,8 +11187,6 @@ " none\n" " two_pass\n" " \n" -" variable_frame_rate\n" -" \n" " video_bitrate\n" " 2000\n" " video_codec\n" @@ -11319,8 +11260,6 @@ " none\n" " two_pass\n" " \n" -" variable_frame_rate\n" -" \n" " video_bitrate\n" " 960\n" " video_codec\n" @@ -11393,8 +11332,6 @@ " none\n" " two_pass\n" " \n" -" variable_frame_rate\n" -" \n" " video_bitrate\n" " 1500\n" " video_codec\n" @@ -11468,8 +11405,6 @@ " none\n" " two_pass\n" " \n" -" variable_frame_rate\n" -" \n" " video_bitrate\n" " 700\n" " video_codec\n" @@ -11520,7 +11455,6 @@ " large_mp4\n" " http_optimize_mp4\n" " ipod_file\n" -" variable_frame_rate\n" " \n" " decomb\n" " \n" @@ -11554,11 +11488,6 @@ " \n" " chapters_in_destination\n" " \n" -" variable_frame_rate\n" -" \n" -" framerate\n" -" detelecine\n" -" \n" " video_codec\n" " \n" " x264_tab\n" @@ -11723,14 +11652,6 @@ " \n" " \n" " \n" -" detelecine\n" -" \n" -" \n" -" variable_frame_rate\n" -" TRUE\n" -" \n" -" \n" -" \n" " end_chapter\n" " \n" " \n" @@ -11739,14 +11660,6 @@ " \n" " \n" " \n" -" framerate\n" -" \n" -" \n" -" variable_frame_rate\n" -" TRUE\n" -" \n" -" \n" -" \n" " http_optimize_mp4\n" " \n" " \n" @@ -11911,14 +11824,6 @@ " \n" " \n" " \n" -" variable_frame_rate\n" -" \n" -" \n" -" container\n" -" avi\n" -" \n" -" \n" -" \n" " video_bitrate\n" " \n" " \n" diff --git a/gtk/src/resources.plist b/gtk/src/resources.plist index b9319ef0..559709c1 100644 --- a/gtk/src/resources.plist +++ b/gtk/src/resources.plist @@ -1708,21 +1708,6 @@ </packing> </child> <child> - <object class="GtkCheckButton" id="variable_frame_rate"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">Variable Frame Rate</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - <signal handler="vfr_changed_cb" name="toggled"/> - </object> - <packing> - <property name="expand">False</property> - <property name="position">2</property> - </packing> - </child> - <child> <object class="GtkCheckButton" id="two_pass"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -1732,7 +1717,7 @@ <signal handler="setting_widget_changed_cb" name="toggled"/> </object> <packing> - <property name="position">3</property> + <property name="position">2</property> </packing> </child> <child> @@ -1753,7 +1738,7 @@ </child> </object> <packing> - <property name="position">4</property> + <property name="position">3</property> </packing> </child> <child> @@ -5003,8 +4988,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A two_pass - variable_frame_rate - video_bitrate 1800 video_codec @@ -5082,8 +5065,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A two_pass - variable_frame_rate - video_bitrate 1000 video_codec @@ -5164,8 +5145,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A none two_pass - variable_frame_rate - video_bitrate 2500 video_codec @@ -5236,8 +5215,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A two_pass - variable_frame_rate - video_bitrate 1800 video_codec @@ -5308,8 +5285,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A two_pass - variable_frame_rate - video_bitrate 512 video_codec @@ -5380,8 +5355,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A two_pass - variable_frame_rate - video_bitrate 1600 video_codec @@ -5450,8 +5423,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A none two_pass - variable_frame_rate - video_bitrate 1000 video_codec @@ -5522,8 +5493,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A two_pass - variable_frame_rate - video_bitrate 2000 video_codec @@ -5594,8 +5563,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A two_pass - variable_frame_rate - video_bitrate 1600 video_codec @@ -5666,8 +5633,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A two_pass - variable_frame_rate - video_bitrate 1800 video_codec @@ -5738,8 +5703,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A two_pass - variable_frame_rate - video_bitrate 1500 video_codec @@ -5806,8 +5769,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A none two_pass - variable_frame_rate - video_bitrate 2500 video_codec @@ -5876,8 +5837,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A none two_pass - variable_frame_rate - video_bitrate 1024 video_codec @@ -5948,8 +5907,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A two_pass - variable_frame_rate - video_bitrate 2000 video_codec @@ -6020,8 +5977,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A two_pass - variable_frame_rate - video_bitrate 1300 video_codec @@ -6088,8 +6043,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A none two_pass - variable_frame_rate - video_bitrate 2000 video_codec @@ -6160,8 +6113,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A none two_pass - variable_frame_rate - video_bitrate 960 video_codec @@ -6232,8 +6183,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A none two_pass - variable_frame_rate - video_bitrate 1500 video_codec @@ -6304,8 +6253,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A none two_pass - variable_frame_rate - video_bitrate 700 video_codec @@ -6355,7 +6302,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A large_mp4 http_optimize_mp4 ipod_file - variable_frame_rate decomb @@ -6389,11 +6335,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A chapters_in_destination - variable_frame_rate - - framerate - detelecine - video_codec x264_tab @@ -6558,14 +6499,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A - detelecine - - - variable_frame_rate - TRUE - - - end_chapter @@ -6574,14 +6507,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A - framerate - - - variable_frame_rate - TRUE - - - http_optimize_mp4 @@ -6746,14 +6671,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A - variable_frame_rate - - - container - avi - - - video_bitrate diff --git a/gtk/src/standard_presets.xml b/gtk/src/standard_presets.xml index 46a78ff5..37fc524d 100644 --- a/gtk/src/standard_presets.xml +++ b/gtk/src/standard_presets.xml @@ -59,8 +59,6 @@ two_pass - variable_frame_rate - video_bitrate 1000 video_codec @@ -141,8 +139,6 @@ none two_pass - variable_frame_rate - video_bitrate 2500 video_codec @@ -213,8 +209,6 @@ two_pass - variable_frame_rate - video_bitrate 1800 video_codec @@ -285,8 +279,6 @@ two_pass - variable_frame_rate - video_bitrate 512 video_codec @@ -357,8 +349,6 @@ two_pass - variable_frame_rate - video_bitrate 1600 video_codec @@ -427,8 +417,6 @@ none two_pass - variable_frame_rate - video_bitrate 1000 video_codec @@ -499,8 +487,6 @@ two_pass - variable_frame_rate - video_bitrate 2000 video_codec @@ -571,8 +557,6 @@ two_pass - variable_frame_rate - video_bitrate 1600 video_codec @@ -643,8 +627,6 @@ two_pass - variable_frame_rate - video_bitrate 1800 video_codec @@ -715,8 +697,6 @@ two_pass - variable_frame_rate - video_bitrate 1500 video_codec @@ -783,8 +763,6 @@ none two_pass - variable_frame_rate - video_bitrate 2500 video_codec @@ -853,8 +831,6 @@ none two_pass - variable_frame_rate - video_bitrate 1024 video_codec @@ -925,8 +901,6 @@ two_pass - variable_frame_rate - video_bitrate 2000 video_codec @@ -997,8 +971,6 @@ two_pass - variable_frame_rate - video_bitrate 1300 video_codec @@ -1065,8 +1037,6 @@ none two_pass - variable_frame_rate - video_bitrate 2000 video_codec @@ -1137,8 +1107,6 @@ none two_pass - variable_frame_rate - video_bitrate 960 video_codec @@ -1209,8 +1177,6 @@ none two_pass - variable_frame_rate - video_bitrate 1500 video_codec @@ -1281,8 +1247,6 @@ none two_pass - variable_frame_rate - video_bitrate 700 video_codec diff --git a/gtk/src/widget_deps b/gtk/src/widget_deps index 858175ad..00120271 100644 --- a/gtk/src/widget_deps +++ b/gtk/src/widget_deps @@ -35,7 +35,6 @@ large_mp4 http_optimize_mp4 ipod_file - variable_frame_rate decomb @@ -69,11 +68,6 @@ chapters_in_destination - variable_frame_rate - - framerate - detelecine - video_codec x264_tab diff --git a/gtk/src/widget_reverse_deps b/gtk/src/widget_reverse_deps index fb269261..25cd55fb 100644 --- a/gtk/src/widget_reverse_deps +++ b/gtk/src/widget_reverse_deps @@ -114,14 +114,6 @@ - detelecine - - - variable_frame_rate - TRUE - - - end_chapter @@ -130,14 +122,6 @@ - framerate - - - variable_frame_rate - TRUE - - - http_optimize_mp4 @@ -302,14 +286,6 @@ - variable_frame_rate - - - container - avi - - - video_bitrate -- 2.11.0