OSDN Git Service

LinGui: When translating legacy presets, vquality 0 means RF 0, not 0%
[handbrake-jp/handbrake-jp-git.git] / gtk / src / callbacks.c
index bf44181..fa57422 100644 (file)
 
 #include <netinet/in.h>
 #include <netdb.h>
+#if defined(_OLD_WEBKIT)
+#include <webkit.h>
+#else
 #include <webkit/webkit.h>
+#endif
 #include <libnotify/notify.h>
+#include <gdk/gdkx.h>
 #else
 #define WINVER 0x0500
 #include <winsock2.h>
 #include "ghb-dvd.h"
 #include "ghbcellrenderertext.h"
 
+static void reset_chapter_list(signal_user_data_t *ud, GValue *settings);
 static void update_chapter_list(signal_user_data_t *ud);
 static GList* dvd_device_list();
 static void prune_logs(signal_user_data_t *ud);
 void ghb_notify_done(signal_user_data_t *ud);
 gpointer ghb_check_update(signal_user_data_t *ud);
+static gboolean ghb_can_shutdown_gsm();
+static void ghb_shutdown_gsm();
+static gboolean ghb_can_suspend_gpm();
+static void ghb_suspend_gpm();
 static gboolean appcast_busy = FALSE;
 
 // This is a dependency map used for greying widgets
@@ -104,8 +114,7 @@ dep_check(signal_user_data_t *ud, const gchar *name, gboolean *out_hide)
                widget_name = ghb_value_string(ghb_array_get_nth(data, 0));
                widget = GHB_WIDGET(ud->builder, widget_name);
                dep_object = gtk_builder_get_object(ud->builder, name);
-               g_free(widget_name);
-               if (!GTK_WIDGET_SENSITIVE(widget))
+               if (widget != NULL && !GTK_WIDGET_SENSITIVE(widget))
                        continue;
                if (dep_object == NULL)
                {
@@ -128,7 +137,7 @@ dep_check(signal_user_data_t *ud, const gchar *name, gboolean *out_hide)
                        if (widget)
                                value = ghb_widget_string(widget);
                        else
-                               value = ghb_settings_get_string(ud->settings, name);
+                               value = ghb_settings_get_string(ud->settings, widget_name);
                        while (values && values[jj])
                        {
                                if (values[jj][0] == '>')
@@ -167,12 +176,16 @@ dep_check(signal_user_data_t *ud, const gchar *name, gboolean *out_hide)
                        g_strfreev (values);
                        g_free(value);
                }
+               g_free(widget_name);
        }
        return result;
 }
 
 void
