diff options
| -rw-r--r-- | gtk/src/ghb.ui | 8 | ||||
| -rw-r--r-- | gtk/src/queuehandler.c | 47 | ||||
| -rw-r--r-- | gtk/src/resource_data.h | 19 | ||||
| -rw-r--r-- | gtk/src/resources.plist | 8 |
4 files changed, 76 insertions, 6 deletions
diff --git a/gtk/src/ghb.ui b/gtk/src/ghb.ui index 7adbbff75..8115f4ad1 100644 --- a/gtk/src/ghb.ui +++ b/gtk/src/ghb.ui @@ -4677,6 +4677,8 @@ location as the movie.</property> <child> <object class="GtkEntry" id="PictureDetelecineCustom"> <property name="width_chars">8</property> + <property name="tooltip-text" translatable="yes">Custom detelecine filter string format + JunkLeft:JunkRight:JunkTop:JunkBottom:StrictBreaks:MetricPlane</property> <signal name="changed" handler="setting_widget_changed_cb"/> </object> <packing> @@ -4718,6 +4720,8 @@ location as the movie.</property> <child> <object class="GtkEntry" id="PictureDecombCustom"> <property name="width_chars">8</property> + <property name="tooltip-text" translatable="yes">Custom decomb filter string format + Mode:SpatialMetric:MotionThresh:SpatialThresh:BlockThresh:BlockWidth:BlockHeight</property> <signal name="changed" handler="setting_widget_changed_cb"/> </object> <packing> @@ -4759,6 +4763,8 @@ location as the movie.</property> <child> <object class="GtkEntry" id="PictureDeinterlaceCustom"> <property name="width_chars">8</property> + <property name="tooltip-text" translatable="yes">Custom deinterlace filter string format + YadifMode:YadifParity:McdintMode:McdeintOp</property> <signal name="changed" handler="setting_widget_changed_cb"/> </object> <packing> @@ -4799,6 +4805,8 @@ location as the movie.</property> <child> <object class="GtkEntry" id="PictureDenoiseCustom"> <property name="width_chars">8</property> + <property name="tooltip-text" translatable="yes">Custom denoise filter string format + SpatialLuma:SpatialChroma:TemporalLuma:TemporalChroma</property> <signal name="changed" handler="setting_widget_changed_cb"/> </object> <packing> diff --git a/gtk/src/queuehandler.c b/gtk/src/queuehandler.c index d928ed7c7..68be7791b 100644 --- a/gtk/src/queuehandler.c +++ b/gtk/src/queuehandler.c @@ -278,19 +278,34 @@ add_to_queue_list(signal_user_data_t *ud, GValue *settings, GtkTreeIter *piter) "<b>Picture:</b> Source: <small>%d x %d, Output %d x %d %s</small>\n", source_width, source_height, width, height, aspect_desc); - gboolean decomb; + gint decomb, detel; gboolean filters = FALSE; decomb = ghb_settings_combo_int(settings, "PictureDecomb"); g_string_append_printf(str, "<b>Filters:</b><small>"); - if (ghb_settings_combo_int(settings, "PictureDetelecine")) + detel = ghb_settings_combo_int(settings, "PictureDetelecine"); + if (detel) { g_string_append_printf(str, " - Detelecine"); + if (detel == 1) + { + gchar *cust; + cust = ghb_settings_get_string(settings, "PictureDetelecineCustom"); + g_string_append_printf(str, ": %s", cust); + g_free(cust); + } filters = TRUE; } if (decomb) { g_string_append_printf(str, " - Decomb"); + if (decomb == 1) + { + gchar *cust; + cust = ghb_settings_get_string(settings, "PictureDecombCustom"); + g_string_append_printf(str, ": %s", cust); + g_free(cust); + } filters = TRUE; } else @@ -298,18 +313,38 @@ add_to_queue_list(signal_user_data_t *ud, GValue *settings, GtkTreeIter *piter) gint deint = ghb_settings_combo_int(settings, "PictureDeinterlace"); if (deint) { - const gchar *opt = ghb_settings_combo_option(settings, + if (deint == 1) + { + gchar *cust = ghb_settings_get_string(settings, + "PictureDeinterlaceCustom"); + g_string_append_printf(str, " - Deinterlace: %s", cust); + g_free(cust); + } + else + { + const gchar *opt = ghb_settings_combo_option(settings, "PictureDeinterlace"); - g_string_append_printf(str, " - Deinterlace: %s", opt); + g_string_append_printf(str, " - Deinterlace: %s", opt); + } filters = TRUE; } } gint denoise = ghb_settings_combo_int(settings, "PictureDenoise"); if (denoise) { - const gchar *opt = ghb_settings_combo_option(settings, + if (denoise == 1) + { + gchar *cust = ghb_settings_get_string(settings, + "PictureDenoiseCustom"); + g_string_append_printf(str, " - Denoise: %s", cust); + g_free(cust); + } + else + { + const gchar *opt = ghb_settings_combo_option(settings, "PictureDenoise"); - g_string_append_printf(str, " - Denoise: %s", opt); + g_string_append_printf(str, " - Denoise: %s", opt); + } filters = TRUE; } gint deblock = ghb_settings_get_int(settings, "PictureDeblock"); diff --git a/gtk/src/resource_data.h b/gtk/src/resource_data.h index 26e869b53..59d75ca69 100644 --- a/gtk/src/resource_data.h +++ b/gtk/src/resource_data.h @@ -7597,6 +7597,11 @@ " id="PictureDetelecineCustom">\n" " <property name="width_chars" "">8</property>\n" +" <property name="tooltip-tex" +"t" translatable="yes">Custom detelecine filter string" +" format\n" +" JunkLeft:JunkRight:JunkTop:JunkBottom:StrictBreaks:MetricPlane</pro" +"perty>\n" " <signal name="changed"" " handler="setting_widget_changed_cb"/>\n" " </object>\n" @@ -7661,6 +7666,11 @@ " id="PictureDecombCustom">\n" " <property name="width_chars" "">8</property>\n" +" <property name="tooltip-tex" +"t" translatable="yes">Custom decomb filter string for" +"mat\n" +" Mode:SpatialMetric:MotionThresh:SpatialThresh:BlockThresh:BlockWidth:B" +"lockHeight</property>\n" " <signal name="changed"" " handler="setting_widget_changed_cb"/>\n" " </object>\n" @@ -7725,6 +7735,10 @@ " id="PictureDeinterlaceCustom">\n" " <property name="width_chars" "">8</property>\n" +" <property name="tooltip-tex" +"t" translatable="yes">Custom deinterlace filter strin" +"g format\n" +" YadifMode:YadifParity:McdintMode:McdeintOp</property>\n" " <signal name="changed"" " handler="setting_widget_changed_cb"/>\n" " </object>\n" @@ -7788,6 +7802,11 @@ " id="PictureDenoiseCustom">\n" " <property name="width_chars" "">8</property>\n" +" <property name="tooltip-tex" +"t" translatable="yes">Custom denoise filter string fo" +"rmat\n" +" SpatialLuma:SpatialChroma:TemporalLuma:TemporalChroma</property>" +"\n" " <signal name="changed"" " handler="setting_widget_changed_cb"/>\n" " </object>\n" diff --git a/gtk/src/resources.plist b/gtk/src/resources.plist index b6630d26c..7be8bbddf 100644 --- a/gtk/src/resources.plist +++ b/gtk/src/resources.plist @@ -4682,6 +4682,8 @@ location as the movie.</property> <child> <object class="GtkEntry" id="PictureDetelecineCustom"> <property name="width_chars">8</property> + <property name="tooltip-text" translatable="yes">Custom detelecine filter string format + JunkLeft:JunkRight:JunkTop:JunkBottom:StrictBreaks:MetricPlane</property> <signal name="changed" handler="setting_widget_changed_cb"/> </object> <packing> @@ -4723,6 +4725,8 @@ location as the movie.</property> <child> <object class="GtkEntry" id="PictureDecombCustom"> <property name="width_chars">8</property> + <property name="tooltip-text" translatable="yes">Custom decomb filter string format + Mode:SpatialMetric:MotionThresh:SpatialThresh:BlockThresh:BlockWidth:BlockHeight</property> <signal name="changed" handler="setting_widget_changed_cb"/> </object> <packing> @@ -4764,6 +4768,8 @@ location as the movie.</property> <child> <object class="GtkEntry" id="PictureDeinterlaceCustom"> <property name="width_chars">8</property> + <property name="tooltip-text" translatable="yes">Custom deinterlace filter string format + YadifMode:YadifParity:McdintMode:McdeintOp</property> <signal name="changed" handler="setting_widget_changed_cb"/> </object> <packing> @@ -4804,6 +4810,8 @@ location as the movie.</property> <child> <object class="GtkEntry" id="PictureDenoiseCustom"> <property name="width_chars">8</property> + <property name="tooltip-text" translatable="yes">Custom denoise filter string format + SpatialLuma:SpatialChroma:TemporalLuma:TemporalChroma</property> <signal name="changed" handler="setting_widget_changed_cb"/> </object> <packing> |