OSDN Git Service

LinGui: first cut at anamorphic picture settings enhancements
[handbrake-jp/handbrake-jp-git.git] / gtk / src / callbacks.c
index 9a68e47..61b6bf8 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 <libnotify/notify.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 gboolean cancel_encode();
-static void audio_list_refresh_selected(signal_user_data_t *ud);
-static GHashTable* get_selected_asettings(signal_user_data_t *ud);
+static void prune_logs(signal_user_data_t *ud);
+void ghb_notify_done(signal_user_data_t *ud);
 
 // This is a dependency map used for greying widgets
 // that are dependent on the state of another widget.
@@ -42,171 +57,159 @@ static GHashTable* get_selected_asettings(signal_user_data_t *ud);
 // obtained from ghb_widget_value().  For combo boxes
 // you will have to look further to combo box options
 // maps in hb-backend.c
-typedef struct
-{
-       const gchar *widget_name;
-       const gchar *dep_name;
-       const gchar *enable_value;
-       const gboolean disable_if_equal;
-} dependency_t;
-
-static dependency_t dep_map[] =
-{
-       {"title", "queue_add", "none", TRUE},
-       {"title", "queue_add_menu", "none", TRUE},
-       {"title", "preview_button", "none", TRUE},
-       {"title", "show_preview_menu", "none", TRUE},
-       {"title", "preview_frame", "none", TRUE},
-       {"title", "picture_label", "none", TRUE},
-       {"title", "picture_tab", "none", TRUE},
-       {"title", "chapters_label", "none", TRUE},
-       {"title", "chapters_tab", "none", TRUE},
-       {"title", "title", "none", TRUE},
-       {"title", "start_chapter", "none", TRUE},
-       {"title", "end_chapter", "none", TRUE},
-       {"vquality_type_bitrate", "video_bitrate", "enable", FALSE},
-       {"vquality_type_target", "video_target_size", "enable", FALSE},
-       {"vquality_type_constant", "video_quality", "enable", FALSE},
-       {"vquality_type_constant", "constant_rate_factor", "enable", FALSE},
-       {"vquality_type_constant", "two_pass", "enable", TRUE},
-       {"vquality_type_constant", "turbo", "enable", TRUE},
-       {"two_pass", "turbo", "enable", FALSE},
-       {"container", "large_mp4", "mp4|m4v", FALSE},
-       {"container", "http_optimize_mp4", "mp4|m4v", FALSE},
-       {"container", "ipod_file", "mp4|m4v", FALSE},
-       {"container", "variable_frame_rate", "avi", TRUE},
-       {"variable_frame_rate", "framerate", "enable", TRUE},
-       {"variable_frame_rate", "detelecine", "enable", TRUE},
-       {"decomb", "deinterlace", "enable", TRUE},
-       {"decomb", "tweak_deinterlace", "enable", TRUE},
-       {"autocrop", "crop_top", "disable", FALSE},
-       {"autocrop", "crop_bottom", "disable", FALSE},
-       {"autocrop", "crop_left", "disable", FALSE},
-       {"autocrop", "crop_right", "disable", FALSE},
-       {"autoscale", "scale_width", "disable", FALSE},
-       {"autoscale", "scale_height", "disable", FALSE},
-       {"anamorphic", "keep_aspect", "disable", FALSE},
-       {"anamorphic", "scale_height", "disable", FALSE},
-       {"keep_aspect", "scale_height", "disable", FALSE},
-       {"video_codec", "x264_tab", "x264", FALSE},
-       {"video_codec", "x264_tab_label", "x264", FALSE},
-       {"video_codec", "ipod_file", "x264", FALSE},
-       {"audio_codec", "audio_bitrate", "ac3", TRUE},
-       {"audio_codec", "audio_rate", "ac3", TRUE},
-       {"audio_codec", "audio_mix", "ac3", TRUE},
-       {"audio_codec", "audio_drc", "ac3", TRUE},
-       {"x264_bframes", "x264_weighted_bframes", "0", TRUE},
-       {"x264_bframes", "x264_brdo", "0", TRUE},
-       {"x264_bframes", "x264_bime", "0", TRUE},
-       {"x264_bframes", "x264_bpyramid", "<2", TRUE},
-       {"x264_bframes", "x264_direct", "0", TRUE},
-       {"x264_refs", "x264_mixed_refs", "<2", TRUE},
-       {"x264_cabac", "x264_trellis", "enable", FALSE},
-       {"x264_subme", "x264_brdo", "<6", TRUE},
-       {"x264_analyse", "x264_direct", "none", TRUE},
-       {"x264_me", "x264_merange", "umh|esa", FALSE},
-       {"chapter_markers", "chapters_list", "enable", FALSE},
-};
+
+GValue *dep_map;
+GValue *rev_map;
+
+void
+ghb_init_dep_map()
+{
+       dep_map = ghb_resource_get("widget-deps");
+       rev_map = ghb_resource_get("widget-reverse-deps");
+}
 
 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;
-       int ii;
-       int count = sizeof(dep_map) / sizeof(dependency_t);
+       gint ii;
+       gint count;
        gboolean result = TRUE;
+       GValue *array, *data;
+       gchar *widget_name;
        
-       g_debug("dep_check () %s\n", name);
+       g_debug("dep_check () %s", name);
+
+       if (rev_map == NULL) return TRUE;
+       array = ghb_dict_lookup(rev_map, name);
+       count = ghb_array_len(array);
+       *out_hide = FALSE;
        for (ii = 0; ii < count; ii++)
        {
-               if (strcmp(dep_map[ii].dep_name, name) == 0)
+               data = ghb_array_get_nth(array, ii);
+               widget_name = ghb_value_string(ghb_array_get_nth(data, 0));
+               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)
                {
-                       widget = GHB_WIDGET(ud->builder, dep_map[ii].widget_name);
-                       dep_object = gtk_builder_get_object(ud->builder, dep_map[ii].dep_name);
-                       if (dep_object == NULL)
-                       {
-                               g_message("Failed to find widget\n");
-                       }
+                       g_message("Failed to find widget");
+               }
+               else
+               {
+                       gchar *value;
+                       gint jj = 0;
+                       gchar **values;
+                       gboolean sensitive = FALSE;
+                       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);
+
+                       if (widget)
+                               value = ghb_widget_string(widget);
                        else
+                               value = ghb_settings_get_string(ud->settings, name);
+                       while (values && values[jj])
                        {
-                               gchar *value;
-                               gint jj = 0;
-                               gchar **values = g_strsplit(dep_map[ii].enable_value, "|", 10);
-                               gboolean sensitive = FALSE;
-
-                               if (widget)
-                                       value = ghb_widget_short_opt(widget);
-                               else
-                                       value = g_strdup( ghb_settings_get_short_opt(
-                                               ud->settings, dep_map[ii].widget_name));
-                               while (values && values[jj])
+                               if (values[jj][0] == '>')
                                {
-                                       if (values[jj][0] == '>')
+                                       gdouble dbl = g_strtod (&values[jj][1], NULL);
+                                       gdouble dvalue = ghb_widget_double(widget);
+                                       if (dvalue > dbl)
                                        {
-                                               gdouble dbl = g_strtod (&values[jj][1], NULL);
-                                               gdouble dvalue = ghb_widget_dbl (widget);
-                                               if (dvalue > dbl)
-                                               {
-                                                       sensitive = TRUE;
-                                                       break;
-                                               }
-                                       }
-                                       else if (values[jj][0] == '<')
-                                       {
-                                               gdouble dbl = g_strtod (&values[jj][1], NULL);
-                                               gdouble dvalue = ghb_widget_dbl (widget);
-                                               if (dvalue < dbl)
-                                               {
-                                                       sensitive = TRUE;
-                                                       break;
-                                               }
+                                               sensitive = TRUE;
+                                               break;
                                        }
-                                       if (strcmp(values[jj], value) == 0)
+                               }
+                               else if (values[jj][0] == '<')
+                               {
+                                       gdouble dbl = g_strtod (&values[jj][1], NULL);
+                                       gdouble dvalue = ghb_widget_double(widget);
+                                       if (dvalue < dbl)
                                        {
                                                sensitive = TRUE;
                                                break;
                                        }
-                                       jj++;
                                }
-                               sensitive = dep_map[ii].disable_if_equal ^ sensitive;
-                               if (!sensitive) result = FALSE;
-                               g_strfreev (values);
-                               g_free(value);
+                               if (strcmp(values[jj], value) == 0)
+                               {
+                                       sensitive = TRUE;
+                                       break;
+                               }
+                               jj++;
+                       }
+                       sensitive = die ^ sensitive;
+                       if (!sensitive)
+                       {
+                               result = FALSE;
+                               *out_hide |= hide;
                        }
+                       g_strfreev (values);
+                       g_free(value);
                }
        }
        return result;
 }
 
-static void
-check_depencency(signal_user_data_t *ud, GtkWidget *widget)
+void
+ghb_check_dependency(signal_user_data_t *ud, GtkWidget *widget)
 {
        GObject *dep_object;
        const gchar *name;
-       int ii;
-       int count = sizeof(dep_map) / sizeof(dependency_t);
+       GValue *array, *data;
+       gint count, ii;
+       gchar *dep_name;
+       GType type;
+
+       type = GTK_WIDGET_TYPE(widget);
+       if (type == GTK_TYPE_COMBO_BOX || type == GTK_TYPE_COMBO_BOX_ENTRY)
+               if (gtk_combo_box_get_active(GTK_COMBO_BOX(widget)) < 0) return;
 
-       if (ghb_widget_index(widget) < 0) return;
        name = gtk_widget_get_name(widget);
-       g_debug("check_depencency () %s\n", name);
+       g_debug("ghb_check_dependency () %s", name);
+
+       if (dep_map == NULL) return;
+       array = ghb_dict_lookup(dep_map, name);
+       count = ghb_array_len(array);
        for (ii = 0; ii < count; ii++)
        {
-               if (strcmp(dep_map[ii].widget_name, name) == 0)
-               {
-                       gboolean sensitive;
+               gboolean sensitive;
+               gboolean hide;
 
-                       dep_object = gtk_builder_get_object (ud->builder, dep_map[ii].dep_name);
-                       if (dep_object == NULL)
+               data = ghb_array_get_nth(array, ii);
+               dep_name = ghb_value_string(data);
+               dep_object = gtk_builder_get_object(ud->builder, dep_name);
+               if (dep_object == NULL)
+               {
+                       g_message("Failed to find dependent widget %s", dep_name);
+                       g_free(dep_name);
+                       continue;
+               }
+               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)
                        {
-                               g_message("Failed to find dependent widget %s\n", dep_map[ii].dep_name);
-                               continue;
+                               gtk_widget_hide(GTK_WIDGET(dep_object));
                        }
-                       sensitive = dep_check(ud, dep_map[ii].dep_name);
-                       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);
+                       {
+                               gtk_widget_show_now(GTK_WIDGET(dep_object));
+                       }
                }
        }
 }
@@ -214,114 +217,119 @@ check_depencency(signal_user_data_t *ud, GtkWidget *widget)
 void
 ghb_check_all_depencencies(signal_user_data_t *ud)
 {
+       GHashTableIter iter;
+       gchar *dep_name;
+       GValue *value;
        GObject *dep_object;
-       int ii;
-       int count = sizeof(dep_map) / sizeof(dependency_t);
 
-       g_debug("ghb_check_all_depencencies ()\n");
-       for (ii = 0; ii < count; ii++)
+       g_debug("ghb_check_all_depencencies ()");
+       if (rev_map == NULL) return;
+       ghb_dict_iter_init(&iter, rev_map);
+       // middle (void*) cast prevents gcc warning "defreferencing type-punned
+       // pointer will break strict-aliasing rules"
+       while (g_hash_table_iter_next(
+                       &iter, (gpointer*)(void*)&dep_name, (gpointer*)(void*)&value))
        {
                gboolean sensitive;
-               dep_object = gtk_builder_get_object (ud->builder, dep_map[ii].dep_name);
+               gboolean hide;
+
+               dep_object = gtk_builder_get_object (ud->builder, dep_name);
                if (dep_object == NULL)
                {
-                       g_message("Failed to find dependent widget %s\n", dep_map[ii].dep_name);
+                       g_message("Failed to find dependent widget %s", dep_name);
                        continue;
                }
-               sensitive = dep_check(ud, dep_map[ii].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()\n");
-       treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "presets_list"));
-       selection = gtk_tree_view_get_selection (treeview);
-       gtk_tree_selection_unselect_all (selection);
-}
-
-static gchar*
-expand_tilde(const gchar *path)
-{
-       const gchar *user_home;
-       gchar *home;
-       const gchar *suffix;
-       gchar *expanded_path = NULL;
-       
-       g_debug("expand_tilde ()\n");
-       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
 on_quit1_activate(GtkMenuItem *quit, signal_user_data_t *ud)
 {
-       gint state = ghb_get_state();
-       g_debug("on_quit1_activate ()\n");
-    if (state & GHB_STATE_WORKING)
-    {
-        if (cancel_encode("Closing HandBrake will terminate encoding.\n"))
-        {
+       gint state = ghb_get_queue_state();
+       g_debug("on_quit1_activate ()");
+       if (state & GHB_STATE_WORKING)
+       {
+               if (ghb_cancel_encode("Closing HandBrake will terminate encoding.\n"))
+               {
                        ghb_hb_cleanup(FALSE);
-               gtk_main_quit();
-            return;
-        }
-        return;
-    }
+                       prune_logs(ud);
+                       gtk_main_quit();
+                       return;
+               }
+               return;
+       }
        ghb_hb_cleanup(FALSE);
+       prune_logs(ud);
        gtk_main_quit();
 }
 
 static void
 set_destination(signal_user_data_t *ud)
 {
-       if (ghb_settings_get_bool(ud->settings, "use_source_name"))
+       g_debug("set_destination");
+       if (ghb_settings_get_boolean(ud->settings, "use_source_name"))
        {
-               const gchar *vol_name, *filename, *extension;
-               gchar *dir, *new_name;
+               GString *str = g_string_new("");
+               gchar *vol_name, *filename, *extension;
+               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");
-               g_debug("volume_label (%s)\n", vol_name);
-               if (vol_name == NULL)
+               g_string_append_printf(str, "%s", vol_name);
+               title = ghb_settings_combo_int(ud->settings, "title");
+               if (title >= 0)
                {
-                       vol_name = "new_video";
+                       if (ghb_settings_get_boolean(
+                                       ud->settings, "title_no_in_destination"))
+                       {
+
+                               title = ghb_settings_combo_int(ud->settings, "title");
+                               g_string_append_printf(str, " - %d", title+1);
+                       }
+                       if (ghb_settings_get_boolean(
+                                       ud->settings, "chapters_in_destination"))
+                       {
+                               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);
+                       }
                }
-               new_name = g_strdup_printf("%s/%s.%s", dir, vol_name, extension);
-               ghb_ui_update(ud, "destination", new_name);
-               g_free(dir);
+               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(new_name);
        }
 }
@@ -382,6 +390,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)
 {
@@ -413,11 +443,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
                {
@@ -446,18 +472,18 @@ update_source_label(signal_user_data_t *ud, const gchar *source)
        return TRUE;
 }
 
-static GtkWidget *dvd_device_combo = NULL;
-
 void
-chooser_file_selected_cb(GtkFileChooser *dialog, GtkComboBox *combo)
+chooser_file_selected_cb(GtkFileChooser *dialog, signal_user_data_t *ud)
 {
        const gchar *name = gtk_file_chooser_get_filename (dialog);
        GtkTreeModel *store;
        GtkTreeIter iter;
        const gchar *device;
        gboolean foundit = FALSE;
+       GtkComboBox *combo;
        
        if (name == NULL) return;
+       combo = GTK_COMBO_BOX(GHB_WIDGET(ud->builder, "source_device"));
        store = gtk_combo_box_get_model(combo);
        if (gtk_tree_model_get_iter_first(store, &iter))
        {
@@ -478,116 +504,131 @@ chooser_file_selected_cb(GtkFileChooser *dialog, GtkComboBox *combo)
 }
 
 void
-dvd_device_changed_cb(GtkComboBox *combo, GtkWidget *dialog)
+dvd_device_changed_cb(GtkComboBox *combo, signal_user_data_t *ud)
 {
-       gint ii = gtk_combo_box_get_active (combo);
-       if (ii != 0)
+       GtkWidget *dialog;
+       gint ii;
+
+       ii = gtk_combo_box_get_active (combo);
+       if (ii > 0)
        {
-               const gchar *device = gtk_combo_box_get_active_text (combo);
-               const gchar *name = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER(dialog));
+               const gchar *device, *name;
+
+               dialog = GHB_WIDGET(ud->builder, "source_dialog");
+               device = gtk_combo_box_get_active_text (combo);
+               name = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER(dialog));
                if (name == NULL || strcmp(name, device) != 0)
                        gtk_file_chooser_select_filename (GTK_FILE_CHOOSER(dialog), device);
        }
 }
 