-ghb_check_dependency(signal_user_data_t *ud, GtkWidget *widget)
+ghb_check_dependency(
+       signal_user_data_t *ud, 
+       GtkWidget *widget, 
+       const char *alt_name)
 {
        GObject *dep_object;
        const gchar *name;
@@ -181,11 +194,16 @@ ghb_check_dependency(signal_user_data_t *ud, GtkWidget *widget)
        gchar *dep_name;
        GType type;
 
-       type = GTK_WIDGET_TYPE(widget);
-       if (type == GTK_TYPE_COMBO_BOX || type == GTK_TYPE_COMBO_BOX_ENTRY)
-               if (gtk_combo_box_get_active(GTK_COMBO_BOX(widget)) < 0) return;
+       if (widget != NULL)
+       {
+               type = GTK_WIDGET_TYPE(widget);
+               if (type == GTK_TYPE_COMBO_BOX || type == GTK_TYPE_COMBO_BOX_ENTRY)
+                       if (gtk_combo_box_get_active(GTK_COMBO_BOX(widget)) < 0) return;
+               name = gtk_widget_get_name(widget);
+       }
+       else
+               name = alt_name;
 
-       name = gtk_widget_get_name(widget);
        g_debug("ghb_check_dependency () %s", name);
 
        if (dep_map == NULL) return;
@@ -278,9 +296,9 @@ on_quit1_activate(GtkMenuItem *quit, signal_user_data_t *ud)
 {
        gint state = ghb_get_queue_state();
        g_debug("on_quit1_activate ()");
-       if (state & GHB_STATE_WORKING)
+       if (state & (GHB_STATE_WORKING|GHB_STATE_SEARCHING))
        {
-               if (ghb_cancel_encode("Closing HandBrake will terminate encoding.\n"))
+               if (ghb_cancel_encode2(ud, "Closing HandBrake will terminate encoding.\n"))
                {
                        ghb_hb_cleanup(FALSE);
                        prune_logs(ud);
@@ -389,7 +407,7 @@ get_direct_dvd_volume_name(const gchar *drive)
        gchar *result = NULL;
        gchar vname[51], fsname[51];
 
-       if (GetVolumeInformation(drive, vname, 50, NULL, NULL, NULL, fsname, 51))
+       if (GetVolumeInformation(drive, vname, 50, NULL, NULL, NULL, fsname, 50))
        {
                result = g_strdup_printf("%s", vname);
        }
@@ -405,36 +423,30 @@ get_direct_dvd_volume_name(const gchar *drive)
        return result;
 }
 #endif
+
 static gchar*
-get_dvd_volume_name(GDrive *gd)
+get_dvd_volume_name(gpointer gd)
 {
        gchar *label = NULL;
        gchar *result;
        gchar *drive;
 
        drive = get_dvd_device_name(gd);
-       if (g_drive_has_media (gd))
+       g_mutex_lock(volname_mutex);
+       label = g_strdup(g_hash_table_lookup(volname_hash, drive));
+       g_mutex_unlock(volname_mutex);
+       if (label != NULL)
        {
-               g_mutex_lock(volname_mutex);
-               label = g_strdup(g_hash_table_lookup(volname_hash, drive));
-               g_mutex_unlock(volname_mutex);
-               if (label != NULL)
+               if (uppers_and_unders(label))
                {
-                       if (uppers_and_unders(label))
-                       {
-                               camel_convert(label);
-                       }
+                       camel_convert(label);
+               }
 #if defined(_WIN32)
-                       result = g_strdup_printf("%s (%s)", label, drive);
+               result = g_strdup_printf("%s (%s)", label, drive);
 #else
-                       result = g_strdup_printf("%s - %s", drive, label);
+               result = g_strdup_printf("%s - %s", drive, label);
 #endif
-                       g_free(label);
-               }
-               else
-               {
-                       result = g_strdup_printf("%s", drive);
-               }
+               g_free(label);
        }
        else
        {
@@ -452,6 +464,16 @@ ghb_volname_cache_init(void)
                                                                                free_volname_key, free_volname_value);
 }
 
+static void
+free_drive(gpointer drive)
+{
+#if defined(_WIN32)
+               g_free(drive);
+#else
+               g_object_unref(drive);
+#endif
+}
+
 gpointer
 ghb_cache_volnames(signal_user_data_t *ud)
 {
@@ -466,8 +488,19 @@ ghb_cache_volnames(signal_user_data_t *ud)
        g_hash_table_remove_all(volname_hash);
        while (link != NULL)
        {
-               gchar *drive = get_dvd_device_name(link->data);
-               gchar *name = get_direct_dvd_volume_name(drive);
+               gchar *name, *drive;
+
+#if !defined(_WIN32)
+               if (!g_drive_has_media (link->data))
+               {
+                       g_object_unref(link->data);
+                       link = link->next;
+                       continue;
+               }
+#endif
+               drive = get_dvd_device_name(link->data);
+               name = get_direct_dvd_volume_name(drive);
+
                if (drive != NULL && name != NULL)
                {
                        g_hash_table_insert(volname_hash, drive, name);
@@ -480,7 +513,7 @@ ghb_cache_volnames(signal_user_data_t *ud)
                                g_free(name);
                }
        
-               g_object_unref(link->data);
+               free_drive(link->data);
                link = link->next;
        }
        g_mutex_unlock(volname_mutex);
@@ -492,6 +525,35 @@ ghb_cache_volnames(signal_user_data_t *ud)
        return NULL;
 }
 
+static const gchar*
+get_extension(signal_user_data_t *ud)
+{
+       int container;
+       const gchar *extension = "error";
+       GValue *audio_list;
+       GValue *subtitle_list;
+
+       container = ghb_settings_combo_int(ud->settings, "FileFormat");
+       if (container == HB_MUX_MP4)
+       {
+               extension = "mp4";
+               audio_list = ghb_settings_get_value(ud->settings, "audio_list");
+               subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
+               if (ghb_ac3_in_audio_list(audio_list) ||
+                       ghb_soft_in_subtitle_list(subtitle_list) ||
+                       ghb_settings_get_boolean(ud->settings, "ChapterMarkers") ||
+                       ghb_settings_get_boolean(ud->settings, "UseM4v"))
+               {
+                       extension = "m4v";
+               }
+       }
+       else if (container == HB_MUX_MKV)
+       {
+               extension = "mkv";
+       }
+       return extension;
+}
+
 static void
 set_destination(signal_user_data_t *ud)
 {
@@ -499,12 +561,13 @@ set_destination(signal_user_data_t *ud)
        if (ghb_settings_get_boolean(ud->settings, "use_source_name"))
        {
                GString *str = g_string_new("");
-               gchar *vol_name, *filename, *extension;
+               gchar *vol_name, *filename;
+               const gchar *extension;
                gchar *new_name;
                gint title;
                
                filename = ghb_settings_get_string(ud->settings, "dest_file");
-               extension = ghb_settings_get_string(ud->settings, "FileFormat");
+               extension = get_extension(ud);
                vol_name = ghb_settings_get_string(ud->settings, "volume_label");
                g_string_append_printf(str, "%s", vol_name);
                title = ghb_settings_combo_int(ud->settings, "title");
@@ -517,7 +580,8 @@ set_destination(signal_user_data_t *ud)
                                title = ghb_settings_combo_int(ud->settings, "title");
                                g_string_append_printf(str, " - %d", title+1);
                        }
-                       if (ghb_settings_get_boolean(
+                       if (ghb_settings_combo_int(ud->settings, "PtoPType") == 0 && 
+                               ghb_settings_get_boolean(
                                        ud->settings, "chapters_in_destination"))
                        {
                                gint start, end;
@@ -527,8 +591,8 @@ set_destination(signal_user_data_t *ud)
                                {
                                        g_string_append_printf(str, " -");
                                }
-                               start = ghb_settings_get_int(ud->settings, "start_chapter");
-                               end = ghb_settings_get_int(ud->settings, "end_chapter");
+                               start = ghb_settings_get_int(ud->settings, "start_point");
+                               end = ghb_settings_get_int(ud->settings, "end_point");
                                if (start == end)
                                        g_string_append_printf(str, " Ch %d", start);
                                else
@@ -539,7 +603,6 @@ set_destination(signal_user_data_t *ud)
                new_name = g_string_free(str, FALSE);
                ghb_ui_update(ud, "dest_file", ghb_string_value(new_name));
                g_free(filename);
-               g_free(extension);
                g_free(vol_name);
                g_free(new_name);
        }
@@ -548,21 +611,17 @@ set_destination(signal_user_data_t *ud)
 static gchar*
 get_file_label(const gchar *filename)
 {
-       static gchar *containers[] = 
-               {".vob", ".mpg", ".m2ts", ".mkv", ".mp4", ".m4v", ".avi", ".ogm", NULL};
-       gchar *base;
-       gint ii;
+       gchar *base, *pos, *end;
 
        base = g_path_get_basename(filename);
-       for (ii = 0; containers[ii] != NULL; ii++)
+       pos = strrchr(base, '.');
+       if (pos != NULL)
        {
-               if (g_str_has_suffix(base, containers[ii]))
-               {
-                       gchar *pos;
-                       pos = strrchr(base, '.');
+               // If the last '.' is within 4 chars of end of name, assume
+               // there is an extension we want to strip.
+               end = &base[strlen(base) - 1];
+               if (end - pos <= 4)
                        *pos = 0;
-                       break;
-               }
        }
        return base;
 }
@@ -595,7 +654,7 @@ resolve_drive_name(gchar *filename)
 }
 
 static gboolean
-update_source_label(signal_user_data_t *ud, const gchar *source)
+update_source_label(signal_user_data_t *ud, const gchar *source, gboolean update_dest)
 {
        gchar *label = NULL;
        gint len;
@@ -603,12 +662,16 @@ update_source_label(signal_user_data_t *ud, const gchar *source)
        gchar *start;
        gchar *filename = g_strdup(source);
        
+       g_debug("update_source_label()");
        len = strlen(filename);
-       if (filename[len-1] == G_DIR_SEPARATOR) filename[len-1] = 0;
        if (g_file_test(filename, G_FILE_TEST_IS_DIR))
        {
                // Skip dos drive letters
+#if defined(_WIN32)
                start = strchr(filename, ':');
+#else
+               start = filename;
+#endif
                label = resolve_drive_name(filename);
                if (label != NULL)
                {
@@ -619,6 +682,7 @@ update_source_label(signal_user_data_t *ud, const gchar *source)
                }
                else
                {
+                       if (filename[len-1] == G_DIR_SEPARATOR) filename[len-1] = 0;
                        if (start != NULL)
                                start++;
                        else
@@ -676,7 +740,8 @@ update_source_label(signal_user_data_t *ud, const gchar *source)
                gtk_label_set_text (GTK_LABEL(widget), label);
                ghb_settings_set_string(ud->settings, "volume_label", label);
                g_free(label);
-               set_destination(ud);
+               if (update_dest)
+                       set_destination(ud);
        }
        else
        {
@@ -691,7 +756,7 @@ update_source_label(signal_user_data_t *ud, const gchar *source)
 G_MODULE_EXPORT void
 chooser_file_selected_cb(GtkFileChooser *dialog, signal_user_data_t *ud)
 {
-       const gchar *name = gtk_file_chooser_get_filename (dialog);
+       gchar *name = gtk_file_chooser_get_filename (dialog);
        GtkTreeModel *store;
        GtkTreeIter iter;
        const gchar *device;
@@ -717,6 +782,8 @@ chooser_file_selected_cb(GtkFileChooser *dialog, signal_user_data_t *ud)
                gtk_combo_box_set_active_iter (combo, &iter);
        else
                gtk_combo_box_set_active (combo, 0);
+
+       g_free(name);
 }
 
 G_MODULE_EXPORT void
@@ -728,13 +795,16 @@ dvd_device_changed_cb(GtkComboBox *combo, signal_user_data_t *ud)
        ii = gtk_combo_box_get_active (combo);
        if (ii > 0)
        {
-               const gchar *device, *name;
+               const gchar *device;
+               gchar *name;
 
                dialog = GHB_WIDGET(ud->builder, "source_dialog");
                device = gtk_combo_box_get_active_text (combo);
                name = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER(dialog));
                if (name == NULL || strcmp(name, device) != 0)
                        gtk_file_chooser_select_filename (GTK_FILE_CHOOSER(dialog), device);
+               if (name != NULL)
+                       g_free(name);
        }
 }
 
@@ -792,7 +862,7 @@ source_dialog_extra_widgets(
                gchar *name = get_dvd_device_name(link->data);
                gtk_combo_box_append_text(combo, name);
                g_free(name);
-               g_object_unref(link->data);
+               free_drive(link->data);
                link = link->next;
        }
        g_list_free(drives);
@@ -801,6 +871,48 @@ source_dialog_extra_widgets(
 extern GValue *ghb_queue_edit_settings;
 static gchar *last_scan_file = NULL;
 
+static void 
+show_scan_progress(signal_user_data_t *ud)
+{
+       GtkProgressBar *progress;
+       GtkLabel *label;
+
+       progress = GTK_PROGRESS_BAR(GHB_WIDGET(ud->builder, "scan_prog"));
+       gtk_progress_bar_set_fraction (progress, 0);
+       gtk_widget_show(GTK_WIDGET(progress));
+
+       label = GTK_LABEL(GHB_WIDGET(ud->builder, "source_title"));
+       gtk_label_set_text( label, "Scanning ..." );
+}
+
+static void
+start_scan(
+       signal_user_data_t *ud, 
+       const gchar *path, 
+       gint titlenum, 
+       gint preview_count)
+{
+       GtkWidget *widget;
+       GtkAction *action;
+       ghb_status_t status;
+
+       ghb_get_status(&status);
+       if (status.scan.state != GHB_STATE_IDLE)
+               return;
+
+       widget = GHB_WIDGET(ud->builder, "sourcetoolbutton");
+       gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(widget), "hb-stop");
+       gtk_tool_button_set_label(GTK_TOOL_BUTTON(widget), "Stop Scan");
+       gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(widget), "Stop Scan");
+       //gtk_widget_set_sensitive(widget, FALSE);
+
+       action = GHB_ACTION(ud->builder, "source_action");
+       gtk_action_set_sensitive(action, FALSE);
+       action = GHB_ACTION(ud->builder, "source_single_action");
+       gtk_action_set_sensitive(action, FALSE);
+       ghb_backend_scan(path, titlenum, preview_count);
+}
+
 void
 ghb_do_scan(
        signal_user_data_t *ud, 
@@ -808,21 +920,17 @@ ghb_do_scan(
        gint titlenum, 
        gboolean force)
 {
+       g_debug("ghb_do_scan()");
        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);
                        ghb_reset_subtitles(ud, ghb_queue_edit_settings);
-                       if (jstatus == GHB_QUEUE_PENDING)
-                       {
-                               ghb_value_free(ghb_queue_edit_settings);
-                       }
+                       reset_chapter_list(ud, ghb_queue_edit_settings);
+                       ghb_value_free(ghb_queue_edit_settings);
                        ghb_queue_edit_settings = NULL;
                }
                return;
@@ -833,19 +941,18 @@ ghb_do_scan(
        if (filename != NULL)
        {
                last_scan_file = g_strdup(filename);
-               ghb_settings_set_string(ud->settings, "source", filename);
-               if (update_source_label(ud, filename))
+               ghb_settings_set_string(ud->settings, "scan_source", filename);
+               if (update_source_label(ud, filename, TRUE))
                {
-                       GtkProgressBar *progress;
-                       progress = GTK_PROGRESS_BAR(GHB_WIDGET(ud->builder, "progressbar"));
                        gchar *path;
-                       path = ghb_settings_get_string( ud->settings, "source");
-                       gtk_progress_bar_set_fraction (progress, 0);
-                       gtk_progress_bar_set_text (progress, "Scanning ...");
-                       prune_logs(ud);
                        gint preview_count;
+
+                       show_scan_progress(ud);
+                       path = ghb_settings_get_string( ud->settings, "scan_source");
+                       prune_logs(ud);
+
                        preview_count = ghb_settings_get_int(ud->settings, "preview_count");
-                       ghb_backend_scan(path, titlenum, preview_count);
+                       start_scan(ud, path, titlenum, preview_count);
                        g_free(path);
                }
                else
@@ -862,7 +969,7 @@ update_source_name(gpointer data)
        GtkWidget *dialog;
        gchar *sourcename;
 
-       sourcename = ghb_settings_get_string(ud->settings, "source");
+       sourcename = ghb_settings_get_string(ud->settings, "scan_source");
        dialog = GHB_WIDGET(ud->builder, "source_dialog");
        gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog), sourcename);
        g_free(sourcename);
@@ -879,7 +986,7 @@ do_source_dialog(GtkButton *button, gboolean single, signal_user_data_t *ud)
        gboolean checkbutton_active;
 
        g_debug("source_browse_clicked_cb ()");
-       sourcename = ghb_settings_get_string(ud->settings, "source");
+       sourcename = ghb_settings_get_string(ud->settings, "scan_source");
        checkbutton_active = FALSE;
        if (g_file_test(sourcename, G_FILE_TEST_IS_DIR))
        {
@@ -908,7 +1015,7 @@ do_source_dialog(GtkButton *button, gboolean single, signal_user_data_t *ud)
        gtk_widget_hide(dialog);
        if (response == GTK_RESPONSE_ACCEPT)
        {
-               char *filename;
+               gchar *filename;
 
                filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
                if (filename != NULL)
@@ -936,7 +1043,16 @@ do_source_dialog(GtkButton *button, gboolean single, signal_user_data_t *ud)
 G_MODULE_EXPORT void
 source_button_clicked_cb(GtkButton *button, signal_user_data_t *ud)
 {
-       do_source_dialog(button, FALSE, ud);
+       ghb_status_t status;
+       ghb_get_status(&status);
+       if (status.scan.state & GHB_STATE_SCANNING)
+       {
+               ghb_backend_scan_stop();
+       }
+       else
+       {
+               do_source_dialog(button, FALSE, ud);
+       }
 }
 
 G_MODULE_EXPORT void
@@ -951,7 +1067,7 @@ dvd_source_activate_cb(GtkAction *action, signal_user_data_t *ud)
        const gchar *filename;
        gchar *sourcename;
 
-       sourcename = ghb_settings_get_string(ud->settings, "source");
+       sourcename = ghb_settings_get_string(ud->settings, "scan_source");
        filename = gtk_action_get_name(action);
        ghb_do_scan(ud, filename, 0, TRUE);
        if (strcmp(sourcename, filename) != 0)
@@ -963,17 +1079,24 @@ dvd_source_activate_cb(GtkAction *action, signal_user_data_t *ud)
        g_free(sourcename);
 }
 
-static void
-update_destination_extension(signal_user_data_t *ud)
+void
+ghb_update_destination_extension(signal_user_data_t *ud)
 {
-       static gchar *containers[] = {".mkv", ".mp4", ".m4v", ".avi", ".ogm", NULL};
+       static gchar *containers[] = {".mkv", ".mp4", ".m4v", NULL};
        gchar *filename;
-       gchar *extension;
+       const gchar *extension;
        gint ii;
        GtkEntry *entry;
+       static gboolean busy = FALSE;
 
-       g_debug("update_destination_extension ()");
-       extension = ghb_settings_get_string(ud->settings, "FileFormat");
+       g_debug("ghb_update_destination_extension ()");
+       // Since this function modifies the thing that triggers it's
+       // invocation, check to see if busy to prevent accidental infinite
+       // recursion.
+       if (busy)
+               return;
+       busy = TRUE;
+       extension = get_extension(ud);
        entry = GTK_ENTRY(GHB_WIDGET(ud->builder, "dest_file"));
        filename = g_strdup(gtk_entry_get_text(entry));
        for (ii = 0; containers[ii] != NULL; ii++)
@@ -1001,8 +1124,8 @@ update_destination_extension(signal_user_data_t *ud)
                        break;
                }
        }
-       g_free(extension);
        g_free(filename);
+       busy = FALSE;
 }
 
 static void
@@ -1068,7 +1191,7 @@ dest_file_changed_cb(GtkEntry *entry, signal_user_data_t *ud)
        gchar *dest_file, *dest_dir, *dest;
        
        g_debug("dest_file_changed_cb ()");
-       update_destination_extension(ud);
+       ghb_update_destination_extension(ud);
        ghb_widget_to_setting(ud->settings, (GtkWidget*)entry);
        // This signal goes off with ever keystroke, so I'm putting this
        // update on the timer.
@@ -1137,9 +1260,9 @@ window_delete_event_cb(GtkWidget *widget, GdkEvent *event, signal_user_data_t *u
 {
        gint state = ghb_get_queue_state();
        g_debug("window_delete_event_cb ()");
-       if (state & GHB_STATE_WORKING)
+       if (state & (GHB_STATE_WORKING|GHB_STATE_SEARCHING))
        {
-               if (ghb_cancel_encode("Closing HandBrake will terminate encoding.\n"))
+               if (ghb_cancel_encode2(ud, "Closing HandBrake will terminate encoding.\n"))
                {
                        ghb_hb_cleanup(FALSE);
                        prune_logs(ud);
@@ -1163,42 +1286,15 @@ update_acodec_combo(signal_user_data_t *ud)
 G_MODULE_EXPORT void
 container_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-       const GValue *audio_list;
-       gboolean markers;
-
        g_debug("container_changed_cb ()");
        ghb_widget_to_setting(ud->settings, widget);
-       update_destination_extension(ud);
-       ghb_check_dependency(ud, widget);
+       ghb_check_dependency(ud, widget, NULL);
        update_acodec_combo(ud);
+       ghb_update_destination_extension(ud);
        ghb_clear_presets_selection(ud);
        ghb_live_reset(ud);
-
-       audio_list = ghb_settings_get_value(ud->settings, "audio_list");
-       if (ghb_ac3_in_audio_list (audio_list))
-       {
-               gchar *container;
-
-               container = ghb_settings_get_string(ud->settings, "FileFormat");
-               if (strcmp(container, "mp4") == 0)
-               {
-                       ghb_ui_update(ud, "FileFormat", ghb_string_value("m4v"));
-               }
-               g_free(container);
-       }
-       markers = ghb_settings_get_boolean(ud->settings, "ChapterMarkers");
-       if (markers)
-       {
-               gchar *container;
-
-               container = ghb_settings_get_string(ud->settings, "FileFormat");
-               if (strcmp(container, "mp4") == 0)
-               {
-                       ghb_ui_update(ud, "FileFormat", ghb_string_value("m4v"));
-               }
-               g_free(container);
-       }
        ghb_subtitle_prune(ud);
+       ghb_audio_list_refresh_selected(ud);
 }
 
 static gchar*
@@ -1227,25 +1323,87 @@ get_rate_string(gint rate_base, gint rate)
        rate_s = g_strdup_printf("%.6g", rate_f);
        return rate_s;
 }
+
 static void
-show_title_info(signal_user_data_t *ud, ghb_title_info_t *tinfo)
+update_title_duration(signal_user_data_t *ud)
 {
-       GtkWidget *widget;
+       gint ti;
+       gint hh, mm, ss, start, end;
        gchar *text;
+       GtkWidget *widget;
 
-       ud->dont_clear_presets = TRUE;
+       ti = ghb_settings_combo_int(ud->settings, "title");
        widget = GHB_WIDGET (ud->builder, "title_duration");
-       if (tinfo->duration != 0)
+
+       if (ghb_settings_combo_int(ud->settings, "PtoPType") == 0)
        {
-               text = g_strdup_printf ("%02d:%02d:%02d", tinfo->hours, 
-                               tinfo->minutes, tinfo->seconds);
+               start = ghb_settings_get_int(ud->settings, "start_point");
+               end = ghb_settings_get_int(ud->settings, "end_point");
+               ghb_part_duration(ti, start, end, &hh, &mm, &ss);
        }
-       else
+       else if (ghb_settings_combo_int(ud->settings, "PtoPType") == 1)
        {
-               text = g_strdup_printf ("Unknown");
+               gint duration;
+
+               start = ghb_settings_get_int(ud->settings, "start_point");
+               end = ghb_settings_get_int(ud->settings, "end_point");
+               duration = end - start;
+               hh = duration / (60*60);
+               mm = (duration / 60) % 60;
+               ss = duration % 60;
+       }
+       else if (ghb_settings_combo_int(ud->settings, "PtoPType") == 2)
+       {
+               ghb_title_info_t tinfo;
+
+               if (ghb_get_title_info (&tinfo, ti))
+               {
+                       gint64 frames;
+                       gint duration;
+
+                       start = ghb_settings_get_int(ud->settings, "start_point");
+                       end = ghb_settings_get_int(ud->settings, "end_point");
+                       frames = end - start + 1;
+                       duration = frames * tinfo.rate_base / tinfo.rate;
+                       hh = duration / (60*60);
+                       mm = (duration / 60) % 60;
+                       ss = duration % 60;
+               }
+               else
+               {
+                       hh = mm = ss = 0;
+               }
        }
+       text = g_strdup_printf("%02d:%02d:%02d", hh, mm, ss);
        gtk_label_set_text (GTK_LABEL(widget), text);
        g_free(text);
+}
+
+static void
+show_title_info(signal_user_data_t *ud, ghb_title_info_t *tinfo)
+{
+       GtkWidget *widget;
+       gchar *text;
+
+       ghb_settings_set_string(ud->settings, "source", tinfo->path);
+       if (tinfo->type == HB_STREAM_TYPE)
+       {
+               GtkWidget *widget = GHB_WIDGET (ud->builder, "source_title");
+               if (tinfo->name != NULL && tinfo->name[0] != 0)
+               {
+                       gtk_label_set_text (GTK_LABEL(widget), tinfo->name);
+                       ghb_settings_set_string(ud->settings, "volume_label", tinfo->name);
+                       set_destination(ud);
+               }
+               else
+               {
+                       gchar *label = "No Title Found";
+                       gtk_label_set_text (GTK_LABEL(widget), label);
+                       ghb_settings_set_string(ud->settings, "volume_label", label);
+               }
+       }
+       ud->dont_clear_presets = TRUE;
+       update_title_duration(ud);
        widget = GHB_WIDGET (ud->builder, "source_dimensions");
        text = g_strdup_printf ("%d x %d", tinfo->width, tinfo->height);
        gtk_label_set_text (GTK_LABEL(widget), text);
@@ -1278,12 +1436,12 @@ show_title_info(signal_user_data_t *ud, ghb_title_info_t *tinfo)
        // 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;
+       bound = tinfo->height / 2 - 8;
        widget = GHB_WIDGET (ud->builder, "PictureTopCrop");
        gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, bound);
        widget = GHB_WIDGET (ud->builder, "PictureBottomCrop");
        gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, bound);
-       bound = tinfo->width / 2 - 2;
+       bound = tinfo->width / 2 - 8;
        widget = GHB_WIDGET (ud->builder, "PictureLeftCrop");
        gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, bound);
        widget = GHB_WIDGET (ud->builder, "PictureRightCrop");
@@ -1308,17 +1466,46 @@ show_title_info(signal_user_data_t *ud, ghb_title_info_t *tinfo)
        gtk_label_set_text (GTK_LABEL(widget), text);
        g_free(text);
 
-       g_debug("setting max end chapter %d", tinfo->num_chapters);
-       widget = GHB_WIDGET (ud->builder, "end_chapter");
-       gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 1, tinfo->num_chapters);
-       gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), tinfo->num_chapters);
-       widget = GHB_WIDGET (ud->builder, "start_chapter");
-       gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), 1);
-       gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 1, tinfo->num_chapters);
+
+       gint duration = tinfo->duration / 90000;
+
+       if (ghb_settings_combo_int(ud->settings, "PtoPType") == 0)
+       {
+               widget = GHB_WIDGET (ud->builder, "start_point");
+               gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 1, tinfo->num_chapters);
+               gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), 1);
+
+               widget = GHB_WIDGET (ud->builder, "end_point");
+               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);
+       }
+       else if (ghb_settings_combo_int(ud->settings, "PtoPType") == 1)
+       {
+
+               widget = GHB_WIDGET (ud->builder, "start_point");
+               gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, duration-1);
+               gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), 0);
+
+               widget = GHB_WIDGET (ud->builder, "end_point");
+               gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 1, duration);
+               gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), duration);
+       }
+       else if (ghb_settings_combo_int(ud->settings, "PtoPType") == 2)
+       {
+               gdouble max_frames = (gdouble)duration * tinfo->rate / tinfo->rate_base;
+               widget = GHB_WIDGET (ud->builder, "start_point");
+               gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 1, max_frames);
+               gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), 1);
+
+               widget = GHB_WIDGET (ud->builder, "end_point");
+               gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 1, max_frames);
+               gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), max_frames);
+       }
 
        widget = GHB_WIDGET (ud->builder, "angle");
        gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), 1);
        gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 1, tinfo->angle_count);
