OSDN Git Service

LinGui: Picture Filter enhancements
[handbrake-jp/handbrake-jp-git.git] / gtk / src / callbacks.c
index e0e0b9b..4470962 100644 (file)
 #include <poll.h>
 #include <fcntl.h>
 #include <sys/stat.h>
+#include <netinet/in.h>
+#include <netdb.h>
 #include <libhal-storage.h>
 #include <gtk/gtk.h>
+#include <gtkhtml/gtkhtml.h>
 #include <gdk/gdkkeysyms.h>
 #include <glib/gstdio.h>
+#include <dbus/dbus-glib.h>
+#include <dbus/dbus-glib-lowlevel.h>
 #include <gio/gio.h>
 
 #include "hb.h"
 #include "callbacks.h"
 #include "queuehandler.h"
+#include "audiohandler.h"
 #include "resources.h"
 #include "settings.h"
 #include "presets.h"
+#include "preview.h"
 #include "values.h"
 #include "plist.h"
+#include "appcast.h"
 #include "hb-backend.h"
 #include "ghb-dvd.h"
 #include "ghbcellrenderertext.h"
 
 static void update_chapter_list(signal_user_data_t *ud);
-static void clear_audio_list(signal_user_data_t *ud);
 static GList* dvd_device_list();
-static void audio_list_refresh_selected(signal_user_data_t *ud);
-static GValue* get_selected_asettings(signal_user_data_t *ud);
+static void prune_logs(signal_user_data_t *ud);
 
 // This is a dependency map used for greying widgets
 // that are dependent on the state of another widget.
@@ -61,7 +67,7 @@ ghb_init_dep_map()
 }
 
 static gboolean
-dep_check(signal_user_data_t *ud, const gchar *name)
+dep_check(signal_user_data_t *ud, const gchar *name, gboolean *out_hide)
 {
        GtkWidget *widget;
        GObject *dep_object;
@@ -75,6 +81,7 @@ dep_check(signal_user_data_t *ud, const gchar *name)
 
        array = ghb_dict_lookup(rev_map, name);
        count = ghb_array_len(array);
+       *out_hide = FALSE;
        for (ii = 0; ii < count; ii++)
        {
                data = ghb_array_get_nth(array, ii);
@@ -82,6 +89,8 @@ dep_check(signal_user_data_t *ud, const gchar *name)
                widget = GHB_WIDGET(ud->builder, widget_name);
                dep_object = gtk_builder_get_object(ud->builder, name);
                g_free(widget_name);
+               if (!GTK_WIDGET_SENSITIVE(widget))
+                       continue;
                if (dep_object == NULL)
                {
                        g_message("Failed to find widget");
@@ -92,9 +101,10 @@ dep_check(signal_user_data_t *ud, const gchar *name)
                        gint jj = 0;
                        gchar **values;
                        gboolean sensitive = FALSE;
-                       gboolean die;
+                       gboolean die, hide;
 
                        die = ghb_value_boolean(ghb_array_get_nth(data, 2));
+                       hide = ghb_value_boolean(ghb_array_get_nth(data, 3));
                        value = ghb_value_string(ghb_array_get_nth(data, 1));
                        values = g_strsplit(value, "|", 10);
                        g_free(value);
@@ -133,7 +143,11 @@ dep_check(signal_user_data_t *ud, const gchar *name)
                                jj++;
                        }
                        sensitive = die ^ sensitive;
-                       if (!sensitive) result = FALSE;
+                       if (!sensitive)
+                       {
+                               result = FALSE;
+                               *out_hide |= hide;
+                       }
                        g_strfreev (values);
                        g_free(value);
                }
@@ -141,8 +155,8 @@ dep_check(signal_user_data_t *ud, const gchar *name)
        return result;
 }
 
-static void
-check_dependency(signal_user_data_t *ud, GtkWidget *widget)
+void
+ghb_check_dependency(signal_user_data_t *ud, GtkWidget *widget)
 {
        GObject *dep_object;
        const gchar *name;
@@ -156,13 +170,14 @@ check_dependency(signal_user_data_t *ud, GtkWidget *widget)
                if (gtk_combo_box_get_active(GTK_COMBO_BOX(widget)) < 0) return;
 
        name = gtk_widget_get_name(widget);
-       g_debug("check_dependency () %s", name);
+       g_debug("ghb_check_dependency () %s", name);
 
        array = ghb_dict_lookup(dep_map, name);
        count = ghb_array_len(array);
        for (ii = 0; ii < count; ii++)
        {
                gboolean sensitive;
+               gboolean hide;
 
                data = ghb_array_get_nth(array, ii);
                dep_name = ghb_value_string(data);
@@ -173,12 +188,25 @@ check_dependency(signal_user_data_t *ud, GtkWidget *widget)
                        g_free(dep_name);
                        continue;
                }
-               sensitive = dep_check(ud, dep_name);
+               sensitive = dep_check(ud, dep_name, &hide);
                g_free(dep_name);
                if (GTK_IS_ACTION(dep_object))
+               {
                        gtk_action_set_sensitive(GTK_ACTION(dep_object), sensitive);
+                       gtk_action_set_visible(GTK_ACTION(dep_object), sensitive || !hide);
+               }
                else
+               {
                        gtk_widget_set_sensitive(GTK_WIDGET(dep_object), sensitive);
+                       if (!sensitive && hide)
+                       {
+                               gtk_widget_hide(GTK_WIDGET(dep_object));
+                       }
+                       else
+                       {
+                               gtk_widget_show_now(GTK_WIDGET(dep_object));
+                       }
+               }
        }
 }
 
@@ -198,66 +226,33 @@ ghb_check_all_depencencies(signal_user_data_t *ud)
                        &iter, (gpointer*)(void*)&dep_name, (gpointer*)(void*)&value))
        {
                gboolean sensitive;
+               gboolean hide;
+
                dep_object = gtk_builder_get_object (ud->builder, dep_name);
                if (dep_object == NULL)
                {
                        g_message("Failed to find dependent widget %s", dep_name);
                        continue;
                }
-               sensitive = dep_check(ud, dep_name);
+               sensitive = dep_check(ud, dep_name, &hide);
                if (GTK_IS_ACTION(dep_object))
-                       gtk_action_set_sensitive(GTK_ACTION(dep_object), sensitive);
-               else
-                       gtk_widget_set_sensitive(GTK_WIDGET(dep_object), sensitive);
-       }
-}
-
-static void
-clear_presets_selection(signal_user_data_t *ud)
-{
-       GtkTreeView *treeview;
-       GtkTreeSelection *selection;
-       
-       if (ud->dont_clear_presets) return;
-       g_debug("clear_presets_selection()");
-       treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "presets_list"));
-       selection = gtk_tree_view_get_selection (treeview);
-       gtk_tree_selection_unselect_all (selection);
-       ghb_settings_set_boolean(ud->settings, "preset_modified", TRUE);
-}
-
-static gchar*
-expand_tilde(const gchar *path)
-{
-       const gchar *user_home;
-       gchar *home;
-       const gchar *suffix;
-       gchar *expanded_path = NULL;
-       
-       g_debug("expand_tilde ()");
-       if (path[0] == '~')
-       {
-               user_home = g_get_home_dir();
-               home = NULL; // squash warning about home uninitialized
-               if (path[1] == 0)
-               {
-                       home = g_strdup(user_home);
-                       suffix = "";
-               }
-               else if (path[1] == '/')
                {
-                       home = g_strdup(user_home);
-                       suffix = &path[2];
+                       gtk_action_set_sensitive(GTK_ACTION(dep_object), sensitive);
+                       gtk_action_set_visible(GTK_ACTION(dep_object), sensitive || !hide);
                }
                else
                {
-                       home = g_path_get_dirname(user_home);
-                       suffix = &path[1];
+                       gtk_widget_set_sensitive(GTK_WIDGET(dep_object), sensitive);
+                       if (!sensitive && hide)
+                       {
+                               gtk_widget_hide(GTK_WIDGET(dep_object));
+                       }
+                       else
+                       {
+                               gtk_widget_show_now(GTK_WIDGET(dep_object));
+                       }
                }
-               expanded_path = g_strdup_printf("%s/%s", home, suffix);
-               g_free(home);
        }
-       return expanded_path;
 }
 
 void
@@ -270,12 +265,14 @@ on_quit1_activate(GtkMenuItem *quit, signal_user_data_t *ud)
                if (ghb_cancel_encode("Closing HandBrake will terminate encoding.\n"))
                {
                        ghb_hb_cleanup(FALSE);
+                       prune_logs(ud);
                        gtk_main_quit();
                        return;
                }
                return;
        }
        ghb_hb_cleanup(FALSE);
+       prune_logs(ud);
        gtk_main_quit();
 }
 
@@ -285,39 +282,49 @@ set_destination(signal_user_data_t *ud)
        g_debug("set_destination");
        if (ghb_settings_get_boolean(ud->settings, "use_source_name"))
        {
+               GString *str = g_string_new("");
                gchar *vol_name, *filename, *extension;
-               gchar *dir, *new_name;
+               gchar *new_name;
+               gint title;
                
-               filename = ghb_settings_get_string(ud->settings, "destination");
-               extension = ghb_settings_get_string(ud->settings, "container");
-               dir = g_path_get_dirname (filename);
+               filename = ghb_settings_get_string(ud->settings, "dest_file");
+               extension = ghb_settings_get_string(ud->settings, "FileFormat");
                vol_name = ghb_settings_get_string(ud->settings, "volume_label");
-               if (ghb_settings_get_boolean(ud->settings, "chapters_in_destination"))
+               g_string_append_printf(str, "%s", vol_name);
+               title = ghb_settings_combo_int(ud->settings, "title");
+               if (title >= 0)
                {
-                       gint start, end;
-
-                       start = ghb_settings_get_int(ud->settings, "start_chapter");
-                       end = ghb_settings_get_int(ud->settings, "end_chapter");
-                       if (start == end)
+                       if (ghb_settings_get_boolean(
+                                       ud->settings, "title_no_in_destination"))
                        {
-                               new_name = g_strdup_printf("%s/%s-%d.%s", 
-                                       dir, vol_name, start, extension);
+
+                               title = ghb_settings_combo_int(ud->settings, "title");
+                               g_string_append_printf(str, " - %d", title+1);
                        }
-                       else
+                       if (ghb_settings_get_boolean(
+                                       ud->settings, "chapters_in_destination"))
                        {
-                               new_name = g_strdup_printf("%s/%s-%d-%d.%s", 
-                                       dir, vol_name, start, end, extension);
+                               gint start, end;
+
+                               if (!ghb_settings_get_boolean(
+                                               ud->settings, "title_no_in_destination"))
+                               {
+                                       g_string_append_printf(str, " -");
+                               }
+                               start = ghb_settings_get_int(ud->settings, "start_chapter");
+                               end = ghb_settings_get_int(ud->settings, "end_chapter");
+                               if (start == end)
+                                       g_string_append_printf(str, " Ch %d", start);
+                               else
+                                       g_string_append_printf(str, " Ch %d-%d", start, end);
                        }
                }
-               else
-               {
-                       new_name = g_strdup_printf("%s/%s.%s", dir, vol_name, extension);
-               }
-               ghb_ui_update(ud, "destination", ghb_string_value(new_name));
+               g_string_append_printf(str, ".%s", extension);
+               new_name = g_string_free(str, FALSE);
+               ghb_ui_update(ud, "dest_file", ghb_string_value(new_name));
                g_free(filename);
                g_free(extension);
                g_free(vol_name);
-               g_free(dir);
                g_free(new_name);
        }
 }
@@ -378,6 +385,28 @@ camel_convert(gchar *str)
        }
 }
 
