OSDN Git Service

LinGui: update decomb filter string validation.
[handbrake-jp/handbrake-jp-git.git] / gtk / src / hb-backend.c
index eca539e..db91998 100644 (file)
@@ -3163,9 +3163,7 @@ ghb_set_scale(signal_user_data_t *ud, gint mode)
                                job->anamorphic.dar_width = 
                                        ghb_settings_get_int(ud->settings, 
                                                                                "PictureDisplayWidth");
-                               job->anamorphic.dar_height =
-                                       ghb_settings_get_int(ud->settings, 
-                                                                               "PictureDisplayHeight");
+                               job->anamorphic.dar_height = height;
                        }
                }
                else
@@ -3380,7 +3378,7 @@ ghb_validate_filters(signal_user_data_t *ud)
        gint index;
        gchar *message;
 
-       // deinte 4
+       // deinte
        index = ghb_settings_combo_int(ud->settings, "PictureDeinterlace");
        if (index == 1)
        {
@@ -3414,12 +3412,12 @@ ghb_validate_filters(signal_user_data_t *ud)
                }
                g_free(str);
        }
-       // decomb 4
+       // decomb
        index = ghb_settings_combo_int(ud->settings, "PictureDecomb");
        if (index == 1)
        {
                str = ghb_settings_get_string(ud->settings, "PictureDecombCustom");
-               if (!ghb_validate_filter_string(str, 7))
+               if (!ghb_validate_filter_string(str, 15))
                {
                        message = g_strdup_printf(
                                                "Invalid Decomb Settings:\n\n%s\n",
@@ -3431,7 +3429,7 @@ ghb_validate_filters(signal_user_data_t *ud)
                }
                g_free(str);
        }
-       // denois 4
+       // denois
        index = ghb_settings_combo_int(ud->settings, "PictureDenoise");
        if (index == 1)
        {
@@ -4491,11 +4489,13 @@ ghb_pause_queue()
 
     if( s.state == HB_STATE_PAUSED )
     {
-        hb_resume( h_queue );
+               hb_status.queue.state &= ~GHB_STATE_PAUSED;
+               hb_resume( h_queue );
     }
     else
     {
-        hb_pause( h_queue );
+               hb_status.queue.state |= GHB_STATE_PAUSED;
+               hb_pause( h_queue );
     }
 }