-
 void
-source_type_changed_cb(GtkToggleButton *toggle, GtkFileChooser *chooser)
+source_type_changed_cb(GtkToggleButton *toggle, signal_user_data_t *ud)
 {
-       gchar *filename;
+       gchar *folder;
+       GtkFileChooser *chooser;
+       GtkWidget *dvd_device_combo;
        
-       g_debug("source_type_changed_cb ()\n");
+       g_debug("source_type_changed_cb ()");
+       chooser = GTK_FILE_CHOOSER(GHB_WIDGET(ud->builder, "source_dialog"));
+       dvd_device_combo = GHB_WIDGET(ud->builder, "source_device");
+       folder = gtk_file_chooser_get_current_folder (chooser);
        if (gtk_toggle_button_get_active (toggle))
        {
-               filename = gtk_file_chooser_get_filename (chooser);
-               gtk_file_chooser_set_action (chooser, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
-               if (filename != NULL)
-               {
-                       gtk_file_chooser_set_filename(chooser, filename);
-                       g_free(filename);
-               }
+               gtk_file_chooser_set_action (chooser, 
+                                                                       GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
                gtk_widget_set_sensitive (dvd_device_combo, FALSE);
                gtk_combo_box_set_active (GTK_COMBO_BOX(dvd_device_combo), 0);
        }
        else
        {
-               filename = gtk_file_chooser_get_filename (chooser);
                gtk_file_chooser_set_action (chooser, GTK_FILE_CHOOSER_ACTION_OPEN);
-               if (filename != NULL)
-               {
-                       gtk_file_chooser_set_filename(chooser, filename);
-                       g_free(filename);
-               }
                gtk_widget_set_sensitive (dvd_device_combo, TRUE);
        }
+       if (folder != NULL)
+       {
+               gtk_file_chooser_set_current_folder(chooser, folder);
+               g_free(folder);
+       }
 }
 
-static GtkWidget*
-source_dialog_extra_widgets(GtkWidget *dialog, gboolean checkbutton_active)
+static void
+source_dialog_extra_widgets(
+       signal_user_data_t *ud,
+       GtkWidget *dialog, 
+       gboolean checkbutton_active)
 {
-       GtkBox *vbox;
-       GtkWidget *checkbutton;
-       
-       vbox = GTK_BOX(gtk_vbox_new (FALSE, 2));
-       checkbutton = gtk_check_button_new_with_label ("Open VIDEO_TS folder");
-       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(checkbutton), checkbutton_active);
-       gtk_box_pack_start (vbox, checkbutton, FALSE, FALSE, 1);
-       gtk_widget_show(checkbutton);
-
-       GtkWidget *combo;
-       GtkBox *hbox;
+       GtkToggleButton *checkbutton;
+       GtkComboBox *combo;
        GList *drives, *link;
-       GtkWidget *label, *blank;
+       
+       checkbutton = GTK_TOGGLE_BUTTON(
+               GHB_WIDGET(ud->builder, "source_folder_flag"));
+       gtk_toggle_button_set_active(checkbutton, checkbutton_active);
+       combo = GTK_COMBO_BOX(GHB_WIDGET(ud->builder, "source_device"));
+       gtk_list_store_clear(GTK_LIST_STORE(
+                                               gtk_combo_box_get_model(combo)));
 
-       hbox = GTK_BOX(gtk_hbox_new (FALSE, 2));
-       combo = gtk_combo_box_new_text();
-       label = gtk_label_new("Detected DVD devices:");
-       blank = gtk_label_new("");
        link = drives = dvd_device_list();
-       gtk_combo_box_append_text (GTK_COMBO_BOX(combo), "Not Selected");
+       gtk_combo_box_append_text (combo, "Not Selected");
        while (link != NULL)
        {
                gchar *name = (gchar*)link->data;
-               gtk_combo_box_append_text (GTK_COMBO_BOX(combo), name);
+               gtk_combo_box_append_text(combo, name);
                g_free(name);
                link = link->next;
        }
        g_list_free(drives);
-       gtk_combo_box_set_active (GTK_COMBO_BOX(combo), 0);
-       gtk_box_pack_start (vbox, GTK_WIDGET(hbox), FALSE, FALSE, 1);
-       gtk_widget_show(GTK_WIDGET(hbox));
-       gtk_box_pack_start (hbox, label, FALSE, FALSE, 1);
-       gtk_widget_show(label);
-       gtk_box_pack_start (hbox, combo, FALSE, FALSE, 2);
-       gtk_widget_show(combo);
-       gtk_box_pack_start (hbox, blank, TRUE, TRUE, 1);
-       gtk_widget_show(blank);
-       // Ugly hackish global alert
-       dvd_device_combo = combo;
-       g_signal_connect(combo, "changed", (GCallback)dvd_device_changed_cb, dialog);
-       g_signal_connect(dialog, "selection-changed", (GCallback)chooser_file_selected_cb, combo);
-
-       g_signal_connect(checkbutton, "toggled", (GCallback)source_type_changed_cb, dialog);
-       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, 
+       gint titlenum, 
+       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))
                {
                        GtkProgressBar *progress;
                        progress = GTK_PROGRESS_BAR(GHB_WIDGET(ud->builder, "progressbar"));
-                       const gchar *path;
+                       gchar *path;
                        path = ghb_settings_get_string( ud->settings, "source");
                        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, titlenum, preview_count);
+                       g_free(path);
                }
                else
                {
@@ -596,17 +637,30 @@ do_scan(signal_user_data_t *ud, const gchar *filename)
        }
 }
 
-void
-source_button_clicked_cb(GtkButton *button, signal_user_data_t *ud)
+static gboolean 
+update_source_name(gpointer data)
 {
+       signal_user_data_t *ud = (signal_user_data_t*)data;
        GtkWidget *dialog;
-       GtkWidget *widget;
-       const gchar *sourcename;
+       gchar *sourcename;
+
+       sourcename = ghb_settings_get_string(ud->settings, "source");
+       dialog = GHB_WIDGET(ud->builder, "source_dialog");
+       gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog), sourcename);
+       g_free(sourcename);
+       return FALSE;
+}
+
+static void
+do_source_dialog(GtkButton *button, gboolean single, signal_user_data_t *ud)
+{
+       GtkWidget *dialog;
+       gchar *sourcename;
        gint    response;
        GtkFileChooserAction action;
        gboolean checkbutton_active;
 
-       g_debug("source_browse_clicked_cb ()\n");
+       g_debug("source_browse_clicked_cb ()");
        sourcename = ghb_settings_get_string(ud->settings, "source");
        checkbutton_active = FALSE;
        if (g_file_test(sourcename, G_FILE_TEST_IS_DIR))
@@ -618,15 +672,20 @@ source_button_clicked_cb(GtkButton *button, signal_user_data_t *ud)
        {
                action = GTK_FILE_CHOOSER_ACTION_OPEN;
        }
-       dialog = gtk_file_chooser_dialog_new ("Select Source",
-                                                               NULL,
-                                                               action,
-                                                               GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                                               GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
-                                                               NULL);
-       widget = source_dialog_extra_widgets(dialog, checkbutton_active);
-       gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER(dialog), widget);
-       gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog), sourcename);
+       GtkWidget *widget;
+       widget = GHB_WIDGET(ud->builder, "single_title_box");
+       if (single)
+               gtk_widget_show(widget);
+       else
+               gtk_widget_hide(widget);
+       dialog = GHB_WIDGET(ud->builder, "source_dialog");
+       source_dialog_extra_widgets(ud, dialog, checkbutton_active);
+       gtk_file_chooser_set_action(GTK_FILE_CHOOSER(dialog), action);
+       // Updating the filename in the file chooser dialog doesn't seem
+       // to work unless the dialog is running for some reason.
+       // So handle it in an "idle" event.
+       //gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog), sourcename);
+       g_idle_add((GSourceFunc)update_source_name, ud);
        response = gtk_dialog_run(GTK_DIALOG (dialog));
        gtk_widget_hide(dialog);
        if (response == GTK_RESPONSE_ACCEPT)
@@ -636,34 +695,54 @@ 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);
+                       gint titlenum;
+
+                       if (single)
+                               titlenum = ghb_settings_get_int(ud->settings, "single_title");
+                       else
+                               titlenum = 0;
+                       ghb_do_scan(ud, filename, titlenum, TRUE);
                        if (strcmp(sourcename, filename) != 0)
                        {
-                               ghb_settings_set_string (ud->settings, "default_source", filename);
+                               ghb_settings_set_string (ud->settings, 
+                                                                               "default_source", filename);
                                ghb_pref_save (ud->settings, "default_source");
                                ghb_dvd_set_current (filename, ud);
                        }
                        g_free(filename);
                }
        }
-       gtk_widget_destroy(dialog);
+       g_free(sourcename);
+}
+
+void
+source_button_clicked_cb(GtkButton *button, signal_user_data_t *ud)
+{
+       do_source_dialog(button, FALSE, ud);
+}
+
+void
+single_title_source_cb(GtkButton *button, signal_user_data_t *ud)
+{
+       do_source_dialog(button, TRUE, ud);
 }
 
 void
 dvd_source_activate_cb(GtkAction *action, signal_user_data_t *ud)
 {
        const gchar *filename;
-       const gchar *sourcename;
+       gchar *sourcename;
 
        sourcename = ghb_settings_get_string(ud->settings, "source");
        filename = gtk_action_get_name(action);
-       do_scan(ud, filename);
+       ghb_do_scan(ud, filename, 0, TRUE);
        if (strcmp(sourcename, filename) != 0)
        {
                ghb_settings_set_string (ud->settings, "default_source", filename);
                ghb_pref_save (ud->settings, "default_source");
                ghb_dvd_set_current (filename, ud);
        }
+       g_free(sourcename);
 }
 
 static void
@@ -671,13 +750,13 @@ update_destination_extension(signal_user_data_t *ud)
 {
        static gchar *containers[] = {".mkv", ".mp4", ".m4v", ".avi", ".ogm", NULL};
        gchar *filename;
-       const gchar *extension;
+       gchar *extension;
        gint ii;
        GtkEntry *entry;
 
-       g_debug("update_destination_extension ()\n");
-       extension = ghb_settings_get_string(ud->settings, "container");
-       entry = GTK_ENTRY(GHB_WIDGET(ud->builder, "destination"));
+       g_debug("update_destination_extension ()");
+       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++)
        {
@@ -699,31 +778,89 @@ update_destination_extension(signal_user_data_t *ud)
                                break;
                        }
                        new_name = g_strjoin(".", filename, extension, NULL); 
-                       ghb_ui_update(ud, "destination", new_name);
+                       ghb_ui_update(ud, "dest_file", ghb_string_value(new_name));
                        g_free(new_name);
                        break;
                }
        }
+       g_free(extension);
        g_free(filename);
 }
 
+static void
+destination_select_title(GtkEntry *entry)
+{
+       const gchar *dest;
+       gint start, end;
+
+       dest = gtk_entry_get_text(entry);
+       for (end = strlen(dest)-1; end > 0; end--)
+       {
+               if (dest[end] == '.')
+               {
+                       break;
+               }
+       }
+       for (start = end; start >= 0; start--)
+       {
+               if (dest[start] == '/')
+               {
+                       start++;
+                       break;
+               }
+       }
+       if (start < 0) start = 0;
+       if (start < end)
+       {
+               gtk_editable_select_region(GTK_EDITABLE(entry), start, end);
+       }
+}
+
+gboolean
+destination_grab_cb(
+       GtkEntry *entry, 
+       signal_user_data_t *ud)
+{
+       destination_select_title(entry);
+       return FALSE;
+}
+
 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 ()\n");
-       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;
 }
 
@@ -732,35 +869,36 @@ destination_browse_clicked_cb(GtkButton *button, signal_user_data_t *ud)
 {
        GtkWidget *dialog;
        GtkEntry *entry;
-       const char *destname;
+       gchar *destname;
        gchar *basename;
 
-       g_debug("destination_browse_clicked_cb ()\n");
+       g_debug("destination_browse_clicked_cb ()");
        destname = ghb_settings_get_string(ud->settings, "destination");
        dialog = gtk_file_chooser_dialog_new ("Choose Destination",
-                      NULL,
-                      GTK_FILE_CHOOSER_ACTION_SAVE,
-                      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                      GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
-                      NULL);
+                                         NULL,
+                                         GTK_FILE_CHOOSER_ACTION_SAVE,
+                                         GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                                         GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
+                                         NULL);
        gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog), destname);
        basename = g_path_get_basename(destname);
+       g_free(destname);
        gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog), basename);
        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\n", "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);
@@ -769,30 +907,33 @@ destination_browse_clicked_cb(GtkButton *button, signal_user_data_t *ud)
 gboolean
 window_destroy_event_cb(GtkWidget *widget, GdkEvent *event, signal_user_data_t *ud)
 {
-       g_debug("window_destroy_event_cb ()\n");
+       g_debug("window_destroy_event_cb ()");
        ghb_hb_cleanup(FALSE);
+       prune_logs(ud);
        gtk_main_quit();
-    return FALSE;
+       return FALSE;
 }
 
 gboolean
 window_delete_event_cb(GtkWidget *widget, GdkEvent *event, signal_user_data_t *ud)
 {
-       gint state = ghb_get_state();
-       g_debug("window_delete_event_cb ()\n");
-    if (state & GHB_STATE_WORKING)
-    {
-        if (cancel_encode("Closing HandBrake will terminate encoding.\n"))
-        {
+       gint state = ghb_get_queue_state();
+       g_debug("window_delete_event_cb ()");
+       if (state & GHB_STATE_WORKING)
+       {
+               if (ghb_cancel_encode("Closing HandBrake will terminate encoding.\n"))
+               {
                        ghb_hb_cleanup(FALSE);
-               gtk_main_quit();
-            return FALSE;
-        }
-        return TRUE;
-    }
+                       prune_logs(ud);
+                       gtk_main_quit();
+                       return FALSE;
+               }
+               return TRUE;
+       }
        ghb_hb_cleanup(FALSE);
+       prune_logs(ud);
        gtk_main_quit();
-    return FALSE;
+       return FALSE;
 }
 
 static void
@@ -804,21 +945,26 @@ update_acodec_combo(signal_user_data_t *ud)
 void
 container_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-       g_debug("container_changed_cb ()\n");
+       const GValue *audio_list;
+       g_debug("container_changed_cb ()");
        ghb_widget_to_setting(ud->settings, widget);
        update_destination_extension(ud);
-       check_depencency(ud, widget);
+       ghb_check_dependency(ud, widget);
        update_acodec_combo(ud);
-       clear_presets_selection(ud);
-       if (ghb_ac3_in_audio_list (ud->audio_settings))
+       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))
        {
-               const gchar *container;
+               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", "m4v");
+                       ghb_ui_update(ud, "FileFormat", ghb_string_value("m4v"));
                }
+               g_free(container);
        }
 }
 
@@ -869,6 +1015,8 @@ show_title_info(signal_user_data_t *ud, ghb_title_info_t *tinfo)
        widget = GHB_WIDGET (ud->builder, "source_dimensions");
        text = g_strdup_printf ("%d x %d", tinfo->width, tinfo->height);
        gtk_label_set_text (GTK_LABEL(widget), text);
+       ghb_settings_set_int(ud->settings, "source_width", tinfo->width);
+       ghb_settings_set_int(ud->settings, "source_height", tinfo->height);
        g_free(text);
        widget = GHB_WIDGET (ud->builder, "source_aspect");
        text = get_aspect_string(tinfo->aspect_n, tinfo->aspect_d);