+       ghb_settings_set_int(ud->settings, "angle_count", tinfo->angle_count);
        ud->dont_clear_presets = FALSE;
 }
 
@@ -1332,7 +1519,6 @@ title_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
        
        g_debug("title_changed_cb ()");
        ghb_widget_to_setting(ud->settings, widget);
-       ghb_check_dependency(ud, widget);
 
        titleindex = ghb_settings_combo_int(ud->settings, "title");
        ghb_update_ui_combo_box (ud, "AudioTrack", titleindex, FALSE);
@@ -1342,6 +1528,7 @@ title_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
        {
                show_title_info(ud, &tinfo);
        }
+       ghb_check_dependency(ud, widget, NULL);
        update_chapter_list (ud);
        ghb_adjust_audio_rate_combos(ud);
        ghb_set_pref_audio(titleindex, ud);
@@ -1368,13 +1555,74 @@ title_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
        {
                set_destination(ud);
        }
+       ghb_preview_set_visible(ud);
+
+       gint end;
+       widget = GHB_WIDGET (ud->builder, "ChapterMarkers");
+       gtk_widget_set_sensitive(widget, TRUE);
+       end = ghb_settings_get_int(ud->settings, "end_point");
+       if (1 == end)
+       {
+               ud->dont_clear_presets = TRUE;
+               ghb_ui_update(ud, "ChapterMarkers", ghb_boolean_value(FALSE));
+               ud->dont_clear_presets = FALSE;
+               gtk_widget_set_sensitive(widget, FALSE);
+       }
+}
+
+G_MODULE_EXPORT void
+ptop_widget_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
+{
+       gint ti;
+       ghb_title_info_t tinfo;
+
+       ghb_widget_to_setting(ud->settings, widget);
+       ghb_check_dependency(ud, widget, NULL);
+       ghb_live_reset(ud);
+
+       ti = ghb_settings_combo_int(ud->settings, "title");
+       if (!ghb_get_title_info (&tinfo, ti))
+               return;
+
+       gint duration = tinfo.duration / 90000;
+       if (ghb_settings_combo_int(ud->settings, "PtoPType") == 0)
+       {
+               widget = GHB_WIDGET (ud->builder, "start_point");
+               gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 1, tinfo.num_chapters);
+               gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), 1);
+
+               widget = GHB_WIDGET (ud->builder, "end_point");
+               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);
+       }
+       else if (ghb_settings_combo_int(ud->settings, "PtoPType") == 1)
+       {
+               widget = GHB_WIDGET (ud->builder, "start_point");
+               gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, duration-1);
+               gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), 0);
+
+               widget = GHB_WIDGET (ud->builder, "end_point");
+               gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 1, duration);
+               gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), duration);
+       }
+       else if (ghb_settings_combo_int(ud->settings, "PtoPType") == 2)
+       {
+               gdouble max_frames = (gdouble)duration * tinfo.rate / tinfo.rate_base;
+               widget = GHB_WIDGET (ud->builder, "start_point");
+               gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 1, max_frames);
+               gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), 1);
+
+               widget = GHB_WIDGET (ud->builder, "end_point");
+               gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 1, max_frames);
+               gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), max_frames);
+       }
 }
 
 G_MODULE_EXPORT void
 setting_widget_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
        ghb_widget_to_setting(ud->settings, widget);
-       ghb_check_dependency(ud, widget);
+       ghb_check_dependency(ud, widget, NULL);
        ghb_clear_presets_selection(ud);
        ghb_live_reset(ud);
 }
@@ -1382,31 +1630,18 @@ setting_widget_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 G_MODULE_EXPORT void
 chapter_markers_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-       gboolean markers;
-
        ghb_widget_to_setting(ud->settings, widget);
-       ghb_check_dependency(ud, widget);
+       ghb_check_dependency(ud, widget, NULL);
        ghb_clear_presets_selection(ud);
        ghb_live_reset(ud);
-       markers = ghb_settings_get_boolean(ud->settings, "ChapterMarkers");
-       if (markers)
-       {
-               gchar *container;
-
-               container = ghb_settings_get_string(ud->settings, "FileFormat");
-               if (strcmp(container, "mp4") == 0)
-               {
-                       ghb_ui_update(ud, "FileFormat", ghb_string_value("m4v"));
-               }
-               g_free(container);
-       }
+       ghb_update_destination_extension(ud);
 }
 
 G_MODULE_EXPORT void
 vquality_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
        ghb_widget_to_setting(ud->settings, widget);
-       ghb_check_dependency(ud, widget);
+       ghb_check_dependency(ud, widget, NULL);
        ghb_clear_presets_selection(ud);
        ghb_live_reset(ud);
 
@@ -1430,7 +1665,7 @@ G_MODULE_EXPORT void
 http_opt_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
        ghb_widget_to_setting(ud->settings, widget);
-       ghb_check_dependency(ud, widget);
+       ghb_check_dependency(ud, widget, NULL);
        ghb_clear_presets_selection(ud);
        ghb_live_reset(ud);
        // AC3 is not allowed when Web optimized
@@ -1445,7 +1680,7 @@ vcodec_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
        gint digits;
 
        ghb_widget_to_setting(ud->settings, widget);
-       ghb_check_dependency(ud, widget);
+       ghb_check_dependency(ud, widget, NULL);
        ghb_clear_presets_selection(ud);
        ghb_live_reset(ud);
        ghb_vquality_range(ud, &vqmin, &vqmax, &step, &page, &digits, &inverted);
@@ -1462,7 +1697,7 @@ target_size_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
        const gchar *name = gtk_widget_get_name(widget);
        g_debug("target_size_changed_cb () %s", name);
        ghb_widget_to_setting(ud->settings, widget);
-       ghb_check_dependency(ud, widget);
+       ghb_check_dependency(ud, widget, NULL);
        ghb_clear_presets_selection(ud);
        ghb_live_reset(ud);
        if (ghb_settings_get_boolean(ud->settings, "vquality_type_target"))
@@ -1475,62 +1710,106 @@ target_size_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 }
 
 G_MODULE_EXPORT void
-start_chapter_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
+start_point_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
        gint start, end;
        const gchar *name = gtk_widget_get_name(widget);
 
-       g_debug("start_chapter_changed_cb () %s", name);
+       g_debug("start_point_changed_cb () %s", name);
        ghb_widget_to_setting(ud->settings, widget);
-       start = ghb_settings_get_int(ud->settings, "start_chapter");
-       end = ghb_settings_get_int(ud->settings, "end_chapter");
-       if (start > end)
-               ghb_ui_update(ud, "end_chapter", ghb_int_value(start));
-       ghb_check_dependency(ud, widget);
-       if (ghb_settings_get_boolean(ud->settings, "chapters_in_destination"))
-       {
-               set_destination(ud);
+       if (ghb_settings_combo_int(ud->settings, "PtoPType") == 0)
+       {
+               start = ghb_settings_get_int(ud->settings, "start_point");
+               end = ghb_settings_get_int(ud->settings, "end_point");
+               if (start > end)
+                       ghb_ui_update(ud, "end_point", ghb_int_value(start));
+               ghb_check_dependency(ud, widget, NULL);
+               if (ghb_settings_get_boolean(ud->settings, "chapters_in_destination"))
+               {
+                       set_destination(ud);
+               }
+               widget = GHB_WIDGET (ud->builder, "ChapterMarkers");
+               gtk_widget_set_sensitive(widget, TRUE);
+               // End may have been changed above, get it again
+               end = ghb_settings_get_int(ud->settings, "end_point");
+               if (start == end)
+               {
+                       ud->dont_clear_presets = TRUE;
+                       ghb_ui_update(ud, "ChapterMarkers", ghb_boolean_value(FALSE));
+                       ud->dont_clear_presets = FALSE;
+                       gtk_widget_set_sensitive(widget, FALSE);
+               }
+               update_title_duration(ud);
        }
-       widget = GHB_WIDGET (ud->builder, "chapters_tab");
-       // End may have been changed above, get it again
-       end = ghb_settings_get_int(ud->settings, "end_chapter");
-       if (start == end)
+       else if (ghb_settings_combo_int(ud->settings, "PtoPType") == 1)
        {
-               gtk_widget_hide(widget);
+               start = ghb_settings_get_int(ud->settings, "start_point");
+               end = ghb_settings_get_int(ud->settings, "end_point");
+               if (start >= end)
+                       ghb_ui_update(ud, "end_point", ghb_int_value(start+1));
+               ghb_check_dependency(ud, widget, NULL);
+               update_title_duration(ud);
        }
-       else
+       else if (ghb_settings_combo_int(ud->settings, "PtoPType") == 2)
        {
-               gtk_widget_show(widget);
+               start = ghb_settings_get_int(ud->settings, "start_point");
+               end = ghb_settings_get_int(ud->settings, "end_point");
+               if (start > end)
+                       ghb_ui_update(ud, "end_point", ghb_int_value(start));
+               ghb_check_dependency(ud, widget, NULL);
+               update_title_duration(ud);
        }
 }
 
 G_MODULE_EXPORT void
-end_chapter_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
+end_point_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
        gint start, end;
        const gchar *name = gtk_widget_get_name(widget);
 
-       g_debug("end_chapter_changed_cb () %s", name);
+       g_debug("end_point_changed_cb () %s", name);
        ghb_widget_to_setting(ud->settings, widget);