+static gchar*
+get_file_label(const gchar *filename)
+{
+       static gchar *containers[] = 
+               {".vob", ".mpg", ".m2ts", ".mkv", ".mp4", ".m4v", ".avi", ".ogm", NULL};
+       gchar *base;
+       gint ii;
+
+       base = g_path_get_basename(filename);
+       for (ii = 0; containers[ii] != NULL; ii++)
+       {
+               if (g_str_has_suffix(base, containers[ii]))
+               {
+                       gchar *pos;
+                       pos = strrchr(base, '.');
+                       *pos = 0;
+                       break;
+               }
+       }
+       return base;
+}
+
 static gboolean
 update_source_label(signal_user_data_t *ud, const gchar *source)
 {
@@ -409,11 +438,7 @@ update_source_label(signal_user_data_t *ud, const gchar *source)
                label = ghb_dvd_volname (filename);
                if (label == NULL)
                {
-                       path = g_strsplit(filename, "/", -1);
-                       len = g_strv_length (path);
-                       // Just use the last combonent of the path
-                       label = g_strdup(path[len-1]);
-                       g_strfreev (path);
+                       label = get_file_label(filename);
                }
                else
                {
@@ -561,11 +586,36 @@ source_dialog_extra_widgets(GtkWidget *dialog, gboolean checkbutton_active)
        return GTK_WIDGET(vbox);
 }
 
-static void
-do_scan(signal_user_data_t *ud, const gchar *filename)
+extern GValue *ghb_queue_edit_settings;
+static gchar *last_scan_file = NULL;
+
+void
+ghb_do_scan(signal_user_data_t *ud, const gchar *filename, gboolean force)
 {
+       if (!force && last_scan_file != NULL &&
+               strcmp(last_scan_file, filename) == 0)
+       {
+               if (ghb_queue_edit_settings)
+               {
+                       gint jstatus;
+
+                       jstatus = ghb_settings_get_int(ghb_queue_edit_settings, "job_status");
+                       ghb_settings_to_ui(ud, ghb_queue_edit_settings);
+                       ghb_set_audio(ud, ghb_queue_edit_settings);
+                       if (jstatus == GHB_QUEUE_PENDING)
+                       {
+                               ghb_value_free(ghb_queue_edit_settings);
+                       }
+                       ghb_queue_edit_settings = NULL;
+               }
+               return;
+       }
+       if (last_scan_file != NULL)
+               g_free(last_scan_file);
+       last_scan_file = NULL;
        if (filename != NULL)
        {
+               last_scan_file = g_strdup(filename);
                ghb_settings_set_string(ud->settings, "source", filename);
                if (update_source_label(ud, filename))
                {
@@ -576,7 +626,10 @@ do_scan(signal_user_data_t *ud, const gchar *filename)
                        gtk_progress_bar_set_fraction (progress, 0);
                        gtk_progress_bar_set_text (progress, "Scanning ...");
                        ghb_hb_cleanup(TRUE);
-                       ghb_backend_scan (path, 0);
+                       prune_logs(ud);
+                       gint preview_count;
+                       preview_count = ghb_settings_get_int(ud->settings, "preview_count");
+                       ghb_backend_scan(path, 0, preview_count);
                        g_free(path);
                }
                else
@@ -626,7 +679,7 @@ source_button_clicked_cb(GtkButton *button, signal_user_data_t *ud)
                filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
                if (filename != NULL)
                {
-                       do_scan(ud, filename);
+                       ghb_do_scan(ud, filename, TRUE);
                        if (strcmp(sourcename, filename) != 0)
                        {
                                ghb_settings_set_string (ud->settings, "default_source", filename);
@@ -648,7 +701,7 @@ dvd_source_activate_cb(GtkAction *action, signal_user_data_t *ud)
 
        sourcename = ghb_settings_get_string(ud->settings, "source");
        filename = gtk_action_get_name(action);
-       do_scan(ud, filename);
+       ghb_do_scan(ud, filename, TRUE);
        if (strcmp(sourcename, filename) != 0)
        {
                ghb_settings_set_string (ud->settings, "default_source", filename);
@@ -668,8 +721,8 @@ update_destination_extension(signal_user_data_t *ud)
        GtkEntry *entry;
 
        g_debug("update_destination_extension ()");
-       extension = ghb_settings_get_string(ud->settings, "container");
-       entry = GTK_ENTRY(GHB_WIDGET(ud->builder, "destination"));
+       extension = ghb_settings_get_string(ud->settings, "FileFormat");
+       entry = GTK_ENTRY(GHB_WIDGET(ud->builder, "dest_file"));
        filename = g_strdup(gtk_entry_get_text(entry));
        for (ii = 0; containers[ii] != NULL; ii++)
        {
@@ -691,7 +744,7 @@ update_destination_extension(signal_user_data_t *ud)
                                break;
                        }
                        new_name = g_strjoin(".", filename, extension, NULL); 
-                       ghb_ui_update(ud, "destination", ghb_string_value(new_name));
+                       ghb_ui_update(ud, "dest_file", ghb_string_value(new_name));
                        g_free(new_name);
                        break;
                }
@@ -722,6 +775,7 @@ destination_select_title(GtkEntry *entry)
                        break;
                }
        }
+       if (start < 0) start = 0;
        if (start < end)
        {
                gtk_editable_select_region(GTK_EDITABLE(entry), start, end);
@@ -740,20 +794,39 @@ destination_grab_cb(
 static gboolean update_default_destination = FALSE;
 
 void
-destination_entry_changed_cb(GtkEntry *entry, signal_user_data_t *ud)
+dest_dir_set_cb(GtkFileChooserButton *dest_chooser, signal_user_data_t *ud)
 {
-       gchar *dest;
+       gchar *dest_file, *dest_dir, *dest;
        
-       g_debug("destination_entry_changed_cb ()");
-       if ((dest = expand_tilde(gtk_entry_get_text(entry))) != NULL)
-       {
-               gtk_entry_set_text(entry, dest);
-               g_free(dest);
-       }
+       g_debug("dest_dir_set_cb ()");
+       ghb_widget_to_setting(ud->settings, (GtkWidget*)dest_chooser);
+       dest_file = ghb_settings_get_string(ud->settings, "dest_file");
+       dest_dir = ghb_settings_get_string(ud->settings, "dest_dir");
+       dest = g_strdup_printf("%s/%s", dest_dir, dest_file);
+       ghb_settings_set_string(ud->settings, "destination", dest);
+       g_free(dest_file);
+       g_free(dest_dir);
+       g_free(dest);
+       update_default_destination = TRUE;
+}
+
+void
+dest_file_changed_cb(GtkEntry *entry, signal_user_data_t *ud)
+{
+       gchar *dest_file, *dest_dir, *dest;
+       
+       g_debug("dest_file_changed_cb ()");
        update_destination_extension(ud);
        ghb_widget_to_setting(ud->settings, (GtkWidget*)entry);
        // This signal goes off with ever keystroke, so I'm putting this
        // update on the timer.
+       dest_file = ghb_settings_get_string(ud->settings, "dest_file");
+       dest_dir = ghb_settings_get_string(ud->settings, "dest_dir");
+       dest = g_strdup_printf("%s/%s", dest_dir, dest_file);
+       ghb_settings_set_string(ud->settings, "destination", dest);
+       g_free(dest_file);
+       g_free(dest_dir);
+       g_free(dest);
        update_default_destination = TRUE;
 }
 
@@ -780,18 +853,18 @@ destination_browse_clicked_cb(GtkButton *button, signal_user_data_t *ud)
        g_free(basename);
        if (gtk_dialog_run(GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
        {
-               char *filename;
+               char *filename, *dirname;
+               GtkFileChooser *dest_chooser;
                
                filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
-               entry = (GtkEntry*)GHB_WIDGET(ud->builder, "destination");
-               if (entry == NULL)
-               {
-                       g_debug("Failed to find widget: %s", "destination");
-               }
-               else
-               {
-                       gtk_entry_set_text(entry, filename);
-               }
+               basename = g_path_get_basename(filename);
+               dirname = g_path_get_dirname(filename);
+               entry = (GtkEntry*)GHB_WIDGET(ud->builder, "dest_file");
+               gtk_entry_set_text(entry, basename);
+               dest_chooser = GTK_FILE_CHOOSER(GHB_WIDGET(ud->builder, "dest_dir"));
+               gtk_file_chooser_set_filename(dest_chooser, dirname);
+               g_free (dirname);
+               g_free (basename);
                g_free (filename);
        }
        gtk_widget_destroy(dialog);
@@ -802,6 +875,7 @@ window_destroy_event_cb(GtkWidget *widget, GdkEvent *event, signal_user_data_t *
 {
        g_debug("window_destroy_event_cb ()");
        ghb_hb_cleanup(FALSE);
+       prune_logs(ud);
        gtk_main_quit();
        return FALSE;
 }
@@ -816,12 +890,14 @@ window_delete_event_cb(GtkWidget *widget, GdkEvent *event, signal_user_data_t *u
                if (ghb_cancel_encode("Closing HandBrake will terminate encoding.\n"))
                {
                        ghb_hb_cleanup(FALSE);
+                       prune_logs(ud);
                        gtk_main_quit();
                        return FALSE;
                }
                return TRUE;
        }
        ghb_hb_cleanup(FALSE);
+       prune_logs(ud);
        gtk_main_quit();
        return FALSE;
 }
@@ -839,19 +915,20 @@ container_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
        g_debug("container_changed_cb ()");
        ghb_widget_to_setting(ud->settings, widget);
        update_destination_extension(ud);
-       check_dependency(ud, widget);
+       ghb_check_dependency(ud, widget);
        update_acodec_combo(ud);
-       clear_presets_selection(ud);
+       ghb_clear_presets_selection(ud);
+       ghb_live_reset(ud);
 
        audio_list = ghb_settings_get_value(ud->settings, "audio_list");
        if (ghb_ac3_in_audio_list (audio_list))
        {
                gchar *container;
 
-               container = ghb_settings_get_string(ud->settings, "container");
+               container = ghb_settings_get_string(ud->settings, "FileFormat");
                if (strcmp(container, "mp4") == 0)
                {
-                       ghb_ui_update(ud, "container", ghb_string_value("m4v"));
+                       ghb_ui_update(ud, "FileFormat", ghb_string_value("m4v"));
                }
                g_free(container);
        }
@@ -921,7 +998,7 @@ show_title_info(signal_user_data_t *ud, ghb_title_info_t *tinfo)
                ghb_int64_value(tinfo->width - tinfo->crop[2] - tinfo->crop[3]));
        // If anamorphic or keep_aspect, the hight will be automatically calculated
        gboolean keep_aspect, anamorphic;
-       keep_aspect = ghb_settings_get_boolean(ud->settings, "keep_aspect");
+       keep_aspect = ghb_settings_get_boolean(ud->settings, "PictureKeepRatio");
        anamorphic = ghb_settings_get_boolean(ud->settings, "anamorphic");
        if (!(keep_aspect || anamorphic))
        {
@@ -933,471 +1010,133 @@ show_title_info(signal_user_data_t *ud, ghb_title_info_t *tinfo)
        // you pass it a cropped width or height == 0.
        gint bound;
        bound = tinfo->height / 2 - 2;
-       widget = GHB_WIDGET (ud->builder, "crop_top");
+       widget = GHB_WIDGET (ud->builder, "PictureTopCrop");
        gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, bound);
-       widget = GHB_WIDGET (ud->builder, "crop_bottom");
+       widget = GHB_WIDGET (ud->builder, "PictureBottomCrop");
        gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, bound);
        bound = tinfo->width / 2 - 2;
-       widget = GHB_WIDGET (ud->builder, "crop_left");
+       widget = GHB_WIDGET (ud->builder, "PictureLeftCrop");
        gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, bound);
-       widget = GHB_WIDGET (ud->builder, "crop_right");
+       widget = GHB_WIDGET (ud->builder, "PictureRightCrop");
        gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, bound);
-       if (ghb_settings_get_boolean(ud->settings, "autocrop"))
+       if (ghb_settings_get_boolean(ud->settings, "PictureAutoCrop"))
        {
-               ghb_ui_update(ud, "crop_top", ghb_int64_value(tinfo->crop[0]));
-               ghb_ui_update(ud, "crop_bottom", ghb_int64_value(tinfo->crop[1]));
-               ghb_ui_update(ud, "crop_left", ghb_int64_value(tinfo->crop[2]));
-               ghb_ui_update(ud, "crop_right", ghb_int64_value(tinfo->crop[3]));
+               ghb_ui_update(ud, "PictureTopCrop", ghb_int64_value(tinfo->crop[0]));
+               ghb_ui_update(ud, "PictureBottomCrop", ghb_int64_value(tinfo->crop[1]));
+               ghb_ui_update(ud, "PictureLeftCrop", ghb_int64_value(tinfo->crop[2]));
+               ghb_ui_update(ud, "PictureRightCrop", ghb_int64_value(tinfo->crop[3]));
        }
+       ghb_set_scale (ud, GHB_SCALE_KEEP_NONE);
+       gint width, height, crop[4];
+       crop[0] = ghb_settings_get_int(ud->settings, "PictureTopCrop");
+       crop[1] = ghb_settings_get_int(ud->settings, "PictureBottomCrop");
+       crop[2] = ghb_settings_get_int(ud->settings, "PictureLeftCrop");
+       crop[3] = ghb_settings_get_int(ud->settings, "PictureRightCrop");
+       width = tinfo->width - crop[2] - crop[3];
+       height = tinfo->height - crop[0] - crop[1];
+       widget = GHB_WIDGET (ud->builder, "crop_dimensions");
+       text = g_strdup_printf ("%d x %d", width, height);
+       gtk_label_set_text (GTK_LABEL(widget), text);
+       g_free(text);
+
        g_debug("setting max end chapter %d", tinfo->num_chapters);
        widget = GHB_WIDGET (ud->builder, "end_chapter");
        gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 1, tinfo->num_chapters);
        gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), tinfo->num_chapters);
        widget = GHB_WIDGET (ud->builder, "start_chapter");
        gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), 1);
+       gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 1, tinfo->num_chapters);
 }
 
-static void
-adjust_audio_rate_combos(signal_user_data_t *ud)
-{
-       gint titleindex, audioindex, acodec, mix;
-       ghb_audio_info_t ainfo;
-       GtkWidget *widget;
-       
-       g_debug("adjust_audio_rate_combos ()");
-       titleindex = ghb_settings_combo_int(ud->settings, "title");
-
-       widget = GHB_WIDGET(ud->builder, "audio_track");
-       audioindex = ghb_lookup_combo_int("audio_track", ghb_widget_value(widget));
-
-       widget = GHB_WIDGET(ud->builder, "audio_codec");
-       acodec = ghb_lookup_combo_int("audio_codec", ghb_widget_value(widget));
-       widget = GHB_WIDGET(ud->builder, "audio_mix");
-       mix = ghb_lookup_combo_int("audio_mix", ghb_widget_value(widget));
-
-       if (ghb_audio_is_passthru (acodec))
-       {
-               ghb_set_default_bitrate_opts (ud->builder, -1);
-               if (ghb_get_audio_info (&ainfo, titleindex, audioindex))
-               {
-                       gint br = ainfo.bitrate / 1000;
-                       // Set the values for bitrate and samplerate to the input rates
-                       ghb_set_passthru_bitrate_opts (ud->builder, br);
-                       ghb_ui_update(ud, "audio_bitrate", ghb_int64_value(br));
-                       ghb_ui_update(ud, "audio_rate", ghb_int64_value(0));
-                       ghb_ui_update(ud, "audio_mix", ghb_int64_value(0));
-               }
-               else
-               {
-                       ghb_ui_update(ud, "audio_bitrate", ghb_int64_value(384));
-                       ghb_ui_update(ud, "audio_rate", ghb_int64_value(0));
-                       ghb_ui_update(ud, "audio_mix", ghb_int64_value(0));
-               }
-       }
-       else if (acodec == HB_ACODEC_FAAC && mix != HB_AMIXDOWN_6CH)
-       {
-               gint br;
-
-               widget = GHB_WIDGET(ud->builder, "audio_bitrate");
-               br = ghb_lookup_combo_int("audio_bitrate", ghb_widget_value(widget));
-               if (br > 160)
-                       ghb_ui_update(ud, "audio_bitrate", ghb_int64_value(160));
-               ghb_set_default_bitrate_opts (ud->builder, 160);
-       }
-       else
-       {
-               ghb_set_default_bitrate_opts (ud->builder, -1);
-       }
-}
-
-static void
-set_pref_audio(gint titleindex, signal_user_data_t *ud)
-{
-       gint acodec_code, mix_code, track;
-       gchar *source_lang;
-       GtkWidget *button;
-       ghb_audio_info_t ainfo;
-       gint index;
-       GHashTable *track_indicies;
-       gint *iptr;
-
-       GValue *pref_audio;
-       GValue *audio, *acodec, *bitrate, *rate, *mix, *drc;
-       gint count, ii, list_count;
-       
-       g_debug("set_pref_audio");
-       track_indicies = g_hash_table_new(g_int_hash, g_int_equal);
-       // Clear the audio list
-       clear_audio_list(ud);
-       // Find "best" audio based on audio preferences
-       button = GHB_WIDGET (ud->builder, "audio_add");
-       source_lang = ghb_settings_get_string(ud->settings, "source_audio_lang");
-
-       pref_audio = ghb_settings_get_value(ud->settings, "pref_audio_list");
-
-       list_count = 0;
-       count = ghb_array_len(pref_audio);
-       for (ii = 0; ii < count; ii++)
-       {
-               audio = ghb_array_get_nth(pref_audio, ii);
-               acodec = ghb_settings_get_value(audio, "audio_codec");
-               bitrate = ghb_settings_get_value(audio, "audio_bitrate");
-               rate = ghb_settings_get_value(audio, "audio_rate");
-               mix = ghb_settings_get_value(audio, "audio_mix");
-               drc = ghb_settings_get_value(audio, "audio_drc");
-               acodec_code = ghb_lookup_combo_int("audio_codec", acodec);
-               // If there are multiple audios using the same codec, then
-               // select sequential tracks for each.  This hash keeps track 
-               // of the last used track for each codec.
-               iptr = g_hash_table_lookup(track_indicies, &acodec_code);
-               if (iptr == NULL)
-                       index = 0;
-               else
-                       index = *(gint*)iptr;
-
-               track = ghb_find_audio_track(titleindex, source_lang, index);
-               // Check to see if:
-               // 1. pref codec is ac3
-               // 2. source codec is not ac3
-               // 3. next pref is enabled
-               if (ghb_get_audio_info (&ainfo, titleindex, track) && 
-                       ghb_audio_is_passthru (acodec_code))
-               {
-                       if (!ghb_audio_is_passthru(ainfo.codec))
-                       {
-                               acodec_code = ghb_get_default_acodec();
-                               // If there's more audio to process, or we've already
-                               // placed one in the list, then we can skip this one
-                               if ((ii + 1 < count) || (list_count != 0))
-                               {
-                                       // Skip this audio
-                                       acodec_code = 0;
-                               }
-                       }
-               }
-               if (titleindex >= 0 && track < 0)
-                       acodec_code = 0;
-               if (acodec_code != 0)
-               {
-                       // Add to audio list
-                       g_signal_emit_by_name(button, "clicked", ud);
-                       list_count++;
-                       ghb_ui_update(ud, "audio_track", ghb_int64_value(track));
-                       ghb_ui_update(ud, "audio_codec", acodec);
-                       if (!ghb_audio_is_passthru (acodec_code))
-                       {
-                               // This gets set autimatically if the codec is passthru
-                               ghb_ui_update(ud, "audio_bitrate", bitrate);
-                               ghb_ui_update(ud, "audio_rate", rate);
-                               mix_code = ghb_lookup_combo_int("audio_mix", mix);
-                               mix_code = ghb_get_best_mix(
-                                       titleindex, track, acodec_code, mix_code);
-                               ghb_ui_update(ud, "audio_mix", ghb_int64_value(mix_code));
-                       }
-                       ghb_ui_update(ud, "audio_drc", drc);
-                       index++;
-                       g_hash_table_insert(track_indicies, &acodec_code, &index);
-               }
-       }
-       g_free(source_lang);
-       g_hash_table_destroy(track_indicies);
-}
-
-static gint preview_button_width;
-static gint preview_button_height;
 static gboolean update_preview = FALSE;
 