@@ -880,498 +1028,234 @@ show_title_info(signal_user_data_t *ud, ghb_title_info_t *tinfo)
        gtk_label_set_text (GTK_LABEL(widget), text);
        g_free(text);
 
-       ghb_ui_update_int (ud, "scale_width", tinfo->width - tinfo->crop[2] - tinfo->crop[3]);
+       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 = ghb_settings_get_bool(ud->settings, "keep_aspect");
-       gboolean anamorphic = ghb_settings_get_bool(ud->settings, "anamorphic");
-       if (!(keep_aspect || anamorphic))
-               ghb_ui_update_int (ud, "scale_height", tinfo->height - tinfo->crop[0] - tinfo->crop[1]);
+       gboolean keep_aspect;
+       gint pic_par;
+       keep_aspect = ghb_settings_get_boolean(ud->settings, "PictureKeepRatio");
+       pic_par = ghb_settings_combo_int(ud->settings, "PicturePAR");
+       if (!(keep_aspect || pic_par) || pic_par == 3)
+       {
+               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");
+       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_bool (ud->settings, "autocrop"))
+       if (ghb_settings_get_boolean(ud->settings, "PictureAutoCrop"))
        {
-               ghb_ui_update_int (ud, "crop_top", tinfo->crop[0]);
-               ghb_ui_update_int (ud, "crop_bottom", tinfo->crop[1]);
-               ghb_ui_update_int (ud, "crop_left", tinfo->crop[2]);
-               ghb_ui_update_int (ud, "crop_right", 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]));
        }
-       g_debug("setting max end chapter %d\n", tinfo->num_chapters);
+       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)
+static gboolean update_preview = FALSE;
+
+void
+title_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-       gint titleindex, audioindex, acodec;
-       ghb_audio_info_t ainfo;
-       GtkWidget *widget;
+       ghb_title_info_t tinfo;
+       gint titleindex;
        
-       g_debug("adjust_audio_rate_combos ()\n");
-       titleindex = ghb_settings_get_index(ud->settings, "title");
-
-       widget = GHB_WIDGET(ud->builder, "audio_track");
-       audioindex = ghb_widget_int(widget);
+       g_debug("title_changed_cb ()");
+       ghb_widget_to_setting(ud->settings, widget);
+       ghb_check_dependency(ud, widget);
 
-       widget = GHB_WIDGET(ud->builder, "audio_codec");
-       acodec = ghb_widget_int(widget);
+       titleindex = ghb_settings_combo_int(ud->settings, "title");
+       ghb_update_ui_combo_box (ud->builder, "AudioTrack", titleindex, FALSE);
+       ghb_update_ui_combo_box (ud->builder, "Subtitles", titleindex, FALSE);
 
-       if (ghb_get_audio_info (&ainfo, titleindex, audioindex) && ghb_audio_is_passthru (acodec))
+       ghb_update_from_preset(ud, "Subtitles");
+       if (ghb_get_title_info (&tinfo, titleindex))
        {
-               // Set the values for bitrate and samplerate to the input rates
-               ghb_set_passthru_rate_opts (ud->builder, ainfo.bitrate);
-               ghb_ui_update_int (ud, "audio_bitrate", ainfo.bitrate);
-               ghb_ui_update_int (ud, "audio_rate", 0);
-               ghb_ui_update_int (ud, "audio_mix", 0);
+               show_title_info(ud, &tinfo);
        }
-       else
+       update_chapter_list (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, "VideoAvgBitrate", ghb_int64_value(bitrate));
+       }
+
+       // Unfortunately, there is no way to query how many frames were
+       // actually generated during the scan.
+       // If I knew how many were generated, I would adjust the spin
+       // control range here.
+       // 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_range_set_range (GTK_RANGE(widget), 1, preview_count);
+       ghb_ui_update(ud, "preview_frame", ghb_int64_value(2));
+
+       ghb_set_preview_image (ud);
+       if (ghb_settings_get_boolean(ud->settings, "title_no_in_destination"))
        {
-               ghb_set_default_rate_opts (ud->builder);
+               set_destination(ud);
        }
 }
 
-static void
-set_pref_audio(gint titleindex, signal_user_data_t *ud)
+void
+setting_widget_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-       gint acodec, track, ivalue;
-       const gchar *svalue;
-       GtkWidget *button;
-       ghb_audio_info_t ainfo;
-       gchar* drcstr;
-       gint index;
-       GHashTable *track_indicies;
-       gint *iptr;
-       
-       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");
-       svalue = ghb_settings_get_short_opt(ud->settings, "source_audio_lang");
-       gint acount = ghb_pref_acount();
-       gint ii;
-       gint list_count = 0;
-       for (ii = 0; ii < acount; ii++)
-       {
-               acodec = ghb_pref_acodec(ii);
-               iptr = g_hash_table_lookup(track_indicies, &acodec);
-               if (iptr == NULL)
-                       index = 0;
-               else
-                       index = *(gint*)iptr;
-
-               track = ghb_find_audio_track(titleindex, svalue, 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))
-               {
-                       if (!ghb_audio_is_passthru(ainfo.codec))
-                       {
-                               acodec = ghb_get_default_acodec();
-                               if ((ii + 1 < acount) || (list_count != 0))
-                               {
-                                       // Skip this audio
-                                       acodec = 0;
-                               }
-                       }
-               }
-               if (titleindex >= 0 && track < 0)
-                       acodec = 0;
-               if (acodec != 0)
-               {
-                       // Add to audio list
-                       g_signal_emit_by_name(button, "clicked", ud);
-                       list_count++;
-                       ghb_ui_update_int(ud, "audio_track", track);
-                       ghb_ui_update_int(ud, "audio_codec", acodec);
-                       if (!ghb_audio_is_passthru (acodec))
-                       {
-                               // This gets set autimatically if the codec is passthru
-                               ivalue = ghb_pref_bitrate(ii);
-                               ghb_ui_update_int(ud, "audio_bitrate", ivalue);
-                               ivalue = ghb_pref_rate(ii);
-                               ghb_ui_update_int(ud, "audio_rate", ivalue);
-                               ivalue = ghb_pref_mix(ii);
-                               ivalue = ghb_get_best_mix(titleindex, track, acodec, ivalue);
-                               ghb_ui_update_int(ud, "audio_mix", ivalue);
-                       }
-                       drcstr = g_strdup_printf("%.2g", ghb_pref_drc(ii));
-                       ghb_ui_update(ud, "audio_drc", drcstr);
-                       g_free(drcstr);
-                       index++;
-                       g_hash_table_insert(track_indicies, &acodec, &index);
-               }
-       }
-       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 ()\n");
-       gint titleindex = ghb_settings_get_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\n", 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;
-       const gchar *preset;
-       
-       g_debug("title_changed_cb ()\n");
        ghb_widget_to_setting(ud->settings, widget);
-       check_depencency(ud, widget);
-
-       titleindex = ghb_settings_get_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);
-       preset = ghb_settings_get_string (ud->settings, "preset");
-       ghb_update_from_preset(ud, preset, "subtitle_lang");
-       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);
-       if (ghb_settings_get_bool (ud->settings, "vquality_type_target"))
-       {
-               gint bitrate = ghb_calculate_target_bitrate (ud->settings, titleindex);
-               ghb_ui_update_int (ud, "video_bitrate", bitrate);
-       }
-
-       // Unfortunately, there is no way to query how many frames were
-       // actually generated during the scan.  It attempts to make 10.
-       // If I knew how many were generated, I would adjust the spin
-       // control range here.
-       ghb_ui_update_int (ud, "preview_frame", 1);
-
-       set_preview_image (ud);
-}
-
-void
-audio_codec_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
-{
-       static gint prev_acodec = 0;
-       gint acodec, ivalue;
-       GHashTable *asettings;
-       
-       g_debug("audio_codec_changed_cb ()\n");
-       
-       acodec = ghb_widget_int(widget);
-       if (ghb_audio_is_passthru (prev_acodec) && !ghb_audio_is_passthru (acodec))
-       {
-               // Transition from passthru to not, put some audio settings back to 
-               // pref settings
-               gint titleindex = ghb_settings_get_int(ud->settings, "title");
-               gint track = ghb_settings_get_int(ud->settings, "audio_track");
-
-               ivalue = ghb_pref_bitrate(0);
-               ghb_ui_update_int (ud, "audio_bitrate", ivalue);
-               ivalue = ghb_pref_rate(0);
-               ghb_ui_update_int (ud, "audio_rate", ivalue);
-               ivalue = ghb_pref_mix(0);
-               ivalue = ghb_get_best_mix(titleindex, track, acodec, ivalue);
-               ghb_ui_update_int (ud, "audio_mix", ivalue);
-       }
-       adjust_audio_rate_combos(ud);
-       ghb_grey_combo_options (ud->builder);
-       check_depencency(ud, widget);
-       prev_acodec = acodec;
-       asettings = get_selected_asettings(ud);
-       if (asettings != NULL)
-       {
-               ghb_widget_to_setting(asettings, widget);
-               audio_list_refresh_selected(ud);
-       }
-       if (ghb_ac3_in_audio_list (ud->audio_settings))
-       {
-               const gchar *container;
-
-               container = ghb_settings_get_string(ud->settings, "container");
-               if (strcmp(container, "mp4") == 0)
-               {
-                       ghb_ui_update(ud, "container", "m4v");
-               }
-       }
+       ghb_check_dependency(ud, widget);
+       ghb_clear_presets_selection(ud);
+       ghb_live_reset(ud);
 }
 
-static void audio_list_refresh_selected(signal_user_data_t *ud);
-static GHashTable* get_selected_asettings(signal_user_data_t *ud);
-
 void
-audio_track_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
+vquality_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-       GHashTable *asettings;
+       ghb_widget_to_setting(ud->settings, widget);
+       ghb_check_dependency(ud, widget);
+       ghb_clear_presets_selection(ud);
+       ghb_live_reset(ud);
 
-       g_debug("audio_track_changed_cb ()\n");
-       adjust_audio_rate_combos(ud);
-       check_depencency(ud, widget);
-       ghb_grey_combo_options(ud->builder);
-       asettings = get_selected_asettings(ud);
-       if (asettings != NULL)
+       gint vcodec = ghb_settings_combo_int(ud->settings, "VideoEncoder");
+       gdouble step;
+       if (vcodec == HB_VCODEC_X264)
        {
-               ghb_widget_to_setting(asettings, widget);
-               audio_list_refresh_selected(ud);
+               step = ghb_settings_combo_double(ud->settings, 
+                                                                                       "VideoQualityGranularity");
        }
-}
-
-void
-audio_widget_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
-{
-       GHashTable *asettings;
-
-       g_debug("audio_widget_changed_cb ()\n");
-       check_depencency(ud, widget);
-       asettings = get_selected_asettings(ud);
-       if (asettings != NULL)
+       else
        {
-               ghb_widget_to_setting(asettings, widget);
-               audio_list_refresh_selected(ud);
-       }
-}
-
-void
-generic_widget_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
-{
-       g_debug("generic_widget_changed_cb ()\n");
-       check_depencency(ud, widget);
-}
-
-void
-setting_widget_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
-{
-       ghb_widget_to_setting(ud->settings, widget);
-       check_depencency(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 (ghb_widget_index(GTK_WIDGET(combo)) < 0)
-       { // Validate user input
-               const 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);
-               }
+               step = 1;
        }
-}
-
-gboolean
-deint_tweak_focus_out_cb(GtkWidget *widget, GdkEventFocus *event, 
-    signal_user_data_t *ud)
-{
-       g_debug("deint_tweak_focus_out_cb ()\n");
-       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 ()\n");
-       validate_filter_widget(ud, "tweak_noise");
-       return FALSE;
+       gdouble val = gtk_range_get_value(GTK_RANGE(widget));
+       val = ((int)((val + step / 2) / step)) * step;
+       gtk_range_set_value(GTK_RANGE(widget), val);
 }
 
 void
 http_opt_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
        ghb_widget_to_setting(ud->settings, widget);
-       check_depencency(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;
+       gboolean inverted;
+       gint digits;
 
        ghb_widget_to_setting(ud->settings, widget);
-       check_depencency(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, &inverted);
+       GtkWidget *qp = GHB_WIDGET(ud->builder, "VideoQualitySlider");
        gtk_range_set_range (GTK_RANGE(qp), vqmin, vqmax);
-}
-
-void
-vfr_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
-{
-       //const gchar *name = gtk_widget_get_name(widget);
-       //g_debug("setting_widget_changed_cb () %s\n", name);
-       ghb_widget_to_setting(ud->settings, widget);
-       check_depencency(ud, widget);
-       clear_presets_selection(ud);
-       if (ghb_settings_get_bool(ud->settings, "variable_frame_rate"))
-       {
-               ghb_ui_update_int(ud, "framerate", 0);
-       }
-}
-
-void
-mirror_cb(GtkWidget *widget, signal_user_data_t *ud)
-{
-       const gchar *name = gtk_widget_get_name(widget);
-       if (name == NULL) return;
-       
-       g_debug("mirror_cb () %s\n", name);
-       gchar *mirror = g_strdup(name);
-       gchar *pos = g_strrstr(mirror, "_mirror");
-       if (pos == NULL) return;
-       *pos = 0;
-       gchar *value = ghb_widget_short_opt (widget);
-       ghb_ui_update (ud, mirror, value);
-       g_free(mirror);
-}
-
-// 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\n", name);
-       ghb_widget_to_setting(ud->settings, widget);
-       check_depencency(ud, widget);
+       gtk_range_set_increments (GTK_RANGE(qp), step, page);
+       gtk_scale_set_digits(GTK_SCALE(qp), digits);
+       gtk_range_set_inverted (GTK_RANGE(qp), inverted);
 }
 
 void
 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\n", name);
+       g_debug("target_size_changed_cb () %s", name);
        ghb_widget_to_setting(ud->settings, widget);
-       check_depencency(ud, widget);
-       clear_presets_selection(ud);
-       if (ghb_settings_get_bool (ud->settings, "vquality_type_target"))
+       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 = ghb_settings_get_int(ud->settings, "title");
+               gint titleindex;
+               titleindex = ghb_settings_combo_int(ud->settings, "title");
                gint bitrate = ghb_calculate_target_bitrate (ud->settings, titleindex);
-               ghb_ui_update_int (ud, "video_bitrate", bitrate);
+               ghb_ui_update(ud, "VideoAvgBitrate", ghb_int64_value(bitrate));
        }
 }
 
 void
 start_chapter_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
+       gint start, end;
        const gchar *name = gtk_widget_get_name(widget);
-       g_debug("start_chapter_changed_cb () %s\n", name);
+
+       g_debug("start_chapter_changed_cb () %s", name);
        ghb_widget_to_setting(ud->settings, widget);
-       GtkWidget *end_ch = GHB_WIDGET (ud->builder, "end_chapter");
-       gdouble start, end;
-       gtk_spin_button_get_range (GTK_SPIN_BUTTON(end_ch), &start, &end);
        start = ghb_settings_get_int(ud->settings, "start_chapter");
-       gtk_spin_button_set_range (GTK_SPIN_BUTTON(end_ch), start, end);
-       check_depencency(ud, widget);
+       end = ghb_settings_get_int(ud->settings, "end_chapter");
+       if (start > end)
+               ghb_ui_update(ud, "end_chapter", ghb_int_value(start));
+       ghb_check_dependency(ud, widget);
+       if (ghb_settings_get_boolean(ud->settings, "chapters_in_destination"))
+       {
+               set_destination(ud);
+       }
 }
 
 void
 end_chapter_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
+       gint start, end;
        const gchar *name = gtk_widget_get_name(widget);
-       g_debug("end_chapter_changed_cb () %s\n", name);
+
+       g_debug("end_chapter_changed_cb () %s", name);
        ghb_widget_to_setting(ud->settings, widget);
-       GtkWidget *start_ch = GHB_WIDGET (ud->builder, "start_chapter");
-       gdouble start, end;
-       gtk_spin_button_get_range (GTK_SPIN_BUTTON(start_ch), &start, &end);
+       start = ghb_settings_get_int(ud->settings, "start_chapter");
        end = ghb_settings_get_int(ud->settings, "end_chapter");