-       start = ghb_settings_get_int(ud->settings, "start_chapter");
-       end = ghb_settings_get_int(ud->settings, "end_chapter");
-       if (start > end)
-               ghb_ui_update(ud, "start_chapter", ghb_int_value(end));
-       ghb_check_dependency(ud, widget);
-       if (ghb_settings_get_boolean(ud->settings, "chapters_in_destination"))
-       {
-               set_destination(ud);
+       if (ghb_settings_combo_int(ud->settings, "PtoPType") == 0)
+       {
+               start = ghb_settings_get_int(ud->settings, "start_point");
+               end = ghb_settings_get_int(ud->settings, "end_point");
+               if (start > end)
+                       ghb_ui_update(ud, "start_point", ghb_int_value(end));
+               ghb_check_dependency(ud, widget, NULL);
+               if (ghb_settings_get_boolean(ud->settings, "chapters_in_destination"))
+               {
+                       set_destination(ud);
+               }
+               widget = GHB_WIDGET (ud->builder, "ChapterMarkers");
+               gtk_widget_set_sensitive(widget, TRUE);
+               // Start may have been changed above, get it again
+               start = ghb_settings_get_int(ud->settings, "start_point");
+               if (start == end)
+               {
+                       ud->dont_clear_presets = TRUE;
+                       ghb_ui_update(ud, "ChapterMarkers", ghb_boolean_value(FALSE));
+                       ud->dont_clear_presets = FALSE;
+                       gtk_widget_set_sensitive(widget, FALSE);
+               }
+               update_title_duration(ud);
        }
-       widget = GHB_WIDGET (ud->builder, "chapters_tab");
-       // Start may have been changed above, get it again
-       start = ghb_settings_get_int(ud->settings, "start_chapter");
-       if (start == end)
+       else if (ghb_settings_combo_int(ud->settings, "PtoPType") == 1)
        {
-               gtk_widget_hide(widget);
+               start = ghb_settings_get_int(ud->settings, "start_point");
+               end = ghb_settings_get_int(ud->settings, "end_point");
+               if (start >= end)
+                       ghb_ui_update(ud, "start_point", ghb_int_value(end-1));
+               ghb_check_dependency(ud, widget, NULL);
+               update_title_duration(ud);
        }
-       else
+       else if (ghb_settings_combo_int(ud->settings, "PtoPType") == 2)
        {
-               gtk_widget_show(widget);
+               start = ghb_settings_get_int(ud->settings, "start_point");
+               end = ghb_settings_get_int(ud->settings, "end_point");
+               if (start > end)
+                       ghb_ui_update(ud, "start_point", ghb_int_value(end));
+               ghb_check_dependency(ud, widget, NULL);
+               update_title_duration(ud);
        }
 }
 
@@ -1539,7 +1818,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);
-       ghb_check_dependency(ud, widget);
+       ghb_check_dependency(ud, widget, NULL);
        ghb_clear_presets_selection(ud);
        if (GTK_WIDGET_SENSITIVE(widget))
                ghb_set_scale (ud, GHB_PIC_KEEP_WIDTH);
@@ -1559,7 +1838,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);
-       ghb_check_dependency(ud, widget);
+       ghb_check_dependency(ud, widget, NULL);
        ghb_clear_presets_selection(ud);
        if (GTK_WIDGET_SENSITIVE(widget))
                ghb_set_scale (ud, GHB_PIC_KEEP_HEIGHT);
@@ -1582,7 +1861,7 @@ crop_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
        
        g_debug("crop_changed_cb ()");
        ghb_widget_to_setting(ud->settings, widget);
-       ghb_check_dependency(ud, widget);
+       ghb_check_dependency(ud, widget, NULL);
        ghb_clear_presets_selection(ud);
        if (GTK_WIDGET_SENSITIVE(widget))
                ghb_set_scale (ud, 0);
@@ -1620,7 +1899,7 @@ display_width_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
        g_debug("display_width_changed_cb ()");
        ghb_widget_to_setting(ud->settings, widget);
-       ghb_check_dependency(ud, widget);
+       ghb_check_dependency(ud, widget, NULL);
        ghb_clear_presets_selection(ud);
        ghb_live_reset(ud);
        if (GTK_WIDGET_SENSITIVE(widget))
@@ -1634,7 +1913,7 @@ display_height_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
        g_debug("display_height_changed_cb ()");
        ghb_widget_to_setting(ud->settings, widget);
-       ghb_check_dependency(ud, widget);
+       ghb_check_dependency(ud, widget, NULL);
        ghb_clear_presets_selection(ud);
        ghb_live_reset(ud);
        if (GTK_WIDGET_SENSITIVE(widget))
@@ -1648,7 +1927,7 @@ par_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
        g_debug("par_changed_cb ()");
        ghb_widget_to_setting(ud->settings, widget);
-       ghb_check_dependency(ud, widget);
+       ghb_check_dependency(ud, widget, NULL);
        ghb_clear_presets_selection(ud);
        ghb_live_reset(ud);
        if (GTK_WIDGET_SENSITIVE(widget))
@@ -1662,7 +1941,7 @@ scale_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
        g_debug("scale_changed_cb ()");
        ghb_widget_to_setting(ud->settings, widget);
-       ghb_check_dependency(ud, widget);
+       ghb_check_dependency(ud, widget, NULL);
        ghb_clear_presets_selection(ud);
        ghb_live_reset(ud);
        if (GTK_WIDGET_SENSITIVE(widget))
@@ -1704,7 +1983,7 @@ show_crop_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
        g_debug("show_crop_changed_cb ()");
        ghb_widget_to_setting(ud->settings, widget);
-       ghb_check_dependency(ud, widget);
+       ghb_check_dependency(ud, widget, NULL);
        ghb_live_reset(ud);
        if (GTK_WIDGET_SENSITIVE(widget))
                ghb_set_scale (ud, 0);
@@ -1740,6 +2019,95 @@ prefs_dialog_cb(GtkWidget *xwidget, signal_user_data_t *ud)
        gtk_widget_hide(dialog);
 }
 
+typedef struct
+{
+       GtkMessageDialog *dlg;
+       const gchar *msg;
+       const gchar *action;
+       gint timeout;
+} countdown_t;
+
+static gboolean
+shutdown_cb(countdown_t *cd)
+{
+       gchar *str;
+
+       cd->timeout--;
+       if (cd->timeout == 0)
+       {
+               ghb_shutdown_gsm();
+               gtk_main_quit();
+               return FALSE;
+       }
+       str = g_strdup_printf("%s\n\n%s in %d seconds ...", 
+                                                       cd->msg, cd->action, cd->timeout);
+       gtk_message_dialog_set_markup(cd->dlg, str);
+       g_free(str);
+       return TRUE;
+}
+
+static gboolean
+suspend_cb(countdown_t *cd)
+{
+       gchar *str;
+
+       cd->timeout--;
+       if (cd->timeout == 0)
+       {
+               gtk_widget_destroy (GTK_WIDGET(cd->dlg));
+               ghb_suspend_gpm();
+               return FALSE;
+       }
+       str = g_strdup_printf("%s\n\n%s in %d seconds ...", 
+                                                       cd->msg, cd->action, cd->timeout);
+       gtk_message_dialog_set_markup(cd->dlg, str);
+       g_free(str);
+       return TRUE;
+}
+
+void
+ghb_countdown_dialog(
+       GtkMessageType type, 
+       const gchar *message, 
+       const gchar *action, 
+       const gchar *cancel, 
+       GSourceFunc action_func,
+       gint timeout)
+{
+       GtkWidget *dialog;
+       GtkResponseType response;
+       guint timeout_id;
+       countdown_t cd;
+                       
+       cd.msg = message;
+       cd.action = action;
+       cd.timeout = timeout;
+
+       // Toss up a warning dialog
+       dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL,
+                                                       type, GTK_BUTTONS_NONE,
+                                                       "%s\n\n%s in %d seconds ...", 
+                                                       message, action, timeout);
+       gtk_dialog_add_buttons( GTK_DIALOG(dialog), 
+                                                  cancel, GTK_RESPONSE_CANCEL,
+                                                  NULL);
+
+       cd.dlg = GTK_MESSAGE_DIALOG(dialog);
+       timeout_id = g_timeout_add(1000, action_func, &cd);
+       response = gtk_dialog_run(GTK_DIALOG(dialog));
+       gtk_widget_destroy (dialog);
+       if (response == GTK_RESPONSE_CANCEL)
+       {
+               GMainContext *mc;
+               GSource *source;
+
+               mc = g_main_context_default();
+               source = g_main_context_find_source_by_id(mc, timeout_id);
+               if (source != NULL)
+                       g_source_destroy(source);
+       }
+}
+
 gboolean
 ghb_message_dialog(GtkMessageType type, const gchar *message, const gchar *no, const gchar *yes)
 {
@@ -1762,29 +2130,94 @@ ghb_message_dialog(GtkMessageType type, const gchar *message, const gchar *no, c
        return TRUE;
 }
 
-gboolean
-ghb_cancel_encode(const gchar *extra_msg)
+void
+ghb_error_dialog(GtkMessageType type, const gchar *message, const gchar *cancel)
 {
        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);
+                                                       type, GTK_BUTTONS_NONE,
+                                                       "%s", message);
        gtk_dialog_add_buttons( GTK_DIALOG(dialog), 
-                                                  "Continue Encoding", GTK_RESPONSE_NO,
-                                                  "Stop Encoding", GTK_RESPONSE_YES, NULL);
+                                                  cancel, GTK_RESPONSE_CANCEL, 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
+void
+ghb_cancel_encode(signal_user_data_t *ud, 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), 
+                                                  "Cancel Current and Stop", 1,
+                                                  "Cancel Current, Start Next", 2,
+                                                  "Finish Current, then Stop", 3,
+                                                  "Continue Encoding", 4,
+                                                  NULL);
+       response = gtk_dialog_run(GTK_DIALOG(dialog));
+       gtk_widget_destroy (dialog);
+       switch (response)
+       {
+               case 1:
+                       ghb_stop_queue();
+                       ud->cancel_encode = GHB_CANCEL_ALL;
+                       break;
+               case 2:
+                       ghb_stop_queue();
+                       ud->cancel_encode = GHB_CANCEL_CURRENT;
+                       break;
+               case 3:
+                       ud->cancel_encode = GHB_CANCEL_FINISH;
+                       break;
+               case 4:
+               default:
+                       ud->cancel_encode = GHB_CANCEL_NONE;
+                       break;
+       }
+}
+
+gboolean
+ghb_cancel_encode2(signal_user_data_t *ud, 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), 
+                                                  "Cancel Current and Stop", 1,
+                                                  "Continue Encoding", 4,
+                                                  NULL);
+       response = gtk_dialog_run(GTK_DIALOG(dialog));
+       gtk_widget_destroy (dialog);
+       switch (response)
+       {
+               case 1:
+                       ghb_stop_queue();
+                       ud->cancel_encode = GHB_CANCEL_ALL;
+                       return TRUE;
+               case 4:
+               default:
+                       break;
+       }
+       return FALSE;
+}
+
+static void
 submit_job(GValue *settings)
 {
        static gint unique_id = 1;
@@ -1813,13 +2246,19 @@ static void
 prune_logs(signal_user_data_t *ud)
 {
        gchar *dest_dir;
+       gint days;
 
        // Only prune logs stored in the default config dir location
+       days = ghb_settings_combo_int(ud->settings, "LogLongevity");
+       if (days > 365)
+               return;
+
        dest_dir = ghb_get_user_config_dir("EncodeLogs");
        if (g_file_test(dest_dir, G_FILE_TEST_IS_DIR))
        {
                const gchar *file;
-               int week = 7*24*60*60;
+               gint duration = days * 24 * 60 * 60;
+               
                GDir *gdir = g_dir_open(dest_dir, 0, NULL);
                time_t now;
 
@@ -1832,7 +2271,7 @@ prune_logs(signal_user_data_t *ud)
 
                        path = g_strdup_printf("%s/%s", dest_dir, file);
                        g_stat(path, &stbuf);
-                       if (now - stbuf.st_mtime > week)
+                       if (now - stbuf.st_mtime > duration)
                        {
                                g_unlink(path);
                        }
@@ -1872,10 +2311,11 @@ queue_scan(signal_user_data_t *ud, GValue *js)
        {
                *pos = 0;
        }
-       log_path = g_strdup_printf("%s/%d-%02d-%02d %02d-%02d-%02d %s.log",
+       log_path = g_strdup_printf("%s/%s %d-%02d-%02d %02d-%02d-%02d.log",
                dest_dir,
+               basename,
                now->tm_year + 1900, now->tm_mon + 1, now->tm_mday,
-               now->tm_hour, now->tm_min, now->tm_sec, basename);
+               now->tm_hour, now->tm_min, now->tm_sec);
        g_free(basename);
        g_free(dest_dir);
        if (ud->job_activity_log)
@@ -1899,6 +2339,42 @@ queue_scan(signal_user_data_t *ud, GValue *js)
        g_free(path);
 }
 
+static gint
+queue_pending_count(GValue *queue)
+{
+       gint nn, ii, count;
+       GValue *js;
+       gint status;
+
+       nn = 0;
+       count = ghb_array_len(queue);
+       for (ii = 0; ii < count; ii++)
+       {
+
+               js = ghb_array_get_nth(queue, ii);
+               status = ghb_settings_get_int(js, "job_status");
+               if (status == GHB_QUEUE_PENDING)
+               {
+                       nn++;
+               }
+       }
+       return nn;
+}
+
+void
+ghb_update_pending(signal_user_data_t *ud)
+{
+       GtkLabel *label;
+       gint pending;
+       gchar *str;
+
+       label = GTK_LABEL(GHB_WIDGET(ud->builder, "pending_status"));
+       pending = queue_pending_count(ud->queue);
+       str = g_strdup_printf("%d encode(s) pending", pending);
+       gtk_label_set_text(label, str);
+       g_free(str);
+}
+
 GValue* 
 ghb_start_next_job(signal_user_data_t *ud, gboolean find_first)
 {
@@ -1906,8 +2382,12 @@ ghb_start_next_job(signal_user_data_t *ud, gboolean find_first)
        gint count, ii, jj;
        GValue *js;
        gint status;
+       GtkWidget *prog;
 
        g_debug("start_next_job");
+       prog = GHB_WIDGET(ud->builder, "progressbar");
+       gtk_widget_show(prog);
+
        count = ghb_array_len(ud->queue);
        if (find_first)
        {       // Start the first pending item in the queue
@@ -1920,13 +2400,14 @@ ghb_start_next_job(signal_user_data_t *ud, gboolean find_first)
                        if (status == GHB_QUEUE_PENDING)
                        {
                                current = ii;
-                               ghb_inhibit_gpm();
+                               ghb_inhibit_gsm(ud);
                                queue_scan(ud, js);
+                               ghb_update_pending(ud);
                                return js;
                        }
                }
                // Nothing pending
-               ghb_uninhibit_gpm();
+               ghb_uninhibit_gsm();
                ghb_notify_done(ud);
                return NULL;
        }
@@ -1944,8 +2425,9 @@ ghb_start_next_job(signal_user_data_t *ud, gboolean find_first)
                                if (status == GHB_QUEUE_PENDING)
                                {
                                        current = jj;
-                                       ghb_inhibit_gpm();
+                                       ghb_inhibit_gsm(ud);
                                        queue_scan(ud, js);
+                                       ghb_update_pending(ud);
                                        return js;
                                }
                        }
@@ -1960,14 +2442,17 @@ ghb_start_next_job(signal_user_data_t *ud, gboolean find_first)
                if (status == GHB_QUEUE_PENDING)
                {
                        current = ii;
-                       ghb_inhibit_gpm();
+                       ghb_inhibit_gsm(ud);
                        queue_scan(ud, js);
+                       ghb_update_pending(ud);
                        return js;
                }
        }
        // Nothing found