-static void
-set_preview_image(signal_user_data_t *ud)
-{
-       GtkWidget *widget;
-       gint preview_width, preview_height, target_height, width, height;
-
-       g_debug("set_preview_button_image ()");
-       gint titleindex;
-
-       titleindex = ghb_settings_combo_int(ud->settings, "title");
-       if (titleindex < 0) return;
-       widget = GHB_WIDGET (ud->builder, "preview_frame");
-       gint frame = ghb_widget_int(widget) - 1;
-       GdkPixbuf *preview = ghb_get_preview_image (titleindex, frame, ud->settings, TRUE);
-       if (preview == NULL) return;
-       widget = GHB_WIDGET (ud->builder, "preview_image");
-       gtk_image_set_from_pixbuf(GTK_IMAGE(widget), preview);
-
-       preview_width = gdk_pixbuf_get_width(preview);
-       preview_height = gdk_pixbuf_get_height(preview);
-       gchar *text = g_strdup_printf("%d x %d", preview_width, preview_height);
-       widget = GHB_WIDGET (ud->builder, "preview_dims");
-       gtk_label_set_text(GTK_LABEL(widget), text);
-       g_free(text);
-       
-       g_debug("preview %d x %d", preview_width, preview_height);
-       target_height = MIN(preview_button_height - 12, 128);
-       height = target_height;
-       width = preview_width * height / preview_height;
-
-       if ((height >= 16) && (width >= 16))
-       {
-               GdkPixbuf *scaled_preview;
-               scaled_preview = gdk_pixbuf_scale_simple (preview, width, height, GDK_INTERP_NEAREST);
-               if (scaled_preview != NULL)
-               {
-                       g_object_unref (preview);
-                       
-                       widget = GHB_WIDGET (ud->builder, "preview_button_image");
-                       gtk_image_set_from_pixbuf(GTK_IMAGE(widget), scaled_preview);
-                       g_object_unref (scaled_preview);
-               }
-       }
-}
-
 void
 title_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
        ghb_title_info_t tinfo;
        gint titleindex;
-       gchar *preset;
        
        g_debug("title_changed_cb ()");
        ghb_widget_to_setting(ud->settings, widget);
-       check_dependency(ud, widget);
+       ghb_check_dependency(ud, widget);
 
        titleindex = ghb_settings_combo_int(ud->settings, "title");
-       ghb_update_ui_combo_box (ud->builder, "audio_track", titleindex, FALSE);
-       ghb_update_ui_combo_box (ud->builder, "subtitle_lang", titleindex, FALSE);
+       ghb_update_ui_combo_box (ud->builder, "AudioTrack", titleindex, FALSE);
+       ghb_update_ui_combo_box (ud->builder, "Subtitles", titleindex, FALSE);
 
-       preset = ghb_settings_get_string (ud->settings, "preset");
-       ghb_update_from_preset(ud, preset, "subtitle_lang");
-       g_free(preset);
+       ghb_update_from_preset(ud, "Subtitles");
        if (ghb_get_title_info (&tinfo, titleindex))
        {
                show_title_info(ud, &tinfo);
        }
        update_chapter_list (ud);
-       adjust_audio_rate_combos(ud);
-       set_pref_audio(titleindex, ud);
+       ghb_adjust_audio_rate_combos(ud);
+       ghb_set_pref_audio(titleindex, ud);
        if (ghb_settings_get_boolean(ud->settings, "vquality_type_target"))
        {
                gint bitrate = ghb_calculate_target_bitrate (ud->settings, titleindex);
-               ghb_ui_update(ud, "video_bitrate", ghb_int64_value(bitrate));
+               ghb_ui_update(ud, "VideoAvgBitrate", ghb_int64_value(bitrate));
        }
 
        // Unfortunately, there is no way to query how many frames were
-       // actually generated during the scan.  It attempts to make 10.
+       // actually generated during the scan.
        // If I knew how many were generated, I would adjust the spin
        // control range here.
-       ghb_ui_update(ud, "preview_frame", ghb_int64_value(1));
-
-       set_preview_image (ud);
-}
-
-void
-audio_codec_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
-{
-       static gint prev_acodec = 0;
-       gint acodec_code, mix_code;
-       GValue *asettings;
-       
-       g_debug("audio_codec_changed_cb ()");
-       acodec_code = ghb_lookup_combo_int("audio_codec", ghb_widget_value(widget));
-       if (ghb_audio_is_passthru (prev_acodec) && 
-               !ghb_audio_is_passthru (acodec_code))
-       {
-               // Transition from passthru to not, put some audio settings back to 
-               // pref settings
-               gint titleindex;
-               gint track;
-
-               titleindex = ghb_settings_combo_int(ud->settings, "title");
-               track = ghb_settings_combo_int(ud->settings, "audio_track");
-
-               ghb_ui_update(ud, "audio_bitrate", ghb_string_value("160"));
-               ghb_ui_update(ud, "audio_rate", ghb_string_value("source"));
-               mix_code = ghb_lookup_combo_int("audio_mix", ghb_string_value("dpl2"));
-               mix_code = ghb_get_best_mix( titleindex, track, acodec_code, mix_code);
-               ghb_ui_update(ud, "audio_mix", ghb_int64_value(mix_code));
-               ghb_ui_update(ud, "audio_drc", ghb_double_value(1.0));
-       }
-       adjust_audio_rate_combos(ud);
-       ghb_grey_combo_options (ud->builder);
-       check_dependency(ud, widget);
-       prev_acodec = acodec_code;
-       asettings = get_selected_asettings(ud);
-       if (asettings != NULL)
-       {
-               ghb_widget_to_setting(asettings, widget);
-               audio_list_refresh_selected(ud);
-       }
-
-       const GValue *audio_list;
-       audio_list = ghb_settings_get_value(ud->settings, "audio_list");
-       if (ghb_ac3_in_audio_list (audio_list))
-       {
-               gchar *container;
-
-               container = ghb_settings_get_string(ud->settings, "container");
-               if (strcmp(container, "mp4") == 0)
-               {
-                       ghb_ui_update(ud, "container", ghb_string_value("m4v"));
-               }
-               g_free(container);
-       }
-}
-
-void
-audio_track_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
-{
-       GValue *asettings;
-
-       g_debug("audio_track_changed_cb ()");
-       adjust_audio_rate_combos(ud);
-       check_dependency(ud, widget);
-       ghb_grey_combo_options(ud->builder);
-       asettings = get_selected_asettings(ud);
-       if (asettings != NULL)
-       {
-               const gchar *track;
+       // I do know how many were asked for.
+       gint preview_count;
+       preview_count = ghb_settings_get_int(ud->settings, "preview_count");
+       widget = GHB_WIDGET(ud->builder, "preview_frame");
+       gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 1, preview_count);
+       ghb_ui_update(ud, "preview_frame", ghb_int64_value(2));
 
-               ghb_widget_to_setting(asettings, widget);
-               audio_list_refresh_selected(ud);
-               track = ghb_settings_combo_option(asettings, "audio_track");
-               ghb_settings_set_string(asettings, "audio_track_long", track);
-       }
-}
-
-void
-audio_mix_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
-{
-       GValue *asettings;
-
-       g_debug("audio_widget_changed_cb ()");
-       adjust_audio_rate_combos(ud);
-       check_dependency(ud, widget);
-       asettings = get_selected_asettings(ud);
-       if (asettings != NULL)
-       {
-               ghb_widget_to_setting(asettings, widget);
-               audio_list_refresh_selected(ud);
-       }
-}
-
-void
-audio_widget_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
-{
-       GValue *asettings;
-
-       g_debug("audio_widget_changed_cb ()");
-       check_dependency(ud, widget);
-       asettings = get_selected_asettings(ud);
-       if (asettings != NULL)
+       ghb_set_preview_image (ud);
+       if (ghb_settings_get_boolean(ud->settings, "title_no_in_destination"))
        {
-               ghb_widget_to_setting(asettings, widget);
-               audio_list_refresh_selected(ud);
+               set_destination(ud);
        }
 }
 
 void
-generic_widget_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
-{
-       g_debug("generic_widget_changed_cb ()");
-       check_dependency(ud, widget);
-}
-
-void
 setting_widget_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
        ghb_widget_to_setting(ud->settings, widget);
-       check_dependency(ud, widget);
-       clear_presets_selection(ud);
-}
-
-static void
-validate_filter_widget(signal_user_data_t *ud, const gchar *name)
-{
-       GtkTreeModel *store;
-       GtkTreeIter iter;
-       const gchar *str;
-       gboolean foundit = FALSE;
-       GtkComboBox *combo = GTK_COMBO_BOX(GHB_WIDGET(ud->builder, name));
-       if (gtk_combo_box_get_active(combo) < 0)
-       { // Validate user input
-               gchar *val = ghb_settings_get_string(ud->settings, name);
-               store = gtk_combo_box_get_model(combo);
-               // Check to see if user manually entered one of the combo options
-               if (gtk_tree_model_get_iter_first(store, &iter))
-               {
-                       do
-                       {
-                               gtk_tree_model_get(store, &iter, 0, &str, -1);
-                               if (strcasecmp(val, str) == 0)
-                               {
-                                       gtk_combo_box_set_active_iter(combo, &iter);
-                                       foundit = TRUE;
-                                       break;
-                               }
-                       } while (gtk_tree_model_iter_next(store, &iter));
-               }
-               if (!foundit)
-               { // validate format of filter string
-                       if (!ghb_validate_filter_string(val, -1))
-                               gtk_combo_box_set_active(combo, 0);
-               }
-               g_free(val);
-       }
-}
-
-gboolean
-deint_tweak_focus_out_cb(GtkWidget *widget, GdkEventFocus *event, 
-       signal_user_data_t *ud)
-{
-       g_debug("deint_tweak_focus_out_cb ()");
-       validate_filter_widget(ud, "tweak_deinterlace");
-       return FALSE;
-}
-
-gboolean
-denoise_tweak_focus_out_cb(GtkWidget *widget, GdkEventFocus *event, 
-       signal_user_data_t *ud)
-{
-       g_debug("denoise_tweak_focus_out_cb ()");
-       validate_filter_widget(ud, "tweak_noise");
-       return FALSE;
+       ghb_check_dependency(ud, widget);
+       ghb_clear_presets_selection(ud);
+       ghb_live_reset(ud);
 }
 
 void
 http_opt_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
        ghb_widget_to_setting(ud->settings, widget);
-       check_dependency(ud, widget);
-       clear_presets_selection(ud);
+       ghb_check_dependency(ud, widget);
+       ghb_clear_presets_selection(ud);
+       ghb_live_reset(ud);
+       // AC3 is not allowed when Web optimized
        ghb_grey_combo_options (ud->builder);
 }
 
 void
 vcodec_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-       gint vqmin, vqmax;
+       gdouble vqmin, vqmax, step, page;
+       gint digits;
+       gint vcodec;
 
        ghb_widget_to_setting(ud->settings, widget);
-       check_dependency(ud, widget);
-       clear_presets_selection(ud);
-       ghb_vquality_range(ud, &vqmin, &vqmax);
-       GtkWidget *qp = GHB_WIDGET(ud->builder, "video_quality");
+       ghb_check_dependency(ud, widget);
+       ghb_clear_presets_selection(ud);
+       ghb_live_reset(ud);
+       ghb_vquality_range(ud, &vqmin, &vqmax, &step, &page, &digits);
+       GtkWidget *qp = GHB_WIDGET(ud->builder, "VideoQualitySlider");
        gtk_range_set_range (GTK_RANGE(qp), vqmin, vqmax);
-}
-
-// 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
-// would happen for regular settings.
-void
-subtitle_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
-{
-       const gchar *name = gtk_widget_get_name(widget);
-       g_debug("subtitle_changed_cb () %s", name);
-       ghb_widget_to_setting(ud->settings, widget);
-       check_dependency(ud, widget);
+       gtk_range_set_increments (GTK_RANGE(qp), step, page);
+       gtk_scale_set_digits(GTK_SCALE(qp), digits);
+       vcodec = ghb_settings_combo_int(ud->settings, "VideoEncoder");
+       if (vcodec != HB_VCODEC_X264 && vcodec != HB_VCODEC_FFMPEG)
+       {
+               ghb_ui_update(ud, "directqp", ghb_boolean_value(FALSE));
+       }
 }
 
 void
@@ -1406,14 +1145,15 @@ target_size_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);
+       ghb_check_dependency(ud, widget);
+       ghb_clear_presets_selection(ud);
+       ghb_live_reset(ud);
        if (ghb_settings_get_boolean(ud->settings, "vquality_type_target"))
        {
                gint titleindex;
                titleindex = ghb_settings_combo_int(ud->settings, "title");
                gint bitrate = ghb_calculate_target_bitrate (ud->settings, titleindex);
-               ghb_ui_update(ud, "video_bitrate", ghb_int64_value(bitrate));
+               ghb_ui_update(ud, "VideoAvgBitrate", ghb_int64_value(bitrate));
        }
 }
 
@@ -1429,7 +1169,7 @@ start_chapter_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
        end = ghb_settings_get_int(ud->settings, "end_chapter");
        if (start > end)
                ghb_ui_update(ud, "end_chapter", ghb_int_value(start));