-       gtk_spin_button_set_range (GTK_SPIN_BUTTON(start_ch), start, end);
-       check_depencency(ud, widget);
+       if (start > end)
+               ghb_ui_update(ud, "start_chapter", ghb_int_value(end));
+       ghb_check_dependency(ud, widget);
+       if (ghb_settings_get_boolean(ud->settings, "chapters_in_destination"))
+       {
+               set_destination(ud);
+       }
 }
 
 void
 scale_width_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-       g_debug("scale_width_changed_cb ()\n");
+       g_debug("scale_width_changed_cb ()");
        ghb_widget_to_setting(ud->settings, widget);
-       check_depencency(ud, widget);
+       ghb_check_dependency(ud, widget);
        ghb_set_scale (ud, GHB_SCALE_KEEP_WIDTH);
        update_preview = TRUE;
        gchar *text;
@@ -1381,14 +1265,15 @@ 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
 scale_height_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-       g_debug("scale_height_changed_cb ()\n");
+       g_debug("scale_height_changed_cb ()");
        ghb_widget_to_setting(ud->settings, widget);
-       check_depencency(ud, widget);
+       ghb_check_dependency(ud, widget);
        ghb_set_scale (ud, GHB_SCALE_KEEP_HEIGHT);
        update_preview = TRUE;
        gchar *text;
@@ -1398,6 +1283,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
@@ -1406,16 +1292,16 @@ crop_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
        gint titleindex, crop[4];
        ghb_title_info_t tinfo;
        
-       g_debug("crop_changed_cb ()\n");
+       g_debug("crop_changed_cb ()");
        ghb_widget_to_setting(ud->settings, widget);