-       ghb_uninhibit_gpm();
+       ghb_uninhibit_gsm();
        ghb_notify_done(ud);
+       ghb_update_pending(ud);
+       gtk_widget_hide(prog);
        return NULL;
 }
 
@@ -1980,6 +2465,9 @@ find_queue_job(GValue *queue, gint unique_id, GValue **job)
        
        *job = NULL;
        g_debug("find_queue_job");
+       if (unique_id == 0)  // Invalid Id
+               return -1;
+
        count = ghb_array_len(queue);
        for (ii = 0; ii < count; ii++)
        {
@@ -2001,35 +2489,88 @@ working_status_string(signal_user_data_t *ud, ghb_instance_status_t *status)
        gint qcount;
        gint index;
        GValue *js;
+       gboolean subtitle_scan = FALSE;
 
+       qcount = ghb_array_len(ud->queue);
+       index = find_queue_job(ud->queue, status->unique_id, &js);
+       if (js != NULL)
+       {
+               subtitle_scan = ghb_settings_get_boolean(js, "subtitle_scan");
+       }
+       if (qcount > 1)
+       {
+               job_str = g_strdup_printf("job %d of %d, ", index+1, qcount);
+       }
+       else
+       {
+               job_str = g_strdup("");
+       }
        if (status->job_count > 1)
        {
-               task_str = g_strdup_printf("pass %d of %d, ", 
-                       status->job_cur, status->job_count);
+               if (status->job_cur == 1 && subtitle_scan)
+               {
+                       task_str = g_strdup_printf("pass %d (subtitle scan) of %d, ", 
+                               status->job_cur, status->job_count);
+               }
+               else
+               {
+                       task_str = g_strdup_printf("pass %d of %d, ", 
+                               status->job_cur, status->job_count);
+               }
        }
        else
        {
                task_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;
+}
+
+gchar*
+searching_status_string(signal_user_data_t *ud, ghb_instance_status_t *status)
+{
+       gchar *task_str, *job_str, *status_str;
+       gint qcount;
+       gint index;
+       GValue *js;
+
        qcount = ghb_array_len(ud->queue);
+       index = find_queue_job(ud->queue, status->unique_id, &js);
        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("");
        }
+       task_str = g_strdup_printf("Searching for start time, ");
        if(status->seconds > -1)
        {
                status_str= g_strdup_printf(
                        "Encoding: %s%s%.2f %%"
-                       " (%.2f fps, avg %.2f fps, ETA %02dh%02dm%02ds)",
+                       " (ETA %02dh%02dm%02ds)",
                        job_str, task_str,
                        100.0 * status->progress,
-                       status->rate_cur, status->rate_avg, status->hours, 
-                       status->minutes, status->seconds );
+                       status->hours, status->minutes, status->seconds );
        }
        else
        {
@@ -2049,18 +2590,27 @@ ghb_backend_events(signal_user_data_t *ud)
        ghb_status_t status;
        gchar *status_str;
        GtkProgressBar *progress;
+       GtkLabel       *work_status;
        gint titleindex;
        GValue *js;
        gint index;
        GtkTreeView *treeview;
        GtkTreeStore *store;
        GtkTreeIter iter;
-       static gint working = 0;
-       static gboolean work_started = FALSE;
+       static gint prev_scan_state = 0;
+       static gint prev_queue_state = 0;
        
        ghb_track_status();
        ghb_get_status(&status);
+       if (prev_scan_state != status.scan.state ||
+               prev_queue_state != status.queue.state)
+       {
+               ghb_queue_buttons_grey(ud);
+               prev_scan_state = status.scan.state;
+               prev_queue_state = status.queue.state;
+       }
        progress = GTK_PROGRESS_BAR(GHB_WIDGET (ud->builder, "progressbar"));
+       work_status = GTK_LABEL(GHB_WIDGET (ud->builder, "work_status"));
        if (status.scan.state == GHB_STATE_IDLE && 
                status.queue.state == GHB_STATE_IDLE)
        {
@@ -2076,6 +2626,12 @@ ghb_backend_events(signal_user_data_t *ud)
        // Then handle the status of the queue
        if (status.scan.state & GHB_STATE_SCANNING)
        {
+               GtkProgressBar *scan_prog;
+               GtkLabel *label;
+
+               scan_prog = GTK_PROGRESS_BAR(GHB_WIDGET (ud->builder, "scan_prog"));
+               label = GTK_LABEL(GHB_WIDGET (ud->builder, "source_title"));
+
                if (status.scan.title_cur == 0)
                {
                        status_str = g_strdup ("Scanning...");
@@ -2085,20 +2641,44 @@ ghb_backend_events(signal_user_data_t *ud)
                        status_str = g_strdup_printf ("Scanning title %d of %d...", 
                                                          status.scan.title_cur, status.scan.title_count );
                }
-               gtk_progress_bar_set_text (progress, status_str);
+               gtk_label_set_text (label, status_str);
                g_free(status_str);
                if (status.scan.title_count > 0)
                {
-                       gtk_progress_bar_set_fraction (progress
+                       gtk_progress_bar_set_fraction (scan_prog
                                (gdouble)status.scan.title_cur / status.scan.title_count);
                }
        }
        else if (status.scan.state & GHB_STATE_SCANDONE)
        {
-               status_str = g_strdup_printf ("Scan done"); 
-               gtk_progress_bar_set_text (progress, status_str);
-               g_free(status_str);
-               gtk_progress_bar_set_fraction (progress, 1.0);
+               gchar *source;
+               GtkProgressBar *scan_prog;
+               GtkLabel *label;
+
+               GtkWidget *widget;
+               GtkAction *action;
+
+               widget = GHB_WIDGET(ud->builder, "sourcetoolbutton");
+               gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(widget), "hb-source");
+               gtk_tool_button_set_label(GTK_TOOL_BUTTON(widget), "Source");
+               gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(widget), "Choose Video Source");
+
+               action = GHB_ACTION(ud->builder, "source_action");
+               gtk_action_set_sensitive(action, TRUE);
+               action = GHB_ACTION(ud->builder, "source_single_action");
+               gtk_action_set_sensitive(action, TRUE);
+
+               source = ghb_settings_get_string(ud->settings, "scan_source");
+               update_source_label(ud, source, FALSE);
+
+               scan_prog = GTK_PROGRESS_BAR(GHB_WIDGET (ud->builder, "scan_prog"));
+               gtk_progress_bar_set_fraction (scan_prog, 1.0);
+               gtk_widget_hide(GTK_WIDGET(scan_prog));
+
+               if (!ghb_settings_get_boolean(ud->settings, "preset_modified"))
+               {
+                       ghb_refresh_preset(ud);
+               }
 
                ghb_title_info_t tinfo;
                        
@@ -2106,36 +2686,29 @@ ghb_backend_events(signal_user_data_t *ud)
                titleindex = ghb_longest_title();
                ghb_ui_update(ud, "title", ghb_int64_value(titleindex));
 
+               label = GTK_LABEL(GHB_WIDGET (ud->builder, "source_title"));
                // Are there really any titles.
                if (!ghb_get_title_info(&tinfo, titleindex))
                {
-                       GtkProgressBar *progress;
-                       progress = GTK_PROGRESS_BAR(GHB_WIDGET (ud->builder, "progressbar"));
-                       gtk_progress_bar_set_fraction (progress, 0);
-                       gtk_progress_bar_set_text (progress, "No Source");
+                       gtk_label_set_text(label, "None");
                }
                ghb_clear_scan_state(GHB_STATE_SCANDONE);
-               ghb_queue_buttons_grey(ud, work_started);
                if (ghb_queue_edit_settings)
                {
-                       gint jstatus;
-
-                       jstatus = ghb_settings_get_int(ghb_queue_edit_settings, "job_status");
                        ghb_settings_to_ui(ud, ghb_queue_edit_settings);
                        ghb_set_audio(ud, ghb_queue_edit_settings);
                        ghb_reset_subtitles(ud, ghb_queue_edit_settings);
-                       if (jstatus == GHB_QUEUE_PENDING)
-                       {
-                               ghb_value_free(ghb_queue_edit_settings);
-                       }
+                       reset_chapter_list(ud, ghb_queue_edit_settings);
+                       ghb_value_free(ghb_queue_edit_settings);
                        ghb_queue_edit_settings = NULL;
                }
        }
-       else if (status.queue.state & GHB_STATE_SCANNING)
+
+       if (status.queue.state & GHB_STATE_SCANNING)
        {
-               status_str = g_strdup_printf ("Scanning ...");
-               gtk_progress_bar_set_text (progress, status_str);
-               g_free(status_str);
+               // This needs to be in scanning and working since scanning
+               // happens fast enough that it can be missed
+               gtk_label_set_text (work_status, "Scanning ...");
                gtk_progress_bar_set_fraction (progress, 0);
        }
        else if (status.queue.state & GHB_STATE_SCANDONE)
@@ -2143,17 +2716,85 @@ ghb_backend_events(signal_user_data_t *ud)
                ghb_clear_queue_state(GHB_STATE_SCANDONE);
                usleep(2000000);
                submit_job(ud->current_job);
+               ghb_update_pending(ud);
        }
        else if (status.queue.state & GHB_STATE_PAUSED)
        {
-               status_str = g_strdup_printf ("Paused"); 
-               gtk_progress_bar_set_text (progress, status_str);
+               gtk_label_set_text (work_status, "Paused");
+       }
+       else if (status.queue.state & GHB_STATE_SEARCHING)
+       {
+               static gint working = 0;
+
+               // This needs to be in scanning and working since scanning
+               // happens fast enough that it can be missed
+               index = find_queue_job(ud->queue, status.queue.unique_id, &js);
+               if (status.queue.unique_id != 0 && index >= 0)
+               {
+                       gchar working_icon[] = "hb-working0";
+                       working_icon[10] = '0' + working;
+                       working = (working+1) % 6;
+                       treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "queue_list"));
+                       store = GTK_TREE_STORE(gtk_tree_view_get_model(treeview));
+                       gchar *path = g_strdup_printf ("%d", index);
+                       if (gtk_tree_model_get_iter_from_string(
+                                       GTK_TREE_MODEL(store), &iter, path))
+                       {
+                               gtk_tree_store_set(store, &iter, 0, working_icon, -1);
+                       }
+                       g_free(path);
+               }
+               GtkLabel *label;
+               gchar *status_str;
+
+               status_str = searching_status_string(ud, &status.queue);
+               label = GTK_LABEL(GHB_WIDGET(ud->builder, "queue_status"));
+               gtk_label_set_text (label, status_str);
+#if !GTK_CHECK_VERSION(2, 16, 0)
+               GtkStatusIcon *si;
+
+               si = GTK_STATUS_ICON(GHB_OBJECT(ud->builder, "hb_status"));
+               gtk_status_icon_set_tooltip(si, status_str);
+#endif
+               gtk_label_set_text (work_status, status_str);
+               gtk_progress_bar_set_fraction (progress, status.queue.progress);
                g_free(status_str);
        }
        else if (status.queue.state & GHB_STATE_WORKING)
        {
+               static gint working = 0;
+
+               // This needs to be in scanning and working since scanning
+               // happens fast enough that it can be missed
+               index = find_queue_job(ud->queue, status.queue.unique_id, &js);
+               if (status.queue.unique_id != 0 && index >= 0)
+               {
+                       gchar working_icon[] = "hb-working0";
+                       working_icon[10] = '0' + working;
+                       working = (working+1) % 6;
+                       treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "queue_list"));
+                       store = GTK_TREE_STORE(gtk_tree_view_get_model(treeview));
+                       gchar *path = g_strdup_printf ("%d", index);
+                       if (gtk_tree_model_get_iter_from_string(
+                                       GTK_TREE_MODEL(store), &iter, path))
+                       {
+                               gtk_tree_store_set(store, &iter, 0, working_icon, -1);
+                       }
+                       g_free(path);
+               }
+               GtkLabel *label;
+               gchar *status_str;
+
                status_str = working_status_string(ud, &status.queue);