-       check_dependency(ud, widget);
+       ghb_check_dependency(ud, widget);
        if (ghb_settings_get_boolean(ud->settings, "chapters_in_destination"))
        {
                set_destination(ud);
@@ -1448,7 +1188,7 @@ end_chapter_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
        end = ghb_settings_get_int(ud->settings, "end_chapter");
        if (start > end)
                ghb_ui_update(ud, "start_chapter", ghb_int_value(end));
-       check_dependency(ud, widget);
+       ghb_check_dependency(ud, widget);
        if (ghb_settings_get_boolean(ud->settings, "chapters_in_destination"))
        {
                set_destination(ud);
@@ -1460,7 +1200,7 @@ scale_width_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
        g_debug("scale_width_changed_cb ()");
        ghb_widget_to_setting(ud->settings, widget);
-       check_dependency(ud, widget);
+       ghb_check_dependency(ud, widget);
        ghb_set_scale (ud, GHB_SCALE_KEEP_WIDTH);
        update_preview = TRUE;
        gchar *text;
@@ -1470,6 +1210,7 @@ scale_width_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
        text = g_strdup_printf ("%d x %d", width, height);
        gtk_label_set_text (GTK_LABEL(widget), text);
        g_free(text);
+       ghb_live_reset(ud);
 }
 
 void
@@ -1477,7 +1218,7 @@ scale_height_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
        g_debug("scale_height_changed_cb ()");
        ghb_widget_to_setting(ud->settings, widget);
-       check_dependency(ud, widget);
+       ghb_check_dependency(ud, widget);
        ghb_set_scale (ud, GHB_SCALE_KEEP_HEIGHT);
        update_preview = TRUE;
        gchar *text;
@@ -1487,6 +1228,7 @@ scale_height_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
        text = g_strdup_printf ("%d x %d", width, height);
        gtk_label_set_text (GTK_LABEL(widget), text);
        g_free(text);
+       ghb_live_reset(ud);
 }
 
 void
@@ -1497,13 +1239,13 @@ crop_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
        
        g_debug("crop_changed_cb ()");
        ghb_widget_to_setting(ud->settings, widget);
-       check_dependency(ud, widget);
+       ghb_check_dependency(ud, widget);
        ghb_set_scale (ud, GHB_SCALE_KEEP_NONE);
 
-       crop[0] = ghb_settings_get_int(ud->settings, "crop_top");
-       crop[1] = ghb_settings_get_int(ud->settings, "crop_bottom");
-       crop[2] = ghb_settings_get_int(ud->settings, "crop_left");
-       crop[3] = ghb_settings_get_int(ud->settings, "crop_right");
+       crop[0] = ghb_settings_get_int(ud->settings, "PictureTopCrop");
+       crop[1] = ghb_settings_get_int(ud->settings, "PictureBottomCrop");
+       crop[2] = ghb_settings_get_int(ud->settings, "PictureLeftCrop");
+       crop[3] = ghb_settings_get_int(ud->settings, "PictureRightCrop");
        titleindex = ghb_settings_combo_int(ud->settings, "title");
        if (ghb_get_title_info (&tinfo, titleindex))
        {
@@ -1523,6 +1265,7 @@ crop_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
        gtk_label_set_text (GTK_LABEL(widget), text);
        g_free(text);
        update_preview = TRUE;
+       ghb_live_reset(ud);
 }
 
 void
@@ -1530,14 +1273,15 @@ scale_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
        g_debug("scale_changed_cb ()");
        ghb_widget_to_setting(ud->settings, widget);
-       check_dependency(ud, widget);
-       clear_presets_selection(ud);
+       ghb_check_dependency(ud, widget);
+       ghb_clear_presets_selection(ud);
+       ghb_live_reset(ud);
        ghb_set_scale (ud, GHB_SCALE_KEEP_NONE);
        update_preview = TRUE;
        
        gchar *text;
        
-       text = ghb_settings_get_boolean(ud->settings, "autocrop") ? "On" : "Off";
+       text = ghb_settings_get_boolean(ud->settings, "PictureAutoCrop") ? "On" : "Off";
        widget = GHB_WIDGET (ud->builder, "crop_auto");
        gtk_label_set_text (GTK_LABEL(widget), text);
        text = ghb_settings_get_boolean(ud->settings, "autoscale") ? "On" : "Off";
@@ -1565,574 +1309,8 @@ generic_entry_changed_cb(GtkEntry *entry, signal_user_data_t *ud)
        }
 }
 
-gboolean
-generic_focus_out_cb(GtkWidget *widget, GdkEventFocus *event, 
-       signal_user_data_t *ud)
-{
-       g_debug("generic_focus_out_cb ()");
-       ghb_widget_to_setting(ud->settings, widget);
-       return FALSE;
-}
-
-// Flag needed to prevent x264 options processing from chasing its tail
-static gboolean ignore_options_update = FALSE;
-
 void