-       check_depencency(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");
-       titleindex = ghb_settings_get_index(ud->settings, "title");
+       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))
        {
                gint width, height;
@@ -1434,27 +1320,46 @@ 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
 scale_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-       g_debug("scale_changed_cb ()\n");
+       g_debug("scale_changed_cb ()");
        ghb_widget_to_setting(ud->settings, widget);
-       check_depencency(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_bool(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_bool(ud->settings, "autoscale") ? "On" : "Off";
+       text = ghb_settings_get_boolean(ud->settings, "autoscale") ? "On" : "Off";
        widget = GHB_WIDGET (ud->builder, "scale_auto");
        gtk_label_set_text (GTK_LABEL(widget), text);
-       text = ghb_settings_get_bool(ud->settings, "anamorphic") ? "On" : "Off";
+       switch (ghb_settings_combo_int(ud->settings, "PicturePAR"))
+       {
+               case 0:
+                       text = "Off";
+                       break;
+               case 1:
+                       text = "Strict";
+                       break;
+               case 2:
+                       text = "Loose";
+                       break;
+               case 3:
+                       text = "Custom";
+                       break;
+               default:
+                       text = "Unknown";
+                       break;
+       }
        widget = GHB_WIDGET (ud->builder, "scale_anamorphic");
        gtk_label_set_text (GTK_LABEL(widget), text);
 }
@@ -1469,1119 +1374,49 @@ generic_entry_changed_cb(GtkEntry *entry, signal_user_data_t *ud)
        // The changed signal is sent ... so here we are.
        // I don't want to process upon every keystroke, so I prevent processing
        // while the widget has focus.
-       g_debug("generic_entry_changed_cb ()\n");
+       g_debug("generic_entry_changed_cb ()");
        if (!GTK_WIDGET_HAS_FOCUS((GtkWidget*)entry))
        {
                ghb_widget_to_setting(ud->settings, (GtkWidget*)entry);
        }
 }
 
-gboolean
-generic_focus_out_cb(GtkWidget *widget, GdkEventFocus *event, 
-    signal_user_data_t *ud)
-{
-       g_debug("generic_focus_out_cb ()\n");
-       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_depencency(ud, widget);
-       clear_presets_selection(ud);
-}
-
-void
-x264_entry_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
-{
-       g_debug("x264_entry_changed_cb ()\n");
-       if (!ignore_options_update)
-       {
-               GtkWidget *textview;
-               textview = GTK_WIDGET(GHB_WIDGET(ud->builder, "x264_options"));
-               ghb_widget_to_setting(ud->settings, textview);
-               gchar *options;
-               options = (gchar*)ghb_settings_get_string(ud->settings, "x264_options");
-               ignore_options_update = TRUE;
-               ghb_x264_parse_options(ud, options);
-               if (!GTK_WIDGET_HAS_FOCUS(textview))
-               {
-                       options = ghb_sanitize_x264opts(ud, options);
-                       ghb_ui_update(ud, "x264_options", options);
-                       ghb_x264_parse_options(ud, options);
-                       g_free(options);
-               }
-               ignore_options_update = FALSE;
-       }
-}
-
-gboolean
-x264_focus_out_cb(GtkWidget *widget, GdkEventFocus *event, 
-    signal_user_data_t *ud)
-{
-       ghb_widget_to_setting(ud->settings, widget);
-       gchar *options;
-       options = (gchar*)ghb_settings_get_string(ud->settings, "x264_options");
-       options = ghb_sanitize_x264opts(ud, options);
-       ignore_options_update = TRUE;
-       if (options != NULL)
-       {
-               ghb_ui_update(ud, "x264_options", options);
-               ghb_x264_parse_options(ud, options);
-               g_free(options);
-       }
-       ignore_options_update = FALSE;
-       return FALSE;
-}
-
-static void
-clear_audio_list(signal_user_data_t *ud)
-{
-       GtkTreeView *treeview;
-       GtkListStore *store;
-       GSList *link;
-       
-       g_debug("clear_audio_list ()\n");
-       while (ud->audio_settings != NULL)
-       {
-               link = ud->audio_settings;
-               ud->audio_settings = g_slist_remove_link(ud->audio_settings, link);
-               g_hash_table_destroy((GHashTable*)link->data);
-               g_slist_free_1(link);
-       }
-       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, GHashTable *settings)
-{
-       GtkTreeView *treeview;
-       GtkTreeIter iter;
-       GtkListStore *store;
-       GtkTreeSelection *selection;
-       
-       g_debug("add_to_audio_list ()\n");
-       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));
-
-       gtk_list_store_append(store, &iter);
-       gtk_list_store_set(store, &iter, 
-               // These are displayed in list
-               0, ghb_settings_get_option(settings, "audio_track"),
-               1, ghb_settings_get_option(settings, "audio_codec"),
-               2, ghb_settings_get_option(settings, "audio_bitrate"),
-               3, ghb_settings_get_option(settings, "audio_rate"),
-               4, ghb_settings_get_option(settings, "audio_mix"),
-               // These are used to set combo box values when a list item is selected
-               5, ghb_settings_get_string(settings, "audio_drc"),
-               6, ghb_settings_get_short_opt(settings, "audio_track"),
-               7, ghb_settings_get_short_opt(settings, "audio_codec"),
-               8, ghb_settings_get_short_opt(settings, "audio_bitrate"),
-               9, ghb_settings_get_short_opt(settings, "audio_rate"),
-               10, ghb_settings_get_short_opt(settings, "audio_mix"),
-               -1);
-       gtk_tree_selection_select_iter(selection, &iter);
-}
-
-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;
-       GSList *link;
-       GHashTable *asettings = NULL;
-       
-       g_debug("get_selected_asettings ()\n");
-       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);
-               g_free(treepath);
-               row = indices[0];
-               // find audio settings
-               if (row < 0) return;
-               link = g_slist_nth(ud->audio_settings, row);
-               if (link == NULL) return;
-               asettings = (GHashTable*)link->data;
-               gtk_list_store_set(GTK_LIST_STORE(store), &iter, 
-                       // These are displayed in list
-                       0, ghb_settings_get_option(asettings, "audio_track"),
-                       1, ghb_settings_get_option(asettings, "audio_codec"),
-                       2, ghb_settings_get_option(asettings, "audio_bitrate"),
-                       3, ghb_settings_get_option(asettings, "audio_rate"),
-                       4, ghb_settings_get_option(asettings, "audio_mix"),
-                       // These are used to set combo box values when a list item is selected
-                       5, ghb_settings_get_string(asettings, "audio_drc"),
-                       6, ghb_settings_get_short_opt(asettings, "audio_track"),
-                       7, ghb_settings_get_short_opt(asettings, "audio_codec"),
-                       8, ghb_settings_get_short_opt(asettings, "audio_bitrate"),
-                       9, ghb_settings_get_short_opt(asettings, "audio_rate"),
-                       10, ghb_settings_get_short_opt(asettings, "audio_mix"),
-                       -1);
-       }
-}
-
-static GHashTable*
-get_selected_asettings(signal_user_data_t *ud)
-{
-       GtkTreeView *treeview;
-       GtkTreePath *treepath;
-       GtkTreeSelection *selection;
-       GtkTreeModel *store;
-       GtkTreeIter iter;
-       gint *indices;
-       gint row;
-       GSList *link;
-       GHashTable *asettings = NULL;
-       
-       g_debug("get_selected_asettings ()\n");
-       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);
-               g_free(treepath);
-               row = indices[0];
-               // find audio settings
-               if (row < 0) return NULL;
-               link = g_slist_nth(ud->audio_settings, row);
-               if (link == NULL) return NULL;
-               asettings = (GHashTable*)link->data;
-       }
-       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 ()\n");
-       if (gtk_tree_selection_get_selected(selection, &store, &iter))
-       {
-               const gchar *track, *codec, *bitrate, *sample_rate, *mix, *drc;
-               gtk_tree_model_get(store, &iter,
-                                                  6, &track,
-                                                  7, &codec,
-                                                  8, &bitrate,
-                                                  9, &sample_rate,
-                                                  10, &mix,
-                                                  5, &drc,
-                                                  -1);
-               ghb_ui_update(ud, "audio_track", track);
-               ghb_ui_update(ud, "audio_codec", codec);
-               ghb_ui_update(ud, "audio_bitrate", bitrate);
-               ghb_ui_update(ud, "audio_rate", sample_rate);
-               ghb_ui_update(ud, "audio_mix", mix);
-               ghb_ui_update(ud, "audio_drc", 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.
-       GHashTable *asettings;
-       GtkWidget *widget;
-       gint count;
-       
-       g_debug("audio_add_clicked_cb ()\n");
-       // Only allow up to 8 audio entries
-       asettings = ghb_settings_new();
-       widget = GHB_WIDGET(ud->builder, "audio_track");
-       ghb_settings_set(asettings,     "audio_track", ghb_widget_value(widget));
-       widget = GHB_WIDGET(ud->builder, "audio_codec");
-       ghb_settings_set(asettings,     "audio_codec", ghb_widget_value(widget));
-       widget = GHB_WIDGET(ud->builder, "audio_bitrate");
-       ghb_settings_set(asettings,     "audio_bitrate", ghb_widget_value(widget));
-       widget = GHB_WIDGET(ud->builder, "audio_rate");
-       ghb_settings_set(asettings,     "audio_rate", ghb_widget_value(widget));
-       widget = GHB_WIDGET(ud->builder, "audio_mix");
-       ghb_settings_set(asettings,     "audio_mix", ghb_widget_value(widget));
-       widget = GHB_WIDGET(ud->builder, "audio_drc");
-       ghb_settings_set(asettings,     "audio_drc", ghb_widget_value(widget));
-
-       ud->audio_settings = g_slist_append(ud->audio_settings, asettings);
-       add_to_audio_list(ud, asettings);
-       count = g_slist_length(ud->audio_settings);
-       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;
-       GSList *link;
-
-       g_debug("audio_remove_clicked_cb ()\n");
-       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);
-               g_free(treepath);
-               row = indices[0];
-               // Remove the selected item
-               gtk_list_store_remove (GTK_LIST_STORE(store), &iter);
-               // remove from audio settings list
-               if (row < 0) return;
-               link = g_slist_nth(ud->audio_settings, row);
-               if (link == NULL) return;
-               ud->audio_settings = g_slist_remove_link(ud->audio_settings, link);
-               g_hash_table_destroy((GHashTable*)link->data);
-               g_slist_free_1(link);
-               widget = GHB_WIDGET (ud->builder, "audio_add");
-               gtk_widget_set_sensitive(widget, TRUE);
-       }
-}
-
-static void
-audio_list_refresh(signal_user_data_t *ud)
+prefs_dialog_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
-       GtkTreeView *treeview;
-       GtkTreeIter iter;
-       GtkListStore *store;
-       gboolean done;
-       
-       g_debug("audio_list_refresh ()\n");
-       GSList *link = ud->audio_settings;
-       if (link == NULL) return;
-       treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "audio_list"));
-       store = GTK_LIST_STORE(gtk_tree_view_get_model(treeview));
-       if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &iter))
-       {
-               do
-               {
-                       GHashTable *asettings;
-
-                       asettings = (GHashTable*)link->data;
-                       gtk_list_store_set(GTK_LIST_STORE(store), &iter, 
-                               // These are displayed in list
-                               0, ghb_settings_get_option(asettings, "audio_track"),
-                               1, ghb_settings_get_option(asettings, "audio_codec"),
-                               2, ghb_settings_get_option(asettings, "audio_bitrate"),
-                               3, ghb_settings_get_option(asettings, "audio_rate"),
-                               4, ghb_settings_get_option(asettings, "audio_mix"),
-                               // These are used to set combo box values when a list item is selected
-                               5, ghb_settings_get_string(asettings, "audio_drc"),
-                               6, ghb_settings_get_short_opt(asettings, "audio_track"),
-                               7, ghb_settings_get_short_opt(asettings, "audio_codec"),
-                               8, ghb_settings_get_short_opt(asettings, "audio_bitrate"),
-                               9, ghb_settings_get_short_opt(asettings, "audio_rate"),
-                               10, ghb_settings_get_short_opt(asettings, "audio_mix"),
-                               -1);
-                       done = !gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter);
-                       link = link->next;
-               } while (!done && link);
-       }
-}
-
-void
-ghb_presets_list_update(signal_user_data_t *ud)
-{
-       GtkTreeView *treeview;
-       GtkTreeIter iter;
-       GtkListStore *store;
-       gboolean done;
-       gint ii = 0;
-       gint index;
-       gchar **presets;
-       gchar **descriptions;
-       gint flags, custom, def;
-       
-       g_debug("ghb_presets_list_update ()\n");
-       presets = ghb_presets_get_names();
-       descriptions = ghb_presets_get_descriptions();
-       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 ((presets != NULL) && (presets[ii] != NULL))
-                       {
-                               // Update row with settings data
-                               g_debug("Updating row\n");
-                               flags = ghb_preset_flags(presets[ii], &index);
-                               def = flags & PRESET_DEFAULT;
-                               custom = flags & PRESET_CUSTOM;
-                               gtk_list_store_set(store, &iter, 
-                                                       0, presets[ii], 
-                                                       1, def ? 800 : 400, 
-                                                       2, def ? 2 : 0,
-                                                       3, custom ? "black" : "blue", 
-                                                       4, descriptions[ii],
-                                                       -1);
-                               ii++;
-                               done = !gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter);
-                       }
-                       else
-                       {
-                               // No more settings data, remove row
-                               g_debug("Removing row\n");
-                               done = !gtk_list_store_remove(store, &iter);
-                       }
-               } while (!done);
-       }
-       while ((presets != NULL) && (presets[ii] != NULL))
-       {
-               // Additional settings, add row
-               g_debug("Adding row %s\n", presets[ii]);
-               gtk_list_store_append(store, &iter);
-               flags = ghb_preset_flags(presets[ii], &index);
-               def = flags & PRESET_DEFAULT;
-               custom = flags & PRESET_CUSTOM;
-               gtk_list_store_set(store, &iter, 0, presets[ii], 
-                                                       1, def ? 800 : 400, 
-                                                       2, def ? 2 : 0,
-                                                       3, custom ? "black" : "blue", 
-                                                       4, descriptions[ii],
-                                                       -1);
-               ii++;
-       }
-       g_strfreev (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()\n");
-       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;
-                               break;
-                       }
-                       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)
-{
-       GSList *link = ud->audio_settings;
-       GHashTable *asettings;
-       gchar *acodec, *bitrate, *rate, *mix, *drc;
-       GString *pref_acodec, *pref_bitrate, *pref_rate, *pref_mix, *pref_drc;
-       pref_acodec = g_string_new("");
-       pref_bitrate = g_string_new("");
-       pref_rate = g_string_new("");
-       pref_mix = g_string_new("");
-       pref_drc = g_string_new("");
-       while (link)
-       {
-               gchar *format = link->next ? "%s," : "%s";
-               asettings = (GHashTable*)link->data;
-               acodec = (gchar*)ghb_settings_get_short_opt(asettings, "audio_codec");
-               g_string_append_printf( pref_acodec, format, acodec);
-               bitrate = (gchar*)ghb_settings_get_string(asettings, "audio_bitrate");
-               g_string_append_printf( pref_bitrate, format, bitrate);
-               rate = (gchar*)ghb_settings_get_string(asettings, "audio_rate");
-               g_string_append_printf( pref_rate, format, rate);
-               mix = (gchar*)ghb_settings_get_short_opt(asettings, "audio_mix");
-               g_string_append_printf( pref_mix, format, mix);
-               drc = (gchar*)ghb_settings_get_string(asettings, "audio_drc");
-               g_string_append_printf( pref_drc, format, drc);
-               link = link->next;
-       }
-       acodec = g_string_free(pref_acodec, FALSE);
-       bitrate = g_string_free(pref_bitrate, FALSE);
-       rate = g_string_free(pref_rate, FALSE);
-       mix = g_string_free(pref_mix, FALSE);
-       drc = g_string_free(pref_drc, FALSE);
-       ghb_settings_set_string(ud->settings, "pref_audio_codec", acodec);
-       ghb_settings_set_string(ud->settings, "pref_audio_bitrate", bitrate);
-       ghb_settings_set_string(ud->settings, "pref_audio_rate", rate);
-       ghb_settings_set_string(ud->settings, "pref_audio_mix", mix);
-       ghb_settings_set_string(ud->settings, "pref_audio_drc", drc);
-       g_free(acodec);
-       g_free(bitrate);
-       g_free(rate);
-       g_free(mix);
-       g_free(drc);
-}
-
-void
-presets_save_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
-{
-       GtkWidget *dialog;
-       GtkEntry *entry;
-       GtkTextView *desc;
-       GtkResponseType response;
-       const gchar *preset = "";
-
-       g_debug("presets_save_clicked_cb ()\n");
-       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);
-       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\n");
-               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 ()\n");
-       // 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
-       const gchar *preset = ghb_settings_get_string (ud->settings, "preset");
-       ghb_select_preset(ud->builder, preset);
-}
-
-void
-prefs_dialog_cb(GtkWidget *xwidget, signal_user_data_t *ud)
-{
-       GtkWidget *dialog;
-       GtkResponseType response;
-
-       g_debug("prefs_dialog_cb ()\n");
-       dialog = GHB_WIDGET(ud->builder, "prefs_dialog");
-       response = gtk_dialog_run(GTK_DIALOG(dialog));
-       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 ()\n");
-       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(ud->settings, 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_int (ud, "scale_width", tinfo->width - tinfo->crop[2] - tinfo->crop[3]);
-       // If anamorphic or keep_aspect, the hight will be automatically calculated
-       gboolean keep_aspect = ghb_settings_get_bool(ud->settings, "keep_aspect");
-       gboolean anamorphic = ghb_settings_get_bool(ud->settings, "anamorphic");
-       if (!(keep_aspect || anamorphic))
-               ghb_ui_update_int (ud, "scale_height", 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_bool (ud->settings, "autocrop"))
-       {
-               ghb_ui_update_int (ud, "crop_top", tinfo->crop[0]);
-               ghb_ui_update_int (ud, "crop_bottom", tinfo->crop[1]);
-               ghb_ui_update_int (ud, "crop_left", tinfo->crop[2]);
-               ghb_ui_update_int (ud, "crop_right", 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 ()\n");
-       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 = ghb_settings_get_int(ud->settings, "title");
-               set_pref_audio(titleindex, ud);
-               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.\n");
-               gtk_widget_set_sensitive(widget, FALSE);
-       }
-}
-
-void
-queue_list_selection_changed_cb(GtkTreeSelection *selection, signal_user_data_t *ud)
-{
-       GtkTreeModel *store;
-       GtkTreeIter iter, piter;
-       
-       g_debug("queue_list_selection_changed_cb ()\n");
-       // A queue entry is made up of a parent and multiple
-       // children that are visible when expanded.  When and entry
-       // is selected, I want the parent to be selected.
-       // This is purely cosmetic.
-       if (gtk_tree_selection_get_selected(selection, &store, &iter))
-       {
-               if (gtk_tree_model_iter_parent (store, &piter, &iter))
-               {
-                       GtkTreePath *path;
-                       GtkTreeView *treeview;
-                       
-                       gtk_tree_selection_select_iter (selection, &piter);
-                       path = gtk_tree_model_get_path (store, &piter);
-                       treeview = gtk_tree_selection_get_tree_view (selection);
-                       // Make the parent visible in scroll window if it is not.
-                       gtk_tree_view_scroll_to_cell (treeview, path, NULL, FALSE, 0, 0);
-                       g_free(path);
-               }
-       }
-}
-
-static void
-add_to_queue_list(signal_user_data_t *ud, job_settings_t *item)
-{
-       GtkTreeView *treeview;
-       GtkTreeIter iter;
-       GtkTreeStore *store;
-       gchar *info;
-       gint num_pass = 1;
-       gint ii;
-       GtkTreeIter citer;
-       
-       g_debug("update_queue_list ()\n");
-       if (item == NULL) return;
-       treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "queue_list"));
-       store = GTK_TREE_STORE(gtk_tree_view_get_model(treeview));
-               
-       gint title = ghb_settings_get_int(item->settings, "title");
-       gint start_chapter = ghb_settings_get_int(item->settings, "start_chapter");
-       gint end_chapter = ghb_settings_get_int(item->settings, "end_chapter");
-       gboolean pass2 = ghb_settings_get_bool(item->settings, "two_pass");
-       const gchar *vol_name = ghb_settings_get_string(item->settings, "volume_label");
-       if (vol_name == NULL)
-               vol_name = "No Title";
-       info = g_strdup_printf 
-               (
-                "<big><b>%s</b></big> (Title %d, Chapters %d through %d, %d Video %s)",
-                vol_name, title+1, start_chapter, end_chapter, 
-                pass2 ? 2:1, pass2 ? "Passes":"Pass");
-
-       gtk_tree_store_append(store, &iter, NULL);
-       gtk_tree_store_set(store, &iter, 0, "hb-queue-job", 1, info, 2, "hb-queue-delete", -1);
-       g_free(info);
-       
-       const gchar *vcodec = ghb_settings_get_option(item->settings, "video_codec");
-       const gchar *container = ghb_settings_get_option(item->settings, "container");
-       const gchar *acodec = ghb_settings_get_option(item->settings, "audio_codec");
-       const gchar *dest = ghb_settings_get_string(item->settings, "destination");
-       const gchar *preset = ghb_settings_get_string(item->settings, "preset");
-       info = g_strdup_printf 
-               (
-                "<b>Preset:</b> %s\n"
-                "<b>Format:</b> %s Container, %s Video + %s Audio\n"
-                "<b>Destination:</b> %s",
-                preset, container, vcodec, acodec, dest);
-
-       gtk_tree_store_append(store, &citer, &iter);
-       gtk_tree_store_set(store, &citer, 1, info, -1);
-       g_free(info);
-
-       gint width = ghb_settings_get_int(item->settings, "scale_width");
-       gint height = ghb_settings_get_int(item->settings, "scale_height");
-       gboolean anamorphic = ghb_settings_get_bool(item->settings, "anamorphic");
-       gboolean round_dim = ghb_settings_get_bool(item->settings, "round_dimensions");
-       gboolean keep_aspect = ghb_settings_get_bool(item->settings, "keep_aspect");
-       gchar *aspect_desc;
-       if (anamorphic)
-       {
-               if (round_dim)
-               {
-                       aspect_desc = "(Anamorphic)";
-               }
-               else
-               {
-                       aspect_desc = "(Strict Anamorphic)";
-               }
-       }
-       else
-       {
-               if (keep_aspect)
-               {
-                       aspect_desc = "(Aspect Preserved)";
-               }
-               else
-               {
-                       aspect_desc = "(Aspect Lost)";
-               }
-       }
-       gboolean vqtype = ghb_settings_get_bool(item->settings, "vquality_type_constant");
-       gint vqvalue = 0;
-       gchar *vq_desc = "Error";
-       if (!vqtype)
-       {
-               vqtype = ghb_settings_get_bool(item->settings, "vquality_type_target");
-               if (!vqtype)
-               {
-                       // Has to be bitrate
-                       vqvalue = ghb_settings_get_int(item->settings, "video_bitrate");
-                       vq_desc = "kbps";
-               }
-               else
-               {
-                       // Target file size
-                       vqvalue = ghb_settings_get_int(item->settings, "video_target");
-                       vq_desc = "MB";
-               }
-       }
-       else
-       {
-               // Constant quality
-               vqvalue = ghb_settings_get_int(item->settings, "video_quality");
-               vq_desc = "% Constant Quality";
-       }
-       const gchar *fps = ghb_settings_get_string(item->settings, "framerate");
-       const gchar *vcodec_abbr = ghb_settings_get_short_opt(item->settings, "video_codec");
-       gchar *extra_opts;
-       if (strcmp(vcodec_abbr, "x264") == 0)
-       {
-               gchar *x264opts = ghb_build_x264opts_string(item->settings);
-               g_debug("xopts (%s)\n", x264opts);
-               extra_opts = g_strdup_printf ("\n<b>x264 Options:</b> %s", x264opts);
-               g_free(x264opts);
-       }
-       else
-       {
-               extra_opts = g_strdup("");
-       }
-       gboolean turbo = ghb_settings_get_bool (item->settings, "turbo");
-       gchar *turbo_desc = "\n<b>Turbo:</b> Off";;
-       if (turbo)
-       {
-               turbo_desc = "\n<b>Turbo:</b> On";
-       }
-       num_pass = pass2 ? 2 : 1;
-       for (ii = 0; ii < num_pass; ii++)
-       {
-               gboolean final = (ii == (num_pass - 1));
-               GString *pass = g_string_new("");
-               g_string_append_printf( pass,
-                       "<b>%s Pass</b>\n"
-                       "<b>Picture:</b> %d x %d %s\n"
-                       "<b>Video:</b> %s, %d %s, %s fps"
-                       "%s",
-                        ii ? "2nd":"1st", width, height, aspect_desc,
-                        vcodec, vqvalue, vq_desc, fps, 
-                        final ? extra_opts : turbo_desc);
-
-               if (final)
-               {
-                       // Add the audios
-                       GSList *link = item->audio_settings;
-                       while (link)
-                       {
-                               GHashTable *asettings = (GHashTable*)link->data;
-                               const gchar *acodec = ghb_settings_get_option(asettings, "audio_codec");
-                               const gchar *bitrate = ghb_settings_get_string(asettings, "audio_bitrate");
-                               const gchar *samplerate = ghb_settings_get_string(asettings, "audio_rate");
-                               gint track = ghb_settings_get_int(asettings, "audio_track");
-                               const gchar *mix = ghb_settings_get_option(asettings, "audio_mix");
-                               g_string_append_printf(pass,
-                                       "\n<b>Audio:</b> %s, %s kbps, %s kHz, Track %d: %s",
-                                        acodec, bitrate, samplerate, track+1, mix);
-                               link = link->next;
-                       }
-               }
-               info = g_string_free(pass, FALSE);
-               gtk_tree_store_append(store, &citer, &iter);
-               gtk_tree_store_set(store, &citer, 0, ii ? "hb-queue-pass2" : "hb-queue-pass1", 1, info, -1);
-               g_free(info);
-       }
-       g_free(extra_opts);
-}
-
-gboolean
-ghb_message_dialog(GtkMessageType type, const gchar *message, const gchar *no, const gchar *yes)
-{
-       GtkWidget *dialog;
-       GtkResponseType response;
-                       
-       // Toss up a warning dialog
-       dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL,
-                                                       type, GTK_BUTTONS_NONE,
-                                                       message);
-       gtk_dialog_add_buttons( GTK_DIALOG(dialog), 
-                                                  no, GTK_RESPONSE_NO,
-                                                  yes, GTK_RESPONSE_YES, NULL);
-       response = gtk_dialog_run(GTK_DIALOG(dialog));
-       gtk_widget_destroy (dialog);
-       if (response == GTK_RESPONSE_NO)
-       {
-               return FALSE;
-       }
-       return TRUE;
-}
-
-static gint64
-estimate_file_size(signal_user_data_t *ud)
-{
-       ghb_title_info_t tinfo;
-       gint duration;
-       gint bitrate;
-       gint64 size;
-       gint titleindex = ghb_settings_get_int(ud->settings, "title");
-       if (titleindex < 0) return 0;
-                       
-       if (!ghb_get_title_info(&tinfo, titleindex)) return 0;
-       duration = ((tinfo.hours*60)+tinfo.minutes)*60+tinfo.seconds;
-       bitrate = ghb_guess_bitrate(ud->settings);
-       size = (gint64)duration * (gint64)bitrate/8;
-       return size;
-}
-
-#define DISK_FREE_THRESH       (1024L*1024L*1024L*3)
-
-static gboolean
-validate_settings(signal_user_data_t *ud)
-{
-       // Check to see if the dest file exists or is
-       // already in the queue
-       gchar *message;
-       gint titleindex = ghb_settings_get_int(ud->settings, "title");
-       if (titleindex < 0) return FALSE;
-       const gchar *dest = ghb_settings_get_string(ud->settings, "destination");
-       GSList *link = ud->queue;
-       while (link != NULL)
-       {
-               job_settings_t *item;
-               const gchar *filename;
-               item = (job_settings_t*)link->data;
-               filename = ghb_settings_get_string(item->settings, "destination");
-               if (strcmp(dest, filename) == 0)
-               {
-                       message = g_strdup_printf(
-                                               "Destination: %s\n\n"
-                                               "Another queued job has specified the same destination.\n"
-                                               "Do you want to overwrite?",
-                                               dest);
-                       if (!ghb_message_dialog(GTK_MESSAGE_QUESTION, message, "Cancel", "Overwrite"))
-                       {
-                               g_free(message);
-                               return FALSE;
-                       }
-                       g_free(message);
-                       break;
-               }
-               link = link->next;
-       }
-       gchar *destdir = g_path_get_dirname(dest);
-       if (!g_file_test(destdir, G_FILE_TEST_IS_DIR))
-       {
-               message = g_strdup_printf(
-                                       "Destination: %s\n\n"
-                                       "This is not a valid directory.",
-                                       destdir);
-               ghb_message_dialog(GTK_MESSAGE_ERROR, message, "Cancel", NULL);
-               g_free(message);
-               g_free(destdir);
-               return FALSE;
-       }
-       if (g_access(destdir, R_OK|W_OK) != 0)
-       {
-               message = g_strdup_printf(
-                                       "Destination: %s\n\n"
-                                       "Can not read or write the directory.",
-                                       destdir);
-               ghb_message_dialog(GTK_MESSAGE_ERROR, message, "Cancel", NULL);
-               g_free(message);
-               g_free(destdir);
-               return FALSE;
-       }
-       GFile *gfile;
-       GFileInfo *info;
-       guint64 size;
-       gchar *resolved = ghb_resolve_symlink(destdir);
-
-       gfile = g_file_new_for_path(resolved);
-       info = g_file_query_filesystem_info(gfile, 
-                                               G_FILE_ATTRIBUTE_FILESYSTEM_FREE, NULL, NULL);
-       if (info != NULL)
-       {
-               if (g_file_info_has_attribute(info, G_FILE_ATTRIBUTE_FILESYSTEM_FREE))
-               {
-                       size = g_file_info_get_attribute_uint64(info, 
-                                                                       G_FILE_ATTRIBUTE_FILESYSTEM_FREE);
-                       
-                       gint64 fsize = estimate_file_size(ud);
-                       if (size < fsize)
-                       {
-                               message = g_strdup_printf(
-                                                       "Destination filesystem is almost full: %uM free\n\n"
-                                                       "Encode may be incomplete if you proceed.\n",
-                                                       (guint)(size / (1024L*1024L)));
-                               if (!ghb_message_dialog(GTK_MESSAGE_QUESTION, message, "Cancel", "Proceed"))
-                               {
-                                       g_free(message);
-                                       return FALSE;
-                               }
-                               g_free(message);
-                       }
-               }
-               g_object_unref(info);
-       }
-       g_object_unref(gfile);
-       g_free(resolved);
-       g_free(destdir);
-       if (g_file_test(dest, G_FILE_TEST_EXISTS))
-       {
-               message = g_strdup_printf(
-                                       "Destination: %s\n\n"
-                                       "File already exhists.\n"
-                                       "Do you want to overwrite?",
-                                       dest);
-               if (!ghb_message_dialog(GTK_MESSAGE_QUESTION, message, "Cancel", "Overwrite"))
-               {
-                       g_free(message);
-                       return FALSE;
-               }
-               g_free(message);
-               g_unlink(dest);
-       }
-       // Validate video quality is in a reasonable range
-       if (!ghb_validate_vquality(ud->settings))
-       {
-               return FALSE;
-       }
-       // Validate audio settings
-       if (!ghb_validate_audio(ud))
-       {
-               return FALSE;
-       }
-       // Validate video settings
-       if (!ghb_validate_video(ud))
-       {
-               return FALSE;
-       }
-       // Validate container settings
-       if (!ghb_validate_container(ud))
-       {
-               return FALSE;
-       }
-       // Validate filter settings
-       if (!ghb_validate_filters(ud))
-       {
-               return FALSE;
-       }
-       audio_list_refresh(ud);
-       return TRUE;
+       GtkWidget *dialog;
+       GtkResponseType response;
+
+       g_debug("prefs_dialog_cb ()");
+       dialog = GHB_WIDGET(ud->builder, "prefs_dialog");
+       response = gtk_dialog_run(GTK_DIALOG(dialog));
+       gtk_widget_hide(dialog);
 }
 