-               gtk_progress_bar_set_text (progress, status_str);
+               label = GTK_LABEL(GHB_WIDGET(ud->builder, "queue_status"));
+               gtk_label_set_text (label, status_str);
+#if !GTK_CHECK_VERSION(2, 16, 0)
+               GtkStatusIcon *si;
+
+               si = GTK_STATUS_ICON(GHB_OBJECT(ud->builder, "hb_status"));
+               gtk_status_icon_set_tooltip(si, status_str);
+#endif
+               gtk_label_set_text (work_status, status_str);
                gtk_progress_bar_set_fraction (progress, status.queue.progress);
                g_free(status_str);
        }
@@ -2161,17 +2802,16 @@ ghb_backend_events(signal_user_data_t *ud)
        {
                gint qstatus;
 
-               work_started = FALSE;
-               ghb_queue_buttons_grey(ud, FALSE);
                index = find_queue_job(ud->queue, status.queue.unique_id, &js);
                treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "queue_list"));
                store = GTK_TREE_STORE(gtk_tree_view_get_model(treeview));
-               if (ud->cancel_encode)
+               if (ud->cancel_encode == GHB_CANCEL_ALL || 
+                       ud->cancel_encode == GHB_CANCEL_CURRENT)
                        status.queue.error = GHB_ERROR_CANCELED;
                switch( status.queue.error )
                {
                        case GHB_ERROR_NONE:
-                               gtk_progress_bar_set_text( progress, "Rip done!" );
+                               gtk_label_set_text (work_status, "Rip Done!");
                                qstatus = GHB_QUEUE_DONE;
                                if (js != NULL)
                                {
@@ -2185,7 +2825,7 @@ ghb_backend_events(signal_user_data_t *ud)
                                }
                                break;
                        case GHB_ERROR_CANCELED:
-                               gtk_progress_bar_set_text( progress, "Rip canceled." );
+                               gtk_label_set_text (work_status, "Rip Canceled.");
                                qstatus = GHB_QUEUE_CANCELED;
                                if (js != NULL)
                                {
@@ -2199,7 +2839,7 @@ ghb_backend_events(signal_user_data_t *ud)
                                }
                                break;
                        default:
-                               gtk_progress_bar_set_text( progress, "Rip failed.");
+                               gtk_label_set_text (work_status, "Rip Failed.");
                                qstatus = GHB_QUEUE_CANCELED;
                                if (js != NULL)
                                {
@@ -2217,19 +2857,21 @@ ghb_backend_events(signal_user_data_t *ud)
                if (ud->job_activity_log)
                        g_io_channel_unref(ud->job_activity_log);
                ud->job_activity_log = NULL;
-               if (!ud->cancel_encode)
+               if (ud->cancel_encode != GHB_CANCEL_ALL &&
+                       ud->cancel_encode != GHB_CANCEL_FINISH)
                {
                        ud->current_job = ghb_start_next_job(ud, FALSE);
                }
                else
                {
-                       ghb_uninhibit_gpm();
+                       ghb_uninhibit_gsm();
                        ud->current_job = NULL;
+                       gtk_widget_hide(GTK_WIDGET(progress));
                }
                if (js)
                        ghb_settings_set_int(js, "job_status", qstatus);
                ghb_save_queue(ud->queue);
-               ud->cancel_encode = FALSE;
+               ud->cancel_encode = GHB_CANCEL_NONE;
 #if !GTK_CHECK_VERSION(2, 16, 0)
                GtkStatusIcon *si;
 
@@ -2239,57 +2881,9 @@ ghb_backend_events(signal_user_data_t *ud)
        }
        else if (status.queue.state & GHB_STATE_MUXING)
        {
-               gtk_progress_bar_set_text(progress, "Muxing: this may take awhile...");
-       }
-       if (status.queue.state & GHB_STATE_SCANNING)
-       {
-               // This needs to be in scanning and working since scanning
-               // happens fast enough that it can be missed
-               if (!work_started)
-               {
-                       work_started = TRUE;
-                       ghb_queue_buttons_grey(ud, TRUE);
-               }
+               gtk_label_set_text (work_status, "Muxing: This may take a while...");
        }
-       if (status.queue.state & GHB_STATE_WORKING)
-       {
-               // This needs to be in scanning and working since scanning
-               // happens fast enough that it can be missed
-               if (!work_started)
-               {
-                       work_started = TRUE;
-                       ghb_queue_buttons_grey(ud, TRUE);
-               }
-               index = find_queue_job(ud->queue, status.queue.unique_id, &js);
-               if (status.queue.unique_id != 0 && index >= 0)
-               {
-                       gchar working_icon[] = "hb-working0";
-                       working_icon[10] = '0' + working;
-                       working = (working+1) % 6;
-                       treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "queue_list"));
-                       store = GTK_TREE_STORE(gtk_tree_view_get_model(treeview));
-                       gchar *path = g_strdup_printf ("%d", index);
-                       if (gtk_tree_model_get_iter_from_string(
-                                       GTK_TREE_MODEL(store), &iter, path))
-                       {
-                               gtk_tree_store_set(store, &iter, 0, working_icon, -1);
-                       }
-                       g_free(path);
-               }
-               GtkLabel *label;
-               gchar *status_str;
-
-               status_str = working_status_string(ud, &status.queue);
-               label = GTK_LABEL(GHB_WIDGET(ud->builder, "queue_status"));
-               gtk_label_set_text (label, status_str);
-#if !GTK_CHECK_VERSION(2, 16, 0)
-               GtkStatusIcon *si;
 
-               si = GTK_STATUS_ICON(GHB_OBJECT(ud->builder, "hb_status"));
-               gtk_status_icon_set_tooltip(si, status_str);
-#endif
-               g_free(status_str);
-       }
        if (status.scan.state & GHB_STATE_WORKING)
        {
                GtkProgressBar *live_progress;
@@ -2333,6 +2927,8 @@ status_icon_query_tooltip_cb(
        ghb_get_status(&status);
        if (status.queue.state & GHB_STATE_WORKING)
                status_str = working_status_string(ud, &status.queue);
+       else if (status.queue.state & GHB_STATE_SEARCHING)
+               status_str = searching_status_string(ud, &status.queue);
        else if (status.queue.state & GHB_STATE_WORKDONE)
                status_str = g_strdup("Encode Complete");
        else
@@ -2412,7 +3008,7 @@ G_MODULE_EXPORT gboolean
 ghb_log_cb(GIOChannel *source, GIOCondition cond, gpointer data)
 {
        gchar *text = NULL;
-       gsize length;
+       gsize length, outlength;
        GtkTextView *textview;
        GtkTextBuffer *buffer;
        GtkTextIter iter;
@@ -2423,12 +3019,17 @@ ghb_log_cb(GIOChannel *source, GIOCondition cond, gpointer data)
        signal_user_data_t *ud = (signal_user_data_t*)data;
 
        status = g_io_channel_read_line (source, &text, &length, NULL, &gerror);
-       if (text != NULL)
+       // Trim nils from end of text, they cause g_io_channel_write_chars to
+       // fail with an assertion that aborts
+       while (length > 0 && text[length-1] == 0)
+               length--;
+       if (text != NULL && length > 0)
        {
                GdkWindow *window;
                gint width, height;
                gint x, y;
                gboolean bottom = FALSE;
+               gchar *utf8_text;
 
                textview = GTK_TEXT_VIEW(GHB_WIDGET (ud->builder, "activity_view"));
                buffer = gtk_text_view_get_buffer (textview);
@@ -2454,37 +3055,45 @@ ghb_log_cb(GIOChannel *source, GIOCondition cond, gpointer data)
                        bottom = TRUE;
                }
                gtk_text_buffer_get_end_iter(buffer, &iter);
-               gtk_text_buffer_insert(buffer, &iter, text, -1);
-               if (bottom)
+               utf8_text = g_convert_with_fallback(text, -1, "UTF-8", "ISO-8859-1",
+                                                                                       "?", NULL, &length, NULL);
+               if (utf8_text != NULL)
                {
-                       gtk_text_buffer_get_end_iter(buffer, &iter);
-                       mark = gtk_text_buffer_create_mark(buffer, NULL, &iter, FALSE);
-                       gtk_text_view_scroll_mark_onscreen(textview, mark);
-                       gtk_text_buffer_delete_mark(buffer, mark);
-               }
-#if defined(_WIN32)
-               gsize one = 1;
-               text[length-1] = '\r';
-#endif
-               g_io_channel_write_chars (ud->activity_log, text, 
-                                                               length, &length, NULL);
+                       gtk_text_buffer_insert(buffer, &iter, utf8_text, -1);
+                       if (bottom)
+                       {
+                               gtk_text_buffer_get_end_iter(buffer, &iter);
+                               mark = gtk_text_buffer_create_mark(buffer, NULL, &iter, FALSE);
+                               gtk_text_view_scroll_mark_onscreen(textview, mark);
+                               gtk_text_buffer_delete_mark(buffer, mark);
+                       }
 #if defined(_WIN32)
-               g_io_channel_write_chars (ud->activity_log, "\n", 
-                                                               one, &one, NULL);
+                       gsize one = 1;
+                       utf8_text[length-1] = '\r';
 #endif
-               g_io_channel_flush(ud->activity_log, NULL);
-               if (ud->job_activity_log)
-               {
-                       g_io_channel_write_chars (ud->job_activity_log, text, 
-                                                                       length, &length, NULL);
+                       g_io_channel_write_chars (ud->activity_log, utf8_text, 
+                                                                       length, &outlength, NULL);
 #if defined(_WIN32)
                        g_io_channel_write_chars (ud->activity_log, "\n", 
                                                                        one, &one, NULL);
 #endif
-                       g_io_channel_flush(ud->job_activity_log, NULL);
+                       g_io_channel_flush(ud->activity_log, NULL);
+                       if (ud->job_activity_log)
+                       {
+                               g_io_channel_write_chars (ud->job_activity_log, utf8_text, 
+                                                                               length, &outlength, NULL);
+#if defined(_WIN32)
+                               g_io_channel_write_chars (ud->activity_log, "\n", 
+                                                                               one, &outlength, NULL);
+#endif
+                               g_io_channel_flush(ud->job_activity_log, NULL);
+                       }
+                       g_free(utf8_text);
                }
-               g_free(text);
        }
+       if (text != NULL)
+               g_free(text);
+
        if (status != G_IO_STATUS_NORMAL)
        {
                // This should never happen, but if it does I would get into an
@@ -2672,6 +3281,83 @@ show_presets_toggled_cb(GtkWidget *action, signal_user_data_t *ud)
 }
 
 static void
+reset_chapter_list(signal_user_data_t *ud, GValue *settings)
+{
+       GtkTreeView *treeview;
+       GtkTreeIter iter;
+       GtkListStore *store;
+       gboolean done;
+       GValue *chapters;
+       gint titleindex, ii;
+       gint count;
+       
+       g_debug("reset_chapter_list ()");
+       chapters = ghb_value_dup(ghb_settings_get_value(settings, "chapter_list"));
+       count = ghb_array_len(chapters);
+       ghb_settings_set_value(ud->settings, "chapter_list", chapters);
+       titleindex = ghb_settings_combo_int(ud->settings, "title");
+       
+       treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "chapters_list"));
+       store = GTK_LIST_STORE(gtk_tree_view_get_model(treeview));
+       ii = 0;
+       if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &iter))
+       {
+               do
+               {
+
+                       if (ii < count)
+                       {
+                               gchar *chapter, *duration;
+                               gint hh, mm, ss;
+
+                               // Update row with settings data
+                               g_debug("Updating row");
+                               chapter = ghb_value_string(ghb_array_get_nth(chapters, ii));
+                               ghb_get_chapter_duration(titleindex, ii, &hh, &mm, &ss);
+                               duration = g_strdup_printf("%02d:%02d:%02d", hh, mm, ss);
+                               gtk_list_store_set(store, &iter, 
+                                       0, ii+1,
+                                       1, duration,
+                                       2, chapter,
+                                       3, TRUE,
+                                       -1);
+                               g_free(chapter);
+                               g_free(duration);
+                               ii++;
+                               done = !gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter);
+                       }
+                       else
+                       {
+                               // No more settings data, remove row
+                               g_debug("Removing row");
+                               done = !gtk_list_store_remove(store, &iter);
+                       }
+               } while (!done);
+       }
+       while (ii < count)
+       {
+               gchar *chapter, *duration;
+               gint hh, mm, ss;
+
+               // Additional settings, add row
+               g_debug("Adding row");
+               chapter = ghb_value_string(ghb_array_get_nth(chapters, ii));
+               ghb_get_chapter_duration(titleindex, ii, &hh, &mm, &ss);
+               duration = g_strdup_printf("%02d:%02d:%02d", hh, mm, ss);
+               gtk_list_store_append(store, &iter);
+               gtk_list_store_set(store, &iter, 
+                       0, ii+1,
+                       1, duration,
+                       2, chapter,
+                       3, TRUE,
+                       -1);
+               g_free(chapter);
+               g_free(duration);
+               ii++;
+       }
+}
+
+static void
 update_chapter_list(signal_user_data_t *ud)
 {
        GtkTreeView *treeview;
@@ -2901,24 +3587,36 @@ pref_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
        g_debug("pref_changed_cb");
        ghb_widget_to_setting (ud->settings, widget);
-       ghb_check_dependency(ud, widget);
+       ghb_check_dependency(ud, widget, NULL);
        const gchar *name = gtk_widget_get_name(widget);
        ghb_pref_save(ud->settings, name);
 }
 
 G_MODULE_EXPORT void
-skip_taskbar_cb(GtkWidget *widget, signal_user_data_t *ud)
+use_m4v_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-       g_debug("pref_changed_cb");
+       g_debug("use_m4v_changed_cb");
        ghb_widget_to_setting (ud->settings, widget);
-       ghb_check_dependency(ud, widget);
+       ghb_check_dependency(ud, widget, NULL);
        const gchar *name = gtk_widget_get_name(widget);
        ghb_pref_save(ud->settings, name);
+       ghb_update_destination_extension(ud);
+}
 
-       GtkWindow *window;
-       window = GTK_WINDOW(GHB_WIDGET (ud->builder, "hb_window"));
-       gtk_window_set_skip_taskbar_hint(window, 
-                       ghb_settings_get_boolean(ud->settings, "skip_taskbar"));
+G_MODULE_EXPORT void
+show_status_cb(GtkWidget *widget, signal_user_data_t *ud)
+{
+       g_debug("show_status_cb");
+       ghb_widget_to_setting (ud->settings, widget);
+       ghb_check_dependency(ud, widget, NULL);
+       const gchar *name = gtk_widget_get_name(widget);
+       ghb_pref_save(ud->settings, name);
+
+       GtkStatusIcon *si;
+
+       si = GTK_STATUS_ICON(GHB_OBJECT (ud->builder, "hb_status"));
+       gtk_status_icon_set_visible(si,
+                       ghb_settings_get_boolean(ud->settings, "show_status"));
 }
 
 G_MODULE_EXPORT void
@@ -2926,7 +3624,7 @@ vqual_granularity_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
        g_debug("vqual_granularity_changed_cb");
        ghb_widget_to_setting (ud->settings, widget);
-       ghb_check_dependency(ud, widget);
+       ghb_check_dependency(ud, widget, NULL);
 
        const gchar *name = gtk_widget_get_name(widget);
        ghb_pref_save(ud->settings, name);
@@ -3023,7 +3721,7 @@ ghb_file_menu_add_dvd(signal_user_data_t *ud)
                                (GCallback)dvd_source_activate_cb, ud);
                        g_free(name);
                        g_free(drive);
-                       g_object_unref(link->data);
+                       free_drive(link->data);
                        link = link->next;
                }
                g_list_free(drives);
@@ -3087,7 +3785,7 @@ dvd_device_list()
 }
 
 #if !defined(_WIN32)
-static LibHalContext *hal_ctx;
+static LibHalContext *hal_ctx = NULL;
 #endif
 
 gboolean
@@ -3098,11 +3796,18 @@ ghb_is_cd(GDrive *gd)
        LibHalDrive *halDrive;
        LibHalDriveType dtype;
 
+       if (hal_ctx == NULL)
+               return FALSE;
+
        device = g_drive_get_identifier(gd, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE);
+       if (device == NULL)
+               return FALSE;
        halDrive = libhal_drive_from_device_file (hal_ctx, device);
+       g_free(device);
+       if (halDrive == NULL)
+               return FALSE;
        dtype = libhal_drive_get_type(halDrive);
        libhal_drive_free(halDrive);
-       g_free(device);
        return (dtype == LIBHAL_DRIVE_TYPE_CDROM);
 #else
        return FALSE;
@@ -3129,18 +3834,17 @@ handle_media_change(const gchar *device, gboolean insert, signal_user_data_t *ud
                ins_count++;
                if (ins_count == 2)
                {
-                       ghb_file_menu_add_dvd(ud);
-                       if (ud->current_dvd_device != NULL &&
+                       g_thread_create((GThreadFunc)ghb_cache_volnames, ud, FALSE, NULL);
+                       if (ghb_settings_get_boolean(ud->settings, "AutoScan") &&
+                               ud->current_dvd_device != NULL &&
                                strcmp(device, ud->current_dvd_device) == 0)
                        {
-                               GtkProgressBar *progress;
-                               progress = GTK_PROGRESS_BAR(GHB_WIDGET (ud->builder, "progressbar"));
-                               gtk_progress_bar_set_text (progress, "Scanning ...");
-                               gtk_progress_bar_set_fraction (progress, 0);
-                               update_source_label(ud, device);
+                               show_scan_progress(ud);
+                               update_source_label(ud, device, TRUE);
                                gint preview_count;
                                preview_count = ghb_settings_get_int(ud->settings, "preview_count");
-                               ghb_backend_scan(device, 0, preview_count);
+                               ghb_settings_set_string(ud->settings, "scan_source", device);
+                               start_scan(ud, device, 0, preview_count);
                        }
                }
        }
@@ -3150,13 +3854,14 @@ handle_media_change(const gchar *device, gboolean insert, signal_user_data_t *ud
                rem_count++;
                if (rem_count == 2)
                {
-                       ghb_file_menu_add_dvd(ud);
+                       g_thread_create((GThreadFunc)ghb_cache_volnames, ud, FALSE, NULL);
                        if (ud->current_dvd_device != NULL &&
                                strcmp(device, ud->current_dvd_device) == 0)
                        {
                                ghb_hb_cleanup(TRUE);
                                prune_logs(ud);
-                               ghb_backend_scan("/dev/null", 0, 1);
+                               ghb_settings_set_string(ud->settings, "scan_source", "/dev/null");
+                               start_scan(ud, "/dev/null", 0, 1);
                        }
                }
        }
@@ -3236,20 +3941,22 @@ drive_changed_cb(GVolumeMonitor *gvm, GDrive *gd, signal_user_data_t *ud)
        }
        if (g_drive_has_media(gd))
        {
-               GtkProgressBar *progress;
-               progress = GTK_PROGRESS_BAR(GHB_WIDGET (ud->builder, "progressbar"));
-               gtk_progress_bar_set_text (progress, "Scanning ...");
-               gtk_progress_bar_set_fraction (progress, 0);
-               update_source_label(ud, device);
-               gint preview_count;
-               preview_count = ghb_settings_get_int(ud->settings, "preview_count");
-               ghb_backend_scan(device, 0, preview_count);
+               if (ghb_settings_get_boolean(ud->settings, "AutoScan"))
+               {
+                       show_scan_progress(ud);
+                       update_source_label(ud, device, TRUE);
+                       gint preview_count;
+                       preview_count = ghb_settings_get_int(ud->settings, "preview_count");
+                       ghb_settings_set_string(ud->settings, "scan_source", device);
+                       start_scan(ud, device, 0, preview_count);
+               }
        }
        else
        {
                ghb_hb_cleanup(TRUE);
                prune_logs(ud);
-               ghb_backend_scan("/dev/null", 0, 1);
+               ghb_settings_set_string(ud->settings, "scan_source", "/dev/null");
+               start_scan(ud, "/dev/null", 0, 1);
        }
 }
 #endif
@@ -3261,13 +3968,201 @@ dbus_init (void)
        dbus_g_thread_init();
 }
 
-#define GPM_DBUS_SERVICE                       "org.freedesktop.PowerManagement"
+#define GPM_DBUS_PM_SERVICE                    "org.freedesktop.PowerManagement"
+#define GPM_DBUS_PM_PATH                       "/org/freedesktop/PowerManagement"
+#define GPM_DBUS_PM_INTERFACE          "org.freedesktop.PowerManagement"
 #define GPM_DBUS_INHIBIT_PATH          "/org/freedesktop/PowerManagement/Inhibit"
 #define GPM_DBUS_INHIBIT_INTERFACE     "org.freedesktop.PowerManagement.Inhibit" 
 static gboolean gpm_inhibited = FALSE;
 static guint gpm_cookie = -1;
 #endif
 
+static gboolean
+ghb_can_suspend_gpm()
+{
+       gboolean can_suspend = FALSE;
+#if !defined(_WIN32)
+       DBusGConnection *conn;
+       DBusGProxy      *proxy;
+       GError *error = NULL;
+       gboolean res;
+       
+
+       g_debug("ghb_can_suspend_gpm()");
+       conn = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
+       if (error != NULL)
+       {
+               g_warning("DBUS cannot connect: %s", error->message);
+               g_error_free(error);
+               return FALSE;
+       }
+       proxy = dbus_g_proxy_new_for_name(conn, GPM_DBUS_PM_SERVICE,
+                                                       GPM_DBUS_PM_PATH, GPM_DBUS_PM_INTERFACE);
+       if (proxy == NULL)
+       {
+               g_warning("Could not get DBUS proxy: %s", GPM_DBUS_PM_SERVICE);
+               dbus_g_connection_unref(conn);
+               return FALSE;
+       }
+       res = dbus_g_proxy_call(proxy, "CanSuspend", &error,
+                                                       G_TYPE_INVALID,
+                                                       G_TYPE_BOOLEAN, &can_suspend,
+                                                       G_TYPE_INVALID);
+       if (!res)
+       {
+               if (error != NULL)
+               {
+                       g_warning("CanSuspend failed: %s", error->message);
+                       g_error_free(error);
+               }
+               else
+                       g_warning("CanSuspend failed");
+               // Try to shutdown anyway
+               can_suspend = TRUE;
+       }
+       g_object_unref(G_OBJECT(proxy));
+       dbus_g_connection_unref(conn);
+#endif
+       return can_suspend;
+}
+
+static void
+ghb_suspend_gpm()
+{
+#if !defined(_WIN32)
+       DBusGConnection *conn;
+       DBusGProxy      *proxy;
+       GError *error = NULL;
+       gboolean res;
+       
+
+       g_debug("ghb_suspend_gpm()");
+       conn = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
+       if (error != NULL)
+       {
+               g_warning("DBUS cannot connect: %s", error->message);
+               g_error_free(error);
+               return;
+       }
+       proxy = dbus_g_proxy_new_for_name(conn, GPM_DBUS_PM_SERVICE,
+                                                       GPM_DBUS_PM_PATH, GPM_DBUS_PM_INTERFACE);
+       if (proxy == NULL)
+       {
+               g_warning("Could not get DBUS proxy: %s", GPM_DBUS_PM_SERVICE);
+               dbus_g_connection_unref(conn);
+               return;
+       }
+       res = dbus_g_proxy_call(proxy, "Suspend", &error,
+                                                       G_TYPE_INVALID,
+                                                       G_TYPE_INVALID);
+       if (!res)
+       {
+               if (error != NULL)
+               {
+                       g_warning("Suspend failed: %s", error->message);
+                       g_error_free(error);
+               }
+               else
+                       g_warning("Suspend failed");
+       }
+       g_object_unref(G_OBJECT(proxy));
+       dbus_g_connection_unref(conn);
+#endif
+}
+
+static gboolean
+ghb_can_shutdown_gpm()
+{
+       gboolean can_shutdown = FALSE;
+#if !defined(_WIN32)
+       DBusGConnection *conn;
+       DBusGProxy      *proxy;
+       GError *error = NULL;
+       gboolean res;
+       
+
+       g_debug("ghb_can_shutdown_gpm()");
+       conn = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
+       if (error != NULL)
+       {
+               g_warning("DBUS cannot connect: %s", error->message);
+               g_error_free(error);
+               return FALSE;
+       }
+       proxy = dbus_g_proxy_new_for_name(conn, GPM_DBUS_PM_SERVICE,
+                                                       GPM_DBUS_PM_PATH, GPM_DBUS_PM_INTERFACE);
+       if (proxy == NULL)
+       {
+               g_warning("Could not get DBUS proxy: %s", GPM_DBUS_PM_SERVICE);
+               dbus_g_connection_unref(conn);
+               return FALSE;
+       }
+       res = dbus_g_proxy_call(proxy, "CanShutdown", &error,
+                                                       G_TYPE_INVALID,
+                                                       G_TYPE_BOOLEAN, &can_shutdown,
+                                                       G_TYPE_INVALID);
+       if (!res)
+       {
+               if (error != NULL)
+               {
+                       g_warning("CanShutdown failed: %s", error->message);
+                       g_error_free(error);
+               }
+               else
+                       g_warning("CanShutdown failed");
+               // Try to shutdown anyway
+               can_shutdown = TRUE;
+       }
+       g_object_unref(G_OBJECT(proxy));
+       dbus_g_connection_unref(conn);
+#endif
+       return can_shutdown;
+}
+
+static void
+ghb_shutdown_gpm()
+{
+#if !defined(_WIN32)
+       DBusGConnection *conn;
+       DBusGProxy      *proxy;
+       GError *error = NULL;
+       gboolean res;
+       
+
+       g_debug("ghb_shutdown_gpm()");
+       conn = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
+       if (error != NULL)
+       {
+               g_warning("DBUS cannot connect: %s", error->message);
+               g_error_free(error);
+               return;
+       }
+       proxy = dbus_g_proxy_new_for_name(conn, GPM_DBUS_PM_SERVICE,
+                                                       GPM_DBUS_PM_PATH, GPM_DBUS_PM_INTERFACE);
+       if (proxy == NULL)
+       {
+               g_warning("Could not get DBUS proxy: %s", GPM_DBUS_PM_SERVICE);
+               dbus_g_connection_unref(conn);
+               return;
+       }
+       res = dbus_g_proxy_call(proxy, "Shutdown", &error,
+                                                       G_TYPE_INVALID,
+                                                       G_TYPE_INVALID);
+       if (!res)
+       {
+               if (error != NULL)
+               {
+                       g_warning("Shutdown failed: %s", error->message);
+                       g_error_free(error);
+               }
+               else
+                       g_warning("Shutdown failed");
+       }
+       g_object_unref(G_OBJECT(proxy));
+       dbus_g_connection_unref(conn);
+#endif
+}
+
 void
 ghb_inhibit_gpm()
 {
@@ -3291,11 +4186,11 @@ ghb_inhibit_gpm()
                g_error_free(error);
                return;
        }
-       proxy = dbus_g_proxy_new_for_name(conn, GPM_DBUS_SERVICE,
+       proxy = dbus_g_proxy_new_for_name(conn, GPM_DBUS_PM_SERVICE,
                                                        GPM_DBUS_INHIBIT_PATH, GPM_DBUS_INHIBIT_INTERFACE);
        if (proxy == NULL)
        {
-               g_warning("Could not get DBUS proxy: %s", GPM_DBUS_SERVICE);
+               g_warning("Could not get DBUS proxy: %s", GPM_DBUS_PM_SERVICE);
                dbus_g_connection_unref(conn);
                return;
        }
@@ -3347,11 +4242,11 @@ ghb_uninhibit_gpm()
                g_error_free(error);
                return;
        }
-       proxy = dbus_g_proxy_new_for_name(conn, GPM_DBUS_SERVICE,
+       proxy = dbus_g_proxy_new_for_name(conn, GPM_DBUS_PM_SERVICE,
                                                        GPM_DBUS_INHIBIT_PATH, GPM_DBUS_INHIBIT_INTERFACE);
        if (proxy == NULL)
        {
-               g_warning("Could not get DBUS proxy: %s", GPM_DBUS_SERVICE);
+               g_warning("Could not get DBUS proxy: %s", GPM_DBUS_PM_SERVICE);
                dbus_g_connection_unref(conn);
                return;
        }
@@ -3375,6 +4270,216 @@ ghb_uninhibit_gpm()
 #endif
 }
 
+#if !defined(_WIN32)
+
+// For inhibit and shutdown
+#define GPM_DBUS_SM_SERVICE                    "org.gnome.SessionManager"
+#define GPM_DBUS_SM_PATH                       "/org/gnome/SessionManager"
+#define GPM_DBUS_SM_INTERFACE          "org.gnome.SessionManager"
+
+#endif
+
+static gboolean
+ghb_can_shutdown_gsm()
+{
+       gboolean can_shutdown = FALSE;
+#if !defined(_WIN32)
+       DBusGConnection *conn;
+       DBusGProxy      *proxy;
+       GError *error = NULL;
+       gboolean res;
+       
+
+       g_debug("ghb_can_shutdown_gpm()");
+       conn = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
+       if (error != NULL)
+       {
+               g_warning("DBUS cannot connect: %s", error->message);
+               g_error_free(error);
+               return FALSE;
+       }
+       proxy = dbus_g_proxy_new_for_name(conn, GPM_DBUS_SM_SERVICE,
+                                                       GPM_DBUS_SM_PATH, GPM_DBUS_SM_INTERFACE);
+       if (proxy == NULL)
+       {
+               g_warning("Could not get DBUS proxy: %s", GPM_DBUS_SM_SERVICE);
+               dbus_g_connection_unref(conn);
+               return FALSE;
+       }
+       res = dbus_g_proxy_call(proxy, "CanShutdown", &error,
+                                                       G_TYPE_INVALID,
+                                                       G_TYPE_BOOLEAN, &can_shutdown,
+                                                       G_TYPE_INVALID);
+       g_object_unref(G_OBJECT(proxy));
+       dbus_g_connection_unref(conn);
+       if (!res)
+       {
+               if (error != NULL)
+               {
+                       g_error_free(error);
+               }
+               // Try to shutdown anyway
+               can_shutdown = TRUE;
+               // Try the gpm version
+               return ghb_can_shutdown_gpm();
+       }
+#endif
+       return can_shutdown;
+}
+
+static void
+ghb_shutdown_gsm()
+{
+#if !defined(_WIN32)
+       DBusGConnection *conn;
+       DBusGProxy      *proxy;
+       GError *error = NULL;
+       gboolean res;
+       
+
+       g_debug("ghb_shutdown_gpm()");
+       conn = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
+       if (error != NULL)
+       {
+               g_warning("DBUS cannot connect: %s", error->message);
+               g_error_free(error);
+               return;
+       }
+       proxy = dbus_g_proxy_new_for_name(conn, GPM_DBUS_SM_SERVICE,
+                                                       GPM_DBUS_SM_PATH, GPM_DBUS_SM_INTERFACE);
+       if (proxy == NULL)
+       {
+               g_warning("Could not get DBUS proxy: %s", GPM_DBUS_SM_SERVICE);
+               dbus_g_connection_unref(conn);
+               return;
+       }
+       res = dbus_g_proxy_call(proxy, "Shutdown", &error,
+                                                       G_TYPE_INVALID,
+                                                       G_TYPE_INVALID);
+       g_object_unref(G_OBJECT(proxy));
+       dbus_g_connection_unref(conn);
+       if (!res)
+       {
+               if (error != NULL)
+               {
+                       g_error_free(error);
+               }
+               // Try the gpm version
+               ghb_shutdown_gpm();
+       }
+#endif
+}
+
+void
+ghb_inhibit_gsm(signal_user_data_t *ud)
+{
+#if !defined(_WIN32)
+       DBusGConnection *conn;
+       DBusGProxy      *proxy;
+       GError *error = NULL;
+       gboolean res;
+       guint xid;
+       GtkWidget *widget;
+       
+
+       if (gpm_inhibited)
+       {
+               // Already inhibited
+               return;
+       }
+       g_debug("ghb_inhibit_gsm()");
+       conn = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
+       if (error != NULL)
+       {
+               g_warning("DBUS cannot connect: %s", error->message);
+               g_error_free(error);
+               return;
+       }
+       proxy = dbus_g_proxy_new_for_name(conn, GPM_DBUS_SM_SERVICE,
+                                                       GPM_DBUS_SM_PATH, GPM_DBUS_SM_INTERFACE);
+       if (proxy == NULL)
+       {
+               g_warning("Could not get DBUS proxy: %s", GPM_DBUS_SM_SERVICE);
+               dbus_g_connection_unref(conn);
+               return;
+       }
+       widget = GHB_WIDGET(ud->builder, "hb_window");
+       xid = GDK_DRAWABLE_XID(widget->window);
+       res = dbus_g_proxy_call(proxy, "Inhibit", &error,
+                                                       G_TYPE_STRING, "ghb",
+                                                       G_TYPE_UINT, xid,
+                                                       G_TYPE_STRING, "Encoding",
+                                                       G_TYPE_UINT, 1 | 4,
+                                                       G_TYPE_INVALID,
+                                                       G_TYPE_UINT, &gpm_cookie,
+                                                       G_TYPE_INVALID);
+       gpm_inhibited = TRUE;
+       g_object_unref(G_OBJECT(proxy));
+       dbus_g_connection_unref(conn);
+       if (!res)
+       {
+               if (error != NULL)
+               {
+                       g_error_free(error);
+                       gpm_cookie = -1;
+               }
+               gpm_cookie = -1;
+               gpm_inhibited = FALSE;
+               // Try the gpm version
+               ghb_inhibit_gpm();
+       }
+#endif
+}
+
+void
+ghb_uninhibit_gsm()
+{
+#if !defined(_WIN32)
+       DBusGConnection *conn;
+       DBusGProxy      *proxy;
+       GError *error = NULL;
+       gboolean res;
+       
+       g_debug("ghb_uninhibit_gsm() gpm_cookie %u", gpm_cookie);
+
+       if (!gpm_inhibited)
+       {
+               // Not inhibited
+               return;
+       }
+       conn = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
+       if (error != NULL)
+       {
+               g_warning("DBUS cannot connect: %s", error->message);
+               g_error_free(error);
+               return;
+       }
+       proxy = dbus_g_proxy_new_for_name(conn, GPM_DBUS_SM_SERVICE,
+                                                       GPM_DBUS_SM_PATH, GPM_DBUS_SM_INTERFACE);
+       if (proxy == NULL)
+       {
+               g_warning("Could not get DBUS proxy: %s", GPM_DBUS_SM_SERVICE);
+               dbus_g_connection_unref(conn);
+               return;
+       }
+       res = dbus_g_proxy_call(proxy, "Uninhibit", &error,
+                                                       G_TYPE_UINT, gpm_cookie,
+                                                       G_TYPE_INVALID,
+                                                       G_TYPE_INVALID);
+       dbus_g_connection_unref(conn);
+       g_object_unref(G_OBJECT(proxy));
+       if (!res)
+       {
+               if (error != NULL)
+               {
+                       g_error_free(error);
+               }
+               ghb_uninhibit_gpm();
+       }
+       gpm_inhibited = FALSE;
+#endif
+}
+
 void
 ghb_hal_init()
 {
@@ -3408,6 +4513,7 @@ ghb_hal_init()
                dbus_error_free (&error);
                libhal_ctx_free (hal_ctx);
                dbus_g_connection_unref(gconn);
+               hal_ctx = NULL;
                return;
        }
 
@@ -3423,6 +4529,7 @@ ghb_hal_init()
 
                libhal_ctx_shutdown (hal_ctx, NULL);
                libhal_ctx_free (hal_ctx);
+               hal_ctx = NULL;
                dbus_g_connection_unref(gconn);
                return;
        }
@@ -3549,40 +4656,29 @@ format_drc_cb(GtkScale *scale, gdouble val, signal_user_data_t *ud)
 G_MODULE_EXPORT gchar*
 format_vquality_cb(GtkScale *scale, gdouble val, signal_user_data_t *ud)
 {
-       gdouble percent;
-
        gint vcodec = ghb_settings_combo_int(ud->settings, "VideoEncoder");
        switch (vcodec)
        {
                case HB_VCODEC_X264:
                {
-                       gboolean crf;
-                       crf = ghb_settings_get_boolean(ud->settings, "constant_rate_factor");
-                       percent = 100. * (51 - val) / 51.;
-                       if (crf)
-                               return g_strdup_printf("RF: %.4g (%.0f%%)", val, percent);
-                       else
-                               return g_strdup_printf("QP: %.4g (%.0f%%)", val, percent);
+                       return g_strdup_printf("RF: %.4g", val);
                } break;
 
                case HB_VCODEC_FFMPEG:
                {
-                       percent = 100. * (30 - (val - 1)) / 30.;
-                       return g_strdup_printf("QP: %d (%.0f%%)", (int)val, percent);
+                       return g_strdup_printf("QP: %d", (int)val);
                } break;
 
                case HB_VCODEC_THEORA:
                {
-                       percent = 100. * val / 63.;
-                       return g_strdup_printf("QP: %d (%.0f%%)", (int)val, percent);
+                       return g_strdup_printf("QP: %d", (int)val);
                } break;
 
                default:
                {
-                       percent = 0;
                } break;
        }
-       return g_strdup_printf("QP: %.1f / %.1f%%", val, percent);
+       return g_strdup_printf("QP: %.4g", val);
 }
 
 static void
@@ -3625,9 +4721,9 @@ process_appcast(signal_user_data_t *ud)
                gtk_widget_set_size_request(html, 420, 240);
                gtk_widget_show(html);
        }
+       webkit_web_view_open(WEBKIT_WEB_VIEW(html), description);
 #endif
        dialog = GHB_WIDGET(ud->builder, "update_dialog");
-       webkit_web_view_open(WEBKIT_WEB_VIEW(html), description);
        response = gtk_dialog_run(GTK_DIALOG(dialog));
        gtk_widget_hide(dialog);
        if (response == GTK_RESPONSE_OK)
@@ -3776,13 +4872,35 @@ ghb_check_update(signal_user_data_t *ud)
        return NULL;
 }
 
+G_MODULE_EXPORT gboolean
+hb_visibility_event_cb(
+       GtkWidget *widget, 
+       GdkEventVisibility *vs, 
+       signal_user_data_t *ud)
+{
+       ud->hb_visibility = vs->state;
+       return FALSE;
+}
+
 G_MODULE_EXPORT void
 status_activate_cb(GtkStatusIcon *si, signal_user_data_t *ud)
 {
        GtkWindow *window;
+       GdkWindowState state;
 
        window = GTK_WINDOW(GHB_WIDGET(ud->builder, "hb_window"));
-       gtk_window_present(window);
+       state = gdk_window_get_state(GTK_WIDGET(window)->window);
+       if ((state & GDK_WINDOW_STATE_ICONIFIED) ||
+               (ud->hb_visibility != GDK_VISIBILITY_UNOBSCURED))
+       {
+               gtk_window_present(window);
+               gtk_window_set_skip_taskbar_hint(window, FALSE);
+       }
+       else
+       {
+               gtk_window_set_skip_taskbar_hint(window, TRUE);
+               gtk_window_iconify(window);
+       }
 }
 
 #if !defined(_WIN32)
@@ -3798,6 +4916,9 @@ ghb_notify_done(signal_user_data_t *ud)
 {
        GtkStatusIcon *si;
 
+       if (ghb_settings_combo_int(ud->settings, "WhenComplete") == 0)
+               return;
+
        si = GTK_STATUS_ICON(GHB_OBJECT(ud->builder, "hb_status"));
 
 #if !defined(_WIN32)
@@ -3811,4 +4932,25 @@ ghb_notify_done(signal_user_data_t *ud)
        g_signal_connect(notification, "closed", (GCallback)notify_closed_cb, ud);
        notify_notification_show(notification, NULL);
 #endif
+
+       if (ghb_settings_combo_int(ud->settings, "WhenComplete") == 3)
+       {
+               if (ghb_can_shutdown_gsm())
+               {
+                       ghb_countdown_dialog(GTK_MESSAGE_WARNING, 
+                               "Your encode is complete.",
+                               "Shutting down the computer", 
+                               "Cancel", (GSourceFunc)shutdown_cb, 60);
+               }
+       }
+       if (ghb_settings_combo_int(ud->settings, "WhenComplete") == 2)
+       {
+               if (ghb_can_suspend_gpm())
+               {
+                       ghb_countdown_dialog(GTK_MESSAGE_WARNING, 
+                               "Your encode is complete.",
+                               "Putting computer to sleep", 
+                               "Cancel", (GSourceFunc)suspend_cb, 60);
+               }
+       }
 }