OSDN Git Service

LinGui: add update checking. shows a dialog similar to the macui when
[handbrake-jp/handbrake-jp-git.git] / gtk / src / callbacks.c
index eb0e428..f7e5518 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 <gio/gio.h>
 
+#include "hb.h"
 #include "callbacks.h"
+#include "queuehandler.h"
+#include "audiohandler.h"
 #include "resources.h"
 #include "settings.h"
 #include "presets.h"
 #include "values.h"
 #include "plist.h"
+#include "appcast.h"
 #include "hb-backend.h"
 #include "ghb-dvd.h"
 #include "ghbcellrenderertext.h"
-#include "hb.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 GValue* get_selected_asettings(signal_user_data_t *ud);
-static gint find_last_finished(GValue *queue);
+static void prune_logs(signal_user_data_t *ud);
 
 // This is a dependency map used for greying widgets
 // that are dependent on the state of another widget.
@@ -142,8 +144,8 @@ dep_check(signal_user_data_t *ud, const gchar *name)
        return result;
 }
 
-static void
-check_dependency(signal_user_data_t *ud, GtkWidget *widget)
+void
+ghb_check_dependency(signal_user_data_t *ud, GtkWidget *widget)
 {
        GObject *dep_object;
        const gchar *name;
@@ -157,7 +159,7 @@ check_dependency(signal_user_data_t *ud, GtkWidget *widget)
                if (gtk_combo_box_get_active(GTK_COMBO_BOX(widget)) < 0) return;
 
        name = gtk_widget_get_name(widget);
-       g_debug("check_dependency () %s", name);
+       g_debug("ghb_check_dependency () %s", name);
 
        array = ghb_dict_lookup(dep_map, name);
        count = ghb_array_len(array);
@@ -213,20 +215,6 @@ ghb_check_all_depencencies(signal_user_data_t *ud)
        }
 }
 
-static void
-clear_presets_selection(signal_user_data_t *ud)
-{
-       GtkTreeView *treeview;
-       GtkTreeSelection *selection;
-       
-       if (ud->dont_clear_presets) return;
-       g_debug("clear_presets_selection()");
-       treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "presets_list"));
-       selection = gtk_tree_view_get_selection (treeview);
-       gtk_tree_selection_unselect_all (selection);
-       ghb_settings_set_boolean(ud->settings, "preset_modified", TRUE);
-}
-
 static gchar*
 expand_tilde(const gchar *path)
 {
@@ -268,15 +256,17 @@ on_quit1_activate(GtkMenuItem *quit, signal_user_data_t *ud)
        g_debug("on_quit1_activate ()");
        if (state & GHB_STATE_WORKING)
        {
-               if (cancel_encode("Closing HandBrake will terminate encoding.\n"))
+               if (ghb_cancel_encode("Closing HandBrake will terminate encoding.\n"))
                {
                        ghb_hb_cleanup(FALSE);
+                       prune_logs(ud);
                        gtk_main_quit();
                        return;
                }
                return;
        }
        ghb_hb_cleanup(FALSE);
+       prune_logs(ud);
        gtk_main_quit();
 }
 
@@ -290,7 +280,7 @@ set_destination(signal_user_data_t *ud)
                gchar *dir, *new_name;
                
                filename = ghb_settings_get_string(ud->settings, "destination");
-               extension = ghb_settings_get_string(ud->settings, "container");
+               extension = ghb_settings_get_string(ud->settings, "FileFormat");
                dir = g_path_get_dirname (filename);
                vol_name = ghb_settings_get_string(ud->settings, "volume_label");
                if (ghb_settings_get_boolean(ud->settings, "chapters_in_destination"))
@@ -379,6 +369,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)
 {
@@ -410,11 +422,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
                {
@@ -562,11 +570,36 @@ source_dialog_extra_widgets(GtkWidget *dialog, gboolean checkbutton_active)
        return GTK_WIDGET(vbox);
 }
 
-static void
-do_scan(signal_user_data_t *ud, const gchar *filename)
+extern GValue *ghb_queue_edit_settings;
+static gchar *last_scan_file = NULL;
+
+void
+ghb_do_scan(signal_user_data_t *ud, const gchar *filename, gboolean force)
 {
+       if (!force && last_scan_file != NULL &&
+               strcmp(last_scan_file, filename) == 0)
+       {
+               if (ghb_queue_edit_settings)
+               {
+                       gint jstatus;
+
+                       jstatus = ghb_settings_get_int(ghb_queue_edit_settings, "job_status");
+                       ghb_settings_to_ui(ud, ghb_queue_edit_settings);
+                       ghb_set_audio(ud, ghb_queue_edit_settings);
+                       if (jstatus == GHB_QUEUE_PENDING)
+                       {
+                               ghb_value_free(ghb_queue_edit_settings);
+                       }
+                       ghb_queue_edit_settings = NULL;
+               }
+               return;
+       }
+       if (last_scan_file != NULL)
+               g_free(last_scan_file);
+       last_scan_file = NULL;
        if (filename != NULL)
        {
+               last_scan_file = g_strdup(filename);
                ghb_settings_set_string(ud->settings, "source", filename);
                if (update_source_label(ud, filename))
                {
@@ -577,6 +610,7 @@ do_scan(signal_user_data_t *ud, const gchar *filename)
                        gtk_progress_bar_set_fraction (progress, 0);
                        gtk_progress_bar_set_text (progress, "Scanning ...");
                        ghb_hb_cleanup(TRUE);
+                       prune_logs(ud);
                        ghb_backend_scan (path, 0);
                        g_free(path);
                }
@@ -627,7 +661,7 @@ source_button_clicked_cb(GtkButton *button, signal_user_data_t *ud)
                filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
                if (filename != NULL)
                {
-                       do_scan(ud, filename);
+                       ghb_do_scan(ud, filename, TRUE);
                        if (strcmp(sourcename, filename) != 0)
                        {
                                ghb_settings_set_string (ud->settings, "default_source", filename);
@@ -649,7 +683,7 @@ dvd_source_activate_cb(GtkAction *action, signal_user_data_t *ud)
 
        sourcename = ghb_settings_get_string(ud->settings, "source");
        filename = gtk_action_get_name(action);
-       do_scan(ud, filename);
+       ghb_do_scan(ud, filename, TRUE);
        if (strcmp(sourcename, filename) != 0)
        {
                ghb_settings_set_string (ud->settings, "default_source", filename);
@@ -669,7 +703,7 @@ update_destination_extension(signal_user_data_t *ud)
        GtkEntry *entry;
 
        g_debug("update_destination_extension ()");
-       extension = ghb_settings_get_string(ud->settings, "container");
+       extension = ghb_settings_get_string(ud->settings, "FileFormat");
        entry = GTK_ENTRY(GHB_WIDGET(ud->builder, "destination"));
        filename = g_strdup(gtk_entry_get_text(entry));
        for (ii = 0; containers[ii] != NULL; ii++)
@@ -803,6 +837,7 @@ window_destroy_event_cb(GtkWidget *widget, GdkEvent *event, signal_user_data_t *
 {
        g_debug("window_destroy_event_cb ()");
        ghb_hb_cleanup(FALSE);
+       prune_logs(ud);
        gtk_main_quit();
        return FALSE;
 }
@@ -814,15 +849,17 @@ window_delete_event_cb(GtkWidget *widget, GdkEvent *event, signal_user_data_t *u
        g_debug("window_delete_event_cb ()");
        if (state & GHB_STATE_WORKING)
        {
-               if (cancel_encode("Closing HandBrake will terminate encoding.\n"))
+               if (ghb_cancel_encode("Closing HandBrake will terminate encoding.\n"))
                {
                        ghb_hb_cleanup(FALSE);
+                       prune_logs(ud);
                        gtk_main_quit();
                        return FALSE;
                }
                return TRUE;
        }
        ghb_hb_cleanup(FALSE);
+       prune_logs(ud);
        gtk_main_quit();
        return FALSE;
 }
@@ -840,19 +877,19 @@ container_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
        g_debug("container_changed_cb ()");
        ghb_widget_to_setting(ud->settings, widget);
        update_destination_extension(ud);
-       check_dependency(ud, widget);
+       ghb_check_dependency(ud, widget);
        update_acodec_combo(ud);
-       clear_presets_selection(ud);
+       ghb_clear_presets_selection(ud);
 
        audio_list = ghb_settings_get_value(ud->settings, "audio_list");
        if (ghb_ac3_in_audio_list (audio_list))
        {
                gchar *container;
 
-               container = ghb_settings_get_string(ud->settings, "container");
+               container = ghb_settings_get_string(ud->settings, "FileFormat");
                if (strcmp(container, "mp4") == 0)
                {
-                       ghb_ui_update(ud, "container", ghb_string_value("m4v"));
+                       ghb_ui_update(ud, "FileFormat", ghb_string_value("m4v"));
                }
                g_free(container);
        }
@@ -922,7 +959,7 @@ show_title_info(signal_user_data_t *ud, ghb_title_info_t *tinfo)
                ghb_int64_value(tinfo->width - tinfo->crop[2] - tinfo->crop[3]));
        // If anamorphic or keep_aspect, the hight will be automatically calculated
        gboolean keep_aspect, anamorphic;
-       keep_aspect = ghb_settings_get_boolean(ud->settings, "keep_aspect");
+       keep_aspect = ghb_settings_get_boolean(ud->settings, "PictureKeepRatio");
        anamorphic = ghb_settings_get_boolean(ud->settings, "anamorphic");
        if (!(keep_aspect || anamorphic))
        {
@@ -934,172 +971,42 @@ show_title_info(signal_user_data_t *ud, ghb_title_info_t *tinfo)
        // you pass it a cropped width or height == 0.
        gint bound;
        bound = tinfo->height / 2 - 2;
-       widget = GHB_WIDGET (ud->builder, "crop_top");
+       widget = GHB_WIDGET (ud->builder, "PictureTopCrop");
        gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, bound);
-       widget = GHB_WIDGET (ud->builder, "crop_bottom");
+       widget = GHB_WIDGET (ud->builder, "PictureBottomCrop");
        gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, bound);
        bound = tinfo->width / 2 - 2;
-       widget = GHB_WIDGET (ud->builder, "crop_left");
+       widget = GHB_WIDGET (ud->builder, "PictureLeftCrop");
        gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, bound);
-       widget = GHB_WIDGET (ud->builder, "crop_right");
+       widget = GHB_WIDGET (ud->builder, "PictureRightCrop");
        gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, bound);
-       if (ghb_settings_get_boolean(ud->settings, "autocrop"))
+       if (ghb_settings_get_boolean(ud->settings, "PictureAutoCrop"))
        {
-               ghb_ui_update(ud, "crop_top", ghb_int64_value(tinfo->crop[0]));
-               ghb_ui_update(ud, "crop_bottom", ghb_int64_value(tinfo->crop[1]));
-               ghb_ui_update(ud, "crop_left", ghb_int64_value(tinfo->crop[2]));
-               ghb_ui_update(ud, "crop_right", ghb_int64_value(tinfo->crop[3]));
+               ghb_ui_update(ud, "PictureTopCrop", ghb_int64_value(tinfo->crop[0]));
+               ghb_ui_update(ud, "PictureBottomCrop", ghb_int64_value(tinfo->crop[1]));
+               ghb_ui_update(ud, "PictureLeftCrop", ghb_int64_value(tinfo->crop[2]));
+               ghb_ui_update(ud, "PictureRightCrop", ghb_int64_value(tinfo->crop[3]));
        }
+       ghb_set_scale (ud, GHB_SCALE_KEEP_NONE);
+       gint width, height, crop[4];
+       crop[0] = ghb_settings_get_int(ud->settings, "PictureTopCrop");
+       crop[1] = ghb_settings_get_int(ud->settings, "PictureBottomCrop");
+       crop[2] = ghb_settings_get_int(ud->settings, "PictureLeftCrop");
+       crop[3] = ghb_settings_get_int(ud->settings, "PictureRightCrop");
+       width = tinfo->width - crop[2] - crop[3];
+       height = tinfo->height - crop[0] - crop[1];
+       widget = GHB_WIDGET (ud->builder, "crop_dimensions");
+       text = g_strdup_printf ("%d x %d", width, height);
+       gtk_label_set_text (GTK_LABEL(widget), text);
+       g_free(text);
+
        g_debug("setting max end chapter %d", tinfo->num_chapters);
        widget = GHB_WIDGET (ud->builder, "end_chapter");
        gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 1, tinfo->num_chapters);
        gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), tinfo->num_chapters);
        widget = GHB_WIDGET (ud->builder, "start_chapter");
        gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), 1);