-static gboolean
-queue_add(signal_user_data_t *ud)
+gboolean
+ghb_message_dialog(GtkMessageType type, const gchar *message, const gchar *no, const gchar *yes)
 {
-       // Add settings to the queue
-       job_settings_t *queue_item;
-       GSList *link;
-       static gint unique_id = 0;
-       
-       g_debug("queue_add ()\n");
-       if (!validate_settings(ud))
+       GtkWidget *dialog;
+       GtkResponseType response;
+                       
+       // Toss up a warning dialog
+       dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL,
+                                                       type, GTK_BUTTONS_NONE,
+                                                       "%s", message);
+       gtk_dialog_add_buttons( GTK_DIALOG(dialog), 
+                                                  no, GTK_RESPONSE_NO,
+                                                  yes, GTK_RESPONSE_YES, NULL);
+       response = gtk_dialog_run(GTK_DIALOG(dialog));
+       gtk_widget_destroy (dialog);
+       if (response == GTK_RESPONSE_NO)
        {
                return FALSE;
        }
-       // Make a copy of current settings to be used for the new job
-       queue_item = g_malloc(sizeof(job_settings_t));
-       queue_item->settings = ghb_settings_dup(ud->settings);
-       queue_item->audio_settings = NULL;
-       link = ud->audio_settings;
-       while (link != NULL)
-       {
-               GHashTable *asettings;
-               asettings = ghb_settings_dup((GHashTable*)link->data);
-               queue_item->audio_settings =
-                       g_slist_append(queue_item->audio_settings, asettings);
-               link = g_slist_next(link);
-       }
-       queue_item->chapter_list = g_strdupv(ud->chapter_list);
-       ud->queue = g_slist_append(ud->queue, queue_item);
-       add_to_queue_list(ud, queue_item);
-       ghb_add_job (queue_item, unique_id);
-       queue_item->unique_id = unique_id;
-       queue_item->status = GHB_QUEUE_PENDING;
-       unique_id++;
        return TRUE;
 }
 
-void
-queue_add_clicked_cb(GtkWidget *widget, signal_user_data_t *ud)
-{
-       g_debug("queue_add_clicked_cb ()\n");
-       queue_add(ud);
-}
-
-static gboolean
-cancel_encode(const gchar *extra_msg)
+gboolean
+ghb_cancel_encode(const gchar *extra_msg)
 {
        GtkWidget *dialog;
        GtkResponseType response;
@@ -2602,120 +1437,264 @@ cancel_encode(const gchar *extra_msg)
        return TRUE;
 }
 
-void
-queue_remove_clicked_cb(GtkWidget *widget, gchar *path, signal_user_data_t *ud)
+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);
+       ghb_start_queue();
+       unique_id++;
+}
+
+static void
+prune_logs(signal_user_data_t *ud)
 {
-       GtkTreeView *treeview;
-       GtkTreePath *treepath;
-       GtkTreeModel *store;
-       GtkTreeIter iter;
-       gint row;
-       GSList *link;
-       gint *indices;
-       job_settings_t *queue_item;
-       gint unique_id;
+       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;
 
-       g_debug("queue_remove_clicked_cb ()\n");
-       g_debug("ud %p\n", ud);
-       g_debug("ud->builder %p\n", ud->builder);
+               now = time(NULL);
+               file = g_dir_read_name(gdir);
+               while (file)
+               {
+                       gchar *path;
+                       struct stat stbuf;
 
-       treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "queue_list"));
-       store = gtk_tree_view_get_model(treeview);
-       treepath = gtk_tree_path_new_from_string (path);
-       if (gtk_tree_model_get_iter(store, &iter, treepath))
-       {
-               // Find the entry in the queue
-               indices = gtk_tree_path_get_indices (treepath);
-               row = indices[0];
-               // Can only free the treepath After getting what I need from
-               // indices since this points into treepath somewhere.
-               gtk_tree_path_free (treepath);
-               if (row < 0) return;
-               link = g_slist_nth(ud->queue, row);
-               if (link == NULL) return;
-               queue_item = (job_settings_t*)link->data;
-               if (queue_item->status == GHB_QUEUE_RUNNING)
+                       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_get_version(NULL), hb_get_build(NULL));
+               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");
+       ghb_backend_queue_scan(path, titlenum);
+       g_free(path);
+}
+
+GValue* 
+ghb_start_next_job(signal_user_data_t *ud, gboolean find_first)
+{
+       static gint current = 0;
+       gint count, ii, jj;
+       GValue *js;
+       gint status;
+
+       g_debug("start_next_job");
+       count = ghb_array_len(ud->queue);
+       if (find_first)
+       {       // Start the first pending item in the queue
+               current = 0;
+               for (ii = 0; ii < count; ii++)
                {
-                       // Ask if wants to stop encode.
-                       if (!cancel_encode(NULL))
+
+                       js = ghb_array_get_nth(ud->queue, ii);
+                       status = ghb_settings_get_int(js, "job_status");
+                       if (status == GHB_QUEUE_PENDING)
                        {
-                               return;
+                               current = ii;
+                               ghb_inhibit_gpm();
+                               queue_scan(ud, js);
+                               return js;
                        }
                }
-               // Remove the selected item
-               g_debug(" should be removing from treestore\n");
-               gtk_tree_store_remove(GTK_TREE_STORE(store), &iter);
-               // Remove the corresponding item from the queue list
-               ud->queue = g_slist_remove_link(ud->queue, link);
-               g_slist_free_1(link);
-               g_hash_table_destroy(queue_item->settings);
-               link = queue_item->audio_settings;
-               while (link != NULL)
+               // Nothing pending
+               ghb_uninhibit_gpm();
+               ghb_notify_done(ud);
+               return NULL;
+       }
+       // Find the next pending item after the current running item
+       for (ii = 0; ii < count-1; ii++)
+       {
+               js = ghb_array_get_nth(ud->queue, ii);
+               status = ghb_settings_get_int(js, "job_status");
+               if (status == GHB_QUEUE_RUNNING)
                {
-                       GSList *nextlink;
-                       g_hash_table_destroy((GHashTable*)link->data);
-                       nextlink = g_slist_next(link);
-                       g_slist_free_1(link);
-                       link = nextlink;
+                       for (jj = ii+1; jj < count; jj++)
+                       {
+                               js = ghb_array_get_nth(ud->queue, jj);
+                               status = ghb_settings_get_int(js, "job_status");
+                               if (status == GHB_QUEUE_PENDING)
+                               {
+                                       current = jj;
+                                       ghb_inhibit_gpm();
+                                       queue_scan(ud, js);
+                                       return js;
+                               }
+                       }
                }
-               g_strfreev (queue_item->chapter_list);
-               unique_id = queue_item->unique_id;
-               g_free(queue_item);
-               ghb_remove_job(unique_id);
        }
-       else
-       {       
-               gtk_tree_path_free (treepath);
+       // No running item found? Maybe it was deleted
+       // Look for a pending item starting from the last index we started
+       for (ii = current; ii < count; ii++)
+       {
+               js = ghb_array_get_nth(ud->queue, ii);
+               status = ghb_settings_get_int(js, "job_status");
+               if (status == GHB_QUEUE_PENDING)
+               {
+                       current = ii;
+                       ghb_inhibit_gpm();
+                       queue_scan(ud, js);
+                       return js;
+               }
        }
+       // Nothing found
+       ghb_uninhibit_gpm();
+       ghb_notify_done(ud);
+       return NULL;
 }
 
 static gint
-find_queue_item(GSList *queue, gint unique_id, job_settings_t **job)
+find_queue_job(GValue *queue, gint unique_id, GValue **job)
 {
-       job_settings_t *js;
-       gint index = -1;
+       GValue *js;
+       gint ii, count;
+       gint job_unique_id;
        
-       while (queue != NULL)
+       *job = NULL;
+       g_debug("find_queue_job");
+       count = ghb_array_len(queue);
+       for (ii = 0; ii < count; ii++)
        {
-               index++;
-               js = (job_settings_t*)queue->data;
-               if (js->unique_id == unique_id)
+               js = ghb_array_get_nth(queue, ii);
+               job_unique_id = ghb_settings_get_int(js, "job_unique_id");
+               if (job_unique_id == unique_id)
                {
                        *job = js;
-                       return index;
+                       return ii;
                }
-               queue = queue->next;
        }
-       *job = NULL;
-       return index;
+       return -1;
 }
 
-static void
-queue_buttons_grey(signal_user_data_t *ud, gboolean working)
+gchar*
+working_status_string(signal_user_data_t *ud, ghb_instance_status_t *status)
 {
-       GtkWidget *widget;
-       GtkAction *action;
-       gint titleindex = ghb_settings_get_int(ud->settings, "title");
-       gboolean title_ok = (titleindex >= 0);
-       widget = GHB_WIDGET (ud->builder, "queue_start1");
-       gtk_widget_set_sensitive (widget, !working && title_ok);
-       widget = GHB_WIDGET (ud->builder, "queue_start2");
-       gtk_widget_set_sensitive (widget, !working && title_ok);
-       action = GHB_ACTION (ud->builder, "queue_start_menu");
-       gtk_action_set_sensitive (action, !working && title_ok);
-       widget = GHB_WIDGET (ud->builder, "queue_pause1");
-       gtk_widget_set_sensitive (widget, working);
-       widget = GHB_WIDGET (ud->builder, "queue_pause2");
-       gtk_widget_set_sensitive (widget, working);
-       action = GHB_ACTION (ud->builder, "queue_pause_menu");
-       gtk_action_set_sensitive (action, working);
-       widget = GHB_WIDGET (ud->builder, "queue_stop");
-       gtk_widget_set_sensitive (widget, working);
-       action = GHB_ACTION (ud->builder, "queue_stop_menu");
-       gtk_action_set_sensitive (action, working);
-}
-
-void queue_start_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud);
+       gchar *task_str, *job_str, *status_str;
+       gint qcount;
+       gint index;
+       GValue *js;
+
+       if (status->job_count > 1)
+       {
+               task_str = g_strdup_printf("pass %d of %d, ", 
+                       status->job_cur, status->job_count);
+       }
+       else
+       {
+               task_str = g_strdup("");
+       }
+       qcount = ghb_array_len(ud->queue);
+       if (qcount > 1)
+       {
+               index = find_queue_job(ud->queue, status->unique_id, &js);
+               job_str = g_strdup_printf("job %d of %d, ", index+1, qcount);
+       }
+       else
+       {
+               job_str = g_strdup("");
+       }
+       if(status->seconds > -1)
+       {
+               status_str= g_strdup_printf(
+                       "Encoding: %s%s%.2f %%"
+                       " (%.2f fps, avg %.2f fps, ETA %02dh%02dm%02ds)",
+                       job_str, task_str,
+                       100.0 * status->progress,
+                       status->rate_cur, status->rate_avg, status->hours, 
+                       status->minutes, status->seconds );
+       }
+       else
+       {
+               status_str= g_strdup_printf(
+                       "Encoding: %s%s%.2f %%",
+                       job_str, task_str,
+                       100.0 * status->progress );
+       }
+       g_free(task_str);
+       g_free(job_str);
+       return status_str;
+}
 
 static void
 ghb_backend_events(signal_user_data_t *ud)
@@ -2724,8 +1703,7 @@ ghb_backend_events(signal_user_data_t *ud)
        gchar *status_str;
        GtkProgressBar *progress;
        gint titleindex;
-       job_settings_t *js;
-       static gint current_id = -1;
+       GValue *js;
        gint index;
        GtkTreeView *treeview;
        GtkTreeStore *store;
@@ -2736,19 +1714,28 @@ ghb_backend_events(signal_user_data_t *ud)
        ghb_track_status();
        ghb_get_status(&status);
        progress = GTK_PROGRESS_BAR(GHB_WIDGET (ud->builder, "progressbar"));
-       if (status.state & GHB_STATE_SCANNING)
+       // First handle the status of title scans
+       // Then handle the status of the queue
+       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);
@@ -2759,7 +1746,7 @@ ghb_backend_events(signal_user_data_t *ud)
                        
                ghb_update_ui_combo_box(ud->builder, "title", 0, FALSE);
                titleindex = ghb_longest_title();
-               ghb_ui_update_int(ud, "title", titleindex);
+               ghb_ui_update(ud, "title", ghb_int64_value(titleindex));
 
                // Are there really any titles.
                if (!ghb_get_title_info(&tinfo, titleindex))
@@ -2769,48 +1756,69 @@ 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);
-               queue_buttons_grey(ud, (0 != (status.state & GHB_STATE_WORKING)));
-       }
-       else if (status.state & GHB_STATE_WORKING)
-       {
-               if(status.seconds > -1)
-               {
-                       status_str= g_strdup_printf(
-                               "Encoding: task %d of %d, %.2f %%"
-                               " (%.2f fps, avg %.2f fps, ETA %02dh%02dm%02ds)",
-                               status.job_cur, status.job_count, 
-                               100.0 * status.progress,
-                               status.rate_cur, status.rate_avg, status.hours, 
-                               status.minutes, status.seconds );
-               }
-               else
+               ghb_clear_scan_state(GHB_STATE_SCANDONE);
+               ghb_queue_buttons_grey(ud, work_started);
+               if (ghb_queue_edit_settings)
                {
-                       status_str= g_strdup_printf(
-                               "Encoding: task %d of %d, %.2f %%",
-                               status.job_cur, status.job_count, 
-                               100.0 * status.progress );
+                       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)
+       {
+               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)
+       {
+               ghb_clear_queue_state(GHB_STATE_SCANDONE);
+               usleep(2000000);
+               submit_job(ud->current_job);
+       }
+       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)
+       {
+               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.state & GHB_STATE_WORKDONE)
+       else if (status.queue.state & GHB_STATE_WORKDONE)
        {
+               gint qstatus;
+
                work_started = FALSE;
-               queue_buttons_grey(ud, FALSE);
-               index = find_queue_item(ud->queue, current_id, &js);
+               ghb_queue_buttons_grey(ud, FALSE);
+               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));
-               switch( status.error )
+               if (ud->cancel_encode)
+                       status.queue.error = GHB_ERROR_CANCELED;
+               switch( status.queue.error )
                {
                        case GHB_ERROR_NONE:
                                gtk_progress_bar_set_text( progress, "Rip done!" );
+                               qstatus = GHB_QUEUE_DONE;
                                if (js != NULL)
                                {
-                                       js->status = GHB_QUEUE_DONE;
                                        gchar *path = g_strdup_printf ("%d", index);
-                                       if (gtk_tree_model_get_iter_from_string ( GTK_TREE_MODEL(store), &iter, path))
+                                       if (gtk_tree_model_get_iter_from_string(
+                                                       GTK_TREE_MODEL(store), &iter, path))
                                        {
                                                gtk_tree_store_set(store, &iter, 0, "hb-complete", -1);
                                        }
@@ -2819,11 +1827,12 @@ ghb_backend_events(signal_user_data_t *ud)
                                break;
                        case GHB_ERROR_CANCELED:
                                gtk_progress_bar_set_text( progress, "Rip canceled." );
+                               qstatus = GHB_QUEUE_CANCELED;
                                if (js != NULL)
                                {
-                                       js->status = GHB_QUEUE_CANCELED;
                                        gchar *path = g_strdup_printf ("%d", index);
-                                       if (gtk_tree_model_get_iter_from_string ( GTK_TREE_MODEL(store), &iter, path))
+                                       if (gtk_tree_model_get_iter_from_string(
+                                                       GTK_TREE_MODEL(store), &iter, path))
                                        {
                                                gtk_tree_store_set(store, &iter, 0, "hb-canceled", -1);
                                        }
@@ -2832,63 +1841,62 @@ ghb_backend_events(signal_user_data_t *ud)
                                break;
                        default:
                                gtk_progress_bar_set_text( progress, "Rip failed.");
+                               qstatus = GHB_QUEUE_CANCELED;
                                if (js != NULL)
                                {
-                                       js->status = GHB_QUEUE_CANCELED;
                                        gchar *path = g_strdup_printf ("%d", index);
-                                       if (gtk_tree_model_get_iter_from_string ( GTK_TREE_MODEL(store), &iter, path))
+                                       if (gtk_tree_model_get_iter_from_string(
+                                                       GTK_TREE_MODEL(store), &iter, path))
                                        {
                                                gtk_tree_store_set(store, &iter, 0, "hb-canceled", -1);
                                        }
                                        g_free(path);
                                }
                }
-               current_id = -1;
                gtk_progress_bar_set_fraction (progress, 1.0);
-               ghb_clear_state(GHB_STATE_WORKDONE);
-       }
-       else if (status.state & GHB_STATE_PAUSED)
-       {
-               status_str = g_strdup_printf ("Paused"); 
-               gtk_progress_bar_set_text (progress, status_str);
-               g_free(status_str);
+               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.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.state & GHB_STATE_WORKING)
+       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
                if (!work_started)
                {
                        work_started = TRUE;
-                       queue_buttons_grey(ud, TRUE);
+                       ghb_queue_buttons_grey(ud, TRUE);
                }
-               if (status.unique_id != current_id)
+       }
+       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
+               if (!work_started)
                {
-                       index = find_queue_item(ud->queue, current_id, &js);
-                       if (js != NULL)
-                       {
-                               js->status = GHB_QUEUE_DONE;
-                               treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "queue_list"));
-                               store = GTK_TREE_STORE(gtk_tree_view_get_model(treeview));
-                               gchar *path = g_strdup_printf ("%d", index);
-                               if (gtk_tree_model_get_iter_from_string ( GTK_TREE_MODEL(store), &iter, path))
-                               {
-                                       gtk_tree_store_set(store, &iter, 0, "hb-complete", -1);
-                               }
-                               g_free(path);
-                       }
-
-                       index = find_queue_item(ud->queue, status.unique_id, &js);
-                       if (js != NULL)
-                       {
-                               js->status = GHB_QUEUE_RUNNING;
-                               current_id = status.unique_id;
-                       }
+                       work_started = TRUE;
+                       ghb_queue_buttons_grey(ud, TRUE);
                }
-               index = find_queue_item(ud->queue, status.unique_id, &js);
-               if (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;
@@ -2896,12 +1904,45 @@ ghb_backend_events(signal_user_data_t *ud)
                        treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "queue_list"));
                        store = GTK_TREE_STORE(gtk_tree_view_get_model(treeview));
                        gchar *path = g_strdup_printf ("%d", index);
-                       if (gtk_tree_model_get_iter_from_string ( GTK_TREE_MODEL(store), &iter, path))
+                       if (gtk_tree_model_get_iter_from_string(
+                                       GTK_TREE_MODEL(store), &iter, path))
                        {
                                gtk_tree_store_set(store, &iter, 0, working_icon, -1);
                        }
                        g_free(path);
                }
+               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);
        }
 }
 
@@ -2910,22 +1951,27 @@ 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)
        {
-               const gchar *dest = ghb_settings_get_string(ud->settings, "destination");
-               gchar *dest_dir = g_path_get_dirname (dest);
-               const gchar *def_dest = ghb_settings_get_string(ud->settings, "destination_dir");
+               gchar *dest, *dest_dir, *def_dest;
+               dest = ghb_settings_get_string(ud->settings, "destination");
+               dest_dir = g_path_get_dirname (dest);
+               def_dest = ghb_settings_get_string(ud->settings, "destination_dir");
                if (strcmp(dest_dir, def_dest) != 0)
                {
                        ghb_settings_set_string (ud->settings, "destination_dir", dest_dir);
                        ghb_pref_save (ud->settings, "destination_dir");
                }
+               g_free(dest);
+               g_free(dest_dir);
+               g_free(def_dest);
                update_default_destination = FALSE;
        }
        if (update_preview)
        {
-               set_preview_image (ud);
+               ghb_set_preview_image (ud);
                update_preview = FALSE;
        }
        return TRUE;
@@ -2957,7 +2003,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)
@@ -2980,21 +2026,30 @@ 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)
        {
                // This should never happen, but if it does I would get into an
                // infinite loop.  Returning false removes this callback.
-               g_warning("Error while reading activity from pipe\n");
+               g_warning("Error while reading activity from pipe");
                if (gerror != NULL)
                {
-                       g_warning("%s\n", gerror->message);
+                       g_warning("%s", gerror->message);
                        g_error_free (gerror);
                }
                return FALSE;
@@ -3004,20 +2059,69 @@ 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
-about_activate_cb(GtkWidget *xwidget, signal_user_data_t *ud)
+show_activity_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
-       GtkWidget *widget = GHB_WIDGET (ud->builder, "hb_about");
-       gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(widget), ghb_version());
-       gtk_widget_show (widget);
+       GtkWidget *widget = GHB_WIDGET (ud->builder, "activity_window");
+       set_visible(widget, gtk_toggle_tool_button_get_active(
+                                               GTK_TOGGLE_TOOL_BUTTON(xwidget)));
 }
 
 void
-guide_activate_cb(GtkWidget *xwidget, signal_user_data_t *ud)
+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);
+}
+
+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;
@@ -3039,38 +2143,79 @@ 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
-hb_about_response_cb(GtkWidget *widget, gint response, signal_user_data_t *ud)
+about_web_hook(GtkAboutDialog *about, const gchar *link, gpointer data)
 {
-       gtk_widget_hide (widget);
+       browse_url(link);
 }
 
 void
-show_activity_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
+about_activate_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
-       GtkWidget *widget = GHB_WIDGET (ud->builder, "activity_window");
+       GtkWidget *widget = GHB_WIDGET (ud->builder, "hb_about");
+       gchar *ver;
+
+       ver = g_strdup_printf("%s (%s)", HB_PROJECT_VERSION, HB_PROJECT_BUILD_ARCH);
+       gtk_about_dialog_set_url_hook(about_web_hook, NULL, NULL);
+       gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(widget), ver);
+       g_free(ver);
+       gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(widget), 
+                                                               HB_PROJECT_URL_WEBSITE);
+       gtk_about_dialog_set_website_label(GTK_ABOUT_DIALOG(widget), 
+                                                                               HB_PROJECT_URL_WEBSITE);
        gtk_widget_show (widget);
 }
 
 void
+guide_activate_cb(GtkWidget *xwidget, signal_user_data_t *ud)
+{
+       browse_url("http://trac.handbrake.fr/wiki/HandBrakeGuide");
+}
+
+void
+hb_about_response_cb(GtkWidget *widget, gint response, signal_user_data_t *ud)
+{
+       gtk_widget_hide (widget);
+}
+
+void
 show_queue_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
        GtkWidget *widget = GHB_WIDGET (ud->builder, "queue_window");
-       gtk_widget_show (widget);
+       set_visible(widget, gtk_toggle_tool_button_get_active(
+                                               GTK_TOGGLE_TOOL_BUTTON(xwidget)));
+}
+
+void
+show_queue_menu_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
+{
+       GtkWidget *widget = GHB_WIDGET (ud->builder, "queue_window");
+       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 ()\n");
+       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);
        }
@@ -3080,30 +2225,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);
-               g_free(path);
-       }
-}
-
 static void
 update_chapter_list(signal_user_data_t *ud)
 {
@@ -3111,15 +2235,16 @@ update_chapter_list(signal_user_data_t *ud)
        GtkTreeIter iter;
        GtkListStore *store;
        gboolean done;
-       gchar **chapters;
+       GValue *chapters;
        gint titleindex, ii;
+       gint count;
        
-       g_debug("update_chapter_list ()\n");
-       titleindex = ghb_settings_get_index(ud->settings, "title");
+       g_debug("update_chapter_list ()");
+       titleindex = ghb_settings_combo_int(ud->settings, "title");
        chapters = ghb_get_chapters(titleindex);
-       if (ud->chapter_list != NULL)
-               g_strfreev (ud->chapter_list);
-       ud->chapter_list = chapters;
+       count = ghb_array_len(chapters);
+       if (chapters)
+               ghb_settings_set_value(ud->settings, "chapter_list", chapters);
        
        treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "chapters_list"));
        store = GTK_LIST_STORE(gtk_tree_view_get_model(treeview));
@@ -3128,181 +2253,155 @@ update_chapter_list(signal_user_data_t *ud)
        {
                do
                {
-                       if (chapters != NULL && chapters[ii])
+
+                       if (ii < count)
                        {
+                               gchar *chapter, *duration;
+                               gint hh, mm, ss;
+
                                // Update row with settings data
-                               g_debug("Updating row\n");
+                               g_debug("Updating row");
+                               chapter = ghb_value_string(ghb_array_get_nth(chapters, ii));
+                               ghb_get_chapter_duration(titleindex, ii, &hh, &mm, &ss);
+                               duration = g_strdup_printf("%02d:%02d:%02d", hh, mm, ss);
                                gtk_list_store_set(store, &iter, 
                                        0, ii+1,
-                                       1, chapters[ii],
-                                       2, TRUE,
+                                       1, duration,
+                                       2, chapter,
+                                       3, TRUE,
                                        -1);
+                               g_free(chapter);
+                               g_free(duration);
                                ii++;
                                done = !gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter);
                        }
                        else
                        {
                                // No more settings data, remove row
-                               g_debug("Removing row\n");
+                               g_debug("Removing row");
                                done = !gtk_list_store_remove(store, &iter);
                        }
                } while (!done);
        }
-       while (chapters != NULL && chapters[ii])
+       while (ii < count)
        {
+               gchar *chapter, *duration;
+               gint hh, mm, ss;
+
                // Additional settings, add row
-               g_debug("Adding row\n");
-               g_debug("%d -- %s\n", ii, chapters[ii]);
+               g_debug("Adding row");
+               chapter = ghb_value_string(ghb_array_get_nth(chapters, ii));
+               ghb_get_chapter_duration(titleindex, ii, &hh, &mm, &ss);
+               duration = g_strdup_printf("%02d:%02d:%02d", hh, mm, ss);
                gtk_list_store_append(store, &iter);
                gtk_list_store_set(store, &iter, 
                        0, ii+1,
-                       1, chapters[ii],
-                       2, TRUE,
+                       1, duration,
+                       2, chapter,
+                       3, TRUE,
                        -1);
+               g_free(chapter);
+               g_free(duration);
                ii++;
        }
 }
 
+static gint chapter_edit_key = 0;
+
+gboolean
+chapter_keypress_cb(
+       GhbCellRendererText *cell,
+       GdkEventKey *event,
+       signal_user_data_t *ud)
+{
+       chapter_edit_key = event->keyval;
+       return FALSE;
+}
+
 void
-chapter_edited_cb(GtkCellRendererText *cell, gchar *path, gchar *text, signal_user_data_t *ud)
+chapter_edited_cb(
+       GhbCellRendererText *cell, 
+       gchar *path, 
+       gchar *text, 
+       signal_user_data_t *ud)
 {
        GtkTreePath *treepath;
        GtkListStore *store;
        GtkTreeView *treeview;
-       GtkTreeViewColumn *column;
        GtkTreeIter iter;
        gint index;
+       gint *pi;
+       gint row;
        
-       g_debug("chapter_edited_cb ()\n");
-       g_debug("path (%s)\n", path);
-       g_debug("text (%s)\n", text);
+       g_debug("chapter_edited_cb ()");
+       g_debug("path (%s)", path);
+       g_debug("text (%s)", text);
        treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "chapters_list"));
        store = GTK_LIST_STORE(gtk_tree_view_get_model(treeview));
        treepath = gtk_tree_path_new_from_string (path);
+       pi = gtk_tree_path_get_indices(treepath);
+       row = pi[0];
        gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &iter, treepath);
-       gtk_tree_path_free (treepath);
        gtk_list_store_set(store, &iter, 
-               1, text,
-               2, TRUE,
+               2, text,
+               3, TRUE,
                -1);
        gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, 0, &index, -1);
-       g_free(ud->chapter_list[index-1]);
-       ud->chapter_list[index-1] = g_strdup(text);
-       if (gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter))
-       {
-               column = gtk_tree_view_get_column(treeview, 1);
-               treepath = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &iter);
-               gtk_tree_view_set_cursor(treeview, treepath, column, TRUE);
-               gtk_tree_path_free (treepath);
-       }
-}
-
-void
-chapter_list_selection_changed_cb(GtkTreeSelection *selection, signal_user_data_t *ud)
-{
-       GtkTreeModel *store;
-       GtkTreeIter iter;
-       
-       g_debug("chapter_list_selection_changed_cb ()\n");
-       if (gtk_tree_selection_get_selected(selection, &store, &iter))
-       {
-               // What to do??
-       }
-}
-
-void
-queue_list_size_allocate_cb(GtkWidget *widget, GtkAllocation *allocation, GtkCellRenderer *cell)
-{
-       GtkTreeViewColumn *column;
-       gint width;
-       
-       column = gtk_tree_view_get_column (GTK_TREE_VIEW(widget), 0);
-       width = gtk_tree_view_column_get_width(column);
-       g_debug("col width %d alloc width %d\n", width, allocation->width);
-       // Set new wrap-width.  Shave a little off to accomidate the icons
-       // that share this column.
-       if (width >= 564) // Don't allow below a certain size
-               g_object_set(cell, "wrap-width", width-70, NULL);
-}
-
-void
-preview_button_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
-{
-       gint titleindex = ghb_settings_get_int(ud->settings, "title");
-       if (titleindex < 0) return;
-       g_debug("titleindex %d\n", 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\n", 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\n");
-               return;
-       }
-       g_debug("-------------------------------prev allocate %d x %d\n", preview_button_width, preview_button_height);
-       preview_button_width = allocation->width;
-       preview_button_height = allocation->height;
-       set_preview_image(ud);
-}
 
-void
-queue_start_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
-{
-       GSList *link = ud->queue;
-       job_settings_t *job;
-       gboolean running = FALSE;
-       while (link != NULL)
-       {
-               job = (job_settings_t*)link->data;
-               if ((job->status == GHB_QUEUE_RUNNING) || 
-                       (job->status == GHB_QUEUE_PENDING))
-               {
-                       running = TRUE;
-                       break;
-               }
-               link = link->next;
+       const GValue *chapters;
+       GValue *chapter;
+
+       chapters = ghb_settings_get_value(ud->settings, "chapter_list");
+       chapter = ghb_array_get_nth(chapters, index-1);
+       g_value_set_string(chapter, text);
+       if ((chapter_edit_key == GDK_Return || chapter_edit_key == GDK_Down) &&
+               gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter))
+       {
+               GtkTreeViewColumn *column;
+
+               gtk_tree_path_next(treepath);
+               // When a cell has been edited, I want to advance to the
+               // next cell and start editing it automaitcally.
+               // Unfortunately, we may not be in a state here where
+               // editing is allowed.  This happens when the user selects
+               // a new cell with the mouse instead of just hitting enter.
+               // Some kind of Gtk quirk.  widget_editable==NULL assertion.
+               // Editing is enabled again once the selection event has been
+               // processed.  So I'm queueing up a callback to be called
+               // when things go idle.  There, I will advance to the next
+               // cell and initiate editing.
+               //
+               // Now, you might be asking why I don't catch the keypress
+               // event and determine what action to take based on that.
+               // The Gtk developers in their infinite wisdom have made the 
+               // actual GtkEdit widget being used a private member of
+               // GtkCellRendererText, so it can not be accessed to hang a
+               // signal handler off of.  And they also do not propagate the
+               // keypress signals in any other way.  So that information is lost.
+               //g_idle_add((GSourceFunc)next_cell, ud);
+               //
+               // Keeping the above comment for posterity.
+               // I got industrious and made my own CellTextRendererText that
+               // passes on the key-press-event. So now I have much better
+               // control of this.
+               column = gtk_tree_view_get_column(treeview, 2);
+               gtk_tree_view_set_cursor(treeview, treepath, column, TRUE);
        }
-       if (!running)
+       else if (chapter_edit_key == GDK_Up && row > 0)
        {
-               // The queue has no running or pending jobs.
-               // Add current settings to the queue, then run.
-               if (!queue_add(ud))
-                       return;
+               GtkTreeViewColumn *column;
+               gtk_tree_path_prev(treepath);
+               column = gtk_tree_view_get_column(treeview, 2);
+               gtk_tree_view_set_cursor(treeview, treepath, column, TRUE);
        }
-       ghb_start_queue();
-}
-
-void
-queue_stop_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
-{
-       cancel_encode(NULL);
-}
-
-void
-queue_pause_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
-{
-       ghb_pause_queue();
+       gtk_tree_path_free (treepath);
 }
 
 void
-presets_default_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
+chapter_list_selection_changed_cb(GtkTreeSelection *selection, signal_user_data_t *ud)
 {
-       ghb_set_preset_default(ud->settings);
-       ghb_presets_list_update(ud);
+       g_debug("chapter_list_selection_changed_cb ()");
+       //chapter_selection_changed = TRUE;
 }
 
 void
@@ -3316,24 +2415,18 @@ debug_log_handler(const gchar *domain, GLogLevelFlags flags, const gchar *msg, g
        }
 }
 
-static void
-set_visible(GtkWidget *widget, gboolean visible)
+void
+warn_log_handler(const gchar *domain, GLogLevelFlags flags, const gchar *msg, gpointer data)
 {
-       if (visible)
-       {
-               gtk_widget_show_now(widget);
-       }
-       else
-       {
-               gtk_widget_hide(widget);
-       }
+       printf("mywarning\n");
+       printf("%s: %s\n", domain, msg);
 }
 
 void
 ghb_hbfd(signal_user_data_t *ud, gboolean hbfd)
 {
        GtkWidget *widget;
-       g_debug("ghb_hbfd\n");
+       g_debug("ghb_hbfd");
        widget = GHB_WIDGET(ud->builder, "queue_pause1");
        set_visible(widget, !hbfd);
        widget = GHB_WIDGET(ud->builder, "queue_add");
@@ -3353,8 +2446,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);
 
@@ -3363,9 +2454,9 @@ ghb_hbfd(signal_user_data_t *ud, gboolean hbfd)
 void
 hbfd_toggled_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-       g_debug("hbfd_toggled_cb\n");
+       g_debug("hbfd_toggled_cb");
        ghb_widget_to_setting (ud->settings, widget);
-       gboolean hbfd = ghb_settings_get_bool(ud->settings, "hbfd");
+       gboolean hbfd = ghb_settings_get_boolean(ud->settings, "hbfd");
        ghb_hbfd(ud, hbfd);
        ghb_pref_save(ud->settings, "hbfd");
 }
@@ -3373,61 +2464,57 @@ hbfd_toggled_cb(GtkWidget *widget, signal_user_data_t *ud)
 void
 pref_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-       g_debug("pref_changed_cb\n");
+       g_debug("pref_changed_cb");
        ghb_widget_to_setting (ud->settings, widget);
+       ghb_check_dependency(ud, widget);
        const gchar *name = gtk_widget_get_name(widget);
        ghb_pref_save(ud->settings, name);
 }
 
 void
-tweaks_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
+vqual_granularity_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-       g_debug("tweaks_changed_cb\n");
+       g_debug("vqual_granularity_changed_cb");
        ghb_widget_to_setting (ud->settings, widget);
+       ghb_check_dependency(ud, widget);
+
        const gchar *name = gtk_widget_get_name(widget);
        ghb_pref_save(ud->settings, name);
 
-       gboolean tweaks = ghb_settings_get_bool(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);
+       gdouble vqmin, vqmax, step, page;
+       gboolean inverted;
+       gint digits;
 
-       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 gchar *str;
-               str = ghb_settings_get_short_opt(ud->settings, "deinterlace");
-               ghb_ui_update(ud, "tweak_deinterlace", str);
-               str = ghb_settings_get_short_opt(ud->settings, "denoise");
-               ghb_ui_update(ud, "tweak_denoise", str);
-       }
-       else
-       {
-               const gchar *str;
-               str = ghb_settings_get_short_opt(ud->settings, "tweak_deinterlace");
-               ghb_ui_update(ud, "deinterlace", str);
-               str = ghb_settings_get_short_opt(ud->settings, "tweak_denoise");
-               ghb_ui_update(ud, "denoise", str);
-       }
+       ghb_vquality_range(ud, &vqmin, &vqmax, &step, &page, &digits, &inverted);
+       GtkWidget *qp = GHB_WIDGET(ud->builder, "VideoQualitySlider");
+       gtk_range_set_increments (GTK_RANGE(qp), step, page);
+}
+
+void
+tweaks_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
+{
+       g_debug("tweaks_changed_cb");
+       ghb_widget_to_setting (ud->settings, widget);
+       const gchar *name = gtk_widget_get_name(widget);
+       ghb_pref_save(ud->settings, name);
 }
 
 void
 hbfd_feature_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-       g_debug("hbfd_feature_changed_cb\n");
+       g_debug("hbfd_feature_changed_cb");
        ghb_widget_to_setting (ud->settings, widget);
        const gchar *name = gtk_widget_get_name(widget);
        ghb_pref_save(ud->settings, name);
 
-       gboolean hbfd = ghb_settings_get_bool(ud->settings, "hbfd_feature");
+       gboolean hbfd = ghb_settings_get_boolean(ud->settings, "hbfd_feature");
        GtkAction *action;
-       gint val;
-       val = ghb_settings_get_int(ud->settings, "hbfd");
-       ghb_ui_update_int(ud, "hbfd", hbfd && val);
+       if (hbfd)
+       {
+               const GValue *val;
+               val = ghb_settings_get_value(ud->settings, "hbfd");
+               ghb_ui_update(ud, "hbfd", val);
+       }
        action = GHB_ACTION (ud->builder, "hbfd");
        gtk_action_set_visible(action, hbfd);
 }
@@ -3500,8 +2587,6 @@ dvd_device_list()
        return dvd_devices;
 }
 
-
-static DBusConnection *dbus_connection = NULL;
 static LibHalContext *hal_ctx;
 
 gboolean
@@ -3514,6 +2599,7 @@ ghb_is_cd(GDrive *gd)
        device = g_drive_get_identifier(gd, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE);
        halDrive = libhal_drive_from_device_file (hal_ctx, device);
        dtype = libhal_drive_get_type(halDrive);
+       libhal_drive_free(halDrive);
        g_free(device);
        return (dtype == LIBHAL_DRIVE_TYPE_CDROM);
 }
@@ -3522,9 +2608,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.
@@ -3533,7 +2620,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.
@@ -3546,83 +2632,186 @@ drive_changed_cb(GVolumeMonitor *gvm, GDrive *gd, signal_user_data_t *ud)
                        gtk_progress_bar_set_text (progress, "Scanning ...");
                        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();
+}
+
+#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;
 
-    if (dbus_connection != NULL)
-        return TRUE;
+void
+ghb_inhibit_gpm()
+{
+       DBusGConnection *conn;
+       DBusGProxy      *proxy;
+       GError *error = NULL;
+       gboolean res;
+       
 
-    dbus_error_init (&error);
-    if (!(dbus_connection = dbus_bus_get (DBUS_BUS_SYSTEM, &error))) {
-        g_debug ("could not get system bus: %s\n", error.message);
-        dbus_error_free (&error);
-        return FALSE;
-    }
+       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()
 {
-    DBusError error;
-    char **devices;
-    int nr;
-
-    if (!dbus_init ())
-        return;
+       DBusGConnection *gconn;
+       DBusConnection *conn;
+       GError *gerror = NULL;
+       DBusError error;
+       char **devices;
+       int nr;
 
-    if (!(hal_ctx = libhal_ctx_new ())) {
-        g_warning ("failed to create a HAL context!");
-        return;
-    }
+       dbus_init ();
 
-    libhal_ctx_set_dbus_connection (hal_ctx, dbus_connection);
-    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);
-        return;
-    }
+       if (!(hal_ctx = libhal_ctx_new ())) {
+               g_warning ("failed to create a HAL context!");
+               return;
+       }
 
-    /*
-     * Do something to ping the HAL daemon - the above functions will
-     * succeed even if hald is not running, so long as DBUS is.  But we
-     * want to exit silently if hald is not running, to behave on
-     * pre-2.6 systems.
-     */
-    if (!(devices = libhal_get_all_devices (hal_ctx, &nr, &error))) {
-        g_warning ("seems that HAL is not running: %s", error.message ? error.message : "unknown");
-        dbus_error_free (&error);
+       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;
+       }
 
-        libhal_ctx_shutdown (hal_ctx, NULL);
-        libhal_ctx_free (hal_ctx);
-        return;
-    }
+       /*
+        * Do something to ping the HAL daemon - the above functions will
+        * succeed even if hald is not running, so long as DBUS is.  But we
+        * want to exit silently if hald is not running, to behave on
+        * pre-2.6 systems.
+        */
+       if (!(devices = libhal_get_all_devices (hal_ctx, &nr, &error))) {
+               g_warning ("seems that HAL is not running: %s", error.message ? error.message : "unknown");
+               dbus_error_free (&error);
 
-    libhal_free_string_array (devices);
+               libhal_ctx_shutdown (hal_ctx, NULL);
+               libhal_ctx_free (hal_ctx);
+               dbus_g_connection_unref(gconn);
+               return;
+       }
 
-    //gvm_hal_claim_branch ("/org/freedesktop/Hal/devices/local");
+       libhal_free_string_array (devices);
+       dbus_g_connection_unref(gconn);
 }
 
 gboolean 
@@ -3637,13 +2826,13 @@ tweak_setting_cb(
        gboolean allow_tweaks;
 
        g_debug("press %d %d", event->type, event->button);
-       allow_tweaks = ghb_settings_get_bool (ud->settings, "allow_tweaks");
+       allow_tweaks = ghb_settings_get_boolean(ud->settings, "allow_tweaks");
        if (allow_tweaks && event->type == GDK_BUTTON_PRESS && event->button == 3)
        { // Its a right mouse click
                GtkWidget *dialog;
                GtkEntry *entry;
                GtkResponseType response;
-               const gchar *tweak = NULL;
+               gchar *tweak = NULL;
 
                name = gtk_widget_get_name(widget);
                if (g_str_has_prefix(name, "tweak_"))
@@ -3660,12 +2849,15 @@ tweak_setting_cb(
                gtk_window_set_title(GTK_WINDOW(dialog), tweak_name);
                entry = GTK_ENTRY(GHB_WIDGET(ud->builder, "tweak_setting"));
                if (tweak)
+               {
                        gtk_entry_set_text(entry, tweak);
+                       g_free(tweak);
+               }
                response = gtk_dialog_run(GTK_DIALOG(dialog));
                gtk_widget_hide(dialog);
                if (response == GTK_RESPONSE_OK)
                {
-                       tweak = gtk_entry_get_text(entry);
+                       tweak = (gchar*)gtk_entry_get_text(entry);
                        if (ghb_validate_filter_string(tweak, -1))
                                ghb_settings_set_string(ud->settings, tweak_name, tweak);
                        else
@@ -3710,3 +2902,302 @@ easter_egg_cb(
        return FALSE;
 }
 
+gchar*
+format_deblock_cb(GtkScale *scale, gdouble val, signal_user_data_t *ud)
+{
+       if (val < 5.0)
+       {
+               return g_strdup_printf("Off");
+       }
+       else
+       {
+               return g_strdup_printf("%d", (gint)val);
+       }
+}
+
+gchar*
+format_drc_cb(GtkScale *scale, gdouble val, signal_user_data_t *ud)
+{
+       if (val <= 0.0)
+       {
+               return g_strdup_printf("Off");
+       }
+       else
+       {
+               return g_strdup_printf("%.1f", val);
+       }
+}
+
+gchar*
+format_vquality_cb(GtkScale *scale, gdouble val, signal_user_data_t *ud)
+{
+       gdouble percent;
+
+       gint vcodec = ghb_settings_combo_int(ud->settings, "VideoEncoder");
+       switch (vcodec)
+       {
+               case HB_VCODEC_X264:
+               {
+                       gboolean crf;
+                       crf = ghb_settings_get_boolean(ud->settings, "constant_rate_factor");
+                       percent = 100. * (51 - val) / 51.;
+                       if (crf)
+                               return g_strdup_printf("RF: %.4g (%.0f%%)", val, percent);
+                       else
+                               return g_strdup_printf("QP: %.4g (%.0f%%)", val, percent);
+               } break;
+
+               case HB_VCODEC_XVID:
+               case HB_VCODEC_FFMPEG:
+               {
+                       percent = 100. * (30 - (val - 1)) / 30.;
+                       return g_strdup_printf("QP: %d (%.0f%%)", (int)val, percent);
+               } break;
+
+               case HB_VCODEC_THEORA:
+               {
+                       percent = 100. * val / 63.;
+                       return g_strdup_printf("QP: %d (%.0f%%)", (int)val, percent);
+               } break;
+
+               default:
+               {
+                       percent = 0;
+               } break;
+       }
+       return g_strdup_printf("QP: %.1f / %.1f%%", val, percent);
+}
+
+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_get_build(NULL) % 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_get_build(NULL) || skip == ibuild)
+       {
+               if (!stable_update_lock && hb_get_build(NULL) % 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_get_version(NULL), hb_get_build(NULL));
+       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_get_build(NULL) % 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;
+}
+
+void
+status_activate_cb(GtkStatusIcon *si, signal_user_data_t *ud)
+{
+       GtkWindow *window;
+
+       window = GTK_WINDOW(GHB_WIDGET(ud->builder, "hb_window"));
+       gtk_window_present(window);
+}
+
+static void
+notify_closed_cb(NotifyNotification *notification, signal_user_data_t *ud)
+{
+       g_object_unref(G_OBJECT(notification));
+}
+
+void
+ghb_notify_done(signal_user_data_t *ud)
+{
+       NotifyNotification *notification;
+       GtkStatusIcon *si;
+
+       si = GTK_STATUS_ICON(GHB_OBJECT(ud->builder, "hb_status"));
+       gtk_status_icon_set_from_icon_name(si, "hb-status-empty");
+       notification = notify_notification_new(
+               "Encode Complete",
+               "Put down that cocktail, Your HandBrake queue is done!",
+               "hb-icon",
+               NULL);
+       notify_notification_attach_to_status_icon(notification, si);
+       g_signal_connect(notification, "closed", (GCallback)notify_closed_cb, ud);
+       notify_notification_show(notification, NULL);
+}