-x264_widget_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
-{
-       ghb_widget_to_setting(ud->settings, widget);
-       if (!ignore_options_update)
-       {
-               ignore_options_update = TRUE;
-               ghb_x264_opt_update(ud, widget);
-               ignore_options_update = FALSE;
-       }
-       check_dependency(ud, widget);
-       clear_presets_selection(ud);
-}
-
-void
-x264_entry_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
-{
-       g_debug("x264_entry_changed_cb ()");
-       if (!ignore_options_update)
-       {
-               GtkWidget *textview;
-               gchar *options;
-
-               textview = GTK_WIDGET(GHB_WIDGET(ud->builder, "x264_options"));
-               ghb_widget_to_setting(ud->settings, textview);
-               options = ghb_settings_get_string(ud->settings, "x264_options");
-               ignore_options_update = TRUE;
-               ghb_x264_parse_options(ud, options);
-               if (!GTK_WIDGET_HAS_FOCUS(textview))
-               {
-                       gchar *sopts;
-
-                       sopts = ghb_sanitize_x264opts(ud, options);
-                       ghb_ui_update(ud, "x264_options", ghb_string_value(sopts));
-                       ghb_x264_parse_options(ud, sopts);
-                       g_free(sopts);
-               }
-               g_free(options);
-               ignore_options_update = FALSE;
-       }
-}
-
-gboolean
-x264_focus_out_cb(GtkWidget *widget, GdkEventFocus *event, 
-       signal_user_data_t *ud)
-{
-       gchar *options, *sopts;
-
-       ghb_widget_to_setting(ud->settings, widget);
-       options = ghb_settings_get_string(ud->settings, "x264_options");
-       sopts = ghb_sanitize_x264opts(ud, options);
-       ignore_options_update = TRUE;
-       if (sopts != NULL)
-       {
-               ghb_ui_update(ud, "x264_options", ghb_string_value(sopts));
-               ghb_x264_parse_options(ud, sopts);
-       }
-       g_free(options);
-       g_free(sopts);
-       ignore_options_update = FALSE;
-       return FALSE;
-}
-
-static void
-clear_audio_list(signal_user_data_t *ud)
-{
-       GtkTreeView *treeview;
-       GtkListStore *store;
-       GValue *audio_list;
-       
-       g_debug("clear_audio_list ()");
-       audio_list = ghb_settings_get_value(ud->settings, "audio_list");
-       if (audio_list == NULL)
-       {
-               audio_list = ghb_array_value_new(8);
-               ghb_settings_set_value(ud->settings, "audio_list", audio_list);
-       }
-       else
-               ghb_array_value_reset(audio_list, 8);
-       treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "audio_list"));
-       store = GTK_LIST_STORE(gtk_tree_view_get_model(treeview));
-       gtk_list_store_clear (store);
-}
-
-static void
-add_to_audio_list(signal_user_data_t *ud, GValue *settings)
-{
-       GtkTreeView *treeview;
-       GtkTreeIter iter;
-       GtkListStore *store;
-       GtkTreeSelection *selection;
-       const gchar *track, *codec, *br, *sr, *mix;
-       gchar *drc, *s_track, *s_codec, *s_br, *s_sr, *s_mix;
-       gdouble s_drc;
-       
-       g_debug("add_to_audio_list ()");
-       treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "audio_list"));
-       selection = gtk_tree_view_get_selection (treeview);
-       store = GTK_LIST_STORE(gtk_tree_view_get_model(treeview));
-
-       track = ghb_settings_combo_option(settings, "audio_track");
-       codec = ghb_settings_combo_option(settings, "audio_codec");
-       br = ghb_settings_combo_option(settings, "audio_bitrate");
-       sr = ghb_settings_combo_option(settings, "audio_rate");
-       mix = ghb_settings_combo_option(settings, "audio_mix");
-       drc = ghb_settings_get_string(settings, "audio_drc");
-
-       s_track = ghb_settings_get_string(settings, "audio_track");
-       s_codec = ghb_settings_get_string(settings, "audio_codec");
-       s_br = ghb_settings_get_string(settings, "audio_bitrate");
-       s_sr = ghb_settings_get_string(settings, "audio_rate");
-       s_mix = ghb_settings_get_string(settings, "audio_mix");
-       s_drc = ghb_settings_get_double(settings, "audio_drc");
-
-       gtk_list_store_append(store, &iter);
-       gtk_list_store_set(store, &iter, 
-               // These are displayed in list
-               0, track,
-               1, codec,
-               2, br,
-               3, sr,
-               4, mix,
-               // These are used to set combo box values when a list item is selected
-               5, drc,
-               6, s_track,
-               7, s_codec,
-               8, s_br,
-               9, s_sr,
-               10, s_mix,
-               11, s_drc,
-               -1);
-       gtk_tree_selection_select_iter(selection, &iter);
-       g_free(drc);
-       g_free(s_track);
-       g_free(s_codec);
-       g_free(s_br);
-       g_free(s_sr);
-       g_free(s_mix);
-}
-
-static void
-audio_list_refresh_selected(signal_user_data_t *ud)
-{
-       GtkTreeView *treeview;
-       GtkTreePath *treepath;
-       GtkTreeSelection *selection;
-       GtkTreeModel *store;
-       GtkTreeIter iter;
-       gint *indices;
-       gint row;
-       GValue *asettings = NULL;
-       const GValue *audio_list;
-       
-       g_debug("audio_list_refresh_selected ()");
-       treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "audio_list"));
-       selection = gtk_tree_view_get_selection (treeview);
-       if (gtk_tree_selection_get_selected(selection, &store, &iter))
-       {
-               const gchar *track, *codec, *br, *sr, *mix;
-               gchar *drc, *s_track, *s_codec, *s_br, *s_sr, *s_mix;
-               gdouble s_drc;
-               // Get the row number
-               treepath = gtk_tree_model_get_path (store, &iter);
-               indices = gtk_tree_path_get_indices (treepath);
-               row = indices[0];
-               gtk_tree_path_free(treepath);
-               // find audio settings
-               if (row < 0) return;
-               audio_list = ghb_settings_get_value(ud->settings, "audio_list");
-               if (row >= ghb_array_len(audio_list))
-                       return;
-               asettings = ghb_array_get_nth(audio_list, row);
-
-               track = ghb_settings_combo_option(asettings, "audio_track");
-               codec = ghb_settings_combo_option(asettings, "audio_codec");
-               br = ghb_settings_combo_option(asettings, "audio_bitrate");
-               sr = ghb_settings_combo_option(asettings, "audio_rate");
-               mix = ghb_settings_combo_option(asettings, "audio_mix");
-               drc = ghb_settings_get_string(asettings, "audio_drc");
-
-               s_track = ghb_settings_get_string(asettings, "audio_track");
-               s_codec = ghb_settings_get_string(asettings, "audio_codec");
-               s_br = ghb_settings_get_string(asettings, "audio_bitrate");
-               s_sr = ghb_settings_get_string(asettings, "audio_rate");
-               s_mix = ghb_settings_get_string(asettings, "audio_mix");
-               s_drc = ghb_settings_get_double(asettings, "audio_drc");
-
-               gtk_list_store_set(GTK_LIST_STORE(store), &iter, 
-                       // These are displayed in list
-                       0, track,
-                       1, codec,
-                       2, br,
-                       3, sr,
-                       4, mix,
-                       // These are used to set combo values when a list item is selected
-                       5, drc,
-                       6, s_track,
-                       7, s_codec,
-                       8, s_br,
-                       9, s_sr,
-                       10, s_mix,
-                       11, s_drc,
-                       -1);
-               g_free(drc);
-               g_free(s_track);
-               g_free(s_codec);
-               g_free(s_br);
-               g_free(s_sr);
-               g_free(s_mix);
-       }
-}
-
-static GValue*
-get_selected_asettings(signal_user_data_t *ud)
-{
-       GtkTreeView *treeview;
-       GtkTreePath *treepath;
-       GtkTreeSelection *selection;
-       GtkTreeModel *store;
-       GtkTreeIter iter;
-       gint *indices;
-       gint row;
-       GValue *asettings = NULL;
-       const GValue *audio_list;
-       
-       g_debug("get_selected_asettings ()");
-       treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "audio_list"));
-       selection = gtk_tree_view_get_selection (treeview);
-       if (gtk_tree_selection_get_selected(selection, &store, &iter))
-       {
-               // Get the row number
-               treepath = gtk_tree_model_get_path (store, &iter);
-               indices = gtk_tree_path_get_indices (treepath);
-               row = indices[0];
-               gtk_tree_path_free(treepath);
-               // find audio settings
-               if (row < 0) return NULL;
-               audio_list = ghb_settings_get_value(ud->settings, "audio_list");
-               if (row >= ghb_array_len(audio_list))
-                       return NULL;
-               asettings = ghb_array_get_nth(audio_list, row);
-       }
-       return asettings;
-}
-
-void
-audio_list_selection_changed_cb(GtkTreeSelection *selection, signal_user_data_t *ud)
-{
-       GtkTreeModel *store;
-       GtkTreeIter iter;
-       GtkWidget *widget;
-       
-       g_debug("audio_list_selection_changed_cb ()");
-       if (gtk_tree_selection_get_selected(selection, &store, &iter))
-       {
-               const gchar *track, *codec, *bitrate, *sample_rate, *mix;
-               gdouble drc;
-
-               gtk_tree_model_get(store, &iter,
-                                                  6, &track,
-                                                  7, &codec,
-                                                  8, &bitrate,
-                                                  9, &sample_rate,
-                                                  10, &mix,
-                                                  11, &drc,
-                                                  -1);
-               ghb_ui_update(ud, "audio_track", ghb_string_value(track));
-               ghb_ui_update(ud, "audio_codec", ghb_string_value(codec));
-               ghb_ui_update(ud, "audio_bitrate", ghb_string_value(bitrate));
-               ghb_ui_update(ud, "audio_rate", ghb_string_value(sample_rate));
-               ghb_ui_update(ud, "audio_mix", ghb_string_value(mix));
-               ghb_ui_update(ud, "audio_drc", ghb_double_value(drc));
-               widget = GHB_WIDGET (ud->builder, "audio_remove");
-               gtk_widget_set_sensitive(widget, TRUE);
-               //widget = GHB_WIDGET (ud->builder, "audio_update");
-               //gtk_widget_set_sensitive(widget, TRUE);
-       }
-       else
-       {
-               widget = GHB_WIDGET (ud->builder, "audio_remove");
-               gtk_widget_set_sensitive(widget, FALSE);
-               //widget = GHB_WIDGET (ud->builder, "audio_update");
-               //gtk_widget_set_sensitive(widget, FALSE);
-       }
-}
-
-void
-audio_add_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
-{
-       // Add the current audio settings to the list.
-       GValue *asettings;
-       GtkWidget *widget;
-       gint count;
-       GValue *audio_list;
-       const gchar *track;
-       
-       g_debug("audio_add_clicked_cb ()");
-       asettings = ghb_dict_value_new();
-       // Only allow up to 8 audio entries
-       widget = GHB_WIDGET(ud->builder, "audio_track");
-       ghb_settings_take_value(asettings, "audio_track", ghb_widget_value(widget));
-       widget = GHB_WIDGET(ud->builder, "audio_codec");
-       ghb_settings_take_value(asettings, "audio_codec", ghb_widget_value(widget));
-       widget = GHB_WIDGET(ud->builder, "audio_bitrate");
-       ghb_settings_take_value(asettings, "audio_bitrate", ghb_widget_value(widget));
-       widget = GHB_WIDGET(ud->builder, "audio_rate");
-       ghb_settings_take_value(asettings, "audio_rate", ghb_widget_value(widget));
-       widget = GHB_WIDGET(ud->builder, "audio_mix");
-       ghb_settings_take_value(asettings, "audio_mix", ghb_widget_value(widget));
-       widget = GHB_WIDGET(ud->builder, "audio_drc");
-       ghb_settings_take_value(asettings, "audio_drc", ghb_widget_value(widget));
-       track = ghb_settings_combo_option(asettings, "audio_track");
-       ghb_settings_set_string(asettings, "audio_track_long", track);
-
-       audio_list = ghb_settings_get_value(ud->settings, "audio_list");
-       if (audio_list == NULL)
-       {
-               audio_list = ghb_array_value_new(8);
-               ghb_settings_set_value(ud->settings, "audio_list", audio_list);
-       }
-       ghb_array_append(audio_list, asettings);
-       add_to_audio_list(ud, asettings);
-       count = ghb_array_len(audio_list);
-       if (count >= 8)
-       {
-               gtk_widget_set_sensitive(xwidget, FALSE);
-       }
-}
-
-void
-audio_remove_clicked_cb(GtkWidget *widget, signal_user_data_t *ud)
-{
-       GtkTreeView *treeview;
-       GtkTreePath *treepath;
-       GtkTreeSelection *selection;
-       GtkTreeModel *store;
-       GtkTreeIter iter, nextIter;
-       gint *indices;
-       gint row;
-       GValue *audio_list;
-
-       g_debug("audio_remove_clicked_cb ()");
-       treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "audio_list"));
-       selection = gtk_tree_view_get_selection (treeview);
-       if (gtk_tree_selection_get_selected(selection, &store, &iter))
-       {
-               nextIter = iter;
-               if (!gtk_tree_model_iter_next(store, &nextIter))
-               {
-                       nextIter = iter;
-                       if (gtk_tree_model_get_iter_first(store, &nextIter))
-                       {
-                               gtk_tree_selection_select_iter (selection, &nextIter);
-                       }
-               }
-               else
-               {
-                       gtk_tree_selection_select_iter (selection, &nextIter);
-               }
-               // Get the row number
-               treepath = gtk_tree_model_get_path (store, &iter);
-               indices = gtk_tree_path_get_indices (treepath);
-               row = indices[0];
-               gtk_tree_path_free(treepath);
-               // Remove the selected item
-               gtk_list_store_remove (GTK_LIST_STORE(store), &iter);
-               // remove from audio settings list
-               if (row < 0) return;
-               widget = GHB_WIDGET (ud->builder, "audio_add");
-               gtk_widget_set_sensitive(widget, TRUE);
-               audio_list = ghb_settings_get_value(ud->settings, "audio_list");
-               if (row >= ghb_array_len(audio_list))
-                       return;
-               GValue *old = ghb_array_get_nth(audio_list, row);
-               ghb_value_free(old);
-               ghb_array_remove(audio_list, row);
-       }
-}
-
-void
-ghb_presets_list_update(signal_user_data_t *ud)
-{
-       GtkTreeView *treeview;
-       GtkTreeIter iter;
-       GtkListStore *store;
-       gboolean done;
-       GList *presets, *plink;
-       gchar *preset, *def_preset;
-       gchar *description;
-       gint flags, custom, def;
-       
-       g_debug("ghb_presets_list_update ()");
-       def_preset = ghb_settings_get_string(ud->settings, "default_preset");
-       plink = presets = ghb_presets_get_names();
-       treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "presets_list"));
-       store = GTK_LIST_STORE(gtk_tree_view_get_model(treeview));
-       if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &iter))
-       {
-               do
-               {
-                       if (plink)
-                       {
-                               // Update row with settings data
-                               g_debug("Updating row");
-                               preset = (gchar*)plink->data;
-                               def = 0;
-                               if (strcmp(preset, def_preset) == 0)
-                                       def = PRESET_DEFAULT;
-                               
-                               description = ghb_presets_get_description(preset);
-                               flags = ghb_preset_flags(preset);
-                               custom = flags & PRESET_CUSTOM;
-                               gtk_list_store_set(store, &iter, 
-                                                       0, preset, 
-                                                       1, def ? 800 : 400, 
-                                                       2, def ? 2 : 0,
-                                                       3, custom ? "black" : "blue", 
-                                                       4, description,
-                                                       -1);
-                               plink = plink->next;
-                               g_free(description);
-                               done = !gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter);
-                       }
-                       else
-                       {
-                               // No more settings data, remove row
-                               g_debug("Removing row");
-                               done = !gtk_list_store_remove(store, &iter);
-                       }
-               } while (!done);
-       }
-       while (plink)
-       {
-               // Additional settings, add row
-               g_debug("Adding rows");
-               preset = (gchar*)plink->data;
-               def = 0;
-               if (strcmp(preset, def_preset) == 0)
-                       def = PRESET_DEFAULT;
-
-               description = ghb_presets_get_description(preset);
-               gtk_list_store_append(store, &iter);
-               flags = ghb_preset_flags(preset);
-               custom = flags & PRESET_CUSTOM;
-               gtk_list_store_set(store, &iter, 0, preset, 
-                                                       1, def ? 800 : 400, 
-                                                       2, def ? 2 : 0,
-                                                       3, custom ? "black" : "blue", 
-                                                       4, description,
-                                                       -1);
-               plink = plink->next;
-               g_free(description);
-       }
-       g_free(def_preset);
-       g_list_free (presets);
-}
-
-void
-ghb_select_preset(GtkBuilder *builder, const gchar *preset)
-{
-       GtkTreeView *treeview;
-       GtkTreeSelection *selection;
-       GtkTreeModel *store;
-       GtkTreeIter iter;
-       gchar *tpreset;
-       gboolean done;
-       gboolean foundit = FALSE;
-       
-       g_debug("select_preset()");
-       if (preset == NULL) return;
-       treeview = GTK_TREE_VIEW(GHB_WIDGET(builder, "presets_list"));
-       selection = gtk_tree_view_get_selection (treeview);
-       store = gtk_tree_view_get_model (treeview);
-       if (gtk_tree_model_get_iter_first(store, &iter))
-       {
-               do
-               {
-                       gtk_tree_model_get(store, &iter, 0, &tpreset, -1);
-                       if (strcmp(preset, tpreset) == 0)
-                       {
-                               gtk_tree_selection_select_iter (selection, &iter);
-                               foundit = TRUE;
-                               g_free(tpreset);
-                               break;
-                       }
-                       g_free(tpreset);
-                       done = !gtk_tree_model_iter_next(store, &iter);
-               } while (!done);
-       }
-       if (!foundit)
-       {
-               gtk_tree_model_get_iter_first(store, &iter);
-               gtk_tree_selection_select_iter (selection, &iter);
-       }
-}
-
-static void
-update_audio_presets(signal_user_data_t *ud)
-{
-       g_debug("update_audio_presets");
-       const GValue *audio_list;
-
-       audio_list = ghb_settings_get_value(ud->settings, "audio_list");
-       ghb_settings_set_value(ud->settings, "pref_audio_list", audio_list);
-}
-
-void
-presets_save_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
-{
-       GtkWidget *dialog;
-       GtkEntry *entry;
-       GtkTextView *desc;
-       GtkResponseType response;
-       gchar *preset;
-
-       g_debug("presets_save_clicked_cb ()");
-       preset = ghb_settings_get_string (ud->settings, "preset");
-       // Clear the description
-       desc = GTK_TEXT_VIEW(GHB_WIDGET(ud->builder, "preset_description"));
-       dialog = GHB_WIDGET(ud->builder, "preset_save_dialog");
-       entry = GTK_ENTRY(GHB_WIDGET(ud->builder, "preset_name"));
-       gtk_entry_set_text(entry, preset);
-       g_free(preset);
-       response = gtk_dialog_run(GTK_DIALOG(dialog));
-       gtk_widget_hide(dialog);
-       if (response == GTK_RESPONSE_OK)
-       {
-               // save the preset
-               const gchar *name = gtk_entry_get_text(entry);
-               g_debug("description to settings");
-               ghb_widget_to_setting(ud->settings, GTK_WIDGET(desc));
-               // Construct the audio settings presets from the current audio list
-               update_audio_presets(ud);
-               ghb_settings_save(ud, name);
-               ghb_presets_list_update(ud);
-               // Make the new preset the selected item
-               ghb_select_preset(ud->builder, name);
-       }
-}
-
-void
-presets_restore_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
-{
-       g_debug("presets_restore_clicked_cb ()");
-       // Reload only the standard presets
-       ghb_presets_reload(ud);
-       ghb_presets_list_update(ud);
-       // Updating the presets list shuffles things around
-       // need to make sure the proper preset is selected
-       gchar *preset = ghb_settings_get_string (ud->settings, "preset");
-       ghb_select_preset(ud->builder, preset);
-       g_free(preset);
-}
-
-void
-prefs_dialog_cb(GtkWidget *xwidget, signal_user_data_t *ud)
+prefs_dialog_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
        GtkWidget *dialog;
        GtkResponseType response;
@@ -2143,141 +1321,6 @@ prefs_dialog_cb(GtkWidget *xwidget, signal_user_data_t *ud)
        gtk_widget_hide(dialog);
 }
 
-void
-presets_remove_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
-{
-       GtkTreeView *treeview;
-       GtkTreeSelection *selection;
-       GtkTreeModel *store;
-       GtkTreeIter iter;
-       gchar *preset;
-       GtkResponseType response;
-
-       g_debug("presets_remove_clicked_cb ()");
-       treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "presets_list"));
-       selection = gtk_tree_view_get_selection (treeview);
-       if (gtk_tree_selection_get_selected(selection, &store, &iter))
-       {
-               GtkWidget *dialog;
-
-               gtk_tree_model_get(store, &iter, 0, &preset, -1);
-               dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL,
-                                                               GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO,
-                                                               "Confirm deletion of preset %s.", preset);
-               response = gtk_dialog_run(GTK_DIALOG(dialog));
-               gtk_widget_destroy (dialog);
-               if (response == GTK_RESPONSE_YES)
-               {
-                       GtkTreeIter nextIter = iter;
-                       gchar *nextPreset = NULL;
-                       if (!gtk_tree_model_iter_next(store, &nextIter))
-                       {
-                               if (gtk_tree_model_get_iter_first(store, &nextIter))
-                               {
-                                       gtk_tree_model_get(store, &nextIter, 0, &nextPreset, -1);
-                               }
-                       }
-                       else
-                       {
-                               gtk_tree_model_get(store, &nextIter, 0, &nextPreset, -1);
-                       }
-                       // Remove the selected item
-                       // First unselect it so that selecting the new item works properly
-                       gtk_tree_selection_unselect_iter (selection, &iter);
-                       ghb_presets_remove(preset);
-                       ghb_presets_list_update(ud);
-                       ghb_select_preset(ud->builder, nextPreset);
-               }
-       }
-}
-
-static void
-preset_update_title_deps(signal_user_data_t *ud, ghb_title_info_t *tinfo)
-{
-       GtkWidget *widget;
-
-       ghb_ui_update(ud, "scale_width", 
-                       ghb_int64_value(tinfo->width - tinfo->crop[2] - tinfo->crop[3]));
-       // If anamorphic or keep_aspect, the hight will be automatically calculated
-       gboolean keep_aspect, anamorphic;
-       keep_aspect = ghb_settings_get_boolean(ud->settings, "keep_aspect");
-       anamorphic = ghb_settings_get_boolean(ud->settings, "anamorphic");
-       if (!(keep_aspect || anamorphic))
-       {
-               ghb_ui_update(ud, "scale_height", 
-                       ghb_int64_value(tinfo->height - tinfo->crop[0] - tinfo->crop[1]));
-       }
-
-       // Set the limits of cropping.  hb_set_anamorphic_size crashes if
-       // you pass it a cropped width or height == 0.
-       gint bound;
-       bound = tinfo->height / 2 - 2;
-       widget = GHB_WIDGET (ud->builder, "crop_top");
-       gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, bound);
-       widget = GHB_WIDGET (ud->builder, "crop_bottom");
-       gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, bound);
-       bound = tinfo->width / 2 - 2;
-       widget = GHB_WIDGET (ud->builder, "crop_left");
-       gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, bound);
-       widget = GHB_WIDGET (ud->builder, "crop_right");
-       gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, bound);
-       if (ghb_settings_get_boolean(ud->settings, "autocrop"))
-       {
-               ghb_ui_update(ud, "crop_top", ghb_int64_value(tinfo->crop[0]));
-               ghb_ui_update(ud, "crop_bottom", ghb_int64_value(tinfo->crop[1]));
-               ghb_ui_update(ud, "crop_left", ghb_int64_value(tinfo->crop[2]));
-               ghb_ui_update(ud, "crop_right", ghb_int64_value(tinfo->crop[3]));
-       }
-}
-
-void
-presets_list_selection_changed_cb(GtkTreeSelection *selection, signal_user_data_t *ud)
-{
-       GtkTreeModel *store;
-       GtkTreeIter iter;
-       gchar *preset;
-       ghb_title_info_t tinfo;
-       GtkWidget *widget;
-       
-       g_debug("presets_list_selection_changed_cb ()");
-       widget = GHB_WIDGET (ud->builder, "presets_remove");
-       if (gtk_tree_selection_get_selected(selection, &store, &iter))
-       {
-               gtk_tree_model_get(store, &iter, 0, &preset, -1);
-               ud->dont_clear_presets = TRUE;
-               // Temporarily set the video_quality range to (0,100)
-               // This is needed so the video_quality value does not get
-               // truncated when set.  The range will be readjusted below
-               GtkWidget *qp = GHB_WIDGET(ud->builder, "video_quality");
-               gtk_range_set_range (GTK_RANGE(qp), 0, 100);
-               // Clear the audio list prior to changing the preset.  Existing audio
-               // can cause the container extension to be automatically changed when
-               // it shouldn't be
-               clear_audio_list(ud);
-               ghb_set_preset(ud, preset);
-               gint titleindex;
-               titleindex = ghb_settings_combo_int(ud->settings, "title");
-               set_pref_audio(titleindex, ud);
-               ghb_settings_set_boolean(ud->settings, "preset_modified", FALSE);
-               ud->dont_clear_presets = FALSE;
-               if (ghb_get_title_info (&tinfo, titleindex))
-               {
-                       preset_update_title_deps(ud, &tinfo);
-               }
-               ghb_set_scale (ud, GHB_SCALE_KEEP_NONE);
-
-               gint vqmin, vqmax;
-               ghb_vquality_range(ud, &vqmin, &vqmax);
-               gtk_range_set_range (GTK_RANGE(qp), vqmin, vqmax);
-               gtk_widget_set_sensitive(widget, TRUE);
-       }
-       else
-       {
-               g_debug("No selection???  Perhaps unselected.");
-               gtk_widget_set_sensitive(widget, FALSE);
-       }
-}
-
 gboolean
 ghb_message_dialog(GtkMessageType type, const gchar *message, const gchar *no, const gchar *yes)
 {
@@ -2287,7 +1330,7 @@ ghb_message_dialog(GtkMessageType type, const gchar *message, const gchar *no, c
        // Toss up a warning dialog
        dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL,
                                                        type, GTK_BUTTONS_NONE,
-                                                       message);
+                                                       "%s", message);
        gtk_dialog_add_buttons( GTK_DIALOG(dialog), 
                                                   no, GTK_RESPONSE_NO,
                                                   yes, GTK_RESPONSE_YES, NULL);
@@ -2326,9 +1369,20 @@ static void
 submit_job(GValue *settings)
 {
        static gint unique_id = 1;
+       gchar *type, *modified, *preset;
+       const GValue *path;
+       gboolean preset_modified;
 
        g_debug("submit_job");
        if (settings == NULL) return;
+       preset_modified = ghb_settings_get_boolean(settings, "preset_modified");
+       path = ghb_settings_get_value(settings, "preset");
+       preset = ghb_preset_path_string(path);
+       type = ghb_preset_is_custom() ? "Custom " : "";
+       modified = preset_modified ? "Modified " : "";
+       ghb_log("%s%sPreset: %s", modified, type, preset);
+       g_free(preset);
+
        ghb_settings_set_int(settings, "job_unique_id", unique_id);
        ghb_settings_set_int(settings, "job_status", GHB_QUEUE_RUNNING);
        ghb_add_job (settings, unique_id);
@@ -2337,10 +1391,88 @@ submit_job(GValue *settings)
 }
 
 static void
-queue_scan(GValue *js)
+prune_logs(signal_user_data_t *ud)
+{
+       gchar *dest_dir;
+
+       // Only prune logs stored in the default config dir location
+       dest_dir = ghb_get_user_config_dir("EncodeLogs");
+       if (g_file_test(dest_dir, G_FILE_TEST_IS_DIR))
+       {
+               const gchar *file;
+               int week = 7*24*60*60;
+               GDir *gdir = g_dir_open(dest_dir, 0, NULL);
+               time_t now;
+
+               now = time(NULL);
+               file = g_dir_read_name(gdir);
+               while (file)
+               {
+                       gchar *path;
+                       struct stat stbuf;
+
+                       path = g_strdup_printf("%s/%s", dest_dir, file);
+                       g_stat(path, &stbuf);
+                       if (now - stbuf.st_mtime > week)
+                       {
+                               g_unlink(path);
+                       }
+                       g_free(path);
+                       file = g_dir_read_name(gdir);
+               }
+               g_dir_close(gdir);
+       }
+       g_free(dest_dir);
+       ghb_preview_cleanup(ud);
+}
+
+static void
+queue_scan(signal_user_data_t *ud, GValue *js)
 {
        gchar *path;
        gint titlenum;
+       time_t  _now;
+       struct tm *now;
+       gchar *log_path, *pos, *destname, *basename, *dest_dir;
+
+       _now = time(NULL);
+       now = localtime(&_now);
+       destname = ghb_settings_get_string(js, "destination");
+       basename = g_path_get_basename(destname);
+       if (ghb_settings_get_boolean(ud->settings, "EncodeLogLocation"))
+       {
+               dest_dir = g_path_get_dirname (destname);
+       }
+       else
+       {
+               dest_dir = ghb_get_user_config_dir("EncodeLogs");
+       }
+       g_free(destname);
+       pos = g_strrstr( basename, "." );
+       if (pos != NULL)
+       {
+               *pos = 0;
+       }
+       log_path = g_strdup_printf("%s/%d-%02d-%02d %02d-%02d-%02d %s.log",
+               dest_dir,
+               now->tm_year + 1900, now->tm_mon + 1, now->tm_mday,
+               now->tm_hour, now->tm_min, now->tm_sec, basename);
+       g_free(basename);
+       g_free(dest_dir);
+       if (ud->job_activity_log)
+               g_io_channel_unref(ud->job_activity_log);
+       ud->job_activity_log = g_io_channel_new_file (log_path, "w", NULL);
+       if (ud->job_activity_log)
+       {
+               gchar *ver_str;
+
+               ver_str = g_strdup_printf("Handbrake Version: %s (%d)\n", 
+                                                                       HB_VERSION, HB_BUILD);
+               g_io_channel_write_chars (ud->job_activity_log, ver_str, 
+                                                                       -1, NULL, NULL);
+               g_free(ver_str);
+       }
+       g_free(log_path);
 
        path = ghb_settings_get_string( js, "source");
        titlenum = ghb_settings_get_int(js, "titlenum");
@@ -2369,11 +1501,13 @@ ghb_start_next_job(signal_user_data_t *ud, gboolean find_first)
                        if (status == GHB_QUEUE_PENDING)
                        {
                                current = ii;
-                               queue_scan(js);
+                               ghb_inhibit_gpm();
+                               queue_scan(ud, js);
                                return js;
                        }
                }
                // Nothing pending
+               ghb_uninhibit_gpm();
                return NULL;
        }
        // Find the next pending item after the current running item
@@ -2390,7 +1524,8 @@ ghb_start_next_job(signal_user_data_t *ud, gboolean find_first)
                                if (status == GHB_QUEUE_PENDING)
                                {
                                        current = jj;
-                                       queue_scan(js);
+                                       ghb_inhibit_gpm();
+                                       queue_scan(ud, js);
                                        return js;
                                }
                        }
@@ -2405,11 +1540,13 @@ ghb_start_next_job(signal_user_data_t *ud, gboolean find_first)
                if (status == GHB_QUEUE_PENDING)
                {
                        current = ii;
-                       queue_scan(js);
+                       ghb_inhibit_gpm();
+                       queue_scan(ud, js);
                        return js;
                }
        }
        // Nothing found
+       ghb_uninhibit_gpm();
        return NULL;
 }
 
@@ -2437,7 +1574,7 @@ find_queue_job(GValue *queue, gint unique_id, GValue **job)
 }
 
 gchar*
-working_status_string(signal_user_data_t *ud, ghb_status_t *status)
+working_status_string(signal_user_data_t *ud, ghb_instance_status_t *status)
 {
        gchar *task_str, *job_str, *status_str;
        gint qcount;
@@ -2505,19 +1642,26 @@ ghb_backend_events(signal_user_data_t *ud)
        progress = GTK_PROGRESS_BAR(GHB_WIDGET (ud->builder, "progressbar"));
        // First handle the status of title scans
        // Then handle the status of the queue
-       if (status.state & GHB_STATE_SCANNING)
+       if (status.scan.state & GHB_STATE_SCANNING)
        {
-               status_str = g_strdup_printf ("Scanning title %d of %d...", 
-                                                                 status.title_cur, status.title_count );
+               if (status.scan.title_cur == 0)
+               {
+                       status_str = g_strdup ("Scanning...");
+               }
+               else
+               {
+                       status_str = g_strdup_printf ("Scanning title %d of %d...", 
+                                                         status.scan.title_cur, status.scan.title_count );
+               }
                gtk_progress_bar_set_text (progress, status_str);
                g_free(status_str);
-               if (status.title_count > 0)
+               if (status.scan.title_count > 0)
                {
                        gtk_progress_bar_set_fraction (progress, 
-                               (gdouble)status.title_cur / status.title_count);
+                               (gdouble)status.scan.title_cur / status.scan.title_count);
                }
        }
-       else if (status.state & GHB_STATE_SCANDONE)
+       else if (status.scan.state & GHB_STATE_SCANDONE)
        {
                status_str = g_strdup_printf ("Scan done"); 
                gtk_progress_bar_set_text (progress, status_str);
@@ -2538,46 +1682,60 @@ ghb_backend_events(signal_user_data_t *ud)
                        gtk_progress_bar_set_fraction (progress, 0);
                        gtk_progress_bar_set_text (progress, "No Source");
                }
-               ghb_clear_state(GHB_STATE_SCANDONE);
+               ghb_clear_scan_state(GHB_STATE_SCANDONE);
                ghb_queue_buttons_grey(ud, work_started);
+               if (ghb_queue_edit_settings)
+               {
+                       gint jstatus;
+
+                       jstatus = ghb_settings_get_int(ghb_queue_edit_settings, "job_status");
+                       ghb_settings_to_ui(ud, ghb_queue_edit_settings);
+                       ghb_set_audio(ud, ghb_queue_edit_settings);
+                       if (jstatus == GHB_QUEUE_PENDING)
+                       {
+                               ghb_value_free(ghb_queue_edit_settings);
+                       }
+                       ghb_queue_edit_settings = NULL;
+               }
        }
-       else if (status.queue_state & GHB_STATE_SCANNING)
+       else if (status.queue.state & GHB_STATE_SCANNING)
        {
                status_str = g_strdup_printf ("Scanning ...");
                gtk_progress_bar_set_text (progress, status_str);
                g_free(status_str);
                gtk_progress_bar_set_fraction (progress, 0);
        }
-       else if (status.queue_state & GHB_STATE_SCANDONE)
+       else if (status.queue.state & GHB_STATE_SCANDONE)
        {
                ghb_clear_queue_state(GHB_STATE_SCANDONE);
+               usleep(2000000);
                submit_job(ud->current_job);
        }
-       else if (status.queue_state & GHB_STATE_PAUSED)
+       else if (status.queue.state & GHB_STATE_PAUSED)
        {
                status_str = g_strdup_printf ("Paused"); 
                gtk_progress_bar_set_text (progress, status_str);
                g_free(status_str);
        }
-       else if (status.queue_state & GHB_STATE_WORKING)
+       else if (status.queue.state & GHB_STATE_WORKING)
        {
-               status_str = working_status_string(ud, &status);
+               status_str = working_status_string(ud, &status.queue);
                gtk_progress_bar_set_text (progress, status_str);
-               gtk_progress_bar_set_fraction (progress, status.progress);
+               gtk_progress_bar_set_fraction (progress, status.queue.progress);
                g_free(status_str);
        }
-       else if (status.queue_state & GHB_STATE_WORKDONE)
+       else if (status.queue.state & GHB_STATE_WORKDONE)
        {
                gint qstatus;
 
                work_started = FALSE;
                ghb_queue_buttons_grey(ud, FALSE);
-               index = find_queue_job(ud->queue, status.unique_id, &js);
+               index = find_queue_job(ud->queue, status.queue.unique_id, &js);
                treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "queue_list"));
                store = GTK_TREE_STORE(gtk_tree_view_get_model(treeview));
                if (ud->cancel_encode)
-                       status.error = GHB_ERROR_CANCELED;
-               switch( status.error )
+                       status.queue.error = GHB_ERROR_CANCELED;
+               switch( status.queue.error )
                {
                        case GHB_ERROR_NONE:
                                gtk_progress_bar_set_text( progress, "Rip done!" );
@@ -2623,20 +1781,28 @@ ghb_backend_events(signal_user_data_t *ud)
                }
                gtk_progress_bar_set_fraction (progress, 1.0);
                ghb_clear_queue_state(GHB_STATE_WORKDONE);
+               if (ud->job_activity_log)
+                       g_io_channel_unref(ud->job_activity_log);
+               ud->job_activity_log = NULL;
                if (!ud->cancel_encode)
+               {
                        ud->current_job = ghb_start_next_job(ud, FALSE);
+               }
                else
+               {
+                       ghb_uninhibit_gpm();
                        ud->current_job = NULL;
+               }
                if (js)
                        ghb_settings_set_int(js, "job_status", qstatus);
                ghb_save_queue(ud->queue);
                ud->cancel_encode = FALSE;
        }
-       else if (status.queue_state & GHB_STATE_MUXING)
+       else if (status.queue.state & GHB_STATE_MUXING)
        {
                gtk_progress_bar_set_text(progress, "Muxing: this may take awhile...");
        }
-       if (status.queue_state & GHB_STATE_SCANNING)
+       if (status.queue.state & GHB_STATE_SCANNING)
        {
                // This needs to be in scanning and working since scanning
                // happens fast enough that it can be missed
@@ -2646,7 +1812,7 @@ ghb_backend_events(signal_user_data_t *ud)
                        ghb_queue_buttons_grey(ud, TRUE);
                }
        }
-       if (status.queue_state & GHB_STATE_WORKING)
+       if (status.queue.state & GHB_STATE_WORKING)
        {
                // This needs to be in scanning and working since scanning
                // happens fast enough that it can be missed
@@ -2655,8 +1821,8 @@ ghb_backend_events(signal_user_data_t *ud)
                        work_started = TRUE;
                        ghb_queue_buttons_grey(ud, TRUE);
                }
-               index = find_queue_job(ud->queue, status.unique_id, &js);
-               if (status.unique_id != 0 && index >= 0)
+               index = find_queue_job(ud->queue, status.queue.unique_id, &js);
+               if (status.queue.unique_id != 0 && index >= 0)
                {
                        gchar working_icon[] = "hb-working0";
                        working_icon[10] = '0' + working;
@@ -2671,13 +1837,38 @@ ghb_backend_events(signal_user_data_t *ud)
                        }
                        g_free(path);
                }
-               GtkLabel *label;
-               gchar *status_str;
-
-               status_str = working_status_string(ud, &status);
-               label = GTK_LABEL(GHB_WIDGET(ud->builder, "queue_status"));
-               gtk_label_set_text (label, status_str);
-               g_free(status_str);
+               GtkLabel *label;
+               gchar *status_str;
+
+               status_str = working_status_string(ud, &status.queue);
+               label = GTK_LABEL(GHB_WIDGET(ud->builder, "queue_status"));
+               gtk_label_set_text (label, status_str);
+               g_free(status_str);
+       }
+       if (status.scan.state & GHB_STATE_WORKING)
+       {
+               GtkProgressBar *live_progress;
+               live_progress = GTK_PROGRESS_BAR(
+                       GHB_WIDGET(ud->builder, "live_encode_progress"));
+               status_str = working_status_string(ud, &status.scan);
+               gtk_progress_bar_set_text (live_progress, status_str);
+               gtk_progress_bar_set_fraction (live_progress, status.scan.progress);
+               g_free(status_str);
+       }
+       if (status.scan.state & GHB_STATE_WORKDONE)
+       {
+               switch( status.scan.error )
+               {
+                       case GHB_ERROR_NONE:
+                       {
+                               ghb_live_encode_done(ud, TRUE);
+                       } break;
+                       default:
+                       {
+                               ghb_live_encode_done(ud, FALSE);
+                       } break;
+               }
+               ghb_clear_scan_state(GHB_STATE_WORKDONE);
        }
 }
 
@@ -2686,6 +1877,7 @@ ghb_timer_cb(gpointer data)
 {
        signal_user_data_t *ud = (signal_user_data_t*)data;
 
+       ghb_live_preview_progress(ud);
        ghb_backend_events(ud);
        if (update_default_destination)
        {
@@ -2705,7 +1897,7 @@ ghb_timer_cb(gpointer data)
        }
        if (update_preview)
        {
-               set_preview_image (ud);
+               ghb_set_preview_image (ud);
                update_preview = FALSE;
        }
        return TRUE;
@@ -2737,7 +1929,7 @@ ghb_log_cb(GIOChannel *source, GIOCondition cond, gpointer data)
                buffer = gtk_text_view_get_buffer (textview);
                // I would like to auto-scroll the window when the scrollbar
                // is at the bottom, 
-               // must determining whether the insert point is at
+               // must determine whether the insert point is at
                // the bottom of the window 
                window = gtk_text_view_get_window(textview, GTK_TEXT_WINDOW_TEXT);
                if (window != NULL)
@@ -2760,11 +1952,20 @@ ghb_log_cb(GIOChannel *source, GIOCondition cond, gpointer data)
                gtk_text_buffer_insert(buffer, &iter, text, -1);
                if (bottom)
                {
-                       //gtk_text_view_scroll_to_iter(textview, &iter, 0, FALSE, 0, 0);
-                       mark = gtk_text_buffer_get_insert (buffer);
+                       gtk_text_buffer_get_end_iter(buffer, &iter);
+                       mark = gtk_text_buffer_create_mark(buffer, NULL, &iter, FALSE);
                        gtk_text_view_scroll_mark_onscreen(textview, mark);
+                       gtk_text_buffer_delete_mark(buffer, mark);
+               }
+               g_io_channel_write_chars (ud->activity_log, text, 
+                                                               length, &length, NULL);
+               g_io_channel_flush(ud->activity_log, NULL);
+               if (ud->job_activity_log)
+               {
+                       g_io_channel_write_chars (ud->job_activity_log, text, 
+                                                                       length, &length, NULL);
+                       g_io_channel_flush(ud->job_activity_log, NULL);
                }
-               g_io_channel_write_chars (ud->activity_log, text, length, &length, NULL);
                g_free(text);
        }
        if (status != G_IO_STATUS_NORMAL)
@@ -2784,6 +1985,62 @@ ghb_log_cb(GIOChannel *source, GIOCondition cond, gpointer data)
        return TRUE;
 }
 
+static void
+set_visible(GtkWidget *widget, gboolean visible)
+{
+       if (visible)
+       {
+               gtk_widget_show_now(widget);
+       }
+       else
+       {
+               gtk_widget_hide(widget);
+       }
+}
+
+void
+show_activity_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
+{
+       GtkWidget *widget = GHB_WIDGET (ud->builder, "activity_window");
+       set_visible(widget, gtk_toggle_tool_button_get_active(
+                                               GTK_TOGGLE_TOOL_BUTTON(xwidget)));
+}
+
+void
+show_activity_menu_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
+{
+       GtkWidget *widget = GHB_WIDGET (ud->builder, "activity_window");
+       set_visible(widget, TRUE);
+       widget = GHB_WIDGET (ud->builder, "show_activity");
+       gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(widget), TRUE);
+}
+
+gboolean
+activity_window_delete_cb(GtkWidget *xwidget, GdkEvent *event, signal_user_data_t *ud)
+{
+       set_visible(xwidget, FALSE);
+       GtkWidget *widget = GHB_WIDGET (ud->builder, "show_activity");
+       gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(widget), FALSE);
+       return TRUE;
+}
+
+void
+ghb_log(gchar *log, ...)
+{
+       va_list args;
+       time_t _now;
+    struct tm *now;
+       gchar fmt[362];
+
+       _now = time(NULL);
+       now = localtime( &_now );
+       snprintf(fmt, 362, "[%02d:%02d:%02d] lingui: %s\n", 
+                       now->tm_hour, now->tm_min, now->tm_sec, log);
+       va_start(args, log);
+       vfprintf(stderr, fmt, args);
+       va_end(args);
+}
+
 void
 about_activate_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
@@ -2792,12 +2049,13 @@ about_activate_cb(GtkWidget *xwidget, signal_user_data_t *ud)
        gtk_widget_show (widget);
 }
 
-void
-guide_activate_cb(GtkWidget *xwidget, signal_user_data_t *ud)
+static void
+browse_url(const gchar *url)
 {
        gboolean result;
        char *argv[] = 
-               {"xdg-open","http://trac.handbrake.fr/wiki/HandBrakeGuide",NULL,NULL};
+               {"xdg-open",NULL,NULL,NULL};
+       argv[1] = (gchar*)url;
        result = g_spawn_async(NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL,
                                NULL, NULL, NULL);
        if (result) return;
@@ -2819,7 +2077,12 @@ guide_activate_cb(GtkWidget *xwidget, signal_user_data_t *ud)
        argv[2] = NULL;
        result = g_spawn_async(NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL,
                                NULL, NULL, NULL);
-       if (result) return;
+}
+
+void
+guide_activate_cb(GtkWidget *xwidget, signal_user_data_t *ud)
+{
+       browse_url("http://trac.handbrake.fr/wiki/HandBrakeGuide");
 }
 
 void
@@ -2829,28 +2092,41 @@ hb_about_response_cb(GtkWidget *widget, gint response, signal_user_data_t *ud)
 }
 
 void
-show_activity_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
+show_queue_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
-       GtkWidget *widget = GHB_WIDGET (ud->builder, "activity_window");
-       gtk_widget_show (widget);
+       GtkWidget *widget = GHB_WIDGET (ud->builder, "queue_window");
+       set_visible(widget, gtk_toggle_tool_button_get_active(
+                                               GTK_TOGGLE_TOOL_BUTTON(xwidget)));
 }
 
 void
-show_queue_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
+show_queue_menu_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
        GtkWidget *widget = GHB_WIDGET (ud->builder, "queue_window");
-       gtk_widget_show (widget);
+       set_visible(widget, TRUE);
+       widget = GHB_WIDGET (ud->builder, "show_queue");
+       gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(widget), TRUE);
+}
+
+gboolean
+queue_window_delete_cb(GtkWidget *xwidget, GdkEvent *event, signal_user_data_t *ud)
+{
+       set_visible(xwidget, FALSE);
+       GtkWidget *widget = GHB_WIDGET (ud->builder, "show_queue");
+       gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(widget), FALSE);
+       return TRUE;
 }
 
 void
-show_presets_toggled_cb(GtkToggleButton *button, signal_user_data_t *ud)
+show_presets_toggled_cb(GtkWidget *action, signal_user_data_t *ud)
 {
        GtkWidget *widget;
        GtkWindow *hb_window;
        
        g_debug("show_presets_clicked_cb ()");
        widget = GHB_WIDGET (ud->builder, "presets_frame");
-       if (gtk_toggle_button_get_active(button))
+       ghb_widget_to_setting(ud->settings, action);
+       if (ghb_settings_get_boolean(ud->settings, "show_presets"))
        {
                gtk_widget_show_now(widget);
        }
@@ -2860,30 +2136,9 @@ show_presets_toggled_cb(GtkToggleButton *button, signal_user_data_t *ud)
                hb_window = GTK_WINDOW(GHB_WIDGET (ud->builder, "hb_window"));
                gtk_window_resize(hb_window, 16, 16);
        }
-       ghb_widget_to_setting(ud->settings, GTK_WIDGET(button));
        ghb_pref_save(ud->settings, "show_presets");
 }
 
-void
-presets_frame_size_allocate_cb(GtkWidget *widget, GtkAllocation *allocation, signal_user_data_t *ud)
-{
-       GtkTreeView *treeview;
-       GtkTreeSelection *selection;
-       GtkTreeModel *store;
-       GtkTreeIter iter;
-       
-       treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "presets_list"));
-       selection = gtk_tree_view_get_selection(treeview);
-       if (gtk_tree_selection_get_selected(selection, &store, &iter))
-       {
-               GtkTreePath *path;
-               path = gtk_tree_model_get_path (store, &iter);
-               // Make the parent visible in scroll window if it is not.
-               gtk_tree_view_scroll_to_cell (treeview, path, NULL, FALSE, 0, 0);
-               gtk_tree_path_free(path);
-       }
-}
-
 static void
 update_chapter_list(signal_user_data_t *ud)
 {
@@ -2994,7 +2249,7 @@ chapter_edited_cb(
                -1);
        gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, 0, &index, -1);
 
-       GValue *chapters;
+       const GValue *chapters;
        GValue *chapter;
 
        chapters = ghb_settings_get_value(ud->settings, "chapter_list");
@@ -3051,49 +2306,6 @@ chapter_list_selection_changed_cb(GtkTreeSelection *selection, signal_user_data_
 }
 
 void
-preview_button_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
-{
-       gint titleindex;
-
-       titleindex = ghb_settings_combo_int(ud->settings, "title");
-       if (titleindex < 0) return;
-       g_debug("titleindex %d", titleindex);
-
-       GtkWidget *widget = GHB_WIDGET (ud->builder, "preview_window");
-       gtk_widget_show (widget);
-}
-
-void
-preview_frame_value_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
-{
-       set_preview_image(ud);
-}
-
-void
-preview_button_size_allocate_cb(GtkWidget *widget, GtkAllocation *allocation, signal_user_data_t *ud)
-{
-       g_debug("-------------------------------allocate %d x %d", allocation->width, allocation->height);
-       if (preview_button_width == allocation->width &&
-               preview_button_height == allocation->height)
-       {
-               // Nothing to do. Bug out.
-               g_debug("nothing to do");
-               return;
-       }
-       g_debug("-------------------------------prev allocate %d x %d", preview_button_width, preview_button_height);
-       preview_button_width = allocation->width;
-       preview_button_height = allocation->height;
-       set_preview_image(ud);
-}
-
-void
-presets_default_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
-{
-       ghb_set_preset_default(ud->settings);
-       ghb_presets_list_update(ud);
-}
-
-void
 debug_log_handler(const gchar *domain, GLogLevelFlags flags, const gchar *msg, gpointer data)
 {
        signal_user_data_t *ud = (signal_user_data_t*)data;
@@ -3104,19 +2316,6 @@ debug_log_handler(const gchar *domain, GLogLevelFlags flags, const gchar *msg, g
        }
 }
 
-static void
-set_visible(GtkWidget *widget, gboolean visible)
-{
-       if (visible)
-       {
-               gtk_widget_show_now(widget);
-       }
-       else
-       {
-               gtk_widget_hide(widget);
-       }
-}
-
 void
 ghb_hbfd(signal_user_data_t *ud, gboolean hbfd)
 {
@@ -3141,8 +2340,6 @@ ghb_hbfd(signal_user_data_t *ud, gboolean hbfd)
        set_visible(widget, !hbfd);
        widget = GHB_WIDGET(ud->builder, "presets_remove");
        set_visible(widget, !hbfd);
-       widget = GHB_WIDGET(ud->builder, "presets_default");
-       set_visible(widget, !hbfd);
        widget = GHB_WIDGET (ud->builder, "hb_window");
        gtk_window_resize(GTK_WINDOW(widget), 16, 16);
 
@@ -3163,7 +2360,7 @@ pref_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
        g_debug("pref_changed_cb");
        ghb_widget_to_setting (ud->settings, widget);
-       check_dependency(ud, widget);
+       ghb_check_dependency(ud, widget);
        const gchar *name = gtk_widget_get_name(widget);
        ghb_pref_save(ud->settings, name);
 }
@@ -3175,33 +2372,6 @@ tweaks_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
        ghb_widget_to_setting (ud->settings, widget);
        const gchar *name = gtk_widget_get_name(widget);
        ghb_pref_save(ud->settings, name);
-
-       gboolean tweaks = ghb_settings_get_boolean(ud->settings, "allow_tweaks");
-       widget = GHB_WIDGET(ud->builder, "deinterlace");
-       tweaks ? gtk_widget_hide(widget) : gtk_widget_show(widget);
-       widget = GHB_WIDGET(ud->builder, "tweak_deinterlace");
-       !tweaks ? gtk_widget_hide(widget) : gtk_widget_show(widget);
-
-       widget = GHB_WIDGET(ud->builder, "denoise");
-       tweaks ? gtk_widget_hide(widget) : gtk_widget_show(widget);
-       widget = GHB_WIDGET(ud->builder, "tweak_denoise");
-       !tweaks ? gtk_widget_hide(widget) : gtk_widget_show(widget);
-       if (tweaks)
-       {
-               const GValue *value;
-               value = ghb_settings_get_value(ud->settings, "deinterlace");
-               ghb_ui_update(ud, "tweak_deinterlace", value);
-               value = ghb_settings_get_value(ud->settings, "denoise");
-               ghb_ui_update(ud, "tweak_denoise", value);
-       }
-       else
-       {
-               const GValue *value;
-               value = ghb_settings_get_value(ud->settings, "tweak_deinterlace");
-               ghb_ui_update(ud, "deinterlace", value);
-               value = ghb_settings_get_value(ud->settings, "tweak_denoise");
-               ghb_ui_update(ud, "denoise", value);
-       }
 }
 
 void
@@ -3292,8 +2462,6 @@ dvd_device_list()
        return dvd_devices;
 }
 
-
-static DBusConnection *dbus_connection = NULL;
 static LibHalContext *hal_ctx;
 
 gboolean
@@ -3315,9 +2483,10 @@ void
 drive_changed_cb(GVolumeMonitor *gvm, GDrive *gd, signal_user_data_t *ud)
 {
        gchar *device;
-       gint state = ghb_get_state();
+       gint state = ghb_get_scan_state();
        static gboolean first_time = TRUE;
 
+       if (state != GHB_STATE_IDLE) return;
        if (ud->current_dvd_device == NULL) return;
        // A drive change event happens when the program initially starts
        // and I don't want to automatically scan at that time.
@@ -3326,7 +2495,6 @@ drive_changed_cb(GVolumeMonitor *gvm, GDrive *gd, signal_user_data_t *ud)
                first_time = FALSE;
                return;
        }
-       if (state != GHB_STATE_IDLE) return;
        device = g_drive_get_identifier(gd, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE);
        
        // DVD insertion detected.  Scan it.
@@ -3340,61 +2508,166 @@ drive_changed_cb(GVolumeMonitor *gvm, GDrive *gd, signal_user_data_t *ud)
                        gtk_progress_bar_set_fraction (progress, 0);
                        update_source_label(ud, device);
                        ghb_hb_cleanup(TRUE);
-                       ghb_backend_scan(device, 0);
+                       prune_logs(ud);
+                       gint preview_count;
+                       preview_count = ghb_settings_get_int(ud->settings, "preview_count");
+                       ghb_backend_scan(device, 0, preview_count);
                }
                else
                {
                        ghb_hb_cleanup(TRUE);
-                       ghb_backend_scan("/dev/null", 0);
+                       prune_logs(ud);
+                       ghb_backend_scan("/dev/null", 0, 1);
                }
        }
        g_free(device);
 }
 
 
-static gboolean
+static void
 dbus_init (void)
 {
-       DBusError error;
+       dbus_g_thread_init();
+}
 
-       if (dbus_connection != NULL)
-               return TRUE;
+#define GPM_DBUS_SERVICE                       "org.freedesktop.PowerManagement"
+#define GPM_DBUS_INHIBIT_PATH          "/org/freedesktop/PowerManagement/Inhibit"
+#define GPM_DBUS_INHIBIT_INTERFACE     "org.freedesktop.PowerManagement.Inhibit" 
+static gboolean gpm_inhibited = FALSE;
+static guint gpm_cookie = -1;
 
-       dbus_error_init (&error);
-       if (!(dbus_connection = dbus_bus_get (DBUS_BUS_SYSTEM, &error))) {
-               g_debug ("could not get system bus: %s", error.message);
-               dbus_error_free (&error);
-               return FALSE;
+void
+ghb_inhibit_gpm()
+{
+       DBusGConnection *conn;
+       DBusGProxy      *proxy;
+       GError *error = NULL;
+       gboolean res;
+       
+
+       if (gpm_inhibited)
+       {
+               // Already inhibited
+               return;
+       }
+       g_debug("ghb_inhibit_gpm()");
+       conn = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
+       if (error != NULL)
+       {
+               g_debug("DBUS cannot connect: %s", error->message);
+               g_error_free(error);
+               return;
+       }
+       proxy = dbus_g_proxy_new_for_name(conn, GPM_DBUS_SERVICE,
+                                                       GPM_DBUS_INHIBIT_PATH, GPM_DBUS_INHIBIT_INTERFACE);
+       if (proxy == NULL)
+       {
+               g_debug("Could not get DBUS proxy: %s", GPM_DBUS_SERVICE);
+               dbus_g_connection_unref(conn);
+               return;
+       }
+       res = dbus_g_proxy_call(proxy, "Inhibit", &error,
+                                                       G_TYPE_STRING, "ghb",
+                                                       G_TYPE_STRING, "Encoding",
+                                                       G_TYPE_INVALID,
+                                                       G_TYPE_UINT, &gpm_cookie,
+                                                       G_TYPE_INVALID);
+       if (!res)
+       {
+               g_warning("Inhibit method failed");
+               gpm_cookie = -1;
+       }
+       if (error != NULL)
+       {
+               g_warning("Inhibit problem: %s", error->message);
+               g_error_free(error);
+               gpm_cookie = -1;
        }
+       gpm_inhibited = TRUE;
+       g_object_unref(G_OBJECT(proxy));
+       dbus_g_connection_unref(conn);
+}
 
-       //dbus_connection_setup_with_g_main (dbus_connection, NULL);
-       //dbus_connection_set_exit_on_disconnect (dbus_connection, FALSE);
-       //dbus_connection_add_filter (dbus_connection, gvm_dbus_filter_function, NULL, NULL);
+void
+ghb_uninhibit_gpm()
+{
+       DBusGConnection *conn;
+       DBusGProxy      *proxy;
+       GError *error = NULL;
+       gboolean res;
+       
+       g_debug("ghb_uninhibit_gpm() gpm_cookie %u", gpm_cookie);
 
-       return TRUE;
+       if (!gpm_inhibited)
+       {
+               // Not inhibited
+               return;
+       }
+       conn = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
+       if (error != NULL)
+       {
+               g_debug("DBUS cannot connect: %s", error->message);
+               g_error_free(error);
+               return;
+       }
+       proxy = dbus_g_proxy_new_for_name(conn, GPM_DBUS_SERVICE,
+                                                       GPM_DBUS_INHIBIT_PATH, GPM_DBUS_INHIBIT_INTERFACE);
+       if (proxy == NULL)
+       {
+               g_debug("Could not get DBUS proxy: %s", GPM_DBUS_SERVICE);
+               dbus_g_connection_unref(conn);
+               return;
+       }
+       res = dbus_g_proxy_call(proxy, "UnInhibit", &error,
+                                                       G_TYPE_UINT, gpm_cookie,
+                                                       G_TYPE_INVALID,
+                                                       G_TYPE_INVALID);
+       if (!res)
+       {
+               g_warning("UnInhibit method failed");
+       }
+       if (error != NULL)
+       {
+               g_warning("UnInhibit problem: %s", error->message);
+               g_error_free(error);
+       }
+       gpm_inhibited = FALSE;
+       dbus_g_connection_unref(conn);
+       g_object_unref(G_OBJECT(proxy));
 }
 
 void
 ghb_hal_init()
 {
+       DBusGConnection *gconn;
+       DBusConnection *conn;
+       GError *gerror = NULL;
        DBusError error;
        char **devices;
        int nr;
 
-       if (!dbus_init ())
-               return;
+       dbus_init ();
 
        if (!(hal_ctx = libhal_ctx_new ())) {
                g_warning ("failed to create a HAL context!");
                return;
        }
 
-       libhal_ctx_set_dbus_connection (hal_ctx, dbus_connection);
+       gconn = dbus_g_bus_get(DBUS_BUS_SYSTEM, &gerror);
+       if (gerror != NULL)
+       {
+               g_warning("DBUS cannot connect: %s", gerror->message);
+               g_error_free(gerror);
+               return;
+       }
+       conn = dbus_g_connection_get_connection(gconn);
+       libhal_ctx_set_dbus_connection (hal_ctx, conn);
        dbus_error_init (&error);
        if (!libhal_ctx_init (hal_ctx, &error)) {
                g_warning ("libhal_ctx_init failed: %s", error.message ? error.message : "unknown");
                dbus_error_free (&error);
                libhal_ctx_free (hal_ctx);
+               dbus_g_connection_unref(gconn);
                return;
        }
 
@@ -3410,12 +2683,12 @@ ghb_hal_init()
 
                libhal_ctx_shutdown (hal_ctx, NULL);
                libhal_ctx_free (hal_ctx);
+               dbus_g_connection_unref(gconn);
                return;
        }
 
        libhal_free_string_array (devices);
-
-       //gvm_hal_claim_branch ("/org/freedesktop/Hal/devices/local");
+       dbus_g_connection_unref(gconn);
 }
 
 gboolean 
@@ -3518,3 +2791,226 @@ format_deblock_cb(GtkScale *scale, gdouble val, signal_user_data_t *ud)
                return g_strdup_printf("%d", (gint)val);
        }
 }
+
+gchar*
+format_vquality_cb(GtkScale *scale, gdouble val, signal_user_data_t *ud)
+{
+       if (ghb_settings_get_boolean(ud->settings, "directqp"))
+       {
+               gint vcodec = ghb_settings_combo_int(ud->settings, "VideoEncoder");
+               // Only x264 and ffmpeg currently support direct qp/crf entry
+               if (vcodec != HB_VCODEC_X264 && vcodec != HB_VCODEC_FFMPEG)
+               {
+                       val *= 100;
+                       return g_strdup_printf("%.1f", val);
+               }
+               return g_strdup_printf("%d", (gint)val);
+       }
+       else
+       {
+               val *= 100;
+               return g_strdup_printf("%.1f", val);
+       }
+}
+
+static void
+html_link_cb(GtkHTML *html, const gchar *url, signal_user_data_t *ud)
+{
+       browse_url(url);
+}
+
+static gpointer check_stable_update(signal_user_data_t *ud);
+static gboolean stable_update_lock = FALSE;
+
+static void
+process_appcast(signal_user_data_t *ud)
+{
+       gchar *description = NULL, *build = NULL, *version = NULL, *msg;
+       GtkWidget *html, *window, *dialog, *label;
+       gint    response, ibuild = 0, skip;
+
+       if (ud->appcast == NULL || ud->appcast_len < 15 || 
+               strncmp(&(ud->appcast[9]), "200 OK", 6))
+       {
+               if (!stable_update_lock && HB_BUILD % 100)
+                       g_idle_add((GSourceFunc)check_stable_update, ud);
+               goto done;
+       }
+       ghb_appcast_parse(ud->appcast, &description, &build, &version);
+       if (build)
+               ibuild = g_strtod(build, NULL);
+       skip = ghb_settings_get_int(ud->settings, "update_skip_version");
+       if (description == NULL || build == NULL || version == NULL 
+               || ibuild <= HB_BUILD || skip == ibuild)
+       {
+               if (!stable_update_lock && HB_BUILD % 100)
+                       g_thread_create((GThreadFunc)check_stable_update, ud, FALSE, NULL);
+               goto done;
+       }
+       msg = g_strdup_printf("HandBrake %s/%s is now available (you have %s/%d).",
+                       version, build, HB_VERSION, HB_BUILD);
+       label = GHB_WIDGET(ud->builder, "update_message");
+       gtk_label_set_text(GTK_LABEL(label), msg);
+       html = gtk_html_new_from_string(description, -1);
+       g_signal_connect(html, "link_clicked", G_CALLBACK(html_link_cb), ud);
+       window = GHB_WIDGET(ud->builder, "update_scroll");
+       gtk_container_add(GTK_CONTAINER(window), html);
+       // Show it
+       dialog = GHB_WIDGET(ud->builder, "update_dialog");
+       gtk_widget_set_size_request(html, 420, 240);
+       gtk_widget_show(html);
+       response = gtk_dialog_run(GTK_DIALOG(dialog));
+       gtk_widget_hide(dialog);
+       gtk_widget_destroy(html);
+       if (response == GTK_RESPONSE_OK)
+       {
+               // Skip
+               ghb_settings_set_int(ud->settings, "update_skip_version", ibuild);
+               ghb_pref_save(ud->settings, "update_skip_version");
+       }
+       g_free(msg);
+
+done:
+       if (description) g_free(description);
+       if (build) g_free(build);
+       if (version) g_free(version);
+       g_free(ud->appcast);
+       ud->appcast_len = 0;
+       ud->appcast = NULL;
+}
+
+void
+ghb_net_close(GIOChannel *ioc)
+{
+       gint fd;
+
+       g_debug("ghb_net_close");
+       if (ioc == NULL) return;
+       fd = g_io_channel_unix_get_fd(ioc);
+       close(fd);
+       g_io_channel_unref(ioc);
+}
+
+gboolean
+ghb_net_recv_cb(GIOChannel *ioc, GIOCondition cond, gpointer data)
+{
+       gchar buf[2048];
+       gsize len;
+       GError *gerror = NULL;
+       GIOStatus status;
+       
+       g_debug("ghb_net_recv_cb");
+       signal_user_data_t *ud = (signal_user_data_t*)data;
+
+       status = g_io_channel_read_chars (ioc, buf, 2048, &len, &gerror);
+       if ((status == G_IO_STATUS_NORMAL || status == G_IO_STATUS_EOF) &&
+               len > 0)
+       {
+               gint new_len = ud->appcast_len + len;
+               ud->appcast = g_realloc(ud->appcast, new_len + 1);
+               memcpy(&(ud->appcast[ud->appcast_len]), buf, len);
+               ud->appcast_len = new_len;
+       }
+       if (status == G_IO_STATUS_EOF)
+       {
+               ud->appcast[ud->appcast_len] = 0;
+               ghb_net_close(ioc);
+               process_appcast(ud);
+               return FALSE;
+       }
+       return TRUE;
+}
+
+GIOChannel*
+ghb_net_open(signal_user_data_t *ud, gchar *address, gint port)
+{
+       GIOChannel *ioc;
+       gint fd;
+
+       struct sockaddr_in   sock;
+       struct hostent     * host;
+
+       g_debug("ghb_net_open");
+       if( !( host = gethostbyname( address ) ) )
+       {
+               g_warning( "gethostbyname failed (%s)", address );
+               return NULL;
+       }
+
+       memset( &sock, 0, sizeof( struct sockaddr_in ) );
+       sock.sin_family = host->h_addrtype;
+       sock.sin_port   = htons( port );
+       memcpy( &sock.sin_addr, host->h_addr, host->h_length );
+
+       fd = socket(host->h_addrtype, SOCK_STREAM, 0);
+       if( fd < 0 )
+       {
+               g_debug( "socket failed" );
+               return NULL;
+       }
+
+       if(connect(fd, (struct sockaddr*)&sock, sizeof(struct sockaddr_in )) < 0 )
+       {
+               g_debug( "connect failed" );
+               return NULL;
+       }
+       ioc = g_io_channel_unix_new(fd);
+       g_io_channel_set_encoding (ioc, NULL, NULL);
+       g_io_channel_set_flags(ioc, G_IO_FLAG_NONBLOCK, NULL);
+       g_io_add_watch (ioc, G_IO_IN, ghb_net_recv_cb, (gpointer)ud );
+
+       return ioc;
+}
+
+gpointer
+ghb_check_update(signal_user_data_t *ud)
+{
+       gchar *query;
+       gsize len;
+       GIOChannel *ioc;
+       GError *gerror = NULL;
+
+       g_debug("ghb_check_update");
+       if (HB_BUILD % 100)
+       {
+       query = 
+               "GET /appcast_unstable.xml HTTP/1.0\r\nHost: handbrake.fr\r\n\r\n";
+       }
+       else
+       {
+               stable_update_lock = TRUE;
+       query = "GET /appcast.xml HTTP/1.0\r\nHost: handbrake.fr\r\n\r\n";
+       }
+       ioc = ghb_net_open(ud, "handbrake.fr", 80);
+       if (ioc == NULL)
+               return NULL;
+
+       g_io_channel_write_chars(ioc, query, strlen(query), &len, &gerror);
+       g_io_channel_flush(ioc, &gerror);
+       // This function is initiated by g_idle_add.  Must return false
+       // so that it is not called again
+       return NULL;
+}
+
+static gpointer
+check_stable_update(signal_user_data_t *ud)
+{
+       gchar *query;
+       gsize len;
+       GIOChannel *ioc;
+       GError *gerror = NULL;
+
+       g_debug("check_stable_update");
+       stable_update_lock = TRUE;
+       query = "GET /appcast.xml HTTP/1.0\r\nHost: handbrake.fr\r\n\r\n";
+       ioc = ghb_net_open(ud, "handbrake.fr", 80);
+       if (ioc == NULL)
+               return NULL;
+
+       g_io_channel_write_chars(ioc, query, strlen(query), &len, &gerror);
+       g_io_channel_flush(ioc, &gerror);
+       // This function is initiated by g_idle_add.  Must return false
+       // so that it is not called again
+       return NULL;
+}
+