-}
-
-static void
-adjust_audio_rate_combos(signal_user_data_t *ud)
-{
-       gint titleindex, audioindex, acodec;
-       ghb_audio_info_t ainfo;
-       GtkWidget *widget;
-       
-       g_debug("adjust_audio_rate_combos ()");
-       titleindex = ghb_settings_combo_int(ud->settings, "title");
-
-       widget = GHB_WIDGET(ud->builder, "audio_track");
-       audioindex = ghb_lookup_combo_int("audio_track", ghb_widget_value(widget));
-
-       widget = GHB_WIDGET(ud->builder, "audio_codec");
-       acodec = ghb_lookup_combo_int("audio_codec", ghb_widget_value(widget));
-
-       if (ghb_audio_is_passthru (acodec))
-       {
-               ghb_set_default_bitrate_opts (ud->builder, -1);
-               if (ghb_get_audio_info (&ainfo, titleindex, audioindex))
-               {
-                       gint br = ainfo.bitrate / 1000;
-                       // Set the values for bitrate and samplerate to the input rates
-                       ghb_set_passthru_bitrate_opts (ud->builder, br);
-                       ghb_ui_update(ud, "audio_bitrate", ghb_int64_value(br));
-                       ghb_ui_update(ud, "audio_rate", ghb_int64_value(0));
-                       ghb_ui_update(ud, "audio_mix", ghb_int64_value(0));
-               }
-               else
-               {
-                       ghb_ui_update(ud, "audio_bitrate", ghb_int64_value(384));
-                       ghb_ui_update(ud, "audio_rate", ghb_int64_value(0));
-                       ghb_ui_update(ud, "audio_mix", ghb_int64_value(0));
-               }
-       }
-       else if (acodec == HB_ACODEC_FAAC)
-       {
-               gint br;
-
-               widget = GHB_WIDGET(ud->builder, "audio_bitrate");
-               br = ghb_lookup_combo_int("audio_bitrate", ghb_widget_value(widget));
-               if (br > 160)
-                       ghb_ui_update(ud, "audio_bitrate", ghb_int64_value(160));
-               ghb_set_default_bitrate_opts (ud->builder, 160);
-       }
-       else
-       {
-               ghb_set_default_bitrate_opts (ud->builder, -1);
-       }
-}
-
-static void
-set_pref_audio(gint titleindex, signal_user_data_t *ud)
-{
-       gint acodec_code, mix_code, track;
-       gchar *source_lang;
-       GtkWidget *button;
-       ghb_audio_info_t ainfo;
-       gint index;
-       GHashTable *track_indicies;
-       gint *iptr;
-
-       GValue *pref_audio;
-       GValue *audio, *acodec, *bitrate, *rate, *mix, *drc;
-       gint count, ii, list_count;
-       
-       g_debug("set_pref_audio");
-       track_indicies = g_hash_table_new(g_int_hash, g_int_equal);
-       // Clear the audio list
-       clear_audio_list(ud);
-       // Find "best" audio based on audio preferences
-       button = GHB_WIDGET (ud->builder, "audio_add");
-       source_lang = ghb_settings_get_string(ud->settings, "source_audio_lang");
-
-       pref_audio = ghb_settings_get_value(ud->settings, "pref_audio_list");
-
-       list_count = 0;
-       count = ghb_array_len(pref_audio);
-       for (ii = 0; ii < count; ii++)
-       {
-               audio = ghb_array_get_nth(pref_audio, ii);
-               acodec = ghb_settings_get_value(audio, "audio_codec");
-               bitrate = ghb_settings_get_value(audio, "audio_bitrate");
-               rate = ghb_settings_get_value(audio, "audio_rate");
-               mix = ghb_settings_get_value(audio, "audio_mix");
-               drc = ghb_settings_get_value(audio, "audio_drc");
-               acodec_code = ghb_lookup_combo_int("audio_codec", acodec);
-               // If there are multiple audios using the same codec, then
-               // select sequential tracks for each.  This hash keeps track 
-               // of the last used track for each codec.
-               iptr = g_hash_table_lookup(track_indicies, &acodec_code);
-               if (iptr == NULL)
-                       index = 0;
-               else
-                       index = *(gint*)iptr;
-
-               track = ghb_find_audio_track(titleindex, source_lang, index);
-               // Check to see if:
-               // 1. pref codec is ac3
-               // 2. source codec is not ac3
-               // 3. next pref is enabled
-               if (ghb_get_audio_info (&ainfo, titleindex, track) && 
-                       ghb_audio_is_passthru (acodec_code))
-               {
-                       if (!ghb_audio_is_passthru(ainfo.codec))
-                       {
-                               acodec_code = ghb_get_default_acodec();
-                               // If there's more audio to process, or we've already
-                               // placed one in the list, then we can skip this one
-                               if ((ii + 1 < count) || (list_count != 0))
-                               {
-                                       // Skip this audio
-                                       acodec_code = 0;
-                               }
-                       }
-               }
-               if (titleindex >= 0 && track < 0)
-                       acodec_code = 0;
-               if (acodec_code != 0)
-               {
-                       // Add to audio list
-                       g_signal_emit_by_name(button, "clicked", ud);
-                       list_count++;
-                       ghb_ui_update(ud, "audio_track", ghb_int64_value(track));
-                       ghb_ui_update(ud, "audio_codec", acodec);
-                       if (!ghb_audio_is_passthru (acodec_code))
-                       {
-                               // This gets set autimatically if the codec is passthru
-                               ghb_ui_update(ud, "audio_bitrate", bitrate);
-                               ghb_ui_update(ud, "audio_rate", rate);
-                               mix_code = ghb_lookup_combo_int("audio_mix", mix);
-                               mix_code = ghb_get_best_mix(
-                                       titleindex, track, acodec_code, mix_code);
-                               ghb_ui_update(ud, "audio_mix", ghb_int64_value(mix_code));
-                       }
-                       ghb_ui_update(ud, "audio_drc", drc);
-                       index++;
-                       g_hash_table_insert(track_indicies, &acodec_code, &index);
-               }
-       }
-       g_free(source_lang);
-       g_hash_table_destroy(track_indicies);
+       gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 1, tinfo->num_chapters);
 }
 
 static gint preview_button_width;
@@ -1156,30 +1063,27 @@ title_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
        ghb_title_info_t tinfo;
        gint titleindex;
-       gchar *preset;
        
        g_debug("title_changed_cb ()");
        ghb_widget_to_setting(ud->settings, widget);
-       check_dependency(ud, widget);
+       ghb_check_dependency(ud, widget);
 
        titleindex = ghb_settings_combo_int(ud->settings, "title");
-       ghb_update_ui_combo_box (ud->builder, "audio_track", titleindex, FALSE);
-       ghb_update_ui_combo_box (ud->builder, "subtitle_lang", titleindex, FALSE);
+       ghb_update_ui_combo_box (ud->builder, "AudioTrack", titleindex, FALSE);
+       ghb_update_ui_combo_box (ud->builder, "Subtitles", titleindex, FALSE);
 
-       preset = ghb_settings_get_string (ud->settings, "preset");
-       ghb_update_from_preset(ud, preset, "subtitle_lang");
-       g_free(preset);
+       ghb_update_from_preset(ud, "Subtitles");
        if (ghb_get_title_info (&tinfo, titleindex))
        {
                show_title_info(ud, &tinfo);
        }
        update_chapter_list (ud);
-       adjust_audio_rate_combos(ud);
-       set_pref_audio(titleindex, ud);
+       ghb_adjust_audio_rate_combos(ud);
+       ghb_set_pref_audio(titleindex, ud);
        if (ghb_settings_get_boolean(ud->settings, "vquality_type_target"))
        {
                gint bitrate = ghb_calculate_target_bitrate (ud->settings, titleindex);
-               ghb_ui_update(ud, "video_bitrate", ghb_int64_value(bitrate));
+               ghb_ui_update(ud, "VideoAvgBitrate", ghb_int64_value(bitrate));
        }
 
        // Unfortunately, there is no way to query how many frames were
@@ -1192,109 +1096,11 @@ title_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 }
 
 void
-audio_codec_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
-{
-       static gint prev_acodec = 0;
-       gint acodec_code, mix_code;
-       GValue *asettings;
-       
-       g_debug("audio_codec_changed_cb ()");
-       acodec_code = ghb_lookup_combo_int("audio_codec", ghb_widget_value(widget));
-       if (ghb_audio_is_passthru (prev_acodec) && 
-               !ghb_audio_is_passthru (acodec_code))
-       {
-               // Transition from passthru to not, put some audio settings back to 
-               // pref settings
-               gint titleindex;
-               gint track;
-
-               titleindex = ghb_settings_combo_int(ud->settings, "title");
-               track = ghb_settings_combo_int(ud->settings, "audio_track");
-
-               ghb_ui_update(ud, "audio_bitrate", ghb_string_value("160"));
-               ghb_ui_update(ud, "audio_rate", ghb_string_value("source"));
-               mix_code = ghb_lookup_combo_int("audio_mix", ghb_string_value("dpl2"));
-               mix_code = ghb_get_best_mix( titleindex, track, acodec_code, mix_code);
-               ghb_ui_update(ud, "audio_mix", ghb_int64_value(mix_code));
-               ghb_ui_update(ud, "audio_drc", ghb_double_value(1.0));
-       }
-       adjust_audio_rate_combos(ud);
-       ghb_grey_combo_options (ud->builder);
-       check_dependency(ud, widget);
-       prev_acodec = acodec_code;
-       asettings = get_selected_asettings(ud);
-       if (asettings != NULL)
-       {
-               ghb_widget_to_setting(asettings, widget);
-               audio_list_refresh_selected(ud);
-       }
-
-       const GValue *audio_list;
-       audio_list = ghb_settings_get_value(ud->settings, "audio_list");
-       if (ghb_ac3_in_audio_list (audio_list))
-       {
-               gchar *container;
-
-               container = ghb_settings_get_string(ud->settings, "container");
-               if (strcmp(container, "mp4") == 0)
-               {
-                       ghb_ui_update(ud, "container", ghb_string_value("m4v"));
-               }
-               g_free(container);
-       }
-}
-
-static void audio_list_refresh_selected(signal_user_data_t *ud);
-
-void
-audio_track_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
-{
-       GValue *asettings;
-
-       g_debug("audio_track_changed_cb ()");
-       adjust_audio_rate_combos(ud);
-       check_dependency(ud, widget);
-       ghb_grey_combo_options(ud->builder);
-       asettings = get_selected_asettings(ud);
-       if (asettings != NULL)
-       {
-               const gchar *track;
-
-               ghb_widget_to_setting(asettings, widget);
-               audio_list_refresh_selected(ud);
-               track = ghb_settings_combo_option(asettings, "audio_track");
-               ghb_settings_set_string(asettings, "audio_track_long", track);
-       }
-}
-
-void
-audio_widget_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
-{
-       GValue *asettings;
-
-       g_debug("audio_widget_changed_cb ()");
-       check_dependency(ud, widget);
-       asettings = get_selected_asettings(ud);
-       if (asettings != NULL)
-       {
-               ghb_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 ()");
-       check_dependency(ud, widget);
-}
-
-void
 setting_widget_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
        ghb_widget_to_setting(ud->settings, widget);
-       check_dependency(ud, widget);
-       clear_presets_selection(ud);
+       ghb_check_dependency(ud, widget);
+       ghb_clear_presets_selection(ud);
 }
 
 static void
@@ -1337,7 +1143,7 @@ deint_tweak_focus_out_cb(GtkWidget *widget, GdkEventFocus *event,
        signal_user_data_t *ud)
 {
        g_debug("deint_tweak_focus_out_cb ()");
-       validate_filter_widget(ud, "tweak_deinterlace");
+       validate_filter_widget(ud, "tweak_PictureDeinterlace");
        return FALSE;
 }
 
@@ -1346,7 +1152,7 @@ denoise_tweak_focus_out_cb(GtkWidget *widget, GdkEventFocus *event,
        signal_user_data_t *ud)
 {
        g_debug("denoise_tweak_focus_out_cb ()");
-       validate_filter_widget(ud, "tweak_noise");
+       validate_filter_widget(ud, "tweak_PictureDenoise");
        return FALSE;
 }
 
@@ -1354,65 +1160,48 @@ void
 http_opt_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
        ghb_widget_to_setting(ud->settings, widget);
-       check_dependency(ud, widget);
-       clear_presets_selection(ud);
+       ghb_check_dependency(ud, widget);
+       ghb_clear_presets_selection(ud);
+       // AC3 is not allowed when Web optimized
        ghb_grey_combo_options (ud->builder);
 }
 
 void
 vcodec_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-       gint vqmin, vqmax;
+       gdouble vqmin, vqmax, step, page;
+       gint digits;
+       gint vcodec;
 
        ghb_widget_to_setting(ud->settings, widget);
-       check_dependency(ud, widget);
-       clear_presets_selection(ud);
-       ghb_vquality_range(ud, &vqmin, &vqmax);
-       GtkWidget *qp = GHB_WIDGET(ud->builder, "video_quality");
+       ghb_check_dependency(ud, widget);
+       ghb_clear_presets_selection(ud);
+       ghb_vquality_range(ud, &vqmin, &vqmax, &step, &page, &digits);
+       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", name);
-       ghb_widget_to_setting(ud->settings, widget);
-       check_dependency(ud, widget);
-       clear_presets_selection(ud);
-       if (ghb_settings_get_boolean(ud->settings, "variable_frame_rate"))
+       gtk_range_set_increments (GTK_RANGE(qp), step, page);
+       gtk_scale_set_digits(GTK_SCALE(qp), digits);
+       vcodec = ghb_settings_combo_int(ud->settings, "VideoEncoder");
+       if (vcodec != HB_VCODEC_X264 && vcodec != HB_VCODEC_FFMPEG)
        {
-               ghb_ui_update(ud, "framerate", ghb_int64_value(0));
+               ghb_ui_update(ud, "directqp", ghb_boolean_value(FALSE));
        }
 }
 
-// subtitles have their differ from other settings in that
-// the selection is updated automaitcally when the title
-// changes.  I don't want the preset selection changed as
-// would happen for regular settings.
-void
-subtitle_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
-{
-       const gchar *name = gtk_widget_get_name(widget);
-       g_debug("subtitle_changed_cb () %s", name);
-       ghb_widget_to_setting(ud->settings, widget);
-       check_dependency(ud, widget);
-}
-
 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", name);
        ghb_widget_to_setting(ud->settings, widget);
-       check_dependency(ud, widget);
-       clear_presets_selection(ud);
+       ghb_check_dependency(ud, widget);
+       ghb_clear_presets_selection(ud);
        if (ghb_settings_get_boolean(ud->settings, "vquality_type_target"))
        {
                gint titleindex;
                titleindex = ghb_settings_combo_int(ud->settings, "title");
                gint bitrate = ghb_calculate_target_bitrate (ud->settings, titleindex);
-               ghb_ui_update(ud, "video_bitrate", ghb_int64_value(bitrate));
+               ghb_ui_update(ud, "VideoAvgBitrate", ghb_int64_value(bitrate));
        }
 }
 
@@ -1428,7 +1217,7 @@ start_chapter_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
        end = ghb_settings_get_int(ud->settings, "end_chapter");
        if (start > end)
                ghb_ui_update(ud, "end_chapter", ghb_int_value(start));
-       check_dependency(ud, widget);
+       ghb_check_dependency(ud, widget);
        if (ghb_settings_get_boolean(ud->settings, "chapters_in_destination"))
        {
                set_destination(ud);
@@ -1447,7 +1236,7 @@ end_chapter_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
        end = ghb_settings_get_int(ud->settings, "end_chapter");
        if (start > end)
                ghb_ui_update(ud, "start_chapter", ghb_int_value(end));
-       check_dependency(ud, widget);
+       ghb_check_dependency(ud, widget);
        if (ghb_settings_get_boolean(ud->settings, "chapters_in_destination"))
        {
                set_destination(ud);
@@ -1459,7 +1248,7 @@ scale_width_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
        g_debug("scale_width_changed_cb ()");
        ghb_widget_to_setting(ud->settings, widget);
-       check_dependency(ud, widget);
+       ghb_check_dependency(ud, widget);
        ghb_set_scale (ud, GHB_SCALE_KEEP_WIDTH);
        update_preview = TRUE;
        gchar *text;
@@ -1476,7 +1265,7 @@ scale_height_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
        g_debug("scale_height_changed_cb ()");
        ghb_widget_to_setting(ud->settings, widget);
-       check_dependency(ud, widget);
+       ghb_check_dependency(ud, widget);
        ghb_set_scale (ud, GHB_SCALE_KEEP_HEIGHT);
        update_preview = TRUE;
        gchar *text;
@@ -1496,13 +1285,13 @@ crop_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
        
        g_debug("crop_changed_cb ()");
        ghb_widget_to_setting(ud->settings, widget);
-       check_dependency(ud, widget);
+       ghb_check_dependency(ud, widget);
        ghb_set_scale (ud, GHB_SCALE_KEEP_NONE);
 
-       crop[0] = ghb_settings_get_int(ud->settings, "crop_top");
-       crop[1] = ghb_settings_get_int(ud->settings, "crop_bottom");
-       crop[2] = ghb_settings_get_int(ud->settings, "crop_left");
-       crop[3] = ghb_settings_get_int(ud->settings, "crop_right");
+       crop[0] = ghb_settings_get_int(ud->settings, "PictureTopCrop");
+       crop[1] = ghb_settings_get_int(ud->settings, "PictureBottomCrop");
+       crop[2] = ghb_settings_get_int(ud->settings, "PictureLeftCrop");
+       crop[3] = ghb_settings_get_int(ud->settings, "PictureRightCrop");
        titleindex = ghb_settings_combo_int(ud->settings, "title");
        if (ghb_get_title_info (&tinfo, titleindex))
        {
@@ -1529,14 +1318,14 @@ scale_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
        g_debug("scale_changed_cb ()");
        ghb_widget_to_setting(ud->settings, widget);
-       check_dependency(ud, widget);
-       clear_presets_selection(ud);
+       ghb_check_dependency(ud, widget);
+       ghb_clear_presets_selection(ud);
        ghb_set_scale (ud, GHB_SCALE_KEEP_NONE);
        update_preview = TRUE;
        
        gchar *text;
        
-       text = ghb_settings_get_boolean(ud->settings, "autocrop") ? "On" : "Off";
+       text = ghb_settings_get_boolean(ud->settings, "PictureAutoCrop") ? "On" : "Off";
        widget = GHB_WIDGET (ud->builder, "crop_auto");
        gtk_label_set_text (GTK_LABEL(widget), text);
        text = ghb_settings_get_boolean(ud->settings, "autoscale") ? "On" : "Off";
@@ -1564,1638 +1353,169 @@ generic_entry_changed_cb(GtkEntry *entry, signal_user_data_t *ud)
        }
 }
 
-gboolean
-generic_focus_out_cb(GtkWidget *widget, GdkEventFocus *event, 
-       signal_user_data_t *ud)
-{
-       g_debug("generic_focus_out_cb ()");
-       ghb_widget_to_setting(ud->settings, widget);
-       return FALSE;
-}
-
-// Flag needed to prevent x264 options processing from chasing its tail
-static gboolean ignore_options_update = FALSE;
-
-void
-x264_widget_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
-{
-       ghb_widget_to_setting(ud->settings, widget);
-       if (!ignore_options_update)
-       {
-               ignore_options_update = TRUE;
-               ghb_x264_opt_update(ud, widget);
-               ignore_options_update = FALSE;
-       }
-       check_dependency(ud, widget);
-       clear_presets_selection(ud);
-}
-
 void
-x264_entry_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
+prefs_dialog_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
-       g_debug("x264_entry_changed_cb ()");
-       if (!ignore_options_update)
-       {
-               GtkWidget *textview;
-               gchar *options;
-
-               textview = GTK_WIDGET(GHB_WIDGET(ud->builder, "x264_options"));
-               ghb_widget_to_setting(ud->settings, textview);
-               options = ghb_settings_get_string(ud->settings, "x264_options");
-               ignore_options_update = TRUE;
-               ghb_x264_parse_options(ud, options);
-               if (!GTK_WIDGET_HAS_FOCUS(textview))
-               {
-                       gchar *sopts;
+       GtkWidget *dialog;
+       GtkResponseType response;
 
-                       sopts = ghb_sanitize_x264opts(ud, options);
-                       ghb_ui_update(ud, "x264_options", ghb_string_value(sopts));
-                       ghb_x264_parse_options(ud, sopts);
-                       g_free(sopts);
-               }
-               g_free(options);
-               ignore_options_update = FALSE;
-       }
+       g_debug("prefs_dialog_cb ()");
+       dialog = GHB_WIDGET(ud->builder, "prefs_dialog");
+       response = gtk_dialog_run(GTK_DIALOG(dialog));
+       gtk_widget_hide(dialog);
 }
 
 gboolean
-x264_focus_out_cb(GtkWidget *widget, GdkEventFocus *event, 
-       signal_user_data_t *ud)
+ghb_message_dialog(GtkMessageType type, const gchar *message, const gchar *no, const gchar *yes)
 {
-       gchar *options, *sopts;
-
-       ghb_widget_to_setting(ud->settings, widget);
-       options = ghb_settings_get_string(ud->settings, "x264_options");
-       sopts = ghb_sanitize_x264opts(ud, options);
-       ignore_options_update = TRUE;
-       if (sopts != NULL)
+       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)
        {
-               ghb_ui_update(ud, "x264_options", ghb_string_value(sopts));
-               ghb_x264_parse_options(ud, sopts);
+               return FALSE;
        }
-       g_free(options);
-       g_free(sopts);
-       ignore_options_update = FALSE;
-       return FALSE;
+       return TRUE;
 }
 
-static void
-clear_audio_list(signal_user_data_t *ud)
+gboolean
+ghb_cancel_encode(const gchar *extra_msg)
 {
-       GtkTreeView *treeview;
-       GtkListStore *store;
-       GValue *audio_list;
+       GtkWidget *dialog;
+       GtkResponseType response;
        
-       g_debug("clear_audio_list ()");
-       audio_list = ghb_settings_get_value(ud->settings, "audio_list");
-       if (audio_list == NULL)
-       {
-               audio_list = ghb_array_value_new(8);
-               ghb_settings_set_value(ud->settings, "audio_list", audio_list);
-       }
-       else
-               ghb_array_value_reset(audio_list, 8);
-       treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "audio_list"));
-       store = GTK_LIST_STORE(gtk_tree_view_get_model(treeview));
-       gtk_list_store_clear (store);
+       if (extra_msg == NULL) extra_msg = "";
+       // Toss up a warning dialog
+       dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL,
+                               GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE,
+                               "%sYour movie will be lost if you don't continue encoding.",
+                               extra_msg);
+       gtk_dialog_add_buttons( GTK_DIALOG(dialog), 
+                                                  "Continue Encoding", GTK_RESPONSE_NO,
+                                                  "Stop Encoding", GTK_RESPONSE_YES, NULL);
+       response = gtk_dialog_run(GTK_DIALOG(dialog));
+       gtk_widget_destroy (dialog);
+       if (response == GTK_RESPONSE_NO) return FALSE;
+       ghb_stop_queue();
+       return TRUE;
 }
 
 static void
-add_to_audio_list(signal_user_data_t *ud, GValue *settings)
+submit_job(GValue *settings)
 {
-       GtkTreeView *treeview;
-       GtkTreeIter iter;
-       GtkListStore *store;
-       GtkTreeSelection *selection;
-       const gchar *track, *codec, *br, *sr, *mix;
-       gchar *drc, *s_track, *s_codec, *s_br, *s_sr, *s_mix;
-       gdouble s_drc;
-       
-       g_debug("add_to_audio_list ()");
-       treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "audio_list"));
-       selection = gtk_tree_view_get_selection (treeview);
-       store = GTK_LIST_STORE(gtk_tree_view_get_model(treeview));
+       static gint unique_id = 1;
+       gchar *type, *modified, *preset;
+       GValue *path;
+       gboolean preset_modified;
 
-       track = ghb_settings_combo_option(settings, "audio_track");
-       codec = ghb_settings_combo_option(settings, "audio_codec");
-       br = ghb_settings_combo_option(settings, "audio_bitrate");
-       sr = ghb_settings_combo_option(settings, "audio_rate");
-       mix = ghb_settings_combo_option(settings, "audio_mix");
-       drc = ghb_settings_get_string(settings, "audio_drc");
-
-       s_track = ghb_settings_get_string(settings, "audio_track");
-       s_codec = ghb_settings_get_string(settings, "audio_codec");
-       s_br = ghb_settings_get_string(settings, "audio_bitrate");
-       s_sr = ghb_settings_get_string(settings, "audio_rate");
-       s_mix = ghb_settings_get_string(settings, "audio_mix");
-       s_drc = ghb_settings_get_double(settings, "audio_drc");
-
-       gtk_list_store_append(store, &iter);
-       gtk_list_store_set(store, &iter, 
-               // These are displayed in list
-               0, track,
-               1, codec,
-               2, br,
-               3, sr,
-               4, mix,
-               // These are used to set combo box values when a list item is selected
-               5, drc,
-               6, s_track,
-               7, s_codec,
-               8, s_br,
-               9, s_sr,
-               10, s_mix,
-               11, s_drc,
-               -1);
-       gtk_tree_selection_select_iter(selection, &iter);
-       g_free(drc);
-       g_free(s_track);
-       g_free(s_codec);
-       g_free(s_br);
-       g_free(s_sr);
-       g_free(s_mix);
+       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
-audio_list_refresh_selected(signal_user_data_t *ud)
+prune_logs(signal_user_data_t *ud)
 {
-       GtkTreeView *treeview;
-       GtkTreePath *treepath;
-       GtkTreeSelection *selection;
-       GtkTreeModel *store;
-       GtkTreeIter iter;
-       gint *indices;
-       gint row;
-       GValue *asettings = NULL;
-       const GValue *audio_list;
-       
-       g_debug("audio_list_refresh_selected ()");
-       treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "audio_list"));
-       selection = gtk_tree_view_get_selection (treeview);
-       if (gtk_tree_selection_get_selected(selection, &store, &iter))
+       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 *track, *codec, *br, *sr, *mix;
-               gchar *drc, *s_track, *s_codec, *s_br, *s_sr, *s_mix;
-               gdouble s_drc;
-               // Get the row number
-               treepath = gtk_tree_model_get_path (store, &iter);
-               indices = gtk_tree_path_get_indices (treepath);
-               row = indices[0];
-               gtk_tree_path_free(treepath);
-               // find audio settings
-               if (row < 0) return;
-               audio_list = ghb_settings_get_value(ud->settings, "audio_list");
-               if (row >= ghb_array_len(audio_list))
-                       return;
-               asettings = ghb_array_get_nth(audio_list, row);
-
-               track = ghb_settings_combo_option(asettings, "audio_track");
-               codec = ghb_settings_combo_option(asettings, "audio_codec");
-               br = ghb_settings_combo_option(asettings, "audio_bitrate");
-               sr = ghb_settings_combo_option(asettings, "audio_rate");
-               mix = ghb_settings_combo_option(asettings, "audio_mix");
-               drc = ghb_settings_get_string(asettings, "audio_drc");
-
-               s_track = ghb_settings_get_string(asettings, "audio_track");
-               s_codec = ghb_settings_get_string(asettings, "audio_codec");
-               s_br = ghb_settings_get_string(asettings, "audio_bitrate");
-               s_sr = ghb_settings_get_string(asettings, "audio_rate");
-               s_mix = ghb_settings_get_string(asettings, "audio_mix");
-               s_drc = ghb_settings_get_double(asettings, "audio_drc");
-
-               gtk_list_store_set(GTK_LIST_STORE(store), &iter, 
-                       // These are displayed in list
-                       0, track,
-                       1, codec,
-                       2, br,
-                       3, sr,
-                       4, mix,
-                       // These are used to set combo values when a list item is selected
-                       5, drc,
-                       6, s_track,
-                       7, s_codec,
-                       8, s_br,
-                       9, s_sr,
-                       10, s_mix,
-                       11, s_drc,
-                       -1);
-               g_free(drc);
-               g_free(s_track);
-               g_free(s_codec);
-               g_free(s_br);
-               g_free(s_sr);
-               g_free(s_mix);
+               const gchar *file;
+               int week = 7*24*60*60;
+               GDir *gdir = g_dir_open(dest_dir, 0, NULL);
+               time_t now;
+
+               now = time(NULL);
+               file = g_dir_read_name(gdir);
+               while (file)
+               {
+                       gchar *path;
+                       struct stat stbuf;
+
+                       path = g_strdup_printf("%s/%s", dest_dir, file);
+                       g_stat(path, &stbuf);
+                       if (now - stbuf.st_mtime > week)
+                       {
+                               g_unlink(path);
+                       }
+                       g_free(path);
+                       file = g_dir_read_name(gdir);
+               }
+               g_dir_close(gdir);
        }
+       g_free(dest_dir);
 }
 
-static GValue*
-get_selected_asettings(signal_user_data_t *ud)
+static void
+queue_scan(signal_user_data_t *ud, GValue *js)
 {
-       GtkTreeView *treeview;
-       GtkTreePath *treepath;
-       GtkTreeSelection *selection;
-       GtkTreeModel *store;
-       GtkTreeIter iter;
-       gint *indices;
-       gint row;
-       GValue *asettings = NULL;
-       const GValue *audio_list;
-       
-       g_debug("get_selected_asettings ()");
-       treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "audio_list"));
-       selection = gtk_tree_view_get_selection (treeview);
-       if (gtk_tree_selection_get_selected(selection, &store, &iter))
-       {
-               // Get the row number
-               treepath = gtk_tree_model_get_path (store, &iter);
-               indices = gtk_tree_path_get_indices (treepath);
-               row = indices[0];
-               gtk_tree_path_free(treepath);
-               // find audio settings
-               if (row < 0) return NULL;
-               audio_list = ghb_settings_get_value(ud->settings, "audio_list");
-               if (row >= ghb_array_len(audio_list))
-                       return NULL;
-               asettings = ghb_array_get_nth(audio_list, row);
-       }
-       return asettings;
-}
-
-void
-audio_list_selection_changed_cb(GtkTreeSelection *selection, signal_user_data_t *ud)
-{
-       GtkTreeModel *store;
-       GtkTreeIter iter;
-       GtkWidget *widget;
-       
-       g_debug("audio_list_selection_changed_cb ()");
-       if (gtk_tree_selection_get_selected(selection, &store, &iter))
-       {
-               const gchar *track, *codec, *bitrate, *sample_rate, *mix;
-               gdouble drc;
-
-               gtk_tree_model_get(store, &iter,
-                                                  6, &track,
-                                                  7, &codec,
-                                                  8, &bitrate,
-                                                  9, &sample_rate,
-                                                  10, &mix,
-                                                  11, &drc,
-                                                  -1);
-               ghb_ui_update(ud, "audio_track", ghb_string_value(track));
-               ghb_ui_update(ud, "audio_codec", ghb_string_value(codec));
-               ghb_ui_update(ud, "audio_bitrate", ghb_string_value(bitrate));
-               ghb_ui_update(ud, "audio_rate", ghb_string_value(sample_rate));
-               ghb_ui_update(ud, "audio_mix", ghb_string_value(mix));
-               ghb_ui_update(ud, "audio_drc", ghb_double_value(drc));
-               widget = GHB_WIDGET (ud->builder, "audio_remove");
-               gtk_widget_set_sensitive(widget, TRUE);
-               //widget = GHB_WIDGET (ud->builder, "audio_update");
-               //gtk_widget_set_sensitive(widget, TRUE);
-       }
-       else
-       {
-               widget = GHB_WIDGET (ud->builder, "audio_remove");
-               gtk_widget_set_sensitive(widget, FALSE);
-               //widget = GHB_WIDGET (ud->builder, "audio_update");
-               //gtk_widget_set_sensitive(widget, FALSE);
-       }
-}
-
-void
-audio_add_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
-{
-       // Add the current audio settings to the list.
-       GValue *asettings;
-       GtkWidget *widget;
-       gint count;
-       GValue *audio_list;
-       const gchar *track;
-       
-       g_debug("audio_add_clicked_cb ()");
-       asettings = ghb_dict_value_new();
-       // Only allow up to 8 audio entries
-       widget = GHB_WIDGET(ud->builder, "audio_track");
-       ghb_settings_take_value(asettings, "audio_track", ghb_widget_value(widget));
-       widget = GHB_WIDGET(ud->builder, "audio_codec");
-       ghb_settings_take_value(asettings, "audio_codec", ghb_widget_value(widget));
-       widget = GHB_WIDGET(ud->builder, "audio_bitrate");
-       ghb_settings_take_value(asettings, "audio_bitrate", ghb_widget_value(widget));
-       widget = GHB_WIDGET(ud->builder, "audio_rate");
-       ghb_settings_take_value(asettings, "audio_rate", ghb_widget_value(widget));
-       widget = GHB_WIDGET(ud->builder, "audio_mix");
-       ghb_settings_take_value(asettings, "audio_mix", ghb_widget_value(widget));
-       widget = GHB_WIDGET(ud->builder, "audio_drc");
-       ghb_settings_take_value(asettings, "audio_drc", ghb_widget_value(widget));
-       track = ghb_settings_combo_option(asettings, "audio_track");
-       ghb_settings_set_string(asettings, "audio_track_long", track);
-
-       audio_list = ghb_settings_get_value(ud->settings, "audio_list");
-       if (audio_list == NULL)
-       {
-               audio_list = ghb_array_value_new(8);
-               ghb_settings_set_value(ud->settings, "audio_list", audio_list);
-       }
-       ghb_array_append(audio_list, asettings);
-       add_to_audio_list(ud, asettings);
-       count = ghb_array_len(audio_list);
-       if (count >= 8)
-       {
-               gtk_widget_set_sensitive(xwidget, FALSE);
-       }
-}
-
-void
-audio_remove_clicked_cb(GtkWidget *widget, signal_user_data_t *ud)
-{
-       GtkTreeView *treeview;
-       GtkTreePath *treepath;
-       GtkTreeSelection *selection;
-       GtkTreeModel *store;
-       GtkTreeIter iter, nextIter;
-       gint *indices;
-       gint row;
-       GValue *audio_list;
-
-       g_debug("audio_remove_clicked_cb ()");
-       treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "audio_list"));
-       selection = gtk_tree_view_get_selection (treeview);
-       if (gtk_tree_selection_get_selected(selection, &store, &iter))
-       {
-               nextIter = iter;
-               if (!gtk_tree_model_iter_next(store, &nextIter))
-               {
-                       nextIter = iter;
-                       if (gtk_tree_model_get_iter_first(store, &nextIter))
-                       {
-                               gtk_tree_selection_select_iter (selection, &nextIter);
-                       }
-               }
-               else
-               {
-                       gtk_tree_selection_select_iter (selection, &nextIter);
-               }
-               // Get the row number
-               treepath = gtk_tree_model_get_path (store, &iter);
-               indices = gtk_tree_path_get_indices (treepath);
-               row = indices[0];
-               gtk_tree_path_free(treepath);
-               // Remove the selected item
-               gtk_list_store_remove (GTK_LIST_STORE(store), &iter);
-               // remove from audio settings list
-               if (row < 0) return;
-               widget = GHB_WIDGET (ud->builder, "audio_add");
-               gtk_widget_set_sensitive(widget, TRUE);
-               audio_list = ghb_settings_get_value(ud->settings, "audio_list");
-               if (row >= ghb_array_len(audio_list))
-                       return;
-               GValue *old = ghb_array_get_nth(audio_list, row);
-               ghb_value_free(old);
-               ghb_array_remove(audio_list, row);
-       }
-}
-
-static void
-audio_list_refresh(signal_user_data_t *ud)
-{
-       GtkTreeView *treeview;
-       GtkTreeIter iter;
-       GtkListStore *store;
-       gboolean done;
-       gint row = 0;
-       GValue *audio_list;
-
-       g_debug("audio_list_refresh ()");
-       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
-               {
-                       const gchar *track, *codec, *br, *sr, *mix;
-                       gchar *drc, *s_track, *s_codec, *s_br, *s_sr, *s_mix;
-                       gdouble s_drc;
-                       GValue *asettings;
-
-                       audio_list = ghb_settings_get_value(ud->settings, "audio_list");
-                       if (row >= ghb_array_len(audio_list))
-                               return;
-                       asettings = ghb_array_get_nth(audio_list, row);
-
-                       track = ghb_settings_combo_option(asettings, "audio_track");
-                       codec = ghb_settings_combo_option(asettings, "audio_codec");
-                       br = ghb_settings_combo_option(asettings, "audio_bitrate");
-                       sr = ghb_settings_combo_option(asettings, "audio_rate");
-                       mix = ghb_settings_combo_option(asettings, "audio_mix");
-                       drc = ghb_settings_get_string(asettings, "audio_drc");
-
-                       s_track = ghb_settings_get_string(asettings, "audio_track");
-                       s_codec = ghb_settings_get_string(asettings, "audio_codec");
-                       s_br = ghb_settings_get_string(asettings, "audio_bitrate");
-                       s_sr = ghb_settings_get_string(asettings, "audio_rate");
-                       s_mix = ghb_settings_get_string(asettings, "audio_mix");
-                       s_drc = ghb_settings_get_double(asettings, "audio_drc");
-
-                       gtk_list_store_set(GTK_LIST_STORE(store), &iter, 
-                               // These are displayed in list
-                               0, track,
-                               1, codec,
-                               2, br,
-                               3, sr,
-                               4, mix,
-                               // These are used to set combo values when an item is selected
-                               5, drc,
-                               6, s_track,
-                               7, s_codec,
-                               8, s_br,
-                               9, s_sr,
-                               10, s_mix,
-                               11, s_drc,
-                               -1);
-                       g_free(drc);
-                       g_free(s_track);
-                       g_free(s_codec);
-                       g_free(s_br);
-                       g_free(s_sr);
-                       g_free(s_mix);
-                       done = !gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter);
-                       row++;
-               } while (!done);
-       }
-}
-
-void
-ghb_presets_list_update(signal_user_data_t *ud)
-{
-       GtkTreeView *treeview;
-       GtkTreeIter iter;
-       GtkListStore *store;
-       gboolean done;
-       GList *presets, *plink;
-       gchar *preset, *def_preset;
-       gchar *description;
-       gint flags, custom, def;
-       
-       g_debug("ghb_presets_list_update ()");
-       def_preset = ghb_settings_get_string(ud->settings, "default_preset");
-       plink = presets = ghb_presets_get_names();
-       treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "presets_list"));
-       store = GTK_LIST_STORE(gtk_tree_view_get_model(treeview));
-       if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &iter))
-       {
-               do
-               {
-                       if (plink)
-                       {
-                               // Update row with settings data
-                               g_debug("Updating row");
-                               preset = (gchar*)plink->data;
-                               def = 0;
-                               if (strcmp(preset, def_preset) == 0)
-                                       def = PRESET_DEFAULT;
-                               
-                               description = ghb_presets_get_description(preset);
-                               flags = ghb_preset_flags(preset);
-                               custom = flags & PRESET_CUSTOM;
-                               gtk_list_store_set(store, &iter, 
-                                                       0, preset, 
-                                                       1, def ? 800 : 400, 
-                                                       2, def ? 2 : 0,
-                                                       3, custom ? "black" : "blue", 
-                                                       4, description,
-                                                       -1);
-                               plink = plink->next;
-                               g_free(description);
-                               done = !gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter);
-                       }
-                       else
-                       {
-                               // No more settings data, remove row
-                               g_debug("Removing row");
-                               done = !gtk_list_store_remove(store, &iter);
-                       }
-               } while (!done);
-       }
-       while (plink)
-       {
-               // Additional settings, add row
-               g_debug("Adding rows");
-               preset = (gchar*)plink->data;
-               def = 0;
-               if (strcmp(preset, def_preset) == 0)
-                       def = PRESET_DEFAULT;
-
-               description = ghb_presets_get_description(preset);
-               gtk_list_store_append(store, &iter);
-               flags = ghb_preset_flags(preset);
-               custom = flags & PRESET_CUSTOM;
-               gtk_list_store_set(store, &iter, 0, preset, 
-                                                       1, def ? 800 : 400, 
-                                                       2, def ? 2 : 0,
-                                                       3, custom ? "black" : "blue", 
-                                                       4, description,
-                                                       -1);
-               plink = plink->next;
-               g_free(description);
-       }
-       g_free(def_preset);
-       g_list_free (presets);
-}
-
-void
-ghb_select_preset(GtkBuilder *builder, const gchar *preset)
-{
-       GtkTreeView *treeview;
-       GtkTreeSelection *selection;
-       GtkTreeModel *store;
-       GtkTreeIter iter;
-       gchar *tpreset;
-       gboolean done;
-       gboolean foundit = FALSE;
-       
-       g_debug("select_preset()");
-       if (preset == NULL) return;
-       treeview = GTK_TREE_VIEW(GHB_WIDGET(builder, "presets_list"));
-       selection = gtk_tree_view_get_selection (treeview);
-       store = gtk_tree_view_get_model (treeview);
-       if (gtk_tree_model_get_iter_first(store, &iter))
-       {
-               do
-               {
-                       gtk_tree_model_get(store, &iter, 0, &tpreset, -1);
-                       if (strcmp(preset, tpreset) == 0)
-                       {
-                               gtk_tree_selection_select_iter (selection, &iter);
-                               foundit = TRUE;
-                               g_free(tpreset);
-                               break;
-                       }
-                       g_free(tpreset);
-                       done = !gtk_tree_model_iter_next(store, &iter);
-               } while (!done);
-       }
-       if (!foundit)
-       {
-               gtk_tree_model_get_iter_first(store, &iter);
-               gtk_tree_selection_select_iter (selection, &iter);
-       }
-}
-
-static void
-update_audio_presets(signal_user_data_t *ud)
-{
-       g_debug("update_audio_presets");
-       const GValue *audio_list;
-
-       audio_list = ghb_settings_get_value(ud->settings, "audio_list");
-       ghb_settings_set_value(ud->settings, "pref_audio_list", audio_list);
-}
-
-void
-presets_save_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
-{
-       GtkWidget *dialog;
-       GtkEntry *entry;
-       GtkTextView *desc;
-       GtkResponseType response;
-       gchar *preset;
-
-       g_debug("presets_save_clicked_cb ()");
-       preset = ghb_settings_get_string (ud->settings, "preset");
-       // Clear the description
-       desc = GTK_TEXT_VIEW(GHB_WIDGET(ud->builder, "preset_description"));
-       dialog = GHB_WIDGET(ud->builder, "preset_save_dialog");
-       entry = GTK_ENTRY(GHB_WIDGET(ud->builder, "preset_name"));
-       gtk_entry_set_text(entry, preset);
-       g_free(preset);
-       response = gtk_dialog_run(GTK_DIALOG(dialog));
-       gtk_widget_hide(dialog);
-       if (response == GTK_RESPONSE_OK)
-       {
-               // save the preset
-               const gchar *name = gtk_entry_get_text(entry);
-               g_debug("description to settings");
-               ghb_widget_to_setting(ud->settings, GTK_WIDGET(desc));
-               // Construct the audio settings presets from the current audio list
-               update_audio_presets(ud);
-               ghb_settings_save(ud, name);
-               ghb_presets_list_update(ud);
-               // Make the new preset the selected item
-               ghb_select_preset(ud->builder, name);
-       }
-}
-
-void
-presets_restore_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
-{
-       g_debug("presets_restore_clicked_cb ()");
-       // Reload only the standard presets
-       ghb_presets_reload(ud);
-       ghb_presets_list_update(ud);
-       // Updating the presets list shuffles things around
-       // need to make sure the proper preset is selected
-       gchar *preset = ghb_settings_get_string (ud->settings, "preset");
-       ghb_select_preset(ud->builder, preset);
-       g_free(preset);
-}
-
-void
-prefs_dialog_cb(GtkWidget *xwidget, signal_user_data_t *ud)
-{
-       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);
-}
-
-void
-presets_remove_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
-{
-       GtkTreeView *treeview;
-       GtkTreeSelection *selection;
-       GtkTreeModel *store;
-       GtkTreeIter iter;
-       gchar *preset;
-       GtkResponseType response;
-
-       g_debug("presets_remove_clicked_cb ()");
-       treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "presets_list"));
-       selection = gtk_tree_view_get_selection (treeview);
-       if (gtk_tree_selection_get_selected(selection, &store, &iter))
-       {
-               GtkWidget *dialog;
-
-               gtk_tree_model_get(store, &iter, 0, &preset, -1);
-               dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL,
-                                                               GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO,
-                                                               "Confirm deletion of preset %s.", preset);
-               response = gtk_dialog_run(GTK_DIALOG(dialog));
-               gtk_widget_destroy (dialog);
-               if (response == GTK_RESPONSE_YES)
-               {
-                       GtkTreeIter nextIter = iter;
-                       gchar *nextPreset = NULL;
-                       if (!gtk_tree_model_iter_next(store, &nextIter))
-                       {
-                               if (gtk_tree_model_get_iter_first(store, &nextIter))
-                               {
-                                       gtk_tree_model_get(store, &nextIter, 0, &nextPreset, -1);
-                               }
-                       }
-                       else
-                       {
-                               gtk_tree_model_get(store, &nextIter, 0, &nextPreset, -1);
-                       }
-                       // Remove the selected item
-                       // First unselect it so that selecting the new item works properly
-                       gtk_tree_selection_unselect_iter (selection, &iter);
-                       ghb_presets_remove(preset);
-                       ghb_presets_list_update(ud);
-                       ghb_select_preset(ud->builder, nextPreset);
-               }
-       }
-}
-
-static void
-preset_update_title_deps(signal_user_data_t *ud, ghb_title_info_t *tinfo)
-{
-       GtkWidget *widget;
-
-       ghb_ui_update(ud, "scale_width", 
-                       ghb_int64_value(tinfo->width - tinfo->crop[2] - tinfo->crop[3]));
-       // If anamorphic or keep_aspect, the hight will be automatically calculated
-       gboolean keep_aspect, anamorphic;
-       keep_aspect = ghb_settings_get_boolean(ud->settings, "keep_aspect");
-       anamorphic = ghb_settings_get_boolean(ud->settings, "anamorphic");
-       if (!(keep_aspect || anamorphic))
-       {
-               ghb_ui_update(ud, "scale_height", 
-                       ghb_int64_value(tinfo->height - tinfo->crop[0] - tinfo->crop[1]));
-       }
-
-       // Set the limits of cropping.  hb_set_anamorphic_size crashes if
-       // you pass it a cropped width or height == 0.
-       gint bound;
-       bound = tinfo->height / 2 - 2;
-       widget = GHB_WIDGET (ud->builder, "crop_top");
-       gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, bound);
-       widget = GHB_WIDGET (ud->builder, "crop_bottom");
-       gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, bound);
-       bound = tinfo->width / 2 - 2;
-       widget = GHB_WIDGET (ud->builder, "crop_left");
-       gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, bound);
-       widget = GHB_WIDGET (ud->builder, "crop_right");
-       gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, bound);
-       if (ghb_settings_get_boolean(ud->settings, "autocrop"))
-       {
-               ghb_ui_update(ud, "crop_top", ghb_int64_value(tinfo->crop[0]));
-               ghb_ui_update(ud, "crop_bottom", ghb_int64_value(tinfo->crop[1]));
-               ghb_ui_update(ud, "crop_left", ghb_int64_value(tinfo->crop[2]));
-               ghb_ui_update(ud, "crop_right", ghb_int64_value(tinfo->crop[3]));
-       }
-}
-
-void
-presets_list_selection_changed_cb(GtkTreeSelection *selection, signal_user_data_t *ud)
-{
-       GtkTreeModel *store;
-       GtkTreeIter iter;
-       gchar *preset;
-       ghb_title_info_t tinfo;
-       GtkWidget *widget;
-       
-       g_debug("presets_list_selection_changed_cb ()");
-       widget = GHB_WIDGET (ud->builder, "presets_remove");
-       if (gtk_tree_selection_get_selected(selection, &store, &iter))
-       {
-               gtk_tree_model_get(store, &iter, 0, &preset, -1);
-               ud->dont_clear_presets = TRUE;
-               // Temporarily set the video_quality range to (0,100)
-               // This is needed so the video_quality value does not get
-               // truncated when set.  The range will be readjusted below
-               GtkWidget *qp = GHB_WIDGET(ud->builder, "video_quality");
-               gtk_range_set_range (GTK_RANGE(qp), 0, 100);
-               // Clear the audio list prior to changing the preset.  Existing audio
-               // can cause the container extension to be automatically changed when
-               // it shouldn't be
-               clear_audio_list(ud);
-               ghb_set_preset(ud, preset);
-               gint titleindex;
-               titleindex = ghb_settings_combo_int(ud->settings, "title");
-               set_pref_audio(titleindex, ud);
-               ghb_settings_set_boolean(ud->settings, "preset_modified", FALSE);
-               ud->dont_clear_presets = FALSE;
-               if (ghb_get_title_info (&tinfo, titleindex))
-               {
-                       preset_update_title_deps(ud, &tinfo);
-               }
-               ghb_set_scale (ud, GHB_SCALE_KEEP_NONE);
-
-               gint vqmin, vqmax;
-               ghb_vquality_range(ud, &vqmin, &vqmax);
-               gtk_range_set_range (GTK_RANGE(qp), vqmin, vqmax);
-               gtk_widget_set_sensitive(widget, TRUE);
-       }
-       else
-       {
-               g_debug("No selection???  Perhaps unselected.");
-               gtk_widget_set_sensitive(widget, FALSE);
-       }
-}
-
-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 ()");
-       // 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);
-                       gtk_tree_path_free(path);
-               }
-       }
-}
-
-static void
-add_to_queue_list(signal_user_data_t *ud, GValue *settings, GtkTreeIter *piter)
-{
-       GtkTreeView *treeview;
-       GtkTreeIter iter;
-       GtkTreeStore *store;
-       gchar *info;
-       gint status;
-       GtkTreeIter citer;
-       gchar *dest, *preset, *vol_name;
-       const gchar *vcodec, *container;
-       gchar *fps, *vcodec_abbr;
-       gint title, start_chapter, end_chapter, width, height, vqvalue;
-       gint source_width, source_height;
-       gboolean pass2, anamorphic, round_dim, keep_aspect, vqtype, turbo;
-       
-       g_debug("update_queue_list ()");
-       if (settings == NULL) return;
-       treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "queue_list"));
-       store = GTK_TREE_STORE(gtk_tree_view_get_model(treeview));
-               
-       title = ghb_settings_combo_int(settings, "title");
-       start_chapter = ghb_settings_get_int(settings, "start_chapter");
-       end_chapter = ghb_settings_get_int(settings, "end_chapter");
-       pass2 = ghb_settings_get_boolean(settings, "two_pass");
-       vol_name = ghb_settings_get_string(settings, "volume_label");
-       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"
-       );
-
-       if (piter)
-               iter = *piter;
-       else
-               gtk_tree_store_append(store, &iter, NULL);
-
-       gtk_tree_store_set(store, &iter, 1, info, 2, "hb-queue-delete", -1);
-       g_free(info);
-       status = ghb_settings_get_int(settings, "job_status");
-       switch (status)
-       {
-               case GHB_QUEUE_PENDING:
-                       gtk_tree_store_set(store, &iter, 0, "hb-queue-job", -1);
-                       break;
-               case GHB_QUEUE_CANCELED:
-                       gtk_tree_store_set(store, &iter, 0, "hb-canceled", -1);
-                       break;
-               case GHB_QUEUE_RUNNING:
-                       gtk_tree_store_set(store, &iter, 0, "hb-working0", -1);
-                       break;
-               case GHB_QUEUE_DONE:
-                       gtk_tree_store_set(store, &iter, 0, "hb-complete", -1);
-                       break;
-               default:
-                       gtk_tree_store_set(store, &iter, 0, "hb-queue-job", -1);
-                       break;
-       }
-
-       GString *str = g_string_new("");
-       gboolean markers;
-       gboolean preset_modified;
-       gint mux;
-
-       container = ghb_settings_combo_option(settings, "container");
-       mux = ghb_settings_combo_int(settings, "container");
-       dest = ghb_settings_get_string(settings, "destination");
-       preset_modified = ghb_settings_get_boolean(settings, "preset_modified");
-       preset = ghb_settings_get_string(settings, "preset");
-       markers = ghb_settings_get_boolean(settings, "chapter_markers");
-
-       if (preset_modified)
-               g_string_append_printf(str, "<b>Customized Preset Based On:</b> %s\n", 
-                                                               preset);
-       else
-               g_string_append_printf(str, "<b>Preset:</b> %s\n", preset);
-
-       if (markers)
-       {
-               g_string_append_printf(str, 
-                       "<b>Format:</b> %s Container, Chapter Markers\n", container);
-       }
-       else
-       {
-               g_string_append_printf(str, 
-                       "<b>Format:</b> %s Container\n", container);
-       }
-       if (mux == HB_MUX_MP4)
-       {
-               gboolean ipod, http, large;
-
-               ipod = ghb_settings_get_boolean(settings, "ipod_file");
-               http = ghb_settings_get_boolean(settings, "http_optimize_mp4");
-               large = ghb_settings_get_boolean(settings, "large_mp4");
-               if (http || ipod || large)
-               {
-                       g_string_append_printf(str, "<b>MP4 Options:</b>");
-                       if (ipod)
-                               g_string_append_printf(str, " - iPod Atom");
-                       if (http)
-                               g_string_append_printf(str, " - Http Optimized");
-                       if (large)
-                               g_string_append_printf(str, " - 64 Bit");
-                       g_string_append_printf(str, "\n");
-               }
-       }
-       g_string_append_printf(str, "<b>Destination:</b> %s\n", dest);
-
-       width = ghb_settings_get_int(settings, "scale_width");
-       height = ghb_settings_get_int(settings, "scale_height");
-       anamorphic = ghb_settings_get_boolean(settings, "anamorphic");
-       round_dim = ghb_settings_get_boolean(settings, "round_dimensions");
-       keep_aspect = ghb_settings_get_boolean(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)";
-               }
-       }
-       vqtype = ghb_settings_get_boolean(settings, "vquality_type_constant");
-       vqvalue = 0;
-
-       gchar *vq_desc = "Error";
-       gchar *vq_units = "";
-       if (!vqtype)
-       {
-               vqtype = ghb_settings_get_boolean(settings, "vquality_type_target");
-               if (!vqtype)
-               {
-                       // Has to be bitrate
-                       vqvalue = ghb_settings_get_int(settings, "video_bitrate");
-                       vq_desc = "Bitrate:";
-                       vq_units = "kbps";
-               }
-               else
-               {
-                       // Target file size
-                       vqvalue = ghb_settings_get_int(settings, "video_target");
-                       vq_desc = "Target Size:";
-                       vq_units = "MB";
-               }
-       }
-       else
-       {
-               // Constant quality
-               vqvalue = ghb_settings_get_int(settings, "video_quality");
-               vq_desc = "Constant Quality:";
-       }
-       fps = ghb_settings_get_string(settings, "framerate");
-       if (strcmp("source", fps) == 0)
-       {
-               g_free(fps);
-               fps = g_strdup("Same As Source");
-       }
-       vcodec = ghb_settings_combo_option(settings, "video_codec");
-       vcodec_abbr = ghb_settings_get_string(settings, "video_codec");
-       source_width = ghb_settings_get_int(settings, "source_width");
-       source_height = ghb_settings_get_int(settings, "source_height");
-       g_string_append_printf(str,
-               "<b>Picture:</b> Source: %d x %d, Output %d x %d %s\n"
-               "<b>Video:</b> %s, Framerate: %s, %s %d%s\n",
-                        source_width, source_height, width, height, aspect_desc,
-                        vcodec, fps, vq_desc, vqvalue, vq_units);
-
-       turbo = ghb_settings_get_boolean(settings, "turbo");
-       if (turbo)
-       {
-               g_string_append_printf(str, "<b>Turbo:</b> On\n");
-       }
-       if (strcmp(vcodec_abbr, "x264") == 0)
-       {
-               gchar *x264opts = ghb_build_x264opts_string(settings);
-               g_string_append_printf(str, "<b>x264 Options:</b> %s\n", x264opts);
-               g_free(x264opts);
-       }
-       // Add the audios
-       gint count, ii;
-       const GValue *audio_list;
-
-       audio_list = ghb_settings_get_value(settings, "audio_list");
-       count = ghb_array_len(audio_list);
-       for (ii = 0; ii < count; ii++)
-       {
-               gchar *bitrate, *samplerate, *track;
-               const gchar *acodec, *mix;
-               GValue *asettings;
-
-               asettings = ghb_array_get_nth(audio_list, ii);
-
-               acodec = ghb_settings_combo_option(asettings, "audio_codec");
-               bitrate = ghb_settings_get_string(asettings, "audio_bitrate");
-               samplerate = ghb_settings_get_string(asettings, "audio_rate");
-               if (strcmp("source", samplerate) == 0)
-               {
-                       g_free(samplerate);
-                       samplerate = g_strdup("Same As Source");
-               }
-               track = ghb_settings_get_string(asettings, "audio_track_long");
-               mix = ghb_settings_combo_option(asettings, "audio_mix");
-               g_string_append_printf(str,
-                       "<b>Audio:</b> %s, Encoder: %s, Mixdown: %s, SampleRate: %s, Bitrate: %s",
-                        track, acodec, mix, samplerate, bitrate);
-               if (ii < count-1)
-                       g_string_append_printf(str, "\n");
-               g_free(track);
-               g_free(bitrate);
-               g_free(samplerate);
-       }
-       info = g_string_free(str, FALSE);
-       gtk_tree_store_append(store, &citer, &iter);
-       gtk_tree_store_set(store, &citer, 1, info, -1);
-       g_free(info);
-       g_free(fps);
-       g_free(vcodec_abbr);
-       g_free(vol_name);
-       g_free(dest);
-       g_free(preset);
-}
-
-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;
-
-       titleindex = ghb_settings_combo_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, *dest;
-       gint count, ii;
-       gint titleindex;
-
-       titleindex = ghb_settings_combo_int(ud->settings, "title");
-       if (titleindex < 0) return FALSE;
-       dest = ghb_settings_get_string(ud->settings, "destination");
-       count = ghb_array_len(ud->queue);
-       for (ii = 0; ii < count; ii++)
-       {
-               GValue *js;
-               gchar *filename;
-
-               js = ghb_array_get_nth(ud->queue, ii);
-               filename = ghb_settings_get_string(js, "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(filename);
-                               g_free(dest);
-                               g_free(message);
-                               return FALSE;
-                       }
-                       g_free(message);
-                       break;
-               }
-               g_free(filename);
-       }
-       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(dest);
-               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(dest);
-               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(dest);
-                                       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(dest);
-                       g_free(message);
-                       return FALSE;
-               }
-               g_free(message);
-               g_unlink(dest);
-       }
-       g_free(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;
-}
-
-static gboolean
-queue_add(signal_user_data_t *ud)
-{
-       // Add settings to the queue
-       GValue *settings;
-       gint titleindex;
+       gchar *path;
        gint titlenum;
-       
-       g_debug("queue_add ()");
-       if (!validate_settings(ud))
-       {
-               return FALSE;
-       }
-       if (ud->queue == NULL)
-               ud->queue = ghb_array_value_new(32);
-       // Make a copy of current settings to be used for the new job
-       settings = ghb_value_dup(ud->settings);
-       ghb_settings_set_int(settings, "job_status", GHB_QUEUE_PENDING);
-       ghb_settings_set_int(settings, "job_unique_id", 0);
-       titleindex = ghb_settings_combo_int(settings, "title");
-       titlenum = ghb_get_title_number(titleindex);
-       ghb_settings_set_int(settings, "titlenum", titlenum);
-       ghb_array_append(ud->queue, settings);
-       add_to_queue_list(ud, settings, NULL);
-       ghb_save_queue(ud->queue);
-
-       return TRUE;
-}
-
-void
-queue_add_clicked_cb(GtkWidget *widget, signal_user_data_t *ud)
-{
-       g_debug("queue_add_clicked_cb ()");
-       queue_add(ud);
-}
-
-static gboolean
-cancel_encode(const gchar *extra_msg)
-{
-       GtkWidget *dialog;
-       GtkResponseType response;
-       
-       if (extra_msg == NULL) extra_msg = "";
-       // Toss up a warning dialog
-       dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL,
-                               GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE,
-                               "%sYour movie will be lost if you don't continue encoding.",
-                               extra_msg);
-       gtk_dialog_add_buttons( GTK_DIALOG(dialog), 
-                                                  "Continue Encoding", GTK_RESPONSE_NO,
-                                                  "Stop Encoding", GTK_RESPONSE_YES, NULL);
-       response = gtk_dialog_run(GTK_DIALOG(dialog));
-       gtk_widget_destroy (dialog);
-       if (response == GTK_RESPONSE_NO) return FALSE;
-       ghb_stop_queue();
-       return TRUE;
-}
-
-void
-queue_remove_clicked_cb(GtkWidget *widget, gchar *path, signal_user_data_t *ud)
-{
-       GtkTreeView *treeview;
-       GtkTreePath *treepath;
-       GtkTreeModel *store;
-       GtkTreeIter iter;
-       gint row;
-       gint *indices;
-       gint unique_id;
-       GValue *settings;
-       gint status;
+       time_t  _now;
+       struct tm *now;
+       gchar *log_path, *pos, *destname, *basename, *dest_dir;
 
-       g_debug("queue_remove_clicked_cb ()");
-       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_path_get_depth(treepath) > 1) return;
-       if (gtk_tree_model_get_iter(store, &iter, treepath))
+       _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"))
        {
-               // 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;
-               if (row >= ghb_array_len(ud->queue))
-                       return;
-               settings = ghb_array_get_nth(ud->queue, row);
-               status = ghb_settings_get_int(settings, "job_status");
-               if (status == GHB_QUEUE_RUNNING)
-               {
-                       // Ask if wants to stop encode.
-                       if (!cancel_encode(NULL))
-                       {
-                               return;
-                       }
-                       unique_id = ghb_settings_get_int(settings, "job_unique_id");
-                       ghb_remove_job(unique_id);
-               }
-               // Remove the selected item
-               gtk_tree_store_remove(GTK_TREE_STORE(store), &iter);
-               // Remove the corresponding item from the queue list
-               GValue *old = ghb_array_get_nth(ud->queue, row);
-               ghb_value_free(old);
-               ghb_array_remove(ud->queue, row);
-               ghb_save_queue(ud->queue);
+               dest_dir = g_path_get_dirname (destname);
        }
        else
-       {       
-               gtk_tree_path_free (treepath);
-       }
-}
-
-// This little bit is needed to prevent the default drag motion
-// handler from expanding rows if you hover over them while
-// dragging.
-// Also controls where valid drop locations are
-gboolean
-queue_drag_motion_cb(
-       GtkTreeView *tv,
-       GdkDragContext *ctx,
-       gint x,
-       gint y,
-       guint time,
-       signal_user_data_t *ud)
-{
-       GtkTreePath *path = NULL;
-       GtkTreeViewDropPosition pos;
-       gint *indices, row, status, finished;
-       GValue *js;
-       GtkTreeIter iter;
-       GtkTreeView *srctv;
-       GtkTreeModel *model;
-       GtkTreeSelection *select;
-
-       // This bit checks to see if the source is allowed to be
-       // moved.  Only pending and canceled items may be moved.
-       srctv = GTK_TREE_VIEW(gtk_drag_get_source_widget(ctx));
-       select = gtk_tree_view_get_selection (srctv);
-       gtk_tree_selection_get_selected (select, &model, &iter);
-       path = gtk_tree_model_get_path (model, &iter);
-       indices = gtk_tree_path_get_indices(path);
-       row = indices[0];
-       gtk_tree_path_free(path);
-       js = ghb_array_get_nth(ud->queue, row);
-       status = ghb_settings_get_int(js, "job_status");
-       if (status != GHB_QUEUE_PENDING && status != GHB_QUEUE_CANCELED)
-       {
-               gdk_drag_status(ctx, 0, time);
-               return TRUE;
-       }
-
-       // The reset checks that the destination is a valid position
-       // in the list.  Can not move above any finished or running items
-       gtk_tree_view_get_dest_row_at_pos (tv, x, y, &path, &pos);
-       if (path == NULL)
-       {
-               gdk_drag_status(ctx, GDK_ACTION_MOVE, time);
-               return TRUE;
-       }
-       // Don't allow *drop into*
-       if (pos == GTK_TREE_VIEW_DROP_INTO_OR_BEFORE)
-               pos = GTK_TREE_VIEW_DROP_BEFORE;
-       if (pos == GTK_TREE_VIEW_DROP_INTO_OR_AFTER)
-               pos = GTK_TREE_VIEW_DROP_AFTER;
-       // Don't allow droping int child items
-       if (gtk_tree_path_get_depth(path) > 1)
-       {
-               gtk_tree_path_up(path);
-               pos = GTK_TREE_VIEW_DROP_AFTER;
-       }
-       indices = gtk_tree_path_get_indices(path);
-       row = indices[0];
-       js = ghb_array_get_nth(ud->queue, row);
-
-       finished = find_last_finished(ud->queue);
-       if (row < finished)
-       {
-               gtk_tree_path_free(path);
-               gdk_drag_status(ctx, 0, time);
-               return TRUE;
-       }
-       if (pos != GTK_TREE_VIEW_DROP_AFTER && 
-               row == finished)
-       {
-               gtk_tree_path_free(path);
-               gdk_drag_status(ctx, 0, time);
-               return TRUE;
-       }
-       gtk_tree_view_set_drag_dest_row(tv, path, pos);
-       gtk_tree_path_free(path);
-       gdk_drag_status(ctx, GDK_ACTION_MOVE, time);
-       return TRUE;
-}
-
-void 
-queue_drag_cb(
-       GtkTreeView *dstwidget, 
-       GdkDragContext *dc, 
-       gint x, gint y, 
-       GtkSelectionData *selection_data, 
-       guint info, guint t, 
-       signal_user_data_t *ud)
-{
-       GtkTreePath *path = NULL;
-       //GtkTreeModel *model;
-       GtkTreeViewDropPosition pos;
-       GtkTreeIter dstiter, srciter;
-       gint *indices, row;
-       GValue *js;
-       
-       GtkTreeModel *dstmodel = gtk_tree_view_get_model(dstwidget);
-                       
-       g_debug("queue_drag_cb ()");
-       // This doesn't work here for some reason...
-       // gtk_tree_view_get_drag_dest_row(dstwidget, &path, &pos);
-       gtk_tree_view_get_dest_row_at_pos (dstwidget, x, y, &path, &pos);
-       // This little hack is needed because attempting to drop after
-       // the last item gives us no path or pos.
-       if (path == NULL)
-       {
-               gint n_children;
-
-               n_children = gtk_tree_model_iter_n_children(dstmodel, NULL);
-               if (n_children)
-               {
-                       pos = GTK_TREE_VIEW_DROP_AFTER;
-                       path = gtk_tree_path_new_from_indices(n_children-1, -1);
-               }
-               else
-               {
-                       pos = GTK_TREE_VIEW_DROP_BEFORE;
-                       path = gtk_tree_path_new_from_indices(0, -1);
-               }
-       }
-       if (path)
        {
-               if (gtk_tree_path_get_depth(path) > 1)
-                       gtk_tree_path_up(path);
-               if (gtk_tree_model_get_iter (dstmodel, &dstiter, path))
-               {
-                       GtkTreeIter iter;
-                       GtkTreeView *srcwidget;
-                       GtkTreeModel *srcmodel;
-                       GtkTreeSelection *select;
-                       GtkTreePath *srcpath = NULL;
-                       GtkTreePath *dstpath = NULL;
-
-                       srcwidget = GTK_TREE_VIEW(gtk_drag_get_source_widget(dc));
-                       //srcmodel = gtk_tree_view_get_model(srcwidget);
-                       select = gtk_tree_view_get_selection (srcwidget);
-                       gtk_tree_selection_get_selected (select, &srcmodel, &srciter);
-
-                       srcpath = gtk_tree_model_get_path (srcmodel, &srciter);
-                       indices = gtk_tree_path_get_indices(srcpath);
-                       row = indices[0];
-                       gtk_tree_path_free(srcpath);
-                       js = ghb_array_get_nth(ud->queue, row);
-
-                       switch (pos)
-                       {
-                               case GTK_TREE_VIEW_DROP_BEFORE:
-                               case GTK_TREE_VIEW_DROP_INTO_OR_BEFORE:
-                                       gtk_tree_store_insert_before (GTK_TREE_STORE (dstmodel), 
-                                                                                                       &iter, NULL, &dstiter);
-                                       break;
-
-                               case GTK_TREE_VIEW_DROP_AFTER:
-                               case GTK_TREE_VIEW_DROP_INTO_OR_AFTER:
-                                       gtk_tree_store_insert_after (GTK_TREE_STORE (dstmodel), 
-                                                                                                       &iter, NULL, &dstiter);
-                                       break;
-
-                               default:
-                                       break;
-                       }
-                       // Reset job to pending
-                       ghb_settings_set_int(js, "job_status", GHB_QUEUE_PENDING);
-                       add_to_queue_list(ud, js, &iter);
-
-                       dstpath = gtk_tree_model_get_path (dstmodel, &iter);
-                       indices = gtk_tree_path_get_indices(dstpath);
-                       row = indices[0];
-                       gtk_tree_path_free(dstpath);
-                       ghb_array_insert(ud->queue, row, js);
-
-                       srcpath = gtk_tree_model_get_path (srcmodel, &srciter);
-                       indices = gtk_tree_path_get_indices(srcpath);
-                       row = indices[0];
-                       gtk_tree_path_free(srcpath);
-                       ghb_array_remove(ud->queue, row);
-                       gtk_tree_store_remove (GTK_TREE_STORE (srcmodel), &srciter);
-                       ghb_save_queue(ud->queue);
-               }
-               gtk_tree_path_free(path);
+               dest_dir = ghb_get_user_config_dir("EncodeLogs");
        }
-}
-
-
-static gint
-find_last_finished(GValue *queue)
-{
-       GValue *js;
-       gint ii, count;
-       gint status;
-       
-       g_debug("find_last_finished");
-       count = ghb_array_len(queue);
-       for (ii = 0; ii < count; ii++)
+       g_free(destname);
+       pos = g_strrstr( basename, "." );
+       if (pos != NULL)
        {
-               js = ghb_array_get_nth(queue, ii);
-               status = ghb_settings_get_int(js, "job_status");
-               if (status != GHB_QUEUE_DONE && status != GHB_QUEUE_RUNNING)
-               {
-                       return ii-1;
-               }
+               *pos = 0;
        }
-       return -1;
-}
-
-static gint
-find_queue_job(GValue *queue, gint unique_id, GValue **job)
-{
-       GValue *js;
-       gint ii, count;
-       gint job_unique_id;
-       
-       *job = NULL;
-       g_debug("find_queue_job");
-       count = ghb_array_len(queue);
-       for (ii = 0; ii < count; ii++)
+       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)
        {
-               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 ii;
-               }
-       }
-       return -1;
-}
-
-static void
-queue_buttons_grey(signal_user_data_t *ud, gboolean working)
-{
-       GtkWidget *widget;
-       GtkAction *action;
-       gint queue_count;
-       gint titleindex;
-       gboolean title_ok;
-
-       queue_count = ghb_array_len(ud->queue);
-       titleindex = ghb_settings_combo_int(ud->settings, "title");
-       title_ok = (titleindex >= 0);
-
-       widget = GHB_WIDGET (ud->builder, "queue_start1");
-       gtk_widget_set_sensitive (widget, !working && (title_ok || queue_count));
-       widget = GHB_WIDGET (ud->builder, "queue_start2");
-       gtk_widget_set_sensitive (widget, !working && (title_ok || queue_count));
-       action = GHB_ACTION (ud->builder, "queue_start_menu");
-       gtk_action_set_sensitive (action, !working && (title_ok || queue_count));
-       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);
-
-static void
-submit_job(GValue *settings)
-{
-       static gint unique_id = 1;
-
-       g_debug("submit_job");
-       if (settings == NULL) return;
-       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
-queue_scan(GValue *js)
-{
-       gchar *path;
-       gint titlenum;
+               gchar *ver_str;
+
+               ver_str = g_strdup_printf("Handbrake Version: %s (%d)\n", 
+                                                                       HB_VERSION, HB_BUILD);
+               g_io_channel_write_chars (ud->job_activity_log, ver_str, 
+                                                                       -1, NULL, NULL);
+               g_free(ver_str);
+       }
+       g_free(log_path);
 
        path = ghb_settings_get_string( js, "source");
        titlenum = ghb_settings_get_int(js, "titlenum");
@@ -3203,8 +1523,8 @@ queue_scan(GValue *js)
        g_free(path);
 }
 
-static GValue* 
-start_next_job(signal_user_data_t *ud, gboolean find_first)
+GValue* 
+ghb_start_next_job(signal_user_data_t *ud, gboolean find_first)
 {
        static gint current = 0;
        gint count, ii, jj;
@@ -3224,7 +1544,7 @@ start_next_job(signal_user_data_t *ud, gboolean find_first)
                        if (status == GHB_QUEUE_PENDING)
                        {
                                current = ii;
-                               queue_scan(js);
+                               queue_scan(ud, js);
                                return js;
                        }
                }
@@ -3245,7 +1565,7 @@ start_next_job(signal_user_data_t *ud, gboolean find_first)
                                if (status == GHB_QUEUE_PENDING)
                                {
                                        current = jj;
-                                       queue_scan(js);
+                                       queue_scan(ud, js);
                                        return js;
                                }
                        }
@@ -3260,7 +1580,7 @@ start_next_job(signal_user_data_t *ud, gboolean find_first)
                if (status == GHB_QUEUE_PENDING)
                {
                        current = ii;
-                       queue_scan(js);
+                       queue_scan(ud, js);
                        return js;
                }
        }
@@ -3268,6 +1588,78 @@ start_next_job(signal_user_data_t *ud, gboolean find_first)
        return NULL;
 }
 
+static gint
+find_queue_job(GValue *queue, gint unique_id, GValue **job)
+{
+       GValue *js;
+       gint ii, count;
+       gint job_unique_id;
+       
+       *job = NULL;
+       g_debug("find_queue_job");
+       count = ghb_array_len(queue);
+       for (ii = 0; ii < count; ii++)
+       {
+               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 ii;
+               }
+       }
+       return -1;
+}
+
+gchar*
+working_status_string(signal_user_data_t *ud, ghb_status_t *status)
+{
+       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)
 {
@@ -3290,8 +1682,15 @@ ghb_backend_events(signal_user_data_t *ud)
        // Then handle the status of the queue
        if (status.state & GHB_STATE_SCANNING)
        {
-               status_str = g_strdup_printf ("Scanning title %d of %d...", 
+               if (status.title_cur == 0)
+               {
+                       status_str = g_strdup ("Scanning...");
+               }
+               else
+               {
+                       status_str = g_strdup_printf ("Scanning title %d of %d...", 
                                                                  status.title_cur, status.title_count );
+               }
                gtk_progress_bar_set_text (progress, status_str);
                g_free(status_str);
                if (status.title_count > 0)
@@ -3322,7 +1721,20 @@ ghb_backend_events(signal_user_data_t *ud)
                        gtk_progress_bar_set_text (progress, "No Source");
                }
                ghb_clear_state(GHB_STATE_SCANDONE);
-               queue_buttons_grey(ud, work_started);
+               ghb_queue_buttons_grey(ud, work_started);
+               if (ghb_queue_edit_settings)
+               {
+                       gint jstatus;
+
+                       jstatus = ghb_settings_get_int(ghb_queue_edit_settings, "job_status");
+                       ghb_settings_to_ui(ud, ghb_queue_edit_settings);
+                       ghb_set_audio(ud, ghb_queue_edit_settings);
+                       if (jstatus == GHB_QUEUE_PENDING)
+                       {
+                               ghb_value_free(ghb_queue_edit_settings);
+                       }
+                       ghb_queue_edit_settings = NULL;
+               }
        }
        else if (status.queue_state & GHB_STATE_SCANNING)
        {
@@ -3344,47 +1756,7 @@ ghb_backend_events(signal_user_data_t *ud)
        }
        else if (status.queue_state & GHB_STATE_WORKING)
        {
-               gchar *task_str, *job_str;
-               gint qcount;
-
-               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(job_str);
-               g_free(task_str);
+               status_str = working_status_string(ud, &status);
                gtk_progress_bar_set_text (progress, status_str);
                gtk_progress_bar_set_fraction (progress, status.progress);
                g_free(status_str);
@@ -3394,7 +1766,7 @@ ghb_backend_events(signal_user_data_t *ud)
                gint qstatus;
 
                work_started = FALSE;
-               queue_buttons_grey(ud, FALSE);
+               ghb_queue_buttons_grey(ud, FALSE);
                index = find_queue_job(ud->queue, status.unique_id, &js);
                treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "queue_list"));
                store = GTK_TREE_STORE(gtk_tree_view_get_model(treeview));
@@ -3447,13 +1819,15 @@ ghb_backend_events(signal_user_data_t *ud)
                gtk_progress_bar_set_fraction (progress, 1.0);
                ghb_clear_queue_state(GHB_STATE_WORKDONE);
                if (!ud->cancel_encode)
-                       ud->current_job = start_next_job(ud, FALSE);
+                       ud->current_job = ghb_start_next_job(ud, FALSE);
                else
                        ud->current_job = NULL;
                if (js)
                        ghb_settings_set_int(js, "job_status", qstatus);
                ghb_save_queue(ud->queue);
                ud->cancel_encode = FALSE;
+               g_io_channel_unref(ud->job_activity_log);
+               ud->job_activity_log = NULL;
        }
        else if (status.queue_state & GHB_STATE_MUXING)
        {
@@ -3466,7 +1840,7 @@ ghb_backend_events(signal_user_data_t *ud)
                if (!work_started)
                {
                        work_started = TRUE;
-                       queue_buttons_grey(ud, TRUE);
+                       ghb_queue_buttons_grey(ud, TRUE);
                }
        }
        if (status.queue_state & GHB_STATE_WORKING)
@@ -3476,7 +1850,7 @@ ghb_backend_events(signal_user_data_t *ud)
                if (!work_started)
                {
                        work_started = TRUE;
-                       queue_buttons_grey(ud, TRUE);
+                       ghb_queue_buttons_grey(ud, TRUE);
                }
                index = find_queue_job(ud->queue, status.unique_id, &js);
                if (status.unique_id != 0 && index >= 0)
@@ -3494,6 +1868,13 @@ ghb_backend_events(signal_user_data_t *ud)
                        }
                        g_free(path);
                }
+               GtkLabel *label;
+               gchar *status_str;
+
+               status_str = working_status_string(ud, &status);
+               label = GTK_LABEL(GHB_WIDGET(ud->builder, "queue_status"));
+               gtk_label_set_text (label, status_str);
+               g_free(status_str);
        }
 }
 
@@ -3580,7 +1961,11 @@ ghb_log_cb(GIOChannel *source, GIOCondition cond, gpointer data)
                        mark = gtk_text_buffer_get_insert (buffer);
                        gtk_text_view_scroll_mark_onscreen(textview, mark);
                }
-               g_io_channel_write_chars (ud->activity_log, text, length, &length, NULL);
+               g_io_channel_write_chars (ud->activity_log, text, 
+                                                               length, &length, NULL);
+               if (ud->job_activity_log)
+                       g_io_channel_write_chars (ud->job_activity_log, text, 
+                                                                       length, &length, NULL);
                g_free(text);
        }
        if (status != G_IO_STATUS_NORMAL)
@@ -3601,6 +1986,30 @@ ghb_log_cb(GIOChannel *source, GIOCondition cond, gpointer data)
 }
 
 void
+show_activity_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
+{
+       GtkWidget *widget = GHB_WIDGET (ud->builder, "activity_window");
+       gtk_widget_show (widget);
+}
+
+void
+ghb_log(gchar *log, ...)
+{
+       va_list args;
+       time_t _now;
+    struct tm *now;
+       gchar fmt[362];
+
+       _now = time(NULL);
+       now = localtime( &_now );
+       snprintf(fmt, 362, "[%02d:%02d:%02d] lingui: %s\n", 
+                       now->tm_hour, now->tm_min, now->tm_sec, log);
+       va_start(args, log);
+       vfprintf(stderr, fmt, args);
+       va_end(args);
+}
+
+void
 about_activate_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
        GtkWidget *widget = GHB_WIDGET (ud->builder, "hb_about");
@@ -3608,12 +2017,13 @@ about_activate_cb(GtkWidget *xwidget, signal_user_data_t *ud)
        gtk_widget_show (widget);
 }
 
-void
-guide_activate_cb(GtkWidget *xwidget, signal_user_data_t *ud)
+static void
+browse_url(const gchar *url)
 {
        gboolean result;
        char *argv[] = 
-               {"xdg-open","http://trac.handbrake.fr/wiki/HandBrakeGuide",NULL,NULL};
+               {"xdg-open",NULL,NULL,NULL};
+       argv[1] = (gchar*)url;
        result = g_spawn_async(NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL,
                                NULL, NULL, NULL);
        if (result) return;
@@ -3635,20 +2045,18 @@ 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)
+guide_activate_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
-       gtk_widget_hide (widget);
+       browse_url("http://trac.handbrake.fr/wiki/HandBrakeGuide");
 }
 
 void
-show_activity_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
+hb_about_response_cb(GtkWidget *widget, gint response, signal_user_data_t *ud)
 {
-       GtkWidget *widget = GHB_WIDGET (ud->builder, "activity_window");
-       gtk_widget_show (widget);
+       gtk_widget_hide (widget);
 }
 
 void
@@ -3680,26 +2088,6 @@ show_presets_toggled_cb(GtkToggleButton *button, signal_user_data_t *ud)
        ghb_pref_save(ud->settings, "show_presets");
 }
 
-void
-presets_frame_size_allocate_cb(GtkWidget *widget, GtkAllocation *allocation, signal_user_data_t *ud)
-{
-       GtkTreeView *treeview;
-       GtkTreeSelection *selection;
-       GtkTreeModel *store;
-       GtkTreeIter iter;
-       
-       treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "presets_list"));
-       selection = gtk_tree_view_get_selection(treeview);
-       if (gtk_tree_selection_get_selected(selection, &store, &iter))
-       {
-               GtkTreePath *path;
-               path = gtk_tree_model_get_path (store, &iter);
-               // Make the parent visible in scroll window if it is not.
-               gtk_tree_view_scroll_to_cell (treeview, path, NULL, FALSE, 0, 0);
-               gtk_tree_path_free(path);
-       }
-}
-
 static void
 update_chapter_list(signal_user_data_t *ud)
 {
@@ -3867,21 +2255,6 @@ chapter_list_selection_changed_cb(GtkTreeSelection *selection, signal_user_data_
 }
 
 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", 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;
@@ -3918,62 +2291,6 @@ preview_button_size_allocate_cb(GtkWidget *widget, GtkAllocation *allocation, si
 }
 
 void
-queue_start_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
-{
-       GValue *js;
-       gboolean running = FALSE;
-       gint count, ii;
-       gint status;
-       gint state;
-
-       count = ghb_array_len(ud->queue);
-       for (ii = 0; ii < count; ii++)
-       {
-               js = ghb_array_get_nth(ud->queue, ii);
-               status = ghb_settings_get_int(js, "job_status");
-               if ((status == GHB_QUEUE_RUNNING) || 
-                       (status == GHB_QUEUE_PENDING))
-               {
-                       running = TRUE;
-                       break;
-               }
-       }
-       if (!running)
-       {
-               // The queue has no running or pending jobs.
-               // Add current settings to the queue, then run.
-               if (!queue_add(ud))
-                       return;
-       }
-       state = ghb_get_queue_state();
-       if (state == GHB_STATE_IDLE)
-       {
-               // Add the first pending queue item and start
-               ud->current_job = start_next_job(ud, TRUE);
-       }
-}
-
-void
-queue_stop_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
-{
-       ud->cancel_encode = TRUE;
-       cancel_encode(NULL);
-}
-
-void
-queue_pause_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
-{
-       ghb_pause_queue();
-}
-
-void
-presets_default_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
-{
-       ghb_set_preset_default(ud->settings);
-       ghb_presets_list_update(ud);
-}
-
-void
 debug_log_handler(const gchar *domain, GLogLevelFlags flags, const gchar *msg, gpointer data)
 {
        signal_user_data_t *ud = (signal_user_data_t*)data;
@@ -4043,7 +2360,7 @@ pref_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
        g_debug("pref_changed_cb");
        ghb_widget_to_setting (ud->settings, widget);
-       check_dependency(ud, widget);
+       ghb_check_dependency(ud, widget);
        const gchar *name = gtk_widget_get_name(widget);
        ghb_pref_save(ud->settings, name);
 }
@@ -4057,30 +2374,30 @@ tweaks_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
        ghb_pref_save(ud->settings, name);
 
        gboolean tweaks = ghb_settings_get_boolean(ud->settings, "allow_tweaks");
-       widget = GHB_WIDGET(ud->builder, "deinterlace");
+       widget = GHB_WIDGET(ud->builder, "PictureDeinterlace");
        tweaks ? gtk_widget_hide(widget) : gtk_widget_show(widget);
-       widget = GHB_WIDGET(ud->builder, "tweak_deinterlace");
+       widget = GHB_WIDGET(ud->builder, "tweak_PictureDeinterlace");
        !tweaks ? gtk_widget_hide(widget) : gtk_widget_show(widget);
 
-       widget = GHB_WIDGET(ud->builder, "denoise");
+       widget = GHB_WIDGET(ud->builder, "PictureDenoise");
        tweaks ? gtk_widget_hide(widget) : gtk_widget_show(widget);
-       widget = GHB_WIDGET(ud->builder, "tweak_denoise");
+       widget = GHB_WIDGET(ud->builder, "tweak_PictureDenoise");
        !tweaks ? gtk_widget_hide(widget) : gtk_widget_show(widget);
        if (tweaks)
        {
                const GValue *value;
-               value = ghb_settings_get_value(ud->settings, "deinterlace");
-               ghb_ui_update(ud, "tweak_deinterlace", value);
-               value = ghb_settings_get_value(ud->settings, "denoise");
-               ghb_ui_update(ud, "tweak_denoise", value);
+               value = ghb_settings_get_value(ud->settings, "PictureDeinterlace");
+               ghb_ui_update(ud, "tweak_PictureDeinterlace", value);
+               value = ghb_settings_get_value(ud->settings, "PictureDenoise");
+               ghb_ui_update(ud, "tweak_PictureDenoise", value);
        }
        else
        {
                const GValue *value;
-               value = ghb_settings_get_value(ud->settings, "tweak_deinterlace");
-               ghb_ui_update(ud, "deinterlace", value);
-               value = ghb_settings_get_value(ud->settings, "tweak_denoise");
-               ghb_ui_update(ud, "denoise", value);
+               value = ghb_settings_get_value(ud->settings, "tweak_PictureDeinterlace");
+               ghb_ui_update(ud, "PictureDeinterlace", value);
+               value = ghb_settings_get_value(ud->settings, "tweak_PictureDenoise");
+               ghb_ui_update(ud, "PictureDenoise", value);
        }
 }
 
@@ -4220,11 +2537,13 @@ drive_changed_cb(GVolumeMonitor *gvm, GDrive *gd, signal_user_data_t *ud)
                        gtk_progress_bar_set_fraction (progress, 0);
                        update_source_label(ud, device);
                        ghb_hb_cleanup(TRUE);
+                       prune_logs(ud);
                        ghb_backend_scan(device, 0);
                }
                else
                {
                        ghb_hb_cleanup(TRUE);
+                       prune_logs(ud);
                        ghb_backend_scan("/dev/null", 0);
                }
        }
@@ -4386,127 +2705,246 @@ easter_egg_cb(
        return FALSE;
 }
 
-gboolean
-ghb_reload_queue(signal_user_data_t *ud)
+gchar*
+format_deblock_cb(GtkScale *scale, gdouble val, signal_user_data_t *ud)
 {
-       GValue *queue;
-       gint unfinished = 0;
-       gint count, ii;
-       gint status;
-       GValue *settings;
-       gchar *message;
+       if (val < 5.0)
+       {
+               return g_strdup_printf("Off");
+       }
+       else
+       {
+               return g_strdup_printf("%d", (gint)val);
+       }
+}
 
-       g_debug("ghb_reload_queue");
-       queue = ghb_load_queue();
-       // Look for unfinished entries
-       count = ghb_array_len(queue);
-       for (ii = 0; ii < count; ii++)
+gchar*
+format_vquality_cb(GtkScale *scale, gdouble val, signal_user_data_t *ud)
+{
+       if (ghb_settings_get_boolean(ud->settings, "directqp"))
        {
-               settings = ghb_array_get_nth(queue, ii);
-               status = ghb_settings_get_int(settings, "job_status");
-               if (status != GHB_QUEUE_DONE && status != GHB_QUEUE_CANCELED)
+               gint vcodec = ghb_settings_combo_int(ud->settings, "VideoEncoder");
+               // Only x264 and ffmpeg currently support direct qp/crf entry
+               if (vcodec != HB_VCODEC_X264 && vcodec != HB_VCODEC_FFMPEG)
                {
-                       unfinished++;
+                       val *= 100;
+                       return g_strdup_printf("%.1f", val);
                }
+               return g_strdup_printf("%d", (gint)val);
+       }
+       else
+       {
+               val *= 100;
+               return g_strdup_printf("%.1f", val);
        }
-       if (unfinished)
+}
+
+static void
+html_link_cb(GtkHTML *html, const gchar *url, signal_user_data_t *ud)
+{
+       browse_url(url);
+}
+
+static gboolean check_stable_update(signal_user_data_t *ud);
+static gboolean stable_update_lock = FALSE;
+
+static void
+process_appcast(signal_user_data_t *ud)
+{
+       gchar *description = NULL, *build = NULL, *version = NULL, *msg;
+       GtkWidget *html, *window, *dialog, *label;
+       gint    response, ibuild = 0, skip;
+
+       if (ud->appcast == NULL || ud->appcast_len < 15 || 
+               strncmp(&(ud->appcast[9]), "200 OK", 6))
+       {
+               if (!stable_update_lock && HB_BUILD % 100)
+                       g_idle_add((GSourceFunc)check_stable_update, ud);
+               goto done;
+       }
+       ghb_appcast_parse(ud->appcast, &description, &build, &version);
+       if (build)
+               ibuild = g_strtod(build, NULL);
+       skip = ghb_settings_get_int(ud->settings, "update_skip_version");
+       if (description == NULL || build == NULL || version == NULL 
+               || ibuild <= HB_BUILD || skip == ibuild)
+       {
+               if (!stable_update_lock && HB_BUILD % 100)
+                       g_idle_add((GSourceFunc)check_stable_update, ud);
+               goto done;
+       }
+       msg = g_strdup_printf("HandBrake %s/%s is now available (you have %s/%d).",
+                       version, build, HB_VERSION, HB_BUILD);
+       label = GHB_WIDGET(ud->builder, "update_message");
+       gtk_label_set_text(GTK_LABEL(label), msg);
+       html = gtk_html_new_from_string(description, -1);
+       g_signal_connect(html, "link_clicked", G_CALLBACK(html_link_cb), ud);
+       window = GHB_WIDGET(ud->builder, "update_scroll");
+       gtk_container_add(GTK_CONTAINER(window), html);
+       // Show it
+       dialog = GHB_WIDGET(ud->builder, "update_dialog");
+       gtk_widget_set_size_request(html, 420, 240);
+       gtk_widget_show(html);
+       response = gtk_dialog_run(GTK_DIALOG(dialog));
+       gtk_widget_hide(dialog);
+       gtk_widget_destroy(html);
+       if (response == GTK_RESPONSE_OK)
        {
-               message = g_strdup_printf(
-                                       "You have %d unfinished jobs in a saved queue.\n\n"
-                                       "Would you like to reload them?",
-                                       unfinished);
-               if (ghb_message_dialog(GTK_MESSAGE_QUESTION, message, "No", "Yes"))
-               {
-                       GtkWidget *widget = GHB_WIDGET (ud->builder, "queue_window");
-                       gtk_widget_show (widget);
+               // Skip
+               ghb_settings_set_int(ud->settings, "update_skip_version", ibuild);
+               ghb_pref_save(ud->settings, "update_skip_version");
+       }
+       g_free(msg);
 
-                       ud->queue = queue;
-                       // First get rid of any old items we don't want
-                       for (ii = count-1; ii >= 0; ii--)
-                       {
-                               settings = ghb_array_get_nth(queue, ii);
-                               status = ghb_settings_get_int(settings, "job_status");
-                               if (status == GHB_QUEUE_DONE || status == GHB_QUEUE_CANCELED)
-                               {
-                                       GValue *old = ghb_array_get_nth(queue, ii);
-                                       ghb_value_free(old);
-                                       ghb_array_remove(queue, ii);
-                               }
-                       }
-                       count = ghb_array_len(queue);
-                       for (ii = 0; ii < count; ii++)
-                       {
-                               settings = ghb_array_get_nth(queue, ii);
-                               ghb_settings_set_int(settings, "job_unique_id", 0);
-                               ghb_settings_set_int(settings, "job_status", GHB_QUEUE_PENDING);
-                               add_to_queue_list(ud, settings, NULL);
-                       }
-                       queue_buttons_grey(ud, FALSE);
-               }
-               else
-               {
-                       ghb_value_free(queue);
-                       ghb_remove_queue_file();
-               }
-               g_free(message);
+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");
+       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;
+               process_appcast(ud);
+               ghb_net_close(ioc);
+               return FALSE;
+       }
+       return TRUE;
+}
+
+static gboolean
+appcast_timeout_cb(GIOChannel *ioc)
+{
+       g_debug("appcast_timeout_cb");
+       ghb_net_close(ioc);
        return FALSE;
 }
 
-gboolean queue_key_press_cb(
-       GtkWidget *widget, 
-       GdkEventKey *event,
-       signal_user_data_t *ud)
+GIOChannel*
+ghb_net_open(signal_user_data_t *ud, gchar *address, gint port)
 {
-       GtkTreeView *treeview;
-       GtkTreeSelection *selection;
-       GtkTreeModel *store;
-       GtkTreeIter iter;
-       gint row;
-       gint *indices;
-       gint unique_id;
-       GValue *settings;
-       gint status;
+       GIOChannel *ioc;
+       gint fd;
 
-       g_message("queue_key_press_cb ()");
-       treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "queue_list"));
-       store = gtk_tree_view_get_model(treeview);
+       struct sockaddr_in   sock;
+       struct hostent     * host;
 
-       selection = gtk_tree_view_get_selection (treeview);
-       if (gtk_tree_selection_get_selected(selection, &store, &iter))
+       g_debug("ghb_net_open");
+       if( !( host = gethostbyname( address ) ) )
        {
-               GtkTreePath *treepath;
-
-               treepath = gtk_tree_model_get_path (store, &iter);
-               // 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 FALSE;
-               if (row >= ghb_array_len(ud->queue))
-                       return FALSE;
-               settings = ghb_array_get_nth(ud->queue, row);
-               status = ghb_settings_get_int(settings, "job_status");
-               if (status == GHB_QUEUE_RUNNING)
-               {
-                       // Ask if wants to stop encode.
-                       if (!cancel_encode(NULL))
-                       {
-                               return FALSE;
-                       }
-                       unique_id = ghb_settings_get_int(settings, "job_unique_id");
-                       ghb_remove_job(unique_id);
-               }
-               // Remove the selected item
-               gtk_tree_store_remove(GTK_TREE_STORE(store), &iter);
-               // Remove the corresponding item from the queue list
-               GValue *old = ghb_array_get_nth(ud->queue, row);
-               ghb_value_free(old);
-               ghb_array_remove(ud->queue, row);
-               ghb_save_queue(ud->queue);
+               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 );
+       g_timeout_add_seconds(20, (GSourceFunc)appcast_timeout_cb, ioc);
+
+       return ioc;
+}
+
+gboolean
+ghb_check_update(signal_user_data_t *ud)
+{
+       gchar *query;
+       gsize len;
+       GIOChannel *ioc;
+       GError *gerror = NULL;
+
+       g_debug("ghb_check_update");
+       if (HB_BUILD % 100)
+       {
+       query = 
+               "GET /appcast_unstable.xml HTTP/1.0\r\nHost: handbrake.fr\r\n\r\n";
+       }
+       else
+       {
+               stable_update_lock = TRUE;
+       query = "GET /appcast.xml HTTP/1.0\r\nHost: handbrake.fr\r\n\r\n";
+       }
+       ioc = ghb_net_open(ud, "handbrake.fr", 80);
+       if (ioc == NULL)
+               return FALSE;
+
+       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 FALSE;
+}
+
+static gboolean
+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 FALSE;
+
+       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 FALSE;
 }