fix decomb settings. remove cruft from earlier experiments

[handbrake-jp/handbrake-jp-git.git] / gtk / src / hb-backend.c

diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c
index 7ac6bff..2beba26 100644 (file)
--- a/gtk/src/hb-backend.c
+++ b/gtk/src/hb-backend.c
@@ -409,7 +409,7 @@ static const iso639_lang_t language_table[] =
 #define        LANG_TABLE_SIZE (sizeof(language_table)/ sizeof(iso639_lang_t))
 
 static void
-del_tree(const gchar *name)
+del_tree(const gchar *name, gboolean del_top)
 {
        const gchar *file;
 
@@ -421,11 +421,12 @@ del_tree(const gchar *name)
                {
                        gchar *path;
                        path = g_strdup_printf("%s/%s", name, file);
-                       del_tree(path);
+                       del_tree(path, TRUE);
                        g_free(path);
                        file = g_dir_read_name(gdir);
                }
-               g_rmdir(name);
+               if (del_top)
+                       g_rmdir(name);
        }
        else
        {
@@ -521,12 +522,12 @@ static hb_handle_t * h = NULL;
 extern void hb_get_tempory_directory(hb_handle_t *h, char path[512]);
 
 void
-ghb_hb_cleanup()
+ghb_hb_cleanup(gboolean partial)
 {
        char dir[512];
 
        hb_get_tempory_directory(h, dir);
-       del_tree(dir);
+       del_tree(dir, !partial);
 }
 
 static hb_audio_config_t*
@@ -1736,6 +1737,7 @@ ghb_backend_events(signal_user_data_t *ud, gint *unique_id)
                 default:
                     gtk_progress_bar_set_text( progress, "Rip failed.");
             }
+                       gtk_progress_bar_set_fraction (progress, 1.0);
                        return GHB_EVENT_WORK_DONE;
             break;
                }
@@ -2499,7 +2501,6 @@ ghb_add_job(job_settings_t *js, gint unique_id)
        {
                // Use default settings
                hb_filter_decomb.settings = NULL;
-               hb_filter_decomb.settings = "1:2:6:9:40:16:16";
                hb_list_add( job->filters, &hb_filter_decomb );
        }
        if( job->deinterlace )
@@ -2737,7 +2738,8 @@ ghb_add_job(job_settings_t *js, gint unique_id)
        {
                job->select_subtitle = NULL;
        }
-       if( ghb_settings_get_bool(settings, "two_pass") )
+       if( ghb_settings_get_bool(settings, "two_pass") &&
+               !ghb_settings_get_bool(settings, "vquality_type_constant"))
        {
                /*
                 * If subtitle_scan is enabled then only turn it on