diff options
| author | jstebbins <[email protected]> | 2009-10-14 20:46:27 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2009-10-14 20:46:27 +0000 |
| commit | b5bcace7027df5b269d3dfba32df9fa7c05e1d85 (patch) | |
| tree | 713776a56b12cf4a08505857920696df89e4d940 /gtk/src | |
| parent | 3b76ee6a04ac59d3f3da080eb08d974734916db1 (diff) | |
LinGui: remove CQP option from preferences
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2887 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'gtk/src')
| -rw-r--r-- | gtk/src/callbacks.c | 7 | ||||
| -rw-r--r-- | gtk/src/ghb.ui | 64 | ||||
| -rw-r--r-- | gtk/src/hb-backend.c | 2 | ||||
| -rw-r--r-- | gtk/src/widgetdeps.c | 1 |
4 files changed, 21 insertions, 53 deletions
diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c index 4cd6447f4..5067767a9 100644 --- a/gtk/src/callbacks.c +++ b/gtk/src/callbacks.c @@ -4361,13 +4361,8 @@ format_vquality_cb(GtkScale *scale, gdouble val, signal_user_data_t *ud) { case HB_VCODEC_X264: { - gboolean crf; - crf = ghb_settings_get_boolean(ud->settings, "constant_rate_factor"); percent = 100. * (51 - val) / 51.; - if (crf) - return g_strdup_printf("RF: %.4g (%.0f%%)", val, percent); - else - return g_strdup_printf("QP: %.4g (%.0f%%)", val, percent); + return g_strdup_printf("RF: %.4g (%.0f%%)", val, percent); } break; case HB_VCODEC_FFMPEG: diff --git a/gtk/src/ghb.ui b/gtk/src/ghb.ui index 4b45d7d4a..b04c86e4b 100644 --- a/gtk/src/ghb.ui +++ b/gtk/src/ghb.ui @@ -4136,57 +4136,31 @@ Requires subme >= 6 and trellis >= 1.</property> <object class="GtkVBox" id="vbox3"> <property name="visible">True</property> <child> - <object class="GtkCheckButton" id="constant_rate_factor"> - <property name="label" translatable="yes">Use CRF (Instead of CQP) for Constant Quality encodes</property> + <object class="GtkHBox" id="hbox6"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="pref_changed_cb"/> - </object> - <packing> - <property name="expand">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkAlignment" id="alignment59"> - <property name="visible">True</property> - <property name="left_padding">22</property> + <property name="spacing">4</property> <child> - <object class="GtkHBox" id="hbox6"> + <object class="GtkComboBox" id="VideoQualityGranularity"> + <property name="width_request">55</property> <property name="visible">True</property> - <property name="spacing">4</property> - <child> - <object class="GtkComboBox" id="VideoQualityGranularity"> - <property name="width_request">55</property> - <property name="visible">True</property> - <signal name="changed" handler="vqual_granularity_changed_cb"/> - </object> - <packing> - <property name="expand">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label85"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Constant Quality fractional granularity</property> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> + <signal name="changed" handler="vqual_granularity_changed_cb"/> + </object> + <packing> + <property name="expand">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label85"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Constant Quality fractional granularity</property> </object> + <packing> + <property name="position">1</property> + </packing> </child> </object> - <packing> - <property name="expand">False</property> - <property name="position">1</property> - </packing> </child> </object> </child> diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c index bf2ff7b94..9e6eff708 100644 --- a/gtk/src/hb-backend.c +++ b/gtk/src/hb-backend.c @@ -4309,7 +4309,7 @@ add_job(hb_handle_t *h, GValue *js, gint unique_id, gint titleindex) dest_str = ghb_settings_get_string(js, "destination"); job->file = dest_str; - job->crf = ghb_settings_get_boolean(js, "constant_rate_factor"); + job->crf = 1; const GValue *subtitle_list; gint subtitle; diff --git a/gtk/src/widgetdeps.c b/gtk/src/widgetdeps.c index a9c372682..17502eba2 100644 --- a/gtk/src/widgetdeps.c +++ b/gtk/src/widgetdeps.c @@ -31,7 +31,6 @@ static dependency_t dep_map[] = {"vquality_type_bitrate", "VideoAvgBitrate", "TRUE", FALSE, FALSE}, {"vquality_type_target", "VideoTargetSize", "TRUE", FALSE, FALSE}, {"vquality_type_constant", "VideoQualitySlider", "TRUE", FALSE, FALSE}, - {"vquality_type_constant", "constant_rate_factor", "TRUE", FALSE, FALSE}, {"vquality_type_constant", "VideoTwoPass", "TRUE", TRUE, FALSE}, {"vquality_type_constant", "VideoTurboTwoPass", "TRUE", TRUE, FALSE}, {"VideoTwoPass", "VideoTurboTwoPass", "TRUE", FALSE, FALSE